7790 2006-03-15 17:17:03 -0800 ondblclick doesn't fire when attached with addEventListener 2006-06-13 09:43:35 -0700 1 1 1 Unclassified WebKit JavaScriptCore 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 beau eric eric oldest_to_newest 36495 0 beau 2006-03-15 17:17:03 -0800 ondblclick doesn't fire when attached with addEventListener. 36496 1 7097 beau 2006-03-15 17:17:25 -0800 Created attachment 7097 testcase 36508 2 eric 2006-03-15 20:07:19 -0800 Bah. It turns out that internally we use khtmlDblclick. Likely for some historical reason. That's just wrong, so I'll fix it. But a work-around for site authors would be to use: elem.addEventListener('khtmlDblclick', handler, false); instead. Or just set the elm.dblclick property directly. 36514 3 7104 eric 2006-03-15 21:58:43 -0800 Created attachment 7104 Fixes addEventListener("dblclick"... 36518 4 eric 2006-03-15 22:12:08 -0800 Thanks for the bug, and the great test case! 36686 5 eric 2006-03-16 23:57:39 -0800 Looking at the code for the Safari 2.0.3 release branch, it looks like it's not possible there. It was explicitly disallowed for whatever reason. khtmlDblclick worked on all nighties prior to this fix. 45489 6 eric 2006-06-13 09:43:35 -0700 To restate: khtmlDblClick is *not* a valid workarond for 1.3 or 2.0. The only trick I know of working is using a timer to measure the time between two consecutive mouse clicks - if time < 300ms and the target is the same in both cases, I trigger a "virtual" dbl-click. (thanks to Jorge Biaggini for that tip) 7097 2006-03-15 17:17:25 -0800 2006-03-15 17:17:25 -0800 testcase safari_dblclick.html text/html 946 beau PGh0bWw+CjxoZWFkPgoJPHN0eWxlPgoJCSNjbGlja19hcmVhMQoJCXsKCQkJYmFja2dyb3VuZDoJ cmVkOwoJCX0KCQkjY2xpY2tfYXJlYTIKCQl7CgkJCWJhY2tncm91bmQ6CWJsdWU7CgkJCW1hcmdp bi1sZWZ0OiAxMHB4OwoJCX0KCQkudGVzdGFyZWEKCQl7CgkJCWZsb2F0OiBsZWZ0OwoJCQl3aWR0 aDogMjAwcHg7CgkJCWhlaWdodDogMTAwcHg7CgkJCWNvbG9yOiB3aGl0ZTsKCQkJdGV4dC1hbGln bjogY2VudGVyOwoJCQlwYWRkaW5nLXRvcDogNTBweDsKCQkJZm9udC1mYW1pbHk6IG1vbm9zcGFj ZTsKCQl9Cgk8L3N0eWxlPgoJPHNjcmlwdD4KCQlmdW5jdGlvbiBoYW5kbGVyKCkKCQl7CgkJCWFs ZXJ0KCJEb3VibGUgQ2xpY2sgRmlyZWQhIik7CgkJfQoJCQoJCXdpbmRvdy5vbmxvYWQgPSBmdW5j dGlvbigpCgkJewoJCQl2YXIgZWxlbSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjbGlja19h cmVhMSIpOwoJCQlpZiAoZWxlbS5hZGRFdmVudExpc3RlbmVyKQoJCQl7CgkJCQllbGVtLmFkZEV2 ZW50TGlzdGVuZXIoJ2RibGNsaWNrJywgaGFuZGxlciwgZmFsc2UpOwoJCQl9CgoJCQl2YXIgZWxl bSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjbGlja19hcmVhMiIpOwoJCQllbGVtLm9uZGJs Y2xpY2sgPSBoYW5kbGVyOwoJCX0KCTwvc2NyaXB0Pgo8L2hlYWQ+Cjxib2R5Pgo8IS0tIFNvdXJj ZTogaHR0cDovL21pa2VidWxtYW4udHlwZXBhZC5jb20veW91X2xvdmVfbWlrZV9idWxtYW4vMjAw NS8xMS9zYWZhcmlfYWRkZXZlbnQuaHRtbCAtLT4KPGRpdiBpZD0iY2xpY2tfYXJlYTEiIGNsYXNz PSJ0ZXN0YXJlYSI+VGhpcyBhcmVhIHVzZXMgZWxlbS5hZGRFdmVudExpc3RlbmVyPC9kaXY+Cjxk aXYgaWQ9ImNsaWNrX2FyZWEyIiBjbGFzcz0idGVzdGFyZWEiPlRoaXMgYXJlYSB1c2VzIGVsZW0u b25kYmxjbGljazwvZGl2PgoKPC9ib2R5Pgo8L2h0bWw+Cg== 7104 2006-03-15 21:58:43 -0800 2006-03-15 22:06:50 -0800 Fixes addEventListener("dblclick"... dblclick.patch text/plain 22110 eric SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDEzMzIzKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTAgQEAKKzIwMDYtMDMtMTUgIEVyaWMgU2VpZGVsICA8ZXNl aWRlbEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBmYXN0L2V2ZW50cy9kYmxjbGljay1hZGRFdmVudExpc3RlbmVyLWV4cGVjdGVk LnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9ldmVudHMvZGJsY2xpY2stYWRkRXZlbnRMaXN0 ZW5lci5odG1sOiBBZGRlZC4KKwogMjAwNi0wMy0xNSAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBs ZS5jb20+CiAKICAgICAgICAgUnViYmVyIHN0YW1wZWQgYnkgR2VvZmYuCkluZGV4OiBMYXlvdXRU ZXN0cy9mYXN0L2V2ZW50cy9kYmxjbGljay1hZGRFdmVudExpc3RlbmVyLWV4cGVjdGVkLnR4dAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9kYmxjbGljay1hZGRFdmVudExp c3RlbmVyLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvZXZl bnRzL2RibGNsaWNrLWFkZEV2ZW50TGlzdGVuZXItZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpA QCAtMCwwICsxLDkgQEAKK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZENoYW5nZVNlbGVjdGVkRE9N UmFuZ2U6KG51bGwpIHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAyNCBvZiAjdGV4dCA+IERJViA+IEJP RFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDI0IG9mICN0ZXh0ID4gRElWID4gQk9EWSA+IEhUTUwg PiAjZG9jdW1lbnQgYWZmaW5pdHk6TlNTZWxlY3Rpb25BZmZpbml0eURvd25zdHJlYW0gc3RpbGxT ZWxlY3Rpbmc6RkFMU0UKK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rp b246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvbgorRURJVElORyBERUxFR0FU RTogc2hvdWxkQ2hhbmdlU2VsZWN0ZWRET01SYW5nZTpyYW5nZSBmcm9tIDI0IG9mICN0ZXh0ID4g RElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gMjQgb2YgI3RleHQgPiBESVYgPiBCT0RZ ID4gSFRNTCA+ICNkb2N1bWVudCB0b0RPTVJhbmdlOnJhbmdlIGZyb20gMjEgb2YgI3RleHQgPiBE SVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byAyOSBvZiAjdGV4dCA+IERJViA+IEJPRFkg PiBIVE1MID4gI2RvY3VtZW50IGFmZmluaXR5Ok5TU2VsZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFt IHN0aWxsU2VsZWN0aW5nOkZBTFNFCitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdl U2VsZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KK1NVQ0NFU1MK KworRG91YmxlLWNsaWNrIGFib3ZlIHRvIHRlc3QuCisKKwoKUHJvcGVydHkgY2hhbmdlcyBvbjog ZmFzdC9ldmVudHMvZGJsY2xpY2stYWRkRXZlbnRMaXN0ZW5lci1leHBlY3RlZC50eHQKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpOYW1lOiBzdm46ZW9sLXN0eWxlCiAgICsgbmF0aXZlCgpJbmRleDogTGF5b3V0VGVzdHMv ZmFzdC9ldmVudHMvZGJsY2xpY2stYWRkRXZlbnRMaXN0ZW5lci5odG1sCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IExheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2RibGNsaWNrLWFkZEV2ZW50TGlzdGVuZXIuaHRtbAko cmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2RibGNsaWNrLWFkZEV2ZW50 TGlzdGVuZXIuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw0NSBAQAorPGh0bWw+Cis8aGVh ZD4KKyAgICA8dGl0bGU+VGVzdCBjYXNlIGZvciBCdWd6aWxsYSA3NzkwPC90aXRsZT4KKwk8c3R5 bGU+CisJCS50ZXN0YXJlYQorCQl7CisJCSAgICBiYWNrZ3JvdW5kOglyZWQ7CisJCQl3aWR0aDog MTAwcHg7CisJCQloZWlnaHQ6IDEwMHB4OworCQkJY29sb3I6IHdoaXRlOworCQkJdGV4dC1hbGln bjogY2VudGVyOworCQkJZm9udC1mYW1pbHk6IG1vbm9zcGFjZTsKKwkJfQorCTwvc3R5bGU+CisJ PHNjcmlwdD4KKwkJZnVuY3Rpb24gaGFuZGxlcihldmVudCkKKwkJeworICAgICAgICAgICAgdmFy IGVsZW0gPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY2xpY2tfYXJlYSIpOworCQkJZWxlbS5z ZXRBdHRyaWJ1dGUoInN0eWxlIiwgImJhY2tncm91bmQ6IGdyZWVuIik7CisJCQllbGVtLnRleHRD b250ZW50ID0gIlNVQ0NFU1MiOworCQkJZXZlbnQuc3RvcFByb3BhZ2F0aW9uKCk7CisJCQlldmVu dC5wcmV2ZW50RGVmYXVsdCgpOworCQl9CisJCXdpbmRvdy5vbmxvYWQgPSBmdW5jdGlvbigpCisJ CXsKKwkJCXZhciBlbGVtID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNsaWNrX2FyZWEiKTsK KyAgICAgICAgICAgIGVsZW0uYWRkRXZlbnRMaXN0ZW5lcignZGJsY2xpY2snLCBoYW5kbGVyLCBm YWxzZSk7CisgICAgICAgICAgICAKKyAgICAgICAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENv bnRyb2xsZXIpIHsKKyAgICAgICAgICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNU ZXh0KCk7CisgICAgICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oNTAsNTApOwor ICAgICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlRG93bigpOworICAgICAgICAgICAgICAg IGV2ZW50U2VuZGVyLm1vdXNlVXAoKTsKKyAgICAgICAgICAgICAgICBldmVudFNlbmRlci5tb3Vz ZURvd24oKTsKKyAgICAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVVwKCk7CisgICAgICAg ICAgICB9CisJCX0KKwk8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPGRpdiBpZD0iY2xpY2tf YXJlYSIgY2xhc3M9InRlc3RhcmVhIj5GQUlMVVJFLCBubyBkYmxjbGljayByZWNpZXZlZDwvZGl2 PgorPGJyPgorPHA+RG91YmxlLWNsaWNrIGFib3ZlIHRvIHRlc3QuPC9wPgorPC9ib2R5PgorPC9o dG1sPgoKUHJvcGVydHkgY2hhbmdlcyBvbjogZmFzdC9ldmVudHMvZGJsY2xpY2stYWRkRXZlbnRM aXN0ZW5lci5odG1sCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KTmFtZTogc3ZuOmVvbC1zdHlsZQogICArIG5hdGl2ZQoK SW5kZXg6IFdlYkNvcmUva2h0bWwvaHRtbC9IVE1MRWxlbWVudEltcGwuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUva2h0bWwvaHRtbC9IVE1MRWxlbWVudEltcGwuY3BwCShyZXZpc2lvbiAxMzMx OCkKKysrIFdlYkNvcmUva2h0bWwvaHRtbC9IVE1MRWxlbWVudEltcGwuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xNTMsNyArMTUzLDcgQEAgdm9pZCBIVE1MRWxlbWVudEltcGw6OnBhcnNlTWFwcGVk QXR0cmlidQogICAgIH0gZWxzZSBpZiAoYXR0ci0+bmFtZSgpID09IG9uY29udGV4dG1lbnVBdHRy KSB7CiAgICAgICAgIHNldEhUTUxFdmVudExpc3RlbmVyKGNvbnRleHRtZW51RXZlbnQsIGF0dHIp OwogICAgIH0gZWxzZSBpZiAoYXR0ci0+bmFtZSgpID09IG9uZGJsY2xpY2tBdHRyKSB7Ci0gICAg ICAgIHNldEhUTUxFdmVudExpc3RlbmVyKGtodG1sRGJsY2xpY2tFdmVudCwgYXR0cik7CisgICAg ICAgIHNldEhUTUxFdmVudExpc3RlbmVyKGRibGNsaWNrRXZlbnQsIGF0dHIpOwogICAgIH0gZWxz ZSBpZiAoYXR0ci0+bmFtZSgpID09IG9ubW91c2Vkb3duQXR0cikgewogICAgICAgICBzZXRIVE1M RXZlbnRMaXN0ZW5lcihtb3VzZWRvd25FdmVudCwgYXR0cik7CiAgICAgfSBlbHNlIGlmIChhdHRy LT5uYW1lKCkgPT0gb25tb3VzZW1vdmVBdHRyKSB7CkluZGV4OiBXZWJDb3JlL2todG1sL2VjbWEv a2pzX3dpbmRvdy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9raHRtbC9lY21hL2tqc193aW5k b3cuY3BwCShyZXZpc2lvbiAxMzMxOCkKKysrIFdlYkNvcmUva2h0bWwvZWNtYS9ranNfd2luZG93 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODQwLDcgKzg0MCw3IEBAIEpTVmFsdWUgKldpbmRvdzo6 Z2V0VmFsdWVQcm9wZXJ0eShFeGVjU3QKICAgIGNhc2UgT25jbGljazoKICAgICAgcmV0dXJuIGdl dExpc3RlbmVyKGV4ZWMsIGNsaWNrRXZlbnQpOwogICAgY2FzZSBPbmRibGNsaWNrOgotICAgICBy ZXR1cm4gZ2V0TGlzdGVuZXIoZXhlYywga2h0bWxEYmxjbGlja0V2ZW50KTsKKyAgICAgcmV0dXJu IGdldExpc3RlbmVyKGV4ZWMsIGRibGNsaWNrRXZlbnQpOwogICAgY2FzZSBPbmRyYWdkcm9wOgog ICAgICByZXR1cm4gZ2V0TGlzdGVuZXIoZXhlYywga2h0bWxEcmFnZHJvcEV2ZW50KTsKICAgIGNh c2UgT25lcnJvcjoKQEAgLTEwNzMsNyArMTA3Myw3IEBAIHZvaWQgV2luZG93OjpwdXQoRXhlY1N0 YXRlKiBleGVjLCBjb25zdCAKICAgICAgIHJldHVybjsKICAgICBjYXNlIE9uZGJsY2xpY2s6CiAg ICAgICBpZiAoaXNTYWZlU2NyaXB0KGV4ZWMpKQotICAgICAgICBzZXRMaXN0ZW5lcihleGVjLGto dG1sRGJsY2xpY2tFdmVudCx2YWx1ZSk7CisgICAgICAgIHNldExpc3RlbmVyKGV4ZWMsIGRibGNs aWNrRXZlbnQsdmFsdWUpOwogICAgICAgcmV0dXJuOwogICAgIGNhc2UgT25kcmFnZHJvcDoKICAg ICAgIGlmIChpc1NhZmVTY3JpcHQoZXhlYykpCkluZGV4OiBXZWJDb3JlL2todG1sL2VjbWEva2pz X2JpbmRpbmcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUva2h0bWwvZWNtYS9ranNfYmluZGlu Zy5jcHAJKHJldmlzaW9uIDEzMzE4KQorKysgV2ViQ29yZS9raHRtbC9lY21hL2tqc19iaW5kaW5n LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTgwLDcgKzE4MCw3IEBAIGJvb2wgU2NyaXB0SW50ZXJw cmV0ZXI6Ondhc1J1bkJ5VXNlckdlc3QKICAgICBjb25zdCBBdG9taWNTdHJpbmcgJnR5cGUgPSBt X2V2dC0+dHlwZSgpOwogICAgIGJvb2wgZXZlbnRPayA9ICggLy8gbW91c2UgZXZlbnRzCiAgICAg ICB0eXBlID09IGNsaWNrRXZlbnQgfHwgdHlwZSA9PSBtb3VzZWRvd25FdmVudCB8fAotICAgICAg dHlwZSA9PSBtb3VzZXVwRXZlbnQgfHwgdHlwZSA9PSBraHRtbERibGNsaWNrRXZlbnQgfHwKKyAg ICAgIHR5cGUgPT0gbW91c2V1cEV2ZW50IHx8IHR5cGUgPT0gZGJsY2xpY2tFdmVudCB8fAogICAg ICAgLy8ga2V5Ym9hcmQgZXZlbnRzCiAgICAgICB0eXBlID09IGtleWRvd25FdmVudCB8fCB0eXBl ID09IGtleXByZXNzRXZlbnQgfHwKICAgICAgIHR5cGUgPT0ga2V5dXBFdmVudCB8fApJbmRleDog V2ViQ29yZS9raHRtbC9lY21hL2tqc19kb20uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUva2h0 bWwvZWNtYS9ranNfZG9tLmNwcAkocmV2aXNpb24gMTMzMTgpCisrKyBXZWJDb3JlL2todG1sL2Vj bWEva2pzX2RvbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMwNCw3ICszMDQsNyBAQCBKU1ZhbHVl ICpET01Ob2RlOjpnZXRWYWx1ZVByb3BlcnR5KEV4ZWNTCiAgIGNhc2UgT25Db250ZXh0TWVudToK ICAgICByZXR1cm4gZ2V0TGlzdGVuZXIoY29udGV4dG1lbnVFdmVudCk7CiAgIGNhc2UgT25EYmxD bGljazoKLSAgICByZXR1cm4gZ2V0TGlzdGVuZXIoa2h0bWxEYmxjbGlja0V2ZW50KTsKKyAgICBy ZXR1cm4gZ2V0TGlzdGVuZXIoZGJsY2xpY2tFdmVudCk7CiAgIGNhc2UgT25EcmFnRHJvcDoKICAg ICByZXR1cm4gZ2V0TGlzdGVuZXIoa2h0bWxEcmFnZHJvcEV2ZW50KTsKICAgY2FzZSBPbkVycm9y OgpAQCAtNDU2LDcgKzQ1Niw3IEBAIHZvaWQgRE9NTm9kZTo6cHV0VmFsdWVQcm9wZXJ0eShFeGVj U3RhdGUKICAgICBzZXRMaXN0ZW5lcihleGVjLGNvbnRleHRtZW51RXZlbnQsdmFsdWUpOwogICAg IGJyZWFrOwogICBjYXNlIE9uRGJsQ2xpY2s6Ci0gICAgc2V0TGlzdGVuZXIoZXhlYyxraHRtbERi bGNsaWNrRXZlbnQsdmFsdWUpOworICAgIHNldExpc3RlbmVyKGV4ZWMsZGJsY2xpY2tFdmVudCx2 YWx1ZSk7CiAgICAgYnJlYWs7CiAgIGNhc2UgT25EcmFnRHJvcDoKICAgICBzZXRMaXN0ZW5lcihl eGVjLGtodG1sRHJhZ2Ryb3BFdmVudCx2YWx1ZSk7CkluZGV4OiBXZWJDb3JlL2RvbS9FdmVudE5h bWVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vRXZlbnROYW1lcy5oCShyZXZpc2lvbiAx MzMxOCkKKysrIFdlYkNvcmUvZG9tL0V2ZW50TmFtZXMuaAkod29ya2luZyBjb3B5KQpAQCAtMzks NiArMzksNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7IG5hbWVzcGFjZSBFdmVudE5hbWVzCiAgICAg bWFjcm8oY29udGV4dG1lbnUpIFwKICAgICBtYWNybyhjb3B5KSBcCiAgICAgbWFjcm8oY3V0KSBc CisgICAgbWFjcm8oZGJsY2xpY2spIFwKICAgICBtYWNybyhkcmFnKSBcCiAgICAgbWFjcm8oZHJh Z2VuZCkgXAogICAgIG1hY3JvKGRyYWdlbnRlcikgXApAQCAtODUsNyArODYsNiBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7IG5hbWVzcGFjZSBFdmVudE5hbWVzCiAgICAgbWFjcm8oRE9NU3VidHJlZU1v ZGlmaWVkKSBcCiAgICAgXAogICAgIG1hY3JvKGtodG1sQmVmb3JlVGV4dEluc2VydGVkKSBcCi0g ICAgbWFjcm8oa2h0bWxEYmxjbGljaykgXAogICAgIG1hY3JvKGtodG1sRHJhZ2Ryb3ApIFwKICAg ICBtYWNybyhraHRtbEVkaXRhYmxlQ29udGVudENoYW5nZWQpIFwKICAgICBtYWNybyhraHRtbEVy cm9yKSBcCkluZGV4OiBXZWJDb3JlL2RvbS9Ob2RlSW1wbC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvZG9tL05vZGVJbXBsLmgJKHJldmlzaW9uIDEzMzE4KQorKysgV2ViQ29yZS9kb20vTm9kZUlt cGwuaAkod29ya2luZyBjb3B5KQpAQCAtMjY4LDkgKzI2OCw5IEBAIHB1YmxpYzoKICAgICBib29s IGRpc3BhdGNoSFRNTEV2ZW50KGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBib29sIGNh bkJ1YmJsZSwgYm9vbCBjYW5jZWxhYmxlKTsKICAgICB2b2lkIGRpc3BhdGNoV2luZG93RXZlbnQo Y29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5cGUsIGJvb2wgY2FuQnViYmxlLCBib29sIGNhbmNl bGFibGUpOwogICAgIGJvb2wgZGlzcGF0Y2hNb3VzZUV2ZW50KE1vdXNlRXZlbnQqLCBjb25zdCBB dG9taWNTdHJpbmcmIGV2ZW50VHlwZSwKLSAgICAgICAgaW50IGRldGFpbCA9IDAsIE5vZGVJbXBs KiByZWxhdGVkVGFyZ2V0ID0gMCk7CisgICAgICAgIGludCBjbGlja0NvdW50ID0gMCwgTm9kZUlt cGwqIHJlbGF0ZWRUYXJnZXQgPSAwKTsKICAgICBib29sIGRpc3BhdGNoU2ltdWxhdGVkTW91c2VF dmVudChjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSk7Ci0gICAgYm9vbCBkaXNwYXRjaE1v dXNlRXZlbnQoY29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5cGUsIGludCBidXR0b24sIGludCBk ZXRhaWwsCisgICAgYm9vbCBkaXNwYXRjaE1vdXNlRXZlbnQoY29uc3QgQXRvbWljU3RyaW5nJiBl dmVudFR5cGUsIGludCBidXR0b24sIGludCBjbGlja0NvdW50LAogICAgICAgICBpbnQgY2xpZW50 WCwgaW50IGNsaWVudFksIGludCBzY3JlZW5YLCBpbnQgc2NyZWVuWSwKICAgICAgICAgYm9vbCBj dHJsS2V5LCBib29sIGFsdEtleSwgYm9vbCBzaGlmdEtleSwgYm9vbCBtZXRhS2V5LAogICAgICAg ICBib29sIGlzU2ltdWxhdGVkID0gZmFsc2UsIE5vZGVJbXBsKiByZWxhdGVkVGFyZ2V0ID0gMCk7 CkluZGV4OiBXZWJDb3JlL2RvbS9Ob2RlSW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9k b20vTm9kZUltcGwuY3BwCShyZXZpc2lvbiAxMzMxOCkKKysrIFdlYkNvcmUvZG9tL05vZGVJbXBs LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjM5LDcgKzYzOSw3IEBAIHZvaWQgTm9kZUltcGw6OmRp c3BhdGNoV2luZG93RXZlbnQoY29uc3QKIH0KIAogYm9vbCBOb2RlSW1wbDo6ZGlzcGF0Y2hNb3Vz ZUV2ZW50KE1vdXNlRXZlbnQqIF9tb3VzZSwgY29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5cGUs Ci0gICAgaW50IGRldGFpbCwgTm9kZUltcGwqIHJlbGF0ZWRUYXJnZXQpCisgICAgaW50IGNsaWNr Q291bnQsIE5vZGVJbXBsKiByZWxhdGVkVGFyZ2V0KQogewogICAgIGFzc2VydCghZXZlbnREaXNw YXRjaEZvcmJpZGRlbigpKTsKIApAQCAtNjQ4LDcgKzY0OCw3IEBAIGJvb2wgTm9kZUltcGw6OmRp c3BhdGNoTW91c2VFdmVudChNb3VzZUUKICAgICBpZiAoRnJhbWVWaWV3ICp2aWV3ID0gZ2V0RG9j dW1lbnQoKS0+dmlldygpKQogICAgICAgICB2aWV3LT52aWV3cG9ydFRvQ29udGVudHMoX21vdXNl LT54KCksIF9tb3VzZS0+eSgpLCBjbGllbnRYLCBjbGllbnRZKTsKIAotICAgIHJldHVybiBkaXNw YXRjaE1vdXNlRXZlbnQoZXZlbnRUeXBlLCBfbW91c2UtPmJ1dHRvbigpLCBkZXRhaWwsCisgICAg cmV0dXJuIGRpc3BhdGNoTW91c2VFdmVudChldmVudFR5cGUsIF9tb3VzZS0+YnV0dG9uKCksIGNs aWNrQ291bnQsCiAgICAgICAgIGNsaWVudFgsIGNsaWVudFksIF9tb3VzZS0+Z2xvYmFsWCgpLCBf bW91c2UtPmdsb2JhbFkoKSwKICAgICAgICAgX21vdXNlLT5jdHJsS2V5KCksIF9tb3VzZS0+YWx0 S2V5KCksIF9tb3VzZS0+c2hpZnRLZXkoKSwgX21vdXNlLT5tZXRhS2V5KCksCiAgICAgICAgIGZh bHNlLCByZWxhdGVkVGFyZ2V0KTsKQEAgLTY2Miw3ICs2NjIsNyBAQCBib29sIE5vZGVJbXBsOjpk aXNwYXRjaFNpbXVsYXRlZE1vdXNlRXZlCiAgICAgcmV0dXJuIGRpc3BhdGNoTW91c2VFdmVudChl dmVudFR5cGUsIDAsIDAsIDAsIDAsIDAsIDAsIGZhbHNlLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCB0 cnVlKTsKIH0KIAotYm9vbCBOb2RlSW1wbDo6ZGlzcGF0Y2hNb3VzZUV2ZW50KGNvbnN0IEF0b21p Y1N0cmluZyAmZXZlbnRUeXBlLCBpbnQgYnV0dG9uLCBpbnQgZGV0YWlsLAorYm9vbCBOb2RlSW1w bDo6ZGlzcGF0Y2hNb3VzZUV2ZW50KGNvbnN0IEF0b21pY1N0cmluZyAmZXZlbnRUeXBlLCBpbnQg YnV0dG9uLCBpbnQgY2xpY2tDb3VudCwKICAgICBpbnQgY2xpZW50WCwgaW50IGNsaWVudFksIGlu dCBzY3JlZW5YLCBpbnQgc2NyZWVuWSwKICAgICBib29sIGN0cmxLZXksIGJvb2wgYWx0S2V5LCBi b29sIHNoaWZ0S2V5LCBib29sIG1ldGFLZXksIGJvb2wgaXNTaW11bGF0ZWQsIE5vZGVJbXBsKiBy ZWxhdGVkVGFyZ2V0KQogewpAQCAtNjg1LDcgKzY4NSw3IEBAIGJvb2wgTm9kZUltcGw6OmRpc3Bh dGNoTW91c2VFdmVudChjb25zdCAKICAgICBib29sIHN3YWxsb3dFdmVudCA9IGZhbHNlOwogCiAg ICAgUmVmUHRyPEV2ZW50SW1wbD4gbWUgPSBuZXcgTW91c2VFdmVudEltcGwoZXZlbnRUeXBlLCB0 cnVlLCBjYW5jZWxhYmxlLCBnZXREb2N1bWVudCgpLT5kZWZhdWx0VmlldygpLAotICAgICAgICBk ZXRhaWwsIHNjcmVlblgsIHNjcmVlblksIGNsaWVudFgsIGNsaWVudFksCisgICAgICAgIGNsaWNr Q291bnQsIHNjcmVlblgsIHNjcmVlblksIGNsaWVudFgsIGNsaWVudFksCiAgICAgICAgIGN0cmxL ZXksIGFsdEtleSwgc2hpZnRLZXksIG1ldGFLZXksIGJ1dHRvbiwKICAgICAgICAgcmVsYXRlZFRh cmdldCwgMCwgaXNTaW11bGF0ZWQpOwogICAgIApAQCAtNjk1LDEyICs2OTUsMTIgQEAgYm9vbCBO b2RlSW1wbDo6ZGlzcGF0Y2hNb3VzZUV2ZW50KGNvbnN0IAogICAgIGlmIChkZWZhdWx0SGFuZGxl ZCB8fCBkZWZhdWx0UHJldmVudGVkKQogICAgICAgICBzd2FsbG93RXZlbnQgPSB0cnVlOwogCi0g ICAgLy8gU3BlY2lhbCBjYXNlOiBJZiBpdCdzIGEgZG91YmxlIGNsaWNrIGV2ZW50LCB3ZSBhbHNv IHNlbmQgdGhlIEtIVE1MX0RCTENMSUNLIGV2ZW50LiBUaGlzIGlzIG5vdCBwYXJ0CisgICAgLy8g U3BlY2lhbCBjYXNlOiBJZiBpdCdzIGEgZG91YmxlIGNsaWNrIGV2ZW50LCB3ZSBhbHNvIHNlbmQg dGhlICJkYmxjbGljayIgZXZlbnQuIFRoaXMgaXMgbm90IHBhcnQKICAgICAvLyBvZiB0aGUgRE9N IHNwZWNzLCBidXQgaXMgdXNlZCBmb3IgY29tcGF0aWJpbGl0eSB3aXRoIHRoZSBvbmRibGNsaWNr PSIiIGF0dHJpYnV0ZS4gIFRoaXMgaXMgdHJlYXRlZAotICAgIC8vIGFzIGEgc2VwYXJhdGUgZXZl bnQgaW4gb3RoZXIgRE9NLWNvbXBsaWFudCBicm93c2VycyBsaWtlIEZpcmVmb3gsIGFuZCBzbyB3 ZSBkbyB0aGUgc2FtZS4KLSAgICBpZiAoZXZlbnRUeXBlID09IGNsaWNrRXZlbnQgJiYgZGV0YWls ID09IDIpIHsKLSAgICAgICAgbWUgPSBuZXcgTW91c2VFdmVudEltcGwoa2h0bWxEYmxjbGlja0V2 ZW50LCB0cnVlLCBjYW5jZWxhYmxlLCBnZXREb2N1bWVudCgpLT5kZWZhdWx0VmlldygpLAotICAg ICAgICAgICAgZGV0YWlsLCBzY3JlZW5YLCBzY3JlZW5ZLCBjbGllbnRYLCBjbGllbnRZLAorICAg IC8vIGFzIGEgc2VwYXJhdGUgZXZlbnQgaW4gb3RoZXIgYnJvd3NlcnMgbGlrZSBGaXJlZm94LCBX aW5JRSwgJiBPcGVyYSwgc28gd2UgZG8gdGhlIHNhbWUuCisgICAgaWYgKGV2ZW50VHlwZSA9PSBj bGlja0V2ZW50ICYmIGNsaWNrQ291bnQgPT0gMikgeworICAgICAgICBtZSA9IG5ldyBNb3VzZUV2 ZW50SW1wbChkYmxjbGlja0V2ZW50LCB0cnVlLCBjYW5jZWxhYmxlLCBnZXREb2N1bWVudCgpLT5k ZWZhdWx0VmlldygpLAorICAgICAgICAgICAgY2xpY2tDb3VudCwgc2NyZWVuWCwgc2NyZWVuWSwg Y2xpZW50WCwgY2xpZW50WSwKICAgICAgICAgICAgIGN0cmxLZXksIGFsdEtleSwgc2hpZnRLZXks IG1ldGFLZXksIGJ1dHRvbiwKICAgICAgICAgICAgIHJlbGF0ZWRUYXJnZXQsIDAsIGlzU2ltdWxh dGVkKTsKICAgICAgICAgaWYgKGRlZmF1bHRIYW5kbGVkKQpAQCAtNzEyLDcgKzcxMiw3IEBAIGJv b2wgTm9kZUltcGw6OmRpc3BhdGNoTW91c2VFdmVudChjb25zdCAKIAogICAgIC8vIEFsc28gc2Vu ZCBhIERPTUFjdGl2YXRlIGV2ZW50LCB3aGljaCBjYXVzZXMgdGhpbmdzIGxpa2UgZm9ybSBzdWJt aXNzaW9ucyB0byBvY2N1ci4KICAgICBpZiAoZXZlbnRUeXBlID09IGNsaWNrRXZlbnQgJiYgIWRl ZmF1bHRQcmV2ZW50ZWQpCi0gICAgICAgIGRpc3BhdGNoVUlFdmVudChET01BY3RpdmF0ZUV2ZW50 LCBkZXRhaWwpOworICAgICAgICBkaXNwYXRjaFVJRXZlbnQoRE9NQWN0aXZhdGVFdmVudCwgY2xp Y2tDb3VudCk7CiAKICAgICByZXR1cm4gc3dhbGxvd0V2ZW50OwogfQpJbmRleDogV2ViQ29yZS9X ZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9X ZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHJldmlzaW9uIDEzMzE4KQorKysgV2Vi Q29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAg LTgxMCw3ICs4MTAsNiBAQAogCQlBODhBRDUwQzA5NTI0OEYwMDAxREQxOTYgLyogU1ZHWm9vbUFu ZFBhbkltcGwuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IEE4QzBGOEVDMDg5NzAxRjQwMEJBNTExNCAvKiBTVkdab29tQW5kUGFuSW1wbC5oICovOyB9Owog CQlBODhBRDUwRDA5NTI0OEYwMDAxREQxOTYgLyoga3N2Zy5oIGluIEhlYWRlcnMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQThDMEY4RUQwODk3MDFGNDAwQkE1MTE0IC8qIGtz dmcuaCAqLzsgfTsKIAkJQTg4QUQ1MTQwOTUyNDk5RjAwMUREMTk2IC8qIE5hbWVzcGFjZS5oIGlu IEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQTg4NDI4NDAwOTMw OEMxQzAwQjZENDYxIC8qIE5hbWVzcGFjZS5oICovOyB9OwotCQlBODhBRDUxNTA5NTI0OTlGMDAx REQxOTYgLyoga2RvbWV2ZW50cy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gQTg4NDI4M0EwOTMwOEMxQzAwQjZENDYxIC8qIGtkb21ldmVudHMuaCAqLzsg fTsKIAkJQTg4QUQ1MTYwOTUyNDk5RjAwMUREMTk2IC8qIGtkb20uaCBpbiBIZWFkZXJzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE4ODQyODNDMDkzMDhDMUMwMEI2RDQ2MSAv KiBrZG9tLmggKi87IH07CiAJCUE4OEFENTE3MDk1MjQ5OUYwMDFERDE5NiAvKiBET01MaXN0Lmgg aW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBODg0MjgzRDA5 MzA4QzFDMDBCNkQ0NjEgLyogRE9NTGlzdC5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0g KFByaXZhdGUsICk7IH07IH07CiAJCUE4OEFENTE4MDk1MjQ5OUYwMDFERDE5NiAvKiBSR0JDb2xv ckltcGwuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE4 ODQyODNFMDkzMDhDMUMwMEI2RDQ2MSAvKiBSR0JDb2xvckltcGwuaCAqLzsgfTsKQEAgLTE1NDUs NyArMTU0NCw2IEBACiAJCUE4NUQ3QThEMDg3OUVDNjQwMDZBOTE3MiAvKiBLV1FXTWF0cml4Lmgg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGluZGVudFdp ZHRoID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEtXUVdN YXRyaXguaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgdGFiV2lkdGggPSA4OyB1c2VzVGFicyA9 IDA7IH07CiAJCUE4ODQyODM4MDkzMDhDMUMwMEI2RDQ2MSAvKiBTVkdOYW1lc1dyYXBwZXIuY3Bw ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGluZGVudFdp ZHRoID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBT VkdOYW1lc1dyYXBwZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB0YWJXaWR0aCA9IDg7 IHVzZXNUYWJzID0gMDsgfTsKIAkJQTg4NDI4MzkwOTMwOEMxQzAwQjZENDYxIC8qIFNWR0VsZW1l bnRGYWN0b3J5V3JhcHBlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgaW5kZW50V2lkdGggPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuY3BwLmNwcDsgcGF0aCA9IFNWR0VsZW1lbnRGYWN0b3J5V3JhcHBlci5jcHA7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IHRhYldpZHRoID0gODsgdXNlc1RhYnMgPSAwOyB9OwotCQlBODg0Mjgz QTA5MzA4QzFDMDBCNkQ0NjEgLyoga2RvbWV2ZW50cy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGluZGVudFdpZHRoID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IGtkb21ldmVudHMuaDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgdGFiV2lkdGggPSA4OyB1c2VzVGFicyA9IDA7IH07CiAJCUE4ODQyODNDMDkzMDhD MUMwMEI2RDQ2MSAvKiBrZG9tLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgaW5kZW50V2lkdGggPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuYy5oOyBwYXRoID0ga2RvbS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB0YWJXaWR0aCA9 IDg7IHVzZXNUYWJzID0gMDsgfTsKIAkJQTg4NDI4M0QwOTMwOEMxQzAwQjZENDYxIC8qIERPTUxp c3QuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBpbmRl bnRXaWR0aCA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBE T01MaXN0Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IHRhYldpZHRoID0gODsgdXNlc1RhYnMg PSAwOyB9OwogCQlBODg0MjgzRTA5MzA4QzFDMDBCNkQ0NjEgLyogUkdCQ29sb3JJbXBsLmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgaW5kZW50V2lkdGgg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gUkdCQ29sb3JJ bXBsLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IHRhYldpZHRoID0gODsgdXNlc1RhYnMgPSAw OyB9OwpAQCAtMjc0OSw3ICsyNzQ3LDYgQEAKIAkJCWNoaWxkcmVuID0gKAogCQkJCUE4ODQyODNE MDkzMDhDMUMwMEI2RDQ2MSAvKiBET01MaXN0LmggKi8sCiAJCQkJQTg4NDI4M0MwOTMwOEMxQzAw QjZENDYxIC8qIGtkb20uaCAqLywKLQkJCQlBODg0MjgzQTA5MzA4QzFDMDBCNkQ0NjEgLyoga2Rv bWV2ZW50cy5oICovLAogCQkJCUE4ODQyODQ2MDkzMDhDMUMwMEI2RDQ2MSAvKiBLRE9NSGVhZGVy cy5oICovLAogCQkJCUE4ODQyODQwMDkzMDhDMUMwMEI2RDQ2MSAvKiBOYW1lc3BhY2UuaCAqLywK IAkJCQlBODg0MjgzRjA5MzA4QzFDMDBCNkQ0NjEgLyogUkdCQ29sb3JJbXBsLmNwcCAqLywKQEAg LTQxMjAsNyArNDExNyw2IEBACiAJCQkJQTg4QUQ1MEMwOTUyNDhGMDAwMUREMTk2IC8qIFNWR1pv b21BbmRQYW5JbXBsLmggaW4gSGVhZGVycyAqLywKIAkJCQlBODhBRDUwRDA5NTI0OEYwMDAxREQx OTYgLyoga3N2Zy5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQTg4QUQ1MTQwOTUyNDk5RjAwMUREMTk2 IC8qIE5hbWVzcGFjZS5oIGluIEhlYWRlcnMgKi8sCi0JCQkJQTg4QUQ1MTUwOTUyNDk5RjAwMURE MTk2IC8qIGtkb21ldmVudHMuaCBpbiBIZWFkZXJzICovLAogCQkJCUE4OEFENTE2MDk1MjQ5OUYw MDFERDE5NiAvKiBrZG9tLmggaW4gSGVhZGVycyAqLywKIAkJCQlBODhBRDUxNzA5NTI0OTlGMDAx REQxOTYgLyogRE9NTGlzdC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQTg4QUQ1MTgwOTUyNDk5RjAw MUREMTk2IC8qIFJHQkNvbG9ySW1wbC5oIGluIEhlYWRlcnMgKi8sCkluZGV4OiBXZWJDb3JlL0No YW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTMzMjMp CisrKyBXZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM3IEBACisy MDA2LTAzLTE1ICBFcmljIFNlaWRlbCAgPGVzZWlkZWxAYXBwbGUuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHA6Ly9idWd6aWxsYS5vcGVu ZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzc5MAorICAgICAgICBhZGRFdmVudExpc3RlbmVy IGRvZXMgbm90IHdvcmsgd2l0aCAiZGJsY2xpY2siIGV2ZW50LgorICAgICAgICBSZW5hbWVkIGto dG1sRGJsY2xpY2tFdmVudCB0byBkYmxjbGlja0V2ZW50IHRvIGZpeC4KKworICAgICAgICBUZXN0 OiBmYXN0L2V2ZW50cy9kYmxjbGljay1hZGRFdmVudExpc3RlbmVyLmh0bWwKKworICAgICAgICAq IFdlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBicmlkZ2UvbWFj L01hY0ZyYW1lLm1tOgorICAgICAgICAoV2ViQ29yZTo6TWFjRnJhbWU6Om1vdXNlVXApOgorICAg ICAgICAoV2ViQ29yZTo6TWFjRnJhbWU6Om1vdXNlTW92ZWQpOgorICAgICAgICAoV2ViQ29yZTo6 TWFjRnJhbWU6OnNob3VsZERyYWdBdXRvTm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpNYWNGcmFt ZTo6c2VuZENvbnRleHRNZW51RXZlbnQpOgorICAgICAgICAqIGRvbS9FdmVudE5hbWVzLmg6Cisg ICAgICAgICogZG9tL05vZGVJbXBsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGVJbXBsOjpk aXNwYXRjaE1vdXNlRXZlbnQpOgorICAgICAgICAqIGRvbS9Ob2RlSW1wbC5oOgorICAgICAgICAq IGtodG1sL2VjbWEva2pzX2JpbmRpbmcuY3BwOgorICAgICAgICAoS0pTOjpTY3JpcHRJbnRlcnBy ZXRlcjo6d2FzUnVuQnlVc2VyR2VzdHVyZSk6CisgICAgICAgICoga2h0bWwvZWNtYS9ranNfZG9t LmNwcDoKKyAgICAgICAgKEtKUzo6RE9NTm9kZTo6Z2V0VmFsdWVQcm9wZXJ0eSk6CisgICAgICAg IChLSlM6OkRPTU5vZGU6OnB1dFZhbHVlUHJvcGVydHkpOgorICAgICAgICAqIGtodG1sL2VjbWEv a2pzX3dpbmRvdy5jcHA6CisgICAgICAgIChLSlM6OldpbmRvdzo6Z2V0VmFsdWVQcm9wZXJ0eSk6 CisgICAgICAgIChLSlM6OldpbmRvdzo6cHV0KToKKyAgICAgICAgKiBraHRtbC9odG1sL0hUTUxF bGVtZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRWxlbWVudEltcGw6OnBhcnNl TWFwcGVkQXR0cmlidXRlKToKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZVZpZXc6OmRpc3BhdGNoTW91c2VFdmVudCk6CisgICAgICAgICogcGFn ZS9GcmFtZVZpZXcuaDoKKwogMjAwNi0wMy0xNSAgQWRlbGUgUGV0ZXJzb24gIDxhZGVsZUBhcHBs ZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYy4KSW5kZXg6IFdlYkNvcmUvYnJpZGdl L21hYy9NYWNGcmFtZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JyaWRnZS9tYWMvTWFjRnJh bWUubW0JKHJldmlzaW9uIDEzMzE4KQorKysgV2ViQ29yZS9icmlkZ2UvbWFjL01hY0ZyYW1lLm1t CSh3b3JraW5nIGNvcHkpCkBAIC0yMDQ0LDkgKzIwNDQsOCBAQCB2b2lkIE1hY0ZyYW1lOjptb3Vz ZURyYWdnZWQoTlNFdmVudCAqZXZlCiB2b2lkIE1hY0ZyYW1lOjptb3VzZVVwKE5TRXZlbnQgKmV2 ZW50KQogewogICAgIEZyYW1lVmlldyAqdiA9IGQtPm1fdmlldy5nZXQoKTsKLSAgICBpZiAoIXYg fHwgX3NlbmRpbmdFdmVudFRvU3VidmlldykgeworICAgIGlmICghdiB8fCBfc2VuZGluZ0V2ZW50 VG9TdWJ2aWV3KQogICAgICAgICByZXR1cm47Ci0gICAgfQogCiAgICAgS1dRX0JMT0NLX0VYQ0VQ VElPTlM7CiAKQEAgLTIxNDQsOSArMjE0Myw4IEBAIHZvaWQgTWFjRnJhbWU6Om1vdXNlTW92ZWQo TlNFdmVudCAqZXZlbnQKICAgICBGcmFtZVZpZXcgKnYgPSBkLT5tX3ZpZXcuZ2V0KCk7CiAgICAg Ly8gUmVqZWN0IGEgbW91c2UgbW92ZWQgaWYgdGhlIGJ1dHRvbiBpcyBkb3duIC0gc2NyZXdzIHVw IHRyYWNraW5nIGR1cmluZyBhdXRvc2Nyb2xsCiAgICAgLy8gVGhlc2UgaGFwcGVuIGJlY2F1c2Ug V2ViS2l0IHNvbWV0aW1lcyBoYXMgdG8gZmFrZSB1cCBtb3ZlZCBldmVudHMuCi0gICAgaWYgKCF2 IHx8IGQtPm1fYk1vdXNlUHJlc3NlZCB8fCBfc2VuZGluZ0V2ZW50VG9TdWJ2aWV3KSB7CisgICAg aWYgKCF2IHx8IGQtPm1fYk1vdXNlUHJlc3NlZCB8fCBfc2VuZGluZ0V2ZW50VG9TdWJ2aWV3KQog ICAgICAgICByZXR1cm47Ci0gICAgfQogICAgIAogICAgIEtXUV9CTE9DS19FWENFUFRJT05TOwog CkBAIC0yMTc1LDE4ICsyMTczLDE2IEBAIGJvb2wgTWFjRnJhbWU6OnNob3VsZERyYWdBdXRvTm9k ZShOb2RlSW0KICAgICAgICAgZC0+bV92aWV3LT5jb250ZW50c1RvVmlld3BvcnQoeCwgeSwgd2lu ZG93WCwgd2luZG93WSk7CiAgICAgICAgIE5TUG9pbnQgZXZlbnRMb2MgPSB7d2luZG93WCwgd2lu ZG93WX07CiAgICAgICAgIHJldHVybiBbX2JyaWRnZSBtYXlTdGFydERyYWdBdEV2ZW50TG9jYXRp b246ZXZlbnRMb2NdOwotICAgIH0gZWxzZSB7CisgICAgfSBlbHNlCiAgICAgICAgIHJldHVybiBO TzsKLSAgICB9CiB9CiAKIGJvb2wgTWFjRnJhbWU6OnNlbmRDb250ZXh0TWVudUV2ZW50KE5TRXZl bnQgKmV2ZW50KQogewogICAgIERvY3VtZW50SW1wbCogZG9jID0gZC0+bV9kb2MuZ2V0KCk7CiAg ICAgRnJhbWVWaWV3KiB2ID0gZC0+bV92aWV3LmdldCgpOwotICAgIGlmICghZG9jIHx8ICF2KSB7 CisgICAgaWYgKCFkb2MgfHwgIXYpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9CiAKICAg ICBib29sIHN3YWxsb3dFdmVudDsKICAgICBLV1FfQkxPQ0tfRVhDRVBUSU9OUzsKQEAgLTIxOTQs MTcgKzIxOTAsMTcgQEAgYm9vbCBNYWNGcmFtZTo6c2VuZENvbnRleHRNZW51RXZlbnQoTlNFdgog ICAgIE5TRXZlbnQgKm9sZEN1cnJlbnRFdmVudCA9IF9jdXJyZW50RXZlbnQ7CiAgICAgX2N1cnJl bnRFdmVudCA9IEtXUVJldGFpbihldmVudCk7CiAgICAgCi0gICAgTW91c2VFdmVudCBxZXYoZXZl bnQpOworICAgIE1vdXNlRXZlbnQgbW91c2VFdmVudChldmVudCk7CiAKICAgICBpbnQgeG0sIHlt OwotICAgIHYtPnZpZXdwb3J0VG9Db250ZW50cyhxZXYueCgpLCBxZXYueSgpLCB4bSwgeW0pOwor ICAgIHYtPnZpZXdwb3J0VG9Db250ZW50cyhtb3VzZUV2ZW50LngoKSwgbW91c2VFdmVudC55KCks IHhtLCB5bSk7CiAKLSAgICBNb3VzZUV2ZW50V2l0aEhpdFRlc3RSZXN1bHRzIG1ldiA9IGRvYy0+ cHJlcGFyZU1vdXNlRXZlbnQoZmFsc2UsIHRydWUsIGZhbHNlLCB4bSwgeW0sICZxZXYpOworICAg IE1vdXNlRXZlbnRXaXRoSGl0VGVzdFJlc3VsdHMgbWV2ID0gZG9jLT5wcmVwYXJlTW91c2VFdmVu dChmYWxzZSwgdHJ1ZSwgZmFsc2UsIHhtLCB5bSwgJm1vdXNlRXZlbnQpOwogCi0gICAgc3dhbGxv d0V2ZW50ID0gdi0+ZGlzcGF0Y2hNb3VzZUV2ZW50KGNvbnRleHRtZW51RXZlbnQsIG1ldi5pbm5l ck5vZGUoKSwgdHJ1ZSwgMCwgJnFldiwgdHJ1ZSk7CisgICAgc3dhbGxvd0V2ZW50ID0gdi0+ZGlz cGF0Y2hNb3VzZUV2ZW50KGNvbnRleHRtZW51RXZlbnQsIG1ldi5pbm5lck5vZGUoKSwgdHJ1ZSwg MCwgJm1vdXNlRXZlbnQsIHRydWUpOwogICAgIGlmICghc3dhbGxvd0V2ZW50ICYmICFpc1BvaW50 SW5zaWRlU2VsZWN0aW9uKHhtLCB5bSkgJiYKICAgICAgICAgKFtfYnJpZGdlIHNlbGVjdFdvcmRC ZWZvcmVNZW51RXZlbnRdIHx8IFtfYnJpZGdlIGlzRWRpdGFibGVdIHx8IG1ldi5pbm5lck5vZGUo KS0+aXNDb250ZW50RWRpdGFibGUoKSkpIHsKLSAgICAgICAgc2VsZWN0Q2xvc2VzdFdvcmRGcm9t TW91c2VFdmVudCgmcWV2LCBtZXYuaW5uZXJOb2RlKCksIHhtLCB5bSk7CisgICAgICAgIHNlbGVj dENsb3Nlc3RXb3JkRnJvbU1vdXNlRXZlbnQoJm1vdXNlRXZlbnQsIG1ldi5pbm5lck5vZGUoKSwg eG0sIHltKTsKICAgICB9CiAKICAgICBBU1NFUlQoX2N1cnJlbnRFdmVudCA9PSBldmVudCk7Cklu ZGV4OiBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmNwcAkocmV2aXNpb24gMTMzMTgpCisrKyBXZWJDb3JlL3BhZ2UvRnJhbWVW aWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTQwLDcgKzk0MCw3IEBAIHZvaWQgRnJhbWVWaWV3 OjpzZXRSZXNpemluZ0ZyYW1lU2V0KEhUTUwKIH0KIAogYm9vbCBGcmFtZVZpZXc6OmRpc3BhdGNo TW91c2VFdmVudChjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSwgTm9kZUltcGwqIHRhcmdl dE5vZGUsIGJvb2wgY2FuY2VsYWJsZSwKLSAgICBpbnQgZGV0YWlsLCBNb3VzZUV2ZW50KiBtb3Vz ZUV2ZW50LCBib29sIHNldFVuZGVyKQorICAgIGludCBjbGlja0NvdW50LCBNb3VzZUV2ZW50KiBt b3VzZUV2ZW50LCBib29sIHNldFVuZGVyKQogewogICAgIC8vIGlmIHRoZSB0YXJnZXQgbm9kZSBp cyBhIHRleHQgbm9kZSwgZGlzcGF0Y2ggb24gdGhlIHBhcmVudCBub2RlIC0gcmRhcjovLzQxOTY2 NDYKICAgICBpZiAodGFyZ2V0Tm9kZSAmJiB0YXJnZXROb2RlLT5pc1RleHROb2RlKCkpCkBAIC05 NzksNyArOTc5LDcgQEAgYm9vbCBGcmFtZVZpZXc6OmRpc3BhdGNoTW91c2VFdmVudChjb25zdAog ICAgIGJvb2wgc3dhbGxvd0V2ZW50ID0gZmFsc2U7CiAKICAgICBpZiAodGFyZ2V0Tm9kZSkKLSAg ICAgICAgc3dhbGxvd0V2ZW50ID0gdGFyZ2V0Tm9kZS0+ZGlzcGF0Y2hNb3VzZUV2ZW50KG1vdXNl RXZlbnQsIGV2ZW50VHlwZSwgZGV0YWlsKTsKKyAgICAgICAgc3dhbGxvd0V2ZW50ID0gdGFyZ2V0 Tm9kZS0+ZGlzcGF0Y2hNb3VzZUV2ZW50KG1vdXNlRXZlbnQsIGV2ZW50VHlwZSwgY2xpY2tDb3Vu dCk7CiAgICAgCiAgICAgaWYgKCFzd2FsbG93RXZlbnQgJiYgZXZlbnRUeXBlID09IG1vdXNlZG93 bkV2ZW50KSB7CiAgICAgICAgIC8vIEZvY3VzIHNob3VsZCBiZSBzaGlmdGVkIG9uIG1vdXNlIGRv d24sIG5vdCBvbiBhIGNsaWNrLiAgLWR3aApJbmRleDogV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAkocmV2aXNpb24gMTMzMTgp CisrKyBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTIzMSw3ICsy MzEsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgYWRkRm9ybUNvbXBsZXRpb25JdGVtKGNvbnN0IFFT dHJpbmcgJm5hbWUsIGNvbnN0IFFTdHJpbmcgJnZhbHVlKTsKIAogICAgIGJvb2wgZGlzcGF0Y2hN b3VzZUV2ZW50KGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBOb2RlSW1wbCogdGFyZ2V0 LAotICAgICAgICBib29sIGNhbmNlbGFibGUsIGludCBkZXRhaWwsIE1vdXNlRXZlbnQqLCBib29s IHNldFVuZGVyKTsKKyAgICAgICAgYm9vbCBjYW5jZWxhYmxlLCBpbnQgY2xpY2tDb3VudCwgTW91 c2VFdmVudCosIGJvb2wgc2V0VW5kZXIpOwogICAgIGJvb2wgZGlzcGF0Y2hEcmFnRXZlbnQoY29u c3QgQXRvbWljU3RyaW5nJiBldmVudFR5cGUsIE5vZGVJbXBsKiB0YXJnZXQsCiAgICAgICAgIGNv bnN0IEludFBvaW50JiBsb2MsIENsaXBib2FyZEltcGwqKTsKIApJbmRleDogV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUubQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29s cy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS5tCShyZXZpc2lvbiAxMzMxOCkKKysrIFdl YktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLm0JKHdvcmtpbmcgY29weSkK QEAgLTg1Nyw2ICs4NTcsNyBAQCBzdGF0aWMgdm9pZCBkdW1wKHZvaWQpCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcmVzc3VyZTpuaWxdOwogICAg ICAgICBbTlNBcHAgcG9zdEV2ZW50Om1vdXNlVXBFdmVudCBhdFN0YXJ0Ok5PXTsKICAgICAgICAg W3N1YlZpZXcgbW91c2VEb3duOm1vdXNlRG93bkV2ZW50XTsKKyAgICAgICAgbGFzdENsaWNrID0g W21vdXNlVXBFdmVudCB0aW1lc3RhbXBdOwogICAgIH0KIH0KIApJbmRleDogV2ViS2l0VG9vbHMv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24g MTMzMjMpCisrKyBXZWJLaXRUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwxMiBAQAorMjAwNi0wMy0xNSAgRXJpYyBTZWlkZWwgIDxlc2VpZGVsQGFwcGxlLmNvbT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggZXZlbnRT ZW5kZXIubW91c2VDbGljaygpIHRvIHVwZGF0ZSBsYXN0Q2xpY2sgdGltZXN0YW1wLgorCisgICAg ICAgICogRHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUubToKKyAgICAgICAgKC1bRXZlbnRT ZW5kaW5nQ29udHJvbGxlciBtb3VzZUNsaWNrXSk6CisKIDIwMDYtMDMtMTUgIERhcmluIEFkbGVy ICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hY2llai4K