95640 2012-09-01 02:00:12 -0700 [EFL] Add missing semicolon at the end of some lines. 2012-09-02 10:43:32 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 bw80.lee webkit-unassigned cdumez gyuyoung.kim lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 710208 0 bw80.lee 2012-09-01 02:00:12 -0700 In the ewk_view.cpp, there are some lines that doesn't have semicolon, but there was no build error about this. This is caused by some macro definition in the file. 710247 1 161827 bw80.lee 2012-09-01 08:25:36 -0700 Created attachment 161827 Patch 710248 2 161828 bw80.lee 2012-09-01 08:29:18 -0700 Created attachment 161828 Patch 710249 3 bw80.lee 2012-09-01 08:29:42 -0700 Fixed typo in Changelog. 710255 4 161828 cdumez 2012-09-01 09:18:21 -0700 Comment on attachment 161828 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=161828&action=review On principal, I like the idea. > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:168 > + } while (0) We don't technically need to do { } while(0) here. Why not simply get rid of the semicolon at the end of evas_object_smart_data_get(ewkView)? 710267 5 161828 rakuco 2012-09-01 10:52:01 -0700 Comment on attachment 161828 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=161828&action=review EWK_VIEW_TYPE_CHECK does not seem to have had any meaningful change, I don't understand the reason for the additional spaces at the end of the lines. >> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:168 >> + } while (0) > > We don't technically need to do { } while(0) here. Why not simply get rid of the semicolon at the end of evas_object_smart_data_get(ewkView)? The best reason I can think of is convention. 710297 6 bw80.lee 2012-09-01 17:44:35 -0700 (In reply to comment #5) > EWK_VIEW_TYPE_CHECK does not seem to have had any meaningful change, I don't understand the reason for the additional spaces at the end of the lines. It was because that all the position of the '\' were fitted in the previous code. > > >> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:168 > >> + } while (0) > > > > We don't technically need to do { } while(0) here. Why not simply get rid of the semicolon at the end of evas_object_smart_data_get(ewkView)? > > The best reason I can think of is convention. Yes, I just add the while (0), but I think removing semicolon will be easier for the line. And with this additional fitting for '\' also not required. I'll change those. Thanks :) 710299 7 161835 bw80.lee 2012-09-01 17:59:18 -0700 Created attachment 161835 Patch 710315 8 161835 cdumez 2012-09-01 23:29:40 -0700 Comment on attachment 161835 Patch LGTM. 710324 9 161835 rakuco 2012-09-02 03:30:17 -0700 Comment on attachment 161835 Patch Looks good, thank you. 710343 10 161835 webkit.review.bot 2012-09-02 10:43:28 -0700 Comment on attachment 161835 Patch Clearing flags on attachment: 161835 Committed r127390: <http://trac.webkit.org/changeset/127390> 710344 11 webkit.review.bot 2012-09-02 10:43:32 -0700 All reviewed patches have been landed. Closing bug. 161827 2012-09-01 08:25:36 -0700 2012-09-01 08:29:12 -0700 Patch bug-95640-20120902002521.patch text/plain 14251 bw80.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3MzcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTVjNjI1MTczMDg5YzZm MzVjNjE2N2UwMmY0YmZjMjQ4YmMxZGJjMC4uZjUwYmZjMThjOTdkNWIzYTQzOGMzMjRjNmNiYzUy NjEwYzA4ZjljNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTA5LTAxICBCeXVu Z3dvbyBMZWUgIDxidzgwLmxlZUBnbWFpbC5jb20+CisKKyAgICAgICAgW0VGTF0gQWRkIG1pc3Np bmcgc2VtaWNvbG9uIGF0IHRoZSBlbmQgb2Ygc29tZSBsaW5lcy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1NjQwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJO IG1hY3JvIGFuZCBvdGhlciByZWxhdGVkIG1hY3JvIGNhbiB1c2UKKyAgICAgICAgd2l0aG91dCBz ZW1pY29sb24sIGJlY2F1c2UgaXQgZW5kcyB3aXRoIGEgc2VtaWNvbG9uIG9yIGNvbXBsYXRlIGJs b2NrLgorICAgICAgICBUaGlzIGNhbiBtYWtlIGEgaHVtYW4gbWlzdGFrZSBhYm91dCBtaXNzaW5n IHNlbWljb2xvbi4KKworICAgICAgICBGaXhlZCB0aGUgbWFjcm9zIHRvIHJlcXVpcmUgc2VtaWNv bG9uLCBhbmQgYWRkZWQgbWlzc2luZyBzZW1pY29sb25zLgorCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3ZpZXcuY3BwOgorICAgICAgICAoX2V3a192aWV3X3NtYXJ0X2ZvY3VzX2lu KToKKyAgICAgICAgKF9ld2tfdmlld19zbWFydF9mb2N1c19vdXQpOgorICAgICAgICAoX2V3a192 aWV3X3NtYXJ0X21vdXNlX3doZWVsKToKKyAgICAgICAgKF9ld2tfdmlld19zbWFydF9tb3VzZV9k b3duKToKKyAgICAgICAgKF9ld2tfdmlld19zbWFydF9tb3VzZV91cCk6CisgICAgICAgIChfZXdr X3ZpZXdfc21hcnRfbW91c2VfbW92ZSk6CisgICAgICAgIChfZXdrX3ZpZXdfc21hcnRfa2V5X2Rv d24pOgorICAgICAgICAoX2V3a192aWV3X3NtYXJ0X2tleV91cCk6CisgICAgICAgIChfZXdrX3Zp ZXdfaW5pdGlhbGl6ZSk6CisKIDIwMTItMDgtMzEgIEJ5dW5nd29vIExlZSAgPGJ3ODAubGVlQHNh bXN1bmcuY29tPgogCiAgICAgICAgIEJ1aWxkIHdhcm5pbmcgOiAtV2Zvcm1hdCBvbiBXZWJNZW1v cnlTYW1wbGVyLmNwcC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3LmNwcAppbmRleCBjMjhhZTZkOTk5NGVjYWE5NTg2MTYxODI2NDI2YTQ2OWRlNjI0OWJiLi5k OTJkMjIzZmFkM2EwZGM4MGI4YTEyYTliYTY1YzEwMDkwY2Q2NjM3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCkBAIC0xMzIsNjEgKzEzMiw2NyBA QCBzdHJ1Y3QgX0V3a19WaWV3X1ByaXZhdGVfRGF0YSB7CiAgICAgfQogfTsKIAotI2RlZmluZSBF V0tfVklFV19UWVBFX0NIRUNLKGV3a1ZpZXcsIHJlc3VsdCkgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFwKLSAgICBib29sIHJlc3VsdCA9IHRydWU7ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgZG8geyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgXAotICAgICAgICBjb25zdCBjaGFyKiBfdG1wX290eXBlID0gZXZhc19vYmplY3RfdHlw ZV9nZXQoZXdrVmlldyk7ICAgICAgICAgICAgICAgIFwKLSAgICAgICAgY29uc3QgRXZhc19TbWFy dCogX3RtcF9zID0gZXZhc19vYmplY3Rfc21hcnRfc21hcnRfZ2V0KGV3a1ZpZXcpOyAgICAgICBc Ci0gICAgICAgIGlmIChFSU5BX1VOTElLRUxZKCFfdG1wX3MpKSB7ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgICAgICAgICAgRUlOQV9MT0dfQ1JJVCAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAg ICAgICAgICAgICAoIiVwICglcykgaXMgbm90IGEgc21hcnQgb2JqZWN0ISIsICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBcCi0gICAgICAgICAgICAgICAgIGV3a1ZpZXcsIF90bXBfb3R5cGUg PyBfdG1wX290eXBlIDogIihudWxsKSIpOyAgICAgICAgICAgICAgICAgXAotICAgICAgICAgICAg cmVzdWx0ID0gZmFsc2U7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFwKLSAgICAgICAgfSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgICAgIGNvbnN0IEV2YXNf U21hcnRfQ2xhc3MqIF90bXBfc2MgPSBldmFzX3NtYXJ0X2NsYXNzX2dldChfdG1wX3MpOyAgICAg ICAgXAotICAgICAgICBpZiAoRUlOQV9VTkxJS0VMWSghX3RtcF9zYykpIHsgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgICAgIEVJTkFfTE9HX0NSSVQg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0g ICAgICAgICAgICAgICAgKCIlcCAoJXMpIGlzIG5vdCBhIHNtYXJ0IG9iamVjdCEiLCAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgXAotICAgICAgICAgICAgICAgICBld2tWaWV3LCBfdG1wX290 eXBlID8gX3RtcF9vdHlwZSA6ICIobnVsbCkiKTsgICAgICAgICAgICAgICAgIFwKLSAgICAgICAg ICAgIHJlc3VsdCA9IGZhbHNlOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBcCi0gICAgICAgIH0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgICAgICBpZiAoRUlO QV9VTkxJS0VMWShfdG1wX3NjLT5kYXRhICE9IEVXS19WSUVXX1RZUEVfU1RSKSkgeyAgICAgICAg ICAgICAgIFwKLSAgICAgICAgICAgIEVJTkFfTE9HX0NSSVQgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgICAgICAgICAgICAgKCIlcCAo JXMpIGlzIG5vdCBvZiBhbiBld2tfdmlldyAobmVlZCAlcCwgZ290ICVwKSEiLCAgICAgICAgICAg XAotICAgICAgICAgICAgICAgICBld2tWaWV3LCBfdG1wX290eXBlID8gX3RtcF9vdHlwZSA6ICIo bnVsbCkiLCAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgICAgICAgICAgRVdLX1ZJRVdfVFlQ RV9TVFIsIF90bXBfc2MtPmRhdGEpOyAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAg ICAgICAgICByZXN1bHQgPSBmYWxzZTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgXAotICAgICAgICB9ICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyNkZWZpbmUgRVdL X1ZJRVdfVFlQRV9DSEVDSyhld2tWaWV3LCByZXN1bHQpICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgXAorICAgIGJvb2wgcmVzdWx0ID0gdHJ1ZTsgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgZG8geyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFwKKyAgICAgICAgY29uc3QgY2hhciogX3RtcF9vdHlwZSA9IGV2YXNf b2JqZWN0X3R5cGVfZ2V0KGV3a1ZpZXcpOyAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICBj b25zdCBFdmFzX1NtYXJ0KiBfdG1wX3MgPSBldmFzX29iamVjdF9zbWFydF9zbWFydF9nZXQoZXdr Vmlldyk7ICAgICAgICAgICBcCisgICAgICAgIGlmIChFSU5BX1VOTElLRUxZKCFfdG1wX3MpKSB7 ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAg ICAgIEVJTkFfTE9HX0NSSVQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgXAorICAgICAgICAgICAgICAgICgiJXAgKCVzKSBpcyBub3QgYSBz bWFydCBvYmplY3QhIiwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAg ICAgICAgICAgIGV3a1ZpZXcsIF90bXBfb3R5cGUgPyBfdG1wX290eXBlIDogIihudWxsKSIpOyAg ICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgICAgIHJlc3VsdCA9IGZhbHNlOyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAg ICB9ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgIGNvbnN0IEV2YXNfU21hcnRfQ2xhc3MqIF90 bXBfc2MgPSBldmFzX3NtYXJ0X2NsYXNzX2dldChfdG1wX3MpOyAgICAgICAgICAgIFwKKyAgICAg ICAgaWYgKEVJTkFfVU5MSUtFTFkoIV90bXBfc2MpKSB7ICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICAgICAgRUlOQV9MT0dfQ1JJVCAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAg ICAgICAgICAgICAgKCIlcCAoJXMpIGlzIG5vdCBhIHNtYXJ0IG9iamVjdCEiLCAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgICAgICAgICAgZXdrVmlldywgX3RtcF9v dHlwZSA/IF90bXBfb3R5cGUgOiAiKG51bGwpIik7ICAgICAgICAgICAgICAgICAgICAgXAorICAg ICAgICAgICAgcmVzdWx0ID0gZmFsc2U7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgIH0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAg ICAgICAgaWYgKEVJTkFfVU5MSUtFTFkoX3RtcF9zYy0+ZGF0YSAhPSBFV0tfVklFV19UWVBFX1NU UikpIHsgICAgICAgICAgICAgICAgICAgXAorICAgICAgICAgICAgRUlOQV9MT0dfQ1JJVCAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisg ICAgICAgICAgICAgICAgKCIlcCAoJXMpIGlzIG5vdCBvZiBhbiBld2tfdmlldyAobmVlZCAlcCwg Z290ICVwKSEiLCAgICAgICAgICAgICAgIFwKKyAgICAgICAgICAgICAgICAgZXdrVmlldywgX3Rt cF9vdHlwZSA/IF90bXBfb3R5cGUgOiAiKG51bGwpIiwgICAgICAgICAgICAgICAgICAgICAgXAor ICAgICAgICAgICAgICAgICBFV0tfVklFV19UWVBFX1NUUiwgX3RtcF9zYy0+ZGF0YSk7ICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgICAgICByZXN1bHQgPSBmYWxzZTsg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwK KyAgICAgICAgfSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgXAogICAgIH0gd2hpbGUgKDApCiAKLSNkZWZpbmUg RVdLX1ZJRVdfU0RfR0VUKGV3a1ZpZXcsIHNtYXJ0RGF0YSkgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBcCi0gICAgRVdLX1ZJRVdfVFlQRV9DSEVDSyhld2tWaWV3LCBfdG1wX3Jl c3VsdCk7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgIEV3a19WaWV3X1Nt YXJ0X0RhdGEqIHNtYXJ0RGF0YSA9IDA7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFwKLSAgICBpZiAoX3RtcF9yZXN1bHQpICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgICAgIHNtYXJ0RGF0YSA9IChF d2tfVmlld19TbWFydF9EYXRhKilldmFzX29iamVjdF9zbWFydF9kYXRhX2dldChld2tWaWV3KTsK LQotI2RlZmluZSBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwg Li4uKSAgICAgICAgICAgICAgICAgICAgIFwKLSAgICBFV0tfVklFV19TRF9HRVQoZXdrVmlldywg c21hcnREYXRhKTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAg aWYgKCFzbWFydERhdGEpIHsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgXAotICAgICAgICBFSU5BX0xPR19DUklUKCJubyBzbWFydCBkYXRh IGZvciBvYmplY3QgJXAgKCVzKSIsICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgICAg ICAgICAgZXdrVmlldywgZXZhc19vYmplY3RfdHlwZV9nZXQoZXdrVmlldykpOyAgICAgICAgICAg ICAgICAgICAgICBcCi0gICAgICAgIHJldHVybiBfX1ZBX0FSR1NfXzsgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgIH0KKyNkZWZpbmUgRVdL X1ZJRVdfU0RfR0VUKGV3a1ZpZXcsIHNtYXJ0RGF0YSkgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgXAorICAgIEVXS19WSUVXX1RZUEVfQ0hFQ0soZXdrVmlldywgX3RtcF9y ZXN1bHQpOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgRXdrX1Zp ZXdfU21hcnRfRGF0YSogc21hcnREYXRhID0gMDsgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFwKKyAgICBkbyB7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICBp ZiAoX3RtcF9yZXN1bHQpICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBcCisgICAgICAgICAgICBzbWFydERhdGEgPSAoRXdrX1ZpZXdfU21h cnRfRGF0YSopZXZhc19vYmplY3Rfc21hcnRfZGF0YV9nZXQoZXdrVmlldyk7IFwKKyAgICB9IHdo aWxlICgwKQorCisjZGVmaW5lIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21h cnREYXRhLCAuLi4pICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICBFV0tfVklFV19TRF9H RVQoZXdrVmlldywgc21hcnREYXRhKTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgXAorICAgIGRvIHsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgIGlmICghc21h cnREYXRhKSB7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFwKKyAgICAgICAgICAgIEVJTkFfTE9HX0NSSVQoIm5vIHNtYXJ0IGRhdGEgZm9y IG9iamVjdCAlcCAoJXMpIiwgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICAgICAgICAg ICAgICAgZXdrVmlldywgZXZhc19vYmplY3RfdHlwZV9nZXQoZXdrVmlldykpOyAgICAgICAgICAg ICAgICAgICAgICBcCisgICAgICAgICAgICByZXR1cm4gX19WQV9BUkdTX187ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgfSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgXAorICAgIH0gd2hpbGUgKDApCiAKLSNkZWZpbmUgRVdLX1ZJRVdfUFJJVl9H RVQoc21hcnREYXRhLCBwcml2KSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBc CisjZGVmaW5lIEVXS19WSUVXX1BSSVZfR0VUKHNtYXJ0RGF0YSwgcHJpdikgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKICAgICBFd2tfVmlld19Qcml2YXRlX0RhdGEq IHByaXYgPSBzbWFydERhdGEtPnByaXYKIAotI2RlZmluZSBFV0tfVklFV19QUklWX0dFVF9PUl9S RVRVUk4oc21hcnREYXRhLCBwcml2LCAuLi4pICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICBp ZiAoIXNtYXJ0RGF0YSkgeyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBcCi0gICAgICAgIEVJTkFfTE9HX0NSSVQoInNtYXJ0IGRhdGEgaXMg bnVsbCIpOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgICAgICByZXR1 cm4gX19WQV9BUkdTX187ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFwKLSAgICB9ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgRVdLX1ZJRVdfUFJJVl9H RVQoc21hcnREYXRhLCBwcml2KTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgXAotICAgIGlmICghcHJpdikgeyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgRUlOQV9MT0dfQ1JJVCgibm8g cHJpdmF0ZSBkYXRhIGZvciBvYmplY3QgJXAgKCVzKSIsICAgICAgICAgICAgICAgICAgICBcCi0g ICAgICAgICAgICAgICAgIHNtYXJ0RGF0YS0+c2VsZiwgZXZhc19vYmplY3RfdHlwZV9nZXQoc21h cnREYXRhLT5zZWxmKSk7ICAgICAgXAotICAgICAgICByZXR1cm4gX19WQV9BUkdTX187ICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICB9Cisj ZGVmaW5lIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIC4uLikg ICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICBpZiAoIXNtYXJ0RGF0YSkgeyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAor ICAgICAgICBFSU5BX0xPR19DUklUKCJzbWFydCBkYXRhIGlzIG51bGwiKTsgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgIHJldHVybiBfX1ZBX0FSR1NfXzsg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwK KyAgICB9ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgIEVXS19WSUVXX1BSSVZfR0VUKHNtYXJ0 RGF0YSwgcHJpdik7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBc CisgICAgZG8geyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgaWYgKCFwcml2KSB7ICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg XAorICAgICAgICAgICAgRUlOQV9MT0dfQ1JJVCgibm8gcHJpdmF0ZSBkYXRhIGZvciBvYmplY3Qg JXAgKCVzKSIsICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgICAgICAgICAgICAgICBzbWFy dERhdGEtPnNlbGYsIGV2YXNfb2JqZWN0X3R5cGVfZ2V0KHNtYXJ0RGF0YS0+c2VsZikpOyAgICAg IFwKKyAgICAgICAgICAgIHJldHVybiBfX1ZBX0FSR1NfXzsgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICB9ICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBcCisgICAgfSB3aGlsZSAoMCkKIAogc3RhdGljIHZvaWQgX2V3a192aWV3X3NtYXJ0X2NoYW5n ZWQoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhKQogewpAQCAtMTk5LDcgKzIwNSw3IEBA IHN0YXRpYyB2b2lkIF9ld2tfdmlld19zbWFydF9jaGFuZ2VkKEV3a19WaWV3X1NtYXJ0X0RhdGEq IHNtYXJ0RGF0YSkKIC8vIERlZmF1bHQgRXZlbnQgSGFuZGxpbmcuCiBzdGF0aWMgRWluYV9Cb29s IF9ld2tfdmlld19zbWFydF9mb2N1c19pbihFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEp CiB7Ci0gICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFs c2UpCisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFs c2UpOwogCiAgICAgcHJpdi0+cGFnZVByb3h5LT52aWV3U3RhdGVEaWRDaGFuZ2UoV2ViUGFnZVBy b3h5OjpWaWV3SXNGb2N1c2VkIHwgV2ViUGFnZVByb3h5OjpWaWV3V2luZG93SXNBY3RpdmUpOwog ICAgIHJldHVybiB0cnVlOwpAQCAtMjA3LDcgKzIxMyw3IEBAIHN0YXRpYyBFaW5hX0Jvb2wgX2V3 a192aWV3X3NtYXJ0X2ZvY3VzX2luKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSkKIAog c3RhdGljIEVpbmFfQm9vbCBfZXdrX3ZpZXdfc21hcnRfZm9jdXNfb3V0KEV3a19WaWV3X1NtYXJ0 X0RhdGEqIHNtYXJ0RGF0YSkKIHsKLSAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21h cnREYXRhLCBwcml2LCBmYWxzZSkKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21h cnREYXRhLCBwcml2LCBmYWxzZSk7CiAKICAgICBwcml2LT5wYWdlUHJveHktPnZpZXdTdGF0ZURp ZENoYW5nZShXZWJQYWdlUHJveHk6OlZpZXdJc0ZvY3VzZWQgfCBXZWJQYWdlUHJveHk6OlZpZXdX aW5kb3dJc0FjdGl2ZSk7CiAgICAgcmV0dXJuIHRydWU7CkBAIC0yMTUsNyArMjIxLDcgQEAgc3Rh dGljIEVpbmFfQm9vbCBfZXdrX3ZpZXdfc21hcnRfZm9jdXNfb3V0KEV3a19WaWV3X1NtYXJ0X0Rh dGEqIHNtYXJ0RGF0YSkKIAogc3RhdGljIEVpbmFfQm9vbCBfZXdrX3ZpZXdfc21hcnRfbW91c2Vf d2hlZWwoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhLCBjb25zdCBFdmFzX0V2ZW50X01v dXNlX1doZWVsKiB3aGVlbEV2ZW50KQogewotICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVS TihzbWFydERhdGEsIHByaXYsIGZhbHNlKQorICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVS TihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsKIAogICAgIEV2YXNfUG9pbnQgcG9zaXRpb24gPSB7 c21hcnREYXRhLT52aWV3LngsIHNtYXJ0RGF0YS0+dmlldy55fTsKICAgICBwcml2LT5wYWdlUHJv eHktPmhhbmRsZVdoZWVsRXZlbnQoTmF0aXZlV2ViV2hlZWxFdmVudCh3aGVlbEV2ZW50LCAmcG9z aXRpb24pKTsKQEAgLTIyNCw3ICsyMzAsNyBAQCBzdGF0aWMgRWluYV9Cb29sIF9ld2tfdmlld19z bWFydF9tb3VzZV93aGVlbChFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEsIGNvbgogCiBz dGF0aWMgRWluYV9Cb29sIF9ld2tfdmlld19zbWFydF9tb3VzZV9kb3duKEV3a19WaWV3X1NtYXJ0 X0RhdGEqIHNtYXJ0RGF0YSwgY29uc3QgRXZhc19FdmVudF9Nb3VzZV9Eb3duKiBkb3duRXZlbnQp CiB7Ci0gICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFs c2UpCisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFs c2UpOwogCiAgICAgRXZhc19Qb2ludCBwb3NpdGlvbiA9IHtzbWFydERhdGEtPnZpZXcueCwgc21h cnREYXRhLT52aWV3Lnl9OwogICAgIHByaXYtPnBhZ2VQcm94eS0+aGFuZGxlTW91c2VFdmVudChO YXRpdmVXZWJNb3VzZUV2ZW50KGRvd25FdmVudCwgJnBvc2l0aW9uKSk7CkBAIC0yMzMsNyArMjM5 LDcgQEAgc3RhdGljIEVpbmFfQm9vbCBfZXdrX3ZpZXdfc21hcnRfbW91c2VfZG93bihFd2tfVmll d19TbWFydF9EYXRhKiBzbWFydERhdGEsIGNvbnMKIAogc3RhdGljIEVpbmFfQm9vbCBfZXdrX3Zp ZXdfc21hcnRfbW91c2VfdXAoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhLCBjb25zdCBF dmFzX0V2ZW50X01vdXNlX1VwKiB1cEV2ZW50KQogewotICAgIEVXS19WSUVXX1BSSVZfR0VUX09S X1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKQorICAgIEVXS19WSUVXX1BSSVZfR0VUX09S X1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsKIAogICAgIEV2YXNfUG9pbnQgcG9zaXRp b24gPSB7c21hcnREYXRhLT52aWV3LngsIHNtYXJ0RGF0YS0+dmlldy55fTsKICAgICBwcml2LT5w YWdlUHJveHktPmhhbmRsZU1vdXNlRXZlbnQoTmF0aXZlV2ViTW91c2VFdmVudCh1cEV2ZW50LCAm cG9zaXRpb24pKTsKQEAgLTI0Miw3ICsyNDgsNyBAQCBzdGF0aWMgRWluYV9Cb29sIF9ld2tfdmll d19zbWFydF9tb3VzZV91cChFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEsIGNvbnN0CiAK IHN0YXRpYyBFaW5hX0Jvb2wgX2V3a192aWV3X3NtYXJ0X21vdXNlX21vdmUoRXdrX1ZpZXdfU21h cnRfRGF0YSogc21hcnREYXRhLCBjb25zdCBFdmFzX0V2ZW50X01vdXNlX01vdmUqIG1vdmVFdmVu dCkKIHsKLSAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBm YWxzZSkKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBm YWxzZSk7CiAKICAgICBFdmFzX1BvaW50IHBvc2l0aW9uID0ge3NtYXJ0RGF0YS0+dmlldy54LCBz bWFydERhdGEtPnZpZXcueX07CiAgICAgcHJpdi0+cGFnZVByb3h5LT5oYW5kbGVNb3VzZUV2ZW50 KE5hdGl2ZVdlYk1vdXNlRXZlbnQobW92ZUV2ZW50LCAmcG9zaXRpb24pKTsKQEAgLTI1MSw3ICsy NTcsNyBAQCBzdGF0aWMgRWluYV9Cb29sIF9ld2tfdmlld19zbWFydF9tb3VzZV9tb3ZlKEV3a19W aWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgY29ucwogCiBzdGF0aWMgRWluYV9Cb29sIF9ld2tf dmlld19zbWFydF9rZXlfZG93bihFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEsIGNvbnN0 IEV2YXNfRXZlbnRfS2V5X0Rvd24qIGRvd25FdmVudCkKIHsKLSAgICBFV0tfVklFV19QUklWX0dF VF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSkKKyAgICBFV0tfVklFV19QUklWX0dF VF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7CiAKICAgICBwcml2LT5wYWdlUHJv eHktPmhhbmRsZUtleWJvYXJkRXZlbnQoTmF0aXZlV2ViS2V5Ym9hcmRFdmVudChkb3duRXZlbnQp KTsKICAgICByZXR1cm4gdHJ1ZTsKQEAgLTI1OSw3ICsyNjUsNyBAQCBzdGF0aWMgRWluYV9Cb29s IF9ld2tfdmlld19zbWFydF9rZXlfZG93bihFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEs IGNvbnN0CiAKIHN0YXRpYyBFaW5hX0Jvb2wgX2V3a192aWV3X3NtYXJ0X2tleV91cChFd2tfVmll d19TbWFydF9EYXRhKiBzbWFydERhdGEsIGNvbnN0IEV2YXNfRXZlbnRfS2V5X1VwKiB1cEV2ZW50 KQogewotICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZh bHNlKQorICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZh bHNlKTsKIAogICAgIHByaXYtPnBhZ2VQcm94eS0+aGFuZGxlS2V5Ym9hcmRFdmVudChOYXRpdmVX ZWJLZXlib2FyZEV2ZW50KHVwRXZlbnQpKTsKICAgICByZXR1cm4gdHJ1ZTsKQEAgLTY3Myw3ICs2 NzksNyBAQCBzdGF0aWMgaW5saW5lIEV2YXNfU21hcnQqIF9ld2tfdmlld19zbWFydF9jbGFzc19u ZXcodm9pZCkKIHN0YXRpYyB2b2lkIF9ld2tfdmlld19pbml0aWFsaXplKEV2YXNfT2JqZWN0KiBl d2tWaWV3LCBFd2tfQ29udGV4dCogY29udGV4dCwgV0tQYWdlR3JvdXBSZWYgcGFnZUdyb3VwUmVm KQogewogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhKTsK LSAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2KQorICAgIEVX S19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYpOwogICAgIEVJTkFfU0FG RVRZX09OX05VTExfUkVUVVJOKGNvbnRleHQpOwogCiAgICAgaWYgKHByaXYtPnBhZ2VDbGllbnQp Cg== 161828 2012-09-01 08:29:18 -0700 2012-09-01 17:59:12 -0700 Patch bug-95640-20120902002904.patch text/plain 14255 bw80.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3MzcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTVjNjI1MTczMDg5YzZm MzVjNjE2N2UwMmY0YmZjMjQ4YmMxZGJjMC4uMzE1YTNlODNjNWYyYzdkNmU4MzMxYTgxZmMzMjJi ZTBjMDZmMTkyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTA5LTAxICBCeXVu Z3dvbyBMZWUgIDxidzgwLmxlZUBnbWFpbC5jb20+CisKKyAgICAgICAgW0VGTF0gQWRkIG1pc3Np bmcgc2VtaWNvbG9uIGF0IHRoZSBlbmQgb2Ygc29tZSBsaW5lcy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1NjQwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJO IG1hY3JvIGFuZCBvdGhlciByZWxhdGVkIG1hY3JvIGNhbiBiZSB1c2VkCisgICAgICAgIHdpdGhv dXQgc2VtaWNvbG9uLCBiZWNhdXNlIGl0IGVuZHMgd2l0aCBhIHNlbWljb2xvbiBvciBjb21wbGV0 ZSBibG9jay4KKyAgICAgICAgVGhpcyBjYW4gbWFrZSBhIGh1bWFuIG1pc3Rha2UgYWJvdXQgbWlz c2luZyBzZW1pY29sb24uCisKKyAgICAgICAgRml4ZWQgdGhlIG1hY3JvcyB0byByZXF1aXJlIHNl bWljb2xvbiwgYW5kIGFkZGVkIG1pc3Npbmcgc2VtaWNvbG9ucy4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAgICAgKF9ld2tfdmlld19zbWFydF9mb2N1 c19pbik6CisgICAgICAgIChfZXdrX3ZpZXdfc21hcnRfZm9jdXNfb3V0KToKKyAgICAgICAgKF9l d2tfdmlld19zbWFydF9tb3VzZV93aGVlbCk6CisgICAgICAgIChfZXdrX3ZpZXdfc21hcnRfbW91 c2VfZG93bik6CisgICAgICAgIChfZXdrX3ZpZXdfc21hcnRfbW91c2VfdXApOgorICAgICAgICAo X2V3a192aWV3X3NtYXJ0X21vdXNlX21vdmUpOgorICAgICAgICAoX2V3a192aWV3X3NtYXJ0X2tl eV9kb3duKToKKyAgICAgICAgKF9ld2tfdmlld19zbWFydF9rZXlfdXApOgorICAgICAgICAoX2V3 a192aWV3X2luaXRpYWxpemUpOgorCiAyMDEyLTA4LTMxICBCeXVuZ3dvbyBMZWUgIDxidzgwLmxl ZUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBCdWlsZCB3YXJuaW5nIDogLVdmb3JtYXQgb24gV2Vi TWVtb3J5U2FtcGxlci5jcHAuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9l d2tfdmlldy5jcHAKaW5kZXggYzI4YWU2ZDk5OTRlY2FhOTU4NjE2MTgyNjQyNmE0NjlkZTYyNDli Yi4uZDkyZDIyM2ZhZDNhMGRjODBiOGExMmE5YmE2NWMxMDA5MGNkNjYzNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcApAQCAtMTMyLDYxICsxMzIs NjcgQEAgc3RydWN0IF9Fd2tfVmlld19Qcml2YXRlX0RhdGEgewogICAgIH0KIH07CiAKLSNkZWZp bmUgRVdLX1ZJRVdfVFlQRV9DSEVDSyhld2tWaWV3LCByZXN1bHQpICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBcCi0gICAgYm9vbCByZXN1bHQgPSB0cnVlOyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgIGRvIHsgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFwKLSAgICAgICAgY29uc3QgY2hhciogX3RtcF9vdHlwZSA9IGV2YXNfb2JqZWN0 X3R5cGVfZ2V0KGV3a1ZpZXcpOyAgICAgICAgICAgICAgICBcCi0gICAgICAgIGNvbnN0IEV2YXNf U21hcnQqIF90bXBfcyA9IGV2YXNfb2JqZWN0X3NtYXJ0X3NtYXJ0X2dldChld2tWaWV3KTsgICAg ICAgXAotICAgICAgICBpZiAoRUlOQV9VTkxJS0VMWSghX3RtcF9zKSkgeyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgICAgIEVJTkFfTE9HX0NSSVQg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0g ICAgICAgICAgICAgICAgKCIlcCAoJXMpIGlzIG5vdCBhIHNtYXJ0IG9iamVjdCEiLCAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgXAotICAgICAgICAgICAgICAgICBld2tWaWV3LCBfdG1wX290 eXBlID8gX3RtcF9vdHlwZSA6ICIobnVsbCkiKTsgICAgICAgICAgICAgICAgIFwKLSAgICAgICAg ICAgIHJlc3VsdCA9IGZhbHNlOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBcCi0gICAgICAgIH0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgICAgICBjb25zdCBF dmFzX1NtYXJ0X0NsYXNzKiBfdG1wX3NjID0gZXZhc19zbWFydF9jbGFzc19nZXQoX3RtcF9zKTsg ICAgICAgIFwKLSAgICAgICAgaWYgKEVJTkFfVU5MSUtFTFkoIV90bXBfc2MpKSB7ICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgICAgICAgICBFSU5BX0xPR19D UklUICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg XAotICAgICAgICAgICAgICAgICgiJXAgKCVzKSBpcyBub3QgYSBzbWFydCBvYmplY3QhIiwgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgICAgICAgICAgZXdrVmlldywgX3Rt cF9vdHlwZSA/IF90bXBfb3R5cGUgOiAiKG51bGwpIik7ICAgICAgICAgICAgICAgICBcCi0gICAg ICAgICAgICByZXN1bHQgPSBmYWxzZTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgXAotICAgICAgICB9ICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgaWYg KEVJTkFfVU5MSUtFTFkoX3RtcF9zYy0+ZGF0YSAhPSBFV0tfVklFV19UWVBFX1NUUikpIHsgICAg ICAgICAgICAgICBcCi0gICAgICAgICAgICBFSU5BX0xPR19DUklUICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgICAgICAgICAgICAgICgi JXAgKCVzKSBpcyBub3Qgb2YgYW4gZXdrX3ZpZXcgKG5lZWQgJXAsIGdvdCAlcCkhIiwgICAgICAg ICAgIFwKLSAgICAgICAgICAgICAgICAgZXdrVmlldywgX3RtcF9vdHlwZSA/IF90bXBfb3R5cGUg OiAiKG51bGwpIiwgICAgICAgICAgICAgICAgICBcCi0gICAgICAgICAgICAgICAgIEVXS19WSUVX X1RZUEVfU1RSLCBfdG1wX3NjLT5kYXRhKTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAot ICAgICAgICAgICAgcmVzdWx0ID0gZmFsc2U7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgfSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisjZGVmaW5l IEVXS19WSUVXX1RZUEVfQ0hFQ0soZXdrVmlldywgcmVzdWx0KSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIFwKKyAgICBib29sIHJlc3VsdCA9IHRydWU7ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgIGRv IHsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgIGNvbnN0IGNoYXIqIF90bXBfb3R5cGUgPSBl dmFzX29iamVjdF90eXBlX2dldChld2tWaWV3KTsgICAgICAgICAgICAgICAgICAgIFwKKyAgICAg ICAgY29uc3QgRXZhc19TbWFydCogX3RtcF9zID0gZXZhc19vYmplY3Rfc21hcnRfc21hcnRfZ2V0 KGV3a1ZpZXcpOyAgICAgICAgICAgXAorICAgICAgICBpZiAoRUlOQV9VTkxJS0VMWSghX3RtcF9z KSkgeyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAg ICAgICAgICBFSU5BX0xPR19DUklUICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgICAgICAgICAoIiVwICglcykgaXMgbm90 IGEgc21hcnQgb2JqZWN0ISIsICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAg ICAgICAgICAgICAgICBld2tWaWV3LCBfdG1wX290eXBlID8gX3RtcF9vdHlwZSA6ICIobnVsbCki KTsgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgICAgICByZXN1bHQgPSBmYWxzZTsgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAg ICAgICAgfSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICBjb25zdCBFdmFzX1NtYXJ0X0NsYXNz KiBfdG1wX3NjID0gZXZhc19zbWFydF9jbGFzc19nZXQoX3RtcF9zKTsgICAgICAgICAgICBcCisg ICAgICAgIGlmIChFSU5BX1VOTElLRUxZKCFfdG1wX3NjKSkgeyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgICAgIEVJTkFfTE9HX0NSSVQgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAor ICAgICAgICAgICAgICAgICgiJXAgKCVzKSBpcyBub3QgYSBzbWFydCBvYmplY3QhIiwgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgICAgICAgICAgIGV3a1ZpZXcsIF90 bXBfb3R5cGUgPyBfdG1wX290eXBlIDogIihudWxsKSIpOyAgICAgICAgICAgICAgICAgICAgIFwK KyAgICAgICAgICAgIHJlc3VsdCA9IGZhbHNlOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICB9ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBc CisgICAgICAgIGlmIChFSU5BX1VOTElLRUxZKF90bXBfc2MtPmRhdGEgIT0gRVdLX1ZJRVdfVFlQ RV9TVFIpKSB7ICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgICAgIEVJTkFfTE9HX0NSSVQg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg XAorICAgICAgICAgICAgICAgICgiJXAgKCVzKSBpcyBub3Qgb2YgYW4gZXdrX3ZpZXcgKG5lZWQg JXAsIGdvdCAlcCkhIiwgICAgICAgICAgICAgICBcCisgICAgICAgICAgICAgICAgIGV3a1ZpZXcs IF90bXBfb3R5cGUgPyBfdG1wX290eXBlIDogIihudWxsKSIsICAgICAgICAgICAgICAgICAgICAg IFwKKyAgICAgICAgICAgICAgICAgRVdLX1ZJRVdfVFlQRV9TVFIsIF90bXBfc2MtPmRhdGEpOyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICAgICAgcmVzdWx0ID0gZmFs c2U7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBcCisgICAgICAgIH0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKICAgICB9IHdoaWxlICgwKQogCi0jZGVm aW5lIEVXS19WSUVXX1NEX0dFVChld2tWaWV3LCBzbWFydERhdGEpICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgXAotICAgIEVXS19WSUVXX1RZUEVfQ0hFQ0soZXdrVmlldywgX3Rt cF9yZXN1bHQpOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICBFd2tfVmll d19TbWFydF9EYXRhKiBzbWFydERhdGEgPSAwOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBcCi0gICAgaWYgKF90bXBfcmVzdWx0KSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgICAgICBzbWFydERhdGEg PSAoRXdrX1ZpZXdfU21hcnRfRGF0YSopZXZhc19vYmplY3Rfc21hcnRfZGF0YV9nZXQoZXdrVmll dyk7Ci0KLSNkZWZpbmUgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERh dGEsIC4uLikgICAgICAgICAgICAgICAgICAgICBcCi0gICAgRVdLX1ZJRVdfU0RfR0VUKGV3a1Zp ZXcsIHNtYXJ0RGF0YSk7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAot ICAgIGlmICghc21hcnREYXRhKSB7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgRUlOQV9MT0dfQ1JJVCgibm8gc21hcnQg ZGF0YSBmb3Igb2JqZWN0ICVwICglcykiLCAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgICAg ICAgICAgICAgIGV3a1ZpZXcsIGV2YXNfb2JqZWN0X3R5cGVfZ2V0KGV3a1ZpZXcpKTsgICAgICAg ICAgICAgICAgICAgICAgXAotICAgICAgICByZXR1cm4gX19WQV9BUkdTX187ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICB9CisjZGVmaW5l IEVXS19WSUVXX1NEX0dFVChld2tWaWV3LCBzbWFydERhdGEpICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIFwKKyAgICBFV0tfVklFV19UWVBFX0NIRUNLKGV3a1ZpZXcsIF90 bXBfcmVzdWx0KTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgIEV3 a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSA9IDA7ICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBcCisgICAgZG8geyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAg ICAgaWYgKF90bXBfcmVzdWx0KSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICAgICAgc21hcnREYXRhID0gKEV3a19WaWV3 X1NtYXJ0X0RhdGEqKWV2YXNfb2JqZWN0X3NtYXJ0X2RhdGFfZ2V0KGV3a1ZpZXcpOyBcCisgICAg fSB3aGlsZSAoMCkKKworI2RlZmluZSBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcs IHNtYXJ0RGF0YSwgLi4uKSAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgRVdLX1ZJRVdf U0RfR0VUKGV3a1ZpZXcsIHNtYXJ0RGF0YSk7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFwKKyAgICBkbyB7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICBpZiAo IXNtYXJ0RGF0YSkgeyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBcCisgICAgICAgICAgICBFSU5BX0xPR19DUklUKCJubyBzbWFydCBkYXRh IGZvciBvYmplY3QgJXAgKCVzKSIsICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgICAg ICAgICAgICAgIGV3a1ZpZXcsIGV2YXNfb2JqZWN0X3R5cGVfZ2V0KGV3a1ZpZXcpKTsgICAgICAg ICAgICAgICAgICAgICAgXAorICAgICAgICAgICAgcmV0dXJuIF9fVkFfQVJHU19fOyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgIH0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFwKKyAgICB9IHdoaWxlICgwKQogCi0jZGVmaW5lIEVXS19WSUVXX1BS SVZfR0VUKHNtYXJ0RGF0YSwgcHJpdikgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgXAorI2RlZmluZSBFV0tfVklFV19QUklWX0dFVChzbWFydERhdGEsIHByaXYpICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgRXdrX1ZpZXdfUHJpdmF0ZV9E YXRhKiBwcml2ID0gc21hcnREYXRhLT5wcml2CiAKLSNkZWZpbmUgRVdLX1ZJRVdfUFJJVl9HRVRf T1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgLi4uKSAgICAgICAgICAgICAgICAgICAgICBcCi0g ICAgaWYgKCFzbWFydERhdGEpIHsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgXAotICAgICAgICBFSU5BX0xPR19DUklUKCJzbWFydCBkYXRh IGlzIG51bGwiKTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAg cmV0dXJuIF9fVkFfQVJHU19fOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBcCi0gICAgfSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgIEVXS19WSUVXX1BS SVZfR0VUKHNtYXJ0RGF0YSwgcHJpdik7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFwKLSAgICBpZiAoIXByaXYpIHsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgICAgIEVJTkFfTE9HX0NSSVQo Im5vIHByaXZhdGUgZGF0YSBmb3Igb2JqZWN0ICVwICglcykiLCAgICAgICAgICAgICAgICAgICAg XAotICAgICAgICAgICAgICAgICBzbWFydERhdGEtPnNlbGYsIGV2YXNfb2JqZWN0X3R5cGVfZ2V0 KHNtYXJ0RGF0YS0+c2VsZikpOyAgICAgIFwKLSAgICAgICAgcmV0dXJuIF9fVkFfQVJHU19fOyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAg fQorI2RlZmluZSBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCAu Li4pICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgaWYgKCFzbWFydERhdGEpIHsgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFwKKyAgICAgICAgRUlOQV9MT0dfQ1JJVCgic21hcnQgZGF0YSBpcyBudWxsIik7ICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICByZXR1cm4gX19WQV9BUkdT X187ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBcCisgICAgfSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICBFV0tfVklFV19QUklWX0dFVChz bWFydERhdGEsIHByaXYpOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgXAorICAgIGRvIHsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgIGlmICghcHJpdikgeyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFwKKyAgICAgICAgICAgIEVJTkFfTE9HX0NSSVQoIm5vIHByaXZhdGUgZGF0YSBmb3Igb2Jq ZWN0ICVwICglcykiLCAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICAgICAgICAgICAgICAg c21hcnREYXRhLT5zZWxmLCBldmFzX29iamVjdF90eXBlX2dldChzbWFydERhdGEtPnNlbGYpKTsg ICAgICBcCisgICAgICAgICAgICByZXR1cm4gX19WQV9BUkdTX187ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgfSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgXAorICAgIH0gd2hpbGUgKDApCiAKIHN0YXRpYyB2b2lkIF9ld2tfdmlld19zbWFydF9j aGFuZ2VkKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSkKIHsKQEAgLTE5OSw3ICsyMDUs NyBAQCBzdGF0aWMgdm9pZCBfZXdrX3ZpZXdfc21hcnRfY2hhbmdlZChFd2tfVmlld19TbWFydF9E YXRhKiBzbWFydERhdGEpCiAvLyBEZWZhdWx0IEV2ZW50IEhhbmRsaW5nLgogc3RhdGljIEVpbmFf Qm9vbCBfZXdrX3ZpZXdfc21hcnRfZm9jdXNfaW4oRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnRE YXRhKQogewotICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYs IGZhbHNlKQorICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYs IGZhbHNlKTsKIAogICAgIHByaXYtPnBhZ2VQcm94eS0+dmlld1N0YXRlRGlkQ2hhbmdlKFdlYlBh Z2VQcm94eTo6Vmlld0lzRm9jdXNlZCB8IFdlYlBhZ2VQcm94eTo6Vmlld1dpbmRvd0lzQWN0aXZl KTsKICAgICByZXR1cm4gdHJ1ZTsKQEAgLTIwNyw3ICsyMTMsNyBAQCBzdGF0aWMgRWluYV9Cb29s IF9ld2tfdmlld19zbWFydF9mb2N1c19pbihFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEp CiAKIHN0YXRpYyBFaW5hX0Jvb2wgX2V3a192aWV3X3NtYXJ0X2ZvY3VzX291dChFd2tfVmlld19T bWFydF9EYXRhKiBzbWFydERhdGEpCiB7Ci0gICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJO KHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2UpCisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJO KHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2UpOwogCiAgICAgcHJpdi0+cGFnZVByb3h5LT52aWV3U3Rh dGVEaWRDaGFuZ2UoV2ViUGFnZVByb3h5OjpWaWV3SXNGb2N1c2VkIHwgV2ViUGFnZVByb3h5OjpW aWV3V2luZG93SXNBY3RpdmUpOwogICAgIHJldHVybiB0cnVlOwpAQCAtMjE1LDcgKzIyMSw3IEBA IHN0YXRpYyBFaW5hX0Jvb2wgX2V3a192aWV3X3NtYXJ0X2ZvY3VzX291dChFd2tfVmlld19TbWFy dF9EYXRhKiBzbWFydERhdGEpCiAKIHN0YXRpYyBFaW5hX0Jvb2wgX2V3a192aWV3X3NtYXJ0X21v dXNlX3doZWVsKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgY29uc3QgRXZhc19FdmVu dF9Nb3VzZV9XaGVlbCogd2hlZWxFdmVudCkKIHsKLSAgICBFV0tfVklFV19QUklWX0dFVF9PUl9S RVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSkKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9S RVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7CiAKICAgICBFdmFzX1BvaW50IHBvc2l0aW9u ID0ge3NtYXJ0RGF0YS0+dmlldy54LCBzbWFydERhdGEtPnZpZXcueX07CiAgICAgcHJpdi0+cGFn ZVByb3h5LT5oYW5kbGVXaGVlbEV2ZW50KE5hdGl2ZVdlYldoZWVsRXZlbnQod2hlZWxFdmVudCwg JnBvc2l0aW9uKSk7CkBAIC0yMjQsNyArMjMwLDcgQEAgc3RhdGljIEVpbmFfQm9vbCBfZXdrX3Zp ZXdfc21hcnRfbW91c2Vfd2hlZWwoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhLCBjb24K IAogc3RhdGljIEVpbmFfQm9vbCBfZXdrX3ZpZXdfc21hcnRfbW91c2VfZG93bihFd2tfVmlld19T bWFydF9EYXRhKiBzbWFydERhdGEsIGNvbnN0IEV2YXNfRXZlbnRfTW91c2VfRG93biogZG93bkV2 ZW50KQogewotICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYs IGZhbHNlKQorICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYs IGZhbHNlKTsKIAogICAgIEV2YXNfUG9pbnQgcG9zaXRpb24gPSB7c21hcnREYXRhLT52aWV3Lngs IHNtYXJ0RGF0YS0+dmlldy55fTsKICAgICBwcml2LT5wYWdlUHJveHktPmhhbmRsZU1vdXNlRXZl bnQoTmF0aXZlV2ViTW91c2VFdmVudChkb3duRXZlbnQsICZwb3NpdGlvbikpOwpAQCAtMjMzLDcg KzIzOSw3IEBAIHN0YXRpYyBFaW5hX0Jvb2wgX2V3a192aWV3X3NtYXJ0X21vdXNlX2Rvd24oRXdr X1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhLCBjb25zCiAKIHN0YXRpYyBFaW5hX0Jvb2wgX2V3 a192aWV3X3NtYXJ0X21vdXNlX3VwKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgY29u c3QgRXZhc19FdmVudF9Nb3VzZV9VcCogdXBFdmVudCkKIHsKLSAgICBFV0tfVklFV19QUklWX0dF VF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSkKKyAgICBFV0tfVklFV19QUklWX0dF VF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7CiAKICAgICBFdmFzX1BvaW50IHBv c2l0aW9uID0ge3NtYXJ0RGF0YS0+dmlldy54LCBzbWFydERhdGEtPnZpZXcueX07CiAgICAgcHJp di0+cGFnZVByb3h5LT5oYW5kbGVNb3VzZUV2ZW50KE5hdGl2ZVdlYk1vdXNlRXZlbnQodXBFdmVu dCwgJnBvc2l0aW9uKSk7CkBAIC0yNDIsNyArMjQ4LDcgQEAgc3RhdGljIEVpbmFfQm9vbCBfZXdr X3ZpZXdfc21hcnRfbW91c2VfdXAoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhLCBjb25z dAogCiBzdGF0aWMgRWluYV9Cb29sIF9ld2tfdmlld19zbWFydF9tb3VzZV9tb3ZlKEV3a19WaWV3 X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgY29uc3QgRXZhc19FdmVudF9Nb3VzZV9Nb3ZlKiBtb3Zl RXZlbnQpCiB7Ci0gICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJp diwgZmFsc2UpCisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJp diwgZmFsc2UpOwogCiAgICAgRXZhc19Qb2ludCBwb3NpdGlvbiA9IHtzbWFydERhdGEtPnZpZXcu eCwgc21hcnREYXRhLT52aWV3Lnl9OwogICAgIHByaXYtPnBhZ2VQcm94eS0+aGFuZGxlTW91c2VF dmVudChOYXRpdmVXZWJNb3VzZUV2ZW50KG1vdmVFdmVudCwgJnBvc2l0aW9uKSk7CkBAIC0yNTEs NyArMjU3LDcgQEAgc3RhdGljIEVpbmFfQm9vbCBfZXdrX3ZpZXdfc21hcnRfbW91c2VfbW92ZShF d2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEsIGNvbnMKIAogc3RhdGljIEVpbmFfQm9vbCBf ZXdrX3ZpZXdfc21hcnRfa2V5X2Rvd24oRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhLCBj b25zdCBFdmFzX0V2ZW50X0tleV9Eb3duKiBkb3duRXZlbnQpCiB7Ci0gICAgRVdLX1ZJRVdfUFJJ Vl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2UpCisgICAgRVdLX1ZJRVdfUFJJ Vl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2UpOwogCiAgICAgcHJpdi0+cGFn ZVByb3h5LT5oYW5kbGVLZXlib2FyZEV2ZW50KE5hdGl2ZVdlYktleWJvYXJkRXZlbnQoZG93bkV2 ZW50KSk7CiAgICAgcmV0dXJuIHRydWU7CkBAIC0yNTksNyArMjY1LDcgQEAgc3RhdGljIEVpbmFf Qm9vbCBfZXdrX3ZpZXdfc21hcnRfa2V5X2Rvd24oRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnRE YXRhLCBjb25zdAogCiBzdGF0aWMgRWluYV9Cb29sIF9ld2tfdmlld19zbWFydF9rZXlfdXAoRXdr X1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhLCBjb25zdCBFdmFzX0V2ZW50X0tleV9VcCogdXBF dmVudCkKIHsKLSAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2 LCBmYWxzZSkKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2 LCBmYWxzZSk7CiAKICAgICBwcml2LT5wYWdlUHJveHktPmhhbmRsZUtleWJvYXJkRXZlbnQoTmF0 aXZlV2ViS2V5Ym9hcmRFdmVudCh1cEV2ZW50KSk7CiAgICAgcmV0dXJuIHRydWU7CkBAIC02NzMs NyArNjc5LDcgQEAgc3RhdGljIGlubGluZSBFdmFzX1NtYXJ0KiBfZXdrX3ZpZXdfc21hcnRfY2xh c3NfbmV3KHZvaWQpCiBzdGF0aWMgdm9pZCBfZXdrX3ZpZXdfaW5pdGlhbGl6ZShFdmFzX09iamVj dCogZXdrVmlldywgRXdrX0NvbnRleHQqIGNvbnRleHQsIFdLUGFnZUdyb3VwUmVmIHBhZ2VHcm91 cFJlZikKIHsKICAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0 YSk7Ci0gICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdikKKyAg ICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2KTsKICAgICBFSU5B X1NBRkVUWV9PTl9OVUxMX1JFVFVSTihjb250ZXh0KTsKIAogICAgIGlmIChwcml2LT5wYWdlQ2xp ZW50KQo= 161835 2012-09-01 17:59:18 -0700 2012-09-02 10:43:28 -0700 Patch bug-95640-20120902095904.patch text/plain 8469 bw80.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3MzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTVjNjI1MTczMDg5YzZm MzVjNjE2N2UwMmY0YmZjMjQ4YmMxZGJjMC4uMzE1YTNlODNjNWYyYzdkNmU4MzMxYTgxZmMzMjJi ZTBjMDZmMTkyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTA5LTAxICBCeXVu Z3dvbyBMZWUgIDxidzgwLmxlZUBnbWFpbC5jb20+CisKKyAgICAgICAgW0VGTF0gQWRkIG1pc3Np bmcgc2VtaWNvbG9uIGF0IHRoZSBlbmQgb2Ygc29tZSBsaW5lcy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1NjQwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJO IG1hY3JvIGFuZCBvdGhlciByZWxhdGVkIG1hY3JvIGNhbiBiZSB1c2VkCisgICAgICAgIHdpdGhv dXQgc2VtaWNvbG9uLCBiZWNhdXNlIGl0IGVuZHMgd2l0aCBhIHNlbWljb2xvbiBvciBjb21wbGV0 ZSBibG9jay4KKyAgICAgICAgVGhpcyBjYW4gbWFrZSBhIGh1bWFuIG1pc3Rha2UgYWJvdXQgbWlz c2luZyBzZW1pY29sb24uCisKKyAgICAgICAgRml4ZWQgdGhlIG1hY3JvcyB0byByZXF1aXJlIHNl bWljb2xvbiwgYW5kIGFkZGVkIG1pc3Npbmcgc2VtaWNvbG9ucy4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAgICAgKF9ld2tfdmlld19zbWFydF9mb2N1 c19pbik6CisgICAgICAgIChfZXdrX3ZpZXdfc21hcnRfZm9jdXNfb3V0KToKKyAgICAgICAgKF9l d2tfdmlld19zbWFydF9tb3VzZV93aGVlbCk6CisgICAgICAgIChfZXdrX3ZpZXdfc21hcnRfbW91 c2VfZG93bik6CisgICAgICAgIChfZXdrX3ZpZXdfc21hcnRfbW91c2VfdXApOgorICAgICAgICAo X2V3a192aWV3X3NtYXJ0X21vdXNlX21vdmUpOgorICAgICAgICAoX2V3a192aWV3X3NtYXJ0X2tl eV9kb3duKToKKyAgICAgICAgKF9ld2tfdmlld19zbWFydF9rZXlfdXApOgorICAgICAgICAoX2V3 a192aWV3X2luaXRpYWxpemUpOgorCiAyMDEyLTA4LTMxICBCeXVuZ3dvbyBMZWUgIDxidzgwLmxl ZUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBCdWlsZCB3YXJuaW5nIDogLVdmb3JtYXQgb24gV2Vi TWVtb3J5U2FtcGxlci5jcHAuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9l d2tfdmlldy5jcHAKaW5kZXggYzI4YWU2ZDk5OTRlY2FhOTU4NjE2MTgyNjQyNmE0NjlkZTYyNDli Yi4uNTVlMTNkZDQ3MjUyODZmZjkwN2NlZDliNjU3MzQ2YWQ0MjQyMGVlNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcApAQCAtMTYzLDE1ICsxNjMs MTcgQEAgc3RydWN0IF9Fd2tfVmlld19Qcml2YXRlX0RhdGEgewogICAgIEVXS19WSUVXX1RZUEVf Q0hFQ0soZXdrVmlldywgX3RtcF9yZXN1bHQpOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFwKICAgICBFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEgPSAwOyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgaWYgKF90bXBfcmVzdWx0KSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAot ICAgICAgICBzbWFydERhdGEgPSAoRXdrX1ZpZXdfU21hcnRfRGF0YSopZXZhc19vYmplY3Rfc21h cnRfZGF0YV9nZXQoZXdrVmlldyk7CisgICAgICAgIHNtYXJ0RGF0YSA9IChFd2tfVmlld19TbWFy dF9EYXRhKilldmFzX29iamVjdF9zbWFydF9kYXRhX2dldChld2tWaWV3KQogCiAjZGVmaW5lIEVX S19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCAuLi4pICAgICAgICAg ICAgICAgICAgICAgXAogICAgIEVXS19WSUVXX1NEX0dFVChld2tWaWV3LCBzbWFydERhdGEpOyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICBpZiAoIXNtYXJ0RGF0 YSkgeyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBcCi0gICAgICAgIEVJTkFfTE9HX0NSSVQoIm5vIHNtYXJ0IGRhdGEgZm9yIG9iamVjdCAl cCAoJXMpIiwgICAgICAgICAgICAgICAgICAgICAgXAotICAgICAgICAgICAgICAgICBld2tWaWV3 LCBldmFzX29iamVjdF90eXBlX2dldChld2tWaWV3KSk7ICAgICAgICAgICAgICAgICAgICAgIFwK LSAgICAgICAgcmV0dXJuIF9fVkFfQVJHU19fOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgfQorICAgIGRvIHsgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwK KyAgICAgICAgaWYgKCFzbWFydERhdGEpIHsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgICAgICBFSU5BX0xPR19DUklUKCJubyBz bWFydCBkYXRhIGZvciBvYmplY3QgJXAgKCVzKSIsICAgICAgICAgICAgICAgICAgXAorICAgICAg ICAgICAgICAgICAgICAgZXdrVmlldywgZXZhc19vYmplY3RfdHlwZV9nZXQoZXdrVmlldykpOyAg ICAgICAgICAgICAgICAgIFwKKyAgICAgICAgICAgIHJldHVybiBfX1ZBX0FSR1NfXzsgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgIH0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgXAorICAgIH0gd2hpbGUgKDApCiAKICNkZWZpbmUgRVdLX1ZJRVdfUFJJVl9HRVQo c21hcnREYXRhLCBwcml2KSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAg ICAgRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhKiBwcml2ID0gc21hcnREYXRhLT5wcml2CkBAIC0xODIs MTEgKzE4NCwxMyBAQCBzdHJ1Y3QgX0V3a19WaWV3X1ByaXZhdGVfRGF0YSB7CiAgICAgICAgIHJl dHVybiBfX1ZBX0FSR1NfXzsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgXAogICAgIH0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKICAgICBFV0tfVklFV19QUklW X0dFVChzbWFydERhdGEsIHByaXYpOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBcCi0gICAgaWYgKCFwcml2KSB7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgICAgICBFSU5BX0xPR19DUklUKCJu byBwcml2YXRlIGRhdGEgZm9yIG9iamVjdCAlcCAoJXMpIiwgICAgICAgICAgICAgICAgICAgIFwK LSAgICAgICAgICAgICAgICAgc21hcnREYXRhLT5zZWxmLCBldmFzX29iamVjdF90eXBlX2dldChz bWFydERhdGEtPnNlbGYpKTsgICAgICBcCi0gICAgICAgIHJldHVybiBfX1ZBX0FSR1NfXzsgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgIH0K KyAgICBkbyB7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgIGlmICghcHJpdikgeyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAg ICAgICAgRUlOQV9MT0dfQ1JJVCgibm8gcHJpdmF0ZSBkYXRhIGZvciBvYmplY3QgJXAgKCVzKSIs ICAgICAgICAgICAgICAgIFwKKyAgICAgICAgICAgICAgICAgICAgIHNtYXJ0RGF0YS0+c2VsZiwg ZXZhc19vYmplY3RfdHlwZV9nZXQoc21hcnREYXRhLT5zZWxmKSk7ICBcCisgICAgICAgICAgICBy ZXR1cm4gX19WQV9BUkdTX187ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgXAorICAgICAgICB9ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICB9IHdoaWxlICgwKQogCiBz dGF0aWMgdm9pZCBfZXdrX3ZpZXdfc21hcnRfY2hhbmdlZChFd2tfVmlld19TbWFydF9EYXRhKiBz bWFydERhdGEpCiB7CkBAIC0xOTksNyArMjAzLDcgQEAgc3RhdGljIHZvaWQgX2V3a192aWV3X3Nt YXJ0X2NoYW5nZWQoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhKQogLy8gRGVmYXVsdCBF dmVudCBIYW5kbGluZy4KIHN0YXRpYyBFaW5hX0Jvb2wgX2V3a192aWV3X3NtYXJ0X2ZvY3VzX2lu KEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSkKIHsKLSAgICBFV0tfVklFV19QUklWX0dF VF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSkKKyAgICBFV0tfVklFV19QUklWX0dF VF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7CiAKICAgICBwcml2LT5wYWdlUHJv eHktPnZpZXdTdGF0ZURpZENoYW5nZShXZWJQYWdlUHJveHk6OlZpZXdJc0ZvY3VzZWQgfCBXZWJQ YWdlUHJveHk6OlZpZXdXaW5kb3dJc0FjdGl2ZSk7CiAgICAgcmV0dXJuIHRydWU7CkBAIC0yMDcs NyArMjExLDcgQEAgc3RhdGljIEVpbmFfQm9vbCBfZXdrX3ZpZXdfc21hcnRfZm9jdXNfaW4oRXdr X1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhKQogCiBzdGF0aWMgRWluYV9Cb29sIF9ld2tfdmll d19zbWFydF9mb2N1c19vdXQoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhKQogewotICAg IEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKQorICAg IEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsKIAog ICAgIHByaXYtPnBhZ2VQcm94eS0+dmlld1N0YXRlRGlkQ2hhbmdlKFdlYlBhZ2VQcm94eTo6Vmll d0lzRm9jdXNlZCB8IFdlYlBhZ2VQcm94eTo6Vmlld1dpbmRvd0lzQWN0aXZlKTsKICAgICByZXR1 cm4gdHJ1ZTsKQEAgLTIxNSw3ICsyMTksNyBAQCBzdGF0aWMgRWluYV9Cb29sIF9ld2tfdmlld19z bWFydF9mb2N1c19vdXQoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhKQogCiBzdGF0aWMg RWluYV9Cb29sIF9ld2tfdmlld19zbWFydF9tb3VzZV93aGVlbChFd2tfVmlld19TbWFydF9EYXRh KiBzbWFydERhdGEsIGNvbnN0IEV2YXNfRXZlbnRfTW91c2VfV2hlZWwqIHdoZWVsRXZlbnQpCiB7 Ci0gICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2Up CisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2Up OwogCiAgICAgRXZhc19Qb2ludCBwb3NpdGlvbiA9IHtzbWFydERhdGEtPnZpZXcueCwgc21hcnRE YXRhLT52aWV3Lnl9OwogICAgIHByaXYtPnBhZ2VQcm94eS0+aGFuZGxlV2hlZWxFdmVudChOYXRp dmVXZWJXaGVlbEV2ZW50KHdoZWVsRXZlbnQsICZwb3NpdGlvbikpOwpAQCAtMjI0LDcgKzIyOCw3 IEBAIHN0YXRpYyBFaW5hX0Jvb2wgX2V3a192aWV3X3NtYXJ0X21vdXNlX3doZWVsKEV3a19WaWV3 X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgY29uCiAKIHN0YXRpYyBFaW5hX0Jvb2wgX2V3a192aWV3 X3NtYXJ0X21vdXNlX2Rvd24oRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhLCBjb25zdCBF dmFzX0V2ZW50X01vdXNlX0Rvd24qIGRvd25FdmVudCkKIHsKLSAgICBFV0tfVklFV19QUklWX0dF VF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSkKKyAgICBFV0tfVklFV19QUklWX0dF VF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7CiAKICAgICBFdmFzX1BvaW50IHBv c2l0aW9uID0ge3NtYXJ0RGF0YS0+dmlldy54LCBzbWFydERhdGEtPnZpZXcueX07CiAgICAgcHJp di0+cGFnZVByb3h5LT5oYW5kbGVNb3VzZUV2ZW50KE5hdGl2ZVdlYk1vdXNlRXZlbnQoZG93bkV2 ZW50LCAmcG9zaXRpb24pKTsKQEAgLTIzMyw3ICsyMzcsNyBAQCBzdGF0aWMgRWluYV9Cb29sIF9l d2tfdmlld19zbWFydF9tb3VzZV9kb3duKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwg Y29ucwogCiBzdGF0aWMgRWluYV9Cb29sIF9ld2tfdmlld19zbWFydF9tb3VzZV91cChFd2tfVmll d19TbWFydF9EYXRhKiBzbWFydERhdGEsIGNvbnN0IEV2YXNfRXZlbnRfTW91c2VfVXAqIHVwRXZl bnQpCiB7Ci0gICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwg ZmFsc2UpCisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwg ZmFsc2UpOwogCiAgICAgRXZhc19Qb2ludCBwb3NpdGlvbiA9IHtzbWFydERhdGEtPnZpZXcueCwg c21hcnREYXRhLT52aWV3Lnl9OwogICAgIHByaXYtPnBhZ2VQcm94eS0+aGFuZGxlTW91c2VFdmVu dChOYXRpdmVXZWJNb3VzZUV2ZW50KHVwRXZlbnQsICZwb3NpdGlvbikpOwpAQCAtMjQyLDcgKzI0 Niw3IEBAIHN0YXRpYyBFaW5hX0Jvb2wgX2V3a192aWV3X3NtYXJ0X21vdXNlX3VwKEV3a19WaWV3 X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgY29uc3QKIAogc3RhdGljIEVpbmFfQm9vbCBfZXdrX3Zp ZXdfc21hcnRfbW91c2VfbW92ZShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEsIGNvbnN0 IEV2YXNfRXZlbnRfTW91c2VfTW92ZSogbW92ZUV2ZW50KQogewotICAgIEVXS19WSUVXX1BSSVZf R0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKQorICAgIEVXS19WSUVXX1BSSVZf R0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsKIAogICAgIEV2YXNfUG9pbnQg cG9zaXRpb24gPSB7c21hcnREYXRhLT52aWV3LngsIHNtYXJ0RGF0YS0+dmlldy55fTsKICAgICBw cml2LT5wYWdlUHJveHktPmhhbmRsZU1vdXNlRXZlbnQoTmF0aXZlV2ViTW91c2VFdmVudChtb3Zl RXZlbnQsICZwb3NpdGlvbikpOwpAQCAtMjUxLDcgKzI1NSw3IEBAIHN0YXRpYyBFaW5hX0Jvb2wg X2V3a192aWV3X3NtYXJ0X21vdXNlX21vdmUoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRh LCBjb25zCiAKIHN0YXRpYyBFaW5hX0Jvb2wgX2V3a192aWV3X3NtYXJ0X2tleV9kb3duKEV3a19W aWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgY29uc3QgRXZhc19FdmVudF9LZXlfRG93biogZG93 bkV2ZW50KQogewotICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHBy aXYsIGZhbHNlKQorICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHBy aXYsIGZhbHNlKTsKIAogICAgIHByaXYtPnBhZ2VQcm94eS0+aGFuZGxlS2V5Ym9hcmRFdmVudChO YXRpdmVXZWJLZXlib2FyZEV2ZW50KGRvd25FdmVudCkpOwogICAgIHJldHVybiB0cnVlOwpAQCAt MjU5LDcgKzI2Myw3IEBAIHN0YXRpYyBFaW5hX0Jvb2wgX2V3a192aWV3X3NtYXJ0X2tleV9kb3du KEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgY29uc3QKIAogc3RhdGljIEVpbmFfQm9v bCBfZXdrX3ZpZXdfc21hcnRfa2V5X3VwKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwg Y29uc3QgRXZhc19FdmVudF9LZXlfVXAqIHVwRXZlbnQpCiB7Ci0gICAgRVdLX1ZJRVdfUFJJVl9H RVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2UpCisgICAgRVdLX1ZJRVdfUFJJVl9H RVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2UpOwogCiAgICAgcHJpdi0+cGFnZVBy b3h5LT5oYW5kbGVLZXlib2FyZEV2ZW50KE5hdGl2ZVdlYktleWJvYXJkRXZlbnQodXBFdmVudCkp OwogICAgIHJldHVybiB0cnVlOwpAQCAtNjczLDcgKzY3Nyw3IEBAIHN0YXRpYyBpbmxpbmUgRXZh c19TbWFydCogX2V3a192aWV3X3NtYXJ0X2NsYXNzX25ldyh2b2lkKQogc3RhdGljIHZvaWQgX2V3 a192aWV3X2luaXRpYWxpemUoRXZhc19PYmplY3QqIGV3a1ZpZXcsIEV3a19Db250ZXh0KiBjb250 ZXh0LCBXS1BhZ2VHcm91cFJlZiBwYWdlR3JvdXBSZWYpCiB7CiAgICAgRVdLX1ZJRVdfU0RfR0VU X09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEpOwotICAgIEVXS19WSUVXX1BSSVZfR0VUX09S X1JFVFVSTihzbWFydERhdGEsIHByaXYpCisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJO KHNtYXJ0RGF0YSwgcHJpdik7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk4oY29udGV4 dCk7CiAKICAgICBpZiAocHJpdi0+cGFnZUNsaWVudCkK