92463 2012-07-26 23:28:31 -0700 [EFL][WK2] Stop using C API to interact with the page in Ewk_View 2012-07-27 04:52:43 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 61838 1 cdumez cdumez gustavo gyuyoung.kim hausmann kenneth mikhail.pozdnyakov ryuan.choi tonikitoo webkit.review.bot oldest_to_newest 680158 0 cdumez 2012-07-26 23:28:31 -0700 We currently use the C API to interact with the PageProxy in Ewk_View even though we keep a pointer to the PageProxy object. This means we call toAPI() on our PageProxy object all the time for no reason. 680169 1 154855 cdumez 2012-07-26 23:44:13 -0700 Created attachment 154855 Patch 680244 2 154855 hausmann 2012-07-27 01:09:52 -0700 Comment on attachment 154855 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=154855&action=review I think the patch looks good, apart from the boolean trap below: > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:630 > + priv->pageClient->page()->reload(true); This and the other invocation of reload() a few lines up is a classic example of the boolean trap. I suggest to replace it with a comment: ->reload(/*bypassCache*/ true); 680323 3 154880 cdumez 2012-07-27 02:08:35 -0700 Created attachment 154880 Patch Take Simon's feedback into consideration. 680324 4 154880 cdumez 2012-07-27 02:09:18 -0700 Comment on attachment 154880 Patch Patch is broken. 680326 5 154881 cdumez 2012-07-27 02:10:45 -0700 Created attachment 154881 Patch 680425 6 154881 webkit.review.bot 2012-07-27 04:14:59 -0700 Comment on attachment 154881 Patch Rejecting attachment 154881 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: Parsed 2 diffs from patch file(s). patching file Source/WebKit2/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebKit2/UIProcess/API/efl/ewk_view.cpp Hunk #3 FAILED at 593. Hunk #7 succeeded at 768 with fuzz 2. 1 out of 17 hunks FAILED -- saving rejects to file Source/WebKit2/UIProcess/API/efl/ewk_view.cpp.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force', u'--reviewer', u'Simon Haus..." exit_code: 1 cwd: /mnt/git/webkit-commit-queue/ Full output: http://queues.webkit.org/results/13373325 680434 7 154901 cdumez 2012-07-27 04:30:37 -0700 Created attachment 154901 Patch for landing Rebase on master. Could someone please cq+ ? 680453 8 154901 webkit.review.bot 2012-07-27 04:52:37 -0700 Comment on attachment 154901 Patch for landing Clearing flags on attachment: 154901 Committed r123866: <http://trac.webkit.org/changeset/123866> 680454 9 webkit.review.bot 2012-07-27 04:52:43 -0700 All reviewed patches have been landed. Closing bug. 154855 2012-07-26 23:44:13 -0700 2012-07-27 02:08:35 -0700 Patch 92463_no_capi.patch text/plain 9706 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1NjlkZDc1Li4zMGQ3ZTIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTItMDctMjYgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFN0b3AgdXNpbmcgQyBBUEkgdG8gaW50ZXJhY3Qg d2l0aCB0aGUgcGFnZSBpbiBFd2tfVmlldworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTI0NjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBTdG9wIHVzaW5nIEMgQVBJIHRvIGludGVyYWN0IHdpdGggdGhlIFBh Z2VQcm94eSBpbiBFd2tfVmlldworICAgICAgICBhbmQgdXNlIHRoZSBQYWdlUHJveHkgb2JqZWN0 IGRpcmVjdGx5LiBUaGlzIGF2b2lkcyB1c2VsZXNzCisgICAgICAgIGNvbnZlcnRpbmcgdG8gV0sg dHlwZSB1c2luZyB0b0FQSSgpIGFsbCB0aGUgdGltZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAgICAgKGV3a192aWV3X2Jhc2VfYWRkKToKKyAgICAg ICAgKGV3a192aWV3X3VyaV91cGRhdGUpOgorICAgICAgICAoZXdrX3ZpZXdfdXJpX3NldCk6Cisg ICAgICAgIChld2tfdmlld19yZWxvYWQpOgorICAgICAgICAoZXdrX3ZpZXdfcmVsb2FkX2J5cGFz c19jYWNoZSk6CisgICAgICAgIChld2tfdmlld19zdG9wKToKKyAgICAgICAgKGV3a192aWV3X2xv YWRfcHJvZ3Jlc3NfZ2V0KToKKyAgICAgICAgKGV3a192aWV3X2RldmljZV9waXhlbF9yYXRpb19z ZXQpOgorICAgICAgICAoZXdrX3ZpZXdfdGhlbWVfZ2V0KToKKyAgICAgICAgKGV3a192aWV3X2N1 cnNvcl9zZXQpOgorICAgICAgICAoZXdrX3ZpZXdfYmFjayk6CisgICAgICAgIChld2tfdmlld19m b3J3YXJkKToKKyAgICAgICAgKGV3a192aWV3X2ludGVudF9kZWxpdmVyKToKKyAgICAgICAgKGV3 a192aWV3X2JhY2tfcG9zc2libGUpOgorICAgICAgICAoZXdrX3ZpZXdfZm9yd2FyZF9wb3NzaWJs ZSk6CisgICAgICAgIChld2tfdmlld19zZXR0aW5nX2VuY29kaW5nX2N1c3RvbV9nZXQpOgorICAg ICAgICAoZXdrX3ZpZXdfc2V0dGluZ19lbmNvZGluZ19jdXN0b21fc2V0KToKKwogMjAxMi0wNy0y NiAgWmVubyBBbGJpc3NlciAgPHplbm9Ad2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2Vk IFF0IGJ1aWxkZml4IGFmdGVyIHIxMjM3ODYuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfdmlldy5jcHAKaW5kZXggYjY3MWQ3Ni4uM2Q0ZWM1ZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcApAQCAtNTQ4LDEwICs1NDgs MTIgQEAgRXZhc19PYmplY3QqIGV3a192aWV3X2Jhc2VfYWRkKEV2YXMqIGNhbnZhcywgV0tDb250 ZXh0UmVmIGNvbnRleHRSZWYsIFdLUGFnZUdyb3UKICAgICB9CiAKICAgICBwcml2LT5wYWdlQ2xp ZW50ID0gUGFnZUNsaWVudEltcGw6OmNyZWF0ZSh0b0ltcGwoY29udGV4dFJlZiksIHRvSW1wbChw YWdlR3JvdXBSZWYpLCBld2tWaWV3KTsKLSAgICBld2tfdmlld19mb3JtX2NsaWVudF9hdHRhY2go dG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpKSwgZXdrVmlldyk7Ci0gICAgZXdrX3ZpZXdf bG9hZGVyX2NsaWVudF9hdHRhY2godG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpKSwgZXdr Vmlldyk7Ci0gICAgZXdrX3ZpZXdfcG9saWN5X2NsaWVudF9hdHRhY2godG9BUEkocHJpdi0+cGFn ZUNsaWVudC0+cGFnZSgpKSwgZXdrVmlldyk7Ci0gICAgZXdrX3ZpZXdfcmVzb3VyY2VfbG9hZF9j bGllbnRfYXR0YWNoKHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSksIGV3a1ZpZXcpOwor CisgICAgV0tQYWdlUmVmIHdrUGFnZSA9IHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSk7 CisgICAgZXdrX3ZpZXdfZm9ybV9jbGllbnRfYXR0YWNoKHdrUGFnZSwgZXdrVmlldyk7CisgICAg ZXdrX3ZpZXdfbG9hZGVyX2NsaWVudF9hdHRhY2god2tQYWdlLCBld2tWaWV3KTsKKyAgICBld2tf dmlld19wb2xpY3lfY2xpZW50X2F0dGFjaCh3a1BhZ2UsIGV3a1ZpZXcpOworICAgIGV3a192aWV3 X3Jlc291cmNlX2xvYWRfY2xpZW50X2F0dGFjaCh3a1BhZ2UsIGV3a1ZpZXcpOwogCiAgICAgZXdr X3ZpZXdfdGhlbWVfc2V0KGV3a1ZpZXcsIERFRkFVTFRfVEhFTUVfUEFUSCIvZGVmYXVsdC5lZGoi KTsKIApAQCAtNTc5LDEyICs1ODEsMTEgQEAgdm9pZCBld2tfdmlld191cmlfdXBkYXRlKEV2YXNf T2JqZWN0KiBld2tWaWV3KQogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywg c21hcnREYXRhKTsKICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBw cml2KTsKIAotICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiB3a1VSTChBZG9wdFdLLCBXS1BhZ2VD b3B5QWN0aXZlVVJMKHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSkpKTsKLSAgICBpZiAo IXdrVVJMKQorICAgIFN0cmluZyBhY3RpdmVVUkwgPSBwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCkt PmFjdGl2ZVVSTCgpOworICAgIGlmIChhY3RpdmVVUkwuaXNFbXB0eSgpKQogICAgICAgICByZXR1 cm47CiAKLSAgICBDU3RyaW5nIGFjdGl2ZVVSSSA9IHRvSW1wbCh3a1VSTC5nZXQoKSktPnN0cmlu ZygpLnV0ZjgoKTsKLSAgICBpZiAoIWVpbmFfc3RyaW5nc2hhcmVfcmVwbGFjZSgmcHJpdi0+dXJp LCBhY3RpdmVVUkkuZGF0YSgpKSkKKyAgICBpZiAoIWVpbmFfc3RyaW5nc2hhcmVfcmVwbGFjZSgm cHJpdi0+dXJpLCBhY3RpdmVVUkwudXRmOCgpLmRhdGEoKSkpCiAgICAgICAgIHJldHVybjsKIAog ICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2NhbGwoZXdrVmlldywgInVyaSxjaGFuZ2Vk Iiwgc3RhdGljX2Nhc3Q8dm9pZCo+KGNvbnN0X2Nhc3Q8Y2hhcio+KHByaXYtPnVyaSkpKTsKQEAg LTU5MiwxMSArNTkzLDExIEBAIHZvaWQgZXdrX3ZpZXdfdXJpX3VwZGF0ZShFdmFzX09iamVjdCog ZXdrVmlldykKIAogRWluYV9Cb29sIGV3a192aWV3X3VyaV9zZXQoRXZhc19PYmplY3QqIGV3a1Zp ZXcsIGNvbnN0IGNoYXIqIHVyaSkKIHsKLSAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3 a1ZpZXcsIHNtYXJ0RGF0YSwgMCk7Ci0gICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNt YXJ0RGF0YSwgcHJpdiwgMCk7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3 LCBzbWFydERhdGEsIGZhbHNlKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21h cnREYXRhLCBwcml2LCBmYWxzZSk7CisgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFM KHVyaSwgZmFsc2UpOwogCi0gICAgV0tSZXRhaW5QdHI8V0tVUkxSZWY+IHVybChBZG9wdFdLLCBX S1VSTENyZWF0ZVdpdGhVVEY4Q1N0cmluZyh1cmkpKTsKLSAgICBXS1BhZ2VMb2FkVVJMKHRvQVBJ KHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSksIHVybC5nZXQoKSk7CisgICAgcHJpdi0+cGFnZUNs aWVudC0+cGFnZSgpLT5sb2FkVVJMKHVyaSk7CiAgICAgZXdrX3ZpZXdfdXJpX3VwZGF0ZShld2tW aWV3KTsKIAogICAgIHJldHVybiB0cnVlOwpAQCAtNjE1LDggKzYxNiw5IEBAIEVpbmFfQm9vbCBl d2tfdmlld19yZWxvYWQoRXZhc19PYmplY3QqIGV3a1ZpZXcpCiAgICAgRVdLX1ZJRVdfU0RfR0VU X09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEsIGZhbHNlKTsKICAgICBFV0tfVklFV19QUklW X0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7CiAKLSAgICBXS1BhZ2VSZWxv YWQodG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpKSk7CisgICAgcHJpdi0+cGFnZUNsaWVu dC0+cGFnZSgpLT5yZWxvYWQoZmFsc2UpOwogICAgIGV3a192aWV3X3VyaV91cGRhdGUoZXdrVmll dyk7CisKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAtNjI1LDggKzYyNyw5IEBAIEVpbmFfQm9v bCBld2tfdmlld19yZWxvYWRfYnlwYXNzX2NhY2hlKEV2YXNfT2JqZWN0KiBld2tWaWV3KQogICAg IEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCBmYWxzZSk7CiAg ICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2UpOwog Ci0gICAgV0tQYWdlUmVsb2FkRnJvbU9yaWdpbih0b0FQSShwcml2LT5wYWdlQ2xpZW50LT5wYWdl KCkpKTsKKyAgICBwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCktPnJlbG9hZCh0cnVlKTsKICAgICBl d2tfdmlld191cmlfdXBkYXRlKGV3a1ZpZXcpOworCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKQEAg LTYzNSw3ICs2MzgsOCBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfc3RvcChFdmFzX09iamVjdCogZXdr VmlldykKICAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwg ZmFsc2UpOwogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYs IGZhbHNlKTsKIAotICAgIFdLUGFnZVN0b3BMb2FkaW5nKHRvQVBJKHByaXYtPnBhZ2VDbGllbnQt PnBhZ2UoKSkpOworICAgIHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKS0+c3RvcExvYWRpbmcoKTsK KwogICAgIHJldHVybiB0cnVlOwogfQogCkBAIC03NjQsNyArNzY4LDcgQEAgZG91YmxlIGV3a192 aWV3X2xvYWRfcHJvZ3Jlc3NfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3KQogICAgIEVX S19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCAwKTsKICAgICBFV0tf VklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCAwKTsKIAotICAgIHJldHVy biBXS1BhZ2VHZXRFc3RpbWF0ZWRQcm9ncmVzcyh0b0FQSShwcml2LT5wYWdlQ2xpZW50LT5wYWdl KCkpKTsKKyAgICByZXR1cm4gcHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpLT5lc3RpbWF0ZWRQcm9n cmVzcygpOwogfQogCiBFaW5hX0Jvb2wgZXdrX3ZpZXdfZGV2aWNlX3BpeGVsX3JhdGlvX3NldChF dmFzX09iamVjdCogZXdrVmlldywgZmxvYXQgcmF0aW8pCkBAIC03NzMsNiArNzc3LDcgQEAgRWlu YV9Cb29sIGV3a192aWV3X2RldmljZV9waXhlbF9yYXRpb19zZXQoRXZhc19PYmplY3QqIGV3a1Zp ZXcsIGZsb2F0IHJhdGlvKQogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERh dGEsIHByaXYsIGZhbHNlKTsKIAogICAgIHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKS0+c2V0Q3Vz dG9tRGV2aWNlU2NhbGVGYWN0b3IocmF0aW8pOworCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKQEAg LTgyMyw2ICs4MjgsNyBAQCBjb25zdCBjaGFyKiBld2tfdmlld190aGVtZV9nZXQoY29uc3QgRXZh c19PYmplY3QqIGV3a1ZpZXcpCiB7CiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tW aWV3LCBzbWFydERhdGEsIDApOwogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFy dERhdGEsIHByaXYsIDApOworCiAgICAgcmV0dXJuIHByaXYtPnRoZW1lOwogfQogCkBAIC04MzQs NiArODQwLDcgQEAgdm9pZCBld2tfdmlld19jdXJzb3Jfc2V0KEV2YXNfT2JqZWN0KiBld2tWaWV3 LCBjb25zdCBDdXJzb3ImIGN1cnNvcikKICAgICBjb25zdCBjaGFyKiBncm91cCA9IGN1cnNvci5w bGF0Zm9ybUN1cnNvcigpOwogICAgIGlmICghZ3JvdXAgfHwgZ3JvdXAgPT0gcHJpdi0+Y3Vyc29y R3JvdXApCiAgICAgICAgIHJldHVybjsKKwogICAgIHByaXYtPmN1cnNvckdyb3VwID0gZ3JvdXA7 CiAKICAgICBpZiAocHJpdi0+Y3Vyc29yT2JqZWN0KQpAQCAtODkxLDExICs4OTgsMTIgQEAgRWlu YV9Cb29sIGV3a192aWV3X2JhY2soRXZhc19PYmplY3QqIGV3a1ZpZXcpCiAgICAgRVdLX1ZJRVdf U0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEsIGZhbHNlKTsKICAgICBFV0tfVklF V19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7CiAKLSAgICBXS1Bh Z2VSZWYgcGFnZVJlZiA9IHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSk7Ci0gICAgaWYg KFdLUGFnZUNhbkdvQmFjayhwYWdlUmVmKSkgewotICAgICAgICBXS1BhZ2VHb0JhY2socGFnZVJl Zik7CisgICAgV2ViUGFnZVByb3h5KiBwYWdlID0gcHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpOwor ICAgIGlmIChwYWdlLT5jYW5Hb0JhY2soKSkgeworICAgICAgICBwYWdlLT5nb0JhY2soKTsKICAg ICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQorCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCkBAIC05 MDQsMTEgKzkxMiwxMiBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfZm9yd2FyZChFdmFzX09iamVjdCog ZXdrVmlldykKICAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0 YSwgZmFsc2UpOwogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHBy aXYsIGZhbHNlKTsKIAotICAgIFdLUGFnZVJlZiBwYWdlUmVmID0gdG9BUEkocHJpdi0+cGFnZUNs aWVudC0+cGFnZSgpKTsKLSAgICBpZiAoV0tQYWdlQ2FuR29Gb3J3YXJkKHBhZ2VSZWYpKSB7Ci0g ICAgICAgIFdLUGFnZUdvRm9yd2FyZChwYWdlUmVmKTsKKyAgICBXZWJQYWdlUHJveHkqIHBhZ2Ug PSBwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCk7CisgICAgaWYgKHBhZ2UtPmNhbkdvRm9yd2FyZCgp KSB7CisgICAgICAgIHBhZ2UtPmdvRm9yd2FyZCgpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAg ICB9CisKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKQEAgLTkxOSw4ICs5MjgsOSBAQCBFaW5hX0Jv b2wgZXdrX3ZpZXdfaW50ZW50X2RlbGl2ZXIoRXZhc19PYmplY3QqIGV3a1ZpZXcsIEV3a19JbnRl bnQqIGludGVudCkKICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBw cml2LCBmYWxzZSk7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKGludGVudCwg ZmFsc2UpOwogCi0gICAgV0tQYWdlUmVmIHdrUGFnZSA9IHRvQVBJKHByaXYtPnBhZ2VDbGllbnQt PnBhZ2UoKSk7Ci0gICAgV0tQYWdlRGVsaXZlckludGVudFRvRnJhbWUod2tQYWdlLCBXS1BhZ2VH ZXRNYWluRnJhbWUod2tQYWdlKSwgZXdrX2ludGVudF9XS0ludGVudERhdGFSZWZfZ2V0KGludGVu dCkpOworICAgIFdlYlBhZ2VQcm94eSogcGFnZSA9IHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKTsK KyAgICBwYWdlLT5kZWxpdmVySW50ZW50VG9GcmFtZShwYWdlLT5tYWluRnJhbWUoKSwgdG9JbXBs KGV3a19pbnRlbnRfV0tJbnRlbnREYXRhUmVmX2dldChpbnRlbnQpKSk7CisKICAgICByZXR1cm4g dHJ1ZTsKICNlbHNlCiAgICAgcmV0dXJuIGZhbHNlOwpAQCAtOTMyLDcgKzk0Miw3IEBAIEVpbmFf Qm9vbCBld2tfdmlld19iYWNrX3Bvc3NpYmxlKEV2YXNfT2JqZWN0KiBld2tWaWV3KQogICAgIEVX S19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCBmYWxzZSk7CiAgICAg RVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2UpOwogCi0g ICAgcmV0dXJuIFdLUGFnZUNhbkdvQmFjayh0b0FQSShwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCkp KTsKKyAgICByZXR1cm4gcHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpLT5jYW5Hb0JhY2soKTsKIH0K IAogRWluYV9Cb29sIGV3a192aWV3X2ZvcndhcmRfcG9zc2libGUoRXZhc19PYmplY3QqIGV3a1Zp ZXcpCkBAIC05NDAsNyArOTUwLDcgQEAgRWluYV9Cb29sIGV3a192aWV3X2ZvcndhcmRfcG9zc2li bGUoRXZhc19PYmplY3QqIGV3a1ZpZXcpCiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihl d2tWaWV3LCBzbWFydERhdGEsIGZhbHNlKTsKICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRV Uk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7CiAKLSAgICByZXR1cm4gV0tQYWdlQ2FuR29Gb3J3 YXJkKHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSkpOworICAgIHJldHVybiBwcml2LT5w YWdlQ2xpZW50LT5wYWdlKCktPmNhbkdvRm9yd2FyZCgpOwogfQogCiB2b2lkIGV3a192aWV3X2lt YWdlX2RhdGFfc2V0KEV2YXNfT2JqZWN0KiBld2tWaWV3LCB2b2lkKiBpbWFnZURhdGEsIGNvbnN0 IEludFNpemUmIHNpemUpCkBAIC0xMDkzLDExICsxMTAzLDEyIEBAIGNvbnN0IGNoYXIqIGV3a192 aWV3X3NldHRpbmdfZW5jb2RpbmdfY3VzdG9tX2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmll dykKICAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgMCk7 CiAgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgMCk7CiAK LSAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gd2tFbmNvZGluZ05hbWUoQWRvcHRXSywgV0tQ YWdlQ29weUN1c3RvbVRleHRFbmNvZGluZ05hbWUodG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFn ZSgpKSkpOwotICAgIGlmIChXS1N0cmluZ0lzRW1wdHkod2tFbmNvZGluZ05hbWUuZ2V0KCkpKQor ICAgIFN0cmluZyBjdXN0b21FbmNvZGluZyA9IHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKS0+Y3Vz dG9tVGV4dEVuY29kaW5nTmFtZSgpOworICAgIGlmIChjdXN0b21FbmNvZGluZy5pc0VtcHR5KCkp CiAgICAgICAgIHJldHVybiAwOwogCi0gICAgZWluYV9zdHJpbmdzaGFyZV9yZXBsYWNlKCZwcml2 LT5jdXN0b21FbmNvZGluZywgdG9JbXBsKHdrRW5jb2RpbmdOYW1lLmdldCgpKS0+c3RyaW5nKCku dXRmOCgpLmRhdGEoKSk7CisgICAgZWluYV9zdHJpbmdzaGFyZV9yZXBsYWNlKCZwcml2LT5jdXN0 b21FbmNvZGluZywgY3VzdG9tRW5jb2RpbmcudXRmOCgpLmRhdGEoKSk7CisKICAgICByZXR1cm4g cHJpdi0+Y3VzdG9tRW5jb2Rpbmc7CiB9CiAKQEAgLTExMDYsOSArMTExNyw4IEBAIEVpbmFfQm9v bCBld2tfdmlld19zZXR0aW5nX2VuY29kaW5nX2N1c3RvbV9zZXQoRXZhc19PYmplY3QqIGV3a1Zp ZXcsIGNvbnN0IGNoYXIqCiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBz bWFydERhdGEsIGZhbHNlKTsKICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnRE YXRhLCBwcml2LCBmYWxzZSk7CiAKLSAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gd2tFbmNv ZGluZ05hbWUgPSBlbmNvZGluZyA/IGFkb3B0V0soV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJp bmcoZW5jb2RpbmcpKSA6IDA7CiAgICAgaWYgKGVpbmFfc3RyaW5nc2hhcmVfcmVwbGFjZSgmcHJp di0+Y3VzdG9tRW5jb2RpbmcsIGVuY29kaW5nKSkKLSAgICAgICAgV0tQYWdlU2V0Q3VzdG9tVGV4 dEVuY29kaW5nTmFtZSh0b0FQSShwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCkpLCB3a0VuY29kaW5n TmFtZS5nZXQoKSk7CisgICAgICAgIHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKS0+c2V0Q3VzdG9t VGV4dEVuY29kaW5nTmFtZShlbmNvZGluZyA/IGVuY29kaW5nIDogU3RyaW5nKCkpOwogCiAgICAg cmV0dXJuIHRydWU7CiB9Cg== 154880 2012-07-27 02:08:35 -0700 2012-07-27 02:10:45 -0700 Patch 92463_no_capi.patch text/plain 11657 cdumez G1sxbWRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cbW20KG1sxbWluZGV4IDU2OWRkNzUuLjMwZDdlMjAgMTAwNjQ0G1ttChtbMW0t LS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cbW20KG1sxbSsrKyBiL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZxtbbQobWzM2bUBAIC0xLDMgKzEsMzMgQEAbW20KG1szMm0rG1ttG1szMm0yMDEy LTA3LTI2ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+G1tt ChtbMzJtKxtbbQobWzMybSsbW20bWzMybSAgICAgICAgW0VGTF1bV0syXSBTdG9wIHVzaW5nIEMg QVBJIHRvIGludGVyYWN0IHdpdGggdGhlIHBhZ2UgaW4gRXdrX1ZpZXcbW20KG1szMm0rG1ttG1sz Mm0gICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjQ2Mxtb bQobWzMybSsbW20KG1szMm0rG1ttG1szMm0gICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLhtbbQobWzMybSsbW20KG1szMm0rG1ttG1szMm0gICAgICAgIFN0b3AgdXNpbmcgQyBBUEkg dG8gaW50ZXJhY3Qgd2l0aCB0aGUgUGFnZVByb3h5IGluIEV3a19WaWV3G1ttChtbMzJtKxtbbRtb MzJtICAgICAgICBhbmQgdXNlIHRoZSBQYWdlUHJveHkgb2JqZWN0IGRpcmVjdGx5LiBUaGlzIGF2 b2lkcyB1c2VsZXNzG1ttChtbMzJtKxtbbRtbMzJtICAgICAgICBjb252ZXJ0aW5nIHRvIFdLIHR5 cGUgdXNpbmcgdG9BUEkoKSBhbGwgdGhlIHRpbWUuG1ttChtbMzJtKxtbbQobWzMybSsbW20bWzMy bSAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6G1ttChtbMzJtKxtbbRtb MzJtICAgICAgICAoZXdrX3ZpZXdfYmFzZV9hZGQpOhtbbQobWzMybSsbW20bWzMybSAgICAgICAg KGV3a192aWV3X3VyaV91cGRhdGUpOhtbbQobWzMybSsbW20bWzMybSAgICAgICAgKGV3a192aWV3 X3VyaV9zZXQpOhtbbQobWzMybSsbW20bWzMybSAgICAgICAgKGV3a192aWV3X3JlbG9hZCk6G1tt ChtbMzJtKxtbbRtbMzJtICAgICAgICAoZXdrX3ZpZXdfcmVsb2FkX2J5cGFzc19jYWNoZSk6G1tt ChtbMzJtKxtbbRtbMzJtICAgICAgICAoZXdrX3ZpZXdfc3RvcCk6G1ttChtbMzJtKxtbbRtbMzJt ICAgICAgICAoZXdrX3ZpZXdfbG9hZF9wcm9ncmVzc19nZXQpOhtbbQobWzMybSsbW20bWzMybSAg ICAgICAgKGV3a192aWV3X2RldmljZV9waXhlbF9yYXRpb19zZXQpOhtbbQobWzMybSsbW20bWzMy bSAgICAgICAgKGV3a192aWV3X3RoZW1lX2dldCk6G1ttChtbMzJtKxtbbRtbMzJtICAgICAgICAo ZXdrX3ZpZXdfY3Vyc29yX3NldCk6G1ttChtbMzJtKxtbbRtbMzJtICAgICAgICAoZXdrX3ZpZXdf YmFjayk6G1ttChtbMzJtKxtbbRtbMzJtICAgICAgICAoZXdrX3ZpZXdfZm9yd2FyZCk6G1ttChtb MzJtKxtbbRtbMzJtICAgICAgICAoZXdrX3ZpZXdfaW50ZW50X2RlbGl2ZXIpOhtbbQobWzMybSsb W20bWzMybSAgICAgICAgKGV3a192aWV3X2JhY2tfcG9zc2libGUpOhtbbQobWzMybSsbW20bWzMy bSAgICAgICAgKGV3a192aWV3X2ZvcndhcmRfcG9zc2libGUpOhtbbQobWzMybSsbW20bWzMybSAg ICAgICAgKGV3a192aWV3X3NldHRpbmdfZW5jb2RpbmdfY3VzdG9tX2dldCk6G1ttChtbMzJtKxtb bRtbMzJtICAgICAgICAoZXdrX3ZpZXdfc2V0dGluZ19lbmNvZGluZ19jdXN0b21fc2V0KTobW20K G1szMm0rG1ttCiAyMDEyLTA3LTI2ICBaZW5vIEFsYmlzc2VyICA8emVub0B3ZWJraXQub3JnPhtb bQogG1ttCiAgICAgICAgIFVucmV2aWV3ZWQgUXQgYnVpbGRmaXggYWZ0ZXIgcjEyMzc4Ni4bW20K G1sxbWRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmll dy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAbW20K G1sxbWluZGV4IGI2NzFkNzYuLjQxMjc3ZTAgMTAwNjQ0G1ttChtbMW0tLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAbW20KG1sxbSsrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcBtbbQobWzM2bUBAIC01NDgsMTAg KzU0OCwxMiBAQBtbbSAbW21FdmFzX09iamVjdCogZXdrX3ZpZXdfYmFzZV9hZGQoRXZhcyogY2Fu dmFzLCBXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgV0tQYWdlR3JvdRtbbQogICAgIH0bW20KIBtb bQogICAgIHByaXYtPnBhZ2VDbGllbnQgPSBQYWdlQ2xpZW50SW1wbDo6Y3JlYXRlKHRvSW1wbChj b250ZXh0UmVmKSwgdG9JbXBsKHBhZ2VHcm91cFJlZiksIGV3a1ZpZXcpOxtbbQobWzMxbS0gICAg ZXdrX3ZpZXdfZm9ybV9jbGllbnRfYXR0YWNoKHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2Uo KSksIGV3a1ZpZXcpOxtbbQobWzMxbS0gICAgZXdrX3ZpZXdfbG9hZGVyX2NsaWVudF9hdHRhY2go dG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpKSwgZXdrVmlldyk7G1ttChtbMzFtLSAgICBl d2tfdmlld19wb2xpY3lfY2xpZW50X2F0dGFjaCh0b0FQSShwcml2LT5wYWdlQ2xpZW50LT5wYWdl KCkpLCBld2tWaWV3KTsbW20KG1szMW0tICAgIGV3a192aWV3X3Jlc291cmNlX2xvYWRfY2xpZW50 X2F0dGFjaCh0b0FQSShwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCkpLCBld2tWaWV3KTsbW20KG1sz Mm0rG1ttChtbMzJtKxtbbRtbMzJtICAgIFdLUGFnZVJlZiB3a1BhZ2UgPSB0b0FQSShwcml2LT5w YWdlQ2xpZW50LT5wYWdlKCkpOxtbbQobWzMybSsbW20bWzMybSAgICBld2tfdmlld19mb3JtX2Ns aWVudF9hdHRhY2god2tQYWdlLCBld2tWaWV3KTsbW20KG1szMm0rG1ttG1szMm0gICAgZXdrX3Zp ZXdfbG9hZGVyX2NsaWVudF9hdHRhY2god2tQYWdlLCBld2tWaWV3KTsbW20KG1szMm0rG1ttG1sz Mm0gICAgZXdrX3ZpZXdfcG9saWN5X2NsaWVudF9hdHRhY2god2tQYWdlLCBld2tWaWV3KTsbW20K G1szMm0rG1ttG1szMm0gICAgZXdrX3ZpZXdfcmVzb3VyY2VfbG9hZF9jbGllbnRfYXR0YWNoKHdr UGFnZSwgZXdrVmlldyk7G1ttCiAbW20KICAgICBld2tfdmlld190aGVtZV9zZXQoZXdrVmlldywg REVGQVVMVF9USEVNRV9QQVRIIi9kZWZhdWx0LmVkaiIpOxtbbQogG1ttChtbMzZtQEAgLTU3OSwx MiArNTgxLDExIEBAG1ttIBtbbXZvaWQgZXdrX3ZpZXdfdXJpX3VwZGF0ZShFdmFzX09iamVjdCog ZXdrVmlldykbW20KICAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0 RGF0YSk7G1ttCiAgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJp dik7G1ttCiAbW20KG1szMW0tICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiB3a1VSTChBZG9wdFdL LCBXS1BhZ2VDb3B5QWN0aXZlVVJMKHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSkpKTsb W20KG1szMW0tICAgIGlmICghd2tVUkwpG1ttChtbMzJtKxtbbRtbMzJtICAgIFN0cmluZyBhY3Rp dmVVUkwgPSBwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCktPmFjdGl2ZVVSTCgpOxtbbQobWzMybSsb W20bWzMybSAgICBpZiAoYWN0aXZlVVJMLmlzRW1wdHkoKSkbW20KICAgICAgICAgcmV0dXJuOxtb bQogG1ttChtbMzFtLSAgICBDU3RyaW5nIGFjdGl2ZVVSSSA9IHRvSW1wbCh3a1VSTC5nZXQoKSkt PnN0cmluZygpLnV0ZjgoKTsbW20KG1szMW0tICAgIGlmICghZWluYV9zdHJpbmdzaGFyZV9yZXBs YWNlKCZwcml2LT51cmksIGFjdGl2ZVVSSS5kYXRhKCkpKRtbbQobWzMybSsbW20bWzMybSAgICBp ZiAoIWVpbmFfc3RyaW5nc2hhcmVfcmVwbGFjZSgmcHJpdi0+dXJpLCBhY3RpdmVVUkwudXRmOCgp LmRhdGEoKSkpG1ttCiAgICAgICAgIHJldHVybjsbW20KIBtbbQogICAgIGV2YXNfb2JqZWN0X3Nt YXJ0X2NhbGxiYWNrX2NhbGwoZXdrVmlldywgInVyaSxjaGFuZ2VkIiwgc3RhdGljX2Nhc3Q8dm9p ZCo+KGNvbnN0X2Nhc3Q8Y2hhcio+KHByaXYtPnVyaSkpKTsbW20KG1szNm1AQCAtNTkyLDExICs1 OTMsMTEgQEAbW20gG1ttdm9pZCBld2tfdmlld191cmlfdXBkYXRlKEV2YXNfT2JqZWN0KiBld2tW aWV3KRtbbQogG1ttCiBFaW5hX0Jvb2wgZXdrX3ZpZXdfdXJpX3NldChFdmFzX09iamVjdCogZXdr VmlldywgY29uc3QgY2hhciogdXJpKRtbbQogextbbQobWzMxbS0gICAgRVdLX1ZJRVdfU0RfR0VU X09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEsIDApOxtbbQobWzMxbS0gICAgRVdLX1ZJRVdf UFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgMCk7G1ttChtbMzJtKxtbbRtbMzJt ICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCBmYWxzZSk7 G1ttChtbMzJtKxtbbRtbMzJtICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERh dGEsIHByaXYsIGZhbHNlKTsbW20KG1szMm0rG1ttG1szMm0gICAgRUlOQV9TQUZFVFlfT05fTlVM TF9SRVRVUk5fVkFMKHVyaSwgZmFsc2UpOxtbbQogG1ttChtbMzFtLSAgICBXS1JldGFpblB0cjxX S1VSTFJlZj4gdXJsKEFkb3B0V0ssIFdLVVJMQ3JlYXRlV2l0aFVURjhDU3RyaW5nKHVyaSkpOxtb bQobWzMxbS0gICAgV0tQYWdlTG9hZFVSTCh0b0FQSShwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCkp LCB1cmwuZ2V0KCkpOxtbbQobWzMybSsbW20bWzMybSAgICBwcml2LT5wYWdlQ2xpZW50LT5wYWdl KCktPmxvYWRVUkwodXJpKTsbW20KICAgICBld2tfdmlld191cmlfdXBkYXRlKGV3a1ZpZXcpOxtb bQogG1ttCiAgICAgcmV0dXJuIHRydWU7G1ttChtbMzZtQEAgLTYxNSw4ICs2MTYsOSBAQBtbbSAb W21FaW5hX0Jvb2wgZXdrX3ZpZXdfcmVsb2FkKEV2YXNfT2JqZWN0KiBld2tWaWV3KRtbbQogICAg IEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCBmYWxzZSk7G1tt CiAgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2Up OxtbbQogG1ttChtbMzFtLSAgICBXS1BhZ2VSZWxvYWQodG9BUEkocHJpdi0+cGFnZUNsaWVudC0+ cGFnZSgpKSk7G1ttChtbMzJtKxtbbRtbMzJtICAgIHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKS0+ cmVsb2FkKC8qcmVsb2FkRnJvbU9yaWdpbiovIGZhbHNlKTsbW20KICAgICBld2tfdmlld191cmlf dXBkYXRlKGV3a1ZpZXcpOxtbbQobWzMybSsbW20KICAgICByZXR1cm4gdHJ1ZTsbW20KIH0bW20K IBtbbQobWzM2bUBAIC02MjUsOCArNjI3LDkgQEAbW20gG1ttRWluYV9Cb29sIGV3a192aWV3X3Jl bG9hZF9ieXBhc3NfY2FjaGUoRXZhc19PYmplY3QqIGV3a1ZpZXcpG1ttCiAgICAgRVdLX1ZJRVdf U0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEsIGZhbHNlKTsbW20KICAgICBFV0tf VklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7G1ttCiAbW20K G1szMW0tICAgIFdLUGFnZVJlbG9hZEZyb21PcmlnaW4odG9BUEkocHJpdi0+cGFnZUNsaWVudC0+ cGFnZSgpKSk7G1ttChtbMzJtKxtbbRtbMzJtICAgIHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKS0+ cmVsb2FkKC8qcmVsb2FkRnJvbU9yaWdpbiovIHRydWUpOxtbbQogICAgIGV3a192aWV3X3VyaV91 cGRhdGUoZXdrVmlldyk7G1ttChtbMzJtKxtbbQogICAgIHJldHVybiB0cnVlOxtbbQogfRtbbQog G1ttChtbMzZtQEAgLTYzNSw3ICs2MzgsOCBAQBtbbSAbW21FaW5hX0Jvb2wgZXdrX3ZpZXdfc3Rv cChFdmFzX09iamVjdCogZXdrVmlldykbW20KICAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJO KGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFsc2UpOxtbbQogICAgIEVXS19WSUVXX1BSSVZfR0VUX09S X1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsbW20KIBtbbQobWzMxbS0gICAgV0tQYWdl U3RvcExvYWRpbmcodG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpKSk7G1ttChtbMzJtKxtb bRtbMzJtICAgIHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKS0+c3RvcExvYWRpbmcoKTsbW20KG1sz Mm0rG1ttCiAgICAgcmV0dXJuIHRydWU7G1ttCiB9G1ttCiAbW20KG1szNm1AQCAtNzY0LDcgKzc2 OCw3IEBAG1ttIBtbbWRvdWJsZSBld2tfdmlld19sb2FkX3Byb2dyZXNzX2dldChjb25zdCBFdmFz X09iamVjdCogZXdrVmlldykbW20KICAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1Zp ZXcsIHNtYXJ0RGF0YSwgMCk7G1ttCiAgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNt YXJ0RGF0YSwgcHJpdiwgMCk7G1ttCiAbW20KG1szMW0tICAgIHJldHVybiBXS1BhZ2VHZXRFc3Rp bWF0ZWRQcm9ncmVzcyh0b0FQSShwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCkpKTsbW20KG1szMm0r G1ttG1szMm0gICAgcmV0dXJuIHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKS0+ZXN0aW1hdGVkUHJv Z3Jlc3MoKTsbW20KIH0bW20KIBtbbQogRWluYV9Cb29sIGV3a192aWV3X2RldmljZV9waXhlbF9y YXRpb19zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGZsb2F0IHJhdGlvKRtbbQobWzM2bUBAIC03 NzMsNiArNzc3LDcgQEAbW20gG1ttRWluYV9Cb29sIGV3a192aWV3X2RldmljZV9waXhlbF9yYXRp b19zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGZsb2F0IHJhdGlvKRtbbQogICAgIEVXS19WSUVX X1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsbW20KIBtbbQogICAg IHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKS0+c2V0Q3VzdG9tRGV2aWNlU2NhbGVGYWN0b3IocmF0 aW8pOxtbbQobWzMybSsbW20KICAgICByZXR1cm4gdHJ1ZTsbW20KIH0bW20KIBtbbQobWzM2bUBA IC04MjMsNiArODI4LDcgQEAbW20gG1ttY29uc3QgY2hhciogZXdrX3ZpZXdfdGhlbWVfZ2V0KGNv bnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3KRtbbQogextbbQogICAgIEVXS19WSUVXX1NEX0dFVF9P Ul9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCAwKTsbW20KICAgICBFV0tfVklFV19QUklWX0dF VF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCAwKTsbW20KG1szMm0rG1ttCiAgICAgcmV0dXJu IHByaXYtPnRoZW1lOxtbbQogfRtbbQogG1ttChtbMzZtQEAgLTgzNCw2ICs4NDAsNyBAQBtbbSAb W212b2lkIGV3a192aWV3X2N1cnNvcl9zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IEN1 cnNvciYgY3Vyc29yKRtbbQogICAgIGNvbnN0IGNoYXIqIGdyb3VwID0gY3Vyc29yLnBsYXRmb3Jt Q3Vyc29yKCk7G1ttCiAgICAgaWYgKCFncm91cCB8fCBncm91cCA9PSBwcml2LT5jdXJzb3JHcm91 cCkbW20KICAgICAgICAgcmV0dXJuOxtbbQobWzMybSsbW20KICAgICBwcml2LT5jdXJzb3JHcm91 cCA9IGdyb3VwOxtbbQogG1ttCiAgICAgaWYgKHByaXYtPmN1cnNvck9iamVjdCkbW20KG1szNm1A QCAtODkxLDExICs4OTgsMTIgQEAbW20gG1ttRWluYV9Cb29sIGV3a192aWV3X2JhY2soRXZhc19P YmplY3QqIGV3a1ZpZXcpG1ttCiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3 LCBzbWFydERhdGEsIGZhbHNlKTsbW20KICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4o c21hcnREYXRhLCBwcml2LCBmYWxzZSk7G1ttCiAbW20KG1szMW0tICAgIFdLUGFnZVJlZiBwYWdl UmVmID0gdG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpKTsbW20KG1szMW0tICAgIGlmIChX S1BhZ2VDYW5Hb0JhY2socGFnZVJlZikpIHsbW20KG1szMW0tICAgICAgICBXS1BhZ2VHb0JhY2so cGFnZVJlZik7G1ttChtbMzJtKxtbbRtbMzJtICAgIFdlYlBhZ2VQcm94eSogcGFnZSA9IHByaXYt PnBhZ2VDbGllbnQtPnBhZ2UoKTsbW20KG1szMm0rG1ttG1szMm0gICAgaWYgKHBhZ2UtPmNhbkdv QmFjaygpKSB7G1ttChtbMzJtKxtbbRtbMzJtICAgICAgICBwYWdlLT5nb0JhY2soKTsbW20KICAg ICAgICAgcmV0dXJuIHRydWU7G1ttCiAgICAgfRtbbQobWzMybSsbW20KICAgICByZXR1cm4gZmFs c2U7G1ttCiB9G1ttCiAbW20KG1szNm1AQCAtOTA0LDExICs5MTIsMTIgQEAbW20gG1ttRWluYV9C b29sIGV3a192aWV3X2ZvcndhcmQoRXZhc19PYmplY3QqIGV3a1ZpZXcpG1ttCiAgICAgRVdLX1ZJ RVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEsIGZhbHNlKTsbW20KICAgICBF V0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7G1ttCiAb W20KG1szMW0tICAgIFdLUGFnZVJlZiBwYWdlUmVmID0gdG9BUEkocHJpdi0+cGFnZUNsaWVudC0+ cGFnZSgpKTsbW20KG1szMW0tICAgIGlmIChXS1BhZ2VDYW5Hb0ZvcndhcmQocGFnZVJlZikpIHsb W20KG1szMW0tICAgICAgICBXS1BhZ2VHb0ZvcndhcmQocGFnZVJlZik7G1ttChtbMzJtKxtbbRtb MzJtICAgIFdlYlBhZ2VQcm94eSogcGFnZSA9IHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKTsbW20K G1szMm0rG1ttG1szMm0gICAgaWYgKHBhZ2UtPmNhbkdvRm9yd2FyZCgpKSB7G1ttChtbMzJtKxtb bRtbMzJtICAgICAgICBwYWdlLT5nb0ZvcndhcmQoKTsbW20KICAgICAgICAgcmV0dXJuIHRydWU7 G1ttCiAgICAgfRtbbQobWzMybSsbW20KICAgICByZXR1cm4gZmFsc2U7G1ttCiB9G1ttCiAbW20K G1szNm1AQCAtOTE5LDggKzkyOCw5IEBAG1ttIBtbbUVpbmFfQm9vbCBld2tfdmlld19pbnRlbnRf ZGVsaXZlcihFdmFzX09iamVjdCogZXdrVmlldywgRXdrX0ludGVudCogaW50ZW50KRtbbQogICAg IEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsbW20K ICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoaW50ZW50LCBmYWxzZSk7G1ttCiAb W20KG1szMW0tICAgIFdLUGFnZVJlZiB3a1BhZ2UgPSB0b0FQSShwcml2LT5wYWdlQ2xpZW50LT5w YWdlKCkpOxtbbQobWzMxbS0gICAgV0tQYWdlRGVsaXZlckludGVudFRvRnJhbWUod2tQYWdlLCBX S1BhZ2VHZXRNYWluRnJhbWUod2tQYWdlKSwgZXdrX2ludGVudF9XS0ludGVudERhdGFSZWZfZ2V0 KGludGVudCkpOxtbbQobWzMybSsbW20bWzMybSAgICBXZWJQYWdlUHJveHkqIHBhZ2UgPSBwcml2 LT5wYWdlQ2xpZW50LT5wYWdlKCk7G1ttChtbMzJtKxtbbRtbMzJtICAgIHBhZ2UtPmRlbGl2ZXJJ bnRlbnRUb0ZyYW1lKHBhZ2UtPm1haW5GcmFtZSgpLCB0b0ltcGwoZXdrX2ludGVudF9XS0ludGVu dERhdGFSZWZfZ2V0KGludGVudCkpKTsbW20KG1szMm0rG1ttCiAgICAgcmV0dXJuIHRydWU7G1tt CiAjZWxzZRtbbQogICAgIHJldHVybiBmYWxzZTsbW20KG1szNm1AQCAtOTMyLDcgKzk0Miw3IEBA G1ttIBtbbUVpbmFfQm9vbCBld2tfdmlld19iYWNrX3Bvc3NpYmxlKEV2YXNfT2JqZWN0KiBld2tW aWV3KRtbbQogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRh LCBmYWxzZSk7G1ttCiAgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwg cHJpdiwgZmFsc2UpOxtbbQogG1ttChtbMzFtLSAgICByZXR1cm4gV0tQYWdlQ2FuR29CYWNrKHRv QVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSkpOxtbbQobWzMybSsbW20bWzMybSAgICByZXR1 cm4gcHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpLT5jYW5Hb0JhY2soKTsbW20KIH0bW20KIBtbbQog RWluYV9Cb29sIGV3a192aWV3X2ZvcndhcmRfcG9zc2libGUoRXZhc19PYmplY3QqIGV3a1ZpZXcp G1ttChtbMzZtQEAgLTk0MCw3ICs5NTAsNyBAQBtbbSAbW21FaW5hX0Jvb2wgZXdrX3ZpZXdfZm9y d2FyZF9wb3NzaWJsZShFdmFzX09iamVjdCogZXdrVmlldykbW20KICAgICBFV0tfVklFV19TRF9H RVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFsc2UpOxtbbQogICAgIEVXS19WSUVX X1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsbW20KIBtbbQobWzMx bS0gICAgcmV0dXJuIFdLUGFnZUNhbkdvRm9yd2FyZCh0b0FQSShwcml2LT5wYWdlQ2xpZW50LT5w YWdlKCkpKTsbW20KG1szMm0rG1ttG1szMm0gICAgcmV0dXJuIHByaXYtPnBhZ2VDbGllbnQtPnBh Z2UoKS0+Y2FuR29Gb3J3YXJkKCk7G1ttCiB9G1ttCiAbW20KIHZvaWQgZXdrX3ZpZXdfaW1hZ2Vf ZGF0YV9zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIHZvaWQqIGltYWdlRGF0YSwgY29uc3QgSW50 U2l6ZSYgc2l6ZSkbW20KG1szNm1AQCAtMTA5MywxMSArMTEwMywxMiBAQBtbbSAbW21jb25zdCBj aGFyKiBld2tfdmlld19zZXR0aW5nX2VuY29kaW5nX2N1c3RvbV9nZXQoY29uc3QgRXZhc19PYmpl Y3QqIGV3a1ZpZXcpG1ttCiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBz bWFydERhdGEsIDApOxtbbQogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERh dGEsIHByaXYsIDApOxtbbQogG1ttChtbMzFtLSAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4g d2tFbmNvZGluZ05hbWUoQWRvcHRXSywgV0tQYWdlQ29weUN1c3RvbVRleHRFbmNvZGluZ05hbWUo dG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpKSkpOxtbbQobWzMxbS0gICAgaWYgKFdLU3Ry aW5nSXNFbXB0eSh3a0VuY29kaW5nTmFtZS5nZXQoKSkpG1ttChtbMzJtKxtbbRtbMzJtICAgIFN0 cmluZyBjdXN0b21FbmNvZGluZyA9IHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKS0+Y3VzdG9tVGV4 dEVuY29kaW5nTmFtZSgpOxtbbQobWzMybSsbW20bWzMybSAgICBpZiAoY3VzdG9tRW5jb2Rpbmcu aXNFbXB0eSgpKRtbbQogICAgICAgICByZXR1cm4gMDsbW20KIBtbbQobWzMxbS0gICAgZWluYV9z dHJpbmdzaGFyZV9yZXBsYWNlKCZwcml2LT5jdXN0b21FbmNvZGluZywgdG9JbXBsKHdrRW5jb2Rp bmdOYW1lLmdldCgpKS0+c3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7G1ttChtbMzJtKxtbbRtbMzJt ICAgIGVpbmFfc3RyaW5nc2hhcmVfcmVwbGFjZSgmcHJpdi0+Y3VzdG9tRW5jb2RpbmcsIGN1c3Rv bUVuY29kaW5nLnV0ZjgoKS5kYXRhKCkpOxtbbQobWzMybSsbW20KICAgICByZXR1cm4gcHJpdi0+ Y3VzdG9tRW5jb2Rpbmc7G1ttCiB9G1ttCiAbW20KG1szNm1AQCAtMTEwNiw5ICsxMTE3LDggQEAb W20gG1ttRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdfZW5jb2RpbmdfY3VzdG9tX3NldChFdmFz X09iamVjdCogZXdrVmlldywgY29uc3QgY2hhciobW20KICAgICBFV0tfVklFV19TRF9HRVRfT1Jf UkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFsc2UpOxtbbQogICAgIEVXS19WSUVXX1BSSVZf R0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsbW20KIBtbbQobWzMxbS0gICAg V0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHdrRW5jb2RpbmdOYW1lID0gZW5jb2RpbmcgPyBhZG9w dFdLKFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKGVuY29kaW5nKSkgOiAwOxtbbQogICAg IGlmIChlaW5hX3N0cmluZ3NoYXJlX3JlcGxhY2UoJnByaXYtPmN1c3RvbUVuY29kaW5nLCBlbmNv ZGluZykpG1ttChtbMzFtLSAgICAgICAgV0tQYWdlU2V0Q3VzdG9tVGV4dEVuY29kaW5nTmFtZSh0 b0FQSShwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCkpLCB3a0VuY29kaW5nTmFtZS5nZXQoKSk7G1tt ChtbMzJtKxtbbRtbMzJtICAgICAgICBwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCktPnNldEN1c3Rv bVRleHRFbmNvZGluZ05hbWUoZW5jb2RpbmcgPyBlbmNvZGluZyA6IFN0cmluZygpKTsbW20KIBtb bQogICAgIHJldHVybiB0cnVlOxtbbQogfRtbbQo= 154881 2012-07-27 02:10:45 -0700 2012-07-27 04:30:37 -0700 Patch 92463_no_capi2.patch text/plain 9748 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1NjlkZDc1Li4zMGQ3ZTIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTItMDctMjYgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFN0b3AgdXNpbmcgQyBBUEkgdG8gaW50ZXJhY3Qg d2l0aCB0aGUgcGFnZSBpbiBFd2tfVmlldworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTI0NjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBTdG9wIHVzaW5nIEMgQVBJIHRvIGludGVyYWN0IHdpdGggdGhlIFBh Z2VQcm94eSBpbiBFd2tfVmlldworICAgICAgICBhbmQgdXNlIHRoZSBQYWdlUHJveHkgb2JqZWN0 IGRpcmVjdGx5LiBUaGlzIGF2b2lkcyB1c2VsZXNzCisgICAgICAgIGNvbnZlcnRpbmcgdG8gV0sg dHlwZSB1c2luZyB0b0FQSSgpIGFsbCB0aGUgdGltZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAgICAgKGV3a192aWV3X2Jhc2VfYWRkKToKKyAgICAg ICAgKGV3a192aWV3X3VyaV91cGRhdGUpOgorICAgICAgICAoZXdrX3ZpZXdfdXJpX3NldCk6Cisg ICAgICAgIChld2tfdmlld19yZWxvYWQpOgorICAgICAgICAoZXdrX3ZpZXdfcmVsb2FkX2J5cGFz c19jYWNoZSk6CisgICAgICAgIChld2tfdmlld19zdG9wKToKKyAgICAgICAgKGV3a192aWV3X2xv YWRfcHJvZ3Jlc3NfZ2V0KToKKyAgICAgICAgKGV3a192aWV3X2RldmljZV9waXhlbF9yYXRpb19z ZXQpOgorICAgICAgICAoZXdrX3ZpZXdfdGhlbWVfZ2V0KToKKyAgICAgICAgKGV3a192aWV3X2N1 cnNvcl9zZXQpOgorICAgICAgICAoZXdrX3ZpZXdfYmFjayk6CisgICAgICAgIChld2tfdmlld19m b3J3YXJkKToKKyAgICAgICAgKGV3a192aWV3X2ludGVudF9kZWxpdmVyKToKKyAgICAgICAgKGV3 a192aWV3X2JhY2tfcG9zc2libGUpOgorICAgICAgICAoZXdrX3ZpZXdfZm9yd2FyZF9wb3NzaWJs ZSk6CisgICAgICAgIChld2tfdmlld19zZXR0aW5nX2VuY29kaW5nX2N1c3RvbV9nZXQpOgorICAg ICAgICAoZXdrX3ZpZXdfc2V0dGluZ19lbmNvZGluZ19jdXN0b21fc2V0KToKKwogMjAxMi0wNy0y NiAgWmVubyBBbGJpc3NlciAgPHplbm9Ad2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2Vk IFF0IGJ1aWxkZml4IGFmdGVyIHIxMjM3ODYuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfdmlldy5jcHAKaW5kZXggYjY3MWQ3Ni4uNDEyNzdlMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcApAQCAtNTQ4LDEwICs1NDgs MTIgQEAgRXZhc19PYmplY3QqIGV3a192aWV3X2Jhc2VfYWRkKEV2YXMqIGNhbnZhcywgV0tDb250 ZXh0UmVmIGNvbnRleHRSZWYsIFdLUGFnZUdyb3UKICAgICB9CiAKICAgICBwcml2LT5wYWdlQ2xp ZW50ID0gUGFnZUNsaWVudEltcGw6OmNyZWF0ZSh0b0ltcGwoY29udGV4dFJlZiksIHRvSW1wbChw YWdlR3JvdXBSZWYpLCBld2tWaWV3KTsKLSAgICBld2tfdmlld19mb3JtX2NsaWVudF9hdHRhY2go dG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpKSwgZXdrVmlldyk7Ci0gICAgZXdrX3ZpZXdf bG9hZGVyX2NsaWVudF9hdHRhY2godG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpKSwgZXdr Vmlldyk7Ci0gICAgZXdrX3ZpZXdfcG9saWN5X2NsaWVudF9hdHRhY2godG9BUEkocHJpdi0+cGFn ZUNsaWVudC0+cGFnZSgpKSwgZXdrVmlldyk7Ci0gICAgZXdrX3ZpZXdfcmVzb3VyY2VfbG9hZF9j bGllbnRfYXR0YWNoKHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSksIGV3a1ZpZXcpOwor CisgICAgV0tQYWdlUmVmIHdrUGFnZSA9IHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSk7 CisgICAgZXdrX3ZpZXdfZm9ybV9jbGllbnRfYXR0YWNoKHdrUGFnZSwgZXdrVmlldyk7CisgICAg ZXdrX3ZpZXdfbG9hZGVyX2NsaWVudF9hdHRhY2god2tQYWdlLCBld2tWaWV3KTsKKyAgICBld2tf dmlld19wb2xpY3lfY2xpZW50X2F0dGFjaCh3a1BhZ2UsIGV3a1ZpZXcpOworICAgIGV3a192aWV3 X3Jlc291cmNlX2xvYWRfY2xpZW50X2F0dGFjaCh3a1BhZ2UsIGV3a1ZpZXcpOwogCiAgICAgZXdr X3ZpZXdfdGhlbWVfc2V0KGV3a1ZpZXcsIERFRkFVTFRfVEhFTUVfUEFUSCIvZGVmYXVsdC5lZGoi KTsKIApAQCAtNTc5LDEyICs1ODEsMTEgQEAgdm9pZCBld2tfdmlld191cmlfdXBkYXRlKEV2YXNf T2JqZWN0KiBld2tWaWV3KQogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywg c21hcnREYXRhKTsKICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBw cml2KTsKIAotICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiB3a1VSTChBZG9wdFdLLCBXS1BhZ2VD b3B5QWN0aXZlVVJMKHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSkpKTsKLSAgICBpZiAo IXdrVVJMKQorICAgIFN0cmluZyBhY3RpdmVVUkwgPSBwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCkt PmFjdGl2ZVVSTCgpOworICAgIGlmIChhY3RpdmVVUkwuaXNFbXB0eSgpKQogICAgICAgICByZXR1 cm47CiAKLSAgICBDU3RyaW5nIGFjdGl2ZVVSSSA9IHRvSW1wbCh3a1VSTC5nZXQoKSktPnN0cmlu ZygpLnV0ZjgoKTsKLSAgICBpZiAoIWVpbmFfc3RyaW5nc2hhcmVfcmVwbGFjZSgmcHJpdi0+dXJp LCBhY3RpdmVVUkkuZGF0YSgpKSkKKyAgICBpZiAoIWVpbmFfc3RyaW5nc2hhcmVfcmVwbGFjZSgm cHJpdi0+dXJpLCBhY3RpdmVVUkwudXRmOCgpLmRhdGEoKSkpCiAgICAgICAgIHJldHVybjsKIAog ICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2NhbGwoZXdrVmlldywgInVyaSxjaGFuZ2Vk Iiwgc3RhdGljX2Nhc3Q8dm9pZCo+KGNvbnN0X2Nhc3Q8Y2hhcio+KHByaXYtPnVyaSkpKTsKQEAg LTU5MiwxMSArNTkzLDExIEBAIHZvaWQgZXdrX3ZpZXdfdXJpX3VwZGF0ZShFdmFzX09iamVjdCog ZXdrVmlldykKIAogRWluYV9Cb29sIGV3a192aWV3X3VyaV9zZXQoRXZhc19PYmplY3QqIGV3a1Zp ZXcsIGNvbnN0IGNoYXIqIHVyaSkKIHsKLSAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3 a1ZpZXcsIHNtYXJ0RGF0YSwgMCk7Ci0gICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNt YXJ0RGF0YSwgcHJpdiwgMCk7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3 LCBzbWFydERhdGEsIGZhbHNlKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21h cnREYXRhLCBwcml2LCBmYWxzZSk7CisgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFM KHVyaSwgZmFsc2UpOwogCi0gICAgV0tSZXRhaW5QdHI8V0tVUkxSZWY+IHVybChBZG9wdFdLLCBX S1VSTENyZWF0ZVdpdGhVVEY4Q1N0cmluZyh1cmkpKTsKLSAgICBXS1BhZ2VMb2FkVVJMKHRvQVBJ KHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSksIHVybC5nZXQoKSk7CisgICAgcHJpdi0+cGFnZUNs aWVudC0+cGFnZSgpLT5sb2FkVVJMKHVyaSk7CiAgICAgZXdrX3ZpZXdfdXJpX3VwZGF0ZShld2tW aWV3KTsKIAogICAgIHJldHVybiB0cnVlOwpAQCAtNjE1LDggKzYxNiw5IEBAIEVpbmFfQm9vbCBl d2tfdmlld19yZWxvYWQoRXZhc19PYmplY3QqIGV3a1ZpZXcpCiAgICAgRVdLX1ZJRVdfU0RfR0VU X09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEsIGZhbHNlKTsKICAgICBFV0tfVklFV19QUklW X0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7CiAKLSAgICBXS1BhZ2VSZWxv YWQodG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpKSk7CisgICAgcHJpdi0+cGFnZUNsaWVu dC0+cGFnZSgpLT5yZWxvYWQoLypyZWxvYWRGcm9tT3JpZ2luKi8gZmFsc2UpOwogICAgIGV3a192 aWV3X3VyaV91cGRhdGUoZXdrVmlldyk7CisKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAtNjI1 LDggKzYyNyw5IEBAIEVpbmFfQm9vbCBld2tfdmlld19yZWxvYWRfYnlwYXNzX2NhY2hlKEV2YXNf T2JqZWN0KiBld2tWaWV3KQogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywg c21hcnREYXRhLCBmYWxzZSk7CiAgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0 RGF0YSwgcHJpdiwgZmFsc2UpOwogCi0gICAgV0tQYWdlUmVsb2FkRnJvbU9yaWdpbih0b0FQSShw cml2LT5wYWdlQ2xpZW50LT5wYWdlKCkpKTsKKyAgICBwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCkt PnJlbG9hZCgvKnJlbG9hZEZyb21PcmlnaW4qLyB0cnVlKTsKICAgICBld2tfdmlld191cmlfdXBk YXRlKGV3a1ZpZXcpOworCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKQEAgLTYzNSw3ICs2MzgsOCBA QCBFaW5hX0Jvb2wgZXdrX3ZpZXdfc3RvcChFdmFzX09iamVjdCogZXdrVmlldykKICAgICBFV0tf VklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFsc2UpOwogICAgIEVX S19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsKIAotICAg IFdLUGFnZVN0b3BMb2FkaW5nKHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSkpOworICAg IHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKS0+c3RvcExvYWRpbmcoKTsKKwogICAgIHJldHVybiB0 cnVlOwogfQogCkBAIC03NjQsNyArNzY4LDcgQEAgZG91YmxlIGV3a192aWV3X2xvYWRfcHJvZ3Jl c3NfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3KQogICAgIEVXS19WSUVXX1NEX0dFVF9P Ul9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCAwKTsKICAgICBFV0tfVklFV19QUklWX0dFVF9P Ul9SRVRVUk4oc21hcnREYXRhLCBwcml2LCAwKTsKIAotICAgIHJldHVybiBXS1BhZ2VHZXRFc3Rp bWF0ZWRQcm9ncmVzcyh0b0FQSShwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCkpKTsKKyAgICByZXR1 cm4gcHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpLT5lc3RpbWF0ZWRQcm9ncmVzcygpOwogfQogCiBF aW5hX0Jvb2wgZXdrX3ZpZXdfZGV2aWNlX3BpeGVsX3JhdGlvX3NldChFdmFzX09iamVjdCogZXdr VmlldywgZmxvYXQgcmF0aW8pCkBAIC03NzMsNiArNzc3LDcgQEAgRWluYV9Cb29sIGV3a192aWV3 X2RldmljZV9waXhlbF9yYXRpb19zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGZsb2F0IHJhdGlv KQogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNl KTsKIAogICAgIHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKS0+c2V0Q3VzdG9tRGV2aWNlU2NhbGVG YWN0b3IocmF0aW8pOworCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKQEAgLTgyMyw2ICs4MjgsNyBA QCBjb25zdCBjaGFyKiBld2tfdmlld190aGVtZV9nZXQoY29uc3QgRXZhc19PYmplY3QqIGV3a1Zp ZXcpCiB7CiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEs IDApOwogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIDAp OworCiAgICAgcmV0dXJuIHByaXYtPnRoZW1lOwogfQogCkBAIC04MzQsNiArODQwLDcgQEAgdm9p ZCBld2tfdmlld19jdXJzb3Jfc2V0KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25zdCBDdXJzb3Im IGN1cnNvcikKICAgICBjb25zdCBjaGFyKiBncm91cCA9IGN1cnNvci5wbGF0Zm9ybUN1cnNvcigp OwogICAgIGlmICghZ3JvdXAgfHwgZ3JvdXAgPT0gcHJpdi0+Y3Vyc29yR3JvdXApCiAgICAgICAg IHJldHVybjsKKwogICAgIHByaXYtPmN1cnNvckdyb3VwID0gZ3JvdXA7CiAKICAgICBpZiAocHJp di0+Y3Vyc29yT2JqZWN0KQpAQCAtODkxLDExICs4OTgsMTIgQEAgRWluYV9Cb29sIGV3a192aWV3 X2JhY2soRXZhc19PYmplY3QqIGV3a1ZpZXcpCiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVS Tihld2tWaWV3LCBzbWFydERhdGEsIGZhbHNlKTsKICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9S RVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7CiAKLSAgICBXS1BhZ2VSZWYgcGFnZVJlZiA9 IHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSk7Ci0gICAgaWYgKFdLUGFnZUNhbkdvQmFj ayhwYWdlUmVmKSkgewotICAgICAgICBXS1BhZ2VHb0JhY2socGFnZVJlZik7CisgICAgV2ViUGFn ZVByb3h5KiBwYWdlID0gcHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpOworICAgIGlmIChwYWdlLT5j YW5Hb0JhY2soKSkgeworICAgICAgICBwYWdlLT5nb0JhY2soKTsKICAgICAgICAgcmV0dXJuIHRy dWU7CiAgICAgfQorCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCkBAIC05MDQsMTEgKzkxMiwxMiBA QCBFaW5hX0Jvb2wgZXdrX3ZpZXdfZm9yd2FyZChFdmFzX09iamVjdCogZXdrVmlldykKICAgICBF V0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFsc2UpOwogICAg IEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsKIAot ICAgIFdLUGFnZVJlZiBwYWdlUmVmID0gdG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpKTsK LSAgICBpZiAoV0tQYWdlQ2FuR29Gb3J3YXJkKHBhZ2VSZWYpKSB7Ci0gICAgICAgIFdLUGFnZUdv Rm9yd2FyZChwYWdlUmVmKTsKKyAgICBXZWJQYWdlUHJveHkqIHBhZ2UgPSBwcml2LT5wYWdlQ2xp ZW50LT5wYWdlKCk7CisgICAgaWYgKHBhZ2UtPmNhbkdvRm9yd2FyZCgpKSB7CisgICAgICAgIHBh Z2UtPmdvRm9yd2FyZCgpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CisKICAgICByZXR1 cm4gZmFsc2U7CiB9CiAKQEAgLTkxOSw4ICs5MjgsOSBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfaW50 ZW50X2RlbGl2ZXIoRXZhc19PYmplY3QqIGV3a1ZpZXcsIEV3a19JbnRlbnQqIGludGVudCkKICAg ICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7CiAg ICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKGludGVudCwgZmFsc2UpOwogCi0gICAg V0tQYWdlUmVmIHdrUGFnZSA9IHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSk7Ci0gICAg V0tQYWdlRGVsaXZlckludGVudFRvRnJhbWUod2tQYWdlLCBXS1BhZ2VHZXRNYWluRnJhbWUod2tQ YWdlKSwgZXdrX2ludGVudF9XS0ludGVudERhdGFSZWZfZ2V0KGludGVudCkpOworICAgIFdlYlBh Z2VQcm94eSogcGFnZSA9IHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKTsKKyAgICBwYWdlLT5kZWxp dmVySW50ZW50VG9GcmFtZShwYWdlLT5tYWluRnJhbWUoKSwgdG9JbXBsKGV3a19pbnRlbnRfV0tJ bnRlbnREYXRhUmVmX2dldChpbnRlbnQpKSk7CisKICAgICByZXR1cm4gdHJ1ZTsKICNlbHNlCiAg ICAgcmV0dXJuIGZhbHNlOwpAQCAtOTMyLDcgKzk0Miw3IEBAIEVpbmFfQm9vbCBld2tfdmlld19i YWNrX3Bvc3NpYmxlKEV2YXNfT2JqZWN0KiBld2tWaWV3KQogICAgIEVXS19WSUVXX1NEX0dFVF9P Ul9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCBmYWxzZSk7CiAgICAgRVdLX1ZJRVdfUFJJVl9H RVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2UpOwogCi0gICAgcmV0dXJuIFdLUGFn ZUNhbkdvQmFjayh0b0FQSShwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCkpKTsKKyAgICByZXR1cm4g cHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpLT5jYW5Hb0JhY2soKTsKIH0KIAogRWluYV9Cb29sIGV3 a192aWV3X2ZvcndhcmRfcG9zc2libGUoRXZhc19PYmplY3QqIGV3a1ZpZXcpCkBAIC05NDAsNyAr OTUwLDcgQEAgRWluYV9Cb29sIGV3a192aWV3X2ZvcndhcmRfcG9zc2libGUoRXZhc19PYmplY3Qq IGV3a1ZpZXcpCiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERh dGEsIGZhbHNlKTsKICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBw cml2LCBmYWxzZSk7CiAKLSAgICByZXR1cm4gV0tQYWdlQ2FuR29Gb3J3YXJkKHRvQVBJKHByaXYt PnBhZ2VDbGllbnQtPnBhZ2UoKSkpOworICAgIHJldHVybiBwcml2LT5wYWdlQ2xpZW50LT5wYWdl KCktPmNhbkdvRm9yd2FyZCgpOwogfQogCiB2b2lkIGV3a192aWV3X2ltYWdlX2RhdGFfc2V0KEV2 YXNfT2JqZWN0KiBld2tWaWV3LCB2b2lkKiBpbWFnZURhdGEsIGNvbnN0IEludFNpemUmIHNpemUp CkBAIC0xMDkzLDExICsxMTAzLDEyIEBAIGNvbnN0IGNoYXIqIGV3a192aWV3X3NldHRpbmdfZW5j b2RpbmdfY3VzdG9tX2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmlldykKICAgICBFV0tfVklF V19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgMCk7CiAgICAgRVdLX1ZJRVdf UFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgMCk7CiAKLSAgICBXS1JldGFpblB0 cjxXS1N0cmluZ1JlZj4gd2tFbmNvZGluZ05hbWUoQWRvcHRXSywgV0tQYWdlQ29weUN1c3RvbVRl eHRFbmNvZGluZ05hbWUodG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpKSkpOwotICAgIGlm IChXS1N0cmluZ0lzRW1wdHkod2tFbmNvZGluZ05hbWUuZ2V0KCkpKQorICAgIFN0cmluZyBjdXN0 b21FbmNvZGluZyA9IHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKS0+Y3VzdG9tVGV4dEVuY29kaW5n TmFtZSgpOworICAgIGlmIChjdXN0b21FbmNvZGluZy5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVy biAwOwogCi0gICAgZWluYV9zdHJpbmdzaGFyZV9yZXBsYWNlKCZwcml2LT5jdXN0b21FbmNvZGlu ZywgdG9JbXBsKHdrRW5jb2RpbmdOYW1lLmdldCgpKS0+c3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7 CisgICAgZWluYV9zdHJpbmdzaGFyZV9yZXBsYWNlKCZwcml2LT5jdXN0b21FbmNvZGluZywgY3Vz dG9tRW5jb2RpbmcudXRmOCgpLmRhdGEoKSk7CisKICAgICByZXR1cm4gcHJpdi0+Y3VzdG9tRW5j b2Rpbmc7CiB9CiAKQEAgLTExMDYsOSArMTExNyw4IEBAIEVpbmFfQm9vbCBld2tfdmlld19zZXR0 aW5nX2VuY29kaW5nX2N1c3RvbV9zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IGNoYXIq CiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEsIGZhbHNl KTsKICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxz ZSk7CiAKLSAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gd2tFbmNvZGluZ05hbWUgPSBlbmNv ZGluZyA/IGFkb3B0V0soV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoZW5jb2RpbmcpKSA6 IDA7CiAgICAgaWYgKGVpbmFfc3RyaW5nc2hhcmVfcmVwbGFjZSgmcHJpdi0+Y3VzdG9tRW5jb2Rp bmcsIGVuY29kaW5nKSkKLSAgICAgICAgV0tQYWdlU2V0Q3VzdG9tVGV4dEVuY29kaW5nTmFtZSh0 b0FQSShwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCkpLCB3a0VuY29kaW5nTmFtZS5nZXQoKSk7Cisg ICAgICAgIHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKS0+c2V0Q3VzdG9tVGV4dEVuY29kaW5nTmFt ZShlbmNvZGluZyA/IGVuY29kaW5nIDogU3RyaW5nKCkpOwogCiAgICAgcmV0dXJuIHRydWU7CiB9 Cg== 154901 2012-07-27 04:30:37 -0700 2012-07-27 04:52:37 -0700 Patch for landing 92463_no_capi.patch text/plain 9609 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwOTYzODc1Li4zMzE2NzExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTItMDctMjYgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFN0b3AgdXNpbmcgQyBBUEkgdG8gaW50ZXJhY3Qg d2l0aCB0aGUgcGFnZSBpbiBFd2tfVmlldworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTI0NjMKKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVz bWFubi4KKworICAgICAgICBTdG9wIHVzaW5nIEMgQVBJIHRvIGludGVyYWN0IHdpdGggdGhlIFBh Z2VQcm94eSBpbiBFd2tfVmlldworICAgICAgICBhbmQgdXNlIHRoZSBQYWdlUHJveHkgb2JqZWN0 IGRpcmVjdGx5LiBUaGlzIGF2b2lkcyB1c2VsZXNzCisgICAgICAgIGNvbnZlcnRpbmcgdG8gV0sg dHlwZSB1c2luZyB0b0FQSSgpIGFsbCB0aGUgdGltZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAgICAgKGV3a192aWV3X2Jhc2VfYWRkKToKKyAgICAg ICAgKGV3a192aWV3X3VyaV91cGRhdGUpOgorICAgICAgICAoZXdrX3ZpZXdfdXJpX3NldCk6Cisg ICAgICAgIChld2tfdmlld19yZWxvYWQpOgorICAgICAgICAoZXdrX3ZpZXdfcmVsb2FkX2J5cGFz c19jYWNoZSk6CisgICAgICAgIChld2tfdmlld19zdG9wKToKKyAgICAgICAgKGV3a192aWV3X2xv YWRfcHJvZ3Jlc3NfZ2V0KToKKyAgICAgICAgKGV3a192aWV3X2RldmljZV9waXhlbF9yYXRpb19z ZXQpOgorICAgICAgICAoZXdrX3ZpZXdfdGhlbWVfZ2V0KToKKyAgICAgICAgKGV3a192aWV3X2N1 cnNvcl9zZXQpOgorICAgICAgICAoZXdrX3ZpZXdfYmFjayk6CisgICAgICAgIChld2tfdmlld19m b3J3YXJkKToKKyAgICAgICAgKGV3a192aWV3X2ludGVudF9kZWxpdmVyKToKKyAgICAgICAgKGV3 a192aWV3X2JhY2tfcG9zc2libGUpOgorICAgICAgICAoZXdrX3ZpZXdfZm9yd2FyZF9wb3NzaWJs ZSk6CisgICAgICAgIChld2tfdmlld19zZXR0aW5nX2VuY29kaW5nX2N1c3RvbV9nZXQpOgorICAg ICAgICAoZXdrX3ZpZXdfc2V0dGluZ19lbmNvZGluZ19jdXN0b21fc2V0KToKKwogMjAxMi0wNy0y NyAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50ZWwuY29tPgogCiAgICAg ICAgIFtFRkxdW1dLMl0gQWRkIG1vcmUgRXdrX1ZpZXcgdW5pdCB0ZXN0cwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCmluZGV4IDdjZGMxYzMuLmIyOTUz MDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAK QEAgLTU0OCwxMCArNTQ4LDEyIEBAIEV2YXNfT2JqZWN0KiBld2tfdmlld19iYXNlX2FkZChFdmFz KiBjYW52YXMsIFdLQ29udGV4dFJlZiBjb250ZXh0UmVmLCBXS1BhZ2VHcm91CiAgICAgfQogCiAg ICAgcHJpdi0+cGFnZUNsaWVudCA9IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGUodG9JbXBsKGNvbnRl eHRSZWYpLCB0b0ltcGwocGFnZUdyb3VwUmVmKSwgZXdrVmlldyk7Ci0gICAgZXdrX3ZpZXdfZm9y bV9jbGllbnRfYXR0YWNoKHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSksIGV3a1ZpZXcp OwotICAgIGV3a192aWV3X2xvYWRlcl9jbGllbnRfYXR0YWNoKHRvQVBJKHByaXYtPnBhZ2VDbGll bnQtPnBhZ2UoKSksIGV3a1ZpZXcpOwotICAgIGV3a192aWV3X3BvbGljeV9jbGllbnRfYXR0YWNo KHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSksIGV3a1ZpZXcpOwotICAgIGV3a192aWV3 X3Jlc291cmNlX2xvYWRfY2xpZW50X2F0dGFjaCh0b0FQSShwcml2LT5wYWdlQ2xpZW50LT5wYWdl KCkpLCBld2tWaWV3KTsKKworICAgIFdLUGFnZVJlZiB3a1BhZ2UgPSB0b0FQSShwcml2LT5wYWdl Q2xpZW50LT5wYWdlKCkpOworICAgIGV3a192aWV3X2Zvcm1fY2xpZW50X2F0dGFjaCh3a1BhZ2Us IGV3a1ZpZXcpOworICAgIGV3a192aWV3X2xvYWRlcl9jbGllbnRfYXR0YWNoKHdrUGFnZSwgZXdr Vmlldyk7CisgICAgZXdrX3ZpZXdfcG9saWN5X2NsaWVudF9hdHRhY2god2tQYWdlLCBld2tWaWV3 KTsKKyAgICBld2tfdmlld19yZXNvdXJjZV9sb2FkX2NsaWVudF9hdHRhY2god2tQYWdlLCBld2tW aWV3KTsKIAogICAgIGV3a192aWV3X3RoZW1lX3NldChld2tWaWV3LCBERUZBVUxUX1RIRU1FX1BB VEgiL2RlZmF1bHQuZWRqIik7CiAKQEAgLTU3OSwxMiArNTgxLDExIEBAIHZvaWQgZXdrX3ZpZXdf dXJpX3VwZGF0ZShFdmFzX09iamVjdCogZXdrVmlldykKICAgICBFV0tfVklFV19TRF9HRVRfT1Jf UkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSk7CiAgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVU VVJOKHNtYXJ0RGF0YSwgcHJpdik7CiAKLSAgICBXS1JldGFpblB0cjxXS1VSTFJlZj4gd2tVUkwo QWRvcHRXSywgV0tQYWdlQ29weUFjdGl2ZVVSTCh0b0FQSShwcml2LT5wYWdlQ2xpZW50LT5wYWdl KCkpKSk7Ci0gICAgaWYgKCF3a1VSTCkKKyAgICBTdHJpbmcgYWN0aXZlVVJMID0gcHJpdi0+cGFn ZUNsaWVudC0+cGFnZSgpLT5hY3RpdmVVUkwoKTsKKyAgICBpZiAoYWN0aXZlVVJMLmlzRW1wdHko KSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgQ1N0cmluZyBhY3RpdmVVUkkgPSB0b0ltcGwod2tV UkwuZ2V0KCkpLT5zdHJpbmcoKS51dGY4KCk7Ci0gICAgaWYgKCFlaW5hX3N0cmluZ3NoYXJlX3Jl cGxhY2UoJnByaXYtPnVyaSwgYWN0aXZlVVJJLmRhdGEoKSkpCisgICAgaWYgKCFlaW5hX3N0cmlu Z3NoYXJlX3JlcGxhY2UoJnByaXYtPnVyaSwgYWN0aXZlVVJMLnV0ZjgoKS5kYXRhKCkpKQogICAg ICAgICByZXR1cm47CiAKICAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19jYWxsKGV3a1Zp ZXcsICJ1cmksY2hhbmdlZCIsIHN0YXRpY19jYXN0PHZvaWQqPihjb25zdF9jYXN0PGNoYXIqPihw cml2LT51cmkpKSk7CkBAIC01OTQsOSArNTk1LDkgQEAgRWluYV9Cb29sIGV3a192aWV3X3VyaV9z ZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IGNoYXIqIHVyaSkKIHsKICAgICBFV0tfVklF V19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFsc2UpOwogICAgIEVXS19W SUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsKKyAgICBFSU5B X1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwodXJpLCBmYWxzZSk7CiAKLSAgICBXS1JldGFpblB0 cjxXS1VSTFJlZj4gdXJsKEFkb3B0V0ssIFdLVVJMQ3JlYXRlV2l0aFVURjhDU3RyaW5nKHVyaSkp OwotICAgIFdLUGFnZUxvYWRVUkwodG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpKSwgdXJs LmdldCgpKTsKKyAgICBwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCktPmxvYWRVUkwodXJpKTsKICAg ICBld2tfdmlld191cmlfdXBkYXRlKGV3a1ZpZXcpOwogCiAgICAgcmV0dXJuIHRydWU7CkBAIC02 MTUsOCArNjE2LDkgQEAgRWluYV9Cb29sIGV3a192aWV3X3JlbG9hZChFdmFzX09iamVjdCogZXdr VmlldykKICAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwg ZmFsc2UpOwogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYs IGZhbHNlKTsKIAotICAgIFdLUGFnZVJlbG9hZCh0b0FQSShwcml2LT5wYWdlQ2xpZW50LT5wYWdl KCkpKTsKKyAgICBwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCktPnJlbG9hZCgvKnJlbG9hZEZyb21P cmlnaW4qLyBmYWxzZSk7CiAgICAgZXdrX3ZpZXdfdXJpX3VwZGF0ZShld2tWaWV3KTsKKwogICAg IHJldHVybiB0cnVlOwogfQogCkBAIC02MjUsOCArNjI3LDkgQEAgRWluYV9Cb29sIGV3a192aWV3 X3JlbG9hZF9ieXBhc3NfY2FjaGUoRXZhc19PYmplY3QqIGV3a1ZpZXcpCiAgICAgRVdLX1ZJRVdf U0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEsIGZhbHNlKTsKICAgICBFV0tfVklF V19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7CiAKLSAgICBXS1Bh Z2VSZWxvYWRGcm9tT3JpZ2luKHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSkpOworICAg IHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKS0+cmVsb2FkKC8qcmVsb2FkRnJvbU9yaWdpbiovIHRy dWUpOwogICAgIGV3a192aWV3X3VyaV91cGRhdGUoZXdrVmlldyk7CisKICAgICByZXR1cm4gdHJ1 ZTsKIH0KIApAQCAtNjM1LDcgKzYzOCw4IEBAIEVpbmFfQm9vbCBld2tfdmlld19zdG9wKEV2YXNf T2JqZWN0KiBld2tWaWV3KQogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywg c21hcnREYXRhLCBmYWxzZSk7CiAgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0 RGF0YSwgcHJpdiwgZmFsc2UpOwogCi0gICAgV0tQYWdlU3RvcExvYWRpbmcodG9BUEkocHJpdi0+ cGFnZUNsaWVudC0+cGFnZSgpKSk7CisgICAgcHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpLT5zdG9w TG9hZGluZygpOworCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKQEAgLTc2NCw3ICs3NjgsNyBAQCBk b3VibGUgZXdrX3ZpZXdfbG9hZF9wcm9ncmVzc19nZXQoY29uc3QgRXZhc19PYmplY3QqIGV3a1Zp ZXcpCiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEsIC0x LjApOwogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIC0x LjApOwogCi0gICAgcmV0dXJuIFdLUGFnZUdldEVzdGltYXRlZFByb2dyZXNzKHRvQVBJKHByaXYt PnBhZ2VDbGllbnQtPnBhZ2UoKSkpOworICAgIHJldHVybiBwcml2LT5wYWdlQ2xpZW50LT5wYWdl KCktPmVzdGltYXRlZFByb2dyZXNzKCk7CiB9CiAKIEVpbmFfQm9vbCBld2tfdmlld19kZXZpY2Vf cGl4ZWxfcmF0aW9fc2V0KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBmbG9hdCByYXRpbykKQEAgLTc3 Myw2ICs3NzcsNyBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfZGV2aWNlX3BpeGVsX3JhdGlvX3NldChF dmFzX09iamVjdCogZXdrVmlldywgZmxvYXQgcmF0aW8pCiAgICAgRVdLX1ZJRVdfUFJJVl9HRVRf T1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2UpOwogCiAgICAgcHJpdi0+cGFnZUNsaWVu dC0+cGFnZSgpLT5zZXRDdXN0b21EZXZpY2VTY2FsZUZhY3RvcihyYXRpbyk7CisKICAgICByZXR1 cm4gdHJ1ZTsKIH0KIApAQCAtODIzLDYgKzgyOCw3IEBAIGNvbnN0IGNoYXIqIGV3a192aWV3X3Ro ZW1lX2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmlldykKIHsKICAgICBFV0tfVklFV19TRF9H RVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgMCk7CiAgICAgRVdLX1ZJRVdfUFJJVl9H RVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgMCk7CisKICAgICByZXR1cm4gcHJpdi0+dGhl bWU7CiB9CiAKQEAgLTgzNCw2ICs4NDAsNyBAQCB2b2lkIGV3a192aWV3X2N1cnNvcl9zZXQoRXZh c19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IEN1cnNvciYgY3Vyc29yKQogICAgIGNvbnN0IGNoYXIq IGdyb3VwID0gY3Vyc29yLnBsYXRmb3JtQ3Vyc29yKCk7CiAgICAgaWYgKCFncm91cCB8fCBncm91 cCA9PSBwcml2LT5jdXJzb3JHcm91cCkKICAgICAgICAgcmV0dXJuOworCiAgICAgcHJpdi0+Y3Vy c29yR3JvdXAgPSBncm91cDsKIAogICAgIGlmIChwcml2LT5jdXJzb3JPYmplY3QpCkBAIC04OTEs MTEgKzg5OCwxMiBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfYmFjayhFdmFzX09iamVjdCogZXdrVmll dykKICAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFs c2UpOwogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZh bHNlKTsKIAotICAgIFdLUGFnZVJlZiBwYWdlUmVmID0gdG9BUEkocHJpdi0+cGFnZUNsaWVudC0+ cGFnZSgpKTsKLSAgICBpZiAoV0tQYWdlQ2FuR29CYWNrKHBhZ2VSZWYpKSB7Ci0gICAgICAgIFdL UGFnZUdvQmFjayhwYWdlUmVmKTsKKyAgICBXZWJQYWdlUHJveHkqIHBhZ2UgPSBwcml2LT5wYWdl Q2xpZW50LT5wYWdlKCk7CisgICAgaWYgKHBhZ2UtPmNhbkdvQmFjaygpKSB7CisgICAgICAgIHBh Z2UtPmdvQmFjaygpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CisKICAgICByZXR1cm4g ZmFsc2U7CiB9CiAKQEAgLTkwNCwxMSArOTEyLDEyIEBAIEVpbmFfQm9vbCBld2tfdmlld19mb3J3 YXJkKEV2YXNfT2JqZWN0KiBld2tWaWV3KQogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4o ZXdrVmlldywgc21hcnREYXRhLCBmYWxzZSk7CiAgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVU VVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2UpOwogCi0gICAgV0tQYWdlUmVmIHBhZ2VSZWYgPSB0 b0FQSShwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCkpOwotICAgIGlmIChXS1BhZ2VDYW5Hb0Zvcndh cmQocGFnZVJlZikpIHsKLSAgICAgICAgV0tQYWdlR29Gb3J3YXJkKHBhZ2VSZWYpOworICAgIFdl YlBhZ2VQcm94eSogcGFnZSA9IHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKTsKKyAgICBpZiAocGFn ZS0+Y2FuR29Gb3J3YXJkKCkpIHsKKyAgICAgICAgcGFnZS0+Z29Gb3J3YXJkKCk7CiAgICAgICAg IHJldHVybiB0cnVlOwogICAgIH0KKwogICAgIHJldHVybiBmYWxzZTsKIH0KIApAQCAtOTE5LDgg KzkyOCw5IEBAIEVpbmFfQm9vbCBld2tfdmlld19pbnRlbnRfZGVsaXZlcihFdmFzX09iamVjdCog ZXdrVmlldywgRXdrX0ludGVudCogaW50ZW50KQogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JF VFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsKICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JF VFVSTl9WQUwoaW50ZW50LCBmYWxzZSk7CiAKLSAgICBXS1BhZ2VSZWYgd2tQYWdlID0gdG9BUEko cHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpKTsKLSAgICBXS1BhZ2VEZWxpdmVySW50ZW50VG9GcmFt ZSh3a1BhZ2UsIFdLUGFnZUdldE1haW5GcmFtZSh3a1BhZ2UpLCBld2tfaW50ZW50X1dLSW50ZW50 RGF0YVJlZl9nZXQoaW50ZW50KSk7CisgICAgV2ViUGFnZVByb3h5KiBwYWdlID0gcHJpdi0+cGFn ZUNsaWVudC0+cGFnZSgpOworICAgIHBhZ2UtPmRlbGl2ZXJJbnRlbnRUb0ZyYW1lKHBhZ2UtPm1h aW5GcmFtZSgpLCB0b0ltcGwoZXdrX2ludGVudF9XS0ludGVudERhdGFSZWZfZ2V0KGludGVudCkp KTsKKwogICAgIHJldHVybiB0cnVlOwogI2Vsc2UKICAgICByZXR1cm4gZmFsc2U7CkBAIC05MzIs NyArOTQyLDcgQEAgRWluYV9Cb29sIGV3a192aWV3X2JhY2tfcG9zc2libGUoRXZhc19PYmplY3Qq IGV3a1ZpZXcpCiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERh dGEsIGZhbHNlKTsKICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBw cml2LCBmYWxzZSk7CiAKLSAgICByZXR1cm4gV0tQYWdlQ2FuR29CYWNrKHRvQVBJKHByaXYtPnBh Z2VDbGllbnQtPnBhZ2UoKSkpOworICAgIHJldHVybiBwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCkt PmNhbkdvQmFjaygpOwogfQogCiBFaW5hX0Jvb2wgZXdrX3ZpZXdfZm9yd2FyZF9wb3NzaWJsZShF dmFzX09iamVjdCogZXdrVmlldykKQEAgLTk0MCw3ICs5NTAsNyBAQCBFaW5hX0Jvb2wgZXdrX3Zp ZXdfZm9yd2FyZF9wb3NzaWJsZShFdmFzX09iamVjdCogZXdrVmlldykKICAgICBFV0tfVklFV19T RF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFsc2UpOwogICAgIEVXS19WSUVX X1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsKIAotICAgIHJldHVy biBXS1BhZ2VDYW5Hb0ZvcndhcmQodG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpKSk7Cisg ICAgcmV0dXJuIHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKS0+Y2FuR29Gb3J3YXJkKCk7CiB9CiAK IHZvaWQgZXdrX3ZpZXdfaW1hZ2VfZGF0YV9zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIHZvaWQq IGltYWdlRGF0YSwgY29uc3QgSW50U2l6ZSYgc2l6ZSkKQEAgLTEwOTMsMTEgKzExMDMsMTIgQEAg Y29uc3QgY2hhciogZXdrX3ZpZXdfc2V0dGluZ19lbmNvZGluZ19jdXN0b21fZ2V0KGNvbnN0IEV2 YXNfT2JqZWN0KiBld2tWaWV3KQogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmll dywgc21hcnREYXRhLCAwKTsKICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnRE YXRhLCBwcml2LCAwKTsKIAotICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiB3a0VuY29kaW5n TmFtZShBZG9wdFdLLCBXS1BhZ2VDb3B5Q3VzdG9tVGV4dEVuY29kaW5nTmFtZSh0b0FQSShwcml2 LT5wYWdlQ2xpZW50LT5wYWdlKCkpKSk7Ci0gICAgaWYgKFdLU3RyaW5nSXNFbXB0eSh3a0VuY29k aW5nTmFtZS5nZXQoKSkpCisgICAgU3RyaW5nIGN1c3RvbUVuY29kaW5nID0gcHJpdi0+cGFnZUNs aWVudC0+cGFnZSgpLT5jdXN0b21UZXh0RW5jb2RpbmdOYW1lKCk7CisgICAgaWYgKGN1c3RvbUVu Y29kaW5nLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBlaW5hX3N0cmluZ3No YXJlX3JlcGxhY2UoJnByaXYtPmN1c3RvbUVuY29kaW5nLCB0b0ltcGwod2tFbmNvZGluZ05hbWUu Z2V0KCkpLT5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKKyAgICBlaW5hX3N0cmluZ3NoYXJlX3Jl cGxhY2UoJnByaXYtPmN1c3RvbUVuY29kaW5nLCBjdXN0b21FbmNvZGluZy51dGY4KCkuZGF0YSgp KTsKKwogICAgIHJldHVybiBwcml2LT5jdXN0b21FbmNvZGluZzsKIH0KIApAQCAtMTEwNiw5ICsx MTE3LDggQEAgRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdfZW5jb2RpbmdfY3VzdG9tX3NldChF dmFzX09iamVjdCogZXdrVmlldywgY29uc3QgY2hhcioKICAgICBFV0tfVklFV19TRF9HRVRfT1Jf UkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFsc2UpOwogICAgIEVXS19WSUVXX1BSSVZfR0VU X09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsKIAotICAgIFdLUmV0YWluUHRyPFdL U3RyaW5nUmVmPiB3a0VuY29kaW5nTmFtZSA9IGVuY29kaW5nID8gYWRvcHRXSyhXS1N0cmluZ0Ny ZWF0ZVdpdGhVVEY4Q1N0cmluZyhlbmNvZGluZykpIDogMDsKICAgICBpZiAoZWluYV9zdHJpbmdz aGFyZV9yZXBsYWNlKCZwcml2LT5jdXN0b21FbmNvZGluZywgZW5jb2RpbmcpKQotICAgICAgICBX S1BhZ2VTZXRDdXN0b21UZXh0RW5jb2RpbmdOYW1lKHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBh Z2UoKSksIHdrRW5jb2RpbmdOYW1lLmdldCgpKTsKKyAgICAgICAgcHJpdi0+cGFnZUNsaWVudC0+ cGFnZSgpLT5zZXRDdXN0b21UZXh0RW5jb2RpbmdOYW1lKGVuY29kaW5nID8gZW5jb2RpbmcgOiBT dHJpbmcoKSk7CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0K