9622 2006-06-27 11:18:59 -0700 REGRESSION: showModalDialog returnValue ignored, function result is always "undefined" 2006-07-08 12:58:29 -0700 1 1 1 Unclassified WebKit DOM 420+ Mac OS X 10.4 RESOLVED FIXED http://groupaware.com/aspect/dialog/Launcher.html InRadar, Regression P1 Normal --- 1 markmalone darin andersca darin ggaren markmalone mjs oldest_to_newest 47372 0 markmalone 2006-06-27 11:18:59 -0700 The result of the showModalDialog call is the value of the returnValue variable. Current webkit builds report "undefined" as the result of the showModalDialog call regardless of the returnValue's value. 47693 1 darin 2006-06-28 16:00:44 -0700 Works in 10.4.7. 47739 2 darin 2006-06-29 08:51:03 -0700 The problem is that Window::clear() is not being called at all. This is presumably having many bad symptoms, not just this one! 47740 3 darin 2006-06-29 08:54:26 -0700 The change that broke this was the one for bug 6818. 47745 4 9092 darin 2006-06-29 09:14:21 -0700 Created attachment 9092 patch, including change log and a manual test Not the most elegant solution to the problem, but does fix it. 47749 5 9095 darin 2006-06-29 09:36:54 -0700 Created attachment 9095 patch, including change log and a manual test 47751 6 9095 andersca 2006-06-29 09:43:31 -0700 Comment on attachment 9095 patch, including change log and a manual test r=me 47777 7 darin 2006-06-29 19:50:48 -0700 Committed revision 15097. 47779 8 darin 2006-06-29 19:52:13 -0700 <rdar://problem/4604701> 48816 9 9095 darin 2006-07-08 08:56:51 -0700 Comment on attachment 9095 patch, including change log and a manual test Further testing show this not working in some cases. New patch forthcoming. 48817 10 9269 darin 2006-07-08 09:05:46 -0700 Created attachment 9269 better patch with change log, can still use the old test case 48836 11 9271 darin 2006-07-08 09:43:15 -0700 Created attachment 9271 better patch with change log, can still use the old test case 48847 12 9271 ggaren 2006-07-08 10:57:15 -0700 Comment on attachment 9271 better patch with change log, can still use the old test case r=me I think kjs_window.cpp could use a comment explaining why you need to do this: + if (!returnValue) + returnValue = dialogWindow->getDirect("returnValue"); Also, it looks like you changed the indenting in KJSProxy::clear from 4 spaces to 2. 48855 13 darin 2006-07-08 12:41:12 -0700 (In reply to comment #12) > I think kjs_window.cpp could use a comment explaining why you need to do this: > > + if (!returnValue) > + returnValue = dialogWindow->getDirect("returnValue"); OK. Will do. > Also, it looks like you changed the indenting in KJSProxy::clear from 4 spaces > to 2. Actually, my previous fix changed the indenting in KJSProxy::clear from 2 spaces to 4, and I rolled it out. My new change was small enough that I did not feel comfortable reindenting the function at the same time. 48856 14 darin 2006-07-08 12:58:29 -0700 Committed revision 15239. 9092 2006-06-29 09:14:21 -0700 2006-06-29 09:36:54 -0700 patch, including change log and a manual test ShowModalDialogReturnValuePatch.txt text/plain 7131 darin SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDE1MDky KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjggQEAKKzIwMDYtMDYt MjkgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gZml4IGh0dHA6Ly9idWd6aWxsYS5vcGVuZGFy d2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTYyMgorICAgICAgICAgIHNob3dNb2RhbERpYWxvZyBy ZXR1cm5WYWx1ZSBpZ25vcmVkLCBmdW5jdGlvbiByZXN1bHQgaXMgYWx3YXlzICJ1bmRlZmluZWQi CisKKyAgICAgICAgKiBtYW51YWwtdGVzdHMvbW9kYWwtZGlhbG9nLmh0bWw6IEFkZGVkLgorICAg ICAgICAqIG1hbnVhbC10ZXN0cy9zaG93LW1vZGFsLWRpYWxvZy10ZXN0Lmh0bWw6IEFkZGVkLgor CisgICAgICAgICogcGFnZS9GcmFtZS5jcHA6IChXZWJDb3JlOjpGcmFtZTo6Y2xlYXIpOiBDYWxs IEtKU1Byb3h5OjpjbGVhciB3aXRoIHRoZQorICAgICAgICBjbGVhcldpbmRvd1Byb3BlcnRpZXMg cGFyYW1ldGVyIGluc3RlYWQgb2Ygbm90IGNhbGxpbmcgaXQgYXQgYWxsIHdoZW4KKyAgICAgICAg Y2xlYXJXaW5kb3dQcm9wZXJ0aWVzIGlzIGZhbHNlLgorCisgICAgICAgICogYmluZGluZ3MvanMv a2pzX3Byb3h5Lmg6IEFkZCBib29sZWFuIGNsZWFyV2luZG93UHJvcGVydGllcyBwYXJhbWV0ZXIu CisgICAgICAgICogYmluZGluZ3MvanMva2pzX3Byb3h5LmNwcDogKFdlYkNvcmU6OktKU1Byb3h5 OjpjbGVhcik6IFBhc3MgY2xlYXJXaW5kb3dQcm9wZXJ0aWVzCisgICAgICAgIHZhcmlhYmxlIHRo cm91Z2ggdG8gV2luZG93OjpjbGVhciBpbnN0ZWFkIG9mIG5vdCBjYWxsaW5nIGl0IGF0IGFsbC4K KworICAgICAgICAqIGJpbmRpbmdzL2pzL2tqc193aW5kb3cuaDogQWRkIGJvb2xlYW4gY2xlYXJX aW5kb3dQcm9wZXJ0aWVzIHBhcmFtZXRlci4KKyAgICAgICAgKiBiaW5kaW5ncy9qcy9ranNfd2lu ZG93LmNwcDogKEtKUzo6V2luZG93OjpjbGVhcik6IElmIGNsZWFyV2luZG93UHJvcGVydGllcwor ICAgICAgICBpcyBmYWxzZSwgZG8gb25seSB0aGUgcmV0dXJuVmFsdWUgd29yaywgbm90IHRoZSBy ZXN0IG9mIHRoZSB3b3JrLgorCisgICAgICAgICogbWFudWFsLXRlc3RzL21vZGFsLWRpYWxvZy5o dG1sOiBBZGRlZC4KKyAgICAgICAgKiBtYW51YWwtdGVzdHMvc2hvdy1tb2RhbC1kaWFsb2ctdGVz dC5odG1sOiBBZGRlZC4KKwogMjAwNi0wNi0yOSAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAa2ls emVyLm5ldD4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbi4KSW5kZXg6IGJpbmRpbmdzL2pz L2tqc19wcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gYmluZGluZ3MvanMva2pzX3Byb3h5LmNwcAko cmV2aXNpb24gMTUwOTIpCisrKyBiaW5kaW5ncy9qcy9ranNfcHJveHkuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC04MywxNCArODMsMTUgQEAgSlNWYWx1ZSogS0pTUHJveHk6OmV2YWx1YXRlKGNvbnN0 IFN0cmluZwogICByZXR1cm4gMDsKIH0KIAotdm9pZCBLSlNQcm94eTo6Y2xlYXIoKSB7Cit2b2lk IEtKU1Byb3h5OjpjbGVhcihib29sIGNsZWFyV2luZG93UHJvcGVydGllcykKK3sKICAgLy8gY2xl YXIgcmVzb3VyY2VzIGFsbG9jYXRlZCBieSB0aGUgaW50ZXJwcmV0ZXIsIGFuZCBtYWtlIGl0IHJl YWR5IHRvIGJlIHVzZWQgYnkgYW5vdGhlciBwYWdlCiAgIC8vIFdlIGhhdmUgdG8ga2VlcCBpdCwg c28gdGhhdCB0aGUgV2luZG93IG9iamVjdCBmb3IgdGhlIGZyYW1lIHJlbWFpbnMgdGhlIHNhbWUu CiAgIC8vICh3ZSB1c2VkIHRvIGRlbGV0ZSBhbmQgcmUtY3JlYXRlIGl0LCBwcmV2aW91c2x5KQog ICBpZiAobV9zY3JpcHQpIHsKICAgICBXaW5kb3cgKndpbiA9IFdpbmRvdzo6cmV0cmlldmVXaW5k b3cobV9mcmFtZSk7CiAgICAgaWYgKHdpbikKLSAgICAgICAgd2luLT5jbGVhcigpOworICAgICAg ICB3aW4tPmNsZWFyKGJvb2wgY2xlYXJXaW5kb3dQcm9wZXJ0aWVzKTsKICAgfQogfQogCkluZGV4 OiBiaW5kaW5ncy9qcy9ranNfcHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBiaW5kaW5ncy9qcy9ranNf cHJveHkuaAkocmV2aXNpb24gMTUwOTIpCisrKyBiaW5kaW5ncy9qcy9ranNfcHJveHkuaAkod29y a2luZyBjb3B5KQpAQCAtNDEsNyArNDEsNyBAQCBwdWJsaWM6CiAgICAgS0pTUHJveHkoRnJhbWUq KTsKICAgICB+S0pTUHJveHkoKTsKICAgICBLSlM6OkpTVmFsdWUqIGV2YWx1YXRlKGNvbnN0IFN0 cmluZyYgZmlsZW5hbWUsIGludCBiYXNlTGluZSwgY29uc3QgU3RyaW5nJiBjb2RlLCBOb2RlKik7 Ci0gICAgdm9pZCBjbGVhcigpOworICAgIHZvaWQgY2xlYXIoYm9vbCBjbGVhcldpbmRvd1Byb3Bl cnRpZXMpOwogICAgIEV2ZW50TGlzdGVuZXIqIGNyZWF0ZUhUTUxFdmVudEhhbmRsZXIoY29uc3Qg U3RyaW5nJiBmdW5jdGlvbk5hbWUsIGNvbnN0IFN0cmluZyYgY29kZSwgTm9kZSopOwogI2lmIFNW R19TVVBQT1JUCiAgICAgRXZlbnRMaXN0ZW5lciogY3JlYXRlU1ZHRXZlbnRIYW5kbGVyKGNvbnN0 IFN0cmluZyYgZnVuY3Rpb25OYW1lLCBjb25zdCBTdHJpbmcmIGNvZGUsIE5vZGUqKTsKSW5kZXg6 IGJpbmRpbmdzL2pzL2tqc193aW5kb3cuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGJpbmRpbmdzL2pzL2tq c193aW5kb3cuY3BwCShyZXZpc2lvbiAxNTA5MikKKysrIGJpbmRpbmdzL2pzL2tqc193aW5kb3cu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzIzLDIzICsxMzIzLDI1IEBAIEpTVW5wcm90ZWN0ZWRF dmVudExpc3RlbmVyICpXaW5kb3c6OmdldEoKICAgcmV0dXJuIG5ldyBKU1VucHJvdGVjdGVkRXZl bnRMaXN0ZW5lcihvYmplY3QsIHRoaXMsIGh0bWwpOwogfQogCi12b2lkIFdpbmRvdzo6Y2xlYXIo KQordm9pZCBXaW5kb3c6OmNsZWFyKGJvb2wgY2xlYXJXaW5kb3dQcm9wZXJ0aWVzKQogewotICBK U0xvY2sgbG9jazsKKyAgICBKU0xvY2sgbG9jazsKIAotICBpZiAobV9yZXR1cm5WYWx1ZVNsb3Qp Ci0gICAgaWYgKEpTVmFsdWUqIHJldHVyblZhbHVlID0gZ2V0RGlyZWN0KCJyZXR1cm5WYWx1ZSIp KQotICAgICAgKm1fcmV0dXJuVmFsdWVTbG90ID0gcmV0dXJuVmFsdWU7CisgICAgaWYgKG1fcmV0 dXJuVmFsdWVTbG90KQorICAgICAgICBpZiAoSlNWYWx1ZSogcmV0dXJuVmFsdWUgPSBnZXREaXJl Y3QoInJldHVyblZhbHVlIikpCisgICAgICAgICAgICAqbV9yZXR1cm5WYWx1ZVNsb3QgPSByZXR1 cm5WYWx1ZTsKIAotICBjbGVhckFsbFRpbWVvdXRzKCk7Ci0gIGNsZWFyUHJvcGVydGllcygpOwot ICBzZXRQcm90b3R5cGUoSlNET01XaW5kb3dQcm90bzo6c2VsZigpKTsgLy8gY2xlYXIgdGhlIHBy b3RvdHlwZQorICAgIGlmIChjbGVhcldpbmRvd1Byb3BlcnRpZXMpIHsKKyAgICAgICAgY2xlYXJB bGxUaW1lb3V0cygpOworICAgICAgICBjbGVhclByb3BlcnRpZXMoKTsKKyAgICAgICAgc2V0UHJv dG90eXBlKEpTRE9NV2luZG93UHJvdG86OnNlbGYoKSk7IC8vIGNsZWFyIHRoZSBwcm90b3R5cGUK IAotICAvLyB0aGVyZSdzIGxpa2VseSB0byBiZSBsb3RzIG9mIGdhcmJhZ2Ugbm93Ci0gIENvbGxl Y3Rvcjo6Y29sbGVjdCgpOworICAgICAgICAvLyB0aGVyZSdzIGxpa2VseSB0byBiZSBsb3RzIG9m IGdhcmJhZ2Ugbm93CisgICAgICAgIENvbGxlY3Rvcjo6Y29sbGVjdCgpOwogCi0gIC8vIE5vdyBy ZWNyZWF0ZSBhIHdvcmtpbmcgZ2xvYmFsIG9iamVjdCBmb3IgdGhlIG5leHQgVVJMIHRoYXQgd2ls bCB1c2UgdXMKLSAgaW50ZXJwcmV0ZXIoKS0+aW5pdEdsb2JhbE9iamVjdCgpOworICAgICAgICAv LyBOb3cgcmVjcmVhdGUgYSB3b3JraW5nIGdsb2JhbCBvYmplY3QgZm9yIHRoZSBuZXh0IFVSTCB0 aGF0IHdpbGwgdXNlIHVzCisgICAgICAgIGludGVycHJldGVyKCktPmluaXRHbG9iYWxPYmplY3Qo KTsKKyAgICB9CiB9CiAKIHZvaWQgV2luZG93OjpzZXRDdXJyZW50RXZlbnQoRXZlbnQgKmV2dCkK SW5kZXg6IGJpbmRpbmdzL2pzL2tqc193aW5kb3cuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBiaW5kaW5ncy9q cy9ranNfd2luZG93LmgJKHJldmlzaW9uIDE1MDkyKQorKysgYmluZGluZ3MvanMva2pzX3dpbmRv dy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMzgsNyArMTM4LDcgQEAgbmFtZXNwYWNlIEtKUyB7CiAg ICAgQmFySW5mbyAqdG9vbGJhcihFeGVjU3RhdGUqKSBjb25zdDsKICAgICBKU0V2ZW50TGlzdGVu ZXIgKmdldEpTRXZlbnRMaXN0ZW5lcihKU1ZhbHVlKiwgYm9vbCBodG1sID0gZmFsc2UpOwogICAg IEpTVW5wcm90ZWN0ZWRFdmVudExpc3RlbmVyICpnZXRKU1VucHJvdGVjdGVkRXZlbnRMaXN0ZW5l cihKU1ZhbHVlKiwgYm9vbCBodG1sID0gZmFsc2UpOwotICAgIHZvaWQgY2xlYXIoKTsKKyAgICB2 b2lkIGNsZWFyKGJvb2wgY2xlYXJXaW5kb3dQcm9wZXJ0aWVzKTsKICAgICB2aXJ0dWFsIFVTdHJp bmcgdG9TdHJpbmcoRXhlY1N0YXRlICopIGNvbnN0OwogCiAgICAgLy8gU2V0IHRoZSBjdXJyZW50 ICJldmVudCIgb2JqZWN0CkluZGV4OiBtYW51YWwtdGVzdHMvbW9kYWwtZGlhbG9nLmh0bWwKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gbWFudWFsLXRlc3RzL21vZGFsLWRpYWxvZy5odG1sCShyZXZpc2lvbiAwKQor KysgbWFudWFsLXRlc3RzL21vZGFsLWRpYWxvZy5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsx LDEyIEBACis8Zm9ybSBuYW1lPSJmb3JtIj4KKzxwPkhlcmUgaXMgdGhlIHRleHQgZnJvbSB0aGUg bWFpbiB3aW5kb3c6IDxpbnB1dCBuYW1lPSJmcm9tV2luZG93Ij48L3A+Cis8cD5UeXBlIHRleHQg aGVyZSB0byBiZSBzZW50IGJhY2sgdG8gdGhlIG1haW4gd2luZG93OiA8aW5wdXQgbmFtZT0idG9X aW5kb3ciIHZhbHVlPSJmcm9tIG1vZGFsIHdpbmRvdyI+PC9wPgorPHA+VGhlbiwgcHVzaCB0aGlz IGJ1dHRvbjogPGlucHV0IHR5cGU9ImJ1dHRvbiIgdmFsdWU9IkNsb3NlIiBvbkNsaWNrPSJjbG9z ZU1vZGFsKCkiPjwvcD4KKzwvZm9ybT4KKzxzY3JpcHQ+Citkb2N1bWVudC5mb3JtLmZyb21XaW5k b3cudmFsdWUgPSB3aW5kb3cuZGlhbG9nQXJndW1lbnRzOworZnVuY3Rpb24gY2xvc2VNb2RhbCgp IHsKKyAgIHdpbmRvdy5yZXR1cm5WYWx1ZSA9IGRvY3VtZW50LmZvcm0udG9XaW5kb3cudmFsdWU7 CisgICB3aW5kb3cuY2xvc2UoKTsKK30KKzwvc2NyaXB0PgoKUHJvcGVydHkgY2hhbmdlcyBvbjog bWFudWFsLXRlc3RzL21vZGFsLWRpYWxvZy5odG1sCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTmFtZTogc3ZuOm1pbWUt dHlwZQogICArIHRleHQvaHRtbApOYW1lOiBzdm46ZW9sLXN0eWxlCiAgICsgbmF0aXZlCgpJbmRl eDogbWFudWFsLXRlc3RzL3Nob3ctbW9kYWwtZGlhbG9nLXRlc3QuaHRtbAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBtYW51YWwtdGVzdHMvc2hvdy1tb2RhbC1kaWFsb2ctdGVzdC5odG1sCShyZXZpc2lvbiAwKQor KysgbWFudWFsLXRlc3RzL3Nob3ctbW9kYWwtZGlhbG9nLXRlc3QuaHRtbAkocmV2aXNpb24gMCkK QEAgLTAsMCArMSwxNSBAQAorPHNjcmlwdD4KK2Z1bmN0aW9uIHNob3dNb2RhbCgpIHsKKyAgICBk b2N1bWVudC5mb3JtLmZyb21Nb2RhbC52YWx1ZSA9CisgICAgICAgIHNob3dNb2RhbERpYWxvZygi bW9kYWwtZGlhbG9nLmh0bWwiLAorICAgICAgICAgICAgZG9jdW1lbnQuZm9ybS50b01vZGFsLnZh bHVlLAorICAgICAgICAgICAgImRpYWxvZ0hlaWdodDoyODBweCxkaWFsb2dXaWR0aDo0MDBweCIp OworfQorPC9zY3JpcHQ+Cis8Zm9ybSBuYW1lPSJmb3JtIj4KKzxwPlR5cGUgdGV4dCBoZXJlIHRv IGJlIHNlbnQgdG8gdGhlIG1vZGFsIHdpbmRvdyBhbmQgcHJlc3MgdGhlIGJ1dHRvbjoKKzxpbnB1 dCBuYW1lPSJ0b01vZGFsIiB2YWx1ZT0iZnJvbSBtYWluIHdpbmRvdyI+Cis8aW5wdXQgdHlwZT0i YnV0dG9uIiB2YWx1ZT0iU2hvdyBNb2RhbCIgb25DbGljaz0ic2hvd01vZGFsKCkiPjwvcD4KKzxo eT4KKzxwPlRleHQgd2lsbCBhcHBlYXIgaGVyIGZyb20gdGhlIG1vZGFsIHdpbmRvdzogPGlucHV0 IG5hbWU9ImZyb21Nb2RhbCI+Cis8L2Zvcm0+CgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBtYW51YWwt dGVzdHMvc2hvdy1tb2RhbC1kaWFsb2ctdGVzdC5odG1sCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTmFtZTogc3ZuOm1p bWUtdHlwZQogICArIHRleHQvaHRtbApOYW1lOiBzdm46ZW9sLXN0eWxlCiAgICsgbmF0aXZlCgpJ bmRleDogcGFnZS9GcmFtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcGFnZS9GcmFtZS5jcHAJKHJldmlz aW9uIDE1MDkyKQorKysgcGFnZS9GcmFtZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQzNiw4ICs0 MzYsOCBAQCB2b2lkIEZyYW1lOjpjbGVhcihib29sIGNsZWFyV2luZG93UHJvcGVyCiAgIH0KIAog ICAvLyBNb3ZpbmcgcGFzdCBkb2Mgc28gdGhhdCBvblVubG9hZCB3b3Jrcy4KLSAgaWYgKGNsZWFy V2luZG93UHJvcGVydGllcyAmJiBkLT5tX2pzY3JpcHQpCi0gICAgZC0+bV9qc2NyaXB0LT5jbGVh cigpOworICBpZiAoZC0+bV9qc2NyaXB0KQorICAgIGQtPm1fanNjcmlwdC0+Y2xlYXIoY2xlYXJX aW5kb3dQcm9wZXJ0aWVzKTsKIAogICBpZiAoZC0+bV92aWV3KQogICAgIGQtPm1fdmlldy0+Y2xl YXIoKTsK 9095 2006-06-29 09:36:54 -0700 2006-07-08 09:05:46 -0700 patch, including change log and a manual test ShowModalDialogReturnValuePatch.txt text/plain 7842 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNTA5MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjggQEAKKzIwMDYtMDYtMjkgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gZml4 IGh0dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTYyMgorICAg ICAgICAgIHNob3dNb2RhbERpYWxvZyByZXR1cm5WYWx1ZSBpZ25vcmVkLCBmdW5jdGlvbiByZXN1 bHQgaXMgYWx3YXlzICJ1bmRlZmluZWQiCisKKyAgICAgICAgKiBtYW51YWwtdGVzdHMvbW9kYWwt ZGlhbG9nLmh0bWw6IEFkZGVkLgorICAgICAgICAqIG1hbnVhbC10ZXN0cy9zaG93LW1vZGFsLWRp YWxvZy10ZXN0Lmh0bWw6IEFkZGVkLgorCisgICAgICAgICogcGFnZS9GcmFtZS5jcHA6IChXZWJD b3JlOjpGcmFtZTo6Y2xlYXIpOiBDYWxsIEtKU1Byb3h5OjpjbGVhciB3aXRoIHRoZQorICAgICAg ICBjbGVhcldpbmRvd1Byb3BlcnRpZXMgcGFyYW1ldGVyIGluc3RlYWQgb2Ygbm90IGNhbGxpbmcg aXQgYXQgYWxsIHdoZW4KKyAgICAgICAgY2xlYXJXaW5kb3dQcm9wZXJ0aWVzIGlzIGZhbHNlLgor CisgICAgICAgICogYmluZGluZ3MvanMva2pzX3Byb3h5Lmg6IEFkZCBib29sZWFuIGNsZWFyV2lu ZG93UHJvcGVydGllcyBwYXJhbWV0ZXIuCisgICAgICAgICogYmluZGluZ3MvanMva2pzX3Byb3h5 LmNwcDogKFdlYkNvcmU6OktKU1Byb3h5OjpjbGVhcik6IFBhc3MgY2xlYXJXaW5kb3dQcm9wZXJ0 aWVzCisgICAgICAgIHZhcmlhYmxlIHRocm91Z2ggdG8gV2luZG93OjpjbGVhciBpbnN0ZWFkIG9m IG5vdCBjYWxsaW5nIGl0IGF0IGFsbC4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL2tqc193aW5k b3cuaDogQWRkIGJvb2xlYW4gY2xlYXJXaW5kb3dQcm9wZXJ0aWVzIHBhcmFtZXRlci4KKyAgICAg ICAgKiBiaW5kaW5ncy9qcy9ranNfd2luZG93LmNwcDogKEtKUzo6V2luZG93OjpjbGVhcik6IElm IGNsZWFyV2luZG93UHJvcGVydGllcworICAgICAgICBpcyBmYWxzZSwgZG8gb25seSB0aGUgcmV0 dXJuVmFsdWUgd29yaywgbm90IHRoZSByZXN0IG9mIHRoZSB3b3JrLgorCisgICAgICAgICogbWFu dWFsLXRlc3RzL21vZGFsLWRpYWxvZy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBtYW51YWwtdGVz dHMvc2hvdy1tb2RhbC1kaWFsb2ctdGVzdC5odG1sOiBBZGRlZC4KKwogMjAwNi0wNi0yOSAgRGF2 aWQgS2lsemVyICA8ZGRraWx6ZXJAa2lsemVyLm5ldD4KIAogICAgICAgICBSZXZpZXdlZCBieSBE YXJpbi4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvanMva2pzX3Byb3h5LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL2pzL2tqc19wcm94eS5jcHAJKHJldmlzaW9uIDE1MDkyKQor KysgV2ViQ29yZS9iaW5kaW5ncy9qcy9ranNfcHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04 MywxNSArODMsMTUgQEAgSlNWYWx1ZSogS0pTUHJveHk6OmV2YWx1YXRlKGNvbnN0IFN0cmluZwog ICByZXR1cm4gMDsKIH0KIAotdm9pZCBLSlNQcm94eTo6Y2xlYXIoKSB7Ci0gIC8vIGNsZWFyIHJl c291cmNlcyBhbGxvY2F0ZWQgYnkgdGhlIGludGVycHJldGVyLCBhbmQgbWFrZSBpdCByZWFkeSB0 byBiZSB1c2VkIGJ5IGFub3RoZXIgcGFnZQotICAvLyBXZSBoYXZlIHRvIGtlZXAgaXQsIHNvIHRo YXQgdGhlIFdpbmRvdyBvYmplY3QgZm9yIHRoZSBmcmFtZSByZW1haW5zIHRoZSBzYW1lLgotICAv LyAod2UgdXNlZCB0byBkZWxldGUgYW5kIHJlLWNyZWF0ZSBpdCwgcHJldmlvdXNseSkKLSAgaWYg KG1fc2NyaXB0KSB7Ci0gICAgV2luZG93ICp3aW4gPSBXaW5kb3c6OnJldHJpZXZlV2luZG93KG1f ZnJhbWUpOwotICAgIGlmICh3aW4pCi0gICAgICAgIHdpbi0+Y2xlYXIoKTsKLSAgfQordm9pZCBL SlNQcm94eTo6Y2xlYXIoYm9vbCBjbGVhcldpbmRvd1Byb3BlcnRpZXMpCit7CisgICAgLy8gQ2xl YXIgcmVzb3VyY2VzIGFsbG9jYXRlZCBieSB0aGUgaW50ZXJwcmV0ZXIsIGFuZCBtYWtlIGl0IHJl YWR5IHRvIGJlIHVzZWQgYnkgYW5vdGhlciBwYWdlLgorICAgIC8vIEVhcmxpZXIgdmVyc2lvbnMg b2YgdGhpcyBmdW5jdGlvbiBkZWxldGVkIGFuZCByZS1jcmVhdGVkIHRoZSB3aW5kb3cgb2JqZWN0 LCBidXQgd2UgaGF2ZSB0bworICAgIC8vIGtlZXAgaXQgYmVjYXVzZSBKYXZhU2NyaXB0IGNhbiBr ZWVwIGEgcmVmZXJlbmNlIHRvIHRoZSB3aW5kb3cgb2JqZWN0IGFuZCBpdCBtdXN0IGJlIHRoZSBz YW1lLgorICAgIGlmIChtX3NjcmlwdCkgeworICAgICAgICBpZiAoV2luZG93KiB3aW5kb3cgPSBX aW5kb3c6OnJldHJpZXZlV2luZG93KG1fZnJhbWUpKQorICAgICAgICAgICAgd2luZG93LT5jbGVh cihjbGVhcldpbmRvd1Byb3BlcnRpZXMpOworICAgIH0KIH0KIAogRXZlbnRMaXN0ZW5lciogS0pT UHJveHk6OmNyZWF0ZUhUTUxFdmVudEhhbmRsZXIoY29uc3QgU3RyaW5nJiBmdW5jdGlvbk5hbWUs IGNvbnN0IFN0cmluZyYgY29kZSwgTm9kZSogbm9kZSkKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mv anMva2pzX3Byb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9qcy9ranNfcHJv eHkuaAkocmV2aXNpb24gMTUwOTIpCisrKyBXZWJDb3JlL2JpbmRpbmdzL2pzL2tqc19wcm94eS5o CSh3b3JraW5nIGNvcHkpCkBAIC00MSw3ICs0MSw3IEBAIHB1YmxpYzoKICAgICBLSlNQcm94eShG cmFtZSopOwogICAgIH5LSlNQcm94eSgpOwogICAgIEtKUzo6SlNWYWx1ZSogZXZhbHVhdGUoY29u c3QgU3RyaW5nJiBmaWxlbmFtZSwgaW50IGJhc2VMaW5lLCBjb25zdCBTdHJpbmcmIGNvZGUsIE5v ZGUqKTsKLSAgICB2b2lkIGNsZWFyKCk7CisgICAgdm9pZCBjbGVhcihib29sIGNsZWFyV2luZG93 UHJvcGVydGllcyk7CiAgICAgRXZlbnRMaXN0ZW5lciogY3JlYXRlSFRNTEV2ZW50SGFuZGxlcihj b25zdCBTdHJpbmcmIGZ1bmN0aW9uTmFtZSwgY29uc3QgU3RyaW5nJiBjb2RlLCBOb2RlKik7CiAj aWYgU1ZHX1NVUFBPUlQKICAgICBFdmVudExpc3RlbmVyKiBjcmVhdGVTVkdFdmVudEhhbmRsZXIo Y29uc3QgU3RyaW5nJiBmdW5jdGlvbk5hbWUsIGNvbnN0IFN0cmluZyYgY29kZSwgTm9kZSopOwpJ bmRleDogV2ViQ29yZS9iaW5kaW5ncy9qcy9ranNfd2luZG93LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL2JpbmRpbmdzL2pzL2tqc193aW5kb3cuY3BwCShyZXZpc2lvbiAxNTA5MikKKysrIFdl YkNvcmUvYmluZGluZ3MvanMva2pzX3dpbmRvdy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzMjMs MjMgKzEzMjMsMjUgQEAgSlNVbnByb3RlY3RlZEV2ZW50TGlzdGVuZXIgKldpbmRvdzo6Z2V0Sgog ICByZXR1cm4gbmV3IEpTVW5wcm90ZWN0ZWRFdmVudExpc3RlbmVyKG9iamVjdCwgdGhpcywgaHRt bCk7CiB9CiAKLXZvaWQgV2luZG93OjpjbGVhcigpCit2b2lkIFdpbmRvdzo6Y2xlYXIoYm9vbCBj bGVhcldpbmRvd1Byb3BlcnRpZXMpCiB7Ci0gIEpTTG9jayBsb2NrOworICAgIEpTTG9jayBsb2Nr OwogCi0gIGlmIChtX3JldHVyblZhbHVlU2xvdCkKLSAgICBpZiAoSlNWYWx1ZSogcmV0dXJuVmFs dWUgPSBnZXREaXJlY3QoInJldHVyblZhbHVlIikpCi0gICAgICAqbV9yZXR1cm5WYWx1ZVNsb3Qg PSByZXR1cm5WYWx1ZTsKKyAgICBpZiAobV9yZXR1cm5WYWx1ZVNsb3QpCisgICAgICAgIGlmIChK U1ZhbHVlKiByZXR1cm5WYWx1ZSA9IGdldERpcmVjdCgicmV0dXJuVmFsdWUiKSkKKyAgICAgICAg ICAgICptX3JldHVyblZhbHVlU2xvdCA9IHJldHVyblZhbHVlOwogCi0gIGNsZWFyQWxsVGltZW91 dHMoKTsKLSAgY2xlYXJQcm9wZXJ0aWVzKCk7Ci0gIHNldFByb3RvdHlwZShKU0RPTVdpbmRvd1By b3RvOjpzZWxmKCkpOyAvLyBjbGVhciB0aGUgcHJvdG90eXBlCisgICAgaWYgKGNsZWFyV2luZG93 UHJvcGVydGllcykgeworICAgICAgICBjbGVhckFsbFRpbWVvdXRzKCk7CisgICAgICAgIGNsZWFy UHJvcGVydGllcygpOworICAgICAgICBzZXRQcm90b3R5cGUoSlNET01XaW5kb3dQcm90bzo6c2Vs ZigpKTsgLy8gY2xlYXIgdGhlIHByb3RvdHlwZQogCi0gIC8vIHRoZXJlJ3MgbGlrZWx5IHRvIGJl IGxvdHMgb2YgZ2FyYmFnZSBub3cKLSAgQ29sbGVjdG9yOjpjb2xsZWN0KCk7CisgICAgICAgIC8v IHRoZXJlJ3MgbGlrZWx5IHRvIGJlIGxvdHMgb2YgZ2FyYmFnZSBub3cKKyAgICAgICAgQ29sbGVj dG9yOjpjb2xsZWN0KCk7CiAKLSAgLy8gTm93IHJlY3JlYXRlIGEgd29ya2luZyBnbG9iYWwgb2Jq ZWN0IGZvciB0aGUgbmV4dCBVUkwgdGhhdCB3aWxsIHVzZSB1cwotICBpbnRlcnByZXRlcigpLT5p bml0R2xvYmFsT2JqZWN0KCk7CisgICAgICAgIC8vIE5vdyByZWNyZWF0ZSBhIHdvcmtpbmcgZ2xv YmFsIG9iamVjdCBmb3IgdGhlIG5leHQgVVJMIHRoYXQgd2lsbCB1c2UgdXMKKyAgICAgICAgaW50 ZXJwcmV0ZXIoKS0+aW5pdEdsb2JhbE9iamVjdCgpOworICAgIH0KIH0KIAogdm9pZCBXaW5kb3c6 OnNldEN1cnJlbnRFdmVudChFdmVudCAqZXZ0KQpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9qcy9r anNfd2luZG93LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9qcy9ranNfd2luZG93 LmgJKHJldmlzaW9uIDE1MDkyKQorKysgV2ViQ29yZS9iaW5kaW5ncy9qcy9ranNfd2luZG93LmgJ KHdvcmtpbmcgY29weSkKQEAgLTEzOCw3ICsxMzgsNyBAQCBuYW1lc3BhY2UgS0pTIHsKICAgICBC YXJJbmZvICp0b29sYmFyKEV4ZWNTdGF0ZSopIGNvbnN0OwogICAgIEpTRXZlbnRMaXN0ZW5lciAq Z2V0SlNFdmVudExpc3RlbmVyKEpTVmFsdWUqLCBib29sIGh0bWwgPSBmYWxzZSk7CiAgICAgSlNV bnByb3RlY3RlZEV2ZW50TGlzdGVuZXIgKmdldEpTVW5wcm90ZWN0ZWRFdmVudExpc3RlbmVyKEpT VmFsdWUqLCBib29sIGh0bWwgPSBmYWxzZSk7Ci0gICAgdm9pZCBjbGVhcigpOworICAgIHZvaWQg Y2xlYXIoYm9vbCBjbGVhcldpbmRvd1Byb3BlcnRpZXMpOwogICAgIHZpcnR1YWwgVVN0cmluZyB0 b1N0cmluZyhFeGVjU3RhdGUgKikgY29uc3Q7CiAKICAgICAvLyBTZXQgdGhlIGN1cnJlbnQgImV2 ZW50IiBvYmplY3QKSW5kZXg6IFdlYkNvcmUvbWFudWFsLXRlc3RzL21vZGFsLWRpYWxvZy5odG1s Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvbWFudWFsLXRlc3RzL21vZGFsLWRpYWxvZy5odG1sCShy ZXZpc2lvbiAwKQorKysgV2ViQ29yZS9tYW51YWwtdGVzdHMvbW9kYWwtZGlhbG9nLmh0bWwJKHJl dmlzaW9uIDApCkBAIC0wLDAgKzEsMTIgQEAKKzxmb3JtIG5hbWU9ImZvcm0iPgorPHA+SGVyZSBp cyB0aGUgdGV4dCBmcm9tIHRoZSBtYWluIHdpbmRvdzogPGlucHV0IG5hbWU9ImZyb21XaW5kb3ci PjwvcD4KKzxwPlR5cGUgdGV4dCBoZXJlIHRvIGJlIHNlbnQgYmFjayB0byB0aGUgbWFpbiB3aW5k b3c6IDxpbnB1dCBuYW1lPSJ0b1dpbmRvdyIgdmFsdWU9ImZyb20gbW9kYWwgd2luZG93Ij48L3A+ Cis8cD5UaGVuLCBwdXNoIHRoaXMgYnV0dG9uOiA8aW5wdXQgdHlwZT0iYnV0dG9uIiB2YWx1ZT0i Q2xvc2UiIG9uQ2xpY2s9ImNsb3NlTW9kYWwoKSI+PC9wPgorPC9mb3JtPgorPHNjcmlwdD4KK2Rv Y3VtZW50LmZvcm0uZnJvbVdpbmRvdy52YWx1ZSA9IHdpbmRvdy5kaWFsb2dBcmd1bWVudHM7Citm dW5jdGlvbiBjbG9zZU1vZGFsKCkgeworICAgd2luZG93LnJldHVyblZhbHVlID0gZG9jdW1lbnQu Zm9ybS50b1dpbmRvdy52YWx1ZTsKKyAgIHdpbmRvdy5jbG9zZSgpOworfQorPC9zY3JpcHQ+CgpQ cm9wZXJ0eSBjaGFuZ2VzIG9uOiBXZWJDb3JlL21hbnVhbC10ZXN0cy9tb2RhbC1kaWFsb2cuaHRt bApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCk5hbWU6IHN2bjptaW1lLXR5cGUKICAgKyB0ZXh0L2h0bWwKTmFtZTogc3Zu OmVvbC1zdHlsZQogICArIG5hdGl2ZQoKSW5kZXg6IFdlYkNvcmUvbWFudWFsLXRlc3RzL3Nob3ct bW9kYWwtZGlhbG9nLXRlc3QuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL21hbnVhbC10ZXN0 cy9zaG93LW1vZGFsLWRpYWxvZy10ZXN0Lmh0bWwJKHJldmlzaW9uIDApCisrKyBXZWJDb3JlL21h bnVhbC10ZXN0cy9zaG93LW1vZGFsLWRpYWxvZy10ZXN0Lmh0bWwJKHJldmlzaW9uIDApCkBAIC0w LDAgKzEsMTUgQEAKKzxzY3JpcHQ+CitmdW5jdGlvbiBzaG93TW9kYWwoKSB7CisgICAgZG9jdW1l bnQuZm9ybS5mcm9tTW9kYWwudmFsdWUgPQorICAgICAgICBzaG93TW9kYWxEaWFsb2coIm1vZGFs LWRpYWxvZy5odG1sIiwKKyAgICAgICAgICAgIGRvY3VtZW50LmZvcm0udG9Nb2RhbC52YWx1ZSwK KyAgICAgICAgICAgICJkaWFsb2dIZWlnaHQ6MjgwcHgsZGlhbG9nV2lkdGg6NDAwcHgiKTsKK30K Kzwvc2NyaXB0PgorPGZvcm0gbmFtZT0iZm9ybSI+Cis8cD5UeXBlIHRleHQgaGVyZSB0byBiZSBz ZW50IHRvIHRoZSBtb2RhbCB3aW5kb3cgYW5kIHByZXNzIHRoZSBidXR0b246Cis8aW5wdXQgbmFt ZT0idG9Nb2RhbCIgdmFsdWU9ImZyb20gbWFpbiB3aW5kb3ciPgorPGlucHV0IHR5cGU9ImJ1dHRv biIgdmFsdWU9IlNob3cgTW9kYWwiIG9uQ2xpY2s9InNob3dNb2RhbCgpIj48L3A+Cis8aHk+Cis8 cD5UZXh0IHdpbGwgYXBwZWFyIGhlciBmcm9tIHRoZSBtb2RhbCB3aW5kb3c6IDxpbnB1dCBuYW1l PSJmcm9tTW9kYWwiPgorPC9mb3JtPgoKUHJvcGVydHkgY2hhbmdlcyBvbjogV2ViQ29yZS9tYW51 YWwtdGVzdHMvc2hvdy1tb2RhbC1kaWFsb2ctdGVzdC5odG1sCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTmFtZTogc3Zu Om1pbWUtdHlwZQogICArIHRleHQvaHRtbApOYW1lOiBzdm46ZW9sLXN0eWxlCiAgICsgbmF0aXZl CgpJbmRleDogV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3Bh Z2UvRnJhbWUuY3BwCShyZXZpc2lvbiAxNTA5MikKKysrIFdlYkNvcmUvcGFnZS9GcmFtZS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTQzNiw4ICs0MzYsOCBAQCB2b2lkIEZyYW1lOjpjbGVhcihib29s IGNsZWFyV2luZG93UHJvcGVyCiAgIH0KIAogICAvLyBNb3ZpbmcgcGFzdCBkb2Mgc28gdGhhdCBv blVubG9hZCB3b3Jrcy4KLSAgaWYgKGNsZWFyV2luZG93UHJvcGVydGllcyAmJiBkLT5tX2pzY3Jp cHQpCi0gICAgZC0+bV9qc2NyaXB0LT5jbGVhcigpOworICBpZiAoZC0+bV9qc2NyaXB0KQorICAg IGQtPm1fanNjcmlwdC0+Y2xlYXIoY2xlYXJXaW5kb3dQcm9wZXJ0aWVzKTsKIAogICBpZiAoZC0+ bV92aWV3KQogICAgIGQtPm1fdmlldy0+Y2xlYXIoKTsK 9269 2006-07-08 09:05:46 -0700 2006-07-08 09:43:15 -0700 better patch with change log, can still use the old test case ShowModalDialogReturnValuePatch.txt text/plain 8417 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNTIzMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDUgKzEsMjggQEAKIDIwMDYtMDctMDggIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gYmV0 dGVyIGZpeCBmb3IgaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9p ZD05NjIyCisgICAgICAgICAgUkVHUkVTU0lPTjogc2hvd01vZGFsRGlhbG9nIHJldHVyblZhbHVl IGlnbm9yZWQsIGZ1bmN0aW9uIHJlc3VsdCBpcyBhbHdheXMgInVuZGVmaW5lZCIKKworICAgICAg ICAqIGJpbmRpbmdzL2pzL2tqc193aW5kb3cuY3BwOgorICAgICAgICAoS0pTOjpzaG93TW9kYWxE aWFsb2cpOiBTZXQgdGhlIHJldHVybiB2YWx1ZSBhZnRlciByZXR1cm5pbmcgZnJvbSB0aGUgZnVu Y3Rpb24gaWYgdGhlCisgICAgICAgIHdpbmRvdyBpcyBub3QgY2xlYXJlZDsgdGhpcyBpcyBhIGJl dHRlciB3YXkgdG8gaGFuZGxlIHRoZSBjYXNlIHdoZXJlIHRoZSB3aW5kb3cgZG9lcworICAgICAg ICBub3QgZ2V0IGNsZWFyZWQgYmVmb3JlIHJldHVybmluZywgYW5kIGhhbmRsZXMgc29tZSBuZXcg Y2FzZXMgY3JlYXRlZCBieSBzbGlnaHQgY2hhbmdlcworICAgICAgICBpbiB0aGUgbGF0ZXN0IFNh ZmFyaSBwcm9wZXJseSB0b28uCisgICAgICAgIChLSlM6OldpbmRvdzo6Y2xlYXIpOiBDaGFuZ2Vk IGxvZ2ljIHNsaWdodGx5IHNvIHdlIGFsd2F5cyBzdG9yZSB0aGUgcmVzdWx0IG9mIGdldERpcmVj dAorICAgICAgICBpbnRvIHRoZSByZXR1cm4gdmFsdWUgc2xvdCAtLSB0aGUgb2xkIGNvZGUgbGVm dCB0aGUgc3RvcmFnZSB1bnRvdWNoZWQgaWYgaXQgd2FzIDAuCisgICAgICAgIEFsc28gbWFkZSBp dCBvbmx5IG92ZXJ3cml0ZSB0aGUgcmV0dXJuIHZhbHVlIHNsb3QgaWYgaXQncyAwLgorCisgICAg ICAgICogYmluZGluZ3MvanMva2pzX3Byb3h5Lmg6CisgICAgICAgICogYmluZGluZ3MvanMva2pz X3Byb3h5LmNwcDoKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9ranNfd2luZG93Lmg6CisgICAgICAg ICogYmluZGluZ3MvanMva2pzX3dpbmRvdy5jcHA6CisgICAgICAgICogcGFnZS9GcmFtZS5jcHA6 CisgICAgICAgIFJvbGwgdGhlIHByZXZpb3VzIGZpeCBvdXQuCisKKzIwMDYtMDctMDggIERhcmlu IEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCiAgICAgICAgIC0gdHJ5IHRvIGZpeCBXaW5kb3dz IGJ1aWxkCiAKICAgICAgICAgKiBXZWJDb3JlLnZjcHJvai9XZWJDb3JlL1dlYkNvcmUudmNwcm9q OiBBZGQgbWlzc2luZyBzb3VyY2UgZmlsZXMuCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL2pzL2tq c19wcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9qcy9ranNfcHJveHku Y3BwCShyZXZpc2lvbiAxNTIyOSkKKysrIFdlYkNvcmUvYmluZGluZ3MvanMva2pzX3Byb3h5LmNw cAkod29ya2luZyBjb3B5KQpAQCAtODMsMTUgKzgzLDE1IEBAIEpTVmFsdWUqIEtKU1Byb3h5Ojpl dmFsdWF0ZShjb25zdCBTdHJpbmcKICAgcmV0dXJuIDA7CiB9CiAKLXZvaWQgS0pTUHJveHk6OmNs ZWFyKGJvb2wgY2xlYXJXaW5kb3dQcm9wZXJ0aWVzKQotewotICAgIC8vIENsZWFyIHJlc291cmNl cyBhbGxvY2F0ZWQgYnkgdGhlIGludGVycHJldGVyLCBhbmQgbWFrZSBpdCByZWFkeSB0byBiZSB1 c2VkIGJ5IGFub3RoZXIgcGFnZS4KLSAgICAvLyBFYXJsaWVyIHZlcnNpb25zIG9mIHRoaXMgZnVu Y3Rpb24gZGVsZXRlZCBhbmQgcmUtY3JlYXRlZCB0aGUgd2luZG93IG9iamVjdCwgYnV0IHdlIGhh dmUgdG8KLSAgICAvLyBrZWVwIGl0IGJlY2F1c2UgSmF2YVNjcmlwdCBjYW4ga2VlcCBhIHJlZmVy ZW5jZSB0byB0aGUgd2luZG93IG9iamVjdCBhbmQgaXQgbXVzdCBiZSB0aGUgc2FtZS4KLSAgICBp ZiAobV9zY3JpcHQpIHsKLSAgICAgICAgaWYgKFdpbmRvdyogd2luZG93ID0gV2luZG93OjpyZXRy aWV2ZVdpbmRvdyhtX2ZyYW1lKSkKLSAgICAgICAgICAgIHdpbmRvdy0+Y2xlYXIoY2xlYXJXaW5k b3dQcm9wZXJ0aWVzKTsKLSAgICB9Cit2b2lkIEtKU1Byb3h5OjpjbGVhcigpIHsKKyAgLy8gY2xl YXIgcmVzb3VyY2VzIGFsbG9jYXRlZCBieSB0aGUgaW50ZXJwcmV0ZXIsIGFuZCBtYWtlIGl0IHJl YWR5IHRvIGJlIHVzZWQgYnkgYW5vdGhlciBwYWdlCisgIC8vIFdlIGhhdmUgdG8ga2VlcCBpdCwg c28gdGhhdCB0aGUgV2luZG93IG9iamVjdCBmb3IgdGhlIGZyYW1lIHJlbWFpbnMgdGhlIHNhbWUu CisgIC8vICh3ZSB1c2VkIHRvIGRlbGV0ZSBhbmQgcmUtY3JlYXRlIGl0LCBwcmV2aW91c2x5KQor ICBpZiAobV9zY3JpcHQpIHsKKyAgICBXaW5kb3cgKndpbiA9IFdpbmRvdzo6cmV0cmlldmVXaW5k b3cobV9mcmFtZSk7CisgICAgaWYgKHdpbikKKyAgICAgICAgd2luLT5jbGVhcigpOworICB9CiB9 CiAKIEV2ZW50TGlzdGVuZXIqIEtKU1Byb3h5OjpjcmVhdGVIVE1MRXZlbnRIYW5kbGVyKGNvbnN0 IFN0cmluZyYgZnVuY3Rpb25OYW1lLCBjb25zdCBTdHJpbmcmIGNvZGUsIE5vZGUqIG5vZGUpCklu ZGV4OiBXZWJDb3JlL2JpbmRpbmdzL2pzL2tqc19wcm94eS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvYmluZGluZ3MvanMva2pzX3Byb3h5LmgJKHJldmlzaW9uIDE1MjI5KQorKysgV2ViQ29yZS9i aW5kaW5ncy9qcy9ranNfcHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtNDEsNyArNDEsNyBAQCBw dWJsaWM6CiAgICAgS0pTUHJveHkoRnJhbWUqKTsKICAgICB+S0pTUHJveHkoKTsKICAgICBLSlM6 OkpTVmFsdWUqIGV2YWx1YXRlKGNvbnN0IFN0cmluZyYgZmlsZW5hbWUsIGludCBiYXNlTGluZSwg Y29uc3QgU3RyaW5nJiBjb2RlLCBOb2RlKik7Ci0gICAgdm9pZCBjbGVhcihib29sIGNsZWFyV2lu ZG93UHJvcGVydGllcyk7CisgICAgdm9pZCBjbGVhcigpOwogICAgIEV2ZW50TGlzdGVuZXIqIGNy ZWF0ZUhUTUxFdmVudEhhbmRsZXIoY29uc3QgU3RyaW5nJiBmdW5jdGlvbk5hbWUsIGNvbnN0IFN0 cmluZyYgY29kZSwgTm9kZSopOwogI2lmIFNWR19TVVBQT1JUCiAgICAgRXZlbnRMaXN0ZW5lciog Y3JlYXRlU1ZHRXZlbnRIYW5kbGVyKGNvbnN0IFN0cmluZyYgZnVuY3Rpb25OYW1lLCBjb25zdCBT dHJpbmcmIGNvZGUsIE5vZGUqKTsKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvanMva2pzX3dpbmRv dy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9qcy9ranNfd2luZG93LmNwcAko cmV2aXNpb24gMTUyMjkpCisrKyBXZWJDb3JlL2JpbmRpbmdzL2pzL2tqc193aW5kb3cuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC02NTEsMTUgKzY1MSwxOSBAQCBzdGF0aWMgSlNWYWx1ZSAqc2hvd01v ZGFsRGlhbG9nKEV4ZWNTdGF0CiAgICAgd2FyZ3MubG9jYXRpb25CYXJWaXNpYmxlID0gZmFsc2U7 CiAgICAgd2FyZ3MuZnVsbHNjcmVlbiA9IGZhbHNlOwogICAgIAotICAgIEZyYW1lICpkaWFsb2dQ YXJ0ID0gY3JlYXRlTmV3V2luZG93KGV4ZWMsIG9wZW5lcldpbmRvdywgVVJMLCAiIiwgd2FyZ3Ms IGFyZ3NbMV0pOworICAgIEZyYW1lKiBkaWFsb2dQYXJ0ID0gY3JlYXRlTmV3V2luZG93KGV4ZWMs IG9wZW5lcldpbmRvdywgVVJMLCAiIiwgd2FyZ3MsIGFyZ3NbMV0pOwogICAgIGlmICghZGlhbG9n UGFydCkKICAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7CiAKLSAgICBXaW5kb3cgKmRpYWxv Z1dpbmRvdyA9IFdpbmRvdzo6cmV0cmlldmVXaW5kb3coZGlhbG9nUGFydCk7Ci0gICAgSlNWYWx1 ZSAqcmV0dXJuVmFsdWUgPSBqc1VuZGVmaW5lZCgpOworICAgIFdpbmRvdyogZGlhbG9nV2luZG93 ID0gV2luZG93OjpyZXRyaWV2ZVdpbmRvdyhkaWFsb2dQYXJ0KTsKKyAgICBKU1ZhbHVlKiByZXR1 cm5WYWx1ZSA9IDA7CiAgICAgZGlhbG9nV2luZG93LT5zZXRSZXR1cm5WYWx1ZVNsb3QoJnJldHVy blZhbHVlKTsKICAgICBzdGF0aWNfY2FzdDxCcm93c2VyRXh0ZW5zaW9uICo+KGRpYWxvZ1BhcnQt PmJyb3dzZXJFeHRlbnNpb24oKSktPnJ1bk1vZGFsKCk7Ci0gICAgZGlhbG9nV2luZG93LT5zZXRS ZXR1cm5WYWx1ZVNsb3QoTlVMTCk7CisgICAgZGlhbG9nV2luZG93LT5zZXRSZXR1cm5WYWx1ZVNs b3QoMCk7CisgICAgaWYgKCFyZXR1cm5WYWx1ZSkKKyAgICAgICAgcmV0dXJuVmFsdWUgPSBkaWFs b2dXaW5kb3ctPmdldERpcmVjdCgicmV0dXJuVmFsdWUiKTsKKyAgICBpZiAoIXJldHVyblZhbHVl KQorICAgICAgICByZXR1cm5WYWx1ZSA9IGpzVW5kZWZpbmVkKCk7CiAgICAgcmV0dXJuIHJldHVy blZhbHVlOwogfQogCkBAIC0xMzIzLDI1ICsxMzI3LDIyIEBAIEpTVW5wcm90ZWN0ZWRFdmVudExp c3RlbmVyICpXaW5kb3c6OmdldEoKICAgcmV0dXJuIG5ldyBKU1VucHJvdGVjdGVkRXZlbnRMaXN0 ZW5lcihvYmplY3QsIHRoaXMsIGh0bWwpOwogfQogCi12b2lkIFdpbmRvdzo6Y2xlYXIoYm9vbCBj bGVhcldpbmRvd1Byb3BlcnRpZXMpCit2b2lkIFdpbmRvdzo6Y2xlYXIoKQogewotICAgIEpTTG9j ayBsb2NrOworICBKU0xvY2sgbG9jazsKIAotICAgIGlmIChtX3JldHVyblZhbHVlU2xvdCkKLSAg ICAgICAgaWYgKEpTVmFsdWUqIHJldHVyblZhbHVlID0gZ2V0RGlyZWN0KCJyZXR1cm5WYWx1ZSIp KQotICAgICAgICAgICAgKm1fcmV0dXJuVmFsdWVTbG90ID0gcmV0dXJuVmFsdWU7CisgIGlmICht X3JldHVyblZhbHVlU2xvdCAmJiAhKm1fcmV0dXJuVmFsdWVTbG90KQorICAgICptX3JldHVyblZh bHVlU2xvdCA9IGdldERpcmVjdCgicmV0dXJuVmFsdWUiKTsKIAotICAgIGlmIChjbGVhcldpbmRv d1Byb3BlcnRpZXMpIHsKLSAgICAgICAgY2xlYXJBbGxUaW1lb3V0cygpOwotICAgICAgICBjbGVh clByb3BlcnRpZXMoKTsKLSAgICAgICAgc2V0UHJvdG90eXBlKEpTRE9NV2luZG93UHJvdG86OnNl bGYoKSk7IC8vIGNsZWFyIHRoZSBwcm90b3R5cGUKKyAgY2xlYXJBbGxUaW1lb3V0cygpOworICBj bGVhclByb3BlcnRpZXMoKTsKKyAgc2V0UHJvdG90eXBlKEpTRE9NV2luZG93UHJvdG86OnNlbGYo KSk7IC8vIGNsZWFyIHRoZSBwcm90b3R5cGUKIAotICAgICAgICAvLyB0aGVyZSdzIGxpa2VseSB0 byBiZSBsb3RzIG9mIGdhcmJhZ2Ugbm93Ci0gICAgICAgIENvbGxlY3Rvcjo6Y29sbGVjdCgpOwor ICAvLyB0aGVyZSdzIGxpa2VseSB0byBiZSBsb3RzIG9mIGdhcmJhZ2Ugbm93CisgIENvbGxlY3Rv cjo6Y29sbGVjdCgpOwogCi0gICAgICAgIC8vIE5vdyByZWNyZWF0ZSBhIHdvcmtpbmcgZ2xvYmFs IG9iamVjdCBmb3IgdGhlIG5leHQgVVJMIHRoYXQgd2lsbCB1c2UgdXMKLSAgICAgICAgaW50ZXJw cmV0ZXIoKS0+aW5pdEdsb2JhbE9iamVjdCgpOwotICAgIH0KKyAgLy8gTm93IHJlY3JlYXRlIGEg d29ya2luZyBnbG9iYWwgb2JqZWN0IGZvciB0aGUgbmV4dCBVUkwgdGhhdCB3aWxsIHVzZSB1cwor ICBpbnRlcnByZXRlcigpLT5pbml0R2xvYmFsT2JqZWN0KCk7CiB9CiAKIHZvaWQgV2luZG93Ojpz ZXRDdXJyZW50RXZlbnQoRXZlbnQgKmV2dCkKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvanMva2pz X3dpbmRvdy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvanMva2pzX3dpbmRvdy5o CShyZXZpc2lvbiAxNTIyOSkKKysrIFdlYkNvcmUvYmluZGluZ3MvanMva2pzX3dpbmRvdy5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xMzgsNyArMTM4LDcgQEAgbmFtZXNwYWNlIEtKUyB7CiAgICAgQmFy SW5mbyAqdG9vbGJhcihFeGVjU3RhdGUqKSBjb25zdDsKICAgICBKU0V2ZW50TGlzdGVuZXIgKmdl dEpTRXZlbnRMaXN0ZW5lcihKU1ZhbHVlKiwgYm9vbCBodG1sID0gZmFsc2UpOwogICAgIEpTVW5w cm90ZWN0ZWRFdmVudExpc3RlbmVyICpnZXRKU1VucHJvdGVjdGVkRXZlbnRMaXN0ZW5lcihKU1Zh bHVlKiwgYm9vbCBodG1sID0gZmFsc2UpOwotICAgIHZvaWQgY2xlYXIoYm9vbCBjbGVhcldpbmRv d1Byb3BlcnRpZXMpOworICAgIHZvaWQgY2xlYXIoKTsKICAgICB2aXJ0dWFsIFVTdHJpbmcgdG9T dHJpbmcoRXhlY1N0YXRlICopIGNvbnN0OwogCiAgICAgLy8gU2V0IHRoZSBjdXJyZW50ICJldmVu dCIgb2JqZWN0CkluZGV4OiBXZWJDb3JlL21hbnVhbC10ZXN0cy9tb2RhbC1kaWFsb2cuaHRtbAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL21hbnVhbC10ZXN0cy9tb2RhbC1kaWFsb2cuaHRtbAkocmV2 aXNpb24gMTUyMjkpCisrKyBXZWJDb3JlL21hbnVhbC10ZXN0cy9tb2RhbC1kaWFsb2cuaHRtbAko d29ya2luZyBjb3B5KQpAQCAtMSwxMiArMCwwIEBACi08Zm9ybSBuYW1lPSJmb3JtIj4KLTxwPkhl cmUgaXMgdGhlIHRleHQgZnJvbSB0aGUgbWFpbiB3aW5kb3c6IDxpbnB1dCBuYW1lPSJmcm9tV2lu ZG93Ij48L3A+Ci08cD5UeXBlIHRleHQgaGVyZSB0byBiZSBzZW50IGJhY2sgdG8gdGhlIG1haW4g d2luZG93OiA8aW5wdXQgbmFtZT0idG9XaW5kb3ciIHZhbHVlPSJmcm9tIG1vZGFsIHdpbmRvdyI+ PC9wPgotPHA+VGhlbiwgcHVzaCB0aGlzIGJ1dHRvbjogPGlucHV0IHR5cGU9ImJ1dHRvbiIgdmFs dWU9IkNsb3NlIiBvbkNsaWNrPSJjbG9zZU1vZGFsKCkiPjwvcD4KLTwvZm9ybT4KLTxzY3JpcHQ+ Ci1kb2N1bWVudC5mb3JtLmZyb21XaW5kb3cudmFsdWUgPSB3aW5kb3cuZGlhbG9nQXJndW1lbnRz OwotZnVuY3Rpb24gY2xvc2VNb2RhbCgpIHsKLSAgIHdpbmRvdy5yZXR1cm5WYWx1ZSA9IGRvY3Vt ZW50LmZvcm0udG9XaW5kb3cudmFsdWU7Ci0gICB3aW5kb3cuY2xvc2UoKTsKLX0KLTwvc2NyaXB0 PgpJbmRleDogV2ViQ29yZS9tYW51YWwtdGVzdHMvc2hvdy1tb2RhbC1kaWFsb2ctdGVzdC5odG1s Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvbWFudWFsLXRlc3RzL3Nob3ctbW9kYWwtZGlhbG9nLXRl c3QuaHRtbAkocmV2aXNpb24gMTUyMjkpCisrKyBXZWJDb3JlL21hbnVhbC10ZXN0cy9zaG93LW1v ZGFsLWRpYWxvZy10ZXN0Lmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTEsMTUgKzAsMCBAQAotPHNj cmlwdD4KLWZ1bmN0aW9uIHNob3dNb2RhbCgpIHsKLSAgICBkb2N1bWVudC5mb3JtLmZyb21Nb2Rh bC52YWx1ZSA9Ci0gICAgICAgIHNob3dNb2RhbERpYWxvZygibW9kYWwtZGlhbG9nLmh0bWwiLAot ICAgICAgICAgICAgZG9jdW1lbnQuZm9ybS50b01vZGFsLnZhbHVlLAotICAgICAgICAgICAgImRp YWxvZ0hlaWdodDoyODBweCxkaWFsb2dXaWR0aDo0MDBweCIpOwotfQotPC9zY3JpcHQ+Ci08Zm9y bSBuYW1lPSJmb3JtIj4KLTxwPlR5cGUgdGV4dCBoZXJlIHRvIGJlIHNlbnQgdG8gdGhlIG1vZGFs IHdpbmRvdyBhbmQgcHJlc3MgdGhlIGJ1dHRvbjoKLTxpbnB1dCBuYW1lPSJ0b01vZGFsIiB2YWx1 ZT0iZnJvbSBtYWluIHdpbmRvdyI+Ci08aW5wdXQgdHlwZT0iYnV0dG9uIiB2YWx1ZT0iU2hvdyBN b2RhbCIgb25DbGljaz0ic2hvd01vZGFsKCkiPjwvcD4KLTxoeT4KLTxwPlRleHQgd2lsbCBhcHBl YXIgaGVyIGZyb20gdGhlIG1vZGFsIHdpbmRvdzogPGlucHV0IG5hbWU9ImZyb21Nb2RhbCI+Ci08 L2Zvcm0+CkluZGV4OiBXZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvcGFnZS9GcmFtZS5jcHAJKHJldmlzaW9uIDE1MjI5KQorKysgV2ViQ29yZS9wYWdlL0ZyYW1l LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDM3LDggKzQzNyw4IEBAIHZvaWQgRnJhbWU6OmNsZWFy KGJvb2wgY2xlYXJXaW5kb3dQcm9wZXIKICAgfQogCiAgIC8vIE1vdmluZyBwYXN0IGRvYyBzbyB0 aGF0IG9uVW5sb2FkIHdvcmtzLgotICBpZiAoZC0+bV9qc2NyaXB0KQotICAgIGQtPm1fanNjcmlw dC0+Y2xlYXIoY2xlYXJXaW5kb3dQcm9wZXJ0aWVzKTsKKyAgaWYgKGNsZWFyV2luZG93UHJvcGVy dGllcyAmJiBkLT5tX2pzY3JpcHQpCisgICAgZC0+bV9qc2NyaXB0LT5jbGVhcigpOwogCiAgIGlm IChkLT5tX3ZpZXcpCiAgICAgZC0+bV92aWV3LT5jbGVhcigpOwo= 9271 2006-07-08 09:43:15 -0700 2006-07-08 10:57:15 -0700 better patch with change log, can still use the old test case ShowModalDialogReturnValuePatch.txt text/plain 6881 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNTIzMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDUgKzEsMjggQEAKIDIwMDYtMDctMDggIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gYmV0 dGVyIGZpeCBmb3IgaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9p ZD05NjIyCisgICAgICAgICAgUkVHUkVTU0lPTjogc2hvd01vZGFsRGlhbG9nIHJldHVyblZhbHVl IGlnbm9yZWQsIGZ1bmN0aW9uIHJlc3VsdCBpcyBhbHdheXMgInVuZGVmaW5lZCIKKworICAgICAg ICAqIGJpbmRpbmdzL2pzL2tqc193aW5kb3cuY3BwOgorICAgICAgICAoS0pTOjpzaG93TW9kYWxE aWFsb2cpOiBTZXQgdGhlIHJldHVybiB2YWx1ZSBhZnRlciByZXR1cm5pbmcgZnJvbSB0aGUgZnVu Y3Rpb24gaWYgdGhlCisgICAgICAgIHdpbmRvdyBpcyBub3QgY2xlYXJlZDsgdGhpcyBpcyBhIGJl dHRlciB3YXkgdG8gaGFuZGxlIHRoZSBjYXNlIHdoZXJlIHRoZSB3aW5kb3cgZG9lcworICAgICAg ICBub3QgZ2V0IGNsZWFyZWQgYmVmb3JlIHJldHVybmluZywgYW5kIGhhbmRsZXMgc29tZSBuZXcg Y2FzZXMgY3JlYXRlZCBieSBzbGlnaHQgY2hhbmdlcworICAgICAgICBpbiB0aGUgbGF0ZXN0IFNh ZmFyaSBwcm9wZXJseSB0b28uCisgICAgICAgIChLSlM6OldpbmRvdzo6Y2xlYXIpOiBDaGFuZ2Vk IGxvZ2ljIHNsaWdodGx5IHNvIHdlIGFsd2F5cyBzdG9yZSB0aGUgcmVzdWx0IG9mIGdldERpcmVj dAorICAgICAgICBpbnRvIHRoZSByZXR1cm4gdmFsdWUgc2xvdCAtLSB0aGUgb2xkIGNvZGUgbGVm dCB0aGUgc3RvcmFnZSB1bnRvdWNoZWQgaWYgaXQgd2FzIDAuCisgICAgICAgIEFsc28gbWFkZSBp dCBvbmx5IG92ZXJ3cml0ZSB0aGUgcmV0dXJuIHZhbHVlIHNsb3QgaWYgaXQncyAwLgorCisgICAg ICAgICogYmluZGluZ3MvanMva2pzX3Byb3h5Lmg6CisgICAgICAgICogYmluZGluZ3MvanMva2pz X3Byb3h5LmNwcDoKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9ranNfd2luZG93Lmg6CisgICAgICAg ICogYmluZGluZ3MvanMva2pzX3dpbmRvdy5jcHA6CisgICAgICAgICogcGFnZS9GcmFtZS5jcHA6 CisgICAgICAgIFJvbGwgdGhlIHByZXZpb3VzIGZpeCBvdXQuCisKKzIwMDYtMDctMDggIERhcmlu IEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCiAgICAgICAgIC0gdHJ5IHRvIGZpeCBXaW5kb3dz IGJ1aWxkCiAKICAgICAgICAgKiBXZWJDb3JlLnZjcHJvai9XZWJDb3JlL1dlYkNvcmUudmNwcm9q OiBBZGQgbWlzc2luZyBzb3VyY2UgZmlsZXMuCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL2pzL2tq c19wcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9qcy9ranNfcHJveHku Y3BwCShyZXZpc2lvbiAxNTIyOSkKKysrIFdlYkNvcmUvYmluZGluZ3MvanMva2pzX3Byb3h5LmNw cAkod29ya2luZyBjb3B5KQpAQCAtODMsMTUgKzgzLDE1IEBAIEpTVmFsdWUqIEtKU1Byb3h5Ojpl dmFsdWF0ZShjb25zdCBTdHJpbmcKICAgcmV0dXJuIDA7CiB9CiAKLXZvaWQgS0pTUHJveHk6OmNs ZWFyKGJvb2wgY2xlYXJXaW5kb3dQcm9wZXJ0aWVzKQotewotICAgIC8vIENsZWFyIHJlc291cmNl cyBhbGxvY2F0ZWQgYnkgdGhlIGludGVycHJldGVyLCBhbmQgbWFrZSBpdCByZWFkeSB0byBiZSB1 c2VkIGJ5IGFub3RoZXIgcGFnZS4KLSAgICAvLyBFYXJsaWVyIHZlcnNpb25zIG9mIHRoaXMgZnVu Y3Rpb24gZGVsZXRlZCBhbmQgcmUtY3JlYXRlZCB0aGUgd2luZG93IG9iamVjdCwgYnV0IHdlIGhh dmUgdG8KLSAgICAvLyBrZWVwIGl0IGJlY2F1c2UgSmF2YVNjcmlwdCBjYW4ga2VlcCBhIHJlZmVy ZW5jZSB0byB0aGUgd2luZG93IG9iamVjdCBhbmQgaXQgbXVzdCBiZSB0aGUgc2FtZS4KLSAgICBp ZiAobV9zY3JpcHQpIHsKLSAgICAgICAgaWYgKFdpbmRvdyogd2luZG93ID0gV2luZG93OjpyZXRy aWV2ZVdpbmRvdyhtX2ZyYW1lKSkKLSAgICAgICAgICAgIHdpbmRvdy0+Y2xlYXIoY2xlYXJXaW5k b3dQcm9wZXJ0aWVzKTsKLSAgICB9Cit2b2lkIEtKU1Byb3h5OjpjbGVhcigpIHsKKyAgLy8gY2xl YXIgcmVzb3VyY2VzIGFsbG9jYXRlZCBieSB0aGUgaW50ZXJwcmV0ZXIsIGFuZCBtYWtlIGl0IHJl YWR5IHRvIGJlIHVzZWQgYnkgYW5vdGhlciBwYWdlCisgIC8vIFdlIGhhdmUgdG8ga2VlcCBpdCwg c28gdGhhdCB0aGUgV2luZG93IG9iamVjdCBmb3IgdGhlIGZyYW1lIHJlbWFpbnMgdGhlIHNhbWUu CisgIC8vICh3ZSB1c2VkIHRvIGRlbGV0ZSBhbmQgcmUtY3JlYXRlIGl0LCBwcmV2aW91c2x5KQor ICBpZiAobV9zY3JpcHQpIHsKKyAgICBXaW5kb3cgKndpbiA9IFdpbmRvdzo6cmV0cmlldmVXaW5k b3cobV9mcmFtZSk7CisgICAgaWYgKHdpbikKKyAgICAgICAgd2luLT5jbGVhcigpOworICB9CiB9 CiAKIEV2ZW50TGlzdGVuZXIqIEtKU1Byb3h5OjpjcmVhdGVIVE1MRXZlbnRIYW5kbGVyKGNvbnN0 IFN0cmluZyYgZnVuY3Rpb25OYW1lLCBjb25zdCBTdHJpbmcmIGNvZGUsIE5vZGUqIG5vZGUpCklu ZGV4OiBXZWJDb3JlL2JpbmRpbmdzL2pzL2tqc19wcm94eS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvYmluZGluZ3MvanMva2pzX3Byb3h5LmgJKHJldmlzaW9uIDE1MjI5KQorKysgV2ViQ29yZS9i aW5kaW5ncy9qcy9ranNfcHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtNDEsNyArNDEsNyBAQCBw dWJsaWM6CiAgICAgS0pTUHJveHkoRnJhbWUqKTsKICAgICB+S0pTUHJveHkoKTsKICAgICBLSlM6 OkpTVmFsdWUqIGV2YWx1YXRlKGNvbnN0IFN0cmluZyYgZmlsZW5hbWUsIGludCBiYXNlTGluZSwg Y29uc3QgU3RyaW5nJiBjb2RlLCBOb2RlKik7Ci0gICAgdm9pZCBjbGVhcihib29sIGNsZWFyV2lu ZG93UHJvcGVydGllcyk7CisgICAgdm9pZCBjbGVhcigpOwogICAgIEV2ZW50TGlzdGVuZXIqIGNy ZWF0ZUhUTUxFdmVudEhhbmRsZXIoY29uc3QgU3RyaW5nJiBmdW5jdGlvbk5hbWUsIGNvbnN0IFN0 cmluZyYgY29kZSwgTm9kZSopOwogI2lmIFNWR19TVVBQT1JUCiAgICAgRXZlbnRMaXN0ZW5lciog Y3JlYXRlU1ZHRXZlbnRIYW5kbGVyKGNvbnN0IFN0cmluZyYgZnVuY3Rpb25OYW1lLCBjb25zdCBT dHJpbmcmIGNvZGUsIE5vZGUqKTsKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvanMva2pzX3dpbmRv dy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9qcy9ranNfd2luZG93LmNwcAko cmV2aXNpb24gMTUyMjkpCisrKyBXZWJDb3JlL2JpbmRpbmdzL2pzL2tqc193aW5kb3cuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC02NTEsMTUgKzY1MSwxOSBAQCBzdGF0aWMgSlNWYWx1ZSAqc2hvd01v ZGFsRGlhbG9nKEV4ZWNTdGF0CiAgICAgd2FyZ3MubG9jYXRpb25CYXJWaXNpYmxlID0gZmFsc2U7 CiAgICAgd2FyZ3MuZnVsbHNjcmVlbiA9IGZhbHNlOwogICAgIAotICAgIEZyYW1lICpkaWFsb2dQ YXJ0ID0gY3JlYXRlTmV3V2luZG93KGV4ZWMsIG9wZW5lcldpbmRvdywgVVJMLCAiIiwgd2FyZ3Ms IGFyZ3NbMV0pOworICAgIEZyYW1lKiBkaWFsb2dQYXJ0ID0gY3JlYXRlTmV3V2luZG93KGV4ZWMs IG9wZW5lcldpbmRvdywgVVJMLCAiIiwgd2FyZ3MsIGFyZ3NbMV0pOwogICAgIGlmICghZGlhbG9n UGFydCkKICAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7CiAKLSAgICBXaW5kb3cgKmRpYWxv Z1dpbmRvdyA9IFdpbmRvdzo6cmV0cmlldmVXaW5kb3coZGlhbG9nUGFydCk7Ci0gICAgSlNWYWx1 ZSAqcmV0dXJuVmFsdWUgPSBqc1VuZGVmaW5lZCgpOworICAgIFdpbmRvdyogZGlhbG9nV2luZG93 ID0gV2luZG93OjpyZXRyaWV2ZVdpbmRvdyhkaWFsb2dQYXJ0KTsKKyAgICBKU1ZhbHVlKiByZXR1 cm5WYWx1ZSA9IDA7CiAgICAgZGlhbG9nV2luZG93LT5zZXRSZXR1cm5WYWx1ZVNsb3QoJnJldHVy blZhbHVlKTsKICAgICBzdGF0aWNfY2FzdDxCcm93c2VyRXh0ZW5zaW9uICo+KGRpYWxvZ1BhcnQt PmJyb3dzZXJFeHRlbnNpb24oKSktPnJ1bk1vZGFsKCk7Ci0gICAgZGlhbG9nV2luZG93LT5zZXRS ZXR1cm5WYWx1ZVNsb3QoTlVMTCk7CisgICAgZGlhbG9nV2luZG93LT5zZXRSZXR1cm5WYWx1ZVNs b3QoMCk7CisgICAgaWYgKCFyZXR1cm5WYWx1ZSkKKyAgICAgICAgcmV0dXJuVmFsdWUgPSBkaWFs b2dXaW5kb3ctPmdldERpcmVjdCgicmV0dXJuVmFsdWUiKTsKKyAgICBpZiAoIXJldHVyblZhbHVl KQorICAgICAgICByZXR1cm5WYWx1ZSA9IGpzVW5kZWZpbmVkKCk7CiAgICAgcmV0dXJuIHJldHVy blZhbHVlOwogfQogCkBAIC0xMzIzLDI1ICsxMzI3LDIyIEBAIEpTVW5wcm90ZWN0ZWRFdmVudExp c3RlbmVyICpXaW5kb3c6OmdldEoKICAgcmV0dXJuIG5ldyBKU1VucHJvdGVjdGVkRXZlbnRMaXN0 ZW5lcihvYmplY3QsIHRoaXMsIGh0bWwpOwogfQogCi12b2lkIFdpbmRvdzo6Y2xlYXIoYm9vbCBj bGVhcldpbmRvd1Byb3BlcnRpZXMpCit2b2lkIFdpbmRvdzo6Y2xlYXIoKQogewotICAgIEpTTG9j ayBsb2NrOworICBKU0xvY2sgbG9jazsKIAotICAgIGlmIChtX3JldHVyblZhbHVlU2xvdCkKLSAg ICAgICAgaWYgKEpTVmFsdWUqIHJldHVyblZhbHVlID0gZ2V0RGlyZWN0KCJyZXR1cm5WYWx1ZSIp KQotICAgICAgICAgICAgKm1fcmV0dXJuVmFsdWVTbG90ID0gcmV0dXJuVmFsdWU7CisgIGlmICht X3JldHVyblZhbHVlU2xvdCAmJiAhKm1fcmV0dXJuVmFsdWVTbG90KQorICAgICptX3JldHVyblZh bHVlU2xvdCA9IGdldERpcmVjdCgicmV0dXJuVmFsdWUiKTsKIAotICAgIGlmIChjbGVhcldpbmRv d1Byb3BlcnRpZXMpIHsKLSAgICAgICAgY2xlYXJBbGxUaW1lb3V0cygpOwotICAgICAgICBjbGVh clByb3BlcnRpZXMoKTsKLSAgICAgICAgc2V0UHJvdG90eXBlKEpTRE9NV2luZG93UHJvdG86OnNl bGYoKSk7IC8vIGNsZWFyIHRoZSBwcm90b3R5cGUKKyAgY2xlYXJBbGxUaW1lb3V0cygpOworICBj bGVhclByb3BlcnRpZXMoKTsKKyAgc2V0UHJvdG90eXBlKEpTRE9NV2luZG93UHJvdG86OnNlbGYo KSk7IC8vIGNsZWFyIHRoZSBwcm90b3R5cGUKIAotICAgICAgICAvLyB0aGVyZSdzIGxpa2VseSB0 byBiZSBsb3RzIG9mIGdhcmJhZ2Ugbm93Ci0gICAgICAgIENvbGxlY3Rvcjo6Y29sbGVjdCgpOwor ICAvLyB0aGVyZSdzIGxpa2VseSB0byBiZSBsb3RzIG9mIGdhcmJhZ2Ugbm93CisgIENvbGxlY3Rv cjo6Y29sbGVjdCgpOwogCi0gICAgICAgIC8vIE5vdyByZWNyZWF0ZSBhIHdvcmtpbmcgZ2xvYmFs IG9iamVjdCBmb3IgdGhlIG5leHQgVVJMIHRoYXQgd2lsbCB1c2UgdXMKLSAgICAgICAgaW50ZXJw cmV0ZXIoKS0+aW5pdEdsb2JhbE9iamVjdCgpOwotICAgIH0KKyAgLy8gTm93IHJlY3JlYXRlIGEg d29ya2luZyBnbG9iYWwgb2JqZWN0IGZvciB0aGUgbmV4dCBVUkwgdGhhdCB3aWxsIHVzZSB1cwor ICBpbnRlcnByZXRlcigpLT5pbml0R2xvYmFsT2JqZWN0KCk7CiB9CiAKIHZvaWQgV2luZG93Ojpz ZXRDdXJyZW50RXZlbnQoRXZlbnQgKmV2dCkKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvanMva2pz X3dpbmRvdy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvanMva2pzX3dpbmRvdy5o CShyZXZpc2lvbiAxNTIyOSkKKysrIFdlYkNvcmUvYmluZGluZ3MvanMva2pzX3dpbmRvdy5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xMzgsNyArMTM4LDcgQEAgbmFtZXNwYWNlIEtKUyB7CiAgICAgQmFy SW5mbyAqdG9vbGJhcihFeGVjU3RhdGUqKSBjb25zdDsKICAgICBKU0V2ZW50TGlzdGVuZXIgKmdl dEpTRXZlbnRMaXN0ZW5lcihKU1ZhbHVlKiwgYm9vbCBodG1sID0gZmFsc2UpOwogICAgIEpTVW5w cm90ZWN0ZWRFdmVudExpc3RlbmVyICpnZXRKU1VucHJvdGVjdGVkRXZlbnRMaXN0ZW5lcihKU1Zh bHVlKiwgYm9vbCBodG1sID0gZmFsc2UpOwotICAgIHZvaWQgY2xlYXIoYm9vbCBjbGVhcldpbmRv d1Byb3BlcnRpZXMpOworICAgIHZvaWQgY2xlYXIoKTsKICAgICB2aXJ0dWFsIFVTdHJpbmcgdG9T dHJpbmcoRXhlY1N0YXRlICopIGNvbnN0OwogCiAgICAgLy8gU2V0IHRoZSBjdXJyZW50ICJldmVu dCIgb2JqZWN0CkluZGV4OiBXZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGFnZS9GcmFtZS5jcHAJKHJldmlzaW9uIDE1MjI5KQorKysgV2ViQ29yZS9wYWdlL0Zy YW1lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDM3LDggKzQzNyw4IEBAIHZvaWQgRnJhbWU6OmNs ZWFyKGJvb2wgY2xlYXJXaW5kb3dQcm9wZXIKICAgfQogCiAgIC8vIE1vdmluZyBwYXN0IGRvYyBz byB0aGF0IG9uVW5sb2FkIHdvcmtzLgotICBpZiAoZC0+bV9qc2NyaXB0KQotICAgIGQtPm1fanNj cmlwdC0+Y2xlYXIoY2xlYXJXaW5kb3dQcm9wZXJ0aWVzKTsKKyAgaWYgKGNsZWFyV2luZG93UHJv cGVydGllcyAmJiBkLT5tX2pzY3JpcHQpCisgICAgZC0+bV9qc2NyaXB0LT5jbGVhcigpOwogCiAg IGlmIChkLT5tX3ZpZXcpCiAgICAgZC0+bV92aWV3LT5jbGVhcigpOwo=