234233 2021-12-13 04:00:54 -0800 [GTK][a11y] Handle the Embedded method sent by AtkSocket from AccessibilityRootAtspi 2021-12-14 00:13:07 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 230253 1 cgarcia webkit-unassigned aboxhall andresg_22 aperez apinheiro bugs-noreply cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white oldest_to_newest 1823465 0 cgarcia 2021-12-13 04:00:54 -0800 I added some hacks to send the socket path to the web process using WebKit IPC because Embedded message is not in the DBus interface. We can simply add the message to the interface definition and handle it instead to simplify everything. 1823466 1 446986 cgarcia 2021-12-13 04:03:44 -0800 Created attachment 446986 Patch 1823469 2 446986 aperez 2021-12-13 04:17:23 -0800 Comment on attachment 446986 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446986&action=review > Source/WebCore/accessibility/atspi/AccessibilityRootAtspi.cpp:200 > + m_parentPath = parentPath; Nice, and I like it that this allows to remove the USE(GTK4) switcheroo above and the USE(ATSPI) one down below 💪️ 1823908 3 447109 cgarcia 2021-12-13 22:41:02 -0800 Created attachment 447109 Patch for landing 1823920 4 cgarcia 2021-12-14 00:13:07 -0800 Committed r287014 (245219@trunk): <https://commits.webkit.org/245219@trunk> 446986 2021-12-13 04:03:44 -0800 2021-12-13 22:41:02 -0800 Patch wcore-atspi-embedded.diff text/plain 18317 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3ZTNkMjlkZTZhNTMuLjk3NmJjNGQyYzdiOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE5IEBACisyMDIxLTEyLTEzICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVthMTF5XSBIYW5kbGUgdGhlIEVtYmVkZGVkIG1l dGhvZCBzZW50IGJ5IEF0a1NvY2tldCBmcm9tIEFjY2Vzc2liaWxpdHlSb290QXRzcGkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDIzMworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0 eS9hdHNwaS9BY2Nlc3NpYmlsaXR5QXRzcGkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNz aWJpbGl0eUF0c3BpOjpyZWdpc3RlclJvb3QpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvYXRz cGkvQWNjZXNzaWJpbGl0eVJvb3RBdHNwaS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3Np YmlsaXR5Um9vdEF0c3BpOjpyZWdpc3Rlck9iamVjdCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nl c3NpYmlsaXR5Um9vdEF0c3BpOjplbWJlZGRlZCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3Np YmlsaXR5Um9vdEF0c3BpOjpzZXRQYXJlbnRQYXRoKTogRGVsZXRlZC4KKyAgICAgICAgKiBhY2Nl c3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlSb290QXRzcGkuaDoKKyAgICAgICAgKiBhY2Nl c3NpYmlsaXR5L2F0c3BpL3htbC9Tb2NrZXQueG1sOgorCiAyMDIxLTEyLTEyICBBbGFuIEJ1anRh cyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0gRW5hYmxl IGlzb2xhdGUtb3ZlcnJpZGUgZm9yIGlubGluZSBib3hlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5QXRzcGkuY3BwIGIvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5QXRzcGkuY3BwCmluZGV4 IDBiM2Q5MGQ0MWU2OC4uYzNmZDM0ZGVkMjg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlBdHNwaS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5QXRzcGkuY3BwCkBAIC03Myw3 ICs3Myw3IEBAIHZvaWQgQWNjZXNzaWJpbGl0eUF0c3BpOjpyZWdpc3RlclJvb3QoQWNjZXNzaWJp bGl0eVJvb3RBdHNwaSYgcm9vdE9iamVjdCwgVmVjdG9yCiAgICAgICAgIGlmIChtX2Nvbm5lY3Rp b24pIHsKICAgICAgICAgICAgIGVuc3VyZUNhY2hlKCk7CiAgICAgICAgICAgICBTdHJpbmcgcGF0 aCA9IG1ha2VTdHJpbmcoIi9vcmcvYTExeS93ZWJraXQvYWNjZXNzaWJsZS8iLCBjcmVhdGVDYW5v bmljYWxVVUlEU3RyaW5nKCkucmVwbGFjZSgnLScsICdfJykpOwotICAgICAgICAgICAgVmVjdG9y PHVuc2lnbmVkLCAyPiByZWdpc3RlcmVkT2JqZWN0czsKKyAgICAgICAgICAgIFZlY3Rvcjx1bnNp Z25lZCwgMz4gcmVnaXN0ZXJlZE9iamVjdHM7CiAgICAgICAgICAgICByZWdpc3RlcmVkT2JqZWN0 cy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KGludGVyZmFjZXMuc2l6ZSgpKTsKICAgICAgICAgICAg IGZvciAoY29uc3QgYXV0byYgaW50ZXJmYWNlIDogaW50ZXJmYWNlcykgewogICAgICAgICAgICAg ICAgIGF1dG8gaWQgPSBnX2RidXNfY29ubmVjdGlvbl9yZWdpc3Rlcl9vYmplY3QobV9jb25uZWN0 aW9uLmdldCgpLCBwYXRoLnV0ZjgoKS5kYXRhKCksIGludGVyZmFjZS5maXJzdCwgaW50ZXJmYWNl LnNlY29uZCwgcm9vdE9iamVjdC5wdHIoKSwgbnVsbHB0ciwgbnVsbHB0cik7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlSb290QXRz cGkuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5 Um9vdEF0c3BpLmNwcAppbmRleCBhNzk0MWI1MGE1YzIuLjFhZjQwMjZjYmU3YSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5Um9vdEF0 c3BpLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2li aWxpdHlSb290QXRzcGkuY3BwCkBAIC00OCw3ICs0OCw3IEBAIEFjY2Vzc2liaWxpdHlSb290QXRz cGk6OkFjY2Vzc2liaWxpdHlSb290QXRzcGkoUGFnZSYgcGFnZSwgQWNjZXNzaWJpbGl0eUF0c3Bp JiBhCiAKIEdEQnVzSW50ZXJmYWNlVlRhYmxlIEFjY2Vzc2liaWxpdHlSb290QXRzcGk6OnNfYWNj ZXNzaWJsZUZ1bmN0aW9ucyA9IHsKICAgICAvLyBtZXRob2RfY2FsbAotICAgIFtdKEdEQnVzQ29u bmVjdGlvbiosIGNvbnN0IGdjaGFyKiBzZW5kZXIsIGNvbnN0IGdjaGFyKiwgY29uc3QgZ2NoYXIq LCBjb25zdCBnY2hhciogbWV0aG9kTmFtZSwgR1ZhcmlhbnQqIHBhcmFtZXRlcnMsIEdEQnVzTWV0 aG9kSW52b2NhdGlvbiogaW52b2NhdGlvbiwgZ3BvaW50ZXIgdXNlckRhdGEpIHsKKyAgICBbXShH REJ1c0Nvbm5lY3Rpb24qLCBjb25zdCBnY2hhciosIGNvbnN0IGdjaGFyKiwgY29uc3QgZ2NoYXIq LCBjb25zdCBnY2hhciogbWV0aG9kTmFtZSwgR1ZhcmlhbnQqIHBhcmFtZXRlcnMsIEdEQnVzTWV0 aG9kSW52b2NhdGlvbiogaW52b2NhdGlvbiwgZ3BvaW50ZXIgdXNlckRhdGEpIHsKICAgICAgICAg UkVMRUFTRV9BU1NFUlQoIWlzTWFpblRocmVhZCgpKTsKICAgICAgICAgYXV0byYgcm9vdE9iamVj dCA9ICpzdGF0aWNfY2FzdDxBY2Nlc3NpYmlsaXR5Um9vdEF0c3BpKj4odXNlckRhdGEpOwogICAg ICAgICBpZiAoIWdfc3RyY21wMChtZXRob2ROYW1lLCAiR2V0Um9sZSIpKQpAQCAtNTgsMTUgKzU4 LDYgQEAgR0RCdXNJbnRlcmZhY2VWVGFibGUgQWNjZXNzaWJpbGl0eVJvb3RBdHNwaTo6c19hY2Nl c3NpYmxlRnVuY3Rpb25zID0gewogICAgICAgICBlbHNlIGlmICghZ19zdHJjbXAwKG1ldGhvZE5h bWUsICJHZXRMb2NhbGl6ZWRSb2xlTmFtZSIpKQogICAgICAgICAgICAgZ19kYnVzX21ldGhvZF9p bnZvY2F0aW9uX3JldHVybl92YWx1ZShpbnZvY2F0aW9uLCBnX3ZhcmlhbnRfbmV3KCIocykiLCBf KCJmaWxsZXIiKSkpOwogICAgICAgICBlbHNlIGlmICghZ19zdHJjbXAwKG1ldGhvZE5hbWUsICJH ZXRTdGF0ZSIpKSB7Ci0jaWYgVVNFKEdUSzQpCi0gICAgICAgICAgICAvLyBGSVhNRTogd2UgbmVl ZCBhIHdheSB0byBnZXQgdGhlIHBhcmVudCBhdHNwaSByZWZlcmVuY2UgaW4gR1RLNC4KLSNlbHNl Ci0gICAgICAgICAgICAvLyBTaW5jZSB3ZSBkb24ndCBoYXZlIGEgd2F5IHRvIGtub3cgdGhlIHVu aXF1ZSBuYW1lIG9mIHRoZSBVSSBwcm9jZXNzLCByaWdodCBhZnRlciBjYWxsaW5nCi0gICAgICAg ICAgICAvLyBhdGtfc29ja2V0X2VtYmVkKCkgdGhlIFVJIHByb2Nlc3MgY2FsbHMgYXRrX29iamVj dF9yZWZfc3RhdGVfc2V0KCkgdG8gZm9yY2UgYSBHZXRTdGF0ZSBtZXNzYWdlLgotICAgICAgICAg ICAgLy8gV2UgdXNlIHRoaXMgZmlyc3QgR2V0U3RhdGUgbWVzc2FnZSB0byBzZXQgdGhlIHNlbmRl ciBhcyB0aGUgcGFyZW50IHVuaXF1ZSBuYW1lLgotICAgICAgICAgICAgaWYgKHJvb3RPYmplY3Qu bV9wYXJlbnRVbmlxdWVOYW1lLmlzTnVsbCgpKQotICAgICAgICAgICAgICAgIHJvb3RPYmplY3Qu bV9wYXJlbnRVbmlxdWVOYW1lID0gc2VuZGVyOwotI2VuZGlmCiAgICAgICAgICAgICBHVmFyaWFu dEJ1aWxkZXIgYnVpbGRlciA9IEdfVkFSSUFOVF9CVUlMREVSX0lOSVQoR19WQVJJQU5UX1RZUEUo IihhdSkiKSk7CiAKICAgICAgICAgICAgIHVpbnQ2NF90IGF0c3BpU3RhdGVzID0gKEdfR1VJTlQ2 NF9DT05TVEFOVCgxKSA8PCBBdHNwaTo6U3RhdGU6Ok1hbmFnZXNEZXNjZW5kYW50cyk7CkBAIC0x NTQsNiArMTQ1LDI2IEBAIEdEQnVzSW50ZXJmYWNlVlRhYmxlIEFjY2Vzc2liaWxpdHlSb290QXRz cGk6OnNfYWNjZXNzaWJsZUZ1bmN0aW9ucyA9IHsKICAgICBudWxscHRyCiB9OwogCitHREJ1c0lu dGVyZmFjZVZUYWJsZSBBY2Nlc3NpYmlsaXR5Um9vdEF0c3BpOjpzX3NvY2tldEZ1bmN0aW9ucyA9 IHsKKyAgICAvLyBtZXRob2RfY2FsbAorICAgIFtdKEdEQnVzQ29ubmVjdGlvbiosIGNvbnN0IGdj aGFyKiBzZW5kZXIsIGNvbnN0IGdjaGFyKiwgY29uc3QgZ2NoYXIqLCBjb25zdCBnY2hhciogbWV0 aG9kTmFtZSwgR1ZhcmlhbnQqIHBhcmFtZXRlcnMsIEdEQnVzTWV0aG9kSW52b2NhdGlvbiogaW52 b2NhdGlvbiwgZ3BvaW50ZXIgdXNlckRhdGEpIHsKKyAgICAgICAgUkVMRUFTRV9BU1NFUlQoIWlz TWFpblRocmVhZCgpKTsKKyAgICAgICAgYXV0byYgcm9vdE9iamVjdCA9ICpzdGF0aWNfY2FzdDxB Y2Nlc3NpYmlsaXR5Um9vdEF0c3BpKj4odXNlckRhdGEpOworICAgICAgICBpZiAoIWdfc3RyY21w MChtZXRob2ROYW1lLCAiRW1iZWRkZWQiKSkgeworICAgICAgICAgICAgY29uc3QgY2hhciogcGF0 aDsKKyAgICAgICAgICAgIGdfdmFyaWFudF9nZXQocGFyYW1ldGVycywgIigmcykiLCAmcGF0aCk7 CisgICAgICAgICAgICByb290T2JqZWN0LmVtYmVkZGVkKHNlbmRlciwgcGF0aCk7CisgICAgICAg ICAgICBnX2RidXNfbWV0aG9kX2ludm9jYXRpb25fcmV0dXJuX3ZhbHVlKGludm9jYXRpb24sIG51 bGxwdHIpOworICAgICAgICB9CisgICAgfSwKKyAgICAvLyBnZXRfcHJvcGVydHkKKyAgICBudWxs cHRyLAorICAgIC8vIHNldF9wcm9wZXJ0eSwKKyAgICBudWxscHRyLAorICAgIC8vIHBhZGRpbmcK KyAgICBudWxscHRyCit9OworCiB2b2lkIEFjY2Vzc2liaWxpdHlSb290QXRzcGk6OnJlZ2lzdGVy T2JqZWN0KENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgU3RyaW5nJik+JiYgY29tcGxldGlv bkhhbmRsZXIpCiB7CiAgICAgUkVMRUFTRV9BU1NFUlQoaXNNYWluVGhyZWFkKCkpOwpAQCAtMTYy LDYgKzE3Myw3IEBAIHZvaWQgQWNjZXNzaWJpbGl0eVJvb3RBdHNwaTo6cmVnaXN0ZXJPYmplY3Qo Q29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBTdHJpbmcmCiAKICAgICBWZWN0b3I8c3RkOjpw YWlyPEdEQnVzSW50ZXJmYWNlSW5mbyosIEdEQnVzSW50ZXJmYWNlVlRhYmxlKj4+IGludGVyZmFj ZXM7CiAgICAgaW50ZXJmYWNlcy5hcHBlbmQoeyBjb25zdF9jYXN0PEdEQnVzSW50ZXJmYWNlSW5m byo+KCZ3ZWJraXRfYWNjZXNzaWJsZV9pbnRlcmZhY2UpLCAmc19hY2Nlc3NpYmxlRnVuY3Rpb25z IH0pOworICAgIGludGVyZmFjZXMuYXBwZW5kKHsgY29uc3RfY2FzdDxHREJ1c0ludGVyZmFjZUlu Zm8qPigmd2Via2l0X3NvY2tldF9pbnRlcmZhY2UpLCAmc19zb2NrZXRGdW5jdGlvbnMgfSk7CiAg ICAgaW50ZXJmYWNlcy5hcHBlbmQoeyBjb25zdF9jYXN0PEdEQnVzSW50ZXJmYWNlSW5mbyo+KCZ3 ZWJraXRfY29tcG9uZW50X2ludGVyZmFjZSksICZzX2NvbXBvbmVudEZ1bmN0aW9ucyB9KTsKICAg ICBtX2F0c3BpLnJlZ2lzdGVyUm9vdCgqdGhpcywgV1RGTW92ZShpbnRlcmZhY2VzKSwgV1RGTW92 ZShjb21wbGV0aW9uSGFuZGxlcikpOwogfQpAQCAtMTgxLDEwICsxOTMsMTEgQEAgdm9pZCBBY2Nl c3NpYmlsaXR5Um9vdEF0c3BpOjpzZXRQYXRoKFN0cmluZyYmIHBhdGgpCiAgICAgbV9wYXRoID0g V1RGTW92ZShwYXRoKTsKIH0KIAotdm9pZCBBY2Nlc3NpYmlsaXR5Um9vdEF0c3BpOjpzZXRQYXJl bnRQYXRoKFN0cmluZyYmIHBhdGgpCit2b2lkIEFjY2Vzc2liaWxpdHlSb290QXRzcGk6OmVtYmVk ZGVkKGNvbnN0IGNoYXIqIHBhcmVudFVuaXF1ZU5hbWUsIGNvbnN0IGNoYXIqIHBhcmVudFBhdGgp CiB7Ci0gICAgUkVMRUFTRV9BU1NFUlQoaXNNYWluVGhyZWFkKCkpOwotICAgIG1fcGFyZW50UGF0 aCA9IFdURk1vdmUocGF0aCk7CisgICAgUkVMRUFTRV9BU1NFUlQoIWlzTWFpblRocmVhZCgpKTsK KyAgICBtX3BhcmVudFVuaXF1ZU5hbWUgPSBwYXJlbnRVbmlxdWVOYW1lOworICAgIG1fcGFyZW50 UGF0aCA9IHBhcmVudFBhdGg7CiB9CiAKIEdWYXJpYW50KiBBY2Nlc3NpYmlsaXR5Um9vdEF0c3Bp OjphcHBsaWNhdGlvblJlZmVyZW5jZSgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlSb290QXRzcGkuaCBiL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eVJvb3RBdHNwaS5oCmluZGV4 IGEyNzVmM2ZkZTQ2ZC4uZTMxZWIxYTQxY2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlSb290QXRzcGkuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlSb290QXRzcGkuaApAQCAt NDEsNyArNDEsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCByZWdpc3Rlck9iamVjdChDb21wbGV0aW9u SGFuZGxlcjx2b2lkKGNvbnN0IFN0cmluZyYpPiYmKTsKICAgICB2b2lkIHVucmVnaXN0ZXJPYmpl Y3QoKTsKICAgICB2b2lkIHNldFBhdGgoU3RyaW5nJiYpOwotICAgIHZvaWQgc2V0UGFyZW50UGF0 aChTdHJpbmcmJik7CiAKICAgICBjb25zdCBTdHJpbmcmIHBhdGgoKSBjb25zdCB7IHJldHVybiBt X3BhdGg7IH0KICAgICBjb25zdCBTdHJpbmcmIHBhcmVudFVuaXF1ZU5hbWUoKSBjb25zdCB7IHJl dHVybiBtX3BhcmVudFVuaXF1ZU5hbWU7IH0KQEAgLTU1LDkgKzU0LDExIEBAIHB1YmxpYzoKIHBy aXZhdGU6CiAgICAgQWNjZXNzaWJpbGl0eVJvb3RBdHNwaShQYWdlJiwgQWNjZXNzaWJpbGl0eUF0 c3BpJik7CiAKKyAgICB2b2lkIGVtYmVkZGVkKGNvbnN0IGNoYXIqIHBhcmVudFVuaXF1ZU5hbWUs IGNvbnN0IGNoYXIqIHBhcmVudFBhdGgpOwogICAgIEludFJlY3QgZnJhbWVSZWN0KHVpbnQzMl90 KSBjb25zdDsKIAogICAgIHN0YXRpYyBHREJ1c0ludGVyZmFjZVZUYWJsZSBzX2FjY2Vzc2libGVG dW5jdGlvbnM7CisgICAgc3RhdGljIEdEQnVzSW50ZXJmYWNlVlRhYmxlIHNfc29ja2V0RnVuY3Rp b25zOwogICAgIHN0YXRpYyBHREJ1c0ludGVyZmFjZVZUYWJsZSBzX2NvbXBvbmVudEZ1bmN0aW9u czsKIAogICAgIEFjY2Vzc2liaWxpdHlBdHNwaSYgbV9hdHNwaTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkveG1sL1NvY2tldC54bWwgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL3htbC9Tb2NrZXQueG1sCmluZGV4IGY5YWM3NmQyYzg4 OC4uOWZjMmIyNmRkOGM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2F0c3BpL3htbC9Tb2NrZXQueG1sCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv YXRzcGkveG1sL1NvY2tldC54bWwKQEAgLTE0LDYgKzE0LDExIEBACiAgICAgPGFubm90YXRpb24g bmFtZT0ib3JnLnF0cHJvamVjdC5RdERCdXMuUXRUeXBlTmFtZS5JbjAiIHZhbHVlPSJRU3BpT2Jq ZWN0UmVmZXJlbmNlIi8+CiAgIDwvbWV0aG9kPgogCisgIDxtZXRob2QgbmFtZT0iRW1iZWRkZWQi PgorICAgIDxhcmcgZGlyZWN0aW9uPSJpbiIgbmFtZT0ic29ja2V0UGF0aCIgdHlwZT0icyIvPgor ICAgIDxhbm5vdGF0aW9uIG5hbWU9Im9yZy5xdHByb2plY3QuUXREQnVzLlF0VHlwZU5hbWUuSW4w IiB2YWx1ZT0iUVNwaU9iamVjdFJlZmVyZW5jZSIvPgorICA8L21ldGhvZD4KKwogICA8c2lnbmFs IG5hbWU9IkF2YWlsYWJsZSI+CiAgICAgPGFyZyBkaXJlY3Rpb249ImluIiBuYW1lPSJzb2NrZXQi IHR5cGU9IihzbykiLz4KICAgICA8YW5ub3RhdGlvbiBuYW1lPSJvcmcucXRwcm9qZWN0LlF0REJ1 cy5RdFR5cGVOYW1lLkluMCIgdmFsdWU9IlFTcGlPYmplY3RSZWZlcmVuY2UiLz4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5k ZXggOGVmZDQwZGFhOWMzLi4xNzgxNTg3OTY2MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAK KzIwMjEtMTItMTMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgor CisgICAgICAgIFtHVEtdW2ExMXldIEhhbmRsZSB0aGUgRW1iZWRkZWQgbWV0aG9kIHNlbnQgYnkg QXRrU29ja2V0IGZyb20gQWNjZXNzaWJpbGl0eVJvb3RBdHNwaQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0MjMzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSSBhZGRlZCBzb21lIGhhY2tzIHRvIHNlbmQg dGhlIHNvY2tldCBwYXRoIHRvIHRoZSB3ZWIgcHJvY2VzcyB1c2luZyBXZWJLaXQgSVBDIGJlY2F1 c2UgRW1iZWRkZWQgbWVzc2FnZSBpcyBub3QKKyAgICAgICAgaW4gdGhlIERCdXMgaW50ZXJmYWNl LiBXZSBjYW4gc2ltcGx5IGFkZCB0aGUgbWVzc2FnZSB0byB0aGUgaW50ZXJmYWNlIGRlZmluaXRp b24gYW5kIGhhbmRsZSBpdCBpbnN0ZWFkIHRvCisgICAgICAgIHNpbXBsaWZ5IGV2ZXJ5dGhpbmcu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwOgorICAgICAg ICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6YmluZEFjY2Vzc2liaWxpdHlUcmVlKToK KyAgICAgICAgKFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdl KToKKyAgICAgICAgKiBVSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuaDoKKyAgICAgICAg KFdlYktpdDo6UHJvdmlzaW9uYWxQYWdlUHJveHk6OmFjY2Vzc2liaWxpdHlQbHVnSUQpOgorICAg ICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6Q29tcGxldGlvbkhhbmRsZXI8dm9p ZCk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c3dhcFRvUHJvdmlzaW9uYWxQYWdlKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL1dlYlBhZ2VQcm94 eUd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6YmluZEFjY2Vzc2liaWxp dHlUcmVlKToKKyAgICAgICAgKiBVSVByb2Nlc3Mvd3BlL1dlYlBhZ2VQcm94eVdQRS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6YmluZEFjY2Vzc2liaWxpdHlUcmVlKToKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlBhZ2VHdGsuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlOjpwbGF0Zm9ybUluaXRpYWxpemUpOgorCiAyMDIxLTEyLTExICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIE1vbWVudHVtIEV2 ZW50IERpc3BhdGNoZXI6IFRhaWwgZnJhbWVzIGFyZSB0aGUgd3JvbmcgdmVsb2NpdHkgaWYgbW9t ZW50dW0gZXZlbnQgZGlzcGF0Y2ggcmF0ZSBkb2Vzbid0IG1hdGNoIHNjcmVlbiByZWZyZXNoIHJh dGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVBy b3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5LmNw cAppbmRleCBlM2I5NzhmZWVhZjAuLjJlMDZhZGRmN2U4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5LmNwcApAQCAtNDQ0LDEwICs0NDQsOSBA QCB2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpyZWdpc3RlcldlYlByb2Nlc3NBY2Nlc3NpYmls aXR5VG9rZW4oY29uc3QgSVBDOjpEYXRhUgogI2VuZGlmCiAKICNpZiBQTEFURk9STShHVEspIHx8 IFBMQVRGT1JNKFdQRSkKLXZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmJpbmRBY2Nlc3NpYmls aXR5VHJlZShjb25zdCBTdHJpbmcmIHBsdWdJRCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChTdHJp bmcmJik+JiYgY29tcGxldGlvbkhhbmRsZXIpCit2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojpi aW5kQWNjZXNzaWJpbGl0eVRyZWUoY29uc3QgU3RyaW5nJiBwbHVnSUQpCiB7CiAgICAgbV9hY2Nl c3NpYmlsaXR5UGx1Z0lEID0gcGx1Z0lEOwotICAgIG1fYWNjZXNzaWJpbGl0eUJpbmRDb21wbGV0 aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpOwogfQogI2VuZGlmCiAKQEAg LTUxMiw3ICs1MTEsNyBAQCB2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNlaXZlTWVz c2FnZShJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIElQQzo6RAogCiAjaWYgUExBVEZPUk0o R1RLKSB8fCBQTEFURk9STShXUEUpCiAgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUoKSA9PSBN ZXNzYWdlczo6V2ViUGFnZVByb3h5OjpCaW5kQWNjZXNzaWJpbGl0eVRyZWU6Om5hbWUoKSkgewot ICAgICAgICBJUEM6OmhhbmRsZU1lc3NhZ2VBc3luYzxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpC aW5kQWNjZXNzaWJpbGl0eVRyZWU+KGNvbm5lY3Rpb24sIGRlY29kZXIsIHRoaXMsICZQcm92aXNp b25hbFBhZ2VQcm94eTo6YmluZEFjY2Vzc2liaWxpdHlUcmVlKTsKKyAgICAgICAgSVBDOjpoYW5k bGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkJpbmRBY2Nlc3NpYmlsaXR5VHJlZT4o Y29ubmVjdGlvbiwgZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5OjpiaW5kQWNj ZXNzaWJpbGl0eVRyZWUpOwogICAgICAgICByZXR1cm47CiAgICAgfQogI2VuZGlmCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuaAppbmRleCBmMWEzNTUz ZTZiODguLmFhMWY0ODcxMmU1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv UHJvdmlzaW9uYWxQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92 aXNpb25hbFBhZ2VQcm94eS5oCkBAIC05Niw3ICs5Niw2IEBAIHB1YmxpYzoKICNlbmRpZgogI2lm IFBMQVRGT1JNKEdUSykgfHwgUExBVEZPUk0oV1BFKQogICAgIGNvbnN0IFN0cmluZyYgYWNjZXNz aWJpbGl0eVBsdWdJRCgpIHsgcmV0dXJuIG1fYWNjZXNzaWJpbGl0eVBsdWdJRDsgfQotICAgIENv bXBsZXRpb25IYW5kbGVyPHZvaWQoU3RyaW5nJiYpPiB0YWtlQWNjZXNzaWJpbGl0eUJpbmRDb21w bGV0aW9uSGFuZGxlcigpIHsgcmV0dXJuIHN0ZDo6ZXhjaGFuZ2UobV9hY2Nlc3NpYmlsaXR5Qmlu ZENvbXBsZXRpb25IYW5kbGVyLCBudWxscHRyKTsgfQogI2VuZGlmCiAjaWYgSEFWRShWSVNJQklM SVRZX1BST1BBR0FUSU9OX1ZJRVcpCiAgICAgTGF5ZXJIb3N0aW5nQ29udGV4dElEIGNvbnRleHRJ REZvclZpc2liaWxpdHlQcm9wYWdhdGlvbkluV2ViUHJvY2VzcygpIGNvbnN0IHsgcmV0dXJuIG1f Y29udGV4dElERm9yVmlzaWJpbGl0eVByb3BhZ2F0aW9uSW5XZWJQcm9jZXNzOyB9CkBAIC0xNDks NyArMTQ4LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHJlZ2lzdGVyV2ViUHJvY2Vzc0FjY2Vzc2li aWxpdHlUb2tlbihjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmKTsKICNlbmRpZgogI2lmIFBMQVRG T1JNKEdUSykgfHwgUExBVEZPUk0oV1BFKQotICAgIHZvaWQgYmluZEFjY2Vzc2liaWxpdHlUcmVl KGNvbnN0IFN0cmluZyYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoU3RyaW5nJiYpPiYmKTsKKyAg ICB2b2lkIGJpbmRBY2Nlc3NpYmlsaXR5VHJlZShjb25zdCBTdHJpbmcmKTsKICNlbmRpZgogI2lm IEVOQUJMRShDT05URU5UX0ZJTFRFUklORykKICAgICB2b2lkIGNvbnRlbnRGaWx0ZXJEaWRCbG9j a0xvYWRGb3JGcmFtZShjb25zdCBXZWJDb3JlOjpDb250ZW50RmlsdGVyVW5ibG9ja0hhbmRsZXIm LCBXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAKaW5kZXggODk1ZTdiOGNkNWI5Li4xMjBiOTA0ODcyYmQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtOTg4LDggKzk4OCw5IEBAIHZvaWQg V2ViUGFnZVByb3h5Ojpzd2FwVG9Qcm92aXNpb25hbFBhZ2Uoc3RkOjp1bmlxdWVfcHRyPFByb3Zp c2lvbmFsUGFnZVByb3h5PiBwCiAgICAgICAgIHJlZ2lzdGVyV2ViUHJvY2Vzc0FjY2Vzc2liaWxp dHlUb2tlbih7IGFjY2Vzc2liaWxpdHlUb2tlbi5kYXRhKCksIGFjY2Vzc2liaWxpdHlUb2tlbi5z aXplKCkgfSk7CiAjZW5kaWYKICNpZiBQTEFURk9STShHVEspIHx8IFBMQVRGT1JNKFdQRSkKLSAg ICBpZiAoYXV0byBjb21wbGV0aW9uSGFuZGxlciA9IHByb3Zpc2lvbmFsUGFnZS0+dGFrZUFjY2Vz c2liaWxpdHlCaW5kQ29tcGxldGlvbkhhbmRsZXIoKSkKLSAgICAgICAgYmluZEFjY2Vzc2liaWxp dHlUcmVlKHByb3Zpc2lvbmFsUGFnZS0+YWNjZXNzaWJpbGl0eVBsdWdJRCgpLCBXVEZNb3ZlKGNv bXBsZXRpb25IYW5kbGVyKSk7CisgICAgYXV0byBhY2Nlc3NpYmlsaXR5UGx1Z0lEID0gcHJvdmlz aW9uYWxQYWdlLT5hY2Nlc3NpYmlsaXR5UGx1Z0lEKCk7CisgICAgaWYgKCFhY2Nlc3NpYmlsaXR5 UGx1Z0lELmlzRW1wdHkoKSkKKyAgICAgICAgYmluZEFjY2Vzc2liaWxpdHlUcmVlKGFjY2Vzc2li aWxpdHlQbHVnSUQpOwogI2VuZGlmCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmgKaW5kZXggMGY4OGJiNWI3OWViLi4zYjM3NjFhN2U3NzEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0yMjkwLDcgKzIyOTAsNyBAQCBwcml2YXRlOgogI2Vu ZGlmCiAKICNpZiBQTEFURk9STShHVEspIHx8IFBMQVRGT1JNKFdQRSkKLSAgICB2b2lkIGJpbmRB Y2Nlc3NpYmlsaXR5VHJlZShjb25zdCBTdHJpbmcmLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFN0 cmluZyYmKT4mJik7CisgICAgdm9pZCBiaW5kQWNjZXNzaWJpbGl0eVRyZWUoY29uc3QgU3RyaW5n Jik7CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKEdUSykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgppbmRleCA2ZjJmZmU3ZDFkOTEuLmU1Zjhm NWY1MGE0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 Lm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5t ZXNzYWdlcy5pbgpAQCAtMTc5LDcgKzE3OSw3IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2VQcm94eSB7 CiAKICNpZiBQTEFURk9STShHVEspIHx8IFBMQVRGT1JNKFdQRSkKICAgICAjIFN1cHBvcnQgZm9y IGNvbm5lY3RpbmcgdGhlIEFjY2Vzc2liaWxpdHkgd29ybGRzIG9mIHRoZSBVSSBhbmQgdGhlIFdl YiBwcm9jZXNzZXMKLSAgICBCaW5kQWNjZXNzaWJpbGl0eVRyZWUoU3RyaW5nIHBsdWdJRCkgLT4g KFN0cmluZyBzb2NrZXRQYXRoKSBBc3luYworICAgIEJpbmRBY2Nlc3NpYmlsaXR5VHJlZShTdHJp bmcgcGx1Z0lEKQogCiAgICAgU2V0SW5wdXRNZXRob2RTdGF0ZShzdGQ6Om9wdGlvbmFsPFdlYktp dDo6SW5wdXRNZXRob2RTdGF0ZT4gc3RhdGUpOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9ndGsvV2ViUGFnZVByb3h5R3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2d0ay9XZWJQYWdlUHJveHlHdGsuY3BwCmluZGV4IDNmMzQ1OThjMjI5Yi4uOTFl ZjIxN2I5ZDJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvV2ViUGFn ZVByb3h5R3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvV2ViUGFnZVBy b3h5R3RrLmNwcApAQCAtNDksNyArNDksNyBAQCBHdGtXaWRnZXQqIFdlYlBhZ2VQcm94eTo6dmll d1dpZGdldCgpCiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PFBhZ2VDbGllbnRJbXBsJj4ocGFnZUNs aWVudCgpKS52aWV3V2lkZ2V0KCk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpiaW5kQWNjZXNz aWJpbGl0eVRyZWUoY29uc3QgU3RyaW5nJiBwbHVnSUQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo U3RyaW5nJiYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQordm9pZCBXZWJQYWdlUHJveHk6OmJpbmRB Y2Nlc3NpYmlsaXR5VHJlZShjb25zdCBTdHJpbmcmIHBsdWdJRCkKIHsKICNpZiBVU0UoR1RLNCkK ICAgICAvLyBGSVhNRTogV2UgbmVlZCBhIHdheSB0byBvdmVycmlkZSBhY2Nlc3NpYmxlIGludGVy ZmFjZSBvZiBXZWJWaWV3IGFuZCBzZW5kIHRoZSBhdHNwaSByZWZlcmVuY2UgdG8gdGhlIHdlYiBw cm9jZXNzLgpAQCAtNTcsMTUgKzU3LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmJpbmRBY2Nlc3Np YmlsaXR5VHJlZShjb25zdCBTdHJpbmcmIHBsdWdJRCwgQ29tcGxldGlvbkhhbmRsZXIKICNlbHNl CiAgICAgYXV0byogYWNjZXNzaWJsZSA9IGd0a193aWRnZXRfZ2V0X2FjY2Vzc2libGUodmlld1dp ZGdldCgpKTsKICAgICBhdGtfc29ja2V0X2VtYmVkKEFUS19TT0NLRVQoYWNjZXNzaWJsZSksIGNv bnN0X2Nhc3Q8Y2hhcio+KHBsdWdJRC51dGY4KCkuZGF0YSgpKSk7Ci0jaWYgVVNFKEFUU1BJKQot ICAgIC8vIEFUSyBkb2Vzbid0IGhhdmUgQVBJIHRvIGdldCB0aGUgYXRzcGkgcmVmZXJlbmNlIG9m IGFuIG9iamVjdCwgYnV0IHdlIGtub3cgdGhlIGlkIGlzIHN0b3JlZAotICAgIC8vIGFzIGFuIG9i amVjdCB1c2VyIGRhdGEgYXMgInNwaS1kYnVzLWlkIi4gVG8gbGV0IHRoZSB3ZWIgcHJvY2VzcyBr bm93IGFib3V0IHRoZSB1bmlxdWUgbmFtZSwgd2UgY2FsbAotICAgIC8vIGF0a19vYmplY3RfcmVm X3N0YXRlX3NldCgpIHRoYXQgc2VuZHMgYSBHZXRTdGF0ZSBtZXNzYWdlIHRvIHRoZSB3ZWIgcHJv Y2VzcyByb290IG9iamVjdC4KLSAgICBnX29iamVjdF91bnJlZihhdGtfb2JqZWN0X3JlZl9zdGF0 ZV9zZXQoYWNjZXNzaWJsZSkpOwotICAgIGNvbXBsZXRpb25IYW5kbGVyKG1ha2VTdHJpbmcoIi9v cmcvYTExeS9hdHNwaS9hY2Nlc3NpYmxlLyIsIEdQT0lOVEVSX1RPX0lOVChnX29iamVjdF9nZXRf ZGF0YShHX09CSkVDVChhY2Nlc3NpYmxlKSwgInNwaS1kYnVzLWlkIikpKSk7Ci0jZWxzZQotICAg IGNvbXBsZXRpb25IYW5kbGVyKHsgfSk7Ci0jZW5kaWYKICAgICBhdGtfb2JqZWN0X25vdGlmeV9z dGF0ZV9jaGFuZ2UoYWNjZXNzaWJsZSwgQVRLX1NUQVRFX1RSQU5TSUVOVCwgRkFMU0UpOwogI2Vu ZGlmCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy93cGUvV2ViUGFnZVBy b3h5V1BFLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL3dwZS9XZWJQYWdlUHJveHlXUEUu Y3BwCmluZGV4IDg3NjI4ODc2Y2E3Zi4uOGYyODQ0ZDg1MmZmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy93cGUvV2ViUGFnZVByb3h5V1BFLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy93cGUvV2ViUGFnZVByb3h5V1BFLmNwcApAQCAtNDUsMTMgKzQ1LDEyIEBA IHN0cnVjdCB3cGVfdmlld19iYWNrZW5kKiBXZWJQYWdlUHJveHk6OnZpZXdCYWNrZW5kKCkKICAg ICByZXR1cm4gc3RhdGljX2Nhc3Q8UGFnZUNsaWVudEltcGwmPihwYWdlQ2xpZW50KCkpLnZpZXdC YWNrZW5kKCk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpiaW5kQWNjZXNzaWJpbGl0eVRyZWUo Y29uc3QgU3RyaW5nJiBwbHVnSUQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoU3RyaW5nJiYpPiYm IGNvbXBsZXRpb25IYW5kbGVyKQordm9pZCBXZWJQYWdlUHJveHk6OmJpbmRBY2Nlc3NpYmlsaXR5 VHJlZShjb25zdCBTdHJpbmcmIHBsdWdJRCkKIHsKICNpZiBVU0UoQVRLKQogICAgIGF1dG8qIGFj Y2Vzc2libGUgPSBzdGF0aWNfY2FzdDxQYWdlQ2xpZW50SW1wbCY+KHBhZ2VDbGllbnQoKSkuYWNj ZXNzaWJsZSgpOwogICAgIGF0a19zb2NrZXRfZW1iZWQoQVRLX1NPQ0tFVChhY2Nlc3NpYmxlKSwg Y29uc3RfY2FzdDxjaGFyKj4ocGx1Z0lELnV0ZjgoKS5kYXRhKCkpKTsKICAgICBhdGtfb2JqZWN0 X25vdGlmeV9zdGF0ZV9jaGFuZ2UoYWNjZXNzaWJsZSwgQVRLX1NUQVRFX1RSQU5TSUVOVCwgRkFM U0UpOwotICAgIGNvbXBsZXRpb25IYW5kbGVyKHsgfSk7CiAjZW5kaWYKIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlBhZ2VHdGsuY3BwIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlBhZ2VHdGsuY3BwCmluZGV4 IDA1MzM1YmUyNDY0My4uMTUxM2RkMmE1Zjc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9ndGsvV2ViUGFnZUd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlBhZ2VHdGsuY3BwCkBAIC02NCw3ICs2NCw3IEBAIHZv aWQgV2ViUGFnZTo6cGxhdGZvcm1Jbml0aWFsaXplKCkKICNpZiBVU0UoQVRLKQogICAgIG1fYWNj ZXNzaWJpbGl0eU9iamVjdCA9IGFkb3B0R1JlZih3ZWJraXRXZWJQYWdlQWNjZXNzaWJpbGl0eU9i amVjdE5ldyh0aGlzKSk7CiAgICAgR1VuaXF1ZVB0cjxnY2hhcj4gcGx1Z0lEKGF0a19wbHVnX2dl dF9pZChBVEtfUExVRyhtX2FjY2Vzc2liaWxpdHlPYmplY3QuZ2V0KCkpKSk7Ci0gICAgc2VuZFdp dGhBc3luY1JlcGx5KE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkJpbmRBY2Nlc3NpYmlsaXR5VHJl ZShTdHJpbmcocGx1Z0lELmdldCgpKSksIFtdKFN0cmluZyYmKSB7IH0pOworICAgIHNlbmQoTWVz c2FnZXM6OldlYlBhZ2VQcm94eTo6QmluZEFjY2Vzc2liaWxpdHlUcmVlKFN0cmluZyhwbHVnSUQu Z2V0KCkpKSk7CiAjZWxpZiBVU0UoQVRTUEkpCiAjaWYgVVNFKEdUSzQpCiAgICAgLy8gRklYTUU6 IHdlIG5lZWQgYSB3YXkgdG8gY29ubmVjdCBET00gYW5kIGFwcCBhMTF5IHRyZWUgaW4gR1RLNC4K QEAgLTcyLDEyICs3Miw3IEBAIHZvaWQgV2ViUGFnZTo6cGxhdGZvcm1Jbml0aWFsaXplKCkKICAg ICBpZiAoYXV0byogcGFnZSA9IGNvcmVQYWdlKCkpIHsKICAgICAgICAgbV9hY2Nlc3NpYmlsaXR5 Um9vdE9iamVjdCA9IEFjY2Vzc2liaWxpdHlSb290QXRzcGk6OmNyZWF0ZSgqcGFnZSwgV2ViUHJv Y2Vzczo6c2luZ2xldG9uKCkuYWNjZXNzaWJpbGl0eUF0c3BpKCkpOwogICAgICAgICBtX2FjY2Vz c2liaWxpdHlSb290T2JqZWN0LT5yZWdpc3Rlck9iamVjdChbJl0oY29uc3QgU3RyaW5nJiBwbHVn SUQpIHsKLSAgICAgICAgICAgIC8vIEFUSyB1c2VzIGEgY3VzdG9tIERCdXMgbWVzc2FnZSB0byBz ZW5kIHRoZSBzb2NrZXQgcGF0aCB0byB0aGUgQXRrUGx1ZyBvYmplY3QuIEdEQnVzIGRvZXNuJ3Qg YWxsb3cKLSAgICAgICAgICAgIC8vIHRvIHNlbmQgYSBtZXNzYWdlIHRoYXQgaXMgbm90IGRlZmlu ZWQgaW4gdGhlIGludGVyZmFjZSwgc28gd2UgdXNlIHRoZSBXZWJLaXQgSVBDIHRvIGdldCB0aGUg c29ja2V0Ci0gICAgICAgICAgICAvLyBwYXRoIGZyb20gdGhlIFVJIHByb2Nlc3MuCi0gICAgICAg ICAgICBzZW5kV2l0aEFzeW5jUmVwbHkoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6QmluZEFjY2Vz c2liaWxpdHlUcmVlKHBsdWdJRCksIFsmXShTdHJpbmcmJiBzb2NrZXRQYXRoKSB7Ci0gICAgICAg ICAgICAgICAgbV9hY2Nlc3NpYmlsaXR5Um9vdE9iamVjdC0+c2V0UGFyZW50UGF0aChXVEZNb3Zl KHNvY2tldFBhdGgpKTsKLSAgICAgICAgICAgIH0pOworICAgICAgICAgICAgc2VuZChNZXNzYWdl czo6V2ViUGFnZVByb3h5OjpCaW5kQWNjZXNzaWJpbGl0eVRyZWUocGx1Z0lEKSk7CiAgICAgICAg IH0pOwogICAgIH0KICNlbmRpZgo= 447109 2021-12-13 22:41:02 -0800 2021-12-13 22:41:02 -0800 Patch for landing wcore-atspi-embedded.diff text/plain 19098 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0YzYwYmE0NmNiMWIuLjhmOGIwN2NiMjhlNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE5IEBACisyMDIxLTEyLTEzICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVthMTF5XSBIYW5kbGUgdGhlIEVtYmVkZGVkIG1l dGhvZCBzZW50IGJ5IEF0a1NvY2tldCBmcm9tIEFjY2Vzc2liaWxpdHlSb290QXRzcGkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDIzMworCisgICAg ICAgIFJldmlld2VkIGJ5IEFkcmlhbiBQZXJleiBkZSBDYXN0cm8uCisKKyAgICAgICAgKiBhY2Nl c3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlBdHNwaS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpBY2Nlc3NpYmlsaXR5QXRzcGk6OnJlZ2lzdGVyUm9vdCk6CisgICAgICAgICogYWNjZXNzaWJp bGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5Um9vdEF0c3BpLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkFjY2Vzc2liaWxpdHlSb290QXRzcGk6OnJlZ2lzdGVyT2JqZWN0KToKKyAgICAgICAgKFdlYkNv cmU6OkFjY2Vzc2liaWxpdHlSb290QXRzcGk6OmVtYmVkZGVkKToKKyAgICAgICAgKFdlYkNvcmU6 OkFjY2Vzc2liaWxpdHlSb290QXRzcGk6OnNldFBhcmVudFBhdGgpOiBEZWxldGVkLgorICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eVJvb3RBdHNwaS5oOgorICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvYXRzcGkveG1sL1NvY2tldC54bWw6CisKIDIwMjEtMTItMTMgIEth dGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViQ29u dGVudCBwcm9jZXNzIGNyYXNoZXMgYXQgQ29udGVudFNlY3VyaXR5UG9saWN5U291cmNlTGlzdDo6 bWF0Y2hlc0FsbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNw aS9BY2Nlc3NpYmlsaXR5QXRzcGkuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9h dHNwaS9BY2Nlc3NpYmlsaXR5QXRzcGkuY3BwCmluZGV4IDBiM2Q5MGQ0MWU2OC4uYzNmZDM0ZGVk Mjg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vz c2liaWxpdHlBdHNwaS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNw aS9BY2Nlc3NpYmlsaXR5QXRzcGkuY3BwCkBAIC03Myw3ICs3Myw3IEBAIHZvaWQgQWNjZXNzaWJp bGl0eUF0c3BpOjpyZWdpc3RlclJvb3QoQWNjZXNzaWJpbGl0eVJvb3RBdHNwaSYgcm9vdE9iamVj dCwgVmVjdG9yCiAgICAgICAgIGlmIChtX2Nvbm5lY3Rpb24pIHsKICAgICAgICAgICAgIGVuc3Vy ZUNhY2hlKCk7CiAgICAgICAgICAgICBTdHJpbmcgcGF0aCA9IG1ha2VTdHJpbmcoIi9vcmcvYTEx eS93ZWJraXQvYWNjZXNzaWJsZS8iLCBjcmVhdGVDYW5vbmljYWxVVUlEU3RyaW5nKCkucmVwbGFj ZSgnLScsICdfJykpOwotICAgICAgICAgICAgVmVjdG9yPHVuc2lnbmVkLCAyPiByZWdpc3RlcmVk T2JqZWN0czsKKyAgICAgICAgICAgIFZlY3Rvcjx1bnNpZ25lZCwgMz4gcmVnaXN0ZXJlZE9iamVj dHM7CiAgICAgICAgICAgICByZWdpc3RlcmVkT2JqZWN0cy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5 KGludGVyZmFjZXMuc2l6ZSgpKTsKICAgICAgICAgICAgIGZvciAoY29uc3QgYXV0byYgaW50ZXJm YWNlIDogaW50ZXJmYWNlcykgewogICAgICAgICAgICAgICAgIGF1dG8gaWQgPSBnX2RidXNfY29u bmVjdGlvbl9yZWdpc3Rlcl9vYmplY3QobV9jb25uZWN0aW9uLmdldCgpLCBwYXRoLnV0ZjgoKS5k YXRhKCksIGludGVyZmFjZS5maXJzdCwgaW50ZXJmYWNlLnNlY29uZCwgcm9vdE9iamVjdC5wdHIo KSwgbnVsbHB0ciwgbnVsbHB0cik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlSb290QXRzcGkuY3BwIGIvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5Um9vdEF0c3BpLmNwcAppbmRleCBhNzk0 MWI1MGE1YzIuLjFhZjQwMjZjYmU3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5Um9vdEF0c3BpLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlSb290QXRzcGkuY3BwCkBAIC00 OCw3ICs0OCw3IEBAIEFjY2Vzc2liaWxpdHlSb290QXRzcGk6OkFjY2Vzc2liaWxpdHlSb290QXRz cGkoUGFnZSYgcGFnZSwgQWNjZXNzaWJpbGl0eUF0c3BpJiBhCiAKIEdEQnVzSW50ZXJmYWNlVlRh YmxlIEFjY2Vzc2liaWxpdHlSb290QXRzcGk6OnNfYWNjZXNzaWJsZUZ1bmN0aW9ucyA9IHsKICAg ICAvLyBtZXRob2RfY2FsbAotICAgIFtdKEdEQnVzQ29ubmVjdGlvbiosIGNvbnN0IGdjaGFyKiBz ZW5kZXIsIGNvbnN0IGdjaGFyKiwgY29uc3QgZ2NoYXIqLCBjb25zdCBnY2hhciogbWV0aG9kTmFt ZSwgR1ZhcmlhbnQqIHBhcmFtZXRlcnMsIEdEQnVzTWV0aG9kSW52b2NhdGlvbiogaW52b2NhdGlv biwgZ3BvaW50ZXIgdXNlckRhdGEpIHsKKyAgICBbXShHREJ1c0Nvbm5lY3Rpb24qLCBjb25zdCBn Y2hhciosIGNvbnN0IGdjaGFyKiwgY29uc3QgZ2NoYXIqLCBjb25zdCBnY2hhciogbWV0aG9kTmFt ZSwgR1ZhcmlhbnQqIHBhcmFtZXRlcnMsIEdEQnVzTWV0aG9kSW52b2NhdGlvbiogaW52b2NhdGlv biwgZ3BvaW50ZXIgdXNlckRhdGEpIHsKICAgICAgICAgUkVMRUFTRV9BU1NFUlQoIWlzTWFpblRo cmVhZCgpKTsKICAgICAgICAgYXV0byYgcm9vdE9iamVjdCA9ICpzdGF0aWNfY2FzdDxBY2Nlc3Np YmlsaXR5Um9vdEF0c3BpKj4odXNlckRhdGEpOwogICAgICAgICBpZiAoIWdfc3RyY21wMChtZXRo b2ROYW1lLCAiR2V0Um9sZSIpKQpAQCAtNTgsMTUgKzU4LDYgQEAgR0RCdXNJbnRlcmZhY2VWVGFi bGUgQWNjZXNzaWJpbGl0eVJvb3RBdHNwaTo6c19hY2Nlc3NpYmxlRnVuY3Rpb25zID0gewogICAg ICAgICBlbHNlIGlmICghZ19zdHJjbXAwKG1ldGhvZE5hbWUsICJHZXRMb2NhbGl6ZWRSb2xlTmFt ZSIpKQogICAgICAgICAgICAgZ19kYnVzX21ldGhvZF9pbnZvY2F0aW9uX3JldHVybl92YWx1ZShp bnZvY2F0aW9uLCBnX3ZhcmlhbnRfbmV3KCIocykiLCBfKCJmaWxsZXIiKSkpOwogICAgICAgICBl bHNlIGlmICghZ19zdHJjbXAwKG1ldGhvZE5hbWUsICJHZXRTdGF0ZSIpKSB7Ci0jaWYgVVNFKEdU SzQpCi0gICAgICAgICAgICAvLyBGSVhNRTogd2UgbmVlZCBhIHdheSB0byBnZXQgdGhlIHBhcmVu dCBhdHNwaSByZWZlcmVuY2UgaW4gR1RLNC4KLSNlbHNlCi0gICAgICAgICAgICAvLyBTaW5jZSB3 ZSBkb24ndCBoYXZlIGEgd2F5IHRvIGtub3cgdGhlIHVuaXF1ZSBuYW1lIG9mIHRoZSBVSSBwcm9j ZXNzLCByaWdodCBhZnRlciBjYWxsaW5nCi0gICAgICAgICAgICAvLyBhdGtfc29ja2V0X2VtYmVk KCkgdGhlIFVJIHByb2Nlc3MgY2FsbHMgYXRrX29iamVjdF9yZWZfc3RhdGVfc2V0KCkgdG8gZm9y Y2UgYSBHZXRTdGF0ZSBtZXNzYWdlLgotICAgICAgICAgICAgLy8gV2UgdXNlIHRoaXMgZmlyc3Qg R2V0U3RhdGUgbWVzc2FnZSB0byBzZXQgdGhlIHNlbmRlciBhcyB0aGUgcGFyZW50IHVuaXF1ZSBu YW1lLgotICAgICAgICAgICAgaWYgKHJvb3RPYmplY3QubV9wYXJlbnRVbmlxdWVOYW1lLmlzTnVs bCgpKQotICAgICAgICAgICAgICAgIHJvb3RPYmplY3QubV9wYXJlbnRVbmlxdWVOYW1lID0gc2Vu ZGVyOwotI2VuZGlmCiAgICAgICAgICAgICBHVmFyaWFudEJ1aWxkZXIgYnVpbGRlciA9IEdfVkFS SUFOVF9CVUlMREVSX0lOSVQoR19WQVJJQU5UX1RZUEUoIihhdSkiKSk7CiAKICAgICAgICAgICAg IHVpbnQ2NF90IGF0c3BpU3RhdGVzID0gKEdfR1VJTlQ2NF9DT05TVEFOVCgxKSA8PCBBdHNwaTo6 U3RhdGU6Ok1hbmFnZXNEZXNjZW5kYW50cyk7CkBAIC0xNTQsNiArMTQ1LDI2IEBAIEdEQnVzSW50 ZXJmYWNlVlRhYmxlIEFjY2Vzc2liaWxpdHlSb290QXRzcGk6OnNfYWNjZXNzaWJsZUZ1bmN0aW9u cyA9IHsKICAgICBudWxscHRyCiB9OwogCitHREJ1c0ludGVyZmFjZVZUYWJsZSBBY2Nlc3NpYmls aXR5Um9vdEF0c3BpOjpzX3NvY2tldEZ1bmN0aW9ucyA9IHsKKyAgICAvLyBtZXRob2RfY2FsbAor ICAgIFtdKEdEQnVzQ29ubmVjdGlvbiosIGNvbnN0IGdjaGFyKiBzZW5kZXIsIGNvbnN0IGdjaGFy KiwgY29uc3QgZ2NoYXIqLCBjb25zdCBnY2hhciogbWV0aG9kTmFtZSwgR1ZhcmlhbnQqIHBhcmFt ZXRlcnMsIEdEQnVzTWV0aG9kSW52b2NhdGlvbiogaW52b2NhdGlvbiwgZ3BvaW50ZXIgdXNlckRh dGEpIHsKKyAgICAgICAgUkVMRUFTRV9BU1NFUlQoIWlzTWFpblRocmVhZCgpKTsKKyAgICAgICAg YXV0byYgcm9vdE9iamVjdCA9ICpzdGF0aWNfY2FzdDxBY2Nlc3NpYmlsaXR5Um9vdEF0c3BpKj4o dXNlckRhdGEpOworICAgICAgICBpZiAoIWdfc3RyY21wMChtZXRob2ROYW1lLCAiRW1iZWRkZWQi KSkgeworICAgICAgICAgICAgY29uc3QgY2hhciogcGF0aDsKKyAgICAgICAgICAgIGdfdmFyaWFu dF9nZXQocGFyYW1ldGVycywgIigmcykiLCAmcGF0aCk7CisgICAgICAgICAgICByb290T2JqZWN0 LmVtYmVkZGVkKHNlbmRlciwgcGF0aCk7CisgICAgICAgICAgICBnX2RidXNfbWV0aG9kX2ludm9j YXRpb25fcmV0dXJuX3ZhbHVlKGludm9jYXRpb24sIG51bGxwdHIpOworICAgICAgICB9CisgICAg fSwKKyAgICAvLyBnZXRfcHJvcGVydHkKKyAgICBudWxscHRyLAorICAgIC8vIHNldF9wcm9wZXJ0 eSwKKyAgICBudWxscHRyLAorICAgIC8vIHBhZGRpbmcKKyAgICBudWxscHRyCit9OworCiB2b2lk IEFjY2Vzc2liaWxpdHlSb290QXRzcGk6OnJlZ2lzdGVyT2JqZWN0KENvbXBsZXRpb25IYW5kbGVy PHZvaWQoY29uc3QgU3RyaW5nJik+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgUkVMRUFT RV9BU1NFUlQoaXNNYWluVGhyZWFkKCkpOwpAQCAtMTYyLDYgKzE3Myw3IEBAIHZvaWQgQWNjZXNz aWJpbGl0eVJvb3RBdHNwaTo6cmVnaXN0ZXJPYmplY3QoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChj b25zdCBTdHJpbmcmCiAKICAgICBWZWN0b3I8c3RkOjpwYWlyPEdEQnVzSW50ZXJmYWNlSW5mbyos IEdEQnVzSW50ZXJmYWNlVlRhYmxlKj4+IGludGVyZmFjZXM7CiAgICAgaW50ZXJmYWNlcy5hcHBl bmQoeyBjb25zdF9jYXN0PEdEQnVzSW50ZXJmYWNlSW5mbyo+KCZ3ZWJraXRfYWNjZXNzaWJsZV9p bnRlcmZhY2UpLCAmc19hY2Nlc3NpYmxlRnVuY3Rpb25zIH0pOworICAgIGludGVyZmFjZXMuYXBw ZW5kKHsgY29uc3RfY2FzdDxHREJ1c0ludGVyZmFjZUluZm8qPigmd2Via2l0X3NvY2tldF9pbnRl cmZhY2UpLCAmc19zb2NrZXRGdW5jdGlvbnMgfSk7CiAgICAgaW50ZXJmYWNlcy5hcHBlbmQoeyBj b25zdF9jYXN0PEdEQnVzSW50ZXJmYWNlSW5mbyo+KCZ3ZWJraXRfY29tcG9uZW50X2ludGVyZmFj ZSksICZzX2NvbXBvbmVudEZ1bmN0aW9ucyB9KTsKICAgICBtX2F0c3BpLnJlZ2lzdGVyUm9vdCgq dGhpcywgV1RGTW92ZShpbnRlcmZhY2VzKSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwog fQpAQCAtMTgxLDEwICsxOTMsMTEgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5Um9vdEF0c3BpOjpzZXRQ YXRoKFN0cmluZyYmIHBhdGgpCiAgICAgbV9wYXRoID0gV1RGTW92ZShwYXRoKTsKIH0KIAotdm9p ZCBBY2Nlc3NpYmlsaXR5Um9vdEF0c3BpOjpzZXRQYXJlbnRQYXRoKFN0cmluZyYmIHBhdGgpCit2 b2lkIEFjY2Vzc2liaWxpdHlSb290QXRzcGk6OmVtYmVkZGVkKGNvbnN0IGNoYXIqIHBhcmVudFVu aXF1ZU5hbWUsIGNvbnN0IGNoYXIqIHBhcmVudFBhdGgpCiB7Ci0gICAgUkVMRUFTRV9BU1NFUlQo aXNNYWluVGhyZWFkKCkpOwotICAgIG1fcGFyZW50UGF0aCA9IFdURk1vdmUocGF0aCk7CisgICAg UkVMRUFTRV9BU1NFUlQoIWlzTWFpblRocmVhZCgpKTsKKyAgICBtX3BhcmVudFVuaXF1ZU5hbWUg PSBwYXJlbnRVbmlxdWVOYW1lOworICAgIG1fcGFyZW50UGF0aCA9IHBhcmVudFBhdGg7CiB9CiAK IEdWYXJpYW50KiBBY2Nlc3NpYmlsaXR5Um9vdEF0c3BpOjphcHBsaWNhdGlvblJlZmVyZW5jZSgp IGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0Fj Y2Vzc2liaWxpdHlSb290QXRzcGkuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRz cGkvQWNjZXNzaWJpbGl0eVJvb3RBdHNwaS5oCmluZGV4IGEyNzVmM2ZkZTQ2ZC4uZTMxZWIxYTQx Y2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vz c2liaWxpdHlSb290QXRzcGkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0 c3BpL0FjY2Vzc2liaWxpdHlSb290QXRzcGkuaApAQCAtNDEsNyArNDEsNiBAQCBwdWJsaWM6CiAg ICAgdm9pZCByZWdpc3Rlck9iamVjdChDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IFN0cmlu ZyYpPiYmKTsKICAgICB2b2lkIHVucmVnaXN0ZXJPYmplY3QoKTsKICAgICB2b2lkIHNldFBhdGgo U3RyaW5nJiYpOwotICAgIHZvaWQgc2V0UGFyZW50UGF0aChTdHJpbmcmJik7CiAKICAgICBjb25z dCBTdHJpbmcmIHBhdGgoKSBjb25zdCB7IHJldHVybiBtX3BhdGg7IH0KICAgICBjb25zdCBTdHJp bmcmIHBhcmVudFVuaXF1ZU5hbWUoKSBjb25zdCB7IHJldHVybiBtX3BhcmVudFVuaXF1ZU5hbWU7 IH0KQEAgLTU1LDkgKzU0LDExIEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgQWNjZXNzaWJpbGl0 eVJvb3RBdHNwaShQYWdlJiwgQWNjZXNzaWJpbGl0eUF0c3BpJik7CiAKKyAgICB2b2lkIGVtYmVk ZGVkKGNvbnN0IGNoYXIqIHBhcmVudFVuaXF1ZU5hbWUsIGNvbnN0IGNoYXIqIHBhcmVudFBhdGgp OwogICAgIEludFJlY3QgZnJhbWVSZWN0KHVpbnQzMl90KSBjb25zdDsKIAogICAgIHN0YXRpYyBH REJ1c0ludGVyZmFjZVZUYWJsZSBzX2FjY2Vzc2libGVGdW5jdGlvbnM7CisgICAgc3RhdGljIEdE QnVzSW50ZXJmYWNlVlRhYmxlIHNfc29ja2V0RnVuY3Rpb25zOwogICAgIHN0YXRpYyBHREJ1c0lu dGVyZmFjZVZUYWJsZSBzX2NvbXBvbmVudEZ1bmN0aW9uczsKIAogICAgIEFjY2Vzc2liaWxpdHlB dHNwaSYgbV9hdHNwaTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv YXRzcGkveG1sL1NvY2tldC54bWwgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3Bp L3htbC9Tb2NrZXQueG1sCmluZGV4IGY5YWM3NmQyYzg4OC4uOWZjMmIyNmRkOGM1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL3htbC9Tb2NrZXQueG1sCisr KyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkveG1sL1NvY2tldC54bWwKQEAg LTE0LDYgKzE0LDExIEBACiAgICAgPGFubm90YXRpb24gbmFtZT0ib3JnLnF0cHJvamVjdC5RdERC dXMuUXRUeXBlTmFtZS5JbjAiIHZhbHVlPSJRU3BpT2JqZWN0UmVmZXJlbmNlIi8+CiAgIDwvbWV0 aG9kPgogCisgIDxtZXRob2QgbmFtZT0iRW1iZWRkZWQiPgorICAgIDxhcmcgZGlyZWN0aW9uPSJp biIgbmFtZT0ic29ja2V0UGF0aCIgdHlwZT0icyIvPgorICAgIDxhbm5vdGF0aW9uIG5hbWU9Im9y Zy5xdHByb2plY3QuUXREQnVzLlF0VHlwZU5hbWUuSW4wIiB2YWx1ZT0iUVNwaU9iamVjdFJlZmVy ZW5jZSIvPgorICA8L21ldGhvZD4KKwogICA8c2lnbmFsIG5hbWU9IkF2YWlsYWJsZSI+CiAgICAg PGFyZyBkaXJlY3Rpb249ImluIiBuYW1lPSJzb2NrZXQiIHR5cGU9IihzbykiLz4KICAgICA8YW5u b3RhdGlvbiBuYW1lPSJvcmcucXRwcm9qZWN0LlF0REJ1cy5RdFR5cGVOYW1lLkluMCIgdmFsdWU9 IlFTcGlPYmplY3RSZWZlcmVuY2UiLz4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggY2M1OTMzYTZlNjVhLi45NDg5YzFk MDEzNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjEtMTItMTMgIENhcmxvcyBHYXJj aWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdW2ExMXldIEhh bmRsZSB0aGUgRW1iZWRkZWQgbWV0aG9kIHNlbnQgYnkgQXRrU29ja2V0IGZyb20gQWNjZXNzaWJp bGl0eVJvb3RBdHNwaQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjM0MjMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWRyaWFuIFBlcmV6IGRlIENhc3Ry by4KKworICAgICAgICBJIGFkZGVkIHNvbWUgaGFja3MgdG8gc2VuZCB0aGUgc29ja2V0IHBhdGgg dG8gdGhlIHdlYiBwcm9jZXNzIHVzaW5nIFdlYktpdCBJUEMgYmVjYXVzZSBFbWJlZGRlZCBtZXNz YWdlIGlzIG5vdAorICAgICAgICBpbiB0aGUgREJ1cyBpbnRlcmZhY2UuIFdlIGNhbiBzaW1wbHkg YWRkIHRoZSBtZXNzYWdlIHRvIHRoZSBpbnRlcmZhY2UgZGVmaW5pdGlvbiBhbmQgaGFuZGxlIGl0 IGluc3RlYWQgdG8KKyAgICAgICAgc2ltcGxpZnkgZXZlcnl0aGluZy4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlByb3Zp c2lvbmFsUGFnZVByb3h5OjpiaW5kQWNjZXNzaWJpbGl0eVRyZWUpOgorICAgICAgICAoV2ViS2l0 OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkUmVjZWl2ZU1lc3NhZ2UpOgorICAgICAgICAqIFVJ UHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNp b25hbFBhZ2VQcm94eTo6YWNjZXNzaWJpbGl0eVBsdWdJRCk6CisgICAgICAgIChXZWJLaXQ6OlBy b3Zpc2lvbmFsUGFnZVByb3h5OjpDb21wbGV0aW9uSGFuZGxlcjx2b2lkKTogRGVsZXRlZC4KKyAg ICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5Ojpzd2FwVG9Qcm92aXNpb25hbFBhZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2Vz LmluOgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvV2ViUGFnZVByb3h5R3RrLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpiaW5kQWNjZXNzaWJpbGl0eVRyZWUpOgorICAgICAg ICAqIFVJUHJvY2Vzcy93cGUvV2ViUGFnZVByb3h5V1BFLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVByb3h5OjpiaW5kQWNjZXNzaWJpbGl0eVRyZWUpOgorICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUGFnZS9ndGsvV2ViUGFnZUd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6 OnBsYXRmb3JtSW5pdGlhbGl6ZSk6CisKIDIwMjEtMTItMTMgIEFsZXggQ2hyaXN0ZW5zZW4gIDxh Y2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBBbGxvdyBXS0NvbnRlbnRSdWxlTGlz dCB0byBydW4gcmVnZXhlcyBvbiBjdXJyZW50IGZyYW1lJ3MgVVJMLCBub3QganVzdCB0b3AgZnJh bWUncyBVUkwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFs UGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVBy b3h5LmNwcAppbmRleCBlM2I5NzhmZWVhZjAuLjJlMDZhZGRmN2U4NyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5LmNwcApAQCAtNDQ0LDEwICs0 NDQsOSBAQCB2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpyZWdpc3RlcldlYlByb2Nlc3NBY2Nl c3NpYmlsaXR5VG9rZW4oY29uc3QgSVBDOjpEYXRhUgogI2VuZGlmCiAKICNpZiBQTEFURk9STShH VEspIHx8IFBMQVRGT1JNKFdQRSkKLXZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmJpbmRBY2Nl c3NpYmlsaXR5VHJlZShjb25zdCBTdHJpbmcmIHBsdWdJRCwgQ29tcGxldGlvbkhhbmRsZXI8dm9p ZChTdHJpbmcmJik+JiYgY29tcGxldGlvbkhhbmRsZXIpCit2b2lkIFByb3Zpc2lvbmFsUGFnZVBy b3h5OjpiaW5kQWNjZXNzaWJpbGl0eVRyZWUoY29uc3QgU3RyaW5nJiBwbHVnSUQpCiB7CiAgICAg bV9hY2Nlc3NpYmlsaXR5UGx1Z0lEID0gcGx1Z0lEOwotICAgIG1fYWNjZXNzaWJpbGl0eUJpbmRD b21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpOwogfQogI2VuZGlm CiAKQEAgLTUxMiw3ICs1MTEsNyBAQCB2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRSZWNl aXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIElQQzo6RAogCiAjaWYgUExB VEZPUk0oR1RLKSB8fCBQTEFURk9STShXUEUpCiAgICAgaWYgKGRlY29kZXIubWVzc2FnZU5hbWUo KSA9PSBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpCaW5kQWNjZXNzaWJpbGl0eVRyZWU6Om5hbWUo KSkgewotICAgICAgICBJUEM6OmhhbmRsZU1lc3NhZ2VBc3luYzxNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpCaW5kQWNjZXNzaWJpbGl0eVRyZWU+KGNvbm5lY3Rpb24sIGRlY29kZXIsIHRoaXMsICZQ cm92aXNpb25hbFBhZ2VQcm94eTo6YmluZEFjY2Vzc2liaWxpdHlUcmVlKTsKKyAgICAgICAgSVBD OjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkJpbmRBY2Nlc3NpYmlsaXR5 VHJlZT4oY29ubmVjdGlvbiwgZGVjb2RlciwgdGhpcywgJlByb3Zpc2lvbmFsUGFnZVByb3h5Ojpi aW5kQWNjZXNzaWJpbGl0eVRyZWUpOwogICAgICAgICByZXR1cm47CiAgICAgfQogI2VuZGlmCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNpb25hbFBhZ2VQcm94eS5o IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuaAppbmRleCBm MWEzNTUzZTZiODguLmFhMWY0ODcxMmU1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvUHJvdmlzaW9uYWxQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9Qcm92aXNpb25hbFBhZ2VQcm94eS5oCkBAIC05Niw3ICs5Niw2IEBAIHB1YmxpYzoKICNlbmRp ZgogI2lmIFBMQVRGT1JNKEdUSykgfHwgUExBVEZPUk0oV1BFKQogICAgIGNvbnN0IFN0cmluZyYg YWNjZXNzaWJpbGl0eVBsdWdJRCgpIHsgcmV0dXJuIG1fYWNjZXNzaWJpbGl0eVBsdWdJRDsgfQot ICAgIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoU3RyaW5nJiYpPiB0YWtlQWNjZXNzaWJpbGl0eUJp bmRDb21wbGV0aW9uSGFuZGxlcigpIHsgcmV0dXJuIHN0ZDo6ZXhjaGFuZ2UobV9hY2Nlc3NpYmls aXR5QmluZENvbXBsZXRpb25IYW5kbGVyLCBudWxscHRyKTsgfQogI2VuZGlmCiAjaWYgSEFWRShW SVNJQklMSVRZX1BST1BBR0FUSU9OX1ZJRVcpCiAgICAgTGF5ZXJIb3N0aW5nQ29udGV4dElEIGNv bnRleHRJREZvclZpc2liaWxpdHlQcm9wYWdhdGlvbkluV2ViUHJvY2VzcygpIGNvbnN0IHsgcmV0 dXJuIG1fY29udGV4dElERm9yVmlzaWJpbGl0eVByb3BhZ2F0aW9uSW5XZWJQcm9jZXNzOyB9CkBA IC0xNDksNyArMTQ4LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHJlZ2lzdGVyV2ViUHJvY2Vzc0Fj Y2Vzc2liaWxpdHlUb2tlbihjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmKTsKICNlbmRpZgogI2lm IFBMQVRGT1JNKEdUSykgfHwgUExBVEZPUk0oV1BFKQotICAgIHZvaWQgYmluZEFjY2Vzc2liaWxp dHlUcmVlKGNvbnN0IFN0cmluZyYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoU3RyaW5nJiYpPiYm KTsKKyAgICB2b2lkIGJpbmRBY2Nlc3NpYmlsaXR5VHJlZShjb25zdCBTdHJpbmcmKTsKICNlbmRp ZgogI2lmIEVOQUJMRShDT05URU5UX0ZJTFRFUklORykKICAgICB2b2lkIGNvbnRlbnRGaWx0ZXJE aWRCbG9ja0xvYWRGb3JGcmFtZShjb25zdCBXZWJDb3JlOjpDb250ZW50RmlsdGVyVW5ibG9ja0hh bmRsZXImLCBXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggNzA3ZmQyZGU3YjdhLi43ZTVkYjExOGU2ZjQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtOTg4LDggKzk4OCw5IEBA IHZvaWQgV2ViUGFnZVByb3h5Ojpzd2FwVG9Qcm92aXNpb25hbFBhZ2Uoc3RkOjp1bmlxdWVfcHRy PFByb3Zpc2lvbmFsUGFnZVByb3h5PiBwCiAgICAgICAgIHJlZ2lzdGVyV2ViUHJvY2Vzc0FjY2Vz c2liaWxpdHlUb2tlbih7IGFjY2Vzc2liaWxpdHlUb2tlbi5kYXRhKCksIGFjY2Vzc2liaWxpdHlU b2tlbi5zaXplKCkgfSk7CiAjZW5kaWYKICNpZiBQTEFURk9STShHVEspIHx8IFBMQVRGT1JNKFdQ RSkKLSAgICBpZiAoYXV0byBjb21wbGV0aW9uSGFuZGxlciA9IHByb3Zpc2lvbmFsUGFnZS0+dGFr ZUFjY2Vzc2liaWxpdHlCaW5kQ29tcGxldGlvbkhhbmRsZXIoKSkKLSAgICAgICAgYmluZEFjY2Vz c2liaWxpdHlUcmVlKHByb3Zpc2lvbmFsUGFnZS0+YWNjZXNzaWJpbGl0eVBsdWdJRCgpLCBXVEZN b3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CisgICAgYXV0byBhY2Nlc3NpYmlsaXR5UGx1Z0lEID0g cHJvdmlzaW9uYWxQYWdlLT5hY2Nlc3NpYmlsaXR5UGx1Z0lEKCk7CisgICAgaWYgKCFhY2Nlc3Np YmlsaXR5UGx1Z0lELmlzRW1wdHkoKSkKKyAgICAgICAgYmluZEFjY2Vzc2liaWxpdHlUcmVlKGFj Y2Vzc2liaWxpdHlQbHVnSUQpOwogI2VuZGlmCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmgKaW5kZXggOTAyMzdhZTU1ZmY5Li5iMGQxZWJkODEzMWIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0yMjkwLDcgKzIyOTAsNyBAQCBwcml2YXRl OgogI2VuZGlmCiAKICNpZiBQTEFURk9STShHVEspIHx8IFBMQVRGT1JNKFdQRSkKLSAgICB2b2lk IGJpbmRBY2Nlc3NpYmlsaXR5VHJlZShjb25zdCBTdHJpbmcmLCBDb21wbGV0aW9uSGFuZGxlcjx2 b2lkKFN0cmluZyYmKT4mJik7CisgICAgdm9pZCBiaW5kQWNjZXNzaWJpbGl0eVRyZWUoY29uc3Qg U3RyaW5nJik7CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKEdUSykKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgppbmRleCA2ZjJmZmU3ZDFkOTEu LmU1ZjhmNWY1MGE0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5Lm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5tZXNzYWdlcy5pbgpAQCAtMTc5LDcgKzE3OSw3IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2VQ cm94eSB7CiAKICNpZiBQTEFURk9STShHVEspIHx8IFBMQVRGT1JNKFdQRSkKICAgICAjIFN1cHBv cnQgZm9yIGNvbm5lY3RpbmcgdGhlIEFjY2Vzc2liaWxpdHkgd29ybGRzIG9mIHRoZSBVSSBhbmQg dGhlIFdlYiBwcm9jZXNzZXMKLSAgICBCaW5kQWNjZXNzaWJpbGl0eVRyZWUoU3RyaW5nIHBsdWdJ RCkgLT4gKFN0cmluZyBzb2NrZXRQYXRoKSBBc3luYworICAgIEJpbmRBY2Nlc3NpYmlsaXR5VHJl ZShTdHJpbmcgcGx1Z0lEKQogCiAgICAgU2V0SW5wdXRNZXRob2RTdGF0ZShzdGQ6Om9wdGlvbmFs PFdlYktpdDo6SW5wdXRNZXRob2RTdGF0ZT4gc3RhdGUpOwogI2VuZGlmCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvV2ViUGFnZVByb3h5R3RrLmNwcCBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2d0ay9XZWJQYWdlUHJveHlHdGsuY3BwCmluZGV4IDNmMzQ1OThjMjI5 Yi4uOTFlZjIxN2I5ZDJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsv V2ViUGFnZVByb3h5R3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvV2Vi UGFnZVByb3h5R3RrLmNwcApAQCAtNDksNyArNDksNyBAQCBHdGtXaWRnZXQqIFdlYlBhZ2VQcm94 eTo6dmlld1dpZGdldCgpCiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PFBhZ2VDbGllbnRJbXBsJj4o cGFnZUNsaWVudCgpKS52aWV3V2lkZ2V0KCk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpiaW5k QWNjZXNzaWJpbGl0eVRyZWUoY29uc3QgU3RyaW5nJiBwbHVnSUQsIENvbXBsZXRpb25IYW5kbGVy PHZvaWQoU3RyaW5nJiYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQordm9pZCBXZWJQYWdlUHJveHk6 OmJpbmRBY2Nlc3NpYmlsaXR5VHJlZShjb25zdCBTdHJpbmcmIHBsdWdJRCkKIHsKICNpZiBVU0Uo R1RLNCkKICAgICAvLyBGSVhNRTogV2UgbmVlZCBhIHdheSB0byBvdmVycmlkZSBhY2Nlc3NpYmxl IGludGVyZmFjZSBvZiBXZWJWaWV3IGFuZCBzZW5kIHRoZSBhdHNwaSByZWZlcmVuY2UgdG8gdGhl IHdlYiBwcm9jZXNzLgpAQCAtNTcsMTUgKzU3LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmJpbmRB Y2Nlc3NpYmlsaXR5VHJlZShjb25zdCBTdHJpbmcmIHBsdWdJRCwgQ29tcGxldGlvbkhhbmRsZXIK ICNlbHNlCiAgICAgYXV0byogYWNjZXNzaWJsZSA9IGd0a193aWRnZXRfZ2V0X2FjY2Vzc2libGUo dmlld1dpZGdldCgpKTsKICAgICBhdGtfc29ja2V0X2VtYmVkKEFUS19TT0NLRVQoYWNjZXNzaWJs ZSksIGNvbnN0X2Nhc3Q8Y2hhcio+KHBsdWdJRC51dGY4KCkuZGF0YSgpKSk7Ci0jaWYgVVNFKEFU U1BJKQotICAgIC8vIEFUSyBkb2Vzbid0IGhhdmUgQVBJIHRvIGdldCB0aGUgYXRzcGkgcmVmZXJl bmNlIG9mIGFuIG9iamVjdCwgYnV0IHdlIGtub3cgdGhlIGlkIGlzIHN0b3JlZAotICAgIC8vIGFz IGFuIG9iamVjdCB1c2VyIGRhdGEgYXMgInNwaS1kYnVzLWlkIi4gVG8gbGV0IHRoZSB3ZWIgcHJv Y2VzcyBrbm93IGFib3V0IHRoZSB1bmlxdWUgbmFtZSwgd2UgY2FsbAotICAgIC8vIGF0a19vYmpl Y3RfcmVmX3N0YXRlX3NldCgpIHRoYXQgc2VuZHMgYSBHZXRTdGF0ZSBtZXNzYWdlIHRvIHRoZSB3 ZWIgcHJvY2VzcyByb290IG9iamVjdC4KLSAgICBnX29iamVjdF91bnJlZihhdGtfb2JqZWN0X3Jl Zl9zdGF0ZV9zZXQoYWNjZXNzaWJsZSkpOwotICAgIGNvbXBsZXRpb25IYW5kbGVyKG1ha2VTdHJp bmcoIi9vcmcvYTExeS9hdHNwaS9hY2Nlc3NpYmxlLyIsIEdQT0lOVEVSX1RPX0lOVChnX29iamVj dF9nZXRfZGF0YShHX09CSkVDVChhY2Nlc3NpYmxlKSwgInNwaS1kYnVzLWlkIikpKSk7Ci0jZWxz ZQotICAgIGNvbXBsZXRpb25IYW5kbGVyKHsgfSk7Ci0jZW5kaWYKICAgICBhdGtfb2JqZWN0X25v dGlmeV9zdGF0ZV9jaGFuZ2UoYWNjZXNzaWJsZSwgQVRLX1NUQVRFX1RSQU5TSUVOVCwgRkFMU0Up OwogI2VuZGlmCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy93cGUvV2Vi UGFnZVByb3h5V1BFLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL3dwZS9XZWJQYWdlUHJv eHlXUEUuY3BwCmluZGV4IDg3NjI4ODc2Y2E3Zi4uOGYyODQ0ZDg1MmZmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy93cGUvV2ViUGFnZVByb3h5V1BFLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy93cGUvV2ViUGFnZVByb3h5V1BFLmNwcApAQCAtNDUsMTMgKzQ1 LDEyIEBAIHN0cnVjdCB3cGVfdmlld19iYWNrZW5kKiBXZWJQYWdlUHJveHk6OnZpZXdCYWNrZW5k KCkKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8UGFnZUNsaWVudEltcGwmPihwYWdlQ2xpZW50KCkp LnZpZXdCYWNrZW5kKCk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpiaW5kQWNjZXNzaWJpbGl0 eVRyZWUoY29uc3QgU3RyaW5nJiBwbHVnSUQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoU3RyaW5n JiYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQordm9pZCBXZWJQYWdlUHJveHk6OmJpbmRBY2Nlc3Np YmlsaXR5VHJlZShjb25zdCBTdHJpbmcmIHBsdWdJRCkKIHsKICNpZiBVU0UoQVRLKQogICAgIGF1 dG8qIGFjY2Vzc2libGUgPSBzdGF0aWNfY2FzdDxQYWdlQ2xpZW50SW1wbCY+KHBhZ2VDbGllbnQo KSkuYWNjZXNzaWJsZSgpOwogICAgIGF0a19zb2NrZXRfZW1iZWQoQVRLX1NPQ0tFVChhY2Nlc3Np YmxlKSwgY29uc3RfY2FzdDxjaGFyKj4ocGx1Z0lELnV0ZjgoKS5kYXRhKCkpKTsKICAgICBhdGtf b2JqZWN0X25vdGlmeV9zdGF0ZV9jaGFuZ2UoYWNjZXNzaWJsZSwgQVRLX1NUQVRFX1RSQU5TSUVO VCwgRkFMU0UpOwotICAgIGNvbXBsZXRpb25IYW5kbGVyKHsgfSk7CiAjZW5kaWYKIH0KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlBhZ2VHdGsu Y3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlBhZ2VHdGsuY3Bw CmluZGV4IDA1MzM1YmUyNDY0My4uMTUxM2RkMmE1Zjc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9ndGsvV2ViUGFnZUd0ay5jcHAKKysrIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlBhZ2VHdGsuY3BwCkBAIC02NCw3ICs2NCw3 IEBAIHZvaWQgV2ViUGFnZTo6cGxhdGZvcm1Jbml0aWFsaXplKCkKICNpZiBVU0UoQVRLKQogICAg IG1fYWNjZXNzaWJpbGl0eU9iamVjdCA9IGFkb3B0R1JlZih3ZWJraXRXZWJQYWdlQWNjZXNzaWJp bGl0eU9iamVjdE5ldyh0aGlzKSk7CiAgICAgR1VuaXF1ZVB0cjxnY2hhcj4gcGx1Z0lEKGF0a19w bHVnX2dldF9pZChBVEtfUExVRyhtX2FjY2Vzc2liaWxpdHlPYmplY3QuZ2V0KCkpKSk7Ci0gICAg c2VuZFdpdGhBc3luY1JlcGx5KE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkJpbmRBY2Nlc3NpYmls aXR5VHJlZShTdHJpbmcocGx1Z0lELmdldCgpKSksIFtdKFN0cmluZyYmKSB7IH0pOworICAgIHNl bmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6QmluZEFjY2Vzc2liaWxpdHlUcmVlKFN0cmluZyhw bHVnSUQuZ2V0KCkpKSk7CiAjZWxpZiBVU0UoQVRTUEkpCiAjaWYgVVNFKEdUSzQpCiAgICAgLy8g RklYTUU6IHdlIG5lZWQgYSB3YXkgdG8gY29ubmVjdCBET00gYW5kIGFwcCBhMTF5IHRyZWUgaW4g R1RLNC4KQEAgLTcyLDEyICs3Miw3IEBAIHZvaWQgV2ViUGFnZTo6cGxhdGZvcm1Jbml0aWFsaXpl KCkKICAgICBpZiAoYXV0byogcGFnZSA9IGNvcmVQYWdlKCkpIHsKICAgICAgICAgbV9hY2Nlc3Np YmlsaXR5Um9vdE9iamVjdCA9IEFjY2Vzc2liaWxpdHlSb290QXRzcGk6OmNyZWF0ZSgqcGFnZSwg V2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuYWNjZXNzaWJpbGl0eUF0c3BpKCkpOwogICAgICAgICBt X2FjY2Vzc2liaWxpdHlSb290T2JqZWN0LT5yZWdpc3Rlck9iamVjdChbJl0oY29uc3QgU3RyaW5n JiBwbHVnSUQpIHsKLSAgICAgICAgICAgIC8vIEFUSyB1c2VzIGEgY3VzdG9tIERCdXMgbWVzc2Fn ZSB0byBzZW5kIHRoZSBzb2NrZXQgcGF0aCB0byB0aGUgQXRrUGx1ZyBvYmplY3QuIEdEQnVzIGRv ZXNuJ3QgYWxsb3cKLSAgICAgICAgICAgIC8vIHRvIHNlbmQgYSBtZXNzYWdlIHRoYXQgaXMgbm90 IGRlZmluZWQgaW4gdGhlIGludGVyZmFjZSwgc28gd2UgdXNlIHRoZSBXZWJLaXQgSVBDIHRvIGdl dCB0aGUgc29ja2V0Ci0gICAgICAgICAgICAvLyBwYXRoIGZyb20gdGhlIFVJIHByb2Nlc3MuCi0g ICAgICAgICAgICBzZW5kV2l0aEFzeW5jUmVwbHkoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6Qmlu ZEFjY2Vzc2liaWxpdHlUcmVlKHBsdWdJRCksIFsmXShTdHJpbmcmJiBzb2NrZXRQYXRoKSB7Ci0g ICAgICAgICAgICAgICAgbV9hY2Nlc3NpYmlsaXR5Um9vdE9iamVjdC0+c2V0UGFyZW50UGF0aChX VEZNb3ZlKHNvY2tldFBhdGgpKTsKLSAgICAgICAgICAgIH0pOworICAgICAgICAgICAgc2VuZChN ZXNzYWdlczo6V2ViUGFnZVByb3h5OjpCaW5kQWNjZXNzaWJpbGl0eVRyZWUocGx1Z0lEKSk7CiAg ICAgICAgIH0pOwogICAgIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2Uvd3BlL1dlYlBhZ2VXUEUuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2Uvd3BlL1dlYlBhZ2VXUEUuY3BwCmluZGV4IGQ2Y2E0MzNiODRlZS4uNTQ5ZTE4 YmQ1ZGNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS93cGUv V2ViUGFnZVdQRS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uvd3Bl L1dlYlBhZ2VXUEUuY3BwCkBAIC00NSw3ICs0NSw3IEBAIHZvaWQgV2ViUGFnZTo6cGxhdGZvcm1J bml0aWFsaXplKCkKICAgICAvLyBvYmplY3QgdGhlcmUgc3BlY2lmaWNhbGx5IHBsYWNlZCBmb3Ig dGhhdCBwdXJwb3NlICh0aGUgc29ja2V0KS4KICAgICBtX2FjY2Vzc2liaWxpdHlPYmplY3QgPSBh ZG9wdEdSZWYod2Via2l0V2ViUGFnZUFjY2Vzc2liaWxpdHlPYmplY3ROZXcodGhpcykpOwogICAg IEdVbmlxdWVQdHI8Z2NoYXI+IHBsdWdJRChhdGtfcGx1Z19nZXRfaWQoQVRLX1BMVUcobV9hY2Nl c3NpYmlsaXR5T2JqZWN0LmdldCgpKSkpOwotICAgIHNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdl czo6V2ViUGFnZVByb3h5OjpCaW5kQWNjZXNzaWJpbGl0eVRyZWUoU3RyaW5nKHBsdWdJRC5nZXQo KSkpLCBbXShTdHJpbmcmJikgeyB9KTsKKyAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6 OkJpbmRBY2Nlc3NpYmlsaXR5VHJlZShTdHJpbmcocGx1Z0lELmdldCgpKSkpOwogI2VuZGlmCiB9 CiAK