50451 2010-12-03 04:24:24 -0800 [GTK] Drop GdkDrawable usage, it's been removed in GTK+3.x and we can use GdkWindow 2010-12-04 06:55:09 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 xan.lopez webkit-unassigned a9016009 buildbot cskeogh eric mrobinson uws+webkit xan.lopez oldest_to_newest 316776 0 xan.lopez 2010-12-03 04:24:24 -0800 SSIA 316780 1 75488 xan.lopez 2010-12-03 04:33:05 -0800 Created attachment 75488 drawable.diff 316782 2 75488 mrobinson 2010-12-03 04:39:34 -0800 Comment on attachment 75488 drawable.diff View in context: https://bugs.webkit.org/attachment.cgi?id=75488&action=review > WebCore/platform/graphics/GraphicsContext.h:95 > #if PLATFORM(GTK) > -typedef struct _GdkDrawable GdkDrawable; > +typedef struct _GdkWindow GdkWindow; > typedef struct _GdkEventExpose GdkEventExpose; > #endif This typedef will have to be typedef struct _GdkDrawable GdkWindow for GTK+ 2.x. I guess we'll need an #ifdef. You could move these to JavaScriptCore/gobject/GTypedefs.h and do it there. 316800 3 75496 xan.lopez 2010-12-03 06:06:18 -0800 Created attachment 75496 drawable.diff 316804 4 75496 mrobinson 2010-12-03 06:28:24 -0800 Comment on attachment 75496 drawable.diff Seems reasonable. Aren't there any callers for GraphicsContext::gdkWindow() ? 316806 5 buildbot 2010-12-03 06:50:11 -0800 Attachment 75496 did not build on win: Build output: http://queues.webkit.org/results/6832031 316836 6 eric 2010-12-03 08:49:47 -0800 Attachment 75496 did not build on mac: Build output: http://queues.webkit.org/results/6824028 316846 7 75504 xan.lopez 2010-12-03 09:33:29 -0800 Created attachment 75504 drawable.diff 316913 8 uws+webkit 2010-12-03 11:12:56 -0800 GDK_DRAWABLE and some other deprecated macros and functions have been removed altogether from GTK+ 3 (git master), so without this patch Webkit doesn't compile with recent GTK+ 3. 316981 9 75504 mrobinson 2010-12-03 12:58:56 -0800 Comment on attachment 75504 drawable.diff View in context: https://bugs.webkit.org/attachment.cgi?id=75504&action=review I tested this patch locally with exceptional results. But unless I'm crazy, I think that the change to the comment is incorrect. > WebCore/platform/gtk/WidgetRenderingContextGtk2.cpp:91 > + // paint directly to the target window. This will not render CSS rotational transforms properly. This comment is actually correct, because m_target may either be a GdkWindow or a GdkPixmap, both of which are drawables. I don' think a pixmap is a window though. 317167 10 xan.lopez 2010-12-03 16:20:50 -0800 (In reply to comment #9) > > WebCore/platform/gtk/WidgetRenderingContextGtk2.cpp:91 > > + // paint directly to the target window. This will not render CSS rotational transforms properly. > > This comment is actually correct, because m_target may either be a GdkWindow or a GdkPixmap, both of which are drawables. I don' think a pixmap is a window though. You are right, I was too quick with search and replace. (In reply to comment #8) > GDK_DRAWABLE and some other deprecated macros and functions have been removed altogether from GTK+ 3 (git master), so without this patch Webkit doesn't compile with recent GTK+ 3. Right again! I was just sloppy with my words, I know GdkDrawable has been removed and this patch is needed to build. I can tell because of the failed local build ;) 317270 11 xan.lopez 2010-12-04 06:54:21 -0800 Committed r73330: <http://trac.webkit.org/changeset/73330> 75488 2010-12-03 04:33:05 -0800 2010-12-03 06:06:18 -0800 drawable.diff drawable.diff text/plain 6500 xan.lopez RnJvbSA1NmQ4YmRlYWQzZTIxNzViMGYyOTM2NWM2OWE5ZjRiYWNkYWU5MmI3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhsb3BlekBpZ2FsaWEuY29tPgpEYXRlOiBG cmksIDMgRGVjIDIwMTAgMTM6MzE6MzEgKzAxMDAKU3ViamVjdDogW1BBVENIXSAyMDEwLTEyLTAz ICBYYW4gTG9wZXogIDx4bG9wZXpAaWdhbGlhLmNvbT4KCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCgogICAgICAgIFtHVEtdIERyb3AgR2RrRHJhd2FibGUgdXNhZ2UsIGl0J3Mg ZGVwcmVjYXRlZCBpbiBHVEsrMy54IGFuZCB3ZSBjYW4gdXNlIEdka1dpbmRvdwogICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDQ1MQoKICAgICAgICBHZGtE cmF3YWJsZSBoYXMgYmVlbiByZW1vdmVkIGluIEdUSyszLnguIFRvIGNvcGUgd2l0aCB0aGlzIHdl IGNhbgogICAgICAgIGFjdHVhbGx5IHN0b3AgdXNpbmcgaXQgYWx0b2dldGhlciwgc2luY2UgR2Rr V2luZG93IGlzIGp1c3QgYQogICAgICAgIHR5cGVkZWYgZm9yIGl0IGFuZCB0aGF0IHNlZW1zIHRv IGJlIGdvb2QgZW5vdWdoIGZvciB1cy4KCiAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFw aGljc0NvbnRleHQuaDogcy9HZGtEcmF3YWJsZS9HZGtXaW5kb3cvLgogICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0Q2Fpcm8uY3BwOgogICAgICAgIChXZWJD b3JlOjpHcmFwaGljc0NvbnRleHQ6Omdka1dpbmRvdyk6IGRpdHRvLgogICAgICAgICogcGxhdGZv cm0vZ3RrL0d0a1ZlcnNpb25pbmcuaDogZGVjbGFyZSBHREtfV0lORE9XX1hXSU5ET1cgZm9yIEdU SyAzLnggYnVpbGRzLgogICAgICAgICogcGxhdGZvcm0vZ3RrL1BsYXRmb3JtU2NyZWVuR3RrLmNw cDoKICAgICAgICAoV2ViQ29yZTo6c2NyZWVuQXZhaWxhYmxlUmVjdCk6IHMvR2RrRHJhd2FibGUv R2RrV2luZG93Ly4KICAgICAgICAqIHBsYXRmb3JtL2d0ay9XaWRnZXRHdGsuY3BwOgogICAgICAg IChXZWJDb3JlOjpnZGtXaW5kb3cpOiBkaXR0by4KICAgICAgICAoV2ViQ29yZTo6V2lkZ2V0Ojpz ZXRDdXJzb3IpOiBkaXR0by4KLS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB8ICAgMjEgKysrKysrKysrKysrKysrKysrKysKIFdlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmggICAgICAgIHwgICAgNCArLQogLi4uL2dy YXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcCAgICAgICAgfCAgICA0ICstCiBX ZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmggICAgICAgICAgICAgICB8ICAgIDEg KwogV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsuY3BwICAgICAgICAgfCAg ICAyICstCiBXZWJDb3JlL3BsYXRmb3JtL2d0ay9XaWRnZXRHdGsuY3BwICAgICAgICAgICAgICAg ICB8ICAgIDQgKy0KIDYgZmlsZXMgY2hhbmdlZCwgMjkgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9n CmluZGV4IGFiNjhhMWYuLmU2Nzk3YjIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTAtMTItMDMgIFhhbiBM b3BleiAgPHhsb3BlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtHVEtdIERyb3AgR2RrRHJhd2FibGUgdXNhZ2UsIGl0J3MgZGVw cmVjYXRlZCBpbiBHVEsrMy54IGFuZCB3ZSBjYW4gdXNlIEdka1dpbmRvdworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA0NTEKKworICAgICAgICBHZGtE cmF3YWJsZSBoYXMgYmVlbiByZW1vdmVkIGluIEdUSyszLnguIFRvIGNvcGUgd2l0aCB0aGlzIHdl IGNhbgorICAgICAgICBhY3R1YWxseSBzdG9wIHVzaW5nIGl0IGFsdG9nZXRoZXIsIHNpbmNlIEdk a1dpbmRvdyBpcyBqdXN0IGEKKyAgICAgICAgdHlwZWRlZiBmb3IgaXQgYW5kIHRoYXQgc2VlbXMg dG8gYmUgZ29vZCBlbm91Z2ggZm9yIHVzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv R3JhcGhpY3NDb250ZXh0Lmg6IHMvR2RrRHJhd2FibGUvR2RrV2luZG93Ly4KKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5jcHA6CisgICAgICAg IChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6Omdka1dpbmRvdyk6IGRpdHRvLgorICAgICAgICAq IHBsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmg6IGRlY2xhcmUgR0RLX1dJTkRPV19YV0lORE9X IGZvciBHVEsgMy54IGJ1aWxkcy4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3Jl ZW5HdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2NyZWVuQXZhaWxhYmxlUmVjdCk6IHMvR2Rr RHJhd2FibGUvR2RrV2luZG93Ly4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvV2lkZ2V0R3RrLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6Omdka1dpbmRvdyk6IGRpdHRvLgorICAgICAgICAoV2ViQ29y ZTo6V2lkZ2V0OjpzZXRDdXJzb3IpOiBkaXR0by4KKwogMjAxMC0xMi0wMiAgSm9zZXBoIFBlY29y YXJvICA8am9lcGVja0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFk bGVyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRl eHQuaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKaW5kZXgg NTUxYWRjMy4uYjRlNTYwMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0NvbnRleHQuaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNz Q29udGV4dC5oCkBAIC05MCw3ICs5MCw3IEBAIHR5cGVkZWYgdm9pZCBQbGF0Zm9ybUdyYXBoaWNz Q29udGV4dDsKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oR1RLKQotdHlwZWRlZiBzdHJ1Y3QgX0dk a0RyYXdhYmxlIEdka0RyYXdhYmxlOwordHlwZWRlZiBzdHJ1Y3QgX0dka1dpbmRvdyBHZGtXaW5k b3c7CiB0eXBlZGVmIHN0cnVjdCBfR2RrRXZlbnRFeHBvc2UgR2RrRXZlbnRFeHBvc2U7CiAjZW5k aWYKIApAQCAtNDA1LDcgKzQwNSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogI2lmIFBMQVRG T1JNKEdUSykKICAgICAgICAgdm9pZCBzZXRHZGtFeHBvc2VFdmVudChHZGtFdmVudEV4cG9zZSop OwotICAgICAgICBHZGtEcmF3YWJsZSogZ2RrRHJhd2FibGUoKSBjb25zdDsKKyAgICAgICAgR2Rr V2luZG93KiBnZGtXaW5kb3coKSBjb25zdDsKICAgICAgICAgR2RrRXZlbnRFeHBvc2UqIGdka0V4 cG9zZUV2ZW50KCkgY29uc3Q7CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5jcHAgYi9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcAppbmRleCA5YzJmZjgy Li5hNzE4ZjI3IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dy YXBoaWNzQ29udGV4dENhaXJvLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nh aXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcApAQCAtMTA4NSwxMiArMTA4NSwxMiBAQCBHZGtF dmVudEV4cG9zZSogR3JhcGhpY3NDb250ZXh0OjpnZGtFeHBvc2VFdmVudCgpIGNvbnN0CiAgICAg cmV0dXJuIG1fZGF0YS0+ZXhwb3NlOwogfQogCi1HZGtEcmF3YWJsZSogR3JhcGhpY3NDb250ZXh0 OjpnZGtEcmF3YWJsZSgpIGNvbnN0CitHZGtXaW5kb3cqIEdyYXBoaWNzQ29udGV4dDo6Z2RrV2lu ZG93KCkgY29uc3QKIHsKICAgICBpZiAoIW1fZGF0YS0+ZXhwb3NlKQogICAgICAgICByZXR1cm4g MDsKIAotICAgIHJldHVybiBHREtfRFJBV0FCTEUobV9kYXRhLT5leHBvc2UtPndpbmRvdyk7Cisg ICAgcmV0dXJuIG1fZGF0YS0+ZXhwb3NlLT53aW5kb3c7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oIGIvV2ViQ29yZS9wbGF0Zm9y bS9ndGsvR3RrVmVyc2lvbmluZy5oCmluZGV4IGVhMTVhNTQuLjljMzhhYmEgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuaAorKysgYi9XZWJDb3JlL3BsYXRm b3JtL2d0ay9HdGtWZXJzaW9uaW5nLmgKQEAgLTMyLDYgKzMyLDcgQEAgR19CRUdJTl9ERUNMUwog Ly8gTWFjcm9zIHRvIGF2b2lkIGRlcHJlY2F0aW9uIGNoZWNraW5nIGNodXJuCiAjaWZuZGVmIEdU S19BUElfVkVSU0lPTl8yCiAjZGVmaW5lIEdES19ESVNQTEFZKCkgKEdES19ESVNQTEFZX1hESVNQ TEFZKGdka19kaXNwbGF5X2dldF9kZWZhdWx0KCkpKQorI2RlZmluZSBHREtfV0lORE9XX1hXSU5E T1cod2luZG93KSAoZ2RrX3gxMV93aW5kb3dfZ2V0X3hpZCh3aW5kb3cpKQogI2Vsc2UKIEdka1Bp eGJ1ZiogZ2RrX3BpeGJ1Zl9nZXRfZnJvbV9zdXJmYWNlKGNhaXJvX3N1cmZhY2VfdCogc3VyZmFj ZSwgaW50IHNyY1gsIGludCBzcmNZLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgaW50IHdpZHRoLCBpbnQgaGVpZ2h0KTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL1BsYXRmb3JtU2NyZWVuR3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRm b3JtU2NyZWVuR3RrLmNwcAppbmRleCA5YzcwZDBlLi40MGI1MDllIDEwMDY0NAotLS0gYS9XZWJD b3JlL3BsYXRmb3JtL2d0ay9QbGF0Zm9ybVNjcmVlbkd0ay5jcHAKKysrIGIvV2ViQ29yZS9wbGF0 Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsuY3BwCkBAIC0xMjEsNyArMTIxLDcgQEAgRmxvYXRS ZWN0IHNjcmVlbkF2YWlsYWJsZVJlY3QoV2lkZ2V0KiB3aWRnZXQpCiAgICAgaWYgKCFndGtfd2lk Z2V0X2dldF9yZWFsaXplZChjb250YWluZXIpKQogICAgICAgICByZXR1cm4gc2NyZWVuUmVjdCh3 aWRnZXQpOwogCi0gICAgR2RrRHJhd2FibGUqIHJvb3RXaW5kb3cgPSBHREtfRFJBV0FCTEUoZ3Rr X3dpZGdldF9nZXRfcm9vdF93aW5kb3coY29udGFpbmVyKSk7CisgICAgR2RrV2luZG93KiByb290 V2luZG93ID0gZ3RrX3dpZGdldF9nZXRfcm9vdF93aW5kb3coY29udGFpbmVyKTsKICAgICBHZGtE aXNwbGF5KiBkaXNwbGF5ID0gZ2RrX3dpbmRvd19nZXRfZGlzcGxheShyb290V2luZG93KTsKICAg ICBBdG9tIHhwcm9wZXJ0eSA9IGdka194MTFfZ2V0X3hhdG9tX2J5X25hbWVfZm9yX2Rpc3BsYXko ZGlzcGxheSwgIl9ORVRfV09SS0FSRUEiKTsKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9y bS9ndGsvV2lkZ2V0R3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1dpZGdldEd0ay5jcHAK aW5kZXggZGIzMTZkNS4uZWUxMDA1YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv V2lkZ2V0R3RrLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9XaWRnZXRHdGsuY3BwCkBA IC02MCw3ICs2MCw3IEBAIHZvaWQgV2lkZ2V0OjpzZXRGb2N1cyhib29sIGZvY3VzZWQpCiAgICAg ICAgIGd0a193aWRnZXRfZ3JhYl9mb2N1cyhwbGF0Zm9ybVdpZGdldCgpID8gcGxhdGZvcm1XaWRn ZXQoKSA6IEdUS19XSURHRVQocm9vdCgpLT5ob3N0V2luZG93KCktPnBsYXRmb3JtUGFnZUNsaWVu dCgpKSk7CiB9CiAKLXN0YXRpYyBHZGtEcmF3YWJsZSogZ2RrRHJhd2FibGUoUGxhdGZvcm1XaWRn ZXQgd2lkZ2V0KQorc3RhdGljIEdka1dpbmRvdyogZ2RrV2luZG93KFBsYXRmb3JtV2lkZ2V0IHdp ZGdldCkKIHsKICAgICByZXR1cm4gd2lkZ2V0ID8gZ3RrX3dpZGdldF9nZXRfd2luZG93KHdpZGdl dCkgOiAwOwogfQpAQCAtNzgsNyArNzgsNyBAQCB2b2lkIFdpZGdldDo6c2V0Q3Vyc29yKGNvbnN0 IEN1cnNvciYgY3Vyc29yKQogICAgIGlmIChwbGF0Zm9ybUN1cnNvciA9PSBsYXN0U2V0Q3Vyc29y KQogICAgICAgICByZXR1cm47CiAKLSAgICBnZGtfd2luZG93X3NldF9jdXJzb3IoZ2RrRHJhd2Fi bGUocGxhdGZvcm1XaWRnZXQoKSkgPyBHREtfV0lORE9XKGdka0RyYXdhYmxlKHBsYXRmb3JtV2lk Z2V0KCkpKSA6IGd0a193aWRnZXRfZ2V0X3dpbmRvdyhHVEtfV0lER0VUKHJvb3QoKS0+aG9zdFdp bmRvdygpLT5wbGF0Zm9ybVBhZ2VDbGllbnQoKSkpLCBwbGF0Zm9ybUN1cnNvcik7CisgICAgZ2Rr X3dpbmRvd19zZXRfY3Vyc29yKGdka1dpbmRvdyhwbGF0Zm9ybVdpZGdldCgpKSA/IGdka1dpbmRv dyhwbGF0Zm9ybVdpZGdldCgpKSA6IGd0a193aWRnZXRfZ2V0X3dpbmRvdyhHVEtfV0lER0VUKHJv b3QoKS0+aG9zdFdpbmRvdygpLT5wbGF0Zm9ybVBhZ2VDbGllbnQoKSkpLCBwbGF0Zm9ybUN1cnNv cik7CiAgICAgbGFzdFNldEN1cnNvciA9IHBsYXRmb3JtQ3Vyc29yOwogfQogCi0tIAoxLjcuMi4z Cgo= 75496 2010-12-03 06:06:18 -0800 2010-12-03 09:33:29 -0800 drawable.diff drawable.diff text/plain 9137 xan.lopez RnJvbSAyMGRkN2EwNGI5NDMyYTY1Y2ZkYjk3NWQxODQzMWIwMjBjYjJiNjkxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhsb3BlekBpZ2FsaWEuY29tPgpEYXRlOiBG cmksIDMgRGVjIDIwMTAgMTM6MzE6MzEgKzAxMDAKU3ViamVjdDogW1BBVENIXSBXZWJDb3JlOgoK MjAxMC0xMi0wMyAgWGFuIExvcGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CgogICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBbR1RLXSBEcm9wIEdka0RyYXdhYmxlIHVz YWdlLCBpdCdzIGRlcHJlY2F0ZWQgaW4gR1RLKzMueCBhbmQgd2UgY2FuIHVzZSBHZGtXaW5kb3cK ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA0NTEKCiAg ICAgICAgR2RrRHJhd2FibGUgaGFzIGJlZW4gcmVtb3ZlZCBpbiBHVEsrMy54LiBUbyBjb3BlIHdp dGggdGhpcyB3ZSBjYW4KICAgICAgICBhY3R1YWxseSBzdG9wIHVzaW5nIGl0IGFsdG9nZXRoZXIs IHNpbmNlIEdka1dpbmRvdyBpcyBqdXN0IGEKICAgICAgICB0eXBlZGVmIGZvciBpdCBhbmQgdGhh dCBzZWVtcyB0byBiZSBnb29kIGVub3VnaCBmb3IgdXMuCgogICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NDb250ZXh0Lmg6IHMvR2RrRHJhd2FibGUvR2RrV2luZG93Ly4KICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcDoKICAg ICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpnZGtXaW5kb3cpOiBkaXR0by4KICAgICAg ICAqIHBsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmg6IGRlY2xhcmUgR0RLX1dJTkRPV19YV0lO RE9XIGZvciBHVEsgMy54IGJ1aWxkcy4KICAgICAgICAqIHBsYXRmb3JtL2d0ay9QbGF0Zm9ybVNj cmVlbkd0ay5jcHA6CiAgICAgICAgKFdlYkNvcmU6OnNjcmVlbkF2YWlsYWJsZVJlY3QpOiBzL0dk a0RyYXdhYmxlL0dka1dpbmRvdy8uCiAgICAgICAgKiBwbGF0Zm9ybS9ndGsvV2lkZ2V0R3RrLmNw cDoKICAgICAgICAoV2ViQ29yZTo6Z2RrV2luZG93KTogZGl0dG8uCiAgICAgICAgKFdlYkNvcmU6 OldpZGdldDo6c2V0Q3Vyc29yKTogZGl0dG8uCgpKYXZhU2NyaXB0Q29yZToKCjIwMTAtMTItMDMg IFhhbiBMb3BleiAgPHhsb3BlekBpZ2FsaWEuY29tPgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KCiAgICAgICAgW0dUS10gRHJvcCBHZGtEcmF3YWJsZSB1c2FnZSwgaXQncyBk ZXByZWNhdGVkIGluIEdUSyszLnggYW5kIHdlIGNhbiB1c2UgR2RrV2luZG93CiAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwNDUxCgogICAgICAgICogd3Rm L2dvYmplY3QvR1R5cGVkZWZzLmg6IGFkZCBHZGtXaW5kb3cgZGVmaW5lcy4KLS0tCiBKYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDkgKysrKysr KysKIEphdmFTY3JpcHRDb3JlL3d0Zi9nb2JqZWN0L0dUeXBlZGVmcy5oICAgICAgICAgICAgIHwg ICAgMyArLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgfCAgIDIxICsrKysrKysrKysrKysrKysrKysrCiBXZWJDb3JlL3BsYXRmb3JtL1dpZGdldC5o ICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDEgLQogV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9HcmFwaGljc0NvbnRleHQuaCAgICAgICAgfCAgICA4ICstLS0tLQogLi4uL2dyYXBoaWNz L2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcCAgICAgICAgfCAgICA0ICstCiBXZWJDb3Jl L3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmggICAgICAgICAgICAgICB8ICAgIDEgKwogV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsuY3BwICAgICAgICAgfCAgICAyICst CiBXZWJDb3JlL3BsYXRmb3JtL2d0ay9XaWRnZXRHdGsuY3BwICAgICAgICAgICAgICAgICB8ICAg IDQgKy0KIDkgZmlsZXMgY2hhbmdlZCwgNDAgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nIGIvSmF2YVNjcmlwdENvcmUv Q2hhbmdlTG9nCmluZGV4IDAzNzViMjkuLmQwZGE4NDkgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZworKysgYi9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx MiBAQAorMjAxMC0xMi0wMyAgWGFuIExvcGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gRHJvcCBHZGtE cmF3YWJsZSB1c2FnZSwgaXQncyBkZXByZWNhdGVkIGluIEdUSyszLnggYW5kIHdlIGNhbiB1c2Ug R2RrV2luZG93CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD01MDQ1MQorCisgICAgICAgICogd3RmL2dvYmplY3QvR1R5cGVkZWZzLmg6IGFkZCBHZGtXaW5k b3cgZGVmaW5lcy4KKwogMjAxMC0xMi0wMiAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJr aXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmcmV5IEdhcmVuLgpkaWZmIC0tZ2l0 IGEvSmF2YVNjcmlwdENvcmUvd3RmL2dvYmplY3QvR1R5cGVkZWZzLmggYi9KYXZhU2NyaXB0Q29y ZS93dGYvZ29iamVjdC9HVHlwZWRlZnMuaAppbmRleCA3NmQxYjFhLi4wYjlhOWVhIDEwMDY0NAot LS0gYS9KYXZhU2NyaXB0Q29yZS93dGYvZ29iamVjdC9HVHlwZWRlZnMuaAorKysgYi9KYXZhU2Ny aXB0Q29yZS93dGYvZ29iamVjdC9HVHlwZWRlZnMuaApAQCAtNDQsNyArNDQsNiBAQCB0eXBlZGVm IHN0cnVjdCBfR0RpciBHRGlyOwogdHlwZWRlZiBzdHJ1Y3QgX0dka0F0b20qIEdka0F0b207CiB0 eXBlZGVmIHN0cnVjdCBfR2RrQ3Vyc29yIEdka0N1cnNvcjsKIHR5cGVkZWYgc3RydWN0IF9HZGtE cmFnQ29udGV4dCBHZGtEcmFnQ29udGV4dDsKLXR5cGVkZWYgc3RydWN0IF9HZGtEcmF3YWJsZSBH ZGtEcmF3YWJsZTsKIHR5cGVkZWYgc3RydWN0IF9HZGtFdmVudENvbmZpZ3VyZSBHZGtFdmVudENv bmZpZ3VyZTsKIHR5cGVkZWYgc3RydWN0IF9HZGtFdmVudEV4cG9zZSBHZGtFdmVudEV4cG9zZTsK IHR5cGVkZWYgc3RydWN0IF9HZGtQaXhidWYgR2RrUGl4YnVmOwpAQCAtODUsNyArODQsOSBAQCB0 eXBlZGVmIHN0cnVjdCBfR3RrV2luZG93IEd0a1dpbmRvdzsKIAogI2lmZGVmIEdUS19BUElfVkVS U0lPTl8yCiB0eXBlZGVmIHN0cnVjdCBfR2RrUmVjdGFuZ2xlIEdka1JlY3RhbmdsZTsKK3R5cGVk ZWYgc3RydWN0IF9HZGtEcmF3YWJsZSBHZGtXaW5kb3c7CiAjZWxzZQordHlwZWRlZiBzdHJ1Y3Qg X0dka1dpbmRvdyBHZGtXaW5kb3c7CiB0eXBlZGVmIHN0cnVjdCBfY2Fpcm9fcmVjdGFuZ2xlX2lu dCBjYWlyb19yZWN0YW5nbGVfaW50X3Q7CiB0eXBlZGVmIGNhaXJvX3JlY3RhbmdsZV9pbnRfdCBH ZGtSZWN0YW5nbGU7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKaW5kZXggYWI2OGExZi4uZTY3OTdiMiAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAx MC0xMi0wMyAgWGFuIExvcGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gRHJvcCBHZGtEcmF3YWJsZSB1 c2FnZSwgaXQncyBkZXByZWNhdGVkIGluIEdUSyszLnggYW5kIHdlIGNhbiB1c2UgR2RrV2luZG93 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDQ1MQor CisgICAgICAgIEdka0RyYXdhYmxlIGhhcyBiZWVuIHJlbW92ZWQgaW4gR1RLKzMueC4gVG8gY29w ZSB3aXRoIHRoaXMgd2UgY2FuCisgICAgICAgIGFjdHVhbGx5IHN0b3AgdXNpbmcgaXQgYWx0b2dl dGhlciwgc2luY2UgR2RrV2luZG93IGlzIGp1c3QgYQorICAgICAgICB0eXBlZGVmIGZvciBpdCBh bmQgdGhhdCBzZWVtcyB0byBiZSBnb29kIGVub3VnaCBmb3IgdXMuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaDogcy9HZGtEcmF3YWJsZS9HZGtXaW5kb3cv LgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJv LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6Z2RrV2luZG93KTogZGl0 dG8uCisgICAgICAgICogcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuaDogZGVjbGFyZSBHREtf V0lORE9XX1hXSU5ET1cgZm9yIEdUSyAzLnggYnVpbGRzLgorICAgICAgICAqIHBsYXRmb3JtL2d0 ay9QbGF0Zm9ybVNjcmVlbkd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzY3JlZW5BdmFpbGFi bGVSZWN0KTogcy9HZGtEcmF3YWJsZS9HZGtXaW5kb3cvLgorICAgICAgICAqIHBsYXRmb3JtL2d0 ay9XaWRnZXRHdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Z2RrV2luZG93KTogZGl0dG8uCisg ICAgICAgIChXZWJDb3JlOjpXaWRnZXQ6OnNldEN1cnNvcik6IGRpdHRvLgorCiAyMDEwLTEyLTAy ICBKb3NlcGggUGVjb3Jhcm8gIDxqb2VwZWNrQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL1dpZGdldC5o IGIvV2ViQ29yZS9wbGF0Zm9ybS9XaWRnZXQuaAppbmRleCA3NjM1MTQ5Li4xMGM2NWNlIDEwMDY0 NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL1dpZGdldC5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0v V2lkZ2V0LmgKQEAgLTYwLDcgKzYwLDYgQEAgdHlwZWRlZiBIV05EIFBsYXRmb3JtV2lkZ2V0Owog I2VuZGlmCiAKICNpZiBQTEFURk9STShHVEspCi10eXBlZGVmIHN0cnVjdCBfR2RrRHJhd2FibGUg R2RrRHJhd2FibGU7CiB0eXBlZGVmIHN0cnVjdCBfR3RrV2lkZ2V0IEd0a1dpZGdldDsKIHR5cGVk ZWYgc3RydWN0IF9HdGtDb250YWluZXIgR3RrQ29udGFpbmVyOwogdHlwZWRlZiBHdGtXaWRnZXQq IFBsYXRmb3JtV2lkZ2V0OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0NvbnRleHQuaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250 ZXh0LmgKaW5kZXggNTUxYWRjMy4uMTA4NTZhMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0dyYXBoaWNzQ29udGV4dC5oCkBAIC0zNiw2ICszNiw3IEBACiAjaW5jbHVkZSAiVGV4dERp cmVjdGlvbi5oIgogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgogI2luY2x1ZGUgPHd0Zi9Q YXNzT3duUHRyLmg+CisjaW5jbHVkZSA8d3RmL2dvYmplY3QvR1R5cGVkZWZzLmg+CiAKICNpZiBQ TEFURk9STShDRykKIHR5cGVkZWYgc3RydWN0IENHQ29udGV4dCBQbGF0Zm9ybUdyYXBoaWNzQ29u dGV4dDsKQEAgLTg5LDExICs5MCw2IEBAIHR5cGVkZWYgc3RydWN0IEhEQ19fIFBsYXRmb3JtR3Jh cGhpY3NDb250ZXh0OwogdHlwZWRlZiB2b2lkIFBsYXRmb3JtR3JhcGhpY3NDb250ZXh0OwogI2Vu ZGlmCiAKLSNpZiBQTEFURk9STShHVEspCi10eXBlZGVmIHN0cnVjdCBfR2RrRHJhd2FibGUgR2Rr RHJhd2FibGU7Ci10eXBlZGVmIHN0cnVjdCBfR2RrRXZlbnRFeHBvc2UgR2RrRXZlbnRFeHBvc2U7 Ci0jZW5kaWYKLQogI2lmIFBMQVRGT1JNKFdJTikKIHR5cGVkZWYgc3RydWN0IEhEQ19fKiBIREM7 CiAjaWYgIVBMQVRGT1JNKENHKQpAQCAtNDA1LDcgKzQwMSw3IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAogI2lmIFBMQVRGT1JNKEdUSykKICAgICAgICAgdm9pZCBzZXRHZGtFeHBvc2VFdmVudChH ZGtFdmVudEV4cG9zZSopOwotICAgICAgICBHZGtEcmF3YWJsZSogZ2RrRHJhd2FibGUoKSBjb25z dDsKKyAgICAgICAgR2RrV2luZG93KiBnZGtXaW5kb3coKSBjb25zdDsKICAgICAgICAgR2RrRXZl bnRFeHBvc2UqIGdka0V4cG9zZUV2ZW50KCkgY29uc3Q7CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5jcHAg Yi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNw cAppbmRleCA5YzJmZjgyLi5hNzE4ZjI3IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcAorKysgYi9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcApAQCAtMTA4NSwxMiAr MTA4NSwxMiBAQCBHZGtFdmVudEV4cG9zZSogR3JhcGhpY3NDb250ZXh0OjpnZGtFeHBvc2VFdmVu dCgpIGNvbnN0CiAgICAgcmV0dXJuIG1fZGF0YS0+ZXhwb3NlOwogfQogCi1HZGtEcmF3YWJsZSog R3JhcGhpY3NDb250ZXh0OjpnZGtEcmF3YWJsZSgpIGNvbnN0CitHZGtXaW5kb3cqIEdyYXBoaWNz Q29udGV4dDo6Z2RrV2luZG93KCkgY29uc3QKIHsKICAgICBpZiAoIW1fZGF0YS0+ZXhwb3NlKQog ICAgICAgICByZXR1cm4gMDsKIAotICAgIHJldHVybiBHREtfRFJBV0FCTEUobV9kYXRhLT5leHBv c2UtPndpbmRvdyk7CisgICAgcmV0dXJuIG1fZGF0YS0+ZXhwb3NlLT53aW5kb3c7CiB9CiAjZW5k aWYKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oIGIv V2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oCmluZGV4IGVhMTVhNTQuLjljMzhh YmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuaAorKysg Yi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmgKQEAgLTMyLDYgKzMyLDcgQEAg R19CRUdJTl9ERUNMUwogLy8gTWFjcm9zIHRvIGF2b2lkIGRlcHJlY2F0aW9uIGNoZWNraW5nIGNo dXJuCiAjaWZuZGVmIEdUS19BUElfVkVSU0lPTl8yCiAjZGVmaW5lIEdES19ESVNQTEFZKCkgKEdE S19ESVNQTEFZX1hESVNQTEFZKGdka19kaXNwbGF5X2dldF9kZWZhdWx0KCkpKQorI2RlZmluZSBH REtfV0lORE9XX1hXSU5ET1cod2luZG93KSAoZ2RrX3gxMV93aW5kb3dfZ2V0X3hpZCh3aW5kb3cp KQogI2Vsc2UKIEdka1BpeGJ1ZiogZ2RrX3BpeGJ1Zl9nZXRfZnJvbV9zdXJmYWNlKGNhaXJvX3N1 cmZhY2VfdCogc3VyZmFjZSwgaW50IHNyY1gsIGludCBzcmNZLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgaW50IHdpZHRoLCBpbnQgaGVpZ2h0KTsKZGlmZiAtLWdpdCBh L1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3JtU2NyZWVuR3RrLmNwcCBiL1dlYkNvcmUvcGxh dGZvcm0vZ3RrL1BsYXRmb3JtU2NyZWVuR3RrLmNwcAppbmRleCA5YzcwZDBlLi40MGI1MDllIDEw MDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QbGF0Zm9ybVNjcmVlbkd0ay5jcHAKKysr IGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsuY3BwCkBAIC0xMjEsNyAr MTIxLDcgQEAgRmxvYXRSZWN0IHNjcmVlbkF2YWlsYWJsZVJlY3QoV2lkZ2V0KiB3aWRnZXQpCiAg ICAgaWYgKCFndGtfd2lkZ2V0X2dldF9yZWFsaXplZChjb250YWluZXIpKQogICAgICAgICByZXR1 cm4gc2NyZWVuUmVjdCh3aWRnZXQpOwogCi0gICAgR2RrRHJhd2FibGUqIHJvb3RXaW5kb3cgPSBH REtfRFJBV0FCTEUoZ3RrX3dpZGdldF9nZXRfcm9vdF93aW5kb3coY29udGFpbmVyKSk7CisgICAg R2RrV2luZG93KiByb290V2luZG93ID0gZ3RrX3dpZGdldF9nZXRfcm9vdF93aW5kb3coY29udGFp bmVyKTsKICAgICBHZGtEaXNwbGF5KiBkaXNwbGF5ID0gZ2RrX3dpbmRvd19nZXRfZGlzcGxheShy b290V2luZG93KTsKICAgICBBdG9tIHhwcm9wZXJ0eSA9IGdka194MTFfZ2V0X3hhdG9tX2J5X25h bWVfZm9yX2Rpc3BsYXkoZGlzcGxheSwgIl9ORVRfV09SS0FSRUEiKTsKIApkaWZmIC0tZ2l0IGEv V2ViQ29yZS9wbGF0Zm9ybS9ndGsvV2lkZ2V0R3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L1dpZGdldEd0ay5jcHAKaW5kZXggZGIzMTZkNS4uZWUxMDA1YyAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9wbGF0Zm9ybS9ndGsvV2lkZ2V0R3RrLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9X aWRnZXRHdGsuY3BwCkBAIC02MCw3ICs2MCw3IEBAIHZvaWQgV2lkZ2V0OjpzZXRGb2N1cyhib29s IGZvY3VzZWQpCiAgICAgICAgIGd0a193aWRnZXRfZ3JhYl9mb2N1cyhwbGF0Zm9ybVdpZGdldCgp ID8gcGxhdGZvcm1XaWRnZXQoKSA6IEdUS19XSURHRVQocm9vdCgpLT5ob3N0V2luZG93KCktPnBs YXRmb3JtUGFnZUNsaWVudCgpKSk7CiB9CiAKLXN0YXRpYyBHZGtEcmF3YWJsZSogZ2RrRHJhd2Fi bGUoUGxhdGZvcm1XaWRnZXQgd2lkZ2V0KQorc3RhdGljIEdka1dpbmRvdyogZ2RrV2luZG93KFBs YXRmb3JtV2lkZ2V0IHdpZGdldCkKIHsKICAgICByZXR1cm4gd2lkZ2V0ID8gZ3RrX3dpZGdldF9n ZXRfd2luZG93KHdpZGdldCkgOiAwOwogfQpAQCAtNzgsNyArNzgsNyBAQCB2b2lkIFdpZGdldDo6 c2V0Q3Vyc29yKGNvbnN0IEN1cnNvciYgY3Vyc29yKQogICAgIGlmIChwbGF0Zm9ybUN1cnNvciA9 PSBsYXN0U2V0Q3Vyc29yKQogICAgICAgICByZXR1cm47CiAKLSAgICBnZGtfd2luZG93X3NldF9j dXJzb3IoZ2RrRHJhd2FibGUocGxhdGZvcm1XaWRnZXQoKSkgPyBHREtfV0lORE9XKGdka0RyYXdh YmxlKHBsYXRmb3JtV2lkZ2V0KCkpKSA6IGd0a193aWRnZXRfZ2V0X3dpbmRvdyhHVEtfV0lER0VU KHJvb3QoKS0+aG9zdFdpbmRvdygpLT5wbGF0Zm9ybVBhZ2VDbGllbnQoKSkpLCBwbGF0Zm9ybUN1 cnNvcik7CisgICAgZ2RrX3dpbmRvd19zZXRfY3Vyc29yKGdka1dpbmRvdyhwbGF0Zm9ybVdpZGdl dCgpKSA/IGdka1dpbmRvdyhwbGF0Zm9ybVdpZGdldCgpKSA6IGd0a193aWRnZXRfZ2V0X3dpbmRv dyhHVEtfV0lER0VUKHJvb3QoKS0+aG9zdFdpbmRvdygpLT5wbGF0Zm9ybVBhZ2VDbGllbnQoKSkp LCBwbGF0Zm9ybUN1cnNvcik7CiAgICAgbGFzdFNldEN1cnNvciA9IHBsYXRmb3JtQ3Vyc29yOwog fQogCi0tIAoxLjcuMi4zCgo= 75504 2010-12-03 09:33:29 -0800 2010-12-04 06:55:09 -0800 drawable.diff drawable.diff text/plain 10612 xan.lopez RnJvbSAzMzU1NzMxN2UzMjdhODZkZGJjNjY5MTNkZGI2MTY2NzQ5MmJlZTc2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhsb3BlekBpZ2FsaWEuY29tPgpEYXRlOiBG cmksIDMgRGVjIDIwMTAgMTM6MzE6MzEgKzAxMDAKU3ViamVjdDogW1BBVENIXSBXZWJDb3JlOgoK MjAxMC0xMi0wMyAgWGFuIExvcGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CgogICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBbR1RLXSBEcm9wIEdka0RyYXdhYmxlIHVz YWdlLCBpdCdzIGRlcHJlY2F0ZWQgaW4gR1RLKzMueCBhbmQgd2UgY2FuIHVzZSBHZGtXaW5kb3cK ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA0NTEKCiAg ICAgICAgR2RrRHJhd2FibGUgaGFzIGJlZW4gcmVtb3ZlZCBpbiBHVEsrMy54LiBUbyBjb3BlIHdp dGggdGhpcyB3ZSBjYW4KICAgICAgICBhY3R1YWxseSBzdG9wIHVzaW5nIGl0IGFsdG9nZXRoZXIs IHNpbmNlIEdka1dpbmRvdyBpcyBqdXN0IGEKICAgICAgICB0eXBlZGVmIGZvciBpdCBhbmQgdGhh dCBzZWVtcyB0byBiZSBnb29kIGVub3VnaCBmb3IgdXMuCgogICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NDb250ZXh0Lmg6IHMvR2RrRHJhd2FibGUvR2RrV2luZG93Ly4KICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcDoKICAg ICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpnZGtXaW5kb3cpOiBkaXR0by4KICAgICAg ICAqIHBsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmg6IGRlY2xhcmUgR0RLX1dJTkRPV19YV0lO RE9XIGZvciBHVEsgMy54IGJ1aWxkcy4KICAgICAgICAqIHBsYXRmb3JtL2d0ay9QbGF0Zm9ybVNj cmVlbkd0ay5jcHA6CiAgICAgICAgKFdlYkNvcmU6OnNjcmVlbkF2YWlsYWJsZVJlY3QpOiBzL0dk a0RyYXdhYmxlL0dka1dpbmRvdy8uCiAgICAgICAgKiBwbGF0Zm9ybS9ndGsvV2lkZ2V0R3RrLmNw cDoKICAgICAgICAoV2ViQ29yZTo6Z2RrV2luZG93KTogZGl0dG8uCiAgICAgICAgKFdlYkNvcmU6 OldpZGdldDo6c2V0Q3Vyc29yKTogZGl0dG8uCgpKYXZhU2NyaXB0Q29yZToKCjIwMTAtMTItMDMg IFhhbiBMb3BleiAgPHhsb3BlekBpZ2FsaWEuY29tPgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KCiAgICAgICAgW0dUS10gRHJvcCBHZGtEcmF3YWJsZSB1c2FnZSwgaXQncyBk ZXByZWNhdGVkIGluIEdUSyszLnggYW5kIHdlIGNhbiB1c2UgR2RrV2luZG93CiAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwNDUxCgogICAgICAgICogd3Rm L2dvYmplY3QvR1R5cGVkZWZzLmg6IGFkZCBHZGtXaW5kb3cgZGVmaW5lcy4KLS0tCiBKYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDkgKysrKysr KysKIEphdmFTY3JpcHRDb3JlL3d0Zi9nb2JqZWN0L0dUeXBlZGVmcy5oICAgICAgICAgICAgIHwg ICAgMyArLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgfCAgIDIxICsrKysrKysrKysrKysrKysrKysrCiBXZWJDb3JlL3BsYXRmb3JtL1dpZGdldC5o ICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDEgLQogV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9HcmFwaGljc0NvbnRleHQuaCAgICAgICAgfCAgICA3ICstLS0tLQogLi4uL2dyYXBoaWNz L2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcCAgICAgICAgfCAgICA0ICstCiBXZWJDb3Jl L3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmggICAgICAgICAgICAgICB8ICAgIDEgKwogV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsuY3BwICAgICAgICAgfCAgICAyICst CiBXZWJDb3JlL3BsYXRmb3JtL2d0ay9XaWRnZXRHdGsuY3BwICAgICAgICAgICAgICAgICB8ICAg IDQgKy0KIC4uLi9wbGF0Zm9ybS9ndGsvV2lkZ2V0UmVuZGVyaW5nQ29udGV4dEd0azIuY3BwICAg IHwgICAgOCArKystLS0KIDEwIGZpbGVzIGNoYW5nZWQsIDQzIGluc2VydGlvbnMoKyksIDE3IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFT Y3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAwMzc1YjI5Li5kMGRhODQ5IDEwMDY0NAotLS0gYS9K YXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTIgQEAKKzIwMTAtMTItMDMgIFhhbiBMb3BleiAgPHhsb3BlekBpZ2FsaWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtd IERyb3AgR2RrRHJhd2FibGUgdXNhZ2UsIGl0J3MgZGVwcmVjYXRlZCBpbiBHVEsrMy54IGFuZCB3 ZSBjYW4gdXNlIEdka1dpbmRvdworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTA0NTEKKworICAgICAgICAqIHd0Zi9nb2JqZWN0L0dUeXBlZGVmcy5oOiBh ZGQgR2RrV2luZG93IGRlZmluZXMuCisKIDIwMTAtMTItMDIgIENzYWJhIE9zenRyb2dvbsOhYyAg PG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBHZW9mZnJleSBHYXJlbi4K ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL3d0Zi9nb2JqZWN0L0dUeXBlZGVmcy5oIGIvSmF2 YVNjcmlwdENvcmUvd3RmL2dvYmplY3QvR1R5cGVkZWZzLmgKaW5kZXggNzZkMWIxYS4uMGI5YTll YSAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvd3RmL2dvYmplY3QvR1R5cGVkZWZzLmgKKysr IGIvSmF2YVNjcmlwdENvcmUvd3RmL2dvYmplY3QvR1R5cGVkZWZzLmgKQEAgLTQ0LDcgKzQ0LDYg QEAgdHlwZWRlZiBzdHJ1Y3QgX0dEaXIgR0RpcjsKIHR5cGVkZWYgc3RydWN0IF9HZGtBdG9tKiBH ZGtBdG9tOwogdHlwZWRlZiBzdHJ1Y3QgX0dka0N1cnNvciBHZGtDdXJzb3I7CiB0eXBlZGVmIHN0 cnVjdCBfR2RrRHJhZ0NvbnRleHQgR2RrRHJhZ0NvbnRleHQ7Ci10eXBlZGVmIHN0cnVjdCBfR2Rr RHJhd2FibGUgR2RrRHJhd2FibGU7CiB0eXBlZGVmIHN0cnVjdCBfR2RrRXZlbnRDb25maWd1cmUg R2RrRXZlbnRDb25maWd1cmU7CiB0eXBlZGVmIHN0cnVjdCBfR2RrRXZlbnRFeHBvc2UgR2RrRXZl bnRFeHBvc2U7CiB0eXBlZGVmIHN0cnVjdCBfR2RrUGl4YnVmIEdka1BpeGJ1ZjsKQEAgLTg1LDcg Kzg0LDkgQEAgdHlwZWRlZiBzdHJ1Y3QgX0d0a1dpbmRvdyBHdGtXaW5kb3c7CiAKICNpZmRlZiBH VEtfQVBJX1ZFUlNJT05fMgogdHlwZWRlZiBzdHJ1Y3QgX0dka1JlY3RhbmdsZSBHZGtSZWN0YW5n bGU7Cit0eXBlZGVmIHN0cnVjdCBfR2RrRHJhd2FibGUgR2RrV2luZG93OwogI2Vsc2UKK3R5cGVk ZWYgc3RydWN0IF9HZGtXaW5kb3cgR2RrV2luZG93OwogdHlwZWRlZiBzdHJ1Y3QgX2NhaXJvX3Jl Y3RhbmdsZV9pbnQgY2Fpcm9fcmVjdGFuZ2xlX2ludF90OwogdHlwZWRlZiBjYWlyb19yZWN0YW5n bGVfaW50X3QgR2RrUmVjdGFuZ2xlOwogI2VuZGlmCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5n ZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGFiNjhhMWYuLmU2Nzk3YjIgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MjQgQEAKKzIwMTAtMTItMDMgIFhhbiBMb3BleiAgPHhsb3BlekBpZ2FsaWEuY29tPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIERyb3AgR2Rr RHJhd2FibGUgdXNhZ2UsIGl0J3MgZGVwcmVjYXRlZCBpbiBHVEsrMy54IGFuZCB3ZSBjYW4gdXNl IEdka1dpbmRvdworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NTA0NTEKKworICAgICAgICBHZGtEcmF3YWJsZSBoYXMgYmVlbiByZW1vdmVkIGluIEdUSysz LnguIFRvIGNvcGUgd2l0aCB0aGlzIHdlIGNhbgorICAgICAgICBhY3R1YWxseSBzdG9wIHVzaW5n IGl0IGFsdG9nZXRoZXIsIHNpbmNlIEdka1dpbmRvdyBpcyBqdXN0IGEKKyAgICAgICAgdHlwZWRl ZiBmb3IgaXQgYW5kIHRoYXQgc2VlbXMgdG8gYmUgZ29vZCBlbm91Z2ggZm9yIHVzLgorCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0Lmg6IHMvR2RrRHJhd2FibGUv R2RrV2luZG93Ly4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0Nv bnRleHRDYWlyby5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6Omdka1dp bmRvdyk6IGRpdHRvLgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmg6IGRl Y2xhcmUgR0RLX1dJTkRPV19YV0lORE9XIGZvciBHVEsgMy54IGJ1aWxkcy4KKyAgICAgICAgKiBw bGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2Ny ZWVuQXZhaWxhYmxlUmVjdCk6IHMvR2RrRHJhd2FibGUvR2RrV2luZG93Ly4KKyAgICAgICAgKiBw bGF0Zm9ybS9ndGsvV2lkZ2V0R3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Omdka1dpbmRvdyk6 IGRpdHRvLgorICAgICAgICAoV2ViQ29yZTo6V2lkZ2V0OjpzZXRDdXJzb3IpOiBkaXR0by4KKwog MjAxMC0xMi0wMiAgSm9zZXBoIFBlY29yYXJvICA8am9lcGVja0B3ZWJraXQub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9y bS9XaWRnZXQuaCBiL1dlYkNvcmUvcGxhdGZvcm0vV2lkZ2V0LmgKaW5kZXggNzYzNTE0OS4uMTBj NjVjZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9XaWRnZXQuaAorKysgYi9XZWJDb3Jl L3BsYXRmb3JtL1dpZGdldC5oCkBAIC02MCw3ICs2MCw2IEBAIHR5cGVkZWYgSFdORCBQbGF0Zm9y bVdpZGdldDsKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oR1RLKQotdHlwZWRlZiBzdHJ1Y3QgX0dk a0RyYXdhYmxlIEdka0RyYXdhYmxlOwogdHlwZWRlZiBzdHJ1Y3QgX0d0a1dpZGdldCBHdGtXaWRn ZXQ7CiB0eXBlZGVmIHN0cnVjdCBfR3RrQ29udGFpbmVyIEd0a0NvbnRhaW5lcjsKIHR5cGVkZWYg R3RrV2lkZ2V0KiBQbGF0Zm9ybVdpZGdldDsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmggYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dy YXBoaWNzQ29udGV4dC5oCmluZGV4IDU1MWFkYzMuLjkxODRkYjcgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKKysrIGIvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaApAQCAtODksMTEgKzg5LDYgQEAgdHlwZWRl ZiBzdHJ1Y3QgSERDX18gUGxhdGZvcm1HcmFwaGljc0NvbnRleHQ7CiB0eXBlZGVmIHZvaWQgUGxh dGZvcm1HcmFwaGljc0NvbnRleHQ7CiAjZW5kaWYKIAotI2lmIFBMQVRGT1JNKEdUSykKLXR5cGVk ZWYgc3RydWN0IF9HZGtEcmF3YWJsZSBHZGtEcmF3YWJsZTsKLXR5cGVkZWYgc3RydWN0IF9HZGtF dmVudEV4cG9zZSBHZGtFdmVudEV4cG9zZTsKLSNlbmRpZgotCiAjaWYgUExBVEZPUk0oV0lOKQog dHlwZWRlZiBzdHJ1Y3QgSERDX18qIEhEQzsKICNpZiAhUExBVEZPUk0oQ0cpCkBAIC00MDUsNyAr NDAwLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAjaWYgUExBVEZPUk0oR1RLKQogICAgICAg ICB2b2lkIHNldEdka0V4cG9zZUV2ZW50KEdka0V2ZW50RXhwb3NlKik7Ci0gICAgICAgIEdka0Ry YXdhYmxlKiBnZGtEcmF3YWJsZSgpIGNvbnN0OworICAgICAgICBHZGtXaW5kb3cqIGdka1dpbmRv dygpIGNvbnN0OwogICAgICAgICBHZGtFdmVudEV4cG9zZSogZ2RrRXhwb3NlRXZlbnQoKSBjb25z dDsKICNlbmRpZgogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJv L0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fp cm8vR3JhcGhpY3NDb250ZXh0Q2Fpcm8uY3BwCmluZGV4IDljMmZmODIuLmE3MThmMjcgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0Q2Fp cm8uY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250 ZXh0Q2Fpcm8uY3BwCkBAIC0xMDg1LDEyICsxMDg1LDEyIEBAIEdka0V2ZW50RXhwb3NlKiBHcmFw aGljc0NvbnRleHQ6Omdka0V4cG9zZUV2ZW50KCkgY29uc3QKICAgICByZXR1cm4gbV9kYXRhLT5l eHBvc2U7CiB9CiAKLUdka0RyYXdhYmxlKiBHcmFwaGljc0NvbnRleHQ6Omdka0RyYXdhYmxlKCkg Y29uc3QKK0dka1dpbmRvdyogR3JhcGhpY3NDb250ZXh0OjpnZGtXaW5kb3coKSBjb25zdAogewog ICAgIGlmICghbV9kYXRhLT5leHBvc2UpCiAgICAgICAgIHJldHVybiAwOwogCi0gICAgcmV0dXJu IEdES19EUkFXQUJMRShtX2RhdGEtPmV4cG9zZS0+d2luZG93KTsKKyAgICByZXR1cm4gbV9kYXRh LT5leHBvc2UtPndpbmRvdzsKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRm b3JtL2d0ay9HdGtWZXJzaW9uaW5nLmggYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9u aW5nLmgKaW5kZXggZWExNWE1NC4uOWMzOGFiYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9y bS9ndGsvR3RrVmVyc2lvbmluZy5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNp b25pbmcuaApAQCAtMzIsNiArMzIsNyBAQCBHX0JFR0lOX0RFQ0xTCiAvLyBNYWNyb3MgdG8gYXZv aWQgZGVwcmVjYXRpb24gY2hlY2tpbmcgY2h1cm4KICNpZm5kZWYgR1RLX0FQSV9WRVJTSU9OXzIK ICNkZWZpbmUgR0RLX0RJU1BMQVkoKSAoR0RLX0RJU1BMQVlfWERJU1BMQVkoZ2RrX2Rpc3BsYXlf Z2V0X2RlZmF1bHQoKSkpCisjZGVmaW5lIEdES19XSU5ET1dfWFdJTkRPVyh3aW5kb3cpIChnZGtf eDExX3dpbmRvd19nZXRfeGlkKHdpbmRvdykpCiAjZWxzZQogR2RrUGl4YnVmKiBnZGtfcGl4YnVm X2dldF9mcm9tX3N1cmZhY2UoY2Fpcm9fc3VyZmFjZV90KiBzdXJmYWNlLCBpbnQgc3JjWCwgaW50 IHNyY1ksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgd2lkdGgs IGludCBoZWlnaHQpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1T Y3JlZW5HdGsuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsuY3Bw CmluZGV4IDljNzBkMGUuLjQwYjUwOWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L1BsYXRmb3JtU2NyZWVuR3RrLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QbGF0Zm9y bVNjcmVlbkd0ay5jcHAKQEAgLTEyMSw3ICsxMjEsNyBAQCBGbG9hdFJlY3Qgc2NyZWVuQXZhaWxh YmxlUmVjdChXaWRnZXQqIHdpZGdldCkKICAgICBpZiAoIWd0a193aWRnZXRfZ2V0X3JlYWxpemVk KGNvbnRhaW5lcikpCiAgICAgICAgIHJldHVybiBzY3JlZW5SZWN0KHdpZGdldCk7CiAKLSAgICBH ZGtEcmF3YWJsZSogcm9vdFdpbmRvdyA9IEdES19EUkFXQUJMRShndGtfd2lkZ2V0X2dldF9yb290 X3dpbmRvdyhjb250YWluZXIpKTsKKyAgICBHZGtXaW5kb3cqIHJvb3RXaW5kb3cgPSBndGtfd2lk Z2V0X2dldF9yb290X3dpbmRvdyhjb250YWluZXIpOwogICAgIEdka0Rpc3BsYXkqIGRpc3BsYXkg PSBnZGtfd2luZG93X2dldF9kaXNwbGF5KHJvb3RXaW5kb3cpOwogICAgIEF0b20geHByb3BlcnR5 ID0gZ2RrX3gxMV9nZXRfeGF0b21fYnlfbmFtZV9mb3JfZGlzcGxheShkaXNwbGF5LCAiX05FVF9X T1JLQVJFQSIpOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9XaWRnZXRHdGsu Y3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvV2lkZ2V0R3RrLmNwcAppbmRleCBkYjMxNmQ1Li5l ZTEwMDVjIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9XaWRnZXRHdGsuY3BwCisr KyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1dpZGdldEd0ay5jcHAKQEAgLTYwLDcgKzYwLDcgQEAg dm9pZCBXaWRnZXQ6OnNldEZvY3VzKGJvb2wgZm9jdXNlZCkKICAgICAgICAgZ3RrX3dpZGdldF9n cmFiX2ZvY3VzKHBsYXRmb3JtV2lkZ2V0KCkgPyBwbGF0Zm9ybVdpZGdldCgpIDogR1RLX1dJREdF VChyb290KCktPmhvc3RXaW5kb3coKS0+cGxhdGZvcm1QYWdlQ2xpZW50KCkpKTsKIH0KIAotc3Rh dGljIEdka0RyYXdhYmxlKiBnZGtEcmF3YWJsZShQbGF0Zm9ybVdpZGdldCB3aWRnZXQpCitzdGF0 aWMgR2RrV2luZG93KiBnZGtXaW5kb3coUGxhdGZvcm1XaWRnZXQgd2lkZ2V0KQogewogICAgIHJl dHVybiB3aWRnZXQgPyBndGtfd2lkZ2V0X2dldF93aW5kb3cod2lkZ2V0KSA6IDA7CiB9CkBAIC03 OCw3ICs3OCw3IEBAIHZvaWQgV2lkZ2V0OjpzZXRDdXJzb3IoY29uc3QgQ3Vyc29yJiBjdXJzb3Ip CiAgICAgaWYgKHBsYXRmb3JtQ3Vyc29yID09IGxhc3RTZXRDdXJzb3IpCiAgICAgICAgIHJldHVy bjsKIAotICAgIGdka193aW5kb3dfc2V0X2N1cnNvcihnZGtEcmF3YWJsZShwbGF0Zm9ybVdpZGdl dCgpKSA/IEdES19XSU5ET1coZ2RrRHJhd2FibGUocGxhdGZvcm1XaWRnZXQoKSkpIDogZ3RrX3dp ZGdldF9nZXRfd2luZG93KEdUS19XSURHRVQocm9vdCgpLT5ob3N0V2luZG93KCktPnBsYXRmb3Jt UGFnZUNsaWVudCgpKSksIHBsYXRmb3JtQ3Vyc29yKTsKKyAgICBnZGtfd2luZG93X3NldF9jdXJz b3IoZ2RrV2luZG93KHBsYXRmb3JtV2lkZ2V0KCkpID8gZ2RrV2luZG93KHBsYXRmb3JtV2lkZ2V0 KCkpIDogZ3RrX3dpZGdldF9nZXRfd2luZG93KEdUS19XSURHRVQocm9vdCgpLT5ob3N0V2luZG93 KCktPnBsYXRmb3JtUGFnZUNsaWVudCgpKSksIHBsYXRmb3JtQ3Vyc29yKTsKICAgICBsYXN0U2V0 Q3Vyc29yID0gcGxhdGZvcm1DdXJzb3I7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL1dpZGdldFJlbmRlcmluZ0NvbnRleHRHdGsyLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0v Z3RrL1dpZGdldFJlbmRlcmluZ0NvbnRleHRHdGsyLmNwcAppbmRleCBiODcxMmQyLi40ZmJkZjU5 IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9XaWRnZXRSZW5kZXJpbmdDb250ZXh0 R3RrMi5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvV2lkZ2V0UmVuZGVyaW5nQ29udGV4 dEd0azIuY3BwCkBAIC04OCwxMCArODgsMTAgQEAgV2lkZ2V0UmVuZGVyaW5nQ29udGV4dDo6V2lk Z2V0UmVuZGVyaW5nQ29udGV4dChHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29udGV4dCwKIAog ICAgIC8vIEZhbGxiYWNrOiBXZSBmYWlsZWQgdG8gY3JlYXRlIGFuIFJHQkEgY29sb3JtYXAgZWFy bGllciwgc28gd2UgY2Fubm90IHByb3Blcmx5IHBhaW50IAogICAgIC8vIHRvIGEgdGVtcG9yYXJ5 IHN1cmZhY2UgYW5kIHByZXNlcnZlIHRyYW5zcGFyZW5jeS4gVG8gZW5zdXJlIGRlY2VudCB3aWRn ZXQgcmVuZGVyaW5nLCBqdXN0Ci0gICAgLy8gcGFpbnQgZGlyZWN0bHkgdG8gdGhlIHRhcmdldCBk cmF3YWJsZS4gVGhpcyB3aWxsIG5vdCByZW5kZXIgQ1NTIHJvdGF0aW9uYWwgdHJhbnNmb3JtcyBw cm9wZXJseS4KLSAgICBpZiAoIXRoZW1lLT5tX3RoZW1lUGFydHNIYXZlUkdCQUNvbG9ybWFwICYm IGdyYXBoaWNzQ29udGV4dC0+Z2RrRHJhd2FibGUoKSkgeworICAgIC8vIHBhaW50IGRpcmVjdGx5 IHRvIHRoZSB0YXJnZXQgd2luZG93LiBUaGlzIHdpbGwgbm90IHJlbmRlciBDU1Mgcm90YXRpb25h bCB0cmFuc2Zvcm1zIHByb3Blcmx5LgorICAgIGlmICghdGhlbWUtPm1fdGhlbWVQYXJ0c0hhdmVS R0JBQ29sb3JtYXAgJiYgZ3JhcGhpY3NDb250ZXh0LT5nZGtXaW5kb3coKSkgewogICAgICAgICBt X3BhaW50UmVjdCA9IGdyYXBoaWNzQ29udGV4dC0+Z2V0Q1RNKCkubWFwUmVjdCh0YXJnZXRSZWN0 KTsKLSAgICAgICAgbV90YXJnZXQgPSBncmFwaGljc0NvbnRleHQtPmdka0RyYXdhYmxlKCk7Cisg ICAgICAgIG1fdGFyZ2V0ID0gZ3JhcGhpY3NDb250ZXh0LT5nZGtXaW5kb3coKTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KIApAQCAtMTMxLDcgKzEzMSw3IEBAIFdpZGdldFJlbmRlcmluZ0NvbnRl eHQ6On5XaWRnZXRSZW5kZXJpbmdDb250ZXh0KCkKIHsKICAgICAvLyBXZSBkbyBub3QgbmVlZCB0 byBibGl0IGJhY2sgdG8gdGhlIHRhcmdldCBpbiB0aGUgZmFsbGJhY2sgY2FzZS4gU2VlIGFib3Zl LgogICAgIFJlbmRlclRoZW1lR3RrKiB0aGVtZSA9IHN0YXRpY19jYXN0PFJlbmRlclRoZW1lR3Rr Kj4oUmVuZGVyVGhlbWU6OmRlZmF1bHRUaGVtZSgpLmdldCgpKTsKLSAgICBpZiAoIXRoZW1lLT5t X3RoZW1lUGFydHNIYXZlUkdCQUNvbG9ybWFwICYmIG1fZ3JhcGhpY3NDb250ZXh0LT5nZGtEcmF3 YWJsZSgpKQorICAgIGlmICghdGhlbWUtPm1fdGhlbWVQYXJ0c0hhdmVSR0JBQ29sb3JtYXAgJiYg bV9ncmFwaGljc0NvbnRleHQtPmdka1dpbmRvdygpKQogICAgICAgICByZXR1cm47CiAKICAgICAv LyBEb24ndCBwYWludCB0aGUgcmVzdWx0cyBiYWNrIGlmIHRoZXJlIHdhcyBhbiBlcnJvci4KLS0g CjEuNy4yLjMKCg==