121212 2013-09-11 22:27:04 -0700 WinLauncher needs back and forward buttons 2013-09-17 18:09:07 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P3 Minor --- 0 alex.christensen webkit-unassigned bfulgham commit-queue paroga oldest_to_newest 928152 0 alex.christensen 2013-09-11 22:27:04 -0700 The History menu in WinLauncher is not intuitive. Every browser and mini browser has back and forward buttons. 928154 1 211399 alex.christensen 2013-09-11 22:32:00 -0700 Created attachment 211399 Patch 928155 2 alex.christensen 2013-09-11 22:33:06 -0700 This doesn't meet WebKit style, but it matches the style of the surrounding code. 928156 3 commit-queue 2013-09-11 22:34:41 -0700 Attachment 211399 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/WinLauncher/WinLauncher.cpp', u'Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.rc']" exit_code: 1 Tools/WinLauncher/WinLauncher.cpp:368: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] Tools/WinLauncher/WinLauncher.cpp:375: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] Tools/WinLauncher/WinLauncher.cpp:808: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] Tools/WinLauncher/WinLauncher.cpp:811: Missing space after , [whitespace/comma] [3] Tools/WinLauncher/WinLauncher.cpp:820: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] Tools/WinLauncher/WinLauncher.cpp:823: Missing space after , [whitespace/comma] [3] Total errors found: 6 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 928157 4 211399 bfulgham 2013-09-11 22:39:30 -0700 Comment on attachment 211399 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=211399&action=review Thanks for doing this. It will be ice to have these in the UI. r- so you don't delete hooks to some things I'm trying to get landed. :) > Tools/WinLauncher/WinLauncher.cpp:90 > +LRESULT CALLBACK MyReloadButtonProc(HWND, UINT, WPARAM, LPARAM); Can we please call these something else? The 'My...' Naming makes it seem like a programming class project! :) > Tools/WinLauncher/WinLauncher.cpp:379 > + hInst, 0); Please format these normally with 4-space indents. One or two lines are better than these large blocks. > Tools/WinLauncher/WinLauncher.cpp:394 > + DefButtonProc = reinterpret_cast<WNDPROC>(GetWindowLongPtr(hBackButtonWnd, GWLP_WNDPROC)); Honestly, I'm surprised that the GetWindowLongPtr isn't defined as a 32/64 type based on compiler settings. Can you double check that this is necessary? I sort of think it could just be the ...Ptr version. > Tools/WinLauncher/WinLauncher.cpp:-685 > - Please don't delete this. It's WIP. > Tools/WinLauncher/WinLauncher.cpp:-730 > - break; Leave in please. > Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.rc:-52 > - END Leave in please. 928358 5 alex.christensen 2013-09-12 10:02:24 -0700 I'll finish this next week. I've got to finish lots of homework so I can go to Tahoe this weekend :) > > Tools/WinLauncher/WinLauncher.cpp:90 > > +LRESULT CALLBACK MyReloadButtonProc(HWND, UINT, WPARAM, LPARAM); > > Can we please call these something else? The 'My...' Naming makes it seem like a programming class project! :) I'll rename MyEditProc, too. > > Tools/WinLauncher/WinLauncher.cpp:394 > > + DefButtonProc = reinterpret_cast<WNDPROC>(GetWindowLongPtr(hBackButtonWnd, GWLP_WNDPROC)); > > Honestly, I'm surprised that the GetWindowLongPtr isn't defined as a 32/64 type based on compiler settings. Can you double check that this is necessary? I sort of think it could just be the ...Ptr version. If I remember correctly, there was some issue with the WinCE not recognizing the ...Ptr functions. I think WinCE is only 32-bit and only has the 32-bit functions. Patrick? 930428 6 211950 alex.christensen 2013-09-17 15:34:05 -0700 Created attachment 211950 Patch 930440 7 211952 alex.christensen 2013-09-17 16:34:23 -0700 Created attachment 211952 Patch 930443 8 211953 alex.christensen 2013-09-17 16:40:09 -0700 Created attachment 211953 Patch 930445 9 alex.christensen 2013-09-17 16:41:54 -0700 Sorry about all the patches. I removed duplicate calls to CallWindowProc before default and removed unnecessary casting (LRESULT to LRESULT and WNDPROC to WNDPROC) 930464 10 211953 bfulgham 2013-09-17 17:46:41 -0700 Comment on attachment 211953 Patch r=me 930467 11 211953 commit-queue 2013-09-17 18:09:04 -0700 Comment on attachment 211953 Patch Clearing flags on attachment: 211953 Committed r156018: <http://trac.webkit.org/changeset/156018> 930468 12 commit-queue 2013-09-17 18:09:07 -0700 All reviewed patches have been landed. Closing bug. 211399 2013-09-11 22:32:00 -0700 2013-09-17 15:34:01 -0700 Patch bug-121212-20130911233202.patch text/plain 7722 alex.christensen SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1NTU5MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIyIEBACisyMDEzLTA5LTExICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CisKKyAgICAgICAgQWRkZWQgYmFjayBhbmQgZm9yd2FyZCBidXR0b25zIHRvIFdp bkxhdW5jaGVyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTIxMjEyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBXaW5MYXVuY2hlci9XaW5MYXVuY2hlci5jcHA6CisgICAgICAgIChyZXNpemVTdWJWaWV3 cyk6CisgICAgICAgIE1vdmUgbmV3IGJhY2sgYW5kIGZvcndhcmQgYnV0dG9ucyB0byBjb3JyZWN0 IHBvc2l0aW9ucyBiZWZvcmUgVVJMIGJhci4KKyAgICAgICAgKGRsbExhdW5jaGVyRW50cnlQb2lu dCk6CisgICAgICAgIFN0b3JlIHRoZSBkZWZhdWx0IGJ1dHRvbiB3aW5kb3cgcHJvY2VkdXJlIGFu ZCByZXBsYWNlIHdpdGggbXkgYnV0dG9uIHByb2NlZHVyZXMuCisgICAgICAgIChXbmRQcm9jKToK KyAgICAgICAgUmVtb3ZlZCB1bnVzZWQgbWVudSBvcHRpb25zIGZvciBuYXZpZ2F0aW5nIGJhY2sg YW5kIGZvcndhcmQuCisgICAgICAgIChNeUJhY2tCdXR0b25Qcm9jKTogQWRkZWQuCisgICAgICAg IChNeUZvcndhcmRCdXR0b25Qcm9jKTogQWRkZWQuCisgICAgICAgICogV2luTGF1bmNoZXIvV2lu TGF1bmNoZXIudmN4cHJvai9XaW5MYXVuY2hlckxpYi5yYzoKKyAgICAgICAgUmVtb3ZlZCBIaXN0 b3J5IG1lbnUgaW4gZmF2b3Igb2YgYmFjayBhbmQgZm9yd2FyZCBidXR0b25zLgorCiAyMDEzLTA5 LTExICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgVHJ5 IHRvIGZpeCBHQ0MgYnVpbGRzLgpJbmRleDogVG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLmNwcAkocmV2 aXNpb24gMTU1NTg0KQorKysgVG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0yLDYgKzIsNyBAQAogICogQ29weXJpZ2h0IChDKSAyMDA2LCAyMDA4IEFw cGxlIENvbXB1dGVyLCBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChD KSAyMDA5LCAyMDExIEJyZW50IEZ1bGdoYW0uICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29w eXJpZ2h0IChDKSAyMDA5LCAyMDEwLCAyMDExIEFwcGNlbGVyYXRvciwgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEzIEFsZXggQ2hyaXN0ZW5zZW4uICBBbGwg cmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNl IGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUg cGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC01MCwx MiArNTEsMTYgQEAKIAogI2RlZmluZSBNQVhfTE9BRFNUUklORyAxMDAKICNkZWZpbmUgVVJMQkFS X0hFSUdIVCAgMjQKKyNkZWZpbmUgQ09OVFJPTEJVVFRPTl9XSURUSCAyNAogCiAvLyBHbG9iYWwg VmFyaWFibGVzOgogSElOU1RBTkNFIGhJbnN0OyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgLy8gY3VycmVudCBpbnN0YW5jZQogSFdORCBoTWFpblduZDsKIEhXTkQgaFVSTEJhclduZDsK K0hXTkQgaEJhY2tCdXR0b25XbmQ7CitIV05EIGhGb3J3YXJkQnV0dG9uV25kOwogV05EUFJPQyBE ZWZFZGl0UHJvYyA9IDA7CitXTkRQUk9DIERlZkJ1dHRvblByb2MgPSAwOwogV05EUFJPQyBEZWZX ZWJLaXRQcm9jID0gMDsKIElXZWJJbnNwZWN0b3IqIGdJbnNwZWN0b3IgPSAwOwogSVdlYlZpZXcq IGdXZWJWaWV3ID0gMDsKQEAgLTgwLDYgKzg1LDkgQEAgQVRPTSAgICAgICAgICAgICAgICBNeVJl Z2lzdGVyQ2xhc3MoSElOUwogTFJFU1VMVCBDQUxMQkFDSyAgICBXbmRQcm9jKEhXTkQsIFVJTlQs IFdQQVJBTSwgTFBBUkFNKTsKIElOVF9QVFIgQ0FMTEJBQ0sgICAgQWJvdXQoSFdORCwgVUlOVCwg V1BBUkFNLCBMUEFSQU0pOwogTFJFU1VMVCBDQUxMQkFDSyAgICBNeUVkaXRQcm9jKEhXTkQsIFVJ TlQsIFdQQVJBTSwgTFBBUkFNKTsKK0xSRVNVTFQgQ0FMTEJBQ0sgICAgTXlCYWNrQnV0dG9uUHJv YyhIV05ELCBVSU5ULCBXUEFSQU0sIExQQVJBTSk7CitMUkVTVUxUIENBTExCQUNLICAgIE15Rm9y d2FyZEJ1dHRvblByb2MoSFdORCwgVUlOVCwgV1BBUkFNLCBMUEFSQU0pOworTFJFU1VMVCBDQUxM QkFDSyAgICBNeVJlbG9hZEJ1dHRvblByb2MoSFdORCwgVUlOVCwgV1BBUkFNLCBMUEFSQU0pOwog CiBzdGF0aWMgdm9pZCBsb2FkVVJMKEJTVFIgdXJsQlN0cik7CiAKQEAgLTIzMyw3ICsyNDEsOSBA QCBzdGF0aWMgdm9pZCByZXNpemVTdWJWaWV3cygpCiAKICAgICBSRUNUIHJjQ2xpZW50OwogICAg IEdldENsaWVudFJlY3QoaE1haW5XbmQsICZyY0NsaWVudCk7Ci0gICAgTW92ZVdpbmRvdyhoVVJM QmFyV25kLCAwLCAwLCByY0NsaWVudC5yaWdodCwgVVJMQkFSX0hFSUdIVCwgVFJVRSk7CisgICAg TW92ZVdpbmRvdyhoQmFja0J1dHRvblduZCwgMCwgMCwgQ09OVFJPTEJVVFRPTl9XSURUSCwgQ09O VFJPTEJVVFRPTl9XSURUSCwgVFJVRSk7CisgICAgTW92ZVdpbmRvdyhoRm9yd2FyZEJ1dHRvbldu ZCwgQ09OVFJPTEJVVFRPTl9XSURUSCwgMCwgQ09OVFJPTEJVVFRPTl9XSURUSCwgQ09OVFJPTEJV VFRPTl9XSURUSCwgVFJVRSk7CisgICAgTW92ZVdpbmRvdyhoVVJMQmFyV25kLCBDT05UUk9MQlVU VE9OX1dJRFRIICogMiwgMCwgcmNDbGllbnQucmlnaHQsIFVSTEJBUl9IRUlHSFQsIFRSVUUpOwog ICAgIE1vdmVXaW5kb3coZ1ZpZXdXaW5kb3csIDAsIFVSTEJBUl9IRUlHSFQsIHJjQ2xpZW50LnJp Z2h0LCByY0NsaWVudC5ib3R0b20gLSBVUkxCQVJfSEVJR0hULCBUUlVFKTsKIH0KIApAQCAtMzU0 LDkgKzM2NCwyMyBAQCBleHRlcm4gIkMiIF9fZGVjbHNwZWMoZGxsZXhwb3J0KSBpbnQgV0lOCiAg ICAgICAgIGlmICghaE1haW5XbmQpCiAgICAgICAgICAgICByZXR1cm4gRkFMU0U7CiAKKyAgICAg ICAgaEJhY2tCdXR0b25XbmQgPSBDcmVhdGVXaW5kb3coTCJCVVRUT04iLCBMIjwiLAorICAgICAg ICAgICAgICAgICAgICBXU19DSElMRCB8IFdTX1ZJU0lCTEUgIHwgQlNfVEVYVCwgCisgICAgICAg ICAgICAgICAgICAgIDAsIDAsIDAsIDAsCisgICAgICAgICAgICAgICAgICAgIGhNYWluV25kLAor ICAgICAgICAgICAgICAgICAgICAwLAorICAgICAgICAgICAgICAgICAgICBoSW5zdCwgMCk7CisK KyAgICAgICAgaEZvcndhcmRCdXR0b25XbmQgPSBDcmVhdGVXaW5kb3coTCJCVVRUT04iLCBMIj4i LAorICAgICAgICAgICAgICAgICAgICBXU19DSElMRCB8IFdTX1ZJU0lCTEUgIHwgQlNfVEVYVCwg CisgICAgICAgICAgICAgICAgICAgIENPTlRST0xCVVRUT05fV0lEVEgsIDAsIDAsIDAsCisgICAg ICAgICAgICAgICAgICAgIGhNYWluV25kLAorICAgICAgICAgICAgICAgICAgICAwLAorICAgICAg ICAgICAgICAgICAgICBoSW5zdCwgMCk7CisgICAgICAgIAogICAgICAgICBoVVJMQmFyV25kID0g Q3JlYXRlV2luZG93KEwiRURJVCIsIDAsCiAgICAgICAgICAgICAgICAgICAgIFdTX0NISUxEIHwg V1NfVklTSUJMRSB8IFdTX0JPUkRFUiB8IEVTX0xFRlQgfCBFU19BVVRPVlNDUk9MTCwgCi0gICAg ICAgICAgICAgICAgICAgIDAsIDAsIDAsIDAsCisgICAgICAgICAgICAgICAgICAgIENPTlRST0xC VVRUT05fV0lEVEggKiAyLCAwLCAwLCAwLAogICAgICAgICAgICAgICAgICAgICBoTWFpblduZCwK ICAgICAgICAgICAgICAgICAgICAgMCwKICAgICAgICAgICAgICAgICAgICAgaEluc3QsIDApOwpA QCAtMzY3LDEwICszOTEsMTYgQEAgZXh0ZXJuICJDIiBfX2RlY2xzcGVjKGRsbGV4cG9ydCkgaW50 IFdJTgogCiAjaWYgZGVmaW5lZCBfTV9BTUQ2NCB8fCBkZWZpbmVkIF9XSU42NAogICAgIERlZkVk aXRQcm9jID0gcmVpbnRlcnByZXRfY2FzdDxXTkRQUk9DPihHZXRXaW5kb3dMb25nUHRyKGhVUkxC YXJXbmQsIEdXTFBfV05EUFJPQykpOworICAgIERlZkJ1dHRvblByb2MgPSByZWludGVycHJldF9j YXN0PFdORFBST0M+KEdldFdpbmRvd0xvbmdQdHIoaEJhY2tCdXR0b25XbmQsIEdXTFBfV05EUFJP QykpOwogICAgIFNldFdpbmRvd0xvbmdQdHIoaFVSTEJhclduZCwgR1dMUF9XTkRQUk9DLCByZWlu dGVycHJldF9jYXN0PExPTkdfUFRSPihNeUVkaXRQcm9jKSk7CisgICAgU2V0V2luZG93TG9uZ1B0 cihoQmFja0J1dHRvblduZCwgR1dMUF9XTkRQUk9DLCByZWludGVycHJldF9jYXN0PExPTkdfUFRS PihNeUJhY2tCdXR0b25Qcm9jKSk7CisgICAgU2V0V2luZG93TG9uZ1B0cihoRm9yd2FyZEJ1dHRv blduZCwgR1dMUF9XTkRQUk9DLCByZWludGVycHJldF9jYXN0PExPTkdfUFRSPihNeUZvcndhcmRC dXR0b25Qcm9jKSk7CiAjZWxzZQogICAgIERlZkVkaXRQcm9jID0gcmVpbnRlcnByZXRfY2FzdDxX TkRQUk9DPihHZXRXaW5kb3dMb25nKGhVUkxCYXJXbmQsIEdXTF9XTkRQUk9DKSk7CisgICAgRGVm QnV0dG9uUHJvYyA9IHJlaW50ZXJwcmV0X2Nhc3Q8V05EUFJPQz4oR2V0V2luZG93TG9uZyhoQmFj a0J1dHRvblduZCwgR1dMUF9XTkRQUk9DKSk7CiAgICAgU2V0V2luZG93TG9uZyhoVVJMQmFyV25k LCBHV0xfV05EUFJPQywgcmVpbnRlcnByZXRfY2FzdDxMT05HX1BUUj4oTXlFZGl0UHJvYykpOwor ICAgIFNldFdpbmRvd0xvbmcoaEJhY2tCdXR0b25XbmQsIEdXTFBfV05EUFJPQywgcmVpbnRlcnBy ZXRfY2FzdDxMT05HX1BUUj4oTXlCYWNrQnV0dG9uUHJvYykpOworICAgIFNldFdpbmRvd0xvbmco aEZvcndhcmRCdXR0b25XbmQsIEdXTFBfV05EUFJPQywgcmVpbnRlcnByZXRfY2FzdDxMT05HX1BU Uj4oTXlGb3J3YXJkQnV0dG9uUHJvYykpOwogI2VuZGlmCiAKICAgICBTZXRGb2N1cyhoVVJMQmFy V25kKTsKQEAgLTY3MSwxOCArNzAxLDYgQEAgc3RhdGljIHZvaWQgTGF1bmNoSW5zcGVjdG9yKEhX TkQgaHduZCkKICAgICBnSW5zcGVjdG9yLT5zaG93KCk7CiB9CiAKLXN0YXRpYyB2b2lkIE5hdmln YXRlRm9yd2FyZE9yQmFja3dhcmQoSFdORCBoV25kLCBVSU5UIG1lbnVJRCkKLXsKLSAgICBpZiAo IWdXZWJWaWV3KQotICAgICAgICByZXR1cm47Ci0KLSAgICBCT09MIHdlbnRCYWNrT3JGb3J3YXJk ID0gRkFMU0U7Ci0gICAgaWYgKElETV9ISVNUT1JZX0ZPUldBUkQgPT0gbWVudUlEKQotICAgICAg ICBnV2ViVmlldy0+Z29Gb3J3YXJkKCZ3ZW50QmFja09yRm9yd2FyZCk7Ci0gICAgZWxzZQotICAg ICAgICBnV2ViVmlldy0+Z29CYWNrKCZ3ZW50QmFja09yRm9yd2FyZCk7Ci19Ci0KIHN0YXRpYyBj b25zdCBpbnQgZHJhZ0JhckhlaWdodCA9IDMwOwogCiBMUkVTVUxUIENBTExCQUNLIFduZFByb2Mo SFdORCBoV25kLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pCkBA IC03MjQsMTAgKzc0Miw2IEBAIExSRVNVTFQgQ0FMTEJBQ0sgV25kUHJvYyhIV05EIGhXbmQsIFVJ TlQKICAgICAgICAgY2FzZSBJRE1fV0VCX0lOU1BFQ1RPUjoKICAgICAgICAgICAgIExhdW5jaElu c3BlY3RvcihoV25kKTsKICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIElETV9ISVNU T1JZX0JBQ0tXQVJEOgotICAgICAgICBjYXNlIElETV9ISVNUT1JZX0ZPUldBUkQ6Ci0gICAgICAg ICAgICBOYXZpZ2F0ZUZvcndhcmRPckJhY2t3YXJkKGhXbmQsIHdtSWQpOwotICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgIGNhc2UgSURNX0FWRk9VTkRBVElPTjoKICAgICAgICAgY2FzZSBJRE1f QUNDX0NPTVBPU0lUSU5HOgogICAgICAgICBjYXNlIElETV9XS19GVUxMU0NSRUVOOgpAQCAtNzg3 LDYgKzgwMSwyOSBAQCBMUkVTVUxUIENBTExCQUNLIE15RWRpdFByb2MoSFdORCBoRGxnLCBVCiAg ICAgfQogfQogCitMUkVTVUxUIENBTExCQUNLIE15QmFja0J1dHRvblByb2MoSFdORCBoRGxnLCBV SU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pCit7CisgICAgQk9PTCB3 ZW50QmFjayA9IEZBTFNFOworICAgIHN3aXRjaCAobWVzc2FnZSkgeworICAgICAgICBjYXNlIFdN X0xCVVRUT05VUDoKKyAgICAgICAgICAgIGdXZWJWaWV3LT5nb0JhY2soJndlbnRCYWNrKTsKKyAg ICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIHJldHVybiAoTFJFU1VMVClDYWxsV2luZG93UHJv YygoV05EUFJPQylEZWZCdXR0b25Qcm9jLGhEbGcsbWVzc2FnZSx3UGFyYW0sbFBhcmFtKTsKKyAg ICAgICAgYnJlYWs7CisgICAgfQorfQorCitMUkVTVUxUIENBTExCQUNLIE15Rm9yd2FyZEJ1dHRv blByb2MoSFdORCBoRGxnLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFy YW0pCit7CisgICAgQk9PTCB3ZW50Rm9yd2FyZCA9IEZBTFNFOworICAgIHN3aXRjaCAobWVzc2Fn ZSkgeworICAgICAgICBjYXNlIFdNX0xCVVRUT05VUDoKKyAgICAgICAgICAgIGdXZWJWaWV3LT5n b0ZvcndhcmQoJndlbnRGb3J3YXJkKTsKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIHJl dHVybiAoTFJFU1VMVClDYWxsV2luZG93UHJvYygoV05EUFJPQylEZWZCdXR0b25Qcm9jLGhEbGcs bWVzc2FnZSx3UGFyYW0sbFBhcmFtKTsKKyAgICAgICAgYnJlYWs7CisgICAgfQorfQogCiAvLyBN ZXNzYWdlIGhhbmRsZXIgZm9yIGFib3V0IGJveC4KIElOVF9QVFIgQ0FMTEJBQ0sgQWJvdXQoSFdO RCBoRGxnLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pCkluZGV4 OiBUb29scy9XaW5MYXVuY2hlci9XaW5MYXVuY2hlci52Y3hwcm9qL1dpbkxhdW5jaGVyTGliLnJj Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLnZjeHByb2ovV2lu TGF1bmNoZXJMaWIucmMJKHJldmlzaW9uIDE1NTU4NCkKKysrIFRvb2xzL1dpbkxhdW5jaGVyL1dp bkxhdW5jaGVyLnZjeHByb2ovV2luTGF1bmNoZXJMaWIucmMJKHdvcmtpbmcgY29weSkKQEAgLTQ1 LDExICs0NSw2IEBAIEJFR0lOCiAgICAgICAgIE1FTlVJVEVNICImUHJpbnRcdEN0cmwtUCIsICAg ICAgICAgICAgICBJRE1fUFJJTlQKICAgICAgICAgTUVOVUlURU0gIkUmeGl0IiwgICAgICAgICAg ICAgICAgICAgICAgIElETV9FWElUCiAgICAgRU5ECi0gICAgUE9QVVAgIiZIaXN0b3J5IgotICAg IEJFR0lOCi0gICAgICAgIE1FTlVJVEVNICJCYWNrIiwgICAgICAgICAgICAgICAgICAgICAgICBJ RE1fSElTVE9SWV9CQUNLV0FSRAotICAgICAgICBNRU5VSVRFTSAiRm9yd2FyZCIsICAgICAgICAg ICAgICAgICAgICAgSURNX0hJU1RPUllfRk9SV0FSRAotICAgIEVORAogICAgIFBPUFVQICJEJmV2 ZWxvcCIKICAgICBCRUdJTgogICAgICAgICBNRU5VSVRFTSAiU2hvdyBXZWIgSW5zcGVjdG9yIiwg ICAgICAgICAgSURNX1dFQl9JTlNQRUNUT1IK 211950 2013-09-17 15:34:05 -0700 2013-09-17 16:34:19 -0700 Patch bug-121212-20130917163413.patch text/plain 7240 alex.christensen SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1NjAwNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDEzLTA5LTE3ICBBbGV4IENocmlzdGVuc2VuICA8YWxleC5jaHJpc3RlbnNl bkBmbGV4c2ltLmNvbT4KKworICAgICAgICBBZGRlZCBiYWNrIGFuZCBmb3J3YXJkIGJ1dHRvbnMg dG8gV2luTGF1bmNoZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMjEyMTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFdpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLmNwcDoKKyAgICAgICAgKHJlc2l6ZVN1 YlZpZXdzKToKKyAgICAgICAgTW92ZSBuZXcgYmFjayBhbmQgZm9yd2FyZCBidXR0b25zIHRvIGNv cnJlY3QgcG9zaXRpb25zIGJlZm9yZSBVUkwgYmFyLgorICAgICAgICAoZGxsTGF1bmNoZXJFbnRy eVBvaW50KTogCisgICAgICAgIFN0b3JlIHRoZSBkZWZhdWx0IGJ1dHRvbiB3aW5kb3cgcHJvY2Vk dXJlIGFuZCByZXBsYWNlIHdpdGggbXkgYnV0dG9uIHByb2NlZHVyZXMuCisgICAgICAgIChFZGl0 UHJvYyk6IFVwZGF0ZWQgc3R5bGUgYW5kIHJlbmFtZWQgZnJvbSBNeUVkaXRQcm9jLgorICAgICAg ICAoQmFja0J1dHRvblByb2MpOiBBZGRlZC4KKyAgICAgICAgKEZvcndhcmRCdXR0b25Qcm9jKTog QWRkZWQuCisKIDIwMTMtMDktMTcgIE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+ CiAKICAgICAgICAgcnVuLWpzYy1zdHJlc3MtdGVzdHMgZmFpbHMgd2l0aCBydWJ5IHZlcnNpb24g MgpJbmRleDogVG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLmNwcAkocmV2aXNpb24gMTU2MDA0KQorKysg VG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yLDYg KzIsNyBAQAogICogQ29weXJpZ2h0IChDKSAyMDA2LCAyMDA4LCAyMDEzIEFwcGxlIENvbXB1dGVy LCBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDA5LCAyMDEx IEJyZW50IEZ1bGdoYW0uICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAy MDA5LCAyMDEwLCAyMDExIEFwcGNlbGVyYXRvciwgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor ICogQ29weXJpZ2h0IChDKSAyMDEzIEFsZXggQ2hyaXN0ZW5zZW4uIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTU2LDYgKzU3LDcgQEAKIAog I2RlZmluZSBNQVhfTE9BRFNUUklORyAxMDAKICNkZWZpbmUgVVJMQkFSX0hFSUdIVCAgMjQKKyNk ZWZpbmUgQ09OVFJPTEJVVFRPTl9XSURUSCAyNAogCiBzdGF0aWMgY29uc3QgaW50IG1heEhpc3Rv cnlTaXplID0gMTA7CiAKQEAgLTczLDcgKzc1LDEwIEBAIHR5cGVkZWYgX2NvbV9wdHJfdDxfY29t X0lJSUQ8SVdlYlZpZXdQcmkKIEhJTlNUQU5DRSBoSW5zdDsgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIC8vIGN1cnJlbnQgaW5zdGFuY2UKIEhXTkQgaE1haW5XbmQ7CiBIV05EIGhVUkxC YXJXbmQ7CitIV05EIGhCYWNrQnV0dG9uV25kOworSFdORCBoRm9yd2FyZEJ1dHRvblduZDsKIFdO RFBST0MgRGVmRWRpdFByb2MgPSAwOworV05EUFJPQyBEZWZCdXR0b25Qcm9jID0gMDsKIFdORFBS T0MgRGVmV2ViS2l0UHJvYyA9IDA7CiBJV2ViSW5zcGVjdG9yUHRyIGdJbnNwZWN0b3I7CiBJV2Vi Vmlld1B0ciBnV2ViVmlldzsKQEAgLTk5LDcgKzEwNCwxMCBAQCBib29sIHNfZnVsbERlc2t0b3Ag PSBmYWxzZTsKIEFUT00gICAgICAgICAgICAgICAgTXlSZWdpc3RlckNsYXNzKEhJTlNUQU5DRSBo SW5zdGFuY2UpOwogTFJFU1VMVCBDQUxMQkFDSyAgICBXbmRQcm9jKEhXTkQsIFVJTlQsIFdQQVJB TSwgTFBBUkFNKTsKIElOVF9QVFIgQ0FMTEJBQ0sgICAgQWJvdXQoSFdORCwgVUlOVCwgV1BBUkFN LCBMUEFSQU0pOwotTFJFU1VMVCBDQUxMQkFDSyAgICBNeUVkaXRQcm9jKEhXTkQsIFVJTlQsIFdQ QVJBTSwgTFBBUkFNKTsKK0xSRVNVTFQgQ0FMTEJBQ0sgICAgRWRpdFByb2MoSFdORCwgVUlOVCwg V1BBUkFNLCBMUEFSQU0pOworTFJFU1VMVCBDQUxMQkFDSyAgICBCYWNrQnV0dG9uUHJvYyhIV05E LCBVSU5ULCBXUEFSQU0sIExQQVJBTSk7CitMUkVTVUxUIENBTExCQUNLICAgIEZvcndhcmRCdXR0 b25Qcm9jKEhXTkQsIFVJTlQsIFdQQVJBTSwgTFBBUkFNKTsKK0xSRVNVTFQgQ0FMTEJBQ0sgICAg UmVsb2FkQnV0dG9uUHJvYyhIV05ELCBVSU5ULCBXUEFSQU0sIExQQVJBTSk7CiAKIHN0YXRpYyB2 b2lkIGxvYWRVUkwoQlNUUiB1cmxCU3RyKTsKIApAQCAtMzM2LDcgKzM0NCw5IEBAIHN0YXRpYyB2 b2lkIHJlc2l6ZVN1YlZpZXdzKCkKIAogICAgIFJFQ1QgcmNDbGllbnQ7CiAgICAgR2V0Q2xpZW50 UmVjdChoTWFpblduZCwgJnJjQ2xpZW50KTsKLSAgICBNb3ZlV2luZG93KGhVUkxCYXJXbmQsIDAs IDAsIHJjQ2xpZW50LnJpZ2h0LCBVUkxCQVJfSEVJR0hULCBUUlVFKTsKKyAgICBNb3ZlV2luZG93 KGhCYWNrQnV0dG9uV25kLCAwLCAwLCBDT05UUk9MQlVUVE9OX1dJRFRILCBVUkxCQVJfSEVJR0hU LCBUUlVFKTsKKyAgICBNb3ZlV2luZG93KGhGb3J3YXJkQnV0dG9uV25kLCBDT05UUk9MQlVUVE9O X1dJRFRILCAwLCBDT05UUk9MQlVUVE9OX1dJRFRILCBVUkxCQVJfSEVJR0hULCBUUlVFKTsKKyAg ICBNb3ZlV2luZG93KGhVUkxCYXJXbmQsIENPTlRST0xCVVRUT05fV0lEVEggKiAyLCAwLCByY0Ns aWVudC5yaWdodCwgVVJMQkFSX0hFSUdIVCwgVFJVRSk7CiAgICAgTW92ZVdpbmRvdyhnVmlld1dp bmRvdywgMCwgVVJMQkFSX0hFSUdIVCwgcmNDbGllbnQucmlnaHQsIHJjQ2xpZW50LmJvdHRvbSAt IFVSTEJBUl9IRUlHSFQsIFRSVUUpOwogfQogCkBAIC00NTcsMjQgKzQ2NywxOSBAQCBleHRlcm4g IkMiIF9fZGVjbHNwZWMoZGxsZXhwb3J0KSBpbnQgV0lOCiAgICAgICAgIGlmICghaE1haW5XbmQp CiAgICAgICAgICAgICByZXR1cm4gRkFMU0U7CiAKLSAgICAgICAgaFVSTEJhclduZCA9IENyZWF0 ZVdpbmRvdyhMIkVESVQiLCAwLAotICAgICAgICAgICAgICAgICAgICBXU19DSElMRCB8IFdTX1ZJ U0lCTEUgfCBXU19CT1JERVIgfCBFU19MRUZUIHwgRVNfQVVUT1ZTQ1JPTEwsIAotICAgICAgICAg ICAgICAgICAgICAwLCAwLCAwLCAwLAotICAgICAgICAgICAgICAgICAgICBoTWFpblduZCwKLSAg ICAgICAgICAgICAgICAgICAgMCwKLSAgICAgICAgICAgICAgICAgICAgaEluc3QsIDApOworICAg ICAgICBoQmFja0J1dHRvblduZCA9IENyZWF0ZVdpbmRvdyhMIkJVVFRPTiIsIEwiPCIsIFdTX0NI SUxEIHwgV1NfVklTSUJMRSAgfCBCU19URVhULCAwLCAwLCAwLCAwLCBoTWFpblduZCwgMCwgaElu c3QsIDApOworICAgICAgICBoRm9yd2FyZEJ1dHRvblduZCA9IENyZWF0ZVdpbmRvdyhMIkJVVFRP TiIsIEwiPiIsIFdTX0NISUxEIHwgV1NfVklTSUJMRSAgfCBCU19URVhULCBDT05UUk9MQlVUVE9O X1dJRFRILCAwLCAwLCAwLCBoTWFpblduZCwgMCwgaEluc3QsIDApOworICAgICAgICBoVVJMQmFy V25kID0gQ3JlYXRlV2luZG93KEwiRURJVCIsIDAsIFdTX0NISUxEIHwgV1NfVklTSUJMRSB8IFdT X0JPUkRFUiB8IEVTX0xFRlQgfCBFU19BVVRPVlNDUk9MTCwgQ09OVFJPTEJVVFRPTl9XSURUSCAq IDIsIDAsIDAsIDAsIGhNYWluV25kLCAwLCBoSW5zdCwgMCk7CiAKICAgICAgICAgU2hvd1dpbmRv dyhoTWFpblduZCwgbkNtZFNob3cpOwogICAgICAgICBVcGRhdGVXaW5kb3coaE1haW5XbmQpOwog ICAgIH0KIAotI2lmIGRlZmluZWQgX01fQU1ENjQgfHwgZGVmaW5lZCBfV0lONjQKICAgICBEZWZF ZGl0UHJvYyA9IHJlaW50ZXJwcmV0X2Nhc3Q8V05EUFJPQz4oR2V0V2luZG93TG9uZ1B0cihoVVJM QmFyV25kLCBHV0xQX1dORFBST0MpKTsKLSAgICBTZXRXaW5kb3dMb25nUHRyKGhVUkxCYXJXbmQs IEdXTFBfV05EUFJPQywgcmVpbnRlcnByZXRfY2FzdDxMT05HX1BUUj4oTXlFZGl0UHJvYykpOwot I2Vsc2UKLSAgICBEZWZFZGl0UHJvYyA9IHJlaW50ZXJwcmV0X2Nhc3Q8V05EUFJPQz4oR2V0V2lu ZG93TG9uZyhoVVJMQmFyV25kLCBHV0xfV05EUFJPQykpOwotICAgIFNldFdpbmRvd0xvbmcoaFVS TEJhclduZCwgR1dMX1dORFBST0MsIHJlaW50ZXJwcmV0X2Nhc3Q8TE9OR19QVFI+KE15RWRpdFBy b2MpKTsKLSNlbmRpZgorICAgIERlZkJ1dHRvblByb2MgPSByZWludGVycHJldF9jYXN0PFdORFBS T0M+KEdldFdpbmRvd0xvbmdQdHIoaEJhY2tCdXR0b25XbmQsIEdXTFBfV05EUFJPQykpOworICAg IFNldFdpbmRvd0xvbmdQdHIoaFVSTEJhclduZCwgR1dMUF9XTkRQUk9DLCByZWludGVycHJldF9j YXN0PExPTkdfUFRSPihFZGl0UHJvYykpOworICAgIFNldFdpbmRvd0xvbmdQdHIoaEJhY2tCdXR0 b25XbmQsIEdXTFBfV05EUFJPQywgcmVpbnRlcnByZXRfY2FzdDxMT05HX1BUUj4oQmFja0J1dHRv blByb2MpKTsKKyAgICBTZXRXaW5kb3dMb25nUHRyKGhGb3J3YXJkQnV0dG9uV25kLCBHV0xQX1dO RFBST0MsIHJlaW50ZXJwcmV0X2Nhc3Q8TE9OR19QVFI+KEZvcndhcmRCdXR0b25Qcm9jKSk7CiAK ICAgICBTZXRGb2N1cyhoVVJMQmFyV25kKTsKIApAQCAtODY4LDI5ICs4NzMsNDggQEAgTFJFU1VM VCBDQUxMQkFDSyBXbmRQcm9jKEhXTkQgaFduZCwgVUlOVAogCiAjZGVmaW5lIE1BWF9VUkxfTEVO R1RIICAxMDI0CiAKLUxSRVNVTFQgQ0FMTEJBQ0sgTXlFZGl0UHJvYyhIV05EIGhEbGcsIFVJTlQg bWVzc2FnZSwgV1BBUkFNIHdQYXJhbSwgTFBBUkFNIGxQYXJhbSkKK0xSRVNVTFQgQ0FMTEJBQ0sg RWRpdFByb2MoSFdORCBoRGxnLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBs UGFyYW0pCiB7CiAgICAgc3dpdGNoIChtZXNzYWdlKSB7Ci0gICAgICAgIGNhc2UgV01fQ0hBUjoK LSAgICAgICAgICAgIGlmICh3UGFyYW0gPT0gMTMpIHsgLy8gRW50ZXIgS2V5Ci0gICAgICAgICAg ICAgICAgd2NoYXJfdCBzdHJQdHJbTUFYX1VSTF9MRU5HVEhdOwotICAgICAgICAgICAgICAgICoo KExQV09SRClzdHJQdHIpID0gTUFYX1VSTF9MRU5HVEg7IAotICAgICAgICAgICAgICAgIGludCBz dHJMZW4gPSBTZW5kTWVzc2FnZShoRGxnLCBFTV9HRVRMSU5FLCAwLCAoTFBBUkFNKXN0clB0cik7 Ci0KLSAgICAgICAgICAgICAgICBzdHJQdHJbc3RyTGVuXSA9IDA7Ci0gICAgICAgICAgICAgICAg X2JzdHJfdCBic3RyKHN0clB0cik7Ci0gICAgICAgICAgICAgICAgbG9hZFVSTChic3RyKTsKLQot ICAgICAgICAgICAgICAgIHJldHVybiAwOwotICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAg ICAgICAgcmV0dXJuIChMUkVTVUxUKUNhbGxXaW5kb3dQcm9jKChXTkRQUk9DKURlZkVkaXRQcm9j LGhEbGcsbWVzc2FnZSx3UGFyYW0sbFBhcmFtKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAg ICBkZWZhdWx0OgotICAgICAgICAgICAgIHJldHVybiAoTFJFU1VMVClDYWxsV2luZG93UHJvYygo V05EUFJPQylEZWZFZGl0UHJvYyxoRGxnLG1lc3NhZ2Usd1BhcmFtLGxQYXJhbSk7Ci0gICAgICAg IGJyZWFrOworICAgIGNhc2UgV01fQ0hBUjoKKyAgICAgICAgaWYgKHdQYXJhbSA9PSAxMykgeyAv LyBFbnRlciBLZXkKKyAgICAgICAgICAgIHdjaGFyX3Qgc3RyUHRyW01BWF9VUkxfTEVOR1RIXTsK KyAgICAgICAgICAgICooKExQV09SRClzdHJQdHIpID0gTUFYX1VSTF9MRU5HVEg7IAorICAgICAg ICAgICAgaW50IHN0ckxlbiA9IFNlbmRNZXNzYWdlKGhEbGcsIEVNX0dFVExJTkUsIDAsIChMUEFS QU0pc3RyUHRyKTsKKworICAgICAgICAgICAgc3RyUHRyW3N0ckxlbl0gPSAwOworICAgICAgICAg ICAgX2JzdHJfdCBic3RyKHN0clB0cik7CisgICAgICAgICAgICBsb2FkVVJMKGJzdHIpOworCisg ICAgICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgfSAKKyAgICAgICAgcmV0dXJuIChMUkVTVUxU KUNhbGxXaW5kb3dQcm9jKChXTkRQUk9DKURlZkVkaXRQcm9jLCBoRGxnLCBtZXNzYWdlLCB3UGFy YW0sIGxQYXJhbSk7CisgICAgZGVmYXVsdDoKKyAgICAgICAgcmV0dXJuIChMUkVTVUxUKUNhbGxX aW5kb3dQcm9jKChXTkRQUk9DKURlZkVkaXRQcm9jLCBoRGxnLCBtZXNzYWdlLCB3UGFyYW0sIGxQ YXJhbSk7CisgICAgfQorfQorCitMUkVTVUxUIENBTExCQUNLIEJhY2tCdXR0b25Qcm9jKEhXTkQg aERsZywgVUlOVCBtZXNzYWdlLCBXUEFSQU0gd1BhcmFtLCBMUEFSQU0gbFBhcmFtKQoreworICAg IEJPT0wgd2VudEJhY2sgPSBGQUxTRTsKKyAgICBzd2l0Y2ggKG1lc3NhZ2UpIHsKKyAgICBjYXNl IFdNX0xCVVRUT05VUDoKKyAgICAgICAgZ1dlYlZpZXctPmdvQmFjaygmd2VudEJhY2spOworICAg IGRlZmF1bHQ6CisgICAgICAgIHJldHVybiAoTFJFU1VMVClDYWxsV2luZG93UHJvYygoV05EUFJP QylEZWZCdXR0b25Qcm9jLCBoRGxnLCBtZXNzYWdlLCB3UGFyYW0sIGxQYXJhbSk7CiAgICAgfQog fQogCitMUkVTVUxUIENBTExCQUNLIEZvcndhcmRCdXR0b25Qcm9jKEhXTkQgaERsZywgVUlOVCBt ZXNzYWdlLCBXUEFSQU0gd1BhcmFtLCBMUEFSQU0gbFBhcmFtKQoreworICAgIEJPT0wgd2VudEZv cndhcmQgPSBGQUxTRTsKKyAgICBzd2l0Y2ggKG1lc3NhZ2UpIHsKKyAgICBjYXNlIFdNX0xCVVRU T05VUDoKKyAgICAgICAgZ1dlYlZpZXctPmdvRm9yd2FyZCgmd2VudEZvcndhcmQpOworICAgIGRl ZmF1bHQ6CisgICAgICAgIHJldHVybiAoTFJFU1VMVClDYWxsV2luZG93UHJvYygoV05EUFJPQylE ZWZCdXR0b25Qcm9jLCBoRGxnLCBtZXNzYWdlLCB3UGFyYW0sIGxQYXJhbSk7CisgICAgfQorfQog CiAvLyBNZXNzYWdlIGhhbmRsZXIgZm9yIGFib3V0IGJveC4KIElOVF9QVFIgQ0FMTEJBQ0sgQWJv dXQoSFdORCBoRGxnLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0p Cg== 211952 2013-09-17 16:34:23 -0700 2013-09-17 16:40:04 -0700 Patch bug-121212-20130917173430.patch text/plain 7146 alex.christensen SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1NjAwNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDEzLTA5LTE3ICBBbGV4IENocmlzdGVuc2VuICA8YWxleC5jaHJpc3RlbnNl bkBmbGV4c2ltLmNvbT4KKworICAgICAgICBBZGRlZCBiYWNrIGFuZCBmb3J3YXJkIGJ1dHRvbnMg dG8gV2luTGF1bmNoZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMjEyMTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFdpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLmNwcDoKKyAgICAgICAgKHJlc2l6ZVN1 YlZpZXdzKToKKyAgICAgICAgTW92ZSBuZXcgYmFjayBhbmQgZm9yd2FyZCBidXR0b25zIHRvIGNv cnJlY3QgcG9zaXRpb25zIGJlZm9yZSBVUkwgYmFyLgorICAgICAgICAoZGxsTGF1bmNoZXJFbnRy eVBvaW50KTogCisgICAgICAgIFN0b3JlIHRoZSBkZWZhdWx0IGJ1dHRvbiB3aW5kb3cgcHJvY2Vk dXJlIGFuZCByZXBsYWNlIHdpdGggbXkgYnV0dG9uIHByb2NlZHVyZXMuCisgICAgICAgIChFZGl0 UHJvYyk6IFVwZGF0ZWQgc3R5bGUgYW5kIHJlbmFtZWQgZnJvbSBNeUVkaXRQcm9jLgorICAgICAg ICAoQmFja0J1dHRvblByb2MpOiBBZGRlZC4KKyAgICAgICAgKEZvcndhcmRCdXR0b25Qcm9jKTog QWRkZWQuCisKIDIwMTMtMDktMTcgIE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+ CiAKICAgICAgICAgcnVuLWpzYy1zdHJlc3MtdGVzdHMgZmFpbHMgd2l0aCBydWJ5IHZlcnNpb24g MgpJbmRleDogVG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLmNwcAkocmV2aXNpb24gMTU2MDA0KQorKysg VG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yLDYg KzIsNyBAQAogICogQ29weXJpZ2h0IChDKSAyMDA2LCAyMDA4LCAyMDEzIEFwcGxlIENvbXB1dGVy LCBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDA5LCAyMDEx IEJyZW50IEZ1bGdoYW0uICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAy MDA5LCAyMDEwLCAyMDExIEFwcGNlbGVyYXRvciwgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor ICogQ29weXJpZ2h0IChDKSAyMDEzIEFsZXggQ2hyaXN0ZW5zZW4uIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTU2LDYgKzU3LDcgQEAKIAog I2RlZmluZSBNQVhfTE9BRFNUUklORyAxMDAKICNkZWZpbmUgVVJMQkFSX0hFSUdIVCAgMjQKKyNk ZWZpbmUgQ09OVFJPTEJVVFRPTl9XSURUSCAyNAogCiBzdGF0aWMgY29uc3QgaW50IG1heEhpc3Rv cnlTaXplID0gMTA7CiAKQEAgLTczLDcgKzc1LDEwIEBAIHR5cGVkZWYgX2NvbV9wdHJfdDxfY29t X0lJSUQ8SVdlYlZpZXdQcmkKIEhJTlNUQU5DRSBoSW5zdDsgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIC8vIGN1cnJlbnQgaW5zdGFuY2UKIEhXTkQgaE1haW5XbmQ7CiBIV05EIGhVUkxC YXJXbmQ7CitIV05EIGhCYWNrQnV0dG9uV25kOworSFdORCBoRm9yd2FyZEJ1dHRvblduZDsKIFdO RFBST0MgRGVmRWRpdFByb2MgPSAwOworV05EUFJPQyBEZWZCdXR0b25Qcm9jID0gMDsKIFdORFBS T0MgRGVmV2ViS2l0UHJvYyA9IDA7CiBJV2ViSW5zcGVjdG9yUHRyIGdJbnNwZWN0b3I7CiBJV2Vi Vmlld1B0ciBnV2ViVmlldzsKQEAgLTk5LDcgKzEwNCwxMCBAQCBib29sIHNfZnVsbERlc2t0b3Ag PSBmYWxzZTsKIEFUT00gICAgICAgICAgICAgICAgTXlSZWdpc3RlckNsYXNzKEhJTlNUQU5DRSBo SW5zdGFuY2UpOwogTFJFU1VMVCBDQUxMQkFDSyAgICBXbmRQcm9jKEhXTkQsIFVJTlQsIFdQQVJB TSwgTFBBUkFNKTsKIElOVF9QVFIgQ0FMTEJBQ0sgICAgQWJvdXQoSFdORCwgVUlOVCwgV1BBUkFN LCBMUEFSQU0pOwotTFJFU1VMVCBDQUxMQkFDSyAgICBNeUVkaXRQcm9jKEhXTkQsIFVJTlQsIFdQ QVJBTSwgTFBBUkFNKTsKK0xSRVNVTFQgQ0FMTEJBQ0sgICAgRWRpdFByb2MoSFdORCwgVUlOVCwg V1BBUkFNLCBMUEFSQU0pOworTFJFU1VMVCBDQUxMQkFDSyAgICBCYWNrQnV0dG9uUHJvYyhIV05E LCBVSU5ULCBXUEFSQU0sIExQQVJBTSk7CitMUkVTVUxUIENBTExCQUNLICAgIEZvcndhcmRCdXR0 b25Qcm9jKEhXTkQsIFVJTlQsIFdQQVJBTSwgTFBBUkFNKTsKK0xSRVNVTFQgQ0FMTEJBQ0sgICAg UmVsb2FkQnV0dG9uUHJvYyhIV05ELCBVSU5ULCBXUEFSQU0sIExQQVJBTSk7CiAKIHN0YXRpYyB2 b2lkIGxvYWRVUkwoQlNUUiB1cmxCU3RyKTsKIApAQCAtMzM2LDcgKzM0NCw5IEBAIHN0YXRpYyB2 b2lkIHJlc2l6ZVN1YlZpZXdzKCkKIAogICAgIFJFQ1QgcmNDbGllbnQ7CiAgICAgR2V0Q2xpZW50 UmVjdChoTWFpblduZCwgJnJjQ2xpZW50KTsKLSAgICBNb3ZlV2luZG93KGhVUkxCYXJXbmQsIDAs IDAsIHJjQ2xpZW50LnJpZ2h0LCBVUkxCQVJfSEVJR0hULCBUUlVFKTsKKyAgICBNb3ZlV2luZG93 KGhCYWNrQnV0dG9uV25kLCAwLCAwLCBDT05UUk9MQlVUVE9OX1dJRFRILCBVUkxCQVJfSEVJR0hU LCBUUlVFKTsKKyAgICBNb3ZlV2luZG93KGhGb3J3YXJkQnV0dG9uV25kLCBDT05UUk9MQlVUVE9O X1dJRFRILCAwLCBDT05UUk9MQlVUVE9OX1dJRFRILCBVUkxCQVJfSEVJR0hULCBUUlVFKTsKKyAg ICBNb3ZlV2luZG93KGhVUkxCYXJXbmQsIENPTlRST0xCVVRUT05fV0lEVEggKiAyLCAwLCByY0Ns aWVudC5yaWdodCwgVVJMQkFSX0hFSUdIVCwgVFJVRSk7CiAgICAgTW92ZVdpbmRvdyhnVmlld1dp bmRvdywgMCwgVVJMQkFSX0hFSUdIVCwgcmNDbGllbnQucmlnaHQsIHJjQ2xpZW50LmJvdHRvbSAt IFVSTEJBUl9IRUlHSFQsIFRSVUUpOwogfQogCkBAIC00NTcsMjQgKzQ2NywxOSBAQCBleHRlcm4g IkMiIF9fZGVjbHNwZWMoZGxsZXhwb3J0KSBpbnQgV0lOCiAgICAgICAgIGlmICghaE1haW5XbmQp CiAgICAgICAgICAgICByZXR1cm4gRkFMU0U7CiAKLSAgICAgICAgaFVSTEJhclduZCA9IENyZWF0 ZVdpbmRvdyhMIkVESVQiLCAwLAotICAgICAgICAgICAgICAgICAgICBXU19DSElMRCB8IFdTX1ZJ U0lCTEUgfCBXU19CT1JERVIgfCBFU19MRUZUIHwgRVNfQVVUT1ZTQ1JPTEwsIAotICAgICAgICAg ICAgICAgICAgICAwLCAwLCAwLCAwLAotICAgICAgICAgICAgICAgICAgICBoTWFpblduZCwKLSAg ICAgICAgICAgICAgICAgICAgMCwKLSAgICAgICAgICAgICAgICAgICAgaEluc3QsIDApOworICAg ICAgICBoQmFja0J1dHRvblduZCA9IENyZWF0ZVdpbmRvdyhMIkJVVFRPTiIsIEwiPCIsIFdTX0NI SUxEIHwgV1NfVklTSUJMRSAgfCBCU19URVhULCAwLCAwLCAwLCAwLCBoTWFpblduZCwgMCwgaElu c3QsIDApOworICAgICAgICBoRm9yd2FyZEJ1dHRvblduZCA9IENyZWF0ZVdpbmRvdyhMIkJVVFRP TiIsIEwiPiIsIFdTX0NISUxEIHwgV1NfVklTSUJMRSAgfCBCU19URVhULCBDT05UUk9MQlVUVE9O X1dJRFRILCAwLCAwLCAwLCBoTWFpblduZCwgMCwgaEluc3QsIDApOworICAgICAgICBoVVJMQmFy V25kID0gQ3JlYXRlV2luZG93KEwiRURJVCIsIDAsIFdTX0NISUxEIHwgV1NfVklTSUJMRSB8IFdT X0JPUkRFUiB8IEVTX0xFRlQgfCBFU19BVVRPVlNDUk9MTCwgQ09OVFJPTEJVVFRPTl9XSURUSCAq IDIsIDAsIDAsIDAsIGhNYWluV25kLCAwLCBoSW5zdCwgMCk7CiAKICAgICAgICAgU2hvd1dpbmRv dyhoTWFpblduZCwgbkNtZFNob3cpOwogICAgICAgICBVcGRhdGVXaW5kb3coaE1haW5XbmQpOwog ICAgIH0KIAotI2lmIGRlZmluZWQgX01fQU1ENjQgfHwgZGVmaW5lZCBfV0lONjQKICAgICBEZWZF ZGl0UHJvYyA9IHJlaW50ZXJwcmV0X2Nhc3Q8V05EUFJPQz4oR2V0V2luZG93TG9uZ1B0cihoVVJM QmFyV25kLCBHV0xQX1dORFBST0MpKTsKLSAgICBTZXRXaW5kb3dMb25nUHRyKGhVUkxCYXJXbmQs IEdXTFBfV05EUFJPQywgcmVpbnRlcnByZXRfY2FzdDxMT05HX1BUUj4oTXlFZGl0UHJvYykpOwot I2Vsc2UKLSAgICBEZWZFZGl0UHJvYyA9IHJlaW50ZXJwcmV0X2Nhc3Q8V05EUFJPQz4oR2V0V2lu ZG93TG9uZyhoVVJMQmFyV25kLCBHV0xfV05EUFJPQykpOwotICAgIFNldFdpbmRvd0xvbmcoaFVS TEJhclduZCwgR1dMX1dORFBST0MsIHJlaW50ZXJwcmV0X2Nhc3Q8TE9OR19QVFI+KE15RWRpdFBy b2MpKTsKLSNlbmRpZgorICAgIERlZkJ1dHRvblByb2MgPSByZWludGVycHJldF9jYXN0PFdORFBS T0M+KEdldFdpbmRvd0xvbmdQdHIoaEJhY2tCdXR0b25XbmQsIEdXTFBfV05EUFJPQykpOworICAg IFNldFdpbmRvd0xvbmdQdHIoaFVSTEJhclduZCwgR1dMUF9XTkRQUk9DLCByZWludGVycHJldF9j YXN0PExPTkdfUFRSPihFZGl0UHJvYykpOworICAgIFNldFdpbmRvd0xvbmdQdHIoaEJhY2tCdXR0 b25XbmQsIEdXTFBfV05EUFJPQywgcmVpbnRlcnByZXRfY2FzdDxMT05HX1BUUj4oQmFja0J1dHRv blByb2MpKTsKKyAgICBTZXRXaW5kb3dMb25nUHRyKGhGb3J3YXJkQnV0dG9uV25kLCBHV0xQX1dO RFBST0MsIHJlaW50ZXJwcmV0X2Nhc3Q8TE9OR19QVFI+KEZvcndhcmRCdXR0b25Qcm9jKSk7CiAK ICAgICBTZXRGb2N1cyhoVVJMQmFyV25kKTsKIApAQCAtODY4LDI5ICs4NzMsNDcgQEAgTFJFU1VM VCBDQUxMQkFDSyBXbmRQcm9jKEhXTkQgaFduZCwgVUlOVAogCiAjZGVmaW5lIE1BWF9VUkxfTEVO R1RIICAxMDI0CiAKLUxSRVNVTFQgQ0FMTEJBQ0sgTXlFZGl0UHJvYyhIV05EIGhEbGcsIFVJTlQg bWVzc2FnZSwgV1BBUkFNIHdQYXJhbSwgTFBBUkFNIGxQYXJhbSkKK0xSRVNVTFQgQ0FMTEJBQ0sg RWRpdFByb2MoSFdORCBoRGxnLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBs UGFyYW0pCiB7CiAgICAgc3dpdGNoIChtZXNzYWdlKSB7Ci0gICAgICAgIGNhc2UgV01fQ0hBUjoK LSAgICAgICAgICAgIGlmICh3UGFyYW0gPT0gMTMpIHsgLy8gRW50ZXIgS2V5Ci0gICAgICAgICAg ICAgICAgd2NoYXJfdCBzdHJQdHJbTUFYX1VSTF9MRU5HVEhdOwotICAgICAgICAgICAgICAgICoo KExQV09SRClzdHJQdHIpID0gTUFYX1VSTF9MRU5HVEg7IAotICAgICAgICAgICAgICAgIGludCBz dHJMZW4gPSBTZW5kTWVzc2FnZShoRGxnLCBFTV9HRVRMSU5FLCAwLCAoTFBBUkFNKXN0clB0cik7 Ci0KLSAgICAgICAgICAgICAgICBzdHJQdHJbc3RyTGVuXSA9IDA7Ci0gICAgICAgICAgICAgICAg X2JzdHJfdCBic3RyKHN0clB0cik7Ci0gICAgICAgICAgICAgICAgbG9hZFVSTChic3RyKTsKLQot ICAgICAgICAgICAgICAgIHJldHVybiAwOwotICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAg ICAgICAgcmV0dXJuIChMUkVTVUxUKUNhbGxXaW5kb3dQcm9jKChXTkRQUk9DKURlZkVkaXRQcm9j LGhEbGcsbWVzc2FnZSx3UGFyYW0sbFBhcmFtKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAg ICBkZWZhdWx0OgotICAgICAgICAgICAgIHJldHVybiAoTFJFU1VMVClDYWxsV2luZG93UHJvYygo V05EUFJPQylEZWZFZGl0UHJvYyxoRGxnLG1lc3NhZ2Usd1BhcmFtLGxQYXJhbSk7Ci0gICAgICAg IGJyZWFrOworICAgIGNhc2UgV01fQ0hBUjoKKyAgICAgICAgaWYgKHdQYXJhbSA9PSAxMykgeyAv LyBFbnRlciBLZXkKKyAgICAgICAgICAgIHdjaGFyX3Qgc3RyUHRyW01BWF9VUkxfTEVOR1RIXTsK KyAgICAgICAgICAgICooKExQV09SRClzdHJQdHIpID0gTUFYX1VSTF9MRU5HVEg7IAorICAgICAg ICAgICAgaW50IHN0ckxlbiA9IFNlbmRNZXNzYWdlKGhEbGcsIEVNX0dFVExJTkUsIDAsIChMUEFS QU0pc3RyUHRyKTsKKworICAgICAgICAgICAgc3RyUHRyW3N0ckxlbl0gPSAwOworICAgICAgICAg ICAgX2JzdHJfdCBic3RyKHN0clB0cik7CisgICAgICAgICAgICBsb2FkVVJMKGJzdHIpOworCisg ICAgICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgfSAKKyAgICBkZWZhdWx0OgorICAgICAgICBy ZXR1cm4gKExSRVNVTFQpQ2FsbFdpbmRvd1Byb2MoKFdORFBST0MpRGVmRWRpdFByb2MsIGhEbGcs IG1lc3NhZ2UsIHdQYXJhbSwgbFBhcmFtKTsKICAgICB9CiB9CiAKK0xSRVNVTFQgQ0FMTEJBQ0sg QmFja0J1dHRvblByb2MoSFdORCBoRGxnLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQ QVJBTSBsUGFyYW0pCit7CisgICAgQk9PTCB3ZW50QmFjayA9IEZBTFNFOworICAgIHN3aXRjaCAo bWVzc2FnZSkgeworICAgIGNhc2UgV01fTEJVVFRPTlVQOgorICAgICAgICBnV2ViVmlldy0+Z29C YWNrKCZ3ZW50QmFjayk7CisgICAgZGVmYXVsdDoKKyAgICAgICAgcmV0dXJuIChMUkVTVUxUKUNh bGxXaW5kb3dQcm9jKChXTkRQUk9DKURlZkJ1dHRvblByb2MsIGhEbGcsIG1lc3NhZ2UsIHdQYXJh bSwgbFBhcmFtKTsKKyAgICB9Cit9CisKK0xSRVNVTFQgQ0FMTEJBQ0sgRm9yd2FyZEJ1dHRvblBy b2MoSFdORCBoRGxnLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0p Cit7CisgICAgQk9PTCB3ZW50Rm9yd2FyZCA9IEZBTFNFOworICAgIHN3aXRjaCAobWVzc2FnZSkg eworICAgIGNhc2UgV01fTEJVVFRPTlVQOgorICAgICAgICBnV2ViVmlldy0+Z29Gb3J3YXJkKCZ3 ZW50Rm9yd2FyZCk7CisgICAgZGVmYXVsdDoKKyAgICAgICAgcmV0dXJuIChMUkVTVUxUKUNhbGxX aW5kb3dQcm9jKChXTkRQUk9DKURlZkJ1dHRvblByb2MsIGhEbGcsIG1lc3NhZ2UsIHdQYXJhbSwg bFBhcmFtKTsKKyAgICB9Cit9CiAKIC8vIE1lc3NhZ2UgaGFuZGxlciBmb3IgYWJvdXQgYm94Lgog SU5UX1BUUiBDQUxMQkFDSyBBYm91dChIV05EIGhEbGcsIFVJTlQgbWVzc2FnZSwgV1BBUkFNIHdQ YXJhbSwgTFBBUkFNIGxQYXJhbSkK 211953 2013-09-17 16:40:09 -0700 2013-09-17 18:09:04 -0700 Patch bug-121212-20130917174016.patch text/plain 7092 alex.christensen SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1NjAwNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDEzLTA5LTE3ICBBbGV4IENocmlzdGVuc2VuICA8YWxleC5jaHJpc3RlbnNl bkBmbGV4c2ltLmNvbT4KKworICAgICAgICBBZGRlZCBiYWNrIGFuZCBmb3J3YXJkIGJ1dHRvbnMg dG8gV2luTGF1bmNoZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMjEyMTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFdpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLmNwcDoKKyAgICAgICAgKHJlc2l6ZVN1 YlZpZXdzKToKKyAgICAgICAgTW92ZSBuZXcgYmFjayBhbmQgZm9yd2FyZCBidXR0b25zIHRvIGNv cnJlY3QgcG9zaXRpb25zIGJlZm9yZSBVUkwgYmFyLgorICAgICAgICAoZGxsTGF1bmNoZXJFbnRy eVBvaW50KTogCisgICAgICAgIFN0b3JlIHRoZSBkZWZhdWx0IGJ1dHRvbiB3aW5kb3cgcHJvY2Vk dXJlIGFuZCByZXBsYWNlIHdpdGggbXkgYnV0dG9uIHByb2NlZHVyZXMuCisgICAgICAgIChFZGl0 UHJvYyk6IFVwZGF0ZWQgc3R5bGUgYW5kIHJlbmFtZWQgZnJvbSBNeUVkaXRQcm9jLgorICAgICAg ICAoQmFja0J1dHRvblByb2MpOiBBZGRlZC4KKyAgICAgICAgKEZvcndhcmRCdXR0b25Qcm9jKTog QWRkZWQuCisKIDIwMTMtMDktMTcgIE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+ CiAKICAgICAgICAgcnVuLWpzYy1zdHJlc3MtdGVzdHMgZmFpbHMgd2l0aCBydWJ5IHZlcnNpb24g MgpJbmRleDogVG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLmNwcAkocmV2aXNpb24gMTU2MDA0KQorKysg VG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yLDYg KzIsNyBAQAogICogQ29weXJpZ2h0IChDKSAyMDA2LCAyMDA4LCAyMDEzIEFwcGxlIENvbXB1dGVy LCBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDA5LCAyMDEx IEJyZW50IEZ1bGdoYW0uICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAy MDA5LCAyMDEwLCAyMDExIEFwcGNlbGVyYXRvciwgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor ICogQ29weXJpZ2h0IChDKSAyMDEzIEFsZXggQ2hyaXN0ZW5zZW4uIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTU2LDYgKzU3LDcgQEAKIAog I2RlZmluZSBNQVhfTE9BRFNUUklORyAxMDAKICNkZWZpbmUgVVJMQkFSX0hFSUdIVCAgMjQKKyNk ZWZpbmUgQ09OVFJPTEJVVFRPTl9XSURUSCAyNAogCiBzdGF0aWMgY29uc3QgaW50IG1heEhpc3Rv cnlTaXplID0gMTA7CiAKQEAgLTczLDcgKzc1LDEwIEBAIHR5cGVkZWYgX2NvbV9wdHJfdDxfY29t X0lJSUQ8SVdlYlZpZXdQcmkKIEhJTlNUQU5DRSBoSW5zdDsgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIC8vIGN1cnJlbnQgaW5zdGFuY2UKIEhXTkQgaE1haW5XbmQ7CiBIV05EIGhVUkxC YXJXbmQ7CitIV05EIGhCYWNrQnV0dG9uV25kOworSFdORCBoRm9yd2FyZEJ1dHRvblduZDsKIFdO RFBST0MgRGVmRWRpdFByb2MgPSAwOworV05EUFJPQyBEZWZCdXR0b25Qcm9jID0gMDsKIFdORFBS T0MgRGVmV2ViS2l0UHJvYyA9IDA7CiBJV2ViSW5zcGVjdG9yUHRyIGdJbnNwZWN0b3I7CiBJV2Vi Vmlld1B0ciBnV2ViVmlldzsKQEAgLTk5LDcgKzEwNCwxMCBAQCBib29sIHNfZnVsbERlc2t0b3Ag PSBmYWxzZTsKIEFUT00gICAgICAgICAgICAgICAgTXlSZWdpc3RlckNsYXNzKEhJTlNUQU5DRSBo SW5zdGFuY2UpOwogTFJFU1VMVCBDQUxMQkFDSyAgICBXbmRQcm9jKEhXTkQsIFVJTlQsIFdQQVJB TSwgTFBBUkFNKTsKIElOVF9QVFIgQ0FMTEJBQ0sgICAgQWJvdXQoSFdORCwgVUlOVCwgV1BBUkFN LCBMUEFSQU0pOwotTFJFU1VMVCBDQUxMQkFDSyAgICBNeUVkaXRQcm9jKEhXTkQsIFVJTlQsIFdQ QVJBTSwgTFBBUkFNKTsKK0xSRVNVTFQgQ0FMTEJBQ0sgICAgRWRpdFByb2MoSFdORCwgVUlOVCwg V1BBUkFNLCBMUEFSQU0pOworTFJFU1VMVCBDQUxMQkFDSyAgICBCYWNrQnV0dG9uUHJvYyhIV05E LCBVSU5ULCBXUEFSQU0sIExQQVJBTSk7CitMUkVTVUxUIENBTExCQUNLICAgIEZvcndhcmRCdXR0 b25Qcm9jKEhXTkQsIFVJTlQsIFdQQVJBTSwgTFBBUkFNKTsKK0xSRVNVTFQgQ0FMTEJBQ0sgICAg UmVsb2FkQnV0dG9uUHJvYyhIV05ELCBVSU5ULCBXUEFSQU0sIExQQVJBTSk7CiAKIHN0YXRpYyB2 b2lkIGxvYWRVUkwoQlNUUiB1cmxCU3RyKTsKIApAQCAtMzM2LDcgKzM0NCw5IEBAIHN0YXRpYyB2 b2lkIHJlc2l6ZVN1YlZpZXdzKCkKIAogICAgIFJFQ1QgcmNDbGllbnQ7CiAgICAgR2V0Q2xpZW50 UmVjdChoTWFpblduZCwgJnJjQ2xpZW50KTsKLSAgICBNb3ZlV2luZG93KGhVUkxCYXJXbmQsIDAs IDAsIHJjQ2xpZW50LnJpZ2h0LCBVUkxCQVJfSEVJR0hULCBUUlVFKTsKKyAgICBNb3ZlV2luZG93 KGhCYWNrQnV0dG9uV25kLCAwLCAwLCBDT05UUk9MQlVUVE9OX1dJRFRILCBVUkxCQVJfSEVJR0hU LCBUUlVFKTsKKyAgICBNb3ZlV2luZG93KGhGb3J3YXJkQnV0dG9uV25kLCBDT05UUk9MQlVUVE9O X1dJRFRILCAwLCBDT05UUk9MQlVUVE9OX1dJRFRILCBVUkxCQVJfSEVJR0hULCBUUlVFKTsKKyAg ICBNb3ZlV2luZG93KGhVUkxCYXJXbmQsIENPTlRST0xCVVRUT05fV0lEVEggKiAyLCAwLCByY0Ns aWVudC5yaWdodCwgVVJMQkFSX0hFSUdIVCwgVFJVRSk7CiAgICAgTW92ZVdpbmRvdyhnVmlld1dp bmRvdywgMCwgVVJMQkFSX0hFSUdIVCwgcmNDbGllbnQucmlnaHQsIHJjQ2xpZW50LmJvdHRvbSAt IFVSTEJBUl9IRUlHSFQsIFRSVUUpOwogfQogCkBAIC00NTcsMjQgKzQ2NywxOSBAQCBleHRlcm4g IkMiIF9fZGVjbHNwZWMoZGxsZXhwb3J0KSBpbnQgV0lOCiAgICAgICAgIGlmICghaE1haW5XbmQp CiAgICAgICAgICAgICByZXR1cm4gRkFMU0U7CiAKLSAgICAgICAgaFVSTEJhclduZCA9IENyZWF0 ZVdpbmRvdyhMIkVESVQiLCAwLAotICAgICAgICAgICAgICAgICAgICBXU19DSElMRCB8IFdTX1ZJ U0lCTEUgfCBXU19CT1JERVIgfCBFU19MRUZUIHwgRVNfQVVUT1ZTQ1JPTEwsIAotICAgICAgICAg ICAgICAgICAgICAwLCAwLCAwLCAwLAotICAgICAgICAgICAgICAgICAgICBoTWFpblduZCwKLSAg ICAgICAgICAgICAgICAgICAgMCwKLSAgICAgICAgICAgICAgICAgICAgaEluc3QsIDApOworICAg ICAgICBoQmFja0J1dHRvblduZCA9IENyZWF0ZVdpbmRvdyhMIkJVVFRPTiIsIEwiPCIsIFdTX0NI SUxEIHwgV1NfVklTSUJMRSAgfCBCU19URVhULCAwLCAwLCAwLCAwLCBoTWFpblduZCwgMCwgaElu c3QsIDApOworICAgICAgICBoRm9yd2FyZEJ1dHRvblduZCA9IENyZWF0ZVdpbmRvdyhMIkJVVFRP TiIsIEwiPiIsIFdTX0NISUxEIHwgV1NfVklTSUJMRSAgfCBCU19URVhULCBDT05UUk9MQlVUVE9O X1dJRFRILCAwLCAwLCAwLCBoTWFpblduZCwgMCwgaEluc3QsIDApOworICAgICAgICBoVVJMQmFy V25kID0gQ3JlYXRlV2luZG93KEwiRURJVCIsIDAsIFdTX0NISUxEIHwgV1NfVklTSUJMRSB8IFdT X0JPUkRFUiB8IEVTX0xFRlQgfCBFU19BVVRPVlNDUk9MTCwgQ09OVFJPTEJVVFRPTl9XSURUSCAq IDIsIDAsIDAsIDAsIGhNYWluV25kLCAwLCBoSW5zdCwgMCk7CiAKICAgICAgICAgU2hvd1dpbmRv dyhoTWFpblduZCwgbkNtZFNob3cpOwogICAgICAgICBVcGRhdGVXaW5kb3coaE1haW5XbmQpOwog ICAgIH0KIAotI2lmIGRlZmluZWQgX01fQU1ENjQgfHwgZGVmaW5lZCBfV0lONjQKICAgICBEZWZF ZGl0UHJvYyA9IHJlaW50ZXJwcmV0X2Nhc3Q8V05EUFJPQz4oR2V0V2luZG93TG9uZ1B0cihoVVJM QmFyV25kLCBHV0xQX1dORFBST0MpKTsKLSAgICBTZXRXaW5kb3dMb25nUHRyKGhVUkxCYXJXbmQs IEdXTFBfV05EUFJPQywgcmVpbnRlcnByZXRfY2FzdDxMT05HX1BUUj4oTXlFZGl0UHJvYykpOwot I2Vsc2UKLSAgICBEZWZFZGl0UHJvYyA9IHJlaW50ZXJwcmV0X2Nhc3Q8V05EUFJPQz4oR2V0V2lu ZG93TG9uZyhoVVJMQmFyV25kLCBHV0xfV05EUFJPQykpOwotICAgIFNldFdpbmRvd0xvbmcoaFVS TEJhclduZCwgR1dMX1dORFBST0MsIHJlaW50ZXJwcmV0X2Nhc3Q8TE9OR19QVFI+KE15RWRpdFBy b2MpKTsKLSNlbmRpZgorICAgIERlZkJ1dHRvblByb2MgPSByZWludGVycHJldF9jYXN0PFdORFBS T0M+KEdldFdpbmRvd0xvbmdQdHIoaEJhY2tCdXR0b25XbmQsIEdXTFBfV05EUFJPQykpOworICAg IFNldFdpbmRvd0xvbmdQdHIoaFVSTEJhclduZCwgR1dMUF9XTkRQUk9DLCByZWludGVycHJldF9j YXN0PExPTkdfUFRSPihFZGl0UHJvYykpOworICAgIFNldFdpbmRvd0xvbmdQdHIoaEJhY2tCdXR0 b25XbmQsIEdXTFBfV05EUFJPQywgcmVpbnRlcnByZXRfY2FzdDxMT05HX1BUUj4oQmFja0J1dHRv blByb2MpKTsKKyAgICBTZXRXaW5kb3dMb25nUHRyKGhGb3J3YXJkQnV0dG9uV25kLCBHV0xQX1dO RFBST0MsIHJlaW50ZXJwcmV0X2Nhc3Q8TE9OR19QVFI+KEZvcndhcmRCdXR0b25Qcm9jKSk7CiAK ICAgICBTZXRGb2N1cyhoVVJMQmFyV25kKTsKIApAQCAtODY4LDI5ICs4NzMsNDcgQEAgTFJFU1VM VCBDQUxMQkFDSyBXbmRQcm9jKEhXTkQgaFduZCwgVUlOVAogCiAjZGVmaW5lIE1BWF9VUkxfTEVO R1RIICAxMDI0CiAKLUxSRVNVTFQgQ0FMTEJBQ0sgTXlFZGl0UHJvYyhIV05EIGhEbGcsIFVJTlQg bWVzc2FnZSwgV1BBUkFNIHdQYXJhbSwgTFBBUkFNIGxQYXJhbSkKK0xSRVNVTFQgQ0FMTEJBQ0sg RWRpdFByb2MoSFdORCBoRGxnLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBs UGFyYW0pCiB7CiAgICAgc3dpdGNoIChtZXNzYWdlKSB7Ci0gICAgICAgIGNhc2UgV01fQ0hBUjoK LSAgICAgICAgICAgIGlmICh3UGFyYW0gPT0gMTMpIHsgLy8gRW50ZXIgS2V5Ci0gICAgICAgICAg ICAgICAgd2NoYXJfdCBzdHJQdHJbTUFYX1VSTF9MRU5HVEhdOwotICAgICAgICAgICAgICAgICoo KExQV09SRClzdHJQdHIpID0gTUFYX1VSTF9MRU5HVEg7IAotICAgICAgICAgICAgICAgIGludCBz dHJMZW4gPSBTZW5kTWVzc2FnZShoRGxnLCBFTV9HRVRMSU5FLCAwLCAoTFBBUkFNKXN0clB0cik7 Ci0KLSAgICAgICAgICAgICAgICBzdHJQdHJbc3RyTGVuXSA9IDA7Ci0gICAgICAgICAgICAgICAg X2JzdHJfdCBic3RyKHN0clB0cik7Ci0gICAgICAgICAgICAgICAgbG9hZFVSTChic3RyKTsKLQot ICAgICAgICAgICAgICAgIHJldHVybiAwOwotICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAg ICAgICAgcmV0dXJuIChMUkVTVUxUKUNhbGxXaW5kb3dQcm9jKChXTkRQUk9DKURlZkVkaXRQcm9j LGhEbGcsbWVzc2FnZSx3UGFyYW0sbFBhcmFtKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAg ICBkZWZhdWx0OgotICAgICAgICAgICAgIHJldHVybiAoTFJFU1VMVClDYWxsV2luZG93UHJvYygo V05EUFJPQylEZWZFZGl0UHJvYyxoRGxnLG1lc3NhZ2Usd1BhcmFtLGxQYXJhbSk7Ci0gICAgICAg IGJyZWFrOworICAgIGNhc2UgV01fQ0hBUjoKKyAgICAgICAgaWYgKHdQYXJhbSA9PSAxMykgeyAv LyBFbnRlciBLZXkKKyAgICAgICAgICAgIHdjaGFyX3Qgc3RyUHRyW01BWF9VUkxfTEVOR1RIXTsK KyAgICAgICAgICAgICooKExQV09SRClzdHJQdHIpID0gTUFYX1VSTF9MRU5HVEg7IAorICAgICAg ICAgICAgaW50IHN0ckxlbiA9IFNlbmRNZXNzYWdlKGhEbGcsIEVNX0dFVExJTkUsIDAsIChMUEFS QU0pc3RyUHRyKTsKKworICAgICAgICAgICAgc3RyUHRyW3N0ckxlbl0gPSAwOworICAgICAgICAg ICAgX2JzdHJfdCBic3RyKHN0clB0cik7CisgICAgICAgICAgICBsb2FkVVJMKGJzdHIpOworCisg ICAgICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgfSAKKyAgICBkZWZhdWx0OgorICAgICAgICBy ZXR1cm4gQ2FsbFdpbmRvd1Byb2MoRGVmRWRpdFByb2MsIGhEbGcsIG1lc3NhZ2UsIHdQYXJhbSwg bFBhcmFtKTsKICAgICB9CiB9CiAKK0xSRVNVTFQgQ0FMTEJBQ0sgQmFja0J1dHRvblByb2MoSFdO RCBoRGxnLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pCit7Cisg ICAgQk9PTCB3ZW50QmFjayA9IEZBTFNFOworICAgIHN3aXRjaCAobWVzc2FnZSkgeworICAgIGNh c2UgV01fTEJVVFRPTlVQOgorICAgICAgICBnV2ViVmlldy0+Z29CYWNrKCZ3ZW50QmFjayk7Cisg ICAgZGVmYXVsdDoKKyAgICAgICAgcmV0dXJuIENhbGxXaW5kb3dQcm9jKERlZkJ1dHRvblByb2Ms IGhEbGcsIG1lc3NhZ2UsIHdQYXJhbSwgbFBhcmFtKTsKKyAgICB9Cit9CisKK0xSRVNVTFQgQ0FM TEJBQ0sgRm9yd2FyZEJ1dHRvblByb2MoSFdORCBoRGxnLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3 UGFyYW0sIExQQVJBTSBsUGFyYW0pCit7CisgICAgQk9PTCB3ZW50Rm9yd2FyZCA9IEZBTFNFOwor ICAgIHN3aXRjaCAobWVzc2FnZSkgeworICAgIGNhc2UgV01fTEJVVFRPTlVQOgorICAgICAgICBn V2ViVmlldy0+Z29Gb3J3YXJkKCZ3ZW50Rm9yd2FyZCk7CisgICAgZGVmYXVsdDoKKyAgICAgICAg cmV0dXJuIENhbGxXaW5kb3dQcm9jKERlZkJ1dHRvblByb2MsIGhEbGcsIG1lc3NhZ2UsIHdQYXJh bSwgbFBhcmFtKTsKKyAgICB9Cit9CiAKIC8vIE1lc3NhZ2UgaGFuZGxlciBmb3IgYWJvdXQgYm94 LgogSU5UX1BUUiBDQUxMQkFDSyBBYm91dChIV05EIGhEbGcsIFVJTlQgbWVzc2FnZSwgV1BBUkFN IHdQYXJhbSwgTFBBUkFNIGxQYXJhbSkK