60442 2011-05-07 16:58:13 -0700 REGRESSION (r85795): platform/win/plugins/window-geometry-initialized-before-set-window.html and platform/win/plugins/window-region-is-set-to-clip-rect.html failing on Windows 7 Release (WebKit2 Tests) 2011-05-10 10:53:27 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All Windows 7 RESOLVED FIXED InRadar, LayoutTestFailure, PlatformOnly, Regression P2 Normal --- 1 jberlin webkit-unassigned abarth andersca aroben darin eric jberlin webkit.review.bot oldest_to_newest 400131 0 jberlin 2011-05-07 16:58:13 -0700 http://trac.webkit.org/changeset/85795 http://build.webkit.org/results/Windows%207%20Release%20(WebKit2%20Tests)/r85794%20(6495)/results.html http://build.webkit.org/results/Windows%207%20Release%20(WebKit2%20Tests)/r85795%20(6496)/results.html 400141 1 jberlin 2011-05-07 17:58:40 -0700 I am going to commit the expected failing results in order to get the bots green. 400151 2 jberlin 2011-05-07 18:35:18 -0700 Committed the expected failing results in http://trac.webkit.org/changeset/86019 400153 3 jberlin 2011-05-07 18:35:44 -0700 <rdar://problem/9403200> 400467 4 aroben 2011-05-09 06:03:18 -0700 Big ol' fail on my part. Thanks for cleaning up the mess, Jessie. I'll look into these failures today. 400482 5 aroben 2011-05-09 06:55:57 -0700 I think we can relax these tests such that they still pass in WebKit2 and would start failing if either of the bugs they are tests for were reintroduced. At this point I see no evidence that they are indicative of real-world bugs in WebKit2. 401198 6 aroben 2011-05-10 07:55:38 -0700 platform/win/plugins/window-geometry-initialized-before-set-window.html is easy to fix. We should just check the window's size and stop caring about its position. platform/win/plugins/window-region-is-set-to-clip-rect.html is harder. In WebKit2, the plugin window's region won't be set until the UI process paints. But we don't have a good way to wait for that to happen, or to ensure that it happens in a certain order. 401220 7 aroben 2011-05-10 08:32:12 -0700 (In reply to comment #6) > platform/win/plugins/window-region-is-set-to-clip-rect.html is harder. In WebKit2, the plugin window's region won't be set until the UI process paints. But we don't have a good way to wait for that to happen, or to ensure that it happens in a certain order. A timer seems to work around the issue. (Lame!) 401225 8 92959 aroben 2011-05-10 08:44:06 -0700 Created attachment 92959 Update some plugin tests to work with WebKit2's asynchronous windowed plugin positioning on Windows 401231 9 aroben 2011-05-10 08:53:12 -0700 Committed r86157: <http://trac.webkit.org/changeset/86157> 401333 10 webkit.review.bot 2011-05-10 10:53:27 -0700 http://trac.webkit.org/changeset/86157 might have broken SnowLeopard Intel Release (WebKit2 Tests) The following tests are not passing: fast/frames/flattening/frameset-flattening-subframesets.html 92959 2011-05-10 08:44:06 -0700 2011-05-10 08:46:50 -0700 Update some plugin tests to work with WebKit2's asynchronous windowed plugin positioning on Windows bug-60442-20110510114420.patch text/plain 20379 aroben U3VidmVyc2lvbiBSZXZpc2lvbjogODYxNTAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBiODEzOTM1YTBmODQwODAxODA1NWEz NjQ5MWNkMTZlMzA3M2EyYmI3Li41MmIwZTNmZjJkNzUxYzM0N2FjZjNhODVlYWUwYzIzOGE5OWJj NjQwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDUtMTAgIEFkYW0gUm9iZW4gIDxhcm9i ZW5AYXBwbGUuY29tPgorCisgICAgICAgIFVwZGF0ZSBzb21lIHBsdWdpbiB0ZXN0cyB0byB3b3Jr IHdpdGggV2ViS2l0MidzIGFzeW5jaHJvbm91cyB3aW5kb3dlZCBwbHVnaW4gcG9zaXRpb25pbmcg b24gV2luZG93cworCisgICAgICAgIEZpeGVzIDxodHRwOi8vd2Via2l0Lm9yZy9iLzYwNDQyPiA8 cmRhcjovL3Byb2JsZW0vOTQwMzIwMD4gUkVHUkVTU0lPTiAocjg1Nzk1KToKKyAgICAgICAgcGxh dGZvcm0vd2luL3BsdWdpbnMvd2luZG93LWdlb21ldHJ5LWluaXRpYWxpemVkLWJlZm9yZS1zZXQt d2luZG93Lmh0bWwgYW5kCisgICAgICAgIHBsYXRmb3JtL3dpbi9wbHVnaW5zL3dpbmRvdy1yZWdp b24taXMtc2V0LXRvLWNsaXAtcmVjdC5odG1sIGZhaWxpbmcgb24gV2luZG93cyA3IFJlbGVhc2UK KyAgICAgICAgKFdlYktpdDIgVGVzdHMpCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vcGx1Z2lucy93aW5kb3ctZ2VvbWV0cnkt aW5pdGlhbGl6ZWQtYmVmb3JlLXNldC13aW5kb3ctZXhwZWN0ZWQudHh0OiBVcGRhdGVkCisgICAg ICAgIGZvciBuZXcgdGVzdCBvdXRwdXQgdGhhdCBkb2Vzbid0IGNsYWltIGFueXRoaW5nIGFib3V0 IHRoZSB3aW5kb3cncyBwb3NpdGlvbi4KKworICAgICAgICAqIHBsYXRmb3JtL3dpbi9wbHVnaW5z L3dpbmRvdy1yZWdpb24taXMtc2V0LXRvLWNsaXAtcmVjdC5odG1sOiBIaWRlIHRoZSBwbHVnaW4g aW5pdGlhbGx5LAorICAgICAgICBhbmQgdGVsbCB0aGUgcGx1Z2luIHdoZW4gdGhlIGxvYWQgZXZl bnQgaGFzIGZpcmVkLgorCisgICAgICAgICogcGxhdGZvcm0vd2luLXdrMi9wbGF0Zm9ybS93aW4v cGx1Z2lucy93aW5kb3ctZ2VvbWV0cnktaW5pdGlhbGl6ZWQtYmVmb3JlLXNldC13aW5kb3ctZXhw ZWN0ZWQudHh0OiBSZW1vdmVkLgorICAgICAgICAqIHBsYXRmb3JtL3dpbi13azIvcGxhdGZvcm0v d2luL3BsdWdpbnMvd2luZG93LXJlZ2lvbi1pcy1zZXQtdG8tY2xpcC1yZWN0LWV4cGVjdGVkLnR4 dDogUmVtb3ZlZC4KKwogMjAxMS0wNS0xMCAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJr aXQub3JnPgogCiAgICAgICAgIE9uZSBtb3JlIHVucmV2aWV3ZWQgdHlwbyBmaXggYWZ0ZXIgcjg2 MTQ4LiA6KApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL3BsdWdpbnMvd2lu ZG93LWdlb21ldHJ5LWluaXRpYWxpemVkLWJlZm9yZS1zZXQtd2luZG93LWV4cGVjdGVkLnR4dCBi L0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9wbHVnaW5zL3dpbmRvdy1nZW9tZXRyeS1pbml0aWFs aXplZC1iZWZvcmUtc2V0LXdpbmRvdy1leHBlY3RlZC50eHQKaW5kZXggYmQ4NTEwZTgwYTEwZGYw ZjY4ODVhM2YzZGQwZjdmZGI4M2Q5ZGYwNy4uYWExNzA1NWZmYTAxYmM0ZmRmYjZmYTBjYTkxODYz NGFhMjExZmFiYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL3BsdWdpbnMv d2luZG93LWdlb21ldHJ5LWluaXRpYWxpemVkLWJlZm9yZS1zZXQtd2luZG93LWV4cGVjdGVkLnR4 dAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vcGx1Z2lucy93aW5kb3ctZ2VvbWV0cnkt aW5pdGlhbGl6ZWQtYmVmb3JlLXNldC13aW5kb3ctZXhwZWN0ZWQudHh0CkBAIC0xLDMgKzEsMyBA QAotQ09OU09MRSBNRVNTQUdFOiBsaW5lIDA6IFBMVUdJTjogUGx1Z2luJ3MgSFdORCBoYXMgYmVl biBzaXplZCBhbmQgcG9zaXRpb25lZCBiZWZvcmUgTlBQX1NldFdpbmRvdyB3YXMgY2FsbGVkCitD T05TT0xFIE1FU1NBR0U6IGxpbmUgMDogUExVR0lOOiBQbHVnaW4ncyBIV05EIGhhcyBiZWVuIHNp emVkIGJlZm9yZSBOUFBfU2V0V2luZG93IHdhcyBjYWxsZWQKIAogVGhpcyB0ZXN0cyB0aGF0IGEg cGx1Z2luJ3MgSFdORCBpcyBhbHJlYWR5IHNpemVkIGFuZCBwb3NpdGlvbmVkIGJlZm9yZSBOUFBf U2V0V2luZG93IGlzIGNhbGxlZC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3dp bi9wbHVnaW5zL3dpbmRvdy1yZWdpb24taXMtc2V0LXRvLWNsaXAtcmVjdC5odG1sIGIvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vd2luL3BsdWdpbnMvd2luZG93LXJlZ2lvbi1pcy1zZXQtdG8tY2xpcC1y ZWN0Lmh0bWwKaW5kZXggZWFkN2Q5ZWE4NTliODJiMTJhYWI5YmU0YTM5NTc1NzA5ZTcyYjVmYi4u OTZhNWQyNDI3M2M2YWM2M2VjNzA3YmUxYzk4NTBiMzhmY2ZlODRmMiAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vd2luL3BsdWdpbnMvd2luZG93LXJlZ2lvbi1pcy1zZXQtdG8tY2xp cC1yZWN0Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL3BsdWdpbnMvd2luZG93 LXJlZ2lvbi1pcy1zZXQtdG8tY2xpcC1yZWN0Lmh0bWwKQEAgLTQsNiArNCw3IEBACiAgICAgPHNj cmlwdD4KICAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKICAgICAgICAg ICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKyAgICAgICAgYWRkRXZlbnRM aXN0ZW5lcignbG9hZCcsIGZ1bmN0aW9uKCkgeyBkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFt ZSgnZW1iZWQnKVswXS5zdGFydFRlc3QoKSB9LCBmYWxzZSk7CiAgICAgPC9zY3JpcHQ+CiAgICAg PHN0eWxlPgogICAgICAgICAjY29udGFpbmVyIHsKQEAgLTE2LDYgKzE3LDcgQEAKICAgICAgICAg ICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKICAgICAgICAgICAgIHRvcDogLTUwcHg7CiAgICAgICAg ICAgICBsZWZ0OiAtNTBweDsKKyAgICAgICAgICAgIHZpc2liaWxpdHk6IGhpZGRlbjsKICAgICAg ICAgfQogICAgIDwvc3R5bGU+CiA8L2hlYWQ+CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTczNzhlNTAyYjVhM2EzZDY5MzQzMGMzNjUxYjYyZDc0 YmI0ODJkNC4uY2Q0OTA1Yzk1MGNmNDlhMjM2YTlkM2Y3M2RmMTVmOTIwNjBmNGM1ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUx IEBACisyMDExLTA1LTEwICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KKworICAgICAg ICBVcGRhdGUgc29tZSBwbHVnaW4gdGVzdHMgdG8gd29yayB3aXRoIFdlYktpdDIncyBhc3luY2hy b25vdXMgd2luZG93ZWQgcGx1Z2luIHBvc2l0aW9uaW5nIG9uIFdpbmRvd3MKKworICAgICAgICBG aXhlcyA8aHR0cDovL3dlYmtpdC5vcmcvYi82MDQ0Mj4gPHJkYXI6Ly9wcm9ibGVtLzk0MDMyMDA+ IFJFR1JFU1NJT04gKHI4NTc5NSk6CisgICAgICAgIHBsYXRmb3JtL3dpbi9wbHVnaW5zL3dpbmRv dy1nZW9tZXRyeS1pbml0aWFsaXplZC1iZWZvcmUtc2V0LXdpbmRvdy5odG1sIGFuZAorICAgICAg ICBwbGF0Zm9ybS93aW4vcGx1Z2lucy93aW5kb3ctcmVnaW9uLWlzLXNldC10by1jbGlwLXJlY3Qu aHRtbCBmYWlsaW5nIG9uIFdpbmRvd3MgNyBSZWxlYXNlCisgICAgICAgIChXZWJLaXQyIFRlc3Rz KQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRHVt cFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL1Rlc3RzL3dpbi9OUE5JbnZhbGlkYXRlUmVj dEludmFsaWRhdGVzV2luZG93LmNwcDoKKyAgICAgICAgKE5QTkludmFsaWRhdGVSZWN0SW52YWxp ZGF0ZXNXaW5kb3c6Ok5QUF9TZXRXaW5kb3cpOiBNb3ZlZCBzb21lIGNvZGUgZnJvbSBoZXJlIHRv IHRoZSBuZXcKKyAgICAgICAgV2luZG93ZWRQbHVnaW5UZXN0Ojp0ZXN0SGFybmVzc1dpbmRvdyBm dW5jdGlvbi4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi9U ZXN0cy93aW4vV2luZG93R2VvbWV0cnlJbml0aWFsaXplZEJlZm9yZVNldFdpbmRvdy5jcHA6Cisg ICAgICAgIChXaW5kb3dHZW9tZXRyeUluaXRpYWxpemVkQmVmb3JlU2V0V2luZG93OjpOUFBfU2V0 V2luZG93KTogT25seSBjaGVjayB0aGUgd2luZG93J3Mgc2l6ZSwgbm90CisgICAgICAgIGl0cyBw b3NpdGlvbi4gSW4gV2ViS2l0MiwgdGhlIHBvc2l0aW9uIHdvbid0IGhhdmUgYmVlbiBzZXQgeWV0 LCBzbyB3ZSBjYW4ndCB0ZXN0IGl0LiBCdXQgaXQKKyAgICAgICAgdHVybnMgb3V0IG9ubHkgdGhl IHNpemUgbWF0dGVyZWQgZm9yIDxodHRwOi8vd2Via2l0Lm9yZy9iLzQ2NzE2Piwgd2hpY2ggdGhp cyB0ZXN0IHdhcworICAgICAgICBjcmVhdGVkIGZvci4KKworICAgICAgICAqIER1bXBSZW5kZXJU cmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi9UZXN0cy93aW4vV2luZG93UmVnaW9uSXNTZXRUb0NsaXBS ZWN0LmNwcDoKKyAgICAgICAgKFdpbmRvd1JlZ2lvbklzU2V0VG9DbGlwUmVjdDo6V2luZG93UmVn aW9uSXNTZXRUb0NsaXBSZWN0KTogQ29udmVydGVkIHRvIGJlIGEKKyAgICAgICAgV2luZG93ZWRQ bHVnaW5UZXN0LCBhbmQgaW5pdGlhbGl6ZWQgbmV3IG1lbWJlcnMuCisgICAgICAgIChXaW5kb3dS ZWdpb25Jc1NldFRvQ2xpcFJlY3Q6OnN0YXJ0VGVzdCk6IE1ha2Ugb3VyIHBsdWdpbiB3aW5kb3cg dmlzaWJsZSwgYW5kIHNldCB0aGluZ3MgdXAKKyAgICAgICAgdG8gZW5zdXJlIHdlIGdldCBhIFdN X1dJTkRPV1BPU0NIQU5HRUQgbWVzc2FnZSBhYm91dCBpdCBiZWNvbWluZyB2aXNpYmxlLgorICAg ICAgICAoV2luZG93UmVnaW9uSXNTZXRUb0NsaXBSZWN0OjpmaW5pc2hUZXN0KTogQ2hlY2sgdGhh dCB0aGUgd2luZG93IHJlZ2lvbiBpcyB3aGF0IHdlIGV4cGVjdCwKKyAgICAgICAgdGhlbiBjbGVh biB1cCBhbmQgdGVsbCB0aGUgdGVzdCBoYXJuZXNzIHdlJ3JlIGRvbmUuCisgICAgICAgIChXaW5k b3dSZWdpb25Jc1NldFRvQ2xpcFJlY3Q6OmNoZWNrV2luZG93UmVnaW9uKTogTW92ZWQgY29kZSB0 byBjaGVjayB0aGUgd2luZG93IHJlZ2lvbiBoZXJlCisgICAgICAgIGZyb20gTlBQX1NldFdpbmRv dy4gQ2hhbmdlZCB0byB1c2UgdGhlIGZhbmN5IG5ldyBsb2coKSBmdW5jdGlvbiBpbnN0ZWFkIG9m IHBsdWdpbkxvZygpLgorICAgICAgICAoV2luZG93UmVnaW9uSXNTZXRUb0NsaXBSZWN0OjpzaG93 VGVzdEhhcm5lc3NXaW5kb3dJZk5lZWRlZCk6IFNob3cgdGhlIHRlc3QgaGFybmVzcydzIHdpbmRv dworICAgICAgICBpZiBpdCBpcyBoaWRkZW4uIFRoaXMgaXMgbmVlZGVkIHRvIGVuc3VyZSB3ZSBn ZXQgYSBXTV9XSU5ET1dQT1NDSEFOR0VEIG1lc3NhZ2Ugd2hlbiBvdXIgb3duCisgICAgICAgIHdp bmRvdyBiZWNvbWVzIHZpc2libGUuCisgICAgICAgIChXaW5kb3dSZWdpb25Jc1NldFRvQ2xpcFJl Y3Q6OmhpZGVUZXN0SGFybmVzc1dpbmRvd0lmTmVlZGVkKTogSGlkZSB0aGUgdGVzdCBoYXJuZXNz J3Mgd2luZG93CisgICAgICAgIGlmIGl0IHdhcyBoaWRkZW4gYXQgdGhlIHN0YXJ0IG9mIHRoZSB0 ZXN0LgorICAgICAgICAoV2luZG93UmVnaW9uSXNTZXRUb0NsaXBSZWN0Ojp3bmRQcm9jKTogV2hl biBvdXIgdGltZXIgZmlyZXMsIHRlbGwgdGhlIFVJIHByb2Nlc3MgdG8gcGFpbnQuCisgICAgICAg IFRoaXMgc2hvdWxkIGNhdXNlIG91ciB3aW5kb3cgdG8gYmVjb21lIHZpc2libGUgYW5kIG91ciB3 aW5kb3cgcmVnaW9uIHRvIGdldCBzZXQuIFdoZW4gd2UgZ2V0CisgICAgICAgIGEgV01fV0lORE9X UE9TQ0hBTkdFRCBtZXNzYWdlLCB3ZSBjYW4gZmluYWxseSBmaW5pc2ggdGhlIHRlc3QuCisgICAg ICAgIChXaW5kb3dSZWdpb25Jc1NldFRvQ2xpcFJlY3Q6Ok5QUF9HZXRWYWx1ZSk6IFJldHVybiBv dXIgc2NyaXB0IG9iamVjdC4KKyAgICAgICAgKFdpbmRvd1JlZ2lvbklzU2V0VG9DbGlwUmVjdDo6 U2NyaXB0T2JqZWN0OjpoYXNNZXRob2QpOiBXZSBvbmx5IGhhdmUgb25lIG1ldGhvZDoKKyAgICAg ICAgInN0YXJ0VGVzdCIuCisgICAgICAgIChXaW5kb3dSZWdpb25Jc1NldFRvQ2xpcFJlY3Q6OlNj cmlwdE9iamVjdDo6aW52b2tlKTogQ2FsbCB0aHJvdWdoIHRvIHRoZSBQbHVnaW5UZXN0IG9iamVj dC4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi93aW4vV2lu ZG93ZWRQbHVnaW5UZXN0LmNwcDoKKyAgICAgICAgKFdpbmRvd2VkUGx1Z2luVGVzdDo6dGVzdEhh cm5lc3NXaW5kb3cpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJ bi93aW4vV2luZG93ZWRQbHVnaW5UZXN0Lmg6CisgICAgICAgIEFkZGVkIHRoaXMgaGVscGVyIGZ1 bmN0aW9uLiBDb2RlIGNhbWUgZnJvbSBOUE5JbnZhbGlkYXRlUmVjdEludmFsaWRhdGVzV2luZG93 LgorCiAyMDExLTA1LTEwICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCmRpZmYgLS1n aXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4vVGVzdHMvd2luL05Q TkludmFsaWRhdGVSZWN0SW52YWxpZGF0ZXNXaW5kb3cuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRy ZWUvVGVzdE5ldHNjYXBlUGx1Z0luL1Rlc3RzL3dpbi9OUE5JbnZhbGlkYXRlUmVjdEludmFsaWRh dGVzV2luZG93LmNwcAppbmRleCBlNTk4YzQ5M2ZmMWRmY2E3NWI5MDliMGE2Y2NlZDhkZjgwYTQ0 N2QwLi42ZDU0ODRiMWYyNWJjMjQ5ZWY3YTRkZTE0ZmJjZThmM2JhNDc4YzFhIDEwMDY0NAotLS0g YS9Ub29scy9EdW1wUmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4vVGVzdHMvd2luL05QTklu dmFsaWRhdGVSZWN0SW52YWxpZGF0ZXNXaW5kb3cuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi9UZXN0cy93aW4vTlBOSW52YWxpZGF0ZVJlY3RJbnZhbGlk YXRlc1dpbmRvdy5jcHAKQEAgLTEwOSw3ICsxMDksNyBAQCBOUEVycm9yIE5QTkludmFsaWRhdGVS ZWN0SW52YWxpZGF0ZXNXaW5kb3c6Ok5QUF9TZXRXaW5kb3coTlBQIGluc3RhbmNlLCBOUFdpbmRv dwogICAgIC8vIFdlIG5lZWQgdG8gbW92ZSBpdCBvbi1zY3JlZW4gYW5kIG1ha2UgaXQgdmlzaWJs ZSBpbiBvcmRlciBmb3IgdGhlIHBsdWdpbidzIHdpbmRvdyB0bwogICAgIC8vIGFjY3VtdWxhdGUg YW4gdXBkYXRlIHJlZ2lvbiB3aGVuIHRoZSBEV00gaXMgZGlzYWJsZWQuCiAKLSAgICBIV05EIHRl c3RIYXJuZXNzV2luZG93ID0gOjpHZXRBbmNlc3Rvcih3aW5kb3coKSwgR0FfUk9PVCk7CisgICAg SFdORCB0ZXN0SGFybmVzc1dpbmRvdyA9IHRoaXMtPnRlc3RIYXJuZXNzV2luZG93KCk7CiAgICAg aWYgKCF0ZXN0SGFybmVzc1dpbmRvdykgewogICAgICAgICBwbHVnaW5Mb2coaW5zdGFuY2UsICJG YWlsZWQgdG8gZ2V0IHRlc3QgaGFybmVzcyB3aW5kb3ciKTsKICAgICAgICAgcmV0dXJuIE5QRVJS X0dFTkVSSUNfRVJST1I7CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9UZXN0TmV0 c2NhcGVQbHVnSW4vVGVzdHMvd2luL1dpbmRvd0dlb21ldHJ5SW5pdGlhbGl6ZWRCZWZvcmVTZXRX aW5kb3cuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL1Rlc3Rz L3dpbi9XaW5kb3dHZW9tZXRyeUluaXRpYWxpemVkQmVmb3JlU2V0V2luZG93LmNwcAppbmRleCA4 MDU0NDk3MjQxNDc1OGFmYmUwNTFkM2FiMzdkYTMxODE1OGZlYjFjLi4xYzc1ZDI3YTg3MTQ0NmVk MDExMzcxZmU2N2ExNTNlOWM2NWIxOTVkIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJl ZS9UZXN0TmV0c2NhcGVQbHVnSW4vVGVzdHMvd2luL1dpbmRvd0dlb21ldHJ5SW5pdGlhbGl6ZWRC ZWZvcmVTZXRXaW5kb3cuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2Fw ZVBsdWdJbi9UZXN0cy93aW4vV2luZG93R2VvbWV0cnlJbml0aWFsaXplZEJlZm9yZVNldFdpbmRv dy5jcHAKQEAgLTYzLDI0ICs2MywxMiBAQCBwcml2YXRlOgogICAgICAgICAgICAgcmV0dXJuIE5Q RVJSX0dFTkVSSUNfRVJST1I7CiAgICAgICAgIH0KIAotICAgICAgICBIV05EIHBhcmVudCA9IDo6 R2V0UGFyZW50KGh3bmQpOwotICAgICAgICBpZiAoIXBhcmVudCkgewotICAgICAgICAgICAgcGx1 Z2luTG9nKGluc3RhbmNlLCAiOjpHZXRQYXJlbnQgZmFpbGVkIik7CisgICAgICAgIGlmICgocmVj dC5yaWdodCAtIHJlY3QubGVmdCkgIT0gd2luZG93LT53aWR0aCB8fCAocmVjdC5ib3R0b20gLSBy ZWN0LnRvcCkgIT0gd2luZG93LT5oZWlnaHQpIHsKKyAgICAgICAgICAgIHBsdWdpbkxvZyhpbnN0 YW5jZSwgIlNpemUgb2YgSFdORCdzIHJlY3QgYW5kIHNpemUgb2YgTlBXaW5kb3cncyByZWN0IGFy ZSBub3QgZXF1YWwiKTsKICAgICAgICAgICAgIHJldHVybiBOUEVSUl9HRU5FUklDX0VSUk9SOwog ICAgICAgICB9CiAKLSAgICAgICAgLy8gTVNETiBzYXlzIHRoYXQgY2FsbGluZyA6Ok1hcFdpbmRv d1BvaW50cyB0aGlzIHdheSB3aWxsIHRlbGwgaXQgd2UncmUgcGFzc2luZyBhIFJFQ1QgcmF0aGVy IHRoYW4gdHdvIFBPSU5Ucy4KLSAgICAgICAgaWYgKCE6Ok1hcFdpbmRvd1BvaW50cyhod25kLCBw YXJlbnQsIHJlaW50ZXJwcmV0X2Nhc3Q8UE9JTlQqPigmcmVjdCksIDIpKSB7Ci0gICAgICAgICAg ICBwbHVnaW5Mb2coaW5zdGFuY2UsICI6Ok1hcFdpbmRvd1BvaW50cyBmYWlsZWQiKTsKLSAgICAg ICAgICAgIHJldHVybiBOUEVSUl9HRU5FUklDX0VSUk9SOwotICAgICAgICB9Ci0KLSAgICAgICAg aWYgKHJlY3QubGVmdCAhPSB3aW5kb3ctPnggfHwgcmVjdC50b3AgIT0gd2luZG93LT55IHx8IChy ZWN0LnJpZ2h0IC0gcmVjdC5sZWZ0KSAhPSB3aW5kb3ctPndpZHRoIHx8IChyZWN0LmJvdHRvbSAt IHJlY3QudG9wKSAhPSB3aW5kb3ctPmhlaWdodCkgewotICAgICAgICAgICAgcGx1Z2luTG9nKGlu c3RhbmNlLCAiSFdORCdzIHJlY3QgYW5kIE5QV2luZG93J3MgcmVjdCBhcmUgbm90IGVxdWFsIik7 Ci0gICAgICAgICAgICByZXR1cm4gTlBFUlJfR0VORVJJQ19FUlJPUjsKLSAgICAgICAgfQotCi0g ICAgICAgIHBsdWdpbkxvZyhpbnN0YW5jZSwgIlBsdWdpbidzIEhXTkQgaGFzIGJlZW4gc2l6ZWQg YW5kIHBvc2l0aW9uZWQgYmVmb3JlIE5QUF9TZXRXaW5kb3cgd2FzIGNhbGxlZCIpOworICAgICAg ICBwbHVnaW5Mb2coaW5zdGFuY2UsICJQbHVnaW4ncyBIV05EIGhhcyBiZWVuIHNpemVkIGJlZm9y ZSBOUFBfU2V0V2luZG93IHdhcyBjYWxsZWQiKTsKICAgICAgICAgcmV0dXJuIE5QRVJSX05PX0VS Uk9SOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNj YXBlUGx1Z0luL1Rlc3RzL3dpbi9XaW5kb3dSZWdpb25Jc1NldFRvQ2xpcFJlY3QuY3BwIGIvVG9v bHMvRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL1Rlc3RzL3dpbi9XaW5kb3dSZWdp b25Jc1NldFRvQ2xpcFJlY3QuY3BwCmluZGV4IDk3NWE1OTgyZWE1ODhiZTgyYjAyMWE4OGNmODI0 ZmFiNGRhOTI2MWEuLjc0MTBmZDA0M2I3MGM3NmYwZDk0NjY4YzQxZWUyYjgxZGFhYjUyYTQgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi9UZXN0cy93 aW4vV2luZG93UmVnaW9uSXNTZXRUb0NsaXBSZWN0LmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVy VHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4vVGVzdHMvd2luL1dpbmRvd1JlZ2lvbklzU2V0VG9DbGlw UmVjdC5jcHAKQEAgLTIzLDcgKzIzLDcgQEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERB TUFHRS4KICAqLwogCi0jaW5jbHVkZSAiUGx1Z2luVGVzdC5oIgorI2luY2x1ZGUgIldpbmRvd2Vk UGx1Z2luVGVzdC5oIgogCiAjaW5jbHVkZSAiUGx1Z2luT2JqZWN0LmgiCiAKQEAgLTMxLDUxICsz MSw5NiBAQCB1c2luZyBuYW1lc3BhY2Ugc3RkOwogCiAvLyBUaGUgcGx1Z2luJ3Mgd2luZG93J3Mg d2luZG93IHJlZ2lvbiBzaG91bGQgYmUgc2V0IHRvIHRoZSBwbHVnaW4ncyBjbGlwIHJlY3QuCiAK LWNsYXNzIFdpbmRvd1JlZ2lvbklzU2V0VG9DbGlwUmVjdCA6IHB1YmxpYyBQbHVnaW5UZXN0IHsK K2NsYXNzIFdpbmRvd1JlZ2lvbklzU2V0VG9DbGlwUmVjdCA6IHB1YmxpYyBXaW5kb3dlZFBsdWdp blRlc3QgewogcHVibGljOgogICAgIFdpbmRvd1JlZ2lvbklzU2V0VG9DbGlwUmVjdChOUFAsIGNv bnN0IHN0cmluZyYgaWRlbnRpZmllcik7CiAKIHByaXZhdGU6Ci0gICAgdmlydHVhbCBOUEVycm9y IE5QUF9TZXRXaW5kb3coTlBQLCBOUFdpbmRvdyopOworICAgIHN0cnVjdCBTY3JpcHRPYmplY3Qg OiBPYmplY3Q8U2NyaXB0T2JqZWN0PiB7CisgICAgICAgIGJvb2wgaGFzTWV0aG9kKE5QSWRlbnRp Zmllcik7CisgICAgICAgIGJvb2wgaW52b2tlKE5QSWRlbnRpZmllciwgY29uc3QgTlBWYXJpYW50 KiwgdWludDMyX3QsIE5QVmFyaWFudCopOworICAgIH07CiAKLSAgICBib29sIG1fZGlkUmVjZWl2 ZUluaXRpYWxTZXRXaW5kb3dDYWxsOworICAgIHN0YXRpYyBjb25zdCBVSU5UX1BUUiB0cmlnZ2Vy UGFpbnRUaW1lcklEID0gMTsKKworICAgIHZvaWQgc3RhcnRUZXN0KCk7CisgICAgdm9pZCBmaW5p c2hUZXN0KCk7CisgICAgdm9pZCBjaGVja1dpbmRvd1JlZ2lvbigpOworCisgICAgdm9pZCBzaG93 VGVzdEhhcm5lc3NXaW5kb3dJZk5lZWRlZCgpOworICAgIHZvaWQgaGlkZVRlc3RIYXJuZXNzV2lu ZG93SWZOZWVkZWQoKTsKKworICAgIC8vIFdpbmRvd2VkUGx1Z2luVGVzdAorICAgIHZpcnR1YWwg TFJFU1VMVCB3bmRQcm9jKFVJTlQgbWVzc2FnZSwgV1BBUkFNLCBMUEFSQU0sIGJvb2wmIGhhbmRs ZWQpOworCisgICAgLy8gUGx1Z2luVGVzdAorICAgIHZpcnR1YWwgTlBFcnJvciBOUFBfR2V0VmFs dWUoTlBQVmFyaWFibGUsIHZvaWQqKTsKKworICAgIGJvb2wgbV9kaWRDaGVja1dpbmRvd1JlZ2lv bjsKKyAgICBib29sIG1fdGVzdEhhcm5lc3NXaW5kb3dXYXNWaXNpYmxlOwogfTsKIAogc3RhdGlj IFBsdWdpblRlc3Q6OlJlZ2lzdGVyPFdpbmRvd1JlZ2lvbklzU2V0VG9DbGlwUmVjdD4gcmVnaXN0 cmFyKCJ3aW5kb3ctcmVnaW9uLWlzLXNldC10by1jbGlwLXJlY3QiKTsKIAogV2luZG93UmVnaW9u SXNTZXRUb0NsaXBSZWN0OjpXaW5kb3dSZWdpb25Jc1NldFRvQ2xpcFJlY3QoTlBQIG5wcCwgY29u c3Qgc3RyaW5nJiBpZGVudGlmaWVyKQotICAgIDogUGx1Z2luVGVzdChucHAsIGlkZW50aWZpZXIp Ci0gICAgLCBtX2RpZFJlY2VpdmVJbml0aWFsU2V0V2luZG93Q2FsbChmYWxzZSkKKyAgICA6IFdp bmRvd2VkUGx1Z2luVGVzdChucHAsIGlkZW50aWZpZXIpCisgICAgLCBtX2RpZENoZWNrV2luZG93 UmVnaW9uKGZhbHNlKQorICAgICwgbV90ZXN0SGFybmVzc1dpbmRvd1dhc1Zpc2libGUoZmFsc2Up CiB7CiB9CiAKLU5QRXJyb3IgV2luZG93UmVnaW9uSXNTZXRUb0NsaXBSZWN0OjpOUFBfU2V0V2lu ZG93KE5QUCBpbnN0YW5jZSwgTlBXaW5kb3cqIHdpbmRvdykKK3ZvaWQgV2luZG93UmVnaW9uSXNT ZXRUb0NsaXBSZWN0OjpzdGFydFRlc3QoKQogewotICAgIGlmIChtX2RpZFJlY2VpdmVJbml0aWFs U2V0V2luZG93Q2FsbCkKLSAgICAgICAgcmV0dXJuIE5QRVJSX05PX0VSUk9SOwotICAgIG1fZGlk UmVjZWl2ZUluaXRpYWxTZXRXaW5kb3dDYWxsID0gdHJ1ZTsKKyAgICAvLyBJbiBXZWJLaXQxLCBv dXIgd2luZG93J3Mgd2luZG93IHJlZ2lvbiB3aWxsIGJlIHNldCBpbW1lZGlhdGVseS4gSW4gV2Vi S2l0MiwgaXQgd29uJ3QgYmUgc2V0CisgICAgLy8gdW50aWwgdGhlIFVJIHByb2Nlc3MgcGFpbnRz LiBTaW5jZSB0aGUgVUkgcHJvY2VzcyB3aWxsIGFsc28gc2hvdyBvdXIgd2luZG93IHdoZW4gaXQg cGFpbnRzLAorICAgIC8vIHdlIGNhbiBkZXRlY3Qgd2hlbiB0aGUgcGFpbnQgb2NjdXJzIChhbmQg dGh1cyB3aGVuIG91ciB3aW5kb3cgcmVnaW9uIHNob3VsZCBiZSBzZXQpIGJ5CisgICAgLy8gc3Rh cnRpbmcgd2l0aCBvdXIgcGx1Z2luIGVsZW1lbnQgaGlkZGVuLCB0aGVuIG1ha2luZyBpdCB2aXNp YmxlIGFuZCB3YWl0aW5nIGZvciBhCisgICAgLy8gV01fV0lORE9XUE9TQ0hBTkdFRCBldmVudCB0 byB0ZWxsIHVzIG91ciB3aW5kb3cgaGFzIGJlZW4gc2hvd24uCisKKyAgICB3YWl0VW50aWxEb25l KCk7CisKKyAgICAvLyBJZiB0aGUgdGVzdCBoYXJuZXNzIHdpbmRvdyBpc24ndCB2aXNpYmxlLCB3 ZSBtaWdodCBub3QgcmVjZWl2ZSBhIFdNX1dJTkRPV1BPU0NIQU5HRUQgbWVzc2FnZQorICAgIC8v IHdoZW4gb3VyIHdpbmRvdyBpcyBtYWRlIHZpc2libGUuIFNvIHdlIHRlbXBvcmFyaWx5IHNob3cg dGhlIHRlc3QgaGFybmVzcyB3aW5kb3cgZHVyaW5nIHRoaXMgdGVzdC4KKyAgICBzaG93VGVzdEhh cm5lc3NXaW5kb3dJZk5lZWRlZCgpOworCisgICAgLy8gTWFrZSBvdXIgd2luZG93IHZpc2libGUu IChJbiBXZWJLaXQyLCB0aGlzIHdvbid0IHRha2UgZWZmZWN0IGltbWVkaWF0ZWx5LikKKyAgICBl eGVjdXRlU2NyaXB0KCJkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgnZW1iZWQnKVswXS5z dHlsZS52aXNpYmlsaXR5ID0gJ3Zpc2libGUnOyIpOworCisgICAgLy8gV2UgdHJpZ2dlciBhIFVJ IHByb2Nlc3MgcGFpbnQgYWZ0ZXIgYSBzbGlnaHQgZGVsYXkgdG8gZW5zdXJlIHRoYXQgdGhlIFVJ IHByb2Nlc3MgaGFzCisgICAgLy8gcmVjZWl2ZWQgdGhlICJtYWtlIHRoZSBwbHVnaW4gd2luZG93 IHZpc2libGUiIG1lc3NhZ2UgYmVmb3JlIGl0IHBhaW50cy4KKyAgICAvLyBGSVhNRTogSXQgd291 bGQgYmUgbmljZSB0byBoYXZlIGEgd2F5IHRvIGd1YXJhbnRlZSB0aGF0IHRoZSBVSSBwcm9jZXNz IGhhZCByZWNlaXZlZCB0aGF0CisgICAgLy8gbWVzc2FnZSBiZWZvcmUgd2UgdHJpZ2dlcmVkIGEg cGFpbnQuIEhvcGVmdWxseSB0aGF0IHdvdWxkIGxldCB1cyBnZXQgcmlkIG9mIHRoaXMgc2VtaS0K KyAgICAvLyBhcmJpdHJhcnkgdGltZW91dC4KKyAgICA6OlNldFRpbWVyKHdpbmRvdygpLCB0cmln Z2VyUGFpbnRUaW1lcklELCAyNTAsIDApOworfQogCi0gICAgaWYgKHdpbmRvdy0+dHlwZSAhPSBO UFdpbmRvd1R5cGVXaW5kb3cpIHsKLSAgICAgICAgcGx1Z2luTG9nKGluc3RhbmNlLCAid2luZG93 LT50eXBlIHNob3VsZCBiZSBOUFdpbmRvd1R5cGVXaW5kb3cgYnV0IHdhcyAlZCIsIHdpbmRvdy0+ dHlwZSk7Ci0gICAgICAgIHJldHVybiBOUEVSUl9HRU5FUklDX0VSUk9SOwotICAgIH0KK3ZvaWQg V2luZG93UmVnaW9uSXNTZXRUb0NsaXBSZWN0OjpmaW5pc2hUZXN0KCkKK3sKKyAgICBjaGVja1dp bmRvd1JlZ2lvbigpOworICAgIGhpZGVUZXN0SGFybmVzc1dpbmRvd0lmTmVlZGVkKCk7CisgICAg bm90aWZ5RG9uZSgpOworfQogCi0gICAgSFdORCBod25kID0gcmVpbnRlcnByZXRfY2FzdDxIV05E Pih3aW5kb3ctPndpbmRvdyk7Cit2b2lkIFdpbmRvd1JlZ2lvbklzU2V0VG9DbGlwUmVjdDo6Y2hl Y2tXaW5kb3dSZWdpb24oKQoreworICAgIGlmIChtX2RpZENoZWNrV2luZG93UmVnaW9uKQorICAg ICAgICByZXR1cm47CisgICAgbV9kaWRDaGVja1dpbmRvd1JlZ2lvbiA9IHRydWU7CiAKICAgICBS RUNUIHJlZ2lvblJlY3Q7Ci0gICAgaWYgKDo6R2V0V2luZG93UmduQm94KGh3bmQsICZyZWdpb25S ZWN0KSA9PSBFUlJPUikgewotICAgICAgICBwbHVnaW5Mb2coaW5zdGFuY2UsICI6OkdldFdpbmRv d1JnbkJveCBmYWlsZWQgd2l0aCBlcnJvciAldSIsIDo6R2V0TGFzdEVycm9yKCkpOwotICAgICAg ICByZXR1cm4gTlBFUlJfR0VORVJJQ19FUlJPUjsKKyAgICBpZiAoOjpHZXRXaW5kb3dSZ25Cb3go d2luZG93KCksICZyZWdpb25SZWN0KSA9PSBFUlJPUikgeworICAgICAgICBsb2coIjo6R2V0V2lu ZG93UmduQm94IGZhaWxlZCwgb3Igd2luZG93IGhhcyBubyB3aW5kb3cgcmVnaW9uIik7CisgICAg ICAgIHJldHVybjsKICAgICB9CiAKICAgICAvLyBUaGlzIGV4cGVjdGVkIHJlY3QgaXMgYmFzZWQg b24gdGhlIGxheW91dCBvZiB3aW5kb3ctcmVnaW9uLWlzLXNldC10by1jbGlwLXJlY3QuaHRtbC4K ICAgICBSRUNUIGV4cGVjdGVkUmVjdCA9IHsgNTAsIDUwLCAxMDAsIDEwMCB9OwogICAgIGlmICgh OjpFcXVhbFJlY3QoJnJlZ2lvblJlY3QsICZleHBlY3RlZFJlY3QpKSB7Ci0gICAgICAgIHBsdWdp bkxvZyhpbnN0YW5jZSwgIkV4cGVjdGVkIHJlZ2lvbiByZWN0IHtsZWZ0PSV1LCB0b3A9JXUsIHJp Z2h0PSV1LCBib3R0b209JXV9LCBidXQgZ290IHtsZWZ0PSVkLCB0b3A9JWQsIHJpZ2h0PSVkLCBi b3R0b209JWR9IiwgZXhwZWN0ZWRSZWN0LmxlZnQsIGV4cGVjdGVkUmVjdC50b3AsIGV4cGVjdGVk UmVjdC5yaWdodCwgZXhwZWN0ZWRSZWN0LmJvdHRvbSwgcmVnaW9uUmVjdC5sZWZ0LCByZWdpb25S ZWN0LnRvcCwgcmVnaW9uUmVjdC5yaWdodCwgcmVnaW9uUmVjdC5ib3R0b20pOwotICAgICAgICBy ZXR1cm4gTlBFUlJfR0VORVJJQ19FUlJPUjsKKyAgICAgICAgbG9nKCJFeHBlY3RlZCByZWdpb24g cmVjdCB7bGVmdD0ldSwgdG9wPSV1LCByaWdodD0ldSwgYm90dG9tPSV1fSwgYnV0IGdvdCB7bGVm dD0lZCwgdG9wPSVkLCByaWdodD0lZCwgYm90dG9tPSVkfSIsIGV4cGVjdGVkUmVjdC5sZWZ0LCBl eHBlY3RlZFJlY3QudG9wLCBleHBlY3RlZFJlY3QucmlnaHQsIGV4cGVjdGVkUmVjdC5ib3R0b20s IHJlZ2lvblJlY3QubGVmdCwgcmVnaW9uUmVjdC50b3AsIHJlZ2lvblJlY3QucmlnaHQsIHJlZ2lv blJlY3QuYm90dG9tKTsKKyAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIHBsdWdpbkxvZyhp bnN0YW5jZSwgIlBBU1M6IFBsdWdpbidzIHdpbmRvdydzIHdpbmRvdyByZWdpb24gaGFzIGJlZW4g c2V0IGFzIGV4cGVjdGVkIik7CisgICAgbG9nKCJQQVNTOiBQbHVnaW4ncyB3aW5kb3cncyB3aW5k b3cgcmVnaW9uIGhhcyBiZWVuIHNldCBhcyBleHBlY3RlZCIpOwogCiAgICAgLy8gV2hpbGUgd2Un cmUgaGVyZSwgY2hlY2sgdGhhdCBvdXIgd2luZG93IGNsYXNzIGRvZXNuJ3QgaGF2ZSB0aGUgQ1Nf UEFSRU5UREMgc3R5bGUsIHdoaWNoCiAgICAgLy8gZGVmZWF0cyBjbGlwcGluZyBieSBpZ25vcmlu ZyB0aGUgd2luZG93IHJlZ2lvbiBhbmQgYWx3YXlzIGNsaXBwaW5nIHRvIHRoZSBwYXJlbnQgd2lu ZG93LgpAQCAtODMsOSArMTI4LDkgQEAgTlBFcnJvciBXaW5kb3dSZWdpb25Jc1NldFRvQ2xpcFJl Y3Q6Ok5QUF9TZXRXaW5kb3coTlBQIGluc3RhbmNlLCBOUFdpbmRvdyogd2luZG8KICAgICAvLyBn ZXR0aW5nIGNsaXBwZWQgY29ycmVjdGx5LCBidXQgdW5mb3J0dW5hdGVseSB3aW5kb3cgcmVnaW9u cyBhcmUgaWdub3JlZAogICAgIC8vIGR1cmluZyBXTV9QUklOVCAoc2VlIDxodHRwOi8vd2Via2l0 Lm9yZy9iLzQ5MDM0PikuCiAgICAgd2NoYXJfdCBjbGFzc05hbWVbNTEyXTsKLSAgICBpZiAoITo6 R2V0Q2xhc3NOYW1lVyhod25kLCBjbGFzc05hbWUsIF9jb3VudG9mKGNsYXNzTmFtZSkpKSB7Ci0g ICAgICAgIHBsdWdpbkxvZyhpbnN0YW5jZSwgIjo6R2V0Q2xhc3NOYW1lIGZhaWxlZCB3aXRoIGVy cm9yICV1IiwgOjpHZXRMYXN0RXJyb3IoKSk7Ci0gICAgICAgIHJldHVybiBOUEVSUl9HRU5FUklD X0VSUk9SOworICAgIGlmICghOjpHZXRDbGFzc05hbWVXKHdpbmRvdygpLCBjbGFzc05hbWUsIF9j b3VudG9mKGNsYXNzTmFtZSkpKSB7CisgICAgICAgIGxvZygiOjpHZXRDbGFzc05hbWUgZmFpbGVk IHdpdGggZXJyb3IgJXUiLCA6OkdldExhc3RFcnJvcigpKTsKKyAgICAgICAgcmV0dXJuOwogICAg IH0KIAogI2lmZGVmIERFQlVHX0FMTApAQCAtOTUsMjAgKzE0MCw4MCBAQCBOUEVycm9yIFdpbmRv d1JlZ2lvbklzU2V0VG9DbGlwUmVjdDo6TlBQX1NldFdpbmRvdyhOUFAgaW5zdGFuY2UsIE5QV2lu ZG93KiB3aW5kbwogI2VuZGlmCiAgICAgSE1PRFVMRSB3ZWJLaXRNb2R1bGUgPSA6OkdldE1vZHVs ZUhhbmRsZVcod2ViS2l0RExMTmFtZSk7CiAgICAgaWYgKCF3ZWJLaXRNb2R1bGUpIHsKLSAgICAg ICAgcGx1Z2luTG9nKGluc3RhbmNlLCAiOjpHZXRNb2R1bGVIYW5kbGVXIGZhaWxlZCB3aXRoIGVy cm9yICV1IiwgOjpHZXRMYXN0RXJyb3IoKSk7Ci0gICAgICAgIHJldHVybiBOUEVSUl9HRU5FUklD X0VSUk9SOworICAgICAgICBsb2coIjo6R2V0TW9kdWxlSGFuZGxlVyBmYWlsZWQgd2l0aCBlcnJv ciAldSIsIDo6R2V0TGFzdEVycm9yKCkpOworICAgICAgICByZXR1cm47CiAgICAgfQogCiAgICAg V05EQ0xBU1NXIHduZENsYXNzOwogICAgIGlmICghOjpHZXRDbGFzc0luZm9XKHdlYktpdE1vZHVs ZSwgY2xhc3NOYW1lLCAmd25kQ2xhc3MpKSB7Ci0gICAgICAgIHBsdWdpbkxvZyhpbnN0YW5jZSwg Ijo6R2V0Q2xhc3NJbmZvVyBmYWlsZWQgd2l0aCBlcnJvciAldSIsIDo6R2V0TGFzdEVycm9yKCkp OwotICAgICAgICByZXR1cm4gTlBFUlJfR0VORVJJQ19FUlJPUjsKKyAgICAgICAgbG9nKCI6Okdl dENsYXNzSW5mb1cgZmFpbGVkIHdpdGggZXJyb3IgJXUiLCA6OkdldExhc3RFcnJvcigpKTsKKyAg ICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIGlmICh3bmRDbGFzcy5zdHlsZSAmIENTX1BBUkVO VERDKQotICAgICAgICBwbHVnaW5Mb2coaW5zdGFuY2UsICJGQUlMOiBQbHVnaW4ncyB3aW5kb3cn cyBjbGFzcyBoYXMgdGhlIENTX1BBUkVOVERDIHN0eWxlLCB3aGljaCB3aWxsIGRlZmVhdCBjbGlw cGluZyIpOworICAgICAgICBsb2coIkZBSUw6IFBsdWdpbidzIHdpbmRvdydzIGNsYXNzIGhhcyB0 aGUgQ1NfUEFSRU5UREMgc3R5bGUsIHdoaWNoIHdpbGwgZGVmZWF0IGNsaXBwaW5nIik7CiAgICAg ZWxzZQotICAgICAgICBwbHVnaW5Mb2coaW5zdGFuY2UsICJQQVNTOiBQbHVnaW4ncyB3aW5kb3cn cyBjbGFzcyBkb2VzIG5vdCBoYXZlIHRoZSBDU19QQVJFTlREQyBzdHlsZSIpOworICAgICAgICBs b2coIlBBU1M6IFBsdWdpbidzIHdpbmRvdydzIGNsYXNzIGRvZXMgbm90IGhhdmUgdGhlIENTX1BB UkVOVERDIHN0eWxlIik7Cit9CisKK3ZvaWQgV2luZG93UmVnaW9uSXNTZXRUb0NsaXBSZWN0Ojpz aG93VGVzdEhhcm5lc3NXaW5kb3dJZk5lZWRlZCgpCit7CisgICAgSFdORCB0ZXN0SGFybmVzc1dp bmRvdyA9IHRoaXMtPnRlc3RIYXJuZXNzV2luZG93KCk7CisgICAgbV90ZXN0SGFybmVzc1dpbmRv d1dhc1Zpc2libGUgPSA6OklzV2luZG93VmlzaWJsZSh0ZXN0SGFybmVzc1dpbmRvdyk7CisgICAg aWYgKG1fdGVzdEhhcm5lc3NXaW5kb3dXYXNWaXNpYmxlKQorICAgICAgICByZXR1cm47CisgICAg OjpTaG93V2luZG93KHRlc3RIYXJuZXNzV2luZG93LCBTV19TSE9XTkEpOworfQorCit2b2lkIFdp bmRvd1JlZ2lvbklzU2V0VG9DbGlwUmVjdDo6aGlkZVRlc3RIYXJuZXNzV2luZG93SWZOZWVkZWQo KQoreworICAgIGlmIChtX3Rlc3RIYXJuZXNzV2luZG93V2FzVmlzaWJsZSkKKyAgICAgICAgcmV0 dXJuOworICAgIDo6U2hvd1dpbmRvdyh0ZXN0SGFybmVzc1dpbmRvdygpLCBTV19ISURFKTsKK30K KworTFJFU1VMVCBXaW5kb3dSZWdpb25Jc1NldFRvQ2xpcFJlY3Q6OnduZFByb2MoVUlOVCBtZXNz YWdlLCBXUEFSQU0gd1BhcmFtLCBMUEFSQU0gbFBhcmFtLCBib29sJiBoYW5kbGVkKQoreworICAg IHN3aXRjaCAobWVzc2FnZSkgeworICAgIGNhc2UgV01fVElNRVI6CisgICAgICAgIGlmICh3UGFy YW0gIT0gdHJpZ2dlclBhaW50VGltZXJJRCkKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBo YW5kbGVkID0gdHJ1ZTsKKyAgICAgICAgOjpLaWxsVGltZXIod2luZG93KCksIHdQYXJhbSk7Cisg ICAgICAgIC8vIFRlbGwgdGhlIFVJIHByb2Nlc3MgdG8gcGFpbnQuCisgICAgICAgIDo6UG9zdE1l c3NhZ2VXKDo6R2V0UGFyZW50KHdpbmRvdygpKSwgV01fUEFJTlQsIDAsIDApOworICAgICAgICBi cmVhazsKKyAgICBjYXNlIFdNX1dJTkRPV1BPU0NIQU5HRUQ6IHsKKyAgICAgICAgV0lORE9XUE9T KiB3aW5kb3dQb3MgPSByZWludGVycHJldF9jYXN0PFdJTkRPV1BPUyo+KGxQYXJhbSk7CisgICAg ICAgIGlmICghKHdpbmRvd1Bvcy0+ZmxhZ3MgJiBTV1BfU0hPV1dJTkRPVykpCisgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgZmluaXNoVGVzdCgpOworICAgICAgICBicmVhazsKKyAgICB9CisK KyAgICB9CisKKyAgICByZXR1cm4gMDsKK30KKworTlBFcnJvciBXaW5kb3dSZWdpb25Jc1NldFRv Q2xpcFJlY3Q6Ok5QUF9HZXRWYWx1ZShOUFBWYXJpYWJsZSB2YXJpYWJsZSwgdm9pZCogdmFsdWUp Cit7CisgICAgaWYgKHZhcmlhYmxlICE9IE5QUFZwbHVnaW5TY3JpcHRhYmxlTlBPYmplY3QpCisg ICAgICAgIHJldHVybiBOUEVSUl9HRU5FUklDX0VSUk9SOworCisgICAgKnN0YXRpY19jYXN0PE5Q T2JqZWN0Kio+KHZhbHVlKSA9IFNjcmlwdE9iamVjdDo6Y3JlYXRlKHRoaXMpOwogCiAgICAgcmV0 dXJuIE5QRVJSX05PX0VSUk9SOwogfQorCitib29sIFdpbmRvd1JlZ2lvbklzU2V0VG9DbGlwUmVj dDo6U2NyaXB0T2JqZWN0OjpoYXNNZXRob2QoTlBJZGVudGlmaWVyIG1ldGhvZE5hbWUpCit7Cisg ICAgcmV0dXJuIG1ldGhvZE5hbWUgPT0gcGx1Z2luVGVzdCgpLT5OUE5fR2V0U3RyaW5nSWRlbnRp Zmllcigic3RhcnRUZXN0Iik7Cit9CisKK2Jvb2wgV2luZG93UmVnaW9uSXNTZXRUb0NsaXBSZWN0 OjpTY3JpcHRPYmplY3Q6Omludm9rZShOUElkZW50aWZpZXIgaWRlbnRpZmllciwgY29uc3QgTlBW YXJpYW50KiwgdWludDMyX3QsIE5QVmFyaWFudCopCit7CisgICAgYXNzZXJ0KGlkZW50aWZpZXIg PT0gcGx1Z2luVGVzdCgpLT5OUE5fR2V0U3RyaW5nSWRlbnRpZmllcigic3RhcnRUZXN0IikpOwor ICAgIHN0YXRpY19jYXN0PFdpbmRvd1JlZ2lvbklzU2V0VG9DbGlwUmVjdCo+KHBsdWdpblRlc3Qo KSktPnN0YXJ0VGVzdCgpOworICAgIHJldHVybiB0cnVlOworfQpkaWZmIC0tZ2l0IGEvVG9vbHMv RHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL3dpbi9XaW5kb3dlZFBsdWdpblRlc3Qu Y3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL3dpbi9XaW5kb3dl ZFBsdWdpblRlc3QuY3BwCmluZGV4IDk2YjUxZjgwOTYyYjNkZGY2OGExZGQxZWI4MTJiYjgwZjBh ZGY4ZGUuLjJlNzVjYTE2MmJjYjNkODc0ZTVmMmYzMDIyMzI2NDEzNDQ5MGJjMGIgMTAwNjQ0Ci0t LSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi93aW4vV2luZG93ZWRQ bHVnaW5UZXN0LmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVn SW4vd2luL1dpbmRvd2VkUGx1Z2luVGVzdC5jcHAKQEAgLTM2LDYgKzM2LDExIEBAIFdpbmRvd2Vk UGx1Z2luVGVzdDo6V2luZG93ZWRQbHVnaW5UZXN0KE5QUCBucHAsIGNvbnN0IHN0cmluZyYgaWRl bnRpZmllcikKIHsKIH0KIAorSFdORCBXaW5kb3dlZFBsdWdpblRlc3Q6OnRlc3RIYXJuZXNzV2lu ZG93KCkgY29uc3QKK3sKKyAgICByZXR1cm4gOjpHZXRBbmNlc3Rvcih3aW5kb3coKSwgR0FfUk9P VCk7Cit9CisKIE5QRXJyb3IgV2luZG93ZWRQbHVnaW5UZXN0OjpOUFBfU2V0V2luZG93KE5QUCBp bnN0YW5jZSwgTlBXaW5kb3cqIHdpbmRvdykKIHsKICAgICBIV05EIG5ld1dpbmRvdyA9IHJlaW50 ZXJwcmV0X2Nhc3Q8SFdORD4od2luZG93LT53aW5kb3cpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVt cFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL3dpbi9XaW5kb3dlZFBsdWdpblRlc3QuaCBi L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi93aW4vV2luZG93ZWRQbHVn aW5UZXN0LmgKaW5kZXggN2FiYzczNDM1ZTM5ZTk2MGNmYmU5MzZmMGYzOTFlOTcyYWM5Y2M4YS4u YjUwNzQ2YWUzNmNiOGNiZmM5ODQ1MDdkMDQxMWVmY2Q2MTMzZGQ4OSAxMDA2NDQKLS0tIGEvVG9v bHMvRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL3dpbi9XaW5kb3dlZFBsdWdpblRl c3QuaAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4vd2luL1dp bmRvd2VkUGx1Z2luVGVzdC5oCkBAIC0zMyw2ICszMyw3IEBAIHByb3RlY3RlZDoKICAgICBXaW5k b3dlZFBsdWdpblRlc3QoTlBQLCBjb25zdCBzdGQ6OnN0cmluZyYgaWRlbnRpZmllcik7CiAKICAg ICBIV05EIHdpbmRvdygpIGNvbnN0IHsgcmV0dXJuIG1fd2luZG93OyB9CisgICAgSFdORCB0ZXN0 SGFybmVzc1dpbmRvdygpIGNvbnN0OwogCiAgICAgLy8gRm9yIGRlcml2ZWQgY2xhc3NlcyB0byBv dmVycmlkZQogICAgIHZpcnR1YWwgTFJFU1VMVCB3bmRQcm9jKFVJTlQgbWVzc2FnZSwgV1BBUkFN LCBMUEFSQU0sIGJvb2wmIGhhbmRsZWQpID0gMDsK