198822 2019-06-13 03:20:08 -0700 [GTK] gdk_display_get_device_manager and gdk_screen_get_width/height are deprecated 2019-06-13 04:38:53 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ludovico.denittis webkit-unassigned bugs-noreply cgarcia commit-queue oldest_to_newest 1544415 0 ludovico.denittis 2019-06-13 03:20:08 -0700 Since GTK 3.20 gdk_display_get_device_manager has been deprecated. Since GTK 3.22 gdk_screen_get_width and gdk_screen_get_height has been deprecated. I'm going to upload a patch. The two deprecation are not related (is only that they are both used in the same GtkVersioning.c file), but this is a small patch so I decided to go with a single commit. Let me know if you prefer two separated commits. 1544416 1 372043 ludovico.denittis 2019-06-13 03:27:04 -0700 Created attachment 372043 Patch 1544417 2 372043 cgarcia 2019-06-13 03:42:38 -0700 Comment on attachment 372043 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372043&action=review > Source/WebCore/platform/gtk/GtkVersioning.c:35 > + GdkSeat *seat = gdk_display_get_default_seat(gdk_window_get_display(window)); > + return gdk_seat_get_pointer(seat); return gdk_seat_get_pointer(gdk_display_get_default_seat(gdk_window_get_display(window))); 1544422 3 372045 ludovico.denittis 2019-06-13 03:51:24 -0700 Created attachment 372045 Patch 1544424 4 372045 commit-queue 2019-06-13 04:38:51 -0700 Comment on attachment 372045 Patch Clearing flags on attachment: 372045 Committed r246398: <https://trac.webkit.org/changeset/246398> 1544425 5 commit-queue 2019-06-13 04:38:53 -0700 All reviewed patches have been landed. Closing bug. 372043 2019-06-13 03:27:04 -0700 2019-06-13 03:51:20 -0700 Patch bug-198822-20190613122703.patch text/plain 5635 ludovico.denittis U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2Mzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGE4ZWExNDBiMTA2NmY4 ZDM0NjU1NGU0ODQxMDcyZmZlMzRlODk5Zi4uNTUxMWEyOGNmYTg0ZjBhNTkxNWVmZGNkNjM3MWUy NGVjYjUzOTI5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE5LTA2LTEzICBMdWRv dmljbyBkZSBOaXR0aXMgIDxsdWRvdmljby5kZW5pdHRpc0Bjb2xsYWJvcmEuY29tPgorCisgICAg ICAgIFtHVEtdIGdka19kaXNwbGF5X2dldF9kZXZpY2VfbWFuYWdlciBhbmQgZ2RrX3NjcmVlbl9n ZXRfd2lkdGgvaGVpZ2h0IGFyZSBkZXByZWNhdGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg4MjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBHZGtTZWF0IGFuZCBHZGtSZWN0YW5nbGUgc2hvdWxkIGJl IHVzZWQsIHJlc3BlY3RpdmVseS4KKworICAgICAgICBObyBiZWhhdmlvdXIgY2hhbmdlcy4KKwor ICAgICAgICAqIHBsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmM6CisgICAgICAgIChnZXREZWZh dWx0R0RLUG9pbnRlckRldmljZSk6CisgICAgICAgIChnZXRTY3JlZW5Xb3JrQXJlYSk6CisKIDIw MTktMDYtMTIgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAgICBb V0hMU0xdIEhvb2sgdXAgY29tcHV0ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAwZDk5MDA5ZjQ2NDQ0Y2UwOTQ1Y2Q4 MDNiNzE2ZDZhYTFiMTE1NjM5Li4yN2NlYzU1ZTc3ODMwOTM2MjkyYzI2ODU3OTUxN2UyMDIwODg2 NzQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTA2LTEzICBMdWRvdmljbyBkZSBO aXR0aXMgIDxsdWRvdmljby5kZW5pdHRpc0Bjb2xsYWJvcmEuY29tPgorCisgICAgICAgIFtHVEtd IGdka19kaXNwbGF5X2dldF9kZXZpY2VfbWFuYWdlciBhbmQgZ2RrX3NjcmVlbl9nZXRfd2lkdGgv aGVpZ2h0IGFyZSBkZXByZWNhdGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTg4MjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBHZGtTZWF0IGFuZCBHZGtSZWN0YW5nbGUgc2hvdWxkIGJlIHVzZWQsIHJl c3BlY3RpdmVseS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BdXRvbWF0aW9uL2d0ay9XZWJBdXRv bWF0aW9uU2Vzc2lvbkd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OmRvTW91c2VFdmVudCk6Cisg ICAgICAgIChXZWJLaXQ6OmRvTW90aW9uRXZlbnQpOgorICAgICAgICAoV2ViS2l0Ojpkb0tleVN0 cm9rZUV2ZW50KToKKwogMjAxOS0wNi0xMiAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUu Y29tPgogCiAgICAgICAgIFNob3cgdGhlIHdlYiBwYWdlIFVSTCB3aGVuIHNoYXJpbmcgYW4gQVIg bW9kZWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9u aW5nLmMgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5jCmluZGV4 IDBkNTFiMzgxNzQwZjFjMmIzY2UwNzZkMTg2OWQ3YTA3M2Y5ZDU0OGEuLjk4YzBjZjU0OGIxODRh MzliZjRkMmI3ZjVhMjdhODI2NWFjZTAwNDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmMKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3RrL0d0a1ZlcnNpb25pbmcuYwpAQCAtMzAsNyArMzAsMTAgQEAKIAogR2RrRGV2aWNlICpnZXRE ZWZhdWx0R0RLUG9pbnRlckRldmljZShHZGtXaW5kb3cqIHdpbmRvdykKIHsKLSNpZm5kZWYgR1RL X0FQSV9WRVJTSU9OXzIKKyNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigzLCAyMCwgMCkKKyAgICBHZGtT ZWF0ICpzZWF0ID0gZ2RrX2Rpc3BsYXlfZ2V0X2RlZmF1bHRfc2VhdChnZGtfd2luZG93X2dldF9k aXNwbGF5KHdpbmRvdykpOworICAgIHJldHVybiBnZGtfc2VhdF9nZXRfcG9pbnRlcihzZWF0KTsK KyNlbGlmICFkZWZpbmVkKEdUS19BUElfVkVSU0lPTl8yKQogICAgIEdka0RldmljZU1hbmFnZXIg Km1hbmFnZXIgPSAgZ2RrX2Rpc3BsYXlfZ2V0X2RldmljZV9tYW5hZ2VyKGdka193aW5kb3dfZ2V0 X2Rpc3BsYXkod2luZG93KSk7CiAgICAgcmV0dXJuIGdka19kZXZpY2VfbWFuYWdlcl9nZXRfY2xp ZW50X3BvaW50ZXIobWFuYWdlcik7CiAjZWxzZQpAQCAtMjMzLDEwICsyMzYsMjAgQEAgc3RhdGlj IHZvaWQgZ2V0U2NyZWVuV29ya0FyZWEoR2RrU2NyZWVuICpzY3JlZW4sIEdka1JlY3RhbmdsZSAq YXJlYSkKICAgICBBdG9tIHdvcmtBcmVhID0gWEludGVybkF0b20oZGlzcGxheSwgIl9ORVRfV09S S0FSRUEiLCBUcnVlKTsKIAogICAgIC8qIERlZmF1bHRzIGluIGNhc2Ugb2YgZXJyb3IuICovCisj aWYgR1RLX0NIRUNLX1ZFUlNJT04oMywgMjIsIDApCisgICAgR2RrUmVjdGFuZ2xlIGdlb207Cisg ICAgR2RrTW9uaXRvciAqbW9uaXRvciA9IGdka19kaXNwbGF5X2dldF9wcmltYXJ5X21vbml0b3Io ZGlzcGxheSk7CisgICAgZ2RrX21vbml0b3JfZ2V0X2dlb21ldHJ5KG1vbml0b3IsICZnZW9tKTsK KyAgICBhcmVhLT54ID0gZ2VvbS54OworICAgIGFyZWEtPnkgPSBnZW9tLnk7CisgICAgYXJlYS0+ d2lkdGggPSBnZW9tLndpZHRoOworICAgIGFyZWEtPmhlaWdodCA9IGdlb20uaGVpZ2h0OworI2Vs c2UKICAgICBhcmVhLT54ID0gMDsKICAgICBhcmVhLT55ID0gMDsKICAgICBhcmVhLT53aWR0aCA9 IGdka19zY3JlZW5fZ2V0X3dpZHRoKHNjcmVlbik7CiAgICAgYXJlYS0+aGVpZ2h0ID0gZ2RrX3Nj cmVlbl9nZXRfaGVpZ2h0KHNjcmVlbik7CisjZW5kaWYKIAogICAgIGlmICh3b3JrQXJlYSA9PSBO b25lKQogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BdXRvbWF0aW9uL2d0ay9XZWJBdXRvbWF0aW9uU2Vzc2lvbkd0ay5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL2d0ay9XZWJBdXRvbWF0aW9uU2Vzc2lvbkd0ay5jcHAK aW5kZXggMzZmNzhhODcyMzViZGRhNDkyZGZiYWEyMGNkMDI1M2JkNDIxY2RjZS4uY2U5MmIwNzIy NDk5ZGJhZDUyZjVmODc4MTlkZjA4MzhkNWVlYWY2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQXV0b21hdGlvbi9ndGsvV2ViQXV0b21hdGlvblNlc3Npb25HdGsuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vZ3RrL1dlYkF1dG9tYXRpb25T ZXNzaW9uR3RrLmNwcApAQCAtNzUsNyArNzUsMTEgQEAgc3RhdGljIHZvaWQgZG9Nb3VzZUV2ZW50 KEdka0V2ZW50VHlwZSB0eXBlLCBHdGtXaWRnZXQqIHdpZGdldCwgY29uc3QgV2ViQ29yZTo6SW4K ICAgICBldmVudC0+YnV0dG9uLmF4ZXMgPSAwOwogICAgIGV2ZW50LT5idXR0b24uc3RhdGUgPSBz dGF0ZTsKICAgICBldmVudC0+YnV0dG9uLmJ1dHRvbiA9IGJ1dHRvbjsKKyNpZiBHVEtfQ0hFQ0tf VkVSU0lPTigzLCAyMCwgMCkKKyAgICBldmVudC0+YnV0dG9uLmRldmljZSA9IGdka19zZWF0X2dl dF9wb2ludGVyKGdka19kaXNwbGF5X2dldF9kZWZhdWx0X3NlYXQoZ3RrX3dpZGdldF9nZXRfZGlz cGxheSh3aWRnZXQpKSk7CisjZWxzZQogICAgIGV2ZW50LT5idXR0b24uZGV2aWNlID0gZ2RrX2Rl dmljZV9tYW5hZ2VyX2dldF9jbGllbnRfcG9pbnRlcihnZGtfZGlzcGxheV9nZXRfZGV2aWNlX21h bmFnZXIoZ3RrX3dpZGdldF9nZXRfZGlzcGxheSh3aWRnZXQpKSk7CisjZW5kaWYKICAgICBpbnQg eFJvb3QsIHlSb290OwogICAgIGdka193aW5kb3dfZ2V0X3Jvb3RfY29vcmRzKGd0a193aWRnZXRf Z2V0X3dpbmRvdyh3aWRnZXQpLCBsb2NhdGlvbi54KCksIGxvY2F0aW9uLnkoKSwgJnhSb290LCAm eVJvb3QpOwogICAgIGV2ZW50LT5idXR0b24ueF9yb290ID0geFJvb3Q7CkBAIC05Myw3ICs5Nywx MSBAQCBzdGF0aWMgdm9pZCBkb01vdGlvbkV2ZW50KEd0a1dpZGdldCogd2lkZ2V0LCBjb25zdCBX ZWJDb3JlOjpJbnRQb2ludCYgbG9jYXRpb24sCiAgICAgZXZlbnQtPm1vdGlvbi55ID0gbG9jYXRp b24ueSgpOwogICAgIGV2ZW50LT5tb3Rpb24uYXhlcyA9IDA7CiAgICAgZXZlbnQtPm1vdGlvbi5z dGF0ZSA9IHN0YXRlOworI2lmIEdUS19DSEVDS19WRVJTSU9OKDMsIDIwLCAwKQorICAgIGV2ZW50 LT5tb3Rpb24uZGV2aWNlID0gZ2RrX3NlYXRfZ2V0X3BvaW50ZXIoZ2RrX2Rpc3BsYXlfZ2V0X2Rl ZmF1bHRfc2VhdChndGtfd2lkZ2V0X2dldF9kaXNwbGF5KHdpZGdldCkpKTsKKyNlbHNlCiAgICAg ZXZlbnQtPm1vdGlvbi5kZXZpY2UgPSBnZGtfZGV2aWNlX21hbmFnZXJfZ2V0X2NsaWVudF9wb2lu dGVyKGdka19kaXNwbGF5X2dldF9kZXZpY2VfbWFuYWdlcihndGtfd2lkZ2V0X2dldF9kaXNwbGF5 KHdpZGdldCkpKTsKKyNlbmRpZgogICAgIGludCB4Um9vdCwgeVJvb3Q7CiAgICAgZ2RrX3dpbmRv d19nZXRfcm9vdF9jb29yZHMoZ3RrX3dpZGdldF9nZXRfd2luZG93KHdpZGdldCksIGxvY2F0aW9u LngoKSwgbG9jYXRpb24ueSgpLCAmeFJvb3QsICZ5Um9vdCk7CiAgICAgZXZlbnQtPm1vdGlvbi54 X3Jvb3QgPSB4Um9vdDsKQEAgLTE0Miw3ICsxNTAsMTIgQEAgc3RhdGljIHZvaWQgZG9LZXlTdHJv a2VFdmVudChHZGtFdmVudFR5cGUgdHlwZSwgR3RrV2lkZ2V0KiB3aWRnZXQsIHVuc2lnbmVkIGtl eVYKICAgICBldmVudC0+a2V5LnRpbWUgPSBHREtfQ1VSUkVOVF9USU1FOwogICAgIGV2ZW50LT5r ZXkud2luZG93ID0gZ3RrX3dpZGdldF9nZXRfd2luZG93KHdpZGdldCk7CiAgICAgZ19vYmplY3Rf cmVmKGV2ZW50LT5rZXkud2luZG93KTsKKworI2lmIEdUS19DSEVDS19WRVJTSU9OKDMsIDIwLCAw KQorICAgIGdka19ldmVudF9zZXRfZGV2aWNlKGV2ZW50LmdldCgpLCBnZGtfc2VhdF9nZXRfcG9p bnRlcihnZGtfZGlzcGxheV9nZXRfZGVmYXVsdF9zZWF0KGd0a193aWRnZXRfZ2V0X2Rpc3BsYXko d2lkZ2V0KSkpKTsKKyNlbHNlCiAgICAgZ2RrX2V2ZW50X3NldF9kZXZpY2UoZXZlbnQuZ2V0KCks IGdka19kZXZpY2VfbWFuYWdlcl9nZXRfY2xpZW50X3BvaW50ZXIoZ2RrX2Rpc3BsYXlfZ2V0X2Rl dmljZV9tYW5hZ2VyKGd0a193aWRnZXRfZ2V0X2Rpc3BsYXkod2lkZ2V0KSkpKTsKKyNlbmRpZgog ICAgIGV2ZW50LT5rZXkuc3RhdGUgPSBzdGF0ZTsKIAogICAgIC8vIFdoZW4gc3ludGhlc2l6aW5n IGFuIGV2ZW50LCBhbiBpbnZhbGlkIGhhcmR3YXJlX2tleWNvZGUgdmFsdWUgY2FuIGNhdXNlIGl0 IHRvIGJlIGJhZGx5IHByb2Nlc3NlZCBieSBHVEsrLgpAQCAtMzMyLDQgKzM0NSwzIEBAIHZvaWQg V2ViQXV0b21hdGlvblNlc3Npb246OnBsYXRmb3JtU2ltdWxhdGVLZXlTZXF1ZW5jZShXZWJQYWdl UHJveHkmIHBhZ2UsIGNvbnN0CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAotCg== 372045 2019-06-13 03:51:24 -0700 2019-06-13 04:38:51 -0700 Patch bug-198822-20190613125123.patch text/plain 5607 ludovico.denittis U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2Mzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGE4ZWExNDBiMTA2NmY4 ZDM0NjU1NGU0ODQxMDcyZmZlMzRlODk5Zi4uNTUxMWEyOGNmYTg0ZjBhNTkxNWVmZGNkNjM3MWUy NGVjYjUzOTI5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE5LTA2LTEzICBMdWRv dmljbyBkZSBOaXR0aXMgIDxsdWRvdmljby5kZW5pdHRpc0Bjb2xsYWJvcmEuY29tPgorCisgICAg ICAgIFtHVEtdIGdka19kaXNwbGF5X2dldF9kZXZpY2VfbWFuYWdlciBhbmQgZ2RrX3NjcmVlbl9n ZXRfd2lkdGgvaGVpZ2h0IGFyZSBkZXByZWNhdGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg4MjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBHZGtTZWF0IGFuZCBHZGtSZWN0YW5nbGUgc2hvdWxkIGJl IHVzZWQsIHJlc3BlY3RpdmVseS4KKworICAgICAgICBObyBiZWhhdmlvdXIgY2hhbmdlcy4KKwor ICAgICAgICAqIHBsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmM6CisgICAgICAgIChnZXREZWZh dWx0R0RLUG9pbnRlckRldmljZSk6CisgICAgICAgIChnZXRTY3JlZW5Xb3JrQXJlYSk6CisKIDIw MTktMDYtMTIgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAgICBb V0hMU0xdIEhvb2sgdXAgY29tcHV0ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAwZDk5MDA5ZjQ2NDQ0Y2UwOTQ1Y2Q4 MDNiNzE2ZDZhYTFiMTE1NjM5Li4yN2NlYzU1ZTc3ODMwOTM2MjkyYzI2ODU3OTUxN2UyMDIwODg2 NzQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTA2LTEzICBMdWRvdmljbyBkZSBO aXR0aXMgIDxsdWRvdmljby5kZW5pdHRpc0Bjb2xsYWJvcmEuY29tPgorCisgICAgICAgIFtHVEtd IGdka19kaXNwbGF5X2dldF9kZXZpY2VfbWFuYWdlciBhbmQgZ2RrX3NjcmVlbl9nZXRfd2lkdGgv aGVpZ2h0IGFyZSBkZXByZWNhdGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTg4MjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBHZGtTZWF0IGFuZCBHZGtSZWN0YW5nbGUgc2hvdWxkIGJlIHVzZWQsIHJl c3BlY3RpdmVseS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BdXRvbWF0aW9uL2d0ay9XZWJBdXRv bWF0aW9uU2Vzc2lvbkd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OmRvTW91c2VFdmVudCk6Cisg ICAgICAgIChXZWJLaXQ6OmRvTW90aW9uRXZlbnQpOgorICAgICAgICAoV2ViS2l0Ojpkb0tleVN0 cm9rZUV2ZW50KToKKwogMjAxOS0wNi0xMiAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUu Y29tPgogCiAgICAgICAgIFNob3cgdGhlIHdlYiBwYWdlIFVSTCB3aGVuIHNoYXJpbmcgYW4gQVIg bW9kZWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9u aW5nLmMgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5jCmluZGV4 IDBkNTFiMzgxNzQwZjFjMmIzY2UwNzZkMTg2OWQ3YTA3M2Y5ZDU0OGEuLjAxZTU4NjMxOWYxNjQ0 MWYyYjU3NmY4OGRlNjVlOTNkMjdhYTA0OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmMKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3RrL0d0a1ZlcnNpb25pbmcuYwpAQCAtMzAsNyArMzAsOSBAQAogCiBHZGtEZXZpY2UgKmdldERl ZmF1bHRHREtQb2ludGVyRGV2aWNlKEdka1dpbmRvdyogd2luZG93KQogewotI2lmbmRlZiBHVEtf QVBJX1ZFUlNJT05fMgorI2lmIEdUS19DSEVDS19WRVJTSU9OKDMsIDIwLCAwKQorICAgIHJldHVy biBnZGtfc2VhdF9nZXRfcG9pbnRlcihnZGtfZGlzcGxheV9nZXRfZGVmYXVsdF9zZWF0KGdka193 aW5kb3dfZ2V0X2Rpc3BsYXkod2luZG93KSkpOworI2VsaWYgIWRlZmluZWQoR1RLX0FQSV9WRVJT SU9OXzIpCiAgICAgR2RrRGV2aWNlTWFuYWdlciAqbWFuYWdlciA9ICBnZGtfZGlzcGxheV9nZXRf ZGV2aWNlX21hbmFnZXIoZ2RrX3dpbmRvd19nZXRfZGlzcGxheSh3aW5kb3cpKTsKICAgICByZXR1 cm4gZ2RrX2RldmljZV9tYW5hZ2VyX2dldF9jbGllbnRfcG9pbnRlcihtYW5hZ2VyKTsKICNlbHNl CkBAIC0yMzMsMTAgKzIzNSwyMCBAQCBzdGF0aWMgdm9pZCBnZXRTY3JlZW5Xb3JrQXJlYShHZGtT Y3JlZW4gKnNjcmVlbiwgR2RrUmVjdGFuZ2xlICphcmVhKQogICAgIEF0b20gd29ya0FyZWEgPSBY SW50ZXJuQXRvbShkaXNwbGF5LCAiX05FVF9XT1JLQVJFQSIsIFRydWUpOwogCiAgICAgLyogRGVm YXVsdHMgaW4gY2FzZSBvZiBlcnJvci4gKi8KKyNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigzLCAyMiwg MCkKKyAgICBHZGtSZWN0YW5nbGUgZ2VvbTsKKyAgICBHZGtNb25pdG9yICptb25pdG9yID0gZ2Rr X2Rpc3BsYXlfZ2V0X3ByaW1hcnlfbW9uaXRvcihkaXNwbGF5KTsKKyAgICBnZGtfbW9uaXRvcl9n ZXRfZ2VvbWV0cnkobW9uaXRvciwgJmdlb20pOworICAgIGFyZWEtPnggPSBnZW9tLng7CisgICAg YXJlYS0+eSA9IGdlb20ueTsKKyAgICBhcmVhLT53aWR0aCA9IGdlb20ud2lkdGg7CisgICAgYXJl YS0+aGVpZ2h0ID0gZ2VvbS5oZWlnaHQ7CisjZWxzZQogICAgIGFyZWEtPnggPSAwOwogICAgIGFy ZWEtPnkgPSAwOwogICAgIGFyZWEtPndpZHRoID0gZ2RrX3NjcmVlbl9nZXRfd2lkdGgoc2NyZWVu KTsKICAgICBhcmVhLT5oZWlnaHQgPSBnZGtfc2NyZWVuX2dldF9oZWlnaHQoc2NyZWVuKTsKKyNl bmRpZgogCiAgICAgaWYgKHdvcmtBcmVhID09IE5vbmUpCiAgICAgICAgIHJldHVybjsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vZ3RrL1dlYkF1dG9tYXRp b25TZXNzaW9uR3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vZ3Rr L1dlYkF1dG9tYXRpb25TZXNzaW9uR3RrLmNwcAppbmRleCAzNmY3OGE4NzIzNWJkZGE0OTJkZmJh YTIwY2QwMjUzYmQ0MjFjZGNlLi5jZTkyYjA3MjI0OTlkYmFkNTJmNWY4NzgxOWRmMDgzOGQ1ZWVh ZjZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL2d0ay9X ZWJBdXRvbWF0aW9uU2Vzc2lvbkd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QXV0b21hdGlvbi9ndGsvV2ViQXV0b21hdGlvblNlc3Npb25HdGsuY3BwCkBAIC03NSw3ICs3NSwx MSBAQCBzdGF0aWMgdm9pZCBkb01vdXNlRXZlbnQoR2RrRXZlbnRUeXBlIHR5cGUsIEd0a1dpZGdl dCogd2lkZ2V0LCBjb25zdCBXZWJDb3JlOjpJbgogICAgIGV2ZW50LT5idXR0b24uYXhlcyA9IDA7 CiAgICAgZXZlbnQtPmJ1dHRvbi5zdGF0ZSA9IHN0YXRlOwogICAgIGV2ZW50LT5idXR0b24uYnV0 dG9uID0gYnV0dG9uOworI2lmIEdUS19DSEVDS19WRVJTSU9OKDMsIDIwLCAwKQorICAgIGV2ZW50 LT5idXR0b24uZGV2aWNlID0gZ2RrX3NlYXRfZ2V0X3BvaW50ZXIoZ2RrX2Rpc3BsYXlfZ2V0X2Rl ZmF1bHRfc2VhdChndGtfd2lkZ2V0X2dldF9kaXNwbGF5KHdpZGdldCkpKTsKKyNlbHNlCiAgICAg ZXZlbnQtPmJ1dHRvbi5kZXZpY2UgPSBnZGtfZGV2aWNlX21hbmFnZXJfZ2V0X2NsaWVudF9wb2lu dGVyKGdka19kaXNwbGF5X2dldF9kZXZpY2VfbWFuYWdlcihndGtfd2lkZ2V0X2dldF9kaXNwbGF5 KHdpZGdldCkpKTsKKyNlbmRpZgogICAgIGludCB4Um9vdCwgeVJvb3Q7CiAgICAgZ2RrX3dpbmRv d19nZXRfcm9vdF9jb29yZHMoZ3RrX3dpZGdldF9nZXRfd2luZG93KHdpZGdldCksIGxvY2F0aW9u LngoKSwgbG9jYXRpb24ueSgpLCAmeFJvb3QsICZ5Um9vdCk7CiAgICAgZXZlbnQtPmJ1dHRvbi54 X3Jvb3QgPSB4Um9vdDsKQEAgLTkzLDcgKzk3LDExIEBAIHN0YXRpYyB2b2lkIGRvTW90aW9uRXZl bnQoR3RrV2lkZ2V0KiB3aWRnZXQsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBsb2NhdGlvbiwK ICAgICBldmVudC0+bW90aW9uLnkgPSBsb2NhdGlvbi55KCk7CiAgICAgZXZlbnQtPm1vdGlvbi5h eGVzID0gMDsKICAgICBldmVudC0+bW90aW9uLnN0YXRlID0gc3RhdGU7CisjaWYgR1RLX0NIRUNL X1ZFUlNJT04oMywgMjAsIDApCisgICAgZXZlbnQtPm1vdGlvbi5kZXZpY2UgPSBnZGtfc2VhdF9n ZXRfcG9pbnRlcihnZGtfZGlzcGxheV9nZXRfZGVmYXVsdF9zZWF0KGd0a193aWRnZXRfZ2V0X2Rp c3BsYXkod2lkZ2V0KSkpOworI2Vsc2UKICAgICBldmVudC0+bW90aW9uLmRldmljZSA9IGdka19k ZXZpY2VfbWFuYWdlcl9nZXRfY2xpZW50X3BvaW50ZXIoZ2RrX2Rpc3BsYXlfZ2V0X2RldmljZV9t YW5hZ2VyKGd0a193aWRnZXRfZ2V0X2Rpc3BsYXkod2lkZ2V0KSkpOworI2VuZGlmCiAgICAgaW50 IHhSb290LCB5Um9vdDsKICAgICBnZGtfd2luZG93X2dldF9yb290X2Nvb3JkcyhndGtfd2lkZ2V0 X2dldF93aW5kb3cod2lkZ2V0KSwgbG9jYXRpb24ueCgpLCBsb2NhdGlvbi55KCksICZ4Um9vdCwg JnlSb290KTsKICAgICBldmVudC0+bW90aW9uLnhfcm9vdCA9IHhSb290OwpAQCAtMTQyLDcgKzE1 MCwxMiBAQCBzdGF0aWMgdm9pZCBkb0tleVN0cm9rZUV2ZW50KEdka0V2ZW50VHlwZSB0eXBlLCBH dGtXaWRnZXQqIHdpZGdldCwgdW5zaWduZWQga2V5VgogICAgIGV2ZW50LT5rZXkudGltZSA9IEdE S19DVVJSRU5UX1RJTUU7CiAgICAgZXZlbnQtPmtleS53aW5kb3cgPSBndGtfd2lkZ2V0X2dldF93 aW5kb3cod2lkZ2V0KTsKICAgICBnX29iamVjdF9yZWYoZXZlbnQtPmtleS53aW5kb3cpOworCisj aWYgR1RLX0NIRUNLX1ZFUlNJT04oMywgMjAsIDApCisgICAgZ2RrX2V2ZW50X3NldF9kZXZpY2Uo ZXZlbnQuZ2V0KCksIGdka19zZWF0X2dldF9wb2ludGVyKGdka19kaXNwbGF5X2dldF9kZWZhdWx0 X3NlYXQoZ3RrX3dpZGdldF9nZXRfZGlzcGxheSh3aWRnZXQpKSkpOworI2Vsc2UKICAgICBnZGtf ZXZlbnRfc2V0X2RldmljZShldmVudC5nZXQoKSwgZ2RrX2RldmljZV9tYW5hZ2VyX2dldF9jbGll bnRfcG9pbnRlcihnZGtfZGlzcGxheV9nZXRfZGV2aWNlX21hbmFnZXIoZ3RrX3dpZGdldF9nZXRf ZGlzcGxheSh3aWRnZXQpKSkpOworI2VuZGlmCiAgICAgZXZlbnQtPmtleS5zdGF0ZSA9IHN0YXRl OwogCiAgICAgLy8gV2hlbiBzeW50aGVzaXppbmcgYW4gZXZlbnQsIGFuIGludmFsaWQgaGFyZHdh cmVfa2V5Y29kZSB2YWx1ZSBjYW4gY2F1c2UgaXQgdG8gYmUgYmFkbHkgcHJvY2Vzc2VkIGJ5IEdU SysuCkBAIC0zMzIsNCArMzQ1LDMgQEAgdm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6cGxhdGZv cm1TaW11bGF0ZUtleVNlcXVlbmNlKFdlYlBhZ2VQcm94eSYgcGFnZSwgY29uc3QKIH0KIAogfSAv LyBuYW1lc3BhY2UgV2ViS2l0Ci0K