136564 2014-09-04 19:38:43 -0700 Use tracking areas instead of (SPI) mouse moved notifications, and follow flags changes with an event monitor 2021-07-29 13:26:24 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=16271 P2 Normal --- 1 mjs mjs commit-queue dbates mitz oldest_to_newest 1033394 0 mjs 2014-09-04 19:38:43 -0700 Use tracking areas instead of (SPI) mouse moved notifications, and follow flags changes with an event monitor 1033396 1 237671 mjs 2014-09-04 19:49:10 -0700 Created attachment 237671 Patch 1033397 2 commit-queue 2014-09-04 19:50:43 -0700 Attachment 237671 did not pass style-queue: ERROR: Source/WebKit/mac/WebView/WebHTMLView.mm:1780: Multi line control clauses should use braces. [whitespace/braces] [4] ERROR: Source/WebKit/mac/WebView/WebHTMLView.mm:4216: Multi line control clauses should use braces. [whitespace/braces] [4] Total errors found: 2 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1033418 3 237671 mitz 2014-09-05 00:51:14 -0700 Comment on attachment 237671 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=237671&action=review > Source/WebKit/mac/ChangeLog:13 > + * WebKit.order: Remove reference to obsolete call. There’s no need to update this file. > Source/WebKit/mac/WebView/WebHTMLView.mm:617 > + id _flagsChangedEventMonitor; Might be best to be consistent with the majority of ivars in this class and remove the underscore. > Source/WebKit/mac/WebView/WebHTMLView.mm:1001 > + NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSMouseMoved location:[[flagsChangedEvent window] mouseLocationOutsideOfEventStream] > + modifierFlags:[flagsChangedEvent modifierFlags] timestamp:[flagsChangedEvent timestamp] windowNumber:[flagsChangedEvent windowNumber] > + context:[flagsChangedEvent context] eventNumber:0 clickCount:0 pressure:0]; > + > + // Pretend it's a mouse move. > + [self mouseMoved:fakeEvent]; This code is just moving around, but if you wanted you could rewrite it with dot syntax for property access and remove the not-so-helpful comment. > Source/WebKit/mac/WebView/WebHTMLView.mm:3152 > + _private->_flagsChangedEventMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSFlagsChangedMask handler:^(NSEvent *flagsChangedEvent) > + { The opening brace for a block goes on the same line as the ^ 1033420 4 mjs 2014-09-05 01:01:48 -0700 Committed r173309: <http://trac.webkit.org/changeset/173309> 1033421 5 mjs 2014-09-05 01:07:04 -0700 Landed with all suggested changes (except that I left in the removal from WebKit.order; I know it won't make any difference to the code but it makes it more convenient to not get false-positive search hits for removed symbols). 1033490 6 dbates 2014-09-05 11:16:51 -0700 Committed iOS build fix in <http://trac.webkit.org/changeset/173315>. 1033496 7 dbates 2014-09-05 11:33:58 -0700 Committed additional iOS build fixes in <http://trac.webkit.org/changeset/173316> and <http://trac.webkit.org/changeset/173317>. 237671 2014-09-04 19:49:10 -0700 2014-09-05 00:51:14 -0700 Patch bug-136564-20140904194904.patch text/plain 16343 mjs SW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MzMwNCkKKysrIFNvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ2IEBACisyMDE0LTA5LTA0 ICBNYWNpZWogU3RhY2hvd2lhayAgPG1qc0BhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIHRyYWNr aW5nIGFyZWFzIGluc3RlYWQgb2YgKFNQSSkgbW91c2UgbW92ZWQgbm90aWZpY2F0aW9ucywgYW5k IGZvbGxvdyBmbGFncyBjaGFuZ2VzIHdpdGggYW4gZXZlbnQgbW9uaXRvcgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2NTY0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBXZWJLaXQxIGRlcGVu ZGVkIG9uIG1vdXNlIG1vdmVkIGV2ZW50IG5vdGlmaWNhdGlvbnMgdG8gdHJhY2sgbW91c2UKKyAg ICAgICAgbW92ZXMsIGFuZCBvbiBiZWluZyBzcGVjaWFsbHkgY2FsbGVkIGJ5IFNhZmFyaSB0byB0 cmFjayBmbGFncworICAgICAgICBjaGFuZ2VzLiBXZWJLaXQyIGRvZXMgYm90aCB0aGVzZSB0aGlu Z3MgYmV0dGVyIC0gaXQgdXNlcyBhIHRyYWNraW5nIGFyZWEKKyAgICAgICAgYW5kIGV2ZW50IG1v bml0b3JzLiBDb3B5IHRob3NlIGFwcHJvYWNoZXMuCisKKyAgICAgICAgKiBXZWJLaXQub3JkZXI6 IFJlbW92ZSByZWZlcmVuY2UgdG8gb2Jzb2xldGUgY2FsbC4KKyAgICAgICAgKiBXZWJWaWV3L1dl YkhUTUxWaWV3Lm1tOgorICAgICAgICAoLVtXZWJIVE1MVmlld1ByaXZhdGUgZGVhbGxvY10pOiBO byBuZWVkIHRvIGRlYWxsb2NhdGUgdHJhY2tpbmcKKyAgICAgICAgYXJlYSwgc2luY2Ugd2Ugbm93 IGp1c3QgYWx3YXlzIGhhdmUgb25lLgorICAgICAgICAoLVtXZWJIVE1MVmlld1ByaXZhdGUgY2xl YXJdKTogZGl0dG8KKyAgICAgICAgKC1bV2ViSFRNTFZpZXcgX3Bvc3RGYWtlTW91c2VNb3ZlZEV2 ZW50Rm9yRmxhZ3NDaGFuZ2VkRXZlbnQ6XSk6CisgICAgICAgIE5ldyBtZXRob2QgdGhhdCBwb3N0 cyBhIGZha2UgbW91c2UgbW92ZSBldmVudCBpbiByZXNwb25zZSB0bworICAgICAgICBhIGZsYWdz IGNoYW5nZSBldmVudCwgZm9yIHVzZSBieSB0aGUgZXZlbnQgbW9uaXRvci4KKyAgICAgICAgKCtb V2ViSFRNTFZpZXcgX3Bvc3RGbGFnc0NoYW5nZWRFdmVudDpdKTogRW1wdHkgdGhpcyBvbGQgY2Fs bCwKKyAgICAgICAgc3RpbGwga2VwdCBhcm91bmQgZm9yIGJlbmVmaXQgb2Ygb2xkZXIgU2FmYXJp LgorICAgICAgICAoLVtXZWJIVE1MVmlldyBfdXBkYXRlTW91c2VvdmVyV2l0aEV2ZW50Ol0pOiBI YW5kbGUgRGFzaGJvYXJkJ3MKKyAgICAgICAgc3BlY2lhbCBtb3VzZW92ZXIgbW9kZSAocHJldmlv dXNseSBoYW5kbGVkIGluIGEgd2VpcmQgd2F5KS4KKyAgICAgICAgKC1bV2ViSFRNTFZpZXcgY2xv c2VdKTogTm8gbW9yZSBuZWVkIHRvIG1lc3Mgd2l0aCBtb3VzZSBtb3ZlZCBvYnNlcnZlci4KKyAg ICAgICAgKC1bV2ViSFRNTFZpZXcgdmlld1dpbGxNb3ZlVG9XaW5kb3c6XSk6IGRpdHRvCisgICAg ICAgICgtW1dlYkhUTUxWaWV3IHZpZXdEaWRNb3ZlVG9XaW5kb3ddKTogZGl0dG87IGJ1dCBub3cg aG9vayB1cCBhIGZsYWdzCisgICAgICAgIGNoYW5nZWQgbW9uaXRvci4KKyAgICAgICAgKC1bV2Vi SFRNTFZpZXcgd2luZG93RGlkQmVjb21lS2V5Ol0pOiBObyBuZWVkIHRvIGhhbmRsZSBub24ta2V5 IHdpbmRvdworICAgICAgICB0cmFja2luZyBhcmVhIG9yIG1vdXNlIG1vdmVkIG9ic2VydmVyLgor ICAgICAgICAoLVtXZWJIVE1MVmlldyB3aW5kb3dEaWRSZXNpZ25LZXk6XSk6IGRpdHRvCisgICAg ICAgICgtW1dlYkhUTUxWaWV3IHdpbmRvd1dpbGxPcmRlck9uU2NyZWVuOl0pOiBObyBuZWVkIHRv IG1lc3Mgd2l0aCBtb3VzZQorICAgICAgICBtb3ZlZCBvYnNlcnZlci4KKyAgICAgICAgKC1bV2Vi SFRNTFZpZXcgd2luZG93V2lsbE9yZGVyT2ZmU2NyZWVuOl0pOiBkaXR0bworICAgICAgICAoLVtX ZWJIVE1MVmlldyBtb3VzZU1vdmVkOl0pOiBDb252ZXJ0ZWQgZnJvbSB0aGUgb2xkIG1vdXNlTW92 ZWROb3RpZmljYXRpb246CisgICAgICAgICgtW1dlYkhUTUxWaWV3IHNldERhdGFTb3VyY2U6XSk6 IENoYW5nZSBpZiBhcm91bmQgYm9keSB0byBlYXJseSByZXR1cm4uIEhvb2sKKyAgICAgICAgdXAg dHJhY2tpbmcgYXJlYSAtIHdlIGhhdmUgdG8gZG8gaXQgaGVyZSwgYmVjYXVzZSBiZWZvcmUgdGhp cyBwb2ludCwgdGhlCisgICAgICAgIFdlYkhUTUxWaWV3IGRvZXMgbm90IGtub3cgaXRzIFdlYlZp ZXcsIHdoaWNoIGlzIHdoZXJlIGRhc2hib2FyZCBzZXR0aW5ncworICAgICAgICBsaXZlLgorICAg ICAgICAoLVtXZWJIVE1MVmlldyBfcmVtb3ZlTW91c2VNb3ZlZE9ic2VydmVyVW5jb25kaXRpb25h bGx5XSk6IERlbGV0ZWQuCisgICAgICAgICgtW1dlYkhUTUxWaWV3IGFkZE1vdXNlTW92ZWRPYnNl cnZlcl0pOiBEZWxldGVkLgorICAgICAgICAoLVtXZWJIVE1MVmlldyByZW1vdmVNb3VzZU1vdmVk T2JzZXJ2ZXJdKTogRGVsZXRlZC4KKwogMjAxNC0wOS0wNCAgUHJhdGlrIFNvbGFua2kgIDxwc29s YW5raUBhcHBsZS5jb20+CiAKICAgICAgICAgQnJpbmcgYmFjayBbV2ViUHJlZmVyZW5jZXMgc2V0 RGlza0ltYWdlQ2FjaGVFbmFibGVkOl0gZm9yIGJhY2t3YXJkcyBjb21wYXRpYmlsaXR5CkluZGV4 OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJLaXQub3JkZXIKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9tYWMvV2ViS2l0Lm9yZGVyCShyZXZpc2lvbiAxNzMyNzUpCisrKyBTb3VyY2UvV2ViS2l0 L21hYy9XZWJLaXQub3JkZXIJKHdvcmtpbmcgY29weSkKQEAgLTUwMiw3ICs1MDIsNiBAQCBfX1pO MjBXZWJGcmFtZUxvYWRlckNsaWVudDMycG9zdFByb2dyZXNzCiBfX1pOMjBXZWJEb2N1bWVudExv YWRlck1hY0QwRXYKIC1bV2ViVmlldyBfd2luZG93Q2hhbmdlZEtleVN0YXRlXQogLVtXZWJIVE1M VmlldyB3aW5kb3dEaWRCZWNvbWVLZXk6XQotX1dLTW91c2VNb3ZlZE5vdGlmaWNhdGlvbgogLVtX ZWJIVE1MVmlldyhXZWJOU1RleHRJbnB1dFN1cHBvcnQpIF91cGRhdGVTZWN1cmVJbnB1dFN0YXRl XQogLVtXZWJWaWV3IF93aW5kb3dXaWxsT3JkZXJPblNjcmVlbjpdCiAtW1dlYkhUTUxWaWV3IHdp bmRvd1dpbGxPcmRlck9uU2NyZWVuOl0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViSFRNTFZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9X ZWJIVE1MVmlldy5tbQkocmV2aXNpb24gMTczMjc1KQorKysgU291cmNlL1dlYktpdC9tYWMvV2Vi Vmlldy9XZWJIVE1MVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDMzLDcgKzQzMyw3IEBAIC0g KERPTURvY3VtZW50RnJhZ21lbnQgKilfZG9jdW1lbnRGcmFnbWUKIC0gKE5TU3RyaW5nICopX3Bs YWluVGV4dEZyb21QYXN0ZWJvYXJkOihOU1Bhc3RlYm9hcmQgKilwYXN0ZWJvYXJkOwogLSAodm9p ZClfcGFzdGVXaXRoUGFzdGVib2FyZDooTlNQYXN0ZWJvYXJkICopcGFzdGVib2FyZCBhbGxvd1Bs YWluVGV4dDooQk9PTClhbGxvd1BsYWluVGV4dDsKIC0gKHZvaWQpX3Bhc3RlQXNQbGFpblRleHRX aXRoUGFzdGVib2FyZDooTlNQYXN0ZWJvYXJkICopcGFzdGVib2FyZDsKLS0gKHZvaWQpX3JlbW92 ZU1vdXNlTW92ZWRPYnNlcnZlclVuY29uZGl0aW9uYWxseTsKKy0gKHZvaWQpX3Bvc3RGYWtlTW91 c2VNb3ZlZEV2ZW50Rm9yRmxhZ3NDaGFuZ2VkRXZlbnQ6KE5TRXZlbnQgKilmbGFnc0NoYW5nZWRF dmVudDsKIC0gKHZvaWQpX3JlbW92ZVN1cGVydmlld09ic2VydmVyczsKIC0gKHZvaWQpX3JlbW92 ZVdpbmRvd09ic2VydmVyczsKICNlbmRpZgpAQCAtNTQzLDcgKzU0Myw2IEBAIEBpbnRlcmZhY2Ug V2ViSFRNTFZpZXdQcml2YXRlIDogTlNPYmplY3QKICAgICBCT09MIHByaW50aW5nOwogICAgIEJP T0wgcGFnaW5hdGVTY3JlZW5Db250ZW50OwogI2lmICFQTEFURk9STShJT1MpCi0gICAgQk9PTCBv YnNlcnZpbmdNb3VzZU1vdmVkTm90aWZpY2F0aW9uczsKICAgICBCT09MIG9ic2VydmluZ1N1cGVy dmlld05vdGlmaWNhdGlvbnM7CiAgICAgQk9PTCBvYnNlcnZpbmdXaW5kb3dOb3RpZmljYXRpb25z OwogICAgIApAQCAtNjE0LDcgKzYxMyw4IEBAIEBpbnRlcmZhY2UgV2ViSFRNTFZpZXdQcml2YXRl IDogTlNPYmplY3QKICAgICBTRUwgc2VsZWN0b3JGb3JEb0NvbW1hbmRCeVNlbGVjdG9yOwogCiAj aWYgIVBMQVRGT1JNKElPUykKLSAgICBOU1RyYWNraW5nQXJlYSAqdHJhY2tpbmdBcmVhRm9yTm9u S2V5V2luZG93OworICAgIEJPT0wgaW5zdGFsbGVkVHJhY2tpbmdBcmVhOworICAgIGlkIF9mbGFn c0NoYW5nZWRFdmVudE1vbml0b3I7CiAjZW5kaWYKIAogI2lmbmRlZiBOREVCVUcKQEAgLTY5NCw3 ICs2OTQsNiBAQCAtICh2b2lkKWRlYWxsb2MKICNlbmRpZgogICAgIFtkYXRhU291cmNlIHJlbGVh c2VdOwogI2lmICFQTEFURk9STShJT1MpCi0gICAgW3RyYWNraW5nQXJlYUZvck5vbktleVdpbmRv dyByZWxlYXNlXTsKICAgICBpZiAocHJvbWlzZWREcmFnVElGRkRhdGFTb3VyY2UpCiAgICAgICAg IHByb21pc2VkRHJhZ1RJRkZEYXRhU291cmNlLT5yZW1vdmVDbGllbnQocHJvbWlzZWREYXRhQ2xp ZW50KCkpOwogI2VuZGlmCkBAIC03MzIsNyArNzMxLDYgQEAgLSAodm9pZCljbGVhcgogI2VuZGlm CiAgICAgW2RhdGFTb3VyY2UgcmVsZWFzZV07CiAjaWYgIVBMQVRGT1JNKElPUykKLSAgICBbdHJh Y2tpbmdBcmVhRm9yTm9uS2V5V2luZG93IHJlbGVhc2VdOwogICAgIGlmIChwcm9taXNlZERyYWdU SUZGRGF0YVNvdXJjZSkKICAgICAgICAgcHJvbWlzZWREcmFnVElGRkRhdGFTb3VyY2UtPnJlbW92 ZUNsaWVudChwcm9taXNlZERhdGFDbGllbnQoKSk7CiAjZW5kaWYKQEAgLTc0Niw3ICs3NDQsNiBA QCAtICh2b2lkKWNsZWFyCiAjZW5kaWYKICAgICBkYXRhU291cmNlID0gbmlsOwogI2lmICFQTEFU Rk9STShJT1MpCi0gICAgdHJhY2tpbmdBcmVhRm9yTm9uS2V5V2luZG93ID0gbmlsOwogICAgIHBy b21pc2VkRHJhZ1RJRkZEYXRhU291cmNlID0gMDsKICNlbmRpZgogCkBAIC05OTMsNiArOTkwLDE3 IEBAIC0gKHZvaWQpX3Bhc3RlQXNQbGFpblRleHRXaXRoUGFzdGVib2FyZDoKICAgICBbd2ViVmll dyByZWxlYXNlXTsKIH0KIAorCistICh2b2lkKV9wb3N0RmFrZU1vdXNlTW92ZWRFdmVudEZvckZs YWdzQ2hhbmdlZEV2ZW50OihOU0V2ZW50ICopZmxhZ3NDaGFuZ2VkRXZlbnQKK3sKKyAgICBOU0V2 ZW50ICpmYWtlRXZlbnQgPSBbTlNFdmVudCBtb3VzZUV2ZW50V2l0aFR5cGU6TlNNb3VzZU1vdmVk IGxvY2F0aW9uOltbZmxhZ3NDaGFuZ2VkRXZlbnQgd2luZG93XSBtb3VzZUxvY2F0aW9uT3V0c2lk ZU9mRXZlbnRTdHJlYW1dCisgICAgICAgIG1vZGlmaWVyRmxhZ3M6W2ZsYWdzQ2hhbmdlZEV2ZW50 IG1vZGlmaWVyRmxhZ3NdIHRpbWVzdGFtcDpbZmxhZ3NDaGFuZ2VkRXZlbnQgdGltZXN0YW1wXSB3 aW5kb3dOdW1iZXI6W2ZsYWdzQ2hhbmdlZEV2ZW50IHdpbmRvd051bWJlcl0KKyAgICAgICAgY29u dGV4dDpbZmxhZ3NDaGFuZ2VkRXZlbnQgY29udGV4dF0gZXZlbnROdW1iZXI6MCBjbGlja0NvdW50 OjAgcHJlc3N1cmU6MF07CisKKyAgICAvLyBQcmV0ZW5kIGl0J3MgYSBtb3VzZSBtb3ZlLgorICAg IFtzZWxmIG1vdXNlTW92ZWQ6ZmFrZUV2ZW50XTsKK30KKwogLy8gVGhpcyBtZXRob2QgaXMgbmVl ZGVkIHRvIHN1cHBvcnQgTWFjIE9TIFggc2VydmljZXMuCiAtIChCT09MKXJlYWRTZWxlY3Rpb25G cm9tUGFzdGVib2FyZDooTlNQYXN0ZWJvYXJkICopcGFzdGVib2FyZCAKIHsgCkBAIC0xMDA2LDE1 ICsxMDE0LDYgQEAgLSAoQk9PTClyZWFkU2VsZWN0aW9uRnJvbVBhc3RlYm9hcmQ6KE5TUAogICAg IHJldHVybiBZRVM7IAogfQogCi0tICh2b2lkKV9yZW1vdmVNb3VzZU1vdmVkT2JzZXJ2ZXJVbmNv bmRpdGlvbmFsbHkKLXsKLSAgICBpZiAoIV9wcml2YXRlIHx8ICFfcHJpdmF0ZS0+b2JzZXJ2aW5n TW91c2VNb3ZlZE5vdGlmaWNhdGlvbnMpCi0gICAgICAgIHJldHVybjsKLSAgICAKLSAgICBbW05T Tm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIHJlbW92ZU9ic2VydmVyOnNlbGYgbmFt ZTpXS01vdXNlTW92ZWROb3RpZmljYXRpb24oKSBvYmplY3Q6bmlsXTsKLSAgICBfcHJpdmF0ZS0+ b2JzZXJ2aW5nTW91c2VNb3ZlZE5vdGlmaWNhdGlvbnMgPSBmYWxzZTsKLX0KLQogLSAodm9pZClf cmVtb3ZlU3VwZXJ2aWV3T2JzZXJ2ZXJzCiB7CiAgICAgaWYgKCFfcHJpdmF0ZSB8fCAhX3ByaXZh dGUtPm9ic2VydmluZ1N1cGVydmlld05vdGlmaWNhdGlvbnMpCkBAIC0xMjgyLDIyICsxMjgxLDcg QEAgLSAodm9pZCltb3VzZU1vdmVkOihXZWJFdmVudCAqKWV2ZW50CiAjaWYgIVBMQVRGT1JNKElP UykKICsgKHZvaWQpX3Bvc3RGbGFnc0NoYW5nZWRFdmVudDooTlNFdmVudCAqKWZsYWdzQ2hhbmdl ZEV2ZW50CiB7Ci0gICAgLy8gVGhpcyBpcyBhIHdvcmthcm91bmQgZm9yOiA8cmRhcjovL3Byb2Js ZW0vMjk4MTYxOT4gTlNSZXNwb25kZXJfUHJpdmF0ZSBzaG91bGQgaW5jbHVkZSBub3RpZmljYXRp b24gZm9yIEZsYWdzQ2hhbmdlZAotI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIHB1c2gKLSNwcmFn bWEgY2xhbmcgZGlhZ25vc3RpYyBpZ25vcmVkICItV2RlcHJlY2F0ZWQtZGVjbGFyYXRpb25zIgot ICAgIE5TRXZlbnQgKmZha2VFdmVudCA9IFtOU0V2ZW50IG1vdXNlRXZlbnRXaXRoVHlwZTpOU01v dXNlTW92ZWQKLSAgICAgICAgbG9jYXRpb246W1tmbGFnc0NoYW5nZWRFdmVudCB3aW5kb3ddIGNv bnZlcnRTY3JlZW5Ub0Jhc2U6W05TRXZlbnQgbW91c2VMb2NhdGlvbl1dCi0gICAgICAgIG1vZGlm aWVyRmxhZ3M6W2ZsYWdzQ2hhbmdlZEV2ZW50IG1vZGlmaWVyRmxhZ3NdCi0gICAgICAgIHRpbWVz dGFtcDpbZmxhZ3NDaGFuZ2VkRXZlbnQgdGltZXN0YW1wXQotICAgICAgICB3aW5kb3dOdW1iZXI6 W2ZsYWdzQ2hhbmdlZEV2ZW50IHdpbmRvd051bWJlcl0KLSAgICAgICAgY29udGV4dDpbZmxhZ3ND aGFuZ2VkRXZlbnQgY29udGV4dF0KLSAgICAgICAgZXZlbnROdW1iZXI6MCBjbGlja0NvdW50OjAg cHJlc3N1cmU6MF07Ci0jcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgcG9wCi0KLSAgICAvLyBQcmV0 ZW5kIGl0J3MgYSBtb3VzZSBtb3ZlLgotICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVs dENlbnRlcl0KLSAgICAgICAgcG9zdE5vdGlmaWNhdGlvbk5hbWU6V0tNb3VzZU1vdmVkTm90aWZp Y2F0aW9uKCkgb2JqZWN0OnNlbGYKLSAgICAgICAgdXNlckluZm86W05TRGljdGlvbmFyeSBkaWN0 aW9uYXJ5V2l0aE9iamVjdDpmYWtlRXZlbnQgZm9yS2V5OkAiTlNFdmVudCJdXTsKKyAgICAvLyBU aGlzIGlzIG9ic29sZXRlIFNQSSBuZWVkZWQgb25seSBmb3Igb2xkZXIgdmVyc2lvbnMgb2YgU2Fm YXJpCiB9CiAKIC0gKGlkKV9icmlkZ2UKQEAgLTE3OTIsOSArMTc3NiwxNSBAQCAtICh2b2lkKV91 cGRhdGVNb3VzZW92ZXJXaXRoRXZlbnQ6KE5TRXZlCiAgICAgICAgICAgICAvLyBuZXdlciB3aGVu IGxlZ2FjeSBzY3JvbGxiYXJzIGFyZSBlbmFibGVkLCBiZWNhdXNlIHRoZW4gV2ViS2l0IHJlY2Vp dmVzIG1vdXNlIGV2ZW50cyBhbGwgdGhlIHRpbWUuIAogICAgICAgICAgICAgLy8gSWYgaXQgaXMg b25lIG9mIHRob3NlIGNhc2VzIHdoZXJlIHRoZSBwYWdlIGlzIG5vdCBhY3RpdmUgYW5kIHRoZSBt b3VzZSBpcyBub3QgcHJlc3NlZCwgdGhlbiB3ZSBjYW4KICAgICAgICAgICAgIC8vIGZpcmUgYSBt dWNoIG1vcmUgcmVzdHJpY3RlZCBhbmQgZWZmaWNpZW50IHNjcm9sbGJhcnMtb25seSB2ZXJzaW9u IG9mIHRoZSBldmVudC4KLSAgICAgICAgICAgIGlmIChbW3NlbGYgd2luZG93XSBpc0tleVdpbmRv d10gfHwgbW91c2VFdmVudElzUGFydE9mQ2xpY2tPckRyYWcoZXZlbnQpKQorCisgICAgICAgICAg ICBpZiAoW1tzZWxmIHdpbmRvd10gaXNLZXlXaW5kb3ddIAorICAgICAgICAgICAgICAgIHx8IG1v dXNlRXZlbnRJc1BhcnRPZkNsaWNrT3JEcmFnKGV2ZW50KQorI2lmIEVOQUJMRShEQVNIQk9BUkRf U1VQUE9SVCkKKyAgICAgICAgICAgICAgICB8fCBbW3NlbGYgX3dlYlZpZXddIF9kYXNoYm9hcmRC ZWhhdmlvcjpXZWJEYXNoYm9hcmRCZWhhdmlvckFsd2F5c1NlbmRNb3VzZUV2ZW50c1RvQWxsV2lu ZG93c10KKyNlbmRpZgorICAgICAgICAgICAgICAgICkgewogICAgICAgICAgICAgICAgIGNvcmVG cmFtZS0+ZXZlbnRIYW5kbGVyKCkubW91c2VNb3ZlZChldmVudCk7Ci0gICAgICAgICAgICBlbHNl CisgICAgICAgICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICBjb3JlRnJhbWUtPmV2ZW50SGFu ZGxlcigpLnBhc3NNb3VzZU1vdmVkRXZlbnRUb1Njcm9sbGJhcnMoZXZlbnQpOwogICAgICAgICB9 CiAKQEAgLTIxMjEsNyArMjExMSw2IEBAIC0gKHZvaWQpY2xvc2UKIAogICAgIFtzZWxmIF9jbGVh ckxhc3RIaXRWaWV3SWZTZWxmXTsKICNpZiAhUExBVEZPUk0oSU9TKQotICAgIFtzZWxmIF9yZW1v dmVNb3VzZU1vdmVkT2JzZXJ2ZXJVbmNvbmRpdGlvbmFsbHldOwogICAgIFtzZWxmIF9yZW1vdmVX aW5kb3dPYnNlcnZlcnNdOwogICAgIFtzZWxmIF9yZW1vdmVTdXBlcnZpZXdPYnNlcnZlcnNdOwog I2VuZGlmCkBAIC0zMDU1LDQxICszMDQ0LDYgQEAgLSAoQk9PTCltYWludGFpbnNJbmFjdGl2ZVNl bGVjdGlvbgogfQogCiAjaWYgIVBMQVRGT1JNKElPUykKLS0gKHZvaWQpYWRkTW91c2VNb3ZlZE9i c2VydmVyCi17Ci0gICAgaWYgKCFfcHJpdmF0ZS0+ZGF0YVNvdXJjZSB8fCAhW3NlbGYgX2lzVG9w SFRNTFZpZXddIHx8IF9wcml2YXRlLT5vYnNlcnZpbmdNb3VzZU1vdmVkTm90aWZpY2F0aW9ucykK LSAgICAgICAgcmV0dXJuOwotCi0gICAgLy8gVW5sZXNzIHRoZSBEYXNoYm9hcmQgYXNrcyB1cyB0 byBkbyB0aGlzIGZvciBhbGwgd2luZG93cywga2VlcCBhbiBvYnNlcnZlciBnb2luZyBvbmx5IGZv ciB0aGUga2V5IHdpbmRvdy4KLSAgICBpZiAoIShbW3NlbGYgd2luZG93XSBpc0tleVdpbmRvd10g Ci0jaWYgRU5BQkxFKERBU0hCT0FSRF9TVVBQT1JUKQotICAgICAgICAgICAgfHwgW1tzZWxmIF93 ZWJWaWV3XSBfZGFzaGJvYXJkQmVoYXZpb3I6V2ViRGFzaGJvYXJkQmVoYXZpb3JBbHdheXNTZW5k TW91c2VFdmVudHNUb0FsbFdpbmRvd3NdCi0jZW5kaWYKLSAgICAgICAgKSkKLSAgICAgICAgcmV0 dXJuOwotCi0gICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNl cnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3Rvcihtb3VzZU1vdmVkTm90aWZpY2F0aW9uOikKLSAg ICAgICAgbmFtZTpXS01vdXNlTW92ZWROb3RpZmljYXRpb24oKSBvYmplY3Q6bmlsXTsKLSAgICBb c2VsZiBfZnJhbWVPckJvdW5kc0NoYW5nZWRdOwotICAgIF9wcml2YXRlLT5vYnNlcnZpbmdNb3Vz ZU1vdmVkTm90aWZpY2F0aW9ucyA9IHRydWU7Ci19Ci0KLS0gKHZvaWQpcmVtb3ZlTW91c2VNb3Zl ZE9ic2VydmVyCi17Ci0jaWYgRU5BQkxFKERBU0hCT0FSRF9TVVBQT1JUKQotICAgIC8vIERvbid0 IHJlbW92ZSB0aGUgb2JzZXJ2ZXIgaWYgd2UncmUgcnVubmluZyB0aGUgRGFzaGJvYXJkLgotICAg IGlmIChbW3NlbGYgX3dlYlZpZXddIF9kYXNoYm9hcmRCZWhhdmlvcjpXZWJEYXNoYm9hcmRCZWhh dmlvckFsd2F5c1NlbmRNb3VzZUV2ZW50c1RvQWxsV2luZG93c10pCi0gICAgICAgIHJldHVybjsK LSNlbmRpZgotCi0gICAgLy8gTGVnYWN5IHNjcm9sbGJhcnMgcmVxdWlyZSB0cmFja2luZyB0aGUg bW91c2UgYXQgYWxsIHRpbWVzLgotICAgIGlmIChXS1JlY29tbWVuZGVkU2Nyb2xsZXJTdHlsZSgp ID09IE5TU2Nyb2xsZXJTdHlsZUxlZ2FjeSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgW1tzZWxm IF93ZWJWaWV3XSBfbW91c2VEaWRNb3ZlT3ZlckVsZW1lbnQ6bmlsIG1vZGlmaWVyRmxhZ3M6MF07 Ci0gICAgW3NlbGYgX3JlbW92ZU1vdXNlTW92ZWRPYnNlcnZlclVuY29uZGl0aW9uYWxseV07Ci19 Ci0KIC0gKHZvaWQpYWRkU3VwZXJ2aWV3T2JzZXJ2ZXJzCiB7CiAgICAgaWYgKF9wcml2YXRlLT5v YnNlcnZpbmdTdXBlcnZpZXdOb3RpZmljYXRpb25zKQpAQCAtMzE2MSw3ICszMTE1LDYgQEAgLSAo dm9pZCl2aWV3V2lsbE1vdmVUb1dpbmRvdzooTlNXaW5kb3cgKgogCiAjaWYgIVBMQVRGT1JNKElP UykKICAgICAvLyBGSVhNRTogU29tZSBvZiB0aGVzZSBjYWxscyBtYXkgbm90IHdvcmsgYmVjYXVz ZSB0aGlzIHZpZXcgbWF5IGJlIGFscmVhZHkgcmVtb3ZlZCBmcm9tIGl0J3Mgc3VwZXJ2aWV3Lgot ICAgIFtzZWxmIF9yZW1vdmVNb3VzZU1vdmVkT2JzZXJ2ZXJVbmNvbmRpdGlvbmFsbHldOwogICAg IFtzZWxmIF9yZW1vdmVXaW5kb3dPYnNlcnZlcnNdOwogICAgIFtzZWxmIF9yZW1vdmVTdXBlcnZp ZXdPYnNlcnZlcnNdOwogI2VuZGlmCkBAIC0zMTg2LDcgKzMxMzksNiBAQCAtICh2b2lkKXZpZXdE aWRNb3ZlVG9XaW5kb3cKICNpZiAhUExBVEZPUk0oSU9TKQogICAgICAgICBbc2VsZiBhZGRXaW5k b3dPYnNlcnZlcnNdOwogICAgICAgICBbc2VsZiBhZGRTdXBlcnZpZXdPYnNlcnZlcnNdOwotICAg ICAgICBbc2VsZiBhZGRNb3VzZU1vdmVkT2JzZXJ2ZXJdOwogI2VuZGlmCiAKICAgICAgICAgLy8g RklYTUU6IFRoaXMgYWNjb21wbGlzaGVzIHRoZSBzYW1lIHRoaW5nIGFzIHRoZSBjYWxsIHRvIHNl dENhblN0YXJ0TWVkaWEodHJ1ZSkgaW4KQEAgLTMxOTQsNiArMzE0NiwxNyBAQCAtICh2b2lkKXZp ZXdEaWRNb3ZlVG9XaW5kb3cKICAgICAgICAgW1tzZWxmIF9wbHVnaW5Db250cm9sbGVyXSBzdGFy dEFsbFBsdWdpbnNdOwogCiAgICAgICAgIF9wcml2YXRlLT5sYXN0U2Nyb2xsUG9zaXRpb24gPSBO U1plcm9Qb2ludDsKKworICAgICAgICBpZiAoIV9wcml2YXRlLT5fZmxhZ3NDaGFuZ2VkRXZlbnRN b25pdG9yKSB7CisgICAgICAgICAgICBfcHJpdmF0ZS0+X2ZsYWdzQ2hhbmdlZEV2ZW50TW9uaXRv ciA9IFtOU0V2ZW50IGFkZExvY2FsTW9uaXRvckZvckV2ZW50c01hdGNoaW5nTWFzazpOU0ZsYWdz Q2hhbmdlZE1hc2sgaGFuZGxlcjpeKE5TRXZlbnQgKmZsYWdzQ2hhbmdlZEV2ZW50KSAKKyAgICAg ICAgICAgIHsKKyAgICAgICAgICAgICAgICBbc2VsZiBfcG9zdEZha2VNb3VzZU1vdmVkRXZlbnRG b3JGbGFnc0NoYW5nZWRFdmVudDpmbGFnc0NoYW5nZWRFdmVudF07CisgICAgICAgICAgICAgICAg cmV0dXJuIGZsYWdzQ2hhbmdlZEV2ZW50OworICAgICAgICAgICAgfV07CisgICAgICAgIH0KKyAg ICB9IGVsc2UgeworICAgICAgICBbTlNFdmVudCByZW1vdmVNb25pdG9yOl9wcml2YXRlLT5fZmxh Z3NDaGFuZ2VkRXZlbnRNb25pdG9yXTsKKyAgICAgICAgX3ByaXZhdGUtPl9mbGFnc0NoYW5nZWRF dmVudE1vbml0b3IgPSBuaWw7CiAgICAgfQogfQogCkBAIC0zNjcyLDE4ICszNjM1LDEwIEBAIC0g KHZvaWQpd2luZG93RGlkQmVjb21lS2V5OihOU05vdGlmaWNhdGkKICAgICAgICAgcmV0dXJuOwog ICAgIH0KIAotICAgIGlmIChfcHJpdmF0ZS0+dHJhY2tpbmdBcmVhRm9yTm9uS2V5V2luZG93KSB7 Ci0gICAgICAgIFtzZWxmIHJlbW92ZVRyYWNraW5nQXJlYTpfcHJpdmF0ZS0+dHJhY2tpbmdBcmVh Rm9yTm9uS2V5V2luZG93XTsKLSAgICAgICAgW19wcml2YXRlLT50cmFja2luZ0FyZWFGb3JOb25L ZXlXaW5kb3cgcmVsZWFzZV07Ci0gICAgICAgIF9wcml2YXRlLT50cmFja2luZ0FyZWFGb3JOb25L ZXlXaW5kb3cgPSBuaWw7Ci0gICAgfQotCiAgICAgTlNXaW5kb3cgKmtleVdpbmRvdyA9IFtub3Rp ZmljYXRpb24gb2JqZWN0XTsKIAotICAgIGlmIChrZXlXaW5kb3cgPT0gW3NlbGYgd2luZG93XSkg ewotICAgICAgICBbc2VsZiBhZGRNb3VzZU1vdmVkT2JzZXJ2ZXJdOworICAgIGlmIChrZXlXaW5k b3cgPT0gW3NlbGYgd2luZG93XSkKICAgICAgICAgW3NlbGYgX3VwZGF0ZVNlY3VyZUlucHV0U3Rh dGVdOwotICAgIH0KIH0KIAogLSAodm9pZCl3aW5kb3dEaWRSZXNpZ25LZXk6KE5TTm90aWZpY2F0 aW9uICopbm90aWZpY2F0aW9uCkBAIC0zNjk1LDI0ICszNjUwLDEwIEBAIC0gKHZvaWQpd2luZG93 RGlkUmVzaWduS2V5OihOU05vdGlmaWNhdGkKIAogICAgIE5TV2luZG93ICpmb3JtZXJLZXlXaW5k b3cgPSBbbm90aWZpY2F0aW9uIG9iamVjdF07CiAKLSAgICBpZiAoZm9ybWVyS2V5V2luZG93ID09 IFtzZWxmIHdpbmRvd10pCi0gICAgICAgIFtzZWxmIHJlbW92ZU1vdXNlTW92ZWRPYnNlcnZlcl07 Ci0KICAgICBpZiAoZm9ybWVyS2V5V2luZG93ID09IFtzZWxmIHdpbmRvd10gfHwgZm9ybWVyS2V5 V2luZG93ID09IFtbc2VsZiB3aW5kb3ddIGF0dGFjaGVkU2hlZXRdKSB7CiAgICAgICAgIFtzZWxm IF91cGRhdGVTZWN1cmVJbnB1dFN0YXRlXTsKICAgICAgICAgW19wcml2YXRlLT5jb21wbGV0aW9u Q29udHJvbGxlciBlbmRSZXZlcnRpbmdDaGFuZ2U6Tk8gbW92ZUxlZnQ6Tk9dOwogICAgIH0KLQot ICAgIGlmIChXS1JlY29tbWVuZGVkU2Nyb2xsZXJTdHlsZSgpID09IE5TU2Nyb2xsZXJTdHlsZUxl Z2FjeSkgewotICAgICAgICAvLyBMZWdhY3kgc3R5bGUgc2Nyb2xsYmFycyBoYXZlIGRlc2lnbiBk ZXRhaWxzIHRoYXQgcmVseSBvbiB0cmFja2luZyB0aGUgbW91c2UgYWxsIHRoZSB0aW1lLgotICAg ICAgICAvLyBJdCdzIGVhc2llc3QgdG8gZG8gdGhpcyB3aXRoIGEgdHJhY2tpbmcgYXJlYSwgd2hp Y2ggd2Ugd2lsbCByZW1vdmUgd2hlbiB0aGUgd2luZG93IGlzIGtleQotICAgICAgICAvLyBhZ2Fp bi4KLSAgICAgICAgX3ByaXZhdGUtPnRyYWNraW5nQXJlYUZvck5vbktleVdpbmRvdyA9IFtbTlNU cmFja2luZ0FyZWEgYWxsb2NdIGluaXRXaXRoUmVjdDpbc2VsZiBib3VuZHNdCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3B0aW9uczpOU1RyYWNr aW5nTW91c2VNb3ZlZCB8IE5TVHJhY2tpbmdNb3VzZUVudGVyZWRBbmRFeGl0ZWQgfCBOU1RyYWNr aW5nSW5WaXNpYmxlUmVjdCB8IE5TVHJhY2tpbmdBY3RpdmVBbHdheXMKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvd25lcjpzZWxmCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdXNlckluZm86bmls XTsKLSAgICAgICAgW3NlbGYgYWRkVHJhY2tpbmdBcmVhOl9wcml2YXRlLT50cmFja2luZ0FyZWFG b3JOb25LZXlXaW5kb3ddOwotICAgIH0KIH0KIAogLSAodm9pZCl3aW5kb3dXaWxsT3JkZXJPblNj cmVlbjooTlNOb3RpZmljYXRpb24gKilub3RpZmljYXRpb24KQEAgLTM3MjEsMTAgKzM2NjIsNiBA QCAtICh2b2lkKXdpbmRvd1dpbGxPcmRlck9uU2NyZWVuOihOU05vdGlmCiAgICAgICAgIFtzZWxm IHBlcmZvcm1TZWxlY3Rvck9uTWFpblRocmVhZDpfY21kIHdpdGhPYmplY3Q6bm90aWZpY2F0aW9u IHdhaXRVbnRpbERvbmU6Tk9dOwogICAgICAgICByZXR1cm47CiAgICAgfQotCi0gICAgLy8gQ2hl Y2sgaWYgdGhlIHdpbmRvdyBpcyBhbHJlYWR5IGEga2V5IHdpbmRvdywgd2hpY2ggY2FuIGJlIHRo ZSBjYXNlIGZvciBOU1BvcG92ZXJzLgotICAgIGlmIChbW3NlbGYgd2luZG93XSBpc0tleVdpbmRv d10pCi0gICAgICAgIFtzZWxmIGFkZE1vdXNlTW92ZWRPYnNlcnZlcl07CiB9CiAKIC0gKHZvaWQp d2luZG93V2lsbE9yZGVyT2ZmU2NyZWVuOihOU05vdGlmaWNhdGlvbiAqKW5vdGlmaWNhdGlvbgpA QCAtMzczMywxMCArMzY3MCw2IEBAIC0gKHZvaWQpd2luZG93V2lsbE9yZGVyT2ZmU2NyZWVuOihO U05vdGkKICAgICAgICAgW3NlbGYgcGVyZm9ybVNlbGVjdG9yT25NYWluVGhyZWFkOl9jbWQgd2l0 aE9iamVjdDpub3RpZmljYXRpb24gd2FpdFVudGlsRG9uZTpOT107CiAgICAgICAgIHJldHVybjsK ICAgICB9Ci0KLSAgICAvLyBXaGVuIHRoZSBXZWJWaWV3IGlzIGluIGEgTlNQb3BvdmVyIHRoZSBO U1dpbmRvd0RpZFJlc2lnbktleU5vdGlmaWNhdGlvbiBpc24ndCBzZW50Ci0gICAgLy8gdW5sZXNz IHRoZSBwYXJlbnQgd2luZG93IGxvc2VzIGtleS4gU28gd2UgbmVlZCB0byByZW1vdmUgdGhlIG1v dXNlIG1vdmVkIG9ic2VydmVyLgotICAgIFtzZWxmIHJlbW92ZU1vdXNlTW92ZWRPYnNlcnZlcl07 CiB9CiAKIC0gKHZvaWQpd2luZG93V2lsbENsb3NlOihOU05vdGlmaWNhdGlvbiAqKW5vdGlmaWNh dGlvbgpAQCAtNDEwNyw5ICs0MDQwLDkgQEAgLSAodm9pZCltb3VzZVVwOihXZWJFdmVudCAqKWV2 ZW50CiB9CiAKICNpZiAhUExBVEZPUk0oSU9TKQotLSAodm9pZCltb3VzZU1vdmVkTm90aWZpY2F0 aW9uOihOU05vdGlmaWNhdGlvbiAqKW5vdGlmaWNhdGlvbgorLSAodm9pZCltb3VzZU1vdmVkOihO U0V2ZW50ICopZXZlbnQKIHsKLSAgICBbc2VsZiBfdXBkYXRlTW91c2VvdmVyV2l0aEV2ZW50Oltb bm90aWZpY2F0aW9uIHVzZXJJbmZvXSBvYmplY3RGb3JLZXk6QCJOU0V2ZW50Il1dOworICAgIFtz ZWxmIF91cGRhdGVNb3VzZW92ZXJXaXRoRXZlbnQ6ZXZlbnRdOwogfQogI2VuZGlmCiAKQEAgLTQy NjcsMjEgKzQyMDAsMzQgQEAgLSAoQk9PTClyZXNpZ25GaXJzdFJlc3BvbmRlcgogLSAodm9pZClz ZXREYXRhU291cmNlOihXZWJEYXRhU291cmNlICopZGF0YVNvdXJjZSAKIHsKICAgICBBU1NFUlQo ZGF0YVNvdXJjZSk7Ci0gICAgaWYgKF9wcml2YXRlLT5kYXRhU291cmNlICE9IGRhdGFTb3VyY2Up IHsKLSAgICAgICAgQVNTRVJUKCFfcHJpdmF0ZS0+Y2xvc2VkKTsKLSNpZiAhUExBVEZPUk0oSU9T KQotICAgICAgICBCT09MIGhhZERhdGFTb3VyY2UgPSBfcHJpdmF0ZS0+ZGF0YVNvdXJjZSAhPSBu aWw7Ci0jZW5kaWYKKyAgICBpZiAoX3ByaXZhdGUtPmRhdGFTb3VyY2UgPT0gZGF0YVNvdXJjZSkK KyAgICAgICAgcmV0dXJuOworCisgICAgQVNTRVJUKCFfcHJpdmF0ZS0+Y2xvc2VkKTsKIAotICAg ICAgICBbZGF0YVNvdXJjZSByZXRhaW5dOwotICAgICAgICBbX3ByaXZhdGUtPmRhdGFTb3VyY2Ug cmVsZWFzZV07Ci0gICAgICAgIF9wcml2YXRlLT5kYXRhU291cmNlID0gZGF0YVNvdXJjZTsKLSAg ICAgICAgW19wcml2YXRlLT5wbHVnaW5Db250cm9sbGVyIHNldERhdGFTb3VyY2U6ZGF0YVNvdXJj ZV07CisgICAgW2RhdGFTb3VyY2UgcmV0YWluXTsKKyAgICBbX3ByaXZhdGUtPmRhdGFTb3VyY2Ug cmVsZWFzZV07CisgICAgX3ByaXZhdGUtPmRhdGFTb3VyY2UgPSBkYXRhU291cmNlOworICAgIFtf cHJpdmF0ZS0+cGx1Z2luQ29udHJvbGxlciBzZXREYXRhU291cmNlOmRhdGFTb3VyY2VdOwogCiAj aWYgIVBMQVRGT1JNKElPUykKLSAgICAgICAgaWYgKCFoYWREYXRhU291cmNlKQotICAgICAgICAg ICAgW3NlbGYgYWRkTW91c2VNb3ZlZE9ic2VydmVyXTsKKyAgICBpZiAoIV9wcml2YXRlLT5pbnN0 YWxsZWRUcmFja2luZ0FyZWEpIHsKKyAgICAgICAgTlNUcmFja2luZ0FyZWFPcHRpb25zIG9wdGlv bnMgPSBOU1RyYWNraW5nTW91c2VNb3ZlZCB8IE5TVHJhY2tpbmdNb3VzZUVudGVyZWRBbmRFeGl0 ZWQgfCBOU1RyYWNraW5nSW5WaXNpYmxlUmVjdDsKKyAgICAgICAgaWYgKFdLUmVjb21tZW5kZWRT Y3JvbGxlclN0eWxlKCkgPT0gTlNTY3JvbGxlclN0eWxlTGVnYWN5CisjaWYgRU5BQkxFKERBU0hC T0FSRF9TVVBQT1JUKQorICAgICAgICAgICAgfHwgW1tzZWxmIF93ZWJWaWV3XSBfZGFzaGJvYXJk QmVoYXZpb3I6V2ViRGFzaGJvYXJkQmVoYXZpb3JBbHdheXNTZW5kTW91c2VFdmVudHNUb0FsbFdp bmRvd3NdCisjZW5kaWYKKyAgICAgICAgICAgICkKKyAgICAgICAgICAgIG9wdGlvbnMgfD0gTlNU cmFja2luZ0FjdGl2ZUFsd2F5czsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgb3B0aW9ucyB8 PSBOU1RyYWNraW5nQWN0aXZlSW5LZXlXaW5kb3c7CisKKyAgICAgICAgTlNUcmFja2luZ0FyZWEg KnRyYWNraW5nQXJlYSA9IFtbTlNUcmFja2luZ0FyZWEgYWxsb2NdIAorICAgICAgICAgICAgaW5p dFdpdGhSZWN0OltzZWxmIGZyYW1lXSBvcHRpb25zOm9wdGlvbnMgb3duZXI6c2VsZiB1c2VySW5m bzpuaWxdOworICAgICAgICBbc2VsZiBhZGRUcmFja2luZ0FyZWE6dHJhY2tpbmdBcmVhXTsKKyAg ICAgICAgW3RyYWNraW5nQXJlYSByZWxlYXNlXTsKICNlbmRpZgorICAgICAgICBfcHJpdmF0ZS0+ aW5zdGFsbGVkVHJhY2tpbmdBcmVhID0gWUVTOwogICAgIH0KIH0KIAo=