42885 2010-07-23 03:12:50 -0700 [WINCE] Merge PasteboardWince.cpp into PasteboardWin.cpp 2010-07-23 10:11:25 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 paroga webkit-unassigned aroben commit-queue oldest_to_newest 255282 0 paroga 2010-07-23 03:12:50 -0700 see patch 255283 1 62403 paroga 2010-07-23 03:14:58 -0700 Created attachment 62403 Patch 255294 2 62409 paroga 2010-07-23 04:17:23 -0700 Created attachment 62409 Patch (improved version) This patch has an additional "#if !defined(NO_ALPHABLEND)" around the AlphaBlend function like in GraphicsContextWince. 255392 3 62409 aroben 2010-07-23 08:31:48 -0700 Comment on attachment 62409 Patch (improved version) > Pasteboard::Pasteboard() > -{ > - // make a dummy HWND to be the Windows clipboard's owner > - WNDCLASSEX wcex = {0}; > +{ > + HWND hWndParent = 0; > +#if OS(WINCE) > + WNDCLASS wcex; > + memset(&wcex, 0, sizeof(WNDCLASS)); > +#else > + WNDCLASSEX wcex; > + memset(&wcex, 0, sizeof(WNDCLASSEX)); > wcex.cbSize = sizeof(WNDCLASSEX); > +#endif > wcex.lpfnWndProc = PasteboardOwnerWndProc; > - wcex.hInstance = WebCore::instanceHandle(); > wcex.lpszClassName = L"PasteboardOwnerWindowClass"; > - ::RegisterClassEx(&wcex); > +#if OS(WINCE) > + RegisterClass(&wcex); > +#else > + RegisterClassEx(&wcex); > + hWndParent = HWND_MESSAGE; > +#endif I think we can make non-CE Windows use WNDCLASS and RegisterClass, too. I think the reduced complexity is worth it. Why was the setting of the hInstance member removed? 255402 4 62430 paroga 2010-07-23 08:50:52 -0700 Created attachment 62430 Patch > (From update of attachment 62409 [details]) > Why was the setting of the hInstance member removed? By accident. Added again. 255452 5 62430 commit-queue 2010-07-23 10:11:21 -0700 Comment on attachment 62430 Patch Clearing flags on attachment: 62430 Committed r63985: <http://trac.webkit.org/changeset/63985> 255453 6 commit-queue 2010-07-23 10:11:25 -0700 All reviewed patches have been landed. Closing bug. 62403 2010-07-23 03:14:58 -0700 2010-07-23 08:05:38 -0700 Patch bug-42885.patch text/plain 5523 paroga SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDYzOTU4KQ0KKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp DQpAQCAtMSwzICsxLDE5IEBADQorMjAxMC0wNy0yMyAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJv Z2FAcGFyb2dhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBbV0lOQ0VdIE1lcmdlIFBhc3RlYm9hcmRXaW5jZS5jcHAgaW50byBQYXN0ZWJvYXJk V2luLmNwcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDI4ODUKKworICAgICAgICBNYWtlIFBhc3RlYm9hcmRXaW4gbW9yZSBwb3J0YWJsZSBhbmQgcmVt b3ZlIHRoZSBnbG9iYWwgbmFtZXNwYWNlIHByZWZpeAorICAgICAgICBmcm9tIEdsb2JhbExvY2sv R2xvYmFsVW5sb2NrLCBzaW5jZSB0aGV5IGFyZSBvbmx5IG1hY3JvcyBvbiBXaW5DRS4KKworICAg ICAgICAqIHBsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlBhc3RlYm9hcmRPd25lclduZFByb2MpOgorICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6 UGFzdGVib2FyZCk6CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjpwbGFpblRleHQpOgor ICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6ZG9jdW1lbnRGcmFnbWVudCk6CisKIDIwMTAt MDctMjMgIFNoaW5pY2hpcm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBLZW50IFRhbXVyYS4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vd2luL1Bh c3RlYm9hcmRXaW4uY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9wbGF0Zm9ybS93aW4vUGFz dGVib2FyZFdpbi5jcHAJKHJldmlzaW9uIDYzOTU4KQ0KKysrIFdlYkNvcmUvcGxhdGZvcm0vd2lu L1Bhc3RlYm9hcmRXaW4uY3BwCSh3b3JraW5nIGNvcHkpDQpAQCAtNTIsNyArNTIsNiBAQA0KIHN0 YXRpYyBMUkVTVUxUIENBTExCQUNLIFBhc3RlYm9hcmRPd25lclduZFByb2MoSFdORCBoV25kLCBV SU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pCiB7CiAgICAgTFJFU1VM VCBscmVzdWx0ID0gMDsKLSAgICBMT05HX1BUUiBsb25nUHRyID0gR2V0V2luZG93TG9uZ1B0ciho V25kLCAwKTsKIAogICAgIHN3aXRjaCAobWVzc2FnZSkgewogICAgIGNhc2UgV01fUkVOREVSRk9S TUFUOgpAQCAtNjQsMTIgKzYzLDE0IEBADQogICAgICAgICAvLyBhbmQgbm93IHRoaXMgYXBwbGlj YXRpb24gaXMgYWJvdXQgdG8gcXVpdCwgc28gaXQgbXVzdCBwdXQgZGF0YSBvbiAKICAgICAgICAg Ly8gdGhlIGNsaXBib2FyZCBiZWZvcmUgaXQgZXhpdHMuCiAgICAgICAgIGJyZWFrOworICAgIGNh c2UgV01fREVTVFJPWToKKyAgICAgICAgYnJlYWs7CisjaWYgIU9TKFdJTkNFKQogICAgIGNhc2Ug V01fRFJBV0NMSVBCT0FSRDoKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBXTV9ERVNUUk9ZOgot ICAgICAgICBicmVhazsKICAgICBjYXNlIFdNX0NIQU5HRUNCQ0hBSU46CiAgICAgICAgIGJyZWFr OworI2VuZGlmCiAgICAgZGVmYXVsdDoKICAgICAgICAgbHJlc3VsdCA9IERlZldpbmRvd1Byb2Mo aFduZCwgbWVzc2FnZSwgd1BhcmFtLCBsUGFyYW0pOwogICAgICAgICBicmVhazsKQEAgLTg0LDE3 ICs4NSwyNyBAQA0KIH0KIAogUGFzdGVib2FyZDo6UGFzdGVib2FyZCgpCi17IAotICAgIC8vIG1h a2UgYSBkdW1teSBIV05EIHRvIGJlIHRoZSBXaW5kb3dzIGNsaXBib2FyZCdzIG93bmVyCi0gICAg V05EQ0xBU1NFWCB3Y2V4ID0gezB9OworeworICAgIEhXTkQgaFduZFBhcmVudCA9IDA7CisjaWYg T1MoV0lOQ0UpCisgICAgV05EQ0xBU1Mgd2NleDsKKyAgICBtZW1zZXQoJndjZXgsIDAsIHNpemVv ZihXTkRDTEFTUykpOworI2Vsc2UKKyAgICBXTkRDTEFTU0VYIHdjZXg7CisgICAgbWVtc2V0KCZ3 Y2V4LCAwLCBzaXplb2YoV05EQ0xBU1NFWCkpOwogICAgIHdjZXguY2JTaXplID0gc2l6ZW9mKFdO RENMQVNTRVgpOworI2VuZGlmCiAgICAgd2NleC5scGZuV25kUHJvYyAgICA9IFBhc3RlYm9hcmRP d25lclduZFByb2M7Ci0gICAgd2NleC5oSW5zdGFuY2UgICAgICA9IFdlYkNvcmU6Omluc3RhbmNl SGFuZGxlKCk7CiAgICAgd2NleC5scHN6Q2xhc3NOYW1lICA9IEwiUGFzdGVib2FyZE93bmVyV2lu ZG93Q2xhc3MiOwotICAgIDo6UmVnaXN0ZXJDbGFzc0V4KCZ3Y2V4KTsKKyNpZiBPUyhXSU5DRSkK KyAgICBSZWdpc3RlckNsYXNzKCZ3Y2V4KTsKKyNlbHNlCisgICAgUmVnaXN0ZXJDbGFzc0V4KCZ3 Y2V4KTsKKyAgICBoV25kUGFyZW50ID0gSFdORF9NRVNTQUdFOworI2VuZGlmCiAKICAgICBtX293 bmVyID0gOjpDcmVhdGVXaW5kb3coTCJQYXN0ZWJvYXJkT3duZXJXaW5kb3dDbGFzcyIsIEwiUGFz dGVib2FyZE93bmVyV2luZG93IiwgMCwgMCwgMCwgMCwgMCwKLSAgICAgICAgSFdORF9NRVNTQUdF LCAwLCAwLCAwKTsKKyAgICAgICAgaFduZFBhcmVudCwgMCwgMCwgMCk7CiAKICAgICBIVE1MQ2xp cGJvYXJkRm9ybWF0ID0gOjpSZWdpc3RlckNsaXBib2FyZEZvcm1hdChMIkhUTUwgRm9ybWF0Iik7 CiAgICAgQm9va21hcmtDbGlwYm9hcmRGb3JtYXQgPSA6OlJlZ2lzdGVyQ2xpcGJvYXJkRm9ybWF0 KEwiVW5pZm9ybVJlc291cmNlTG9jYXRvclciKTsKQEAgLTI1Myw5ICsyNjQsOSBAQA0KICAgICBp ZiAoOjpJc0NsaXBib2FyZEZvcm1hdEF2YWlsYWJsZShDRl9VTklDT0RFVEVYVCkgJiYgOjpPcGVu Q2xpcGJvYXJkKG1fb3duZXIpKSB7CiAgICAgICAgIEhBTkRMRSBjYkRhdGEgPSA6OkdldENsaXBi b2FyZERhdGEoQ0ZfVU5JQ09ERVRFWFQpOwogICAgICAgICBpZiAoY2JEYXRhKSB7Ci0gICAgICAg ICAgICBVQ2hhciogYnVmZmVyID0gKFVDaGFyKik6Okdsb2JhbExvY2soY2JEYXRhKTsKKyAgICAg ICAgICAgIFVDaGFyKiBidWZmZXIgPSBzdGF0aWNfY2FzdDxVQ2hhcio+KEdsb2JhbExvY2soY2JE YXRhKSk7CiAgICAgICAgICAgICBTdHJpbmcgZnJvbUNsaXBib2FyZChidWZmZXIpOwotICAgICAg ICAgICAgOjpHbG9iYWxVbmxvY2soY2JEYXRhKTsKKyAgICAgICAgICAgIEdsb2JhbFVubG9jayhj YkRhdGEpOwogICAgICAgICAgICAgOjpDbG9zZUNsaXBib2FyZCgpOwogICAgICAgICAgICAgcmV0 dXJuIGZyb21DbGlwYm9hcmQ7CiAgICAgICAgIH0KQEAgLTI2NSw5ICsyNzYsOSBAQA0KICAgICBp ZiAoOjpJc0NsaXBib2FyZEZvcm1hdEF2YWlsYWJsZShDRl9URVhUKSAmJiA6Ok9wZW5DbGlwYm9h cmQobV9vd25lcikpIHsKICAgICAgICAgSEFORExFIGNiRGF0YSA9IDo6R2V0Q2xpcGJvYXJkRGF0 YShDRl9URVhUKTsKICAgICAgICAgaWYgKGNiRGF0YSkgewotICAgICAgICAgICAgY2hhciogYnVm ZmVyID0gKGNoYXIqKTo6R2xvYmFsTG9jayhjYkRhdGEpOworICAgICAgICAgICAgY2hhciogYnVm ZmVyID0gc3RhdGljX2Nhc3Q8Y2hhcio+KEdsb2JhbExvY2soY2JEYXRhKSk7CiAgICAgICAgICAg ICBTdHJpbmcgZnJvbUNsaXBib2FyZChidWZmZXIpOwotICAgICAgICAgICAgOjpHbG9iYWxVbmxv Y2soY2JEYXRhKTsKKyAgICAgICAgICAgIEdsb2JhbFVubG9jayhjYkRhdGEpOwogICAgICAgICAg ICAgOjpDbG9zZUNsaXBib2FyZCgpOwogICAgICAgICAgICAgcmV0dXJuIGZyb21DbGlwYm9hcmQ7 CiAgICAgICAgIH0KQEAgLTI4Niw4ICsyOTcsOCBAQA0KICAgICAgICAgSEFORExFIGNiRGF0YSA9 IDo6R2V0Q2xpcGJvYXJkRGF0YShIVE1MQ2xpcGJvYXJkRm9ybWF0KTsKICAgICAgICAgaWYgKGNi RGF0YSkgewogICAgICAgICAgICAgU0laRV9UIGRhdGFTaXplID0gOjpHbG9iYWxTaXplKGNiRGF0 YSk7Ci0gICAgICAgICAgICBTdHJpbmcgY2ZodG1sKFVURjhFbmNvZGluZygpLmRlY29kZSgoY2hh ciopOjpHbG9iYWxMb2NrKGNiRGF0YSksIGRhdGFTaXplKSk7Ci0gICAgICAgICAgICA6Okdsb2Jh bFVubG9jayhjYkRhdGEpOworICAgICAgICAgICAgU3RyaW5nIGNmaHRtbChVVEY4RW5jb2Rpbmco KS5kZWNvZGUoc3RhdGljX2Nhc3Q8Y2hhcio+KEdsb2JhbExvY2soY2JEYXRhKSksIGRhdGFTaXpl KSk7CisgICAgICAgICAgICBHbG9iYWxVbmxvY2soY2JEYXRhKTsKICAgICAgICAgICAgIDo6Q2xv c2VDbGlwYm9hcmQoKTsKIAogICAgICAgICAgICAgUGFzc1JlZlB0cjxEb2N1bWVudEZyYWdtZW50 PiBmcmFnbWVudCA9IGZyYWdtZW50RnJvbUNGSFRNTChmcmFtZS0+ZG9jdW1lbnQoKSwgY2ZodG1s KTsKQEAgLTMwMiw5ICszMTMsOSBAQA0KICAgICAgICAgaWYgKDo6T3BlbkNsaXBib2FyZChtX293 bmVyKSkgewogICAgICAgICAgICAgSEFORExFIGNiRGF0YSA9IDo6R2V0Q2xpcGJvYXJkRGF0YShD Rl9VTklDT0RFVEVYVCk7CiAgICAgICAgICAgICBpZiAoY2JEYXRhKSB7Ci0gICAgICAgICAgICAg ICAgVUNoYXIqIGJ1ZmZlciA9IChVQ2hhciopR2xvYmFsTG9jayhjYkRhdGEpOworICAgICAgICAg ICAgICAgIFVDaGFyKiBidWZmZXIgPSBzdGF0aWNfY2FzdDxVQ2hhcio+KEdsb2JhbExvY2soY2JE YXRhKSk7CiAgICAgICAgICAgICAgICAgU3RyaW5nIHN0cihidWZmZXIpOwotICAgICAgICAgICAg ICAgIDo6R2xvYmFsVW5sb2NrKGNiRGF0YSk7CisgICAgICAgICAgICAgICAgR2xvYmFsVW5sb2Nr KGNiRGF0YSk7CiAgICAgICAgICAgICAgICAgOjpDbG9zZUNsaXBib2FyZCgpOwogICAgICAgICAg ICAgICAgIFJlZlB0cjxEb2N1bWVudEZyYWdtZW50PiBmcmFnbWVudCA9IGNyZWF0ZUZyYWdtZW50 RnJvbVRleHQoY29udGV4dC5nZXQoKSwgc3RyKTsKICAgICAgICAgICAgICAgICBpZiAoZnJhZ21l bnQpCkBAIC0zMTksOSArMzMwLDkgQEANCiAgICAgICAgIGlmICg6Ok9wZW5DbGlwYm9hcmQobV9v d25lcikpIHsKICAgICAgICAgICAgIEhBTkRMRSBjYkRhdGEgPSA6OkdldENsaXBib2FyZERhdGEo Q0ZfVEVYVCk7CiAgICAgICAgICAgICBpZiAoY2JEYXRhKSB7Ci0gICAgICAgICAgICAgICAgY2hh ciogYnVmZmVyID0gKGNoYXIqKUdsb2JhbExvY2soY2JEYXRhKTsKKyAgICAgICAgICAgICAgICBj aGFyKiBidWZmZXIgPSBzdGF0aWNfY2FzdDxjaGFyKj4oR2xvYmFsTG9jayhjYkRhdGEpKTsKICAg ICAgICAgICAgICAgICBTdHJpbmcgc3RyKGJ1ZmZlcik7Ci0gICAgICAgICAgICAgICAgOjpHbG9i YWxVbmxvY2soY2JEYXRhKTsKKyAgICAgICAgICAgICAgICBHbG9iYWxVbmxvY2soY2JEYXRhKTsK ICAgICAgICAgICAgICAgICA6OkNsb3NlQ2xpcGJvYXJkKCk7CiAgICAgICAgICAgICAgICAgUmVm UHRyPERvY3VtZW50RnJhZ21lbnQ+IGZyYWdtZW50ID0gY3JlYXRlRnJhZ21lbnRGcm9tVGV4dChj b250ZXh0LmdldCgpLCBzdHIpOwogICAgICAgICAgICAgICAgIGlmIChmcmFnbWVudCkK 62409 2010-07-23 04:17:23 -0700 2010-07-23 08:50:52 -0700 Patch (improved version) bug-42885b.patch text/plain 6215 paroga SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDYzOTU4KQ0KKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp DQpAQCAtMSwzICsxLDE5IEBADQorMjAxMC0wNy0yMyAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJv Z2FAcGFyb2dhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBbV0lOQ0VdIE1lcmdlIFBhc3RlYm9hcmRXaW5jZS5jcHAgaW50byBQYXN0ZWJvYXJk V2luLmNwcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDI4ODUKKworICAgICAgICBNYWtlIFBhc3RlYm9hcmRXaW4gbW9yZSBwb3J0YWJsZSBhbmQgcmVt b3ZlIHRoZSBnbG9iYWwgbmFtZXNwYWNlIHByZWZpeAorICAgICAgICBmcm9tIEdsb2JhbExvY2sv R2xvYmFsVW5sb2NrLCBzaW5jZSB0aGV5IGFyZSBvbmx5IG1hY3JvcyBvbiBXaW5DRS4KKworICAg ICAgICAqIHBsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlBhc3RlYm9hcmRPd25lclduZFByb2MpOgorICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6 UGFzdGVib2FyZCk6CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjpwbGFpblRleHQpOgor ICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6ZG9jdW1lbnRGcmFnbWVudCk6CisKIDIwMTAt MDctMjMgIFNoaW5pY2hpcm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBLZW50IFRhbXVyYS4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vd2luL1Bh c3RlYm9hcmRXaW4uY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9wbGF0Zm9ybS93aW4vUGFz dGVib2FyZFdpbi5jcHAJKHJldmlzaW9uIDYzOTU4KQ0KKysrIFdlYkNvcmUvcGxhdGZvcm0vd2lu L1Bhc3RlYm9hcmRXaW4uY3BwCSh3b3JraW5nIGNvcHkpDQpAQCAtNTIsNyArNTIsNiBAQA0KIHN0 YXRpYyBMUkVTVUxUIENBTExCQUNLIFBhc3RlYm9hcmRPd25lclduZFByb2MoSFdORCBoV25kLCBV SU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pDQogew0KICAgICBMUkVT VUxUIGxyZXN1bHQgPSAwOw0KLSAgICBMT05HX1BUUiBsb25nUHRyID0gR2V0V2luZG93TG9uZ1B0 cihoV25kLCAwKTsNCiANCiAgICAgc3dpdGNoIChtZXNzYWdlKSB7DQogICAgIGNhc2UgV01fUkVO REVSRk9STUFUOg0KQEAgLTY0LDEyICs2MywxNCBAQA0KICAgICAgICAgLy8gYW5kIG5vdyB0aGlz IGFwcGxpY2F0aW9uIGlzIGFib3V0IHRvIHF1aXQsIHNvIGl0IG11c3QgcHV0IGRhdGEgb24gDQog ICAgICAgICAvLyB0aGUgY2xpcGJvYXJkIGJlZm9yZSBpdCBleGl0cy4NCiAgICAgICAgIGJyZWFr Ow0KKyAgICBjYXNlIFdNX0RFU1RST1k6DQorICAgICAgICBicmVhazsNCisjaWYgIU9TKFdJTkNF KQ0KICAgICBjYXNlIFdNX0RSQVdDTElQQk9BUkQ6DQogICAgICAgICBicmVhazsNCi0gICAgY2Fz ZSBXTV9ERVNUUk9ZOg0KLSAgICAgICAgYnJlYWs7DQogICAgIGNhc2UgV01fQ0hBTkdFQ0JDSEFJ TjoNCiAgICAgICAgIGJyZWFrOw0KKyNlbmRpZg0KICAgICBkZWZhdWx0Og0KICAgICAgICAgbHJl c3VsdCA9IERlZldpbmRvd1Byb2MoaFduZCwgbWVzc2FnZSwgd1BhcmFtLCBsUGFyYW0pOw0KICAg ICAgICAgYnJlYWs7DQpAQCAtODQsMTcgKzg1LDI3IEBADQogfQ0KIA0KIFBhc3RlYm9hcmQ6OlBh c3RlYm9hcmQoKQ0KLXsgDQotICAgIC8vIG1ha2UgYSBkdW1teSBIV05EIHRvIGJlIHRoZSBXaW5k b3dzIGNsaXBib2FyZCdzIG93bmVyDQotICAgIFdORENMQVNTRVggd2NleCA9IHswfTsNCit7DQor ICAgIEhXTkQgaFduZFBhcmVudCA9IDA7DQorI2lmIE9TKFdJTkNFKQ0KKyAgICBXTkRDTEFTUyB3 Y2V4Ow0KKyAgICBtZW1zZXQoJndjZXgsIDAsIHNpemVvZihXTkRDTEFTUykpOw0KKyNlbHNlDQor ICAgIFdORENMQVNTRVggd2NleDsNCisgICAgbWVtc2V0KCZ3Y2V4LCAwLCBzaXplb2YoV05EQ0xB U1NFWCkpOw0KICAgICB3Y2V4LmNiU2l6ZSA9IHNpemVvZihXTkRDTEFTU0VYKTsNCisjZW5kaWYN CiAgICAgd2NleC5scGZuV25kUHJvYyAgICA9IFBhc3RlYm9hcmRPd25lclduZFByb2M7DQotICAg IHdjZXguaEluc3RhbmNlICAgICAgPSBXZWJDb3JlOjppbnN0YW5jZUhhbmRsZSgpOw0KICAgICB3 Y2V4Lmxwc3pDbGFzc05hbWUgID0gTCJQYXN0ZWJvYXJkT3duZXJXaW5kb3dDbGFzcyI7DQotICAg IDo6UmVnaXN0ZXJDbGFzc0V4KCZ3Y2V4KTsNCisjaWYgT1MoV0lOQ0UpDQorICAgIFJlZ2lzdGVy Q2xhc3MoJndjZXgpOw0KKyNlbHNlDQorICAgIFJlZ2lzdGVyQ2xhc3NFeCgmd2NleCk7DQorICAg IGhXbmRQYXJlbnQgPSBIV05EX01FU1NBR0U7DQorI2VuZGlmDQogDQogICAgIG1fb3duZXIgPSA6 OkNyZWF0ZVdpbmRvdyhMIlBhc3RlYm9hcmRPd25lcldpbmRvd0NsYXNzIiwgTCJQYXN0ZWJvYXJk T3duZXJXaW5kb3ciLCAwLCAwLCAwLCAwLCAwLA0KLSAgICAgICAgSFdORF9NRVNTQUdFLCAwLCAw LCAwKTsNCisgICAgICAgIGhXbmRQYXJlbnQsIDAsIDAsIDApOw0KIA0KICAgICBIVE1MQ2xpcGJv YXJkRm9ybWF0ID0gOjpSZWdpc3RlckNsaXBib2FyZEZvcm1hdChMIkhUTUwgRm9ybWF0Iik7DQog ICAgIEJvb2ttYXJrQ2xpcGJvYXJkRm9ybWF0ID0gOjpSZWdpc3RlckNsaXBib2FyZEZvcm1hdChM IlVuaWZvcm1SZXNvdXJjZUxvY2F0b3JXIik7DQpAQCAtMjI1LDkgKzIzNiwxNCBAQA0KICAgICBI R0RJT0JKIG9sZFNvdXJjZSA9IFNlbGVjdE9iamVjdChzb3VyY2VEQywgY29yZUJpdG1hcCk7DQog ICAgIGltYWdlLT5nZXRIQklUTUFQKGNvcmVCaXRtYXApOw0KIA0KKyNpZiAhZGVmaW5lZChOT19B TFBIQUJMRU5EKQ0KICAgICBCTEVOREZVTkNUSU9OIGJmID0ge0FDX1NSQ19PVkVSLCAwLCAyNTUs IEFDX1NSQ19BTFBIQX07DQogICAgIEFscGhhQmxlbmQoY29tcGF0aWJsZURDLCAwLCAwLCBpbWFn ZS0+d2lkdGgoKSwgaW1hZ2UtPmhlaWdodCgpLA0KICAgICAgICAgc291cmNlREMsIDAsIDAsIGlt YWdlLT53aWR0aCgpLCBpbWFnZS0+aGVpZ2h0KCksIGJmKTsNCisjZWxzZQ0KKyAgICBTdHJldGNo Qmx0KGNvbXBhdGlibGVEQywgMCwgMCwgaW1hZ2UtPndpZHRoKCksIGltYWdlLT5oZWlnaHQoKSwN CisgICAgICAgIHNvdXJjZURDLCAwLCAwLCBpbWFnZS0+d2lkdGgoKSwgaW1hZ2UtPmhlaWdodCgp LCBTUkNDT1BZKTsNCisjZW5kaWYNCiANCiAgICAgU2VsZWN0T2JqZWN0KHNvdXJjZURDLCBvbGRT b3VyY2UpOw0KICAgICBEZWxldGVPYmplY3QoY29yZUJpdG1hcCk7DQpAQCAtMjUzLDkgKzI2OSw5 IEBADQogICAgIGlmICg6OklzQ2xpcGJvYXJkRm9ybWF0QXZhaWxhYmxlKENGX1VOSUNPREVURVhU KSAmJiA6Ok9wZW5DbGlwYm9hcmQobV9vd25lcikpIHsNCiAgICAgICAgIEhBTkRMRSBjYkRhdGEg PSA6OkdldENsaXBib2FyZERhdGEoQ0ZfVU5JQ09ERVRFWFQpOw0KICAgICAgICAgaWYgKGNiRGF0 YSkgew0KLSAgICAgICAgICAgIFVDaGFyKiBidWZmZXIgPSAoVUNoYXIqKTo6R2xvYmFsTG9jayhj YkRhdGEpOw0KKyAgICAgICAgICAgIFVDaGFyKiBidWZmZXIgPSBzdGF0aWNfY2FzdDxVQ2hhcio+ KEdsb2JhbExvY2soY2JEYXRhKSk7DQogICAgICAgICAgICAgU3RyaW5nIGZyb21DbGlwYm9hcmQo YnVmZmVyKTsNCi0gICAgICAgICAgICA6Okdsb2JhbFVubG9jayhjYkRhdGEpOw0KKyAgICAgICAg ICAgIEdsb2JhbFVubG9jayhjYkRhdGEpOw0KICAgICAgICAgICAgIDo6Q2xvc2VDbGlwYm9hcmQo KTsNCiAgICAgICAgICAgICByZXR1cm4gZnJvbUNsaXBib2FyZDsNCiAgICAgICAgIH0NCkBAIC0y NjUsOSArMjgxLDkgQEANCiAgICAgaWYgKDo6SXNDbGlwYm9hcmRGb3JtYXRBdmFpbGFibGUoQ0Zf VEVYVCkgJiYgOjpPcGVuQ2xpcGJvYXJkKG1fb3duZXIpKSB7DQogICAgICAgICBIQU5ETEUgY2JE YXRhID0gOjpHZXRDbGlwYm9hcmREYXRhKENGX1RFWFQpOw0KICAgICAgICAgaWYgKGNiRGF0YSkg ew0KLSAgICAgICAgICAgIGNoYXIqIGJ1ZmZlciA9IChjaGFyKik6Okdsb2JhbExvY2soY2JEYXRh KTsNCisgICAgICAgICAgICBjaGFyKiBidWZmZXIgPSBzdGF0aWNfY2FzdDxjaGFyKj4oR2xvYmFs TG9jayhjYkRhdGEpKTsNCiAgICAgICAgICAgICBTdHJpbmcgZnJvbUNsaXBib2FyZChidWZmZXIp Ow0KLSAgICAgICAgICAgIDo6R2xvYmFsVW5sb2NrKGNiRGF0YSk7DQorICAgICAgICAgICAgR2xv YmFsVW5sb2NrKGNiRGF0YSk7DQogICAgICAgICAgICAgOjpDbG9zZUNsaXBib2FyZCgpOw0KICAg ICAgICAgICAgIHJldHVybiBmcm9tQ2xpcGJvYXJkOw0KICAgICAgICAgfQ0KQEAgLTI4Niw4ICsz MDIsOCBAQA0KICAgICAgICAgSEFORExFIGNiRGF0YSA9IDo6R2V0Q2xpcGJvYXJkRGF0YShIVE1M Q2xpcGJvYXJkRm9ybWF0KTsNCiAgICAgICAgIGlmIChjYkRhdGEpIHsNCiAgICAgICAgICAgICBT SVpFX1QgZGF0YVNpemUgPSA6Okdsb2JhbFNpemUoY2JEYXRhKTsNCi0gICAgICAgICAgICBTdHJp bmcgY2ZodG1sKFVURjhFbmNvZGluZygpLmRlY29kZSgoY2hhciopOjpHbG9iYWxMb2NrKGNiRGF0 YSksIGRhdGFTaXplKSk7DQotICAgICAgICAgICAgOjpHbG9iYWxVbmxvY2soY2JEYXRhKTsNCisg ICAgICAgICAgICBTdHJpbmcgY2ZodG1sKFVURjhFbmNvZGluZygpLmRlY29kZShzdGF0aWNfY2Fz dDxjaGFyKj4oR2xvYmFsTG9jayhjYkRhdGEpKSwgZGF0YVNpemUpKTsNCisgICAgICAgICAgICBH bG9iYWxVbmxvY2soY2JEYXRhKTsNCiAgICAgICAgICAgICA6OkNsb3NlQ2xpcGJvYXJkKCk7DQog DQogICAgICAgICAgICAgUGFzc1JlZlB0cjxEb2N1bWVudEZyYWdtZW50PiBmcmFnbWVudCA9IGZy YWdtZW50RnJvbUNGSFRNTChmcmFtZS0+ZG9jdW1lbnQoKSwgY2ZodG1sKTsNCkBAIC0zMDIsOSAr MzE4LDkgQEANCiAgICAgICAgIGlmICg6Ok9wZW5DbGlwYm9hcmQobV9vd25lcikpIHsNCiAgICAg ICAgICAgICBIQU5ETEUgY2JEYXRhID0gOjpHZXRDbGlwYm9hcmREYXRhKENGX1VOSUNPREVURVhU KTsNCiAgICAgICAgICAgICBpZiAoY2JEYXRhKSB7DQotICAgICAgICAgICAgICAgIFVDaGFyKiBi dWZmZXIgPSAoVUNoYXIqKUdsb2JhbExvY2soY2JEYXRhKTsNCisgICAgICAgICAgICAgICAgVUNo YXIqIGJ1ZmZlciA9IHN0YXRpY19jYXN0PFVDaGFyKj4oR2xvYmFsTG9jayhjYkRhdGEpKTsNCiAg ICAgICAgICAgICAgICAgU3RyaW5nIHN0cihidWZmZXIpOw0KLSAgICAgICAgICAgICAgICA6Okds b2JhbFVubG9jayhjYkRhdGEpOw0KKyAgICAgICAgICAgICAgICBHbG9iYWxVbmxvY2soY2JEYXRh KTsNCiAgICAgICAgICAgICAgICAgOjpDbG9zZUNsaXBib2FyZCgpOw0KICAgICAgICAgICAgICAg ICBSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4gZnJhZ21lbnQgPSBjcmVhdGVGcmFnbWVudEZyb21U ZXh0KGNvbnRleHQuZ2V0KCksIHN0cik7DQogICAgICAgICAgICAgICAgIGlmIChmcmFnbWVudCkN CkBAIC0zMTksOSArMzM1LDkgQEANCiAgICAgICAgIGlmICg6Ok9wZW5DbGlwYm9hcmQobV9vd25l cikpIHsNCiAgICAgICAgICAgICBIQU5ETEUgY2JEYXRhID0gOjpHZXRDbGlwYm9hcmREYXRhKENG X1RFWFQpOw0KICAgICAgICAgICAgIGlmIChjYkRhdGEpIHsNCi0gICAgICAgICAgICAgICAgY2hh ciogYnVmZmVyID0gKGNoYXIqKUdsb2JhbExvY2soY2JEYXRhKTsNCisgICAgICAgICAgICAgICAg Y2hhciogYnVmZmVyID0gc3RhdGljX2Nhc3Q8Y2hhcio+KEdsb2JhbExvY2soY2JEYXRhKSk7DQog ICAgICAgICAgICAgICAgIFN0cmluZyBzdHIoYnVmZmVyKTsNCi0gICAgICAgICAgICAgICAgOjpH bG9iYWxVbmxvY2soY2JEYXRhKTsNCisgICAgICAgICAgICAgICAgR2xvYmFsVW5sb2NrKGNiRGF0 YSk7DQogICAgICAgICAgICAgICAgIDo6Q2xvc2VDbGlwYm9hcmQoKTsNCiAgICAgICAgICAgICAg ICAgUmVmUHRyPERvY3VtZW50RnJhZ21lbnQ+IGZyYWdtZW50ID0gY3JlYXRlRnJhZ21lbnRGcm9t VGV4dChjb250ZXh0LmdldCgpLCBzdHIpOw0KICAgICAgICAgICAgICAgICBpZiAoZnJhZ21lbnQp DQo= 62430 2010-07-23 08:50:52 -0700 2010-07-23 10:11:21 -0700 Patch bug-42885.patch text/plain 6606 paroga SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDYzOTU4KQ0KKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp DQpAQCAtMSwzICsxLDE5IEBADQorMjAxMC0wNy0yMyAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJv Z2FAcGFyb2dhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBbV0lOQ0VdIE1lcmdlIFBhc3RlYm9hcmRXaW5jZS5jcHAgaW50byBQYXN0ZWJvYXJk V2luLmNwcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDI4ODUKKworICAgICAgICBNYWtlIFBhc3RlYm9hcmRXaW4gbW9yZSBwb3J0YWJsZSBhbmQgcmVt b3ZlIHRoZSBnbG9iYWwgbmFtZXNwYWNlIHByZWZpeAorICAgICAgICBmcm9tIEdsb2JhbExvY2sv R2xvYmFsVW5sb2NrLCBzaW5jZSB0aGV5IGFyZSBvbmx5IG1hY3JvcyBvbiBXaW5DRS4KKworICAg ICAgICAqIHBsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlBhc3RlYm9hcmRPd25lclduZFByb2MpOgorICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6 UGFzdGVib2FyZCk6CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjpwbGFpblRleHQpOgor ICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6ZG9jdW1lbnRGcmFnbWVudCk6CisKIDIwMTAt MDctMjMgIFNoaW5pY2hpcm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBLZW50IFRhbXVyYS4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vd2luL1Bh c3RlYm9hcmRXaW4uY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9wbGF0Zm9ybS93aW4vUGFz dGVib2FyZFdpbi5jcHAJKHJldmlzaW9uIDYzOTU4KQ0KKysrIFdlYkNvcmUvcGxhdGZvcm0vd2lu L1Bhc3RlYm9hcmRXaW4uY3BwCSh3b3JraW5nIGNvcHkpDQpAQCAtNTIsNyArNTIsNiBAQCBzdGF0 aWMgVUlOVCBXZWJTbWFydFBhc3RlRm9ybWF0ID0gMDsNCiBzdGF0aWMgTFJFU1VMVCBDQUxMQkFD SyBQYXN0ZWJvYXJkT3duZXJXbmRQcm9jKEhXTkQgaFduZCwgVUlOVCBtZXNzYWdlLCBXUEFSQU0g d1BhcmFtLCBMUEFSQU0gbFBhcmFtKQ0KIHsNCiAgICAgTFJFU1VMVCBscmVzdWx0ID0gMDsNCi0g ICAgTE9OR19QVFIgbG9uZ1B0ciA9IEdldFdpbmRvd0xvbmdQdHIoaFduZCwgMCk7DQogDQogICAg IHN3aXRjaCAobWVzc2FnZSkgew0KICAgICBjYXNlIFdNX1JFTkRFUkZPUk1BVDoNCkBAIC02NCwx MiArNjMsMTQgQEAgc3RhdGljIExSRVNVTFQgQ0FMTEJBQ0sgUGFzdGVib2FyZE93bmVyVw0KICAg ICAgICAgLy8gYW5kIG5vdyB0aGlzIGFwcGxpY2F0aW9uIGlzIGFib3V0IHRvIHF1aXQsIHNvIGl0 IG11c3QgcHV0IGRhdGEgb24gDQogICAgICAgICAvLyB0aGUgY2xpcGJvYXJkIGJlZm9yZSBpdCBl eGl0cy4NCiAgICAgICAgIGJyZWFrOw0KLSAgICBjYXNlIFdNX0RSQVdDTElQQk9BUkQ6DQotICAg ICAgICBicmVhazsNCiAgICAgY2FzZSBXTV9ERVNUUk9ZOg0KICAgICAgICAgYnJlYWs7DQorI2lm ICFPUyhXSU5DRSkNCisgICAgY2FzZSBXTV9EUkFXQ0xJUEJPQVJEOg0KKyAgICAgICAgYnJlYWs7 DQogICAgIGNhc2UgV01fQ0hBTkdFQ0JDSEFJTjoNCiAgICAgICAgIGJyZWFrOw0KKyNlbmRpZg0K ICAgICBkZWZhdWx0Og0KICAgICAgICAgbHJlc3VsdCA9IERlZldpbmRvd1Byb2MoaFduZCwgbWVz c2FnZSwgd1BhcmFtLCBsUGFyYW0pOw0KICAgICAgICAgYnJlYWs7DQpAQCAtODQsMTcgKzg1LDIx IEBAIFBhc3RlYm9hcmQqIFBhc3RlYm9hcmQ6OmdlbmVyYWxQYXN0ZWJvYXINCiB9DQogDQogUGFz dGVib2FyZDo6UGFzdGVib2FyZCgpDQoteyANCi0gICAgLy8gbWFrZSBhIGR1bW15IEhXTkQgdG8g YmUgdGhlIFdpbmRvd3MgY2xpcGJvYXJkJ3Mgb3duZXINCi0gICAgV05EQ0xBU1NFWCB3Y2V4ID0g ezB9Ow0KLSAgICB3Y2V4LmNiU2l6ZSA9IHNpemVvZihXTkRDTEFTU0VYKTsNCi0gICAgd2NleC5s cGZuV25kUHJvYyAgICA9IFBhc3RlYm9hcmRPd25lclduZFByb2M7DQotICAgIHdjZXguaEluc3Rh bmNlICAgICAgPSBXZWJDb3JlOjppbnN0YW5jZUhhbmRsZSgpOw0KLSAgICB3Y2V4Lmxwc3pDbGFz c05hbWUgID0gTCJQYXN0ZWJvYXJkT3duZXJXaW5kb3dDbGFzcyI7DQotICAgIDo6UmVnaXN0ZXJD bGFzc0V4KCZ3Y2V4KTsNCit7DQorICAgIEhXTkQgaFduZFBhcmVudCA9IDA7DQorI2lmICFPUyhX SU5DRSkNCisgICAgaFduZFBhcmVudCA9IEhXTkRfTUVTU0FHRTsNCisjZW5kaWYNCisNCisgICAg V05EQ0xBU1Mgd2M7DQorICAgIG1lbXNldCgmd2MsIDAsIHNpemVvZihXTkRDTEFTUykpOw0KKyAg ICB3Yy5scGZuV25kUHJvYyAgICA9IFBhc3RlYm9hcmRPd25lclduZFByb2M7DQorICAgIHdjLmhJ bnN0YW5jZSAgICAgID0gV2ViQ29yZTo6aW5zdGFuY2VIYW5kbGUoKTsNCisgICAgd2MubHBzekNs YXNzTmFtZSAgPSBMIlBhc3RlYm9hcmRPd25lcldpbmRvd0NsYXNzIjsNCisgICAgUmVnaXN0ZXJD bGFzcygmd2MpOw0KIA0KICAgICBtX293bmVyID0gOjpDcmVhdGVXaW5kb3coTCJQYXN0ZWJvYXJk T3duZXJXaW5kb3dDbGFzcyIsIEwiUGFzdGVib2FyZE93bmVyV2luZG93IiwgMCwgMCwgMCwgMCwg MCwNCi0gICAgICAgIEhXTkRfTUVTU0FHRSwgMCwgMCwgMCk7DQorICAgICAgICBoV25kUGFyZW50 LCAwLCAwLCAwKTsNCiANCiAgICAgSFRNTENsaXBib2FyZEZvcm1hdCA9IDo6UmVnaXN0ZXJDbGlw Ym9hcmRGb3JtYXQoTCJIVE1MIEZvcm1hdCIpOw0KICAgICBCb29rbWFya0NsaXBib2FyZEZvcm1h dCA9IDo6UmVnaXN0ZXJDbGlwYm9hcmRGb3JtYXQoTCJVbmlmb3JtUmVzb3VyY2VMb2NhdG9yVyIp Ow0KQEAgLTIyNSw5ICsyMzAsMTQgQEAgdm9pZCBQYXN0ZWJvYXJkOjp3cml0ZUltYWdlKE5vZGUq IG5vZGUsIA0KICAgICBIR0RJT0JKIG9sZFNvdXJjZSA9IFNlbGVjdE9iamVjdChzb3VyY2VEQywg Y29yZUJpdG1hcCk7DQogICAgIGltYWdlLT5nZXRIQklUTUFQKGNvcmVCaXRtYXApOw0KIA0KKyNp ZiAhZGVmaW5lZChOT19BTFBIQUJMRU5EKQ0KICAgICBCTEVOREZVTkNUSU9OIGJmID0ge0FDX1NS Q19PVkVSLCAwLCAyNTUsIEFDX1NSQ19BTFBIQX07DQogICAgIEFscGhhQmxlbmQoY29tcGF0aWJs ZURDLCAwLCAwLCBpbWFnZS0+d2lkdGgoKSwgaW1hZ2UtPmhlaWdodCgpLA0KICAgICAgICAgc291 cmNlREMsIDAsIDAsIGltYWdlLT53aWR0aCgpLCBpbWFnZS0+aGVpZ2h0KCksIGJmKTsNCisjZWxz ZQ0KKyAgICBTdHJldGNoQmx0KGNvbXBhdGlibGVEQywgMCwgMCwgaW1hZ2UtPndpZHRoKCksIGlt YWdlLT5oZWlnaHQoKSwNCisgICAgICAgIHNvdXJjZURDLCAwLCAwLCBpbWFnZS0+d2lkdGgoKSwg aW1hZ2UtPmhlaWdodCgpLCBTUkNDT1BZKTsNCisjZW5kaWYNCiANCiAgICAgU2VsZWN0T2JqZWN0 KHNvdXJjZURDLCBvbGRTb3VyY2UpOw0KICAgICBEZWxldGVPYmplY3QoY29yZUJpdG1hcCk7DQpA QCAtMjUzLDkgKzI2Myw5IEBAIFN0cmluZyBQYXN0ZWJvYXJkOjpwbGFpblRleHQoRnJhbWUqIGZy YW0NCiAgICAgaWYgKDo6SXNDbGlwYm9hcmRGb3JtYXRBdmFpbGFibGUoQ0ZfVU5JQ09ERVRFWFQp ICYmIDo6T3BlbkNsaXBib2FyZChtX293bmVyKSkgew0KICAgICAgICAgSEFORExFIGNiRGF0YSA9 IDo6R2V0Q2xpcGJvYXJkRGF0YShDRl9VTklDT0RFVEVYVCk7DQogICAgICAgICBpZiAoY2JEYXRh KSB7DQotICAgICAgICAgICAgVUNoYXIqIGJ1ZmZlciA9IChVQ2hhciopOjpHbG9iYWxMb2NrKGNi RGF0YSk7DQorICAgICAgICAgICAgVUNoYXIqIGJ1ZmZlciA9IHN0YXRpY19jYXN0PFVDaGFyKj4o R2xvYmFsTG9jayhjYkRhdGEpKTsNCiAgICAgICAgICAgICBTdHJpbmcgZnJvbUNsaXBib2FyZChi dWZmZXIpOw0KLSAgICAgICAgICAgIDo6R2xvYmFsVW5sb2NrKGNiRGF0YSk7DQorICAgICAgICAg ICAgR2xvYmFsVW5sb2NrKGNiRGF0YSk7DQogICAgICAgICAgICAgOjpDbG9zZUNsaXBib2FyZCgp Ow0KICAgICAgICAgICAgIHJldHVybiBmcm9tQ2xpcGJvYXJkOw0KICAgICAgICAgfQ0KQEAgLTI2 NSw5ICsyNzUsOSBAQCBTdHJpbmcgUGFzdGVib2FyZDo6cGxhaW5UZXh0KEZyYW1lKiBmcmFtDQog ICAgIGlmICg6OklzQ2xpcGJvYXJkRm9ybWF0QXZhaWxhYmxlKENGX1RFWFQpICYmIDo6T3BlbkNs aXBib2FyZChtX293bmVyKSkgew0KICAgICAgICAgSEFORExFIGNiRGF0YSA9IDo6R2V0Q2xpcGJv YXJkRGF0YShDRl9URVhUKTsNCiAgICAgICAgIGlmIChjYkRhdGEpIHsNCi0gICAgICAgICAgICBj aGFyKiBidWZmZXIgPSAoY2hhciopOjpHbG9iYWxMb2NrKGNiRGF0YSk7DQorICAgICAgICAgICAg Y2hhciogYnVmZmVyID0gc3RhdGljX2Nhc3Q8Y2hhcio+KEdsb2JhbExvY2soY2JEYXRhKSk7DQog ICAgICAgICAgICAgU3RyaW5nIGZyb21DbGlwYm9hcmQoYnVmZmVyKTsNCi0gICAgICAgICAgICA6 Okdsb2JhbFVubG9jayhjYkRhdGEpOw0KKyAgICAgICAgICAgIEdsb2JhbFVubG9jayhjYkRhdGEp Ow0KICAgICAgICAgICAgIDo6Q2xvc2VDbGlwYm9hcmQoKTsNCiAgICAgICAgICAgICByZXR1cm4g ZnJvbUNsaXBib2FyZDsNCiAgICAgICAgIH0NCkBAIC0yODYsOCArMjk2LDggQEAgUGFzc1JlZlB0 cjxEb2N1bWVudEZyYWdtZW50PiBQYXN0ZWJvYXJkOg0KICAgICAgICAgSEFORExFIGNiRGF0YSA9 IDo6R2V0Q2xpcGJvYXJkRGF0YShIVE1MQ2xpcGJvYXJkRm9ybWF0KTsNCiAgICAgICAgIGlmIChj YkRhdGEpIHsNCiAgICAgICAgICAgICBTSVpFX1QgZGF0YVNpemUgPSA6Okdsb2JhbFNpemUoY2JE YXRhKTsNCi0gICAgICAgICAgICBTdHJpbmcgY2ZodG1sKFVURjhFbmNvZGluZygpLmRlY29kZSgo Y2hhciopOjpHbG9iYWxMb2NrKGNiRGF0YSksIGRhdGFTaXplKSk7DQotICAgICAgICAgICAgOjpH bG9iYWxVbmxvY2soY2JEYXRhKTsNCisgICAgICAgICAgICBTdHJpbmcgY2ZodG1sKFVURjhFbmNv ZGluZygpLmRlY29kZShzdGF0aWNfY2FzdDxjaGFyKj4oR2xvYmFsTG9jayhjYkRhdGEpKSwgZGF0 YVNpemUpKTsNCisgICAgICAgICAgICBHbG9iYWxVbmxvY2soY2JEYXRhKTsNCiAgICAgICAgICAg ICA6OkNsb3NlQ2xpcGJvYXJkKCk7DQogDQogICAgICAgICAgICAgUGFzc1JlZlB0cjxEb2N1bWVu dEZyYWdtZW50PiBmcmFnbWVudCA9IGZyYWdtZW50RnJvbUNGSFRNTChmcmFtZS0+ZG9jdW1lbnQo KSwgY2ZodG1sKTsNCkBAIC0zMDIsOSArMzEyLDkgQEAgUGFzc1JlZlB0cjxEb2N1bWVudEZyYWdt ZW50PiBQYXN0ZWJvYXJkOg0KICAgICAgICAgaWYgKDo6T3BlbkNsaXBib2FyZChtX293bmVyKSkg ew0KICAgICAgICAgICAgIEhBTkRMRSBjYkRhdGEgPSA6OkdldENsaXBib2FyZERhdGEoQ0ZfVU5J Q09ERVRFWFQpOw0KICAgICAgICAgICAgIGlmIChjYkRhdGEpIHsNCi0gICAgICAgICAgICAgICAg VUNoYXIqIGJ1ZmZlciA9IChVQ2hhciopR2xvYmFsTG9jayhjYkRhdGEpOw0KKyAgICAgICAgICAg ICAgICBVQ2hhciogYnVmZmVyID0gc3RhdGljX2Nhc3Q8VUNoYXIqPihHbG9iYWxMb2NrKGNiRGF0 YSkpOw0KICAgICAgICAgICAgICAgICBTdHJpbmcgc3RyKGJ1ZmZlcik7DQotICAgICAgICAgICAg ICAgIDo6R2xvYmFsVW5sb2NrKGNiRGF0YSk7DQorICAgICAgICAgICAgICAgIEdsb2JhbFVubG9j ayhjYkRhdGEpOw0KICAgICAgICAgICAgICAgICA6OkNsb3NlQ2xpcGJvYXJkKCk7DQogICAgICAg ICAgICAgICAgIFJlZlB0cjxEb2N1bWVudEZyYWdtZW50PiBmcmFnbWVudCA9IGNyZWF0ZUZyYWdt ZW50RnJvbVRleHQoY29udGV4dC5nZXQoKSwgc3RyKTsNCiAgICAgICAgICAgICAgICAgaWYgKGZy YWdtZW50KQ0KQEAgLTMxOSw5ICszMjksOSBAQCBQYXNzUmVmUHRyPERvY3VtZW50RnJhZ21lbnQ+ IFBhc3RlYm9hcmQ6DQogICAgICAgICBpZiAoOjpPcGVuQ2xpcGJvYXJkKG1fb3duZXIpKSB7DQog ICAgICAgICAgICAgSEFORExFIGNiRGF0YSA9IDo6R2V0Q2xpcGJvYXJkRGF0YShDRl9URVhUKTsN CiAgICAgICAgICAgICBpZiAoY2JEYXRhKSB7DQotICAgICAgICAgICAgICAgIGNoYXIqIGJ1ZmZl ciA9IChjaGFyKilHbG9iYWxMb2NrKGNiRGF0YSk7DQorICAgICAgICAgICAgICAgIGNoYXIqIGJ1 ZmZlciA9IHN0YXRpY19jYXN0PGNoYXIqPihHbG9iYWxMb2NrKGNiRGF0YSkpOw0KICAgICAgICAg ICAgICAgICBTdHJpbmcgc3RyKGJ1ZmZlcik7DQotICAgICAgICAgICAgICAgIDo6R2xvYmFsVW5s b2NrKGNiRGF0YSk7DQorICAgICAgICAgICAgICAgIEdsb2JhbFVubG9jayhjYkRhdGEpOw0KICAg ICAgICAgICAgICAgICA6OkNsb3NlQ2xpcGJvYXJkKCk7DQogICAgICAgICAgICAgICAgIFJlZlB0 cjxEb2N1bWVudEZyYWdtZW50PiBmcmFnbWVudCA9IGNyZWF0ZUZyYWdtZW50RnJvbVRleHQoY29u dGV4dC5nZXQoKSwgc3RyKTsNCiAgICAgICAgICAgICAgICAgaWYgKGZyYWdtZW50KQ0K