184913 2018-04-24 06:27:49 -0700 [GTK] Implement MouseEvent.buttons 2018-04-25 03:17:11 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 174616 1 cgarcia webkit-unassigned bugs-noreply Ms2ger zan oldest_to_newest 1417138 0 cgarcia 2018-04-24 06:27:49 -0700 It's currently returning always 0 for WebKitGTK+. https://www.w3.org/TR/uievents/#ref-for-dom-mouseevent-buttons-1 1417140 1 338644 cgarcia 2018-04-24 06:34:39 -0700 Created attachment 338644 Patch 1417466 2 338644 Ms2ger 2018-04-25 01:09:31 -0700 Comment on attachment 338644 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=338644&action=review > Source/WebKit/Shared/gtk/WebEventFactory.cpp:154 > + unsigned modifier = 1 << (8 + event->button.button - 1); I've seen this calculation about five times in this patch; worth writing a small helper function? 1417485 3 cgarcia 2018-04-25 03:17:11 -0700 Committed r230988: <https://trac.webkit.org/changeset/230988> 338644 2018-04-24 06:34:39 -0700 2018-04-24 23:58:46 -0700 Patch wk-mouse-buttons.diff text/plain 15034 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggOTliMmM3NmUyYTMuLjQ2YzY0MTQzMTg1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDIzIEBACisyMDE4LTA0LTI0ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KKworICAgICAgICBbR1RLXSBJbXBsZW1lbnQgTW91c2VFdmVudC5idXR0b25zCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODQ5MTMKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJdCdzIGN1cnJlbnRs eSByZXR1cm5pbmcgYWx3YXlzIDAuCisKKyAgICAgICAgKiBTaGFyZWQvZ3RrL1dlYkV2ZW50RmFj dG9yeS5jcHA6CisgICAgICAgIChXZWJLaXQ6OnByZXNzZWRNb3VzZUJ1dHRvbnMpOiBIZWxwZXIg ZnVuY3Rpb24gdG8gZ2V0IHRoZSBwcmVzc2VkIG1vdXNlIGJ1dHRvbnMuCisgICAgICAgIChXZWJL aXQ6OldlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViTW91c2VFdmVudCk6IFBhc3MgcHJlc3NzZWQg bW91c2UgYnV0dG9ucyB0byBjb25zdHJ1Y3RvciBpbnN0ZWFkIG9mIDAuCisgICAgICAgICogVUlQ cm9jZXNzL0F1dG9tYXRpb24vZ3RrL1dlYkF1dG9tYXRpb25TZXNzaW9uR3RrLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViQXV0b21hdGlvblNlc3Npb246OnBsYXRmb3JtU2ltdWxhdGVNb3VzZUlu dGVyYWN0aW9uKTogSW5jbHVkZSB0aGUgbW91c2UgYnV0dG9ucyBzdGF0ZSBpbiBhdXRvbWF0aW9u CisgICAgICAgIHN5bnRoZXNpemVkIGV2ZW50cyBhbmQgdXBkYXRlIG1fY3VycmVudE1vZGlmaWVy cyB3aXRoIHRoZSBtb3VzZSBidXR0b25zIHN0YXRlLgorICAgICAgICAoV2ViS2l0OjprZXlDb2Rl Rm9yVmlydHVhbEtleSk6IERvIG5vdCBzZXQgdGhlIHN0YXRlIGhlcmUuCisgICAgICAgIChXZWJL aXQ6Om1vZGlmaWVyc0ZvcktleUNvZGUpOiBIZWxwZXIgdG8gZ2V0IHRoZSBtb2RpZmllcnMgZm9y IGEga2V5IGNvZGUuCisgICAgICAgIChXZWJLaXQ6OldlYkF1dG9tYXRpb25TZXNzaW9uOjpwbGF0 Zm9ybVNpbXVsYXRlS2V5Ym9hcmRJbnRlcmFjdGlvbik6IEluaXRpYWxpemUgdGhlIG1vZGlmaWVy cyBhbHNvIHdoZW4KKyAgICAgICAgdmlydHVhbEtleSBpcyBzdGQ6Om51bGxvcHQ7CisKIDIwMTgt MDQtMjQgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtD b29yZEdyYXBoaWNzXSBSZW1vdmUgdW51c2VkIGZpeGVkIGxheW91dCBmdW5jdGlvbmFsaXR5CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9ndGsvV2ViRXZlbnRGYWN0b3J5LmNwcCBi L1NvdXJjZS9XZWJLaXQvU2hhcmVkL2d0ay9XZWJFdmVudEZhY3RvcnkuY3BwCmluZGV4IGRkOTRl MTk2N2NlLi4yZGY3NmUwYTJjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvZ3Rr L1dlYkV2ZW50RmFjdG9yeS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvZ3RrL1dlYkV2 ZW50RmFjdG9yeS5jcHAKQEAgLTEwNiwxMiArMTA2LDQwIEBAIHN0YXRpYyBpbmxpbmUgV2ViTW91 c2VFdmVudDo6QnV0dG9uIGJ1dHRvbkZvckV2ZW50KGNvbnN0IEdka0V2ZW50KiBldmVudCkKICAg ICByZXR1cm4gc3RhdGljX2Nhc3Q8V2ViTW91c2VFdmVudDo6QnV0dG9uPihidXR0b24pOwogfQog CitzdGF0aWMgaW5saW5lIHNob3J0IHByZXNzZWRNb3VzZUJ1dHRvbnMoR2RrTW9kaWZpZXJUeXBl IHN0YXRlKQoreworICAgIC8vIE1vdXNlRXZlbnQuYnV0dG9ucworICAgIC8vIGh0dHBzOi8vd3d3 LnczLm9yZy9UUi91aWV2ZW50cy8jcmVmLWZvci1kb20tbW91c2VldmVudC1idXR0b25zLTEKKwor ICAgIC8vIDAgTVVTVCBpbmRpY2F0ZSBubyBidXR0b24gaXMgY3VycmVudGx5IGFjdGl2ZS4KKyAg ICBzaG9ydCBidXR0b25zID0gMDsKKworICAgIC8vIDEgTVVTVCBpbmRpY2F0ZSB0aGUgcHJpbWFy eSBidXR0b24gb2YgdGhlIGRldmljZSAoaW4gZ2VuZXJhbCwgdGhlIGxlZnQgYnV0dG9uIG9yIHRo ZSBvbmx5IGJ1dHRvbiBvbgorICAgIC8vIHNpbmdsZS1idXR0b24gZGV2aWNlcywgdXNlZCB0byBh Y3RpdmF0ZSBhIHVzZXIgaW50ZXJmYWNlIGNvbnRyb2wgb3Igc2VsZWN0IHRleHQpLgorICAgIGlm IChzdGF0ZSAmIEdES19CVVRUT04xX01BU0spCisgICAgICAgIGJ1dHRvbnMgfD0gMTsKKworICAg IC8vIDQgTVVTVCBpbmRpY2F0ZSB0aGUgYXV4aWxpYXJ5IGJ1dHRvbiAoaW4gZ2VuZXJhbCwgdGhl IG1pZGRsZSBidXR0b24sIG9mdGVuIGNvbWJpbmVkIHdpdGggYSBtb3VzZSB3aGVlbCkuCisgICAg aWYgKHN0YXRlICYgR0RLX0JVVFRPTjJfTUFTSykKKyAgICAgICAgYnV0dG9ucyB8PSA0OworCisg ICAgLy8gMiBNVVNUIGluZGljYXRlIHRoZSBzZWNvbmRhcnkgYnV0dG9uIChpbiBnZW5lcmFsLCB0 aGUgcmlnaHQgYnV0dG9uLCBvZnRlbiB1c2VkIHRvIGRpc3BsYXkgYSBjb250ZXh0IG1lbnUpLAor ICAgIC8vIGlmIHByZXNlbnQuCisgICAgaWYgKHN0YXRlICYgR0RLX0JVVFRPTjNfTUFTSykKKyAg ICAgICAgYnV0dG9ucyB8PSAyOworCisgICAgcmV0dXJuIGJ1dHRvbnM7Cit9CisKIFdlYk1vdXNl RXZlbnQgV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJNb3VzZUV2ZW50KGNvbnN0IEdka0V2ZW50 KiBldmVudCwgaW50IGN1cnJlbnRDbGlja0NvdW50KQogewogICAgIGRvdWJsZSB4LCB5LCB4Um9v dCwgeVJvb3Q7CiAgICAgZ2RrX2V2ZW50X2dldF9jb29yZHMoZXZlbnQsICZ4LCAmeSk7CiAgICAg Z2RrX2V2ZW50X2dldF9yb290X2Nvb3JkcyhldmVudCwgJnhSb290LCAmeVJvb3QpOwogCisgICAg R2RrTW9kaWZpZXJUeXBlIHN0YXRlID0gc3RhdGljX2Nhc3Q8R2RrTW9kaWZpZXJUeXBlPigwKTsK KyAgICBnZGtfZXZlbnRfZ2V0X3N0YXRlKGV2ZW50LCAmc3RhdGUpOworCiAgICAgV2ViRXZlbnQ6 OlR5cGUgdHlwZSA9IHN0YXRpY19jYXN0PFdlYkV2ZW50OjpUeXBlPigwKTsKICAgICBzd2l0Y2gg KGV2ZW50LT50eXBlKSB7CiAgICAgY2FzZSBHREtfTU9USU9OX05PVElGWToKQEAgLTEyMSwxOSAr MTQ5LDI1IEBAIFdlYk1vdXNlRXZlbnQgV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJNb3VzZUV2 ZW50KGNvbnN0IEdka0V2ZW50KiBldmVudCwgaW50IGN1CiAgICAgICAgIGJyZWFrOwogICAgIGNh c2UgR0RLX0JVVFRPTl9QUkVTUzoKICAgICBjYXNlIEdES18yQlVUVE9OX1BSRVNTOgotICAgIGNh c2UgR0RLXzNCVVRUT05fUFJFU1M6CisgICAgY2FzZSBHREtfM0JVVFRPTl9QUkVTUzogewogICAg ICAgICB0eXBlID0gV2ViRXZlbnQ6Ok1vdXNlRG93bjsKKyAgICAgICAgdW5zaWduZWQgbW9kaWZp ZXIgPSAxIDw8ICg4ICsgZXZlbnQtPmJ1dHRvbi5idXR0b24gLSAxKTsKKyAgICAgICAgc3RhdGUg PSBzdGF0aWNfY2FzdDxHZGtNb2RpZmllclR5cGU+KHN0YXRlIHwgbW9kaWZpZXIpOwogICAgICAg ICBicmVhazsKLSAgICBjYXNlIEdES19CVVRUT05fUkVMRUFTRToKKyAgICB9CisgICAgY2FzZSBH REtfQlVUVE9OX1JFTEVBU0U6IHsKICAgICAgICAgdHlwZSA9IFdlYkV2ZW50OjpNb3VzZVVwOwor ICAgICAgICB1bnNpZ25lZCBtb2RpZmllciA9IDEgPDwgKDggKyBldmVudC0+YnV0dG9uLmJ1dHRv biAtIDEpOworICAgICAgICBzdGF0ZSA9IHN0YXRpY19jYXN0PEdka01vZGlmaWVyVHlwZT4oc3Rh dGUgJiB+bW9kaWZpZXIpOwogICAgICAgICBicmVhazsKKyAgICB9CiAgICAgZGVmYXVsdCA6CiAg ICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KIAogICAgIHJldHVybiBXZWJNb3Vz ZUV2ZW50KHR5cGUsCiAgICAgICAgIGJ1dHRvbkZvckV2ZW50KGV2ZW50KSwKLSAgICAgICAgMCwK KyAgICAgICAgcHJlc3NlZE1vdXNlQnV0dG9ucyhzdGF0ZSksCiAgICAgICAgIEludFBvaW50KHgs IHkpLAogICAgICAgICBJbnRQb2ludCh4Um9vdCwgeVJvb3QpLAogICAgICAgICAwIC8qIGRlbHRh WCAqLywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vZ3Rr L1dlYkF1dG9tYXRpb25TZXNzaW9uR3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1 dG9tYXRpb24vZ3RrL1dlYkF1dG9tYXRpb25TZXNzaW9uR3RrLmNwcAppbmRleCBiZjBkNWU2Njlk NS4uMGQyNzFmYzY4MjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9t YXRpb24vZ3RrL1dlYkF1dG9tYXRpb25TZXNzaW9uR3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL2d0ay9XZWJBdXRvbWF0aW9uU2Vzc2lvbkd0ay5jcHAKQEAg LTEwNCw3ICsxMDQsOCBAQCBzdGF0aWMgdm9pZCBkb01vdGlvbkV2ZW50KEd0a1dpZGdldCogd2lk Z2V0LCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgbG9jYXRpb24sCiB2b2lkIFdlYkF1dG9tYXRp b25TZXNzaW9uOjpwbGF0Zm9ybVNpbXVsYXRlTW91c2VJbnRlcmFjdGlvbihXZWJQYWdlUHJveHkm IHBhZ2UsIE1vdXNlSW50ZXJhY3Rpb24gaW50ZXJhY3Rpb24sIFdlYk1vdXNlRXZlbnQ6OkJ1dHRv biBidXR0b24sIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBsb2NhdGlvbkluVmlldywgV2ViRXZl bnQ6Ok1vZGlmaWVycyBrZXlNb2RpZmllcnMpCiB7CiAgICAgdW5zaWduZWQgZ2RrQnV0dG9uID0g bW91c2VCdXR0b25Ub0dka0J1dHRvbihidXR0b24pOwotICAgIHVuc2lnbmVkIHN0YXRlID0gbW9k aWZpZXJzVG9FdmVudFN0YXRlKGtleU1vZGlmaWVycyk7CisgICAgdW5zaWduZWQgbW9kaWZpZXIg PSAxIDw8ICg4ICsgZ2RrQnV0dG9uIC0gMSk7CisgICAgdW5zaWduZWQgc3RhdGUgPSBtb2RpZmll cnNUb0V2ZW50U3RhdGUoa2V5TW9kaWZpZXJzKSB8IG1fY3VycmVudE1vZGlmaWVyczsKIAogICAg IHN3aXRjaCAoaW50ZXJhY3Rpb24pIHsKICAgICBjYXNlIE1vdXNlSW50ZXJhY3Rpb246Ok1vdmU6 CkBAIC0xMTIsMTkgKzExMywyMSBAQCB2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjpwbGF0Zm9y bVNpbXVsYXRlTW91c2VJbnRlcmFjdGlvbihXZWJQYWdlUHJveHkmIHBhZ2UsCiAgICAgICAgIGJy ZWFrOwogICAgIGNhc2UgTW91c2VJbnRlcmFjdGlvbjo6RG93bjoKICAgICAgICAgZG9Nb3VzZUV2 ZW50KEdES19CVVRUT05fUFJFU1MsIHBhZ2Uudmlld1dpZGdldCgpLCBsb2NhdGlvbkluVmlldywg Z2RrQnV0dG9uLCBzdGF0ZSk7CisgICAgICAgIG1fY3VycmVudE1vZGlmaWVycyB8PSBtb2RpZmll cjsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBNb3VzZUludGVyYWN0aW9uOjpVcDoKICAgICAg ICAgZG9Nb3VzZUV2ZW50KEdES19CVVRUT05fUkVMRUFTRSwgcGFnZS52aWV3V2lkZ2V0KCksIGxv Y2F0aW9uSW5WaWV3LCBnZGtCdXR0b24sIHN0YXRlKTsKKyAgICAgICAgbV9jdXJyZW50TW9kaWZp ZXJzICY9IH5tb2RpZmllcjsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBNb3VzZUludGVyYWN0 aW9uOjpTaW5nbGVDbGljazoKICAgICAgICAgZG9Nb3VzZUV2ZW50KEdES19CVVRUT05fUFJFU1Ms IHBhZ2Uudmlld1dpZGdldCgpLCBsb2NhdGlvbkluVmlldywgZ2RrQnV0dG9uLCBzdGF0ZSk7Ci0g ICAgICAgIGRvTW91c2VFdmVudChHREtfQlVUVE9OX1JFTEVBU0UsIHBhZ2Uudmlld1dpZGdldCgp LCBsb2NhdGlvbkluVmlldywgZ2RrQnV0dG9uLCBzdGF0ZSk7CisgICAgICAgIGRvTW91c2VFdmVu dChHREtfQlVUVE9OX1JFTEVBU0UsIHBhZ2Uudmlld1dpZGdldCgpLCBsb2NhdGlvbkluVmlldywg Z2RrQnV0dG9uLCBzdGF0ZSB8IG1vZGlmaWVyKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBN b3VzZUludGVyYWN0aW9uOjpEb3VibGVDbGljazoKICAgICAgICAgZG9Nb3VzZUV2ZW50KEdES19C VVRUT05fUFJFU1MsIHBhZ2Uudmlld1dpZGdldCgpLCBsb2NhdGlvbkluVmlldywgZ2RrQnV0dG9u LCBzdGF0ZSk7Ci0gICAgICAgIGRvTW91c2VFdmVudChHREtfQlVUVE9OX1JFTEVBU0UsIHBhZ2Uu dmlld1dpZGdldCgpLCBsb2NhdGlvbkluVmlldywgZ2RrQnV0dG9uLCBzdGF0ZSk7CisgICAgICAg IGRvTW91c2VFdmVudChHREtfQlVUVE9OX1JFTEVBU0UsIHBhZ2Uudmlld1dpZGdldCgpLCBsb2Nh dGlvbkluVmlldywgZ2RrQnV0dG9uLCBzdGF0ZSB8IG1vZGlmaWVyKTsKICAgICAgICAgZG9Nb3Vz ZUV2ZW50KEdES19CVVRUT05fUFJFU1MsIHBhZ2Uudmlld1dpZGdldCgpLCBsb2NhdGlvbkluVmll dywgZ2RrQnV0dG9uLCBzdGF0ZSk7Ci0gICAgICAgIGRvTW91c2VFdmVudChHREtfQlVUVE9OX1JF TEVBU0UsIHBhZ2Uudmlld1dpZGdldCgpLCBsb2NhdGlvbkluVmlldywgZ2RrQnV0dG9uLCBzdGF0 ZSk7CisgICAgICAgIGRvTW91c2VFdmVudChHREtfQlVUVE9OX1JFTEVBU0UsIHBhZ2Uudmlld1dp ZGdldCgpLCBsb2NhdGlvbkluVmlldywgZ2RrQnV0dG9uLCBzdGF0ZSB8IG1vZGlmaWVyKTsKICAg ICAgICAgYnJlYWs7CiAgICAgfQogfQpAQCAtMTU2LDIxICsxNTksMTYgQEAgc3RhdGljIHZvaWQg ZG9LZXlTdHJva2VFdmVudChHZGtFdmVudFR5cGUgdHlwZSwgR3RrV2lkZ2V0KiB3aWRnZXQsIHVu c2lnbmVkIGtleVYKICAgICB9CiB9CiAKLXN0YXRpYyBpbnQga2V5Q29kZUZvclZpcnR1YWxLZXko SW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlvbjo6VmlydHVhbEtleSBrZXksIEdka01vZGlm aWVyVHlwZSYgc3RhdGUpCitzdGF0aWMgaW50IGtleUNvZGVGb3JWaXJ0dWFsS2V5KEluc3BlY3Rv cjo6UHJvdG9jb2w6OkF1dG9tYXRpb246OlZpcnR1YWxLZXkga2V5KQogewotICAgIHN0YXRlID0g c3RhdGljX2Nhc3Q8R2RrTW9kaWZpZXJUeXBlPigwKTsKICAgICBzd2l0Y2ggKGtleSkgewogICAg IGNhc2UgSW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlvbjo6VmlydHVhbEtleTo6U2hpZnQ6 Ci0gICAgICAgIHN0YXRlID0gR0RLX1NISUZUX01BU0s7CiAgICAgICAgIHJldHVybiBHREtfS0VZ X1NoaWZ0X1I7CiAgICAgY2FzZSBJbnNwZWN0b3I6OlByb3RvY29sOjpBdXRvbWF0aW9uOjpWaXJ0 dWFsS2V5OjpDb250cm9sOgotICAgICAgICBzdGF0ZSA9IEdES19DT05UUk9MX01BU0s7CiAgICAg ICAgIHJldHVybiBHREtfS0VZX0NvbnRyb2xfUjsKICAgICBjYXNlIEluc3BlY3Rvcjo6UHJvdG9j b2w6OkF1dG9tYXRpb246OlZpcnR1YWxLZXk6OkFsdGVybmF0ZToKLSAgICAgICAgc3RhdGUgPSBH REtfTU9EMV9NQVNLOwogICAgICAgICByZXR1cm4gR0RLX0tFWV9BbHRfTDsKICAgICBjYXNlIElu c3BlY3Rvcjo6UHJvdG9jb2w6OkF1dG9tYXRpb246OlZpcnR1YWxLZXk6Ok1ldGE6Ci0gICAgICAg IHN0YXRlID0gR0RLX01FVEFfTUFTSzsKICAgICAgICAgcmV0dXJuIEdES19LRVlfTWV0YV9SOwog ICAgIGNhc2UgSW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlvbjo6VmlydHVhbEtleTo6Q29t bWFuZDoKICAgICAgICAgcmV0dXJuIEdES19LRVlfRXhlY3V0ZTsKQEAgLTI4MCwyNCArMjc4LDM5 IEBAIHN0YXRpYyBpbnQga2V5Q29kZUZvclZpcnR1YWxLZXkoSW5zcGVjdG9yOjpQcm90b2NvbDo6 QXV0b21hdGlvbjo6VmlydHVhbEtleSBrZXksCiAgICAgcmV0dXJuIDA7CiB9CiAKK3N0YXRpYyB1 bnNpZ25lZCBtb2RpZmllcnNGb3JLZXlDb2RlKHVuc2lnbmVkIGtleUNvZGUpCit7CisgICAgc3dp dGNoIChrZXlDb2RlKSB7CisgICAgY2FzZSBHREtfS0VZX1NoaWZ0X1I6CisgICAgICAgIHJldHVy biBHREtfU0hJRlRfTUFTSzsKKyAgICBjYXNlIEdES19LRVlfQ29udHJvbF9SOgorICAgICAgICBy ZXR1cm4gR0RLX0NPTlRST0xfTUFTSzsKKyAgICBjYXNlIEdES19LRVlfQWx0X0w6CisgICAgICAg IHJldHVybiBHREtfTU9EMV9NQVNLOworICAgIGNhc2UgR0RLX0tFWV9NZXRhX1I6CisgICAgICAg IHJldHVybiBHREtfTUVUQV9NQVNLOworICAgIH0KKyAgICByZXR1cm4gMDsKK30KKwogdm9pZCBX ZWJBdXRvbWF0aW9uU2Vzc2lvbjo6cGxhdGZvcm1TaW11bGF0ZUtleWJvYXJkSW50ZXJhY3Rpb24o V2ViUGFnZVByb3h5JiBwYWdlLCBLZXlib2FyZEludGVyYWN0aW9uIGludGVyYWN0aW9uLCBzdGQ6 Om9wdGlvbmFsPFZpcnR1YWxLZXk+IHZpcnR1YWxLZXksIHN0ZDo6b3B0aW9uYWw8Q2hhcktleT4g Y2hhcktleSkKIHsKICAgICBBU1NFUlQodmlydHVhbEtleS5oYXNfdmFsdWUoKSB8fCBjaGFyS2V5 Lmhhc192YWx1ZSgpKTsKIAotICAgIEdka01vZGlmaWVyVHlwZSB1cGRhdGVTdGF0ZTsKLSAgICBp bnQga2V5Q29kZTsKKyAgICB1bnNpZ25lZCBrZXlDb2RlOwogICAgIGlmICh2aXJ0dWFsS2V5Lmhh c192YWx1ZSgpKQotICAgICAgICBrZXlDb2RlID0ga2V5Q29kZUZvclZpcnR1YWxLZXkodmlydHVh bEtleS52YWx1ZSgpLCB1cGRhdGVTdGF0ZSk7CisgICAgICAgIGtleUNvZGUgPSBrZXlDb2RlRm9y VmlydHVhbEtleSh2aXJ0dWFsS2V5LnZhbHVlKCkpOwogICAgIGVsc2UKICAgICAgICAga2V5Q29k ZSA9IGdka191bmljb2RlX3RvX2tleXZhbChnX3V0ZjhfZ2V0X2NoYXIoJmNoYXJLZXkudmFsdWUo KSkpOworICAgIHVuc2lnbmVkIG1vZGlmaWVycyA9IG1vZGlmaWVyc0ZvcktleUNvZGUoa2V5Q29k ZSk7CiAKICAgICBzd2l0Y2ggKGludGVyYWN0aW9uKSB7CiAgICAgY2FzZSBLZXlib2FyZEludGVy YWN0aW9uOjpLZXlQcmVzczoKLSAgICAgICAgbV9jdXJyZW50TW9kaWZpZXJzIHw9IHVwZGF0ZVN0 YXRlOworICAgICAgICBtX2N1cnJlbnRNb2RpZmllcnMgfD0gbW9kaWZpZXJzOwogICAgICAgICBk b0tleVN0cm9rZUV2ZW50KEdES19LRVlfUFJFU1MsIHBhZ2Uudmlld1dpZGdldCgpLCBrZXlDb2Rl LCBtX2N1cnJlbnRNb2RpZmllcnMpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIEtleWJvYXJk SW50ZXJhY3Rpb246OktleVJlbGVhc2U6Ci0gICAgICAgIG1fY3VycmVudE1vZGlmaWVycyAmPSB+ dXBkYXRlU3RhdGU7CisgICAgICAgIG1fY3VycmVudE1vZGlmaWVycyAmPSB+bW9kaWZpZXJzOwog ICAgICAgICBkb0tleVN0cm9rZUV2ZW50KEdES19LRVlfUkVMRUFTRSwgcGFnZS52aWV3V2lkZ2V0 KCksIGtleUNvZGUsIG1fY3VycmVudE1vZGlmaWVycyk7CiAgICAgICAgIGJyZWFrOwogICAgIGNh c2UgS2V5Ym9hcmRJbnRlcmFjdGlvbjo6SW5zZXJ0QnlLZXk6CmRpZmYgLS1naXQgYS9Ub29scy9D aGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjlhNzRkZmVhZTYuLjEyMDBlMTc1MzBm IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjAgQEAKKzIwMTgtMDQtMjQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBp Z2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEltcGxlbWVudCBNb3VzZUV2ZW50LmJ1dHRvbnMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NDkxMwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluY2x1ZGUg dGhlIG1vdXNlIGJ1dHRvbnMgc3RhdGUgaW4gV1RSIHN5bnRoZXNpemVkIGV2ZW50cy4KKworICAg ICAgICAqIFdlYktpdFRlc3RSdW5uZXIvRXZlbnRTZW5kZXJQcm94eS5oOgorICAgICAgICAqIFdl YktpdFRlc3RSdW5uZXIvZ3RrL0V2ZW50U2VuZGVyUHJveHlHdGsuY3BwOgorICAgICAgICAoV1RS OjpFdmVudFNlbmRlclByb3h5OjpFdmVudFNlbmRlclByb3h5KToKKyAgICAgICAgKFdUUjo6RXZl bnRTZW5kZXJQcm94eTo6Y3JlYXRlTW91c2VCdXR0b25FdmVudCk6CisgICAgICAgIChXVFI6OkV2 ZW50U2VuZGVyUHJveHk6Om1vdXNlRG93bik6CisgICAgICAgIChXVFI6OkV2ZW50U2VuZGVyUHJv eHk6Om1vdXNlVXApOgorICAgICAgICAoV1RSOjpFdmVudFNlbmRlclByb3h5Ojptb3VzZU1vdmVU byk6CisKIDIwMTgtMDQtMjQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIFVwZGF0ZSBXM0MgV2ViRHJpdmVyIGltcG9ydGVk IHRlc3RzLgpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9FdmVudFNlbmRlclBy b3h5LmggYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0V2ZW50U2VuZGVyUHJveHkuaAppbmRleCBi MmE4YjRmMjk0ZS4uNjY1ZTdhZDA5MzQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvRXZlbnRTZW5kZXJQcm94eS5oCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvRXZlbnRT ZW5kZXJQcm94eS5oCkBAIC0xMzYsNyArMTM2LDcgQEAgcHJpdmF0ZToKICAgICBpbnQgZXZlbnRO dW1iZXI7CiAjZWxpZiBQTEFURk9STShHVEspCiAgICAgRGVxdWU8V1RSRXZlbnRRdWV1ZUl0ZW0+ IG1fZXZlbnRRdWV1ZTsKLSAgICB1bnNpZ25lZCBtX21vdXNlQnV0dG9uQ3VycmVudGx5RG93bjsK KyAgICB1bnNpZ25lZCBtX21vdXNlQnV0dG9uc0N1cnJlbnRseURvd24geyAwIH07CiAgICAgVmVj dG9yPEdVbmlxdWVQdHI8R2RrRXZlbnQ+PiBtX3RvdWNoRXZlbnRzOwogICAgIEhhc2hTZXQ8aW50 PiBtX3VwZGF0ZWRUb3VjaEV2ZW50czsKICNlbGlmIFBMQVRGT1JNKFdQRSkKZGlmZiAtLWdpdCBh L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvZ3RrL0V2ZW50U2VuZGVyUHJveHlHdGsuY3BwIGIvVG9v bHMvV2ViS2l0VGVzdFJ1bm5lci9ndGsvRXZlbnRTZW5kZXJQcm94eUd0ay5jcHAKaW5kZXggNmI5 MTZkZmM2YjMuLjU1ZTIzMzA4NDc5IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVy L2d0ay9FdmVudFNlbmRlclByb3h5R3RrLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVy L2d0ay9FdmVudFNlbmRlclByb3h5R3RrLmNwcApAQCAtNzksNyArNzksNiBAQCBFdmVudFNlbmRl clByb3h5OjpFdmVudFNlbmRlclByb3h5KFRlc3RDb250cm9sbGVyKiB0ZXN0Q29udHJvbGxlcikK ICAgICAsIG1fY2xpY2tDb3VudCgwKQogICAgICwgbV9jbGlja1RpbWUoMCkKICAgICAsIG1fY2xp Y2tCdXR0b24oa1dLRXZlbnRNb3VzZUJ1dHRvbk5vQnV0dG9uKQotICAgICwgbV9tb3VzZUJ1dHRv bkN1cnJlbnRseURvd24oMCkKIHsKIH0KIApAQCAtODcsMTcgKzg2LDYgQEAgRXZlbnRTZW5kZXJQ cm94eTo6fkV2ZW50U2VuZGVyUHJveHkoKQogewogfQogCi1zdGF0aWMgZ3VpbnQgZ2V0TW91c2VC dXR0b25Nb2RpZmllcnMoaW50IGdka0J1dHRvbikKLXsKLSAgICBpZiAoZ2RrQnV0dG9uID09IDEp Ci0gICAgICAgIHJldHVybiBHREtfQlVUVE9OMV9NQVNLOwotICAgIGlmIChnZGtCdXR0b24gPT0g MikKLSAgICAgICAgcmV0dXJuIEdES19CVVRUT04yX01BU0s7Ci0gICAgaWYgKGdka0J1dHRvbiA9 PSAzKQotICAgICAgICByZXR1cm4gR0RLX0JVVFRPTjNfTUFTSzsKLSAgICByZXR1cm4gMDsKLX0K LQogc3RhdGljIHVuc2lnbmVkIGV2ZW50U2VuZGVyQnV0dG9uVG9HREtCdXR0b24odW5zaWduZWQg YnV0dG9uKQogewogICAgIGludCBtb3VzZUJ1dHRvbiA9IDM7CkBAIC0xMzIsMTMgKzEyMCwxMyBA QCBHZGtFdmVudCogRXZlbnRTZW5kZXJQcm94eTo6Y3JlYXRlTW91c2VCdXR0b25FdmVudChHZGtF dmVudFR5cGUgZXZlbnRUeXBlLCB1bnNpZwogewogICAgIEdka0V2ZW50KiBtb3VzZUV2ZW50ID0g Z2RrX2V2ZW50X25ldyhldmVudFR5cGUpOwogCi0gICAgbW91c2VFdmVudC0+YnV0dG9uLmJ1dHRv biA9IGV2ZW50U2VuZGVyQnV0dG9uVG9HREtCdXR0b24oYnV0dG9uKTsKKyAgICBtb3VzZUV2ZW50 LT5idXR0b24uYnV0dG9uID0gYnV0dG9uOwogICAgIG1vdXNlRXZlbnQtPmJ1dHRvbi54ID0gbV9w b3NpdGlvbi54OwogICAgIG1vdXNlRXZlbnQtPmJ1dHRvbi55ID0gbV9wb3NpdGlvbi55OwogICAg IG1vdXNlRXZlbnQtPmJ1dHRvbi53aW5kb3cgPSBndGtfd2lkZ2V0X2dldF93aW5kb3coR1RLX1dJ REdFVChtX3Rlc3RDb250cm9sbGVyLT5tYWluV2ViVmlldygpLT5wbGF0Zm9ybVZpZXcoKSkpOwog ICAgIGdfb2JqZWN0X3JlZihtb3VzZUV2ZW50LT5idXR0b24ud2luZG93KTsKICAgICBnZGtfZXZl bnRfc2V0X2RldmljZShtb3VzZUV2ZW50LCBnZGtfZGV2aWNlX21hbmFnZXJfZ2V0X2NsaWVudF9w b2ludGVyKGdka19kaXNwbGF5X2dldF9kZXZpY2VfbWFuYWdlcihnZGtfd2luZG93X2dldF9kaXNw bGF5KG1vdXNlRXZlbnQtPmJ1dHRvbi53aW5kb3cpKSkpOwotICAgIG1vdXNlRXZlbnQtPmJ1dHRv bi5zdGF0ZSA9IHdlYmtpdE1vZGlmaWVyc1RvR0RLTW9kaWZpZXJzKG1vZGlmaWVycykgfCBnZXRN b3VzZUJ1dHRvbk1vZGlmaWVycyhtb3VzZUV2ZW50LT5idXR0b24uYnV0dG9uKTsKKyAgICBtb3Vz ZUV2ZW50LT5idXR0b24uc3RhdGUgPSB3ZWJraXRNb2RpZmllcnNUb0dES01vZGlmaWVycyhtb2Rp ZmllcnMpIHwgbV9tb3VzZUJ1dHRvbnNDdXJyZW50bHlEb3duOwogICAgIG1vdXNlRXZlbnQtPmJ1 dHRvbi50aW1lID0gR0RLX0NVUlJFTlRfVElNRTsKICAgICBtb3VzZUV2ZW50LT5idXR0b24uYXhl cyA9IDA7CiAKQEAgLTMyNiwxNCArMzE0LDE0IEBAIHZvaWQgRXZlbnRTZW5kZXJQcm94eTo6a2V5 RG93bihXS1N0cmluZ1JlZiBrZXlSZWYsIFdLRXZlbnRNb2RpZmllcnMgd2tNb2RpZmllcnMsCiAK IHZvaWQgRXZlbnRTZW5kZXJQcm94eTo6bW91c2VEb3duKHVuc2lnbmVkIGJ1dHRvbiwgV0tFdmVu dE1vZGlmaWVycyB3a01vZGlmaWVycykKIHsKKyAgICB1bnNpZ25lZCBnZGtCdXR0b24gPSBldmVu dFNlbmRlckJ1dHRvblRvR0RLQnV0dG9uKGJ1dHRvbik7CisgICAgdW5zaWduZWQgbW9kaWZpZXIg PSAxIDw8ICg4ICsgZ2RrQnV0dG9uIC0gMSk7CisKICAgICAvLyBJZiB0aGUgc2FtZSBtb3VzZSBi dXR0b24gaXMgYWxyZWFkeSBpbiB0aGUgZG93biBwb3NpdGlvbiBkb24ndAogICAgIC8vIHNlbmQg YW5vdGhlciBldmVudCBhcyBpdCBtYXkgY29uZnVzZSBYdmZiLgotICAgIHVuc2lnbmVkIGdka0J1 dHRvbiA9IGV2ZW50U2VuZGVyQnV0dG9uVG9HREtCdXR0b24oYnV0dG9uKTsKLSAgICBpZiAobV9t b3VzZUJ1dHRvbkN1cnJlbnRseURvd24gPT0gZ2RrQnV0dG9uKQorICAgIGlmIChtX21vdXNlQnV0 dG9uc0N1cnJlbnRseURvd24gJiBtb2RpZmllcikKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9t b3VzZUJ1dHRvbkN1cnJlbnRseURvd24gPSBnZGtCdXR0b247Ci0KICAgICAvLyBOb3JtYWxseSBH REsgd2lsbCBzZW5kIGJvdGggR0RLX0JVVFRPTl9QUkVTUyBhbmQgR0RLXzJCVVRUT05fUFJFU1Mg Zm9yCiAgICAgLy8gdGhlIHNlY29uZCBidXR0b24gcHJlc3MgZHVyaW5nIGRvdWJsZS1jbGlja3Mu IFdlYktpdCBHVEsrIHNlbGVjdGl2ZWx5CiAgICAgLy8gaWdub3JlcyB0aGUgZmlyc3QgR0RLX0JV VFRPTl9QUkVTUyBvZiB0aGF0IHBhaXIgdXNpbmcgZ2RrX2V2ZW50X3BlZWsuCkBAIC0zNTIsMTgg KzM0MCwyMCBAQCB2b2lkIEV2ZW50U2VuZGVyUHJveHk6Om1vdXNlRG93bih1bnNpZ25lZCBidXR0 b24sIFdLRXZlbnRNb2RpZmllcnMgd2tNb2RpZmllcnMpCiAgICAgZWxzZQogICAgICAgICBldmVu dFR5cGUgPSBHREtfQlVUVE9OX1BSRVNTOwogCi0gICAgR2RrRXZlbnQqIGV2ZW50ID0gY3JlYXRl TW91c2VCdXR0b25FdmVudChldmVudFR5cGUsIGJ1dHRvbiwgd2tNb2RpZmllcnMpOworICAgIEdk a0V2ZW50KiBldmVudCA9IGNyZWF0ZU1vdXNlQnV0dG9uRXZlbnQoZXZlbnRUeXBlLCBnZGtCdXR0 b24sIHdrTW9kaWZpZXJzKTsKKyAgICBtX21vdXNlQnV0dG9uc0N1cnJlbnRseURvd24gfD0gbW9k aWZpZXI7CiAgICAgc2VuZE9yUXVldWVFdmVudChldmVudCk7CiB9CiAKIHZvaWQgRXZlbnRTZW5k ZXJQcm94eTo6bW91c2VVcCh1bnNpZ25lZCBidXR0b24sIFdLRXZlbnRNb2RpZmllcnMgd2tNb2Rp ZmllcnMpCiB7CiAgICAgbV9jbGlja0J1dHRvbiA9IGtXS0V2ZW50TW91c2VCdXR0b25Ob0J1dHRv bjsKLSAgICBHZGtFdmVudCogZXZlbnQgPSBjcmVhdGVNb3VzZUJ1dHRvbkV2ZW50KEdES19CVVRU T05fUkVMRUFTRSwgYnV0dG9uLCB3a01vZGlmaWVycyk7CisgICAgdW5zaWduZWQgZ2RrQnV0dG9u ID0gZXZlbnRTZW5kZXJCdXR0b25Ub0dES0J1dHRvbihidXR0b24pOworICAgIEdka0V2ZW50KiBl dmVudCA9IGNyZWF0ZU1vdXNlQnV0dG9uRXZlbnQoR0RLX0JVVFRPTl9SRUxFQVNFLCBnZGtCdXR0 b24sIHdrTW9kaWZpZXJzKTsKKyAgICB1bnNpZ25lZCBtb2RpZmllciA9IDEgPDwgKDggKyBnZGtC dXR0b24gLSAxKTsKKyAgICBtX21vdXNlQnV0dG9uc0N1cnJlbnRseURvd24gJj0gfm1vZGlmaWVy OwogICAgIHNlbmRPclF1ZXVlRXZlbnQoZXZlbnQpOwogCi0gICAgaWYgKG1fbW91c2VCdXR0b25D dXJyZW50bHlEb3duID09IGV2ZW50LT5idXR0b24uYnV0dG9uKQotICAgICAgICBtX21vdXNlQnV0 dG9uQ3VycmVudGx5RG93biA9IDA7CiAgICAgbV9jbGlja1Bvc2l0aW9uID0gbV9wb3NpdGlvbjsK ICAgICBtX2NsaWNrVGltZSA9IEdES19DVVJSRU5UX1RJTUU7CiB9CkBAIC0zODEsNyArMzcxLDcg QEAgdm9pZCBFdmVudFNlbmRlclByb3h5Ojptb3VzZU1vdmVUbyhkb3VibGUgeCwgZG91YmxlIHkp CiAgICAgZXZlbnQtPm1vdGlvbi53aW5kb3cgPSBndGtfd2lkZ2V0X2dldF93aW5kb3coR1RLX1dJ REdFVChtX3Rlc3RDb250cm9sbGVyLT5tYWluV2ViVmlldygpLT5wbGF0Zm9ybVZpZXcoKSkpOwog ICAgIGdfb2JqZWN0X3JlZihldmVudC0+bW90aW9uLndpbmRvdyk7CiAgICAgZ2RrX2V2ZW50X3Nl dF9kZXZpY2UoZXZlbnQsIGdka19kZXZpY2VfbWFuYWdlcl9nZXRfY2xpZW50X3BvaW50ZXIoZ2Rr X2Rpc3BsYXlfZ2V0X2RldmljZV9tYW5hZ2VyKGdka193aW5kb3dfZ2V0X2Rpc3BsYXkoZXZlbnQt Pm1vdGlvbi53aW5kb3cpKSkpOwotICAgIGV2ZW50LT5tb3Rpb24uc3RhdGUgPSAwIHwgZ2V0TW91 c2VCdXR0b25Nb2RpZmllcnMobV9tb3VzZUJ1dHRvbkN1cnJlbnRseURvd24pOworICAgIGV2ZW50 LT5tb3Rpb24uc3RhdGUgPSBtX21vdXNlQnV0dG9uc0N1cnJlbnRseURvd247CiAgICAgZXZlbnQt Pm1vdGlvbi5heGVzID0gMDsKIAogICAgIGludCB4Um9vdCwgeVJvb3Q7Cg==