86136 2012-05-10 13:56:29 -0700 Rename the missing plug-in indicator to the unavailable plug-in indicator 2012-05-10 14:20:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca eric japhet webkit.review.bot oldest_to_newest 620922 0 andersca 2012-05-10 13:56:29 -0700 Rename the missing plug-in indicator to the unavailable plug-in indicator 620925 1 141244 andersca 2012-05-10 13:59:37 -0700 Created attachment 141244 Patch 620964 2 141244 buildbot 2012-05-10 14:16:32 -0700 Comment on attachment 141244 Patch Attachment 141244 did not pass win-ews (win): Output: http://queues.webkit.org/results/12663435 620972 3 andersca 2012-05-10 14:20:08 -0700 Committed r116687: <http://trac.webkit.org/changeset/116687> 141244 2012-05-10 13:59:37 -0700 2012-05-10 14:16:32 -0700 Patch bug-86136-20120510140155.patch text/plain 35056 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2NjY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTdiYTA4MWY0NDQ3NTc4 NWMyMWUxOWNlNDZjMWFjM2Y1ZmZjMWM0Ny4uNzNkMGM1Zjg2NTlmNTg1MmZiZTBlZjgwOWQ4Nzc3 ZGQ4Y2Y3YTZmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDEyLTA1LTEwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIHRoZSBt aXNzaW5nIHBsdWctaW4gaW5kaWNhdG9yIHRvIHRoZSB1bmF2YWlsYWJsZSBwbHVnLWluIGluZGlj YXRvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODYx MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaW5j ZSB0aGUgaW5kaWNhdG9yIGlzIHNob3duIGZvciBtb3JlIHRoYW4ganVzdCBtaXNzaW5nIHBsdWct aW5zLCBnZW5lcmFsaXplIGl0IGFuZCB1c2UgYSBwbHVnLWluIHVuYXZhaWxhYmlsaXR5CisgICAg ICAgIHJlYXNvbiBlbnVtIHRvIG1ha2UgaXQgZWFzaWVyIHRvIGV4dGVuZC4gQWxzbywgcGFzcyB0 aGUgdW5hdmFpbGFiaWxpdHkgcmVhc29uIHRvIHRoZSBDaHJvbWVDbGllbnQgbWVtYmVyIGZ1bmN0 aW9ucy4KKworICAgICAgICAqIFdlYkNvcmUuZXhwLmluOgorICAgICAgICAqIGh0bWwvSFRNTEVt YmVkRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRW1iZWRFbGVtZW50Ojp1cGRh dGVXaWRnZXQpOgorICAgICAgICAqIGh0bWwvSFRNTE9iamVjdEVsZW1lbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SFRNTE9iamVjdEVsZW1lbnQ6OnVwZGF0ZVdpZGdldCk6CisgICAgICAgICog aHRtbC9IVE1MUGx1Z0luRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MUGx1Z0lu RWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcik6CisgICAgICAgICogaHRtbC9IVE1MUGx1Z0lu SW1hZ2VFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQbHVnSW5JbWFnZUVsZW1l bnQ6OnVwZGF0ZVdpZGdldElmTmVjZXNzYXJ5KToKKyAgICAgICAgKiBsb2FkZXIvU3ViZnJhbWVM b2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3ViZnJhbWVMb2FkZXI6OmxvYWRQbHVnaW4p OgorICAgICAgICAqIHBhZ2UvQ2hyb21lQ2xpZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpDaHJv bWVDbGllbnQ6OnNob3VsZFVuYXZhaWxhYmxlUGx1Z2luTWVzc2FnZUJlQnV0dG9uKToKKyAgICAg ICAgKFdlYkNvcmU6OkNocm9tZUNsaWVudDo6dW5hdmFpbGFibGVQbHVnaW5CdXR0b25DbGlja2Vk KToKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFt ZVZpZXc6OnVwZGF0ZVdpZGdldCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVk T2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckVtYmVkZGVkT2JqZWN0OjpSZW5k ZXJFbWJlZGRlZE9iamVjdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbWJlZGRlZE9iamVj dDo6c2V0UGx1Z2luVW5hdmFpbGFiaWxpdHlSZWFzb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyRW1iZWRkZWRPYmplY3Q6OnNob3dzVW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0b3IpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyRW1iZWRkZWRPYmplY3Q6OnNldFVuYXZhaWxhYmxlUGx1Z2lu SW5kaWNhdG9ySXNQcmVzc2VkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckVtYmVkZGVkT2Jq ZWN0OjpwYWludCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbWJlZGRlZE9iamVjdDo6cGFp bnRSZXBsYWNlZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbWJlZGRlZE9iamVjdDo6Z2V0 UmVwbGFjZW1lbnRUZXh0R2VvbWV0cnkpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRW1iZWRk ZWRPYmplY3Q6OnVuYXZhaWxhYmxlUGx1Z2luUmVwbGFjZW1lbnRUZXh0KToKKyAgICAgICAgKFdl YkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRW1iZWRkZWRPYmplY3Q6OmlzSW5VbmF2 YWlsYWJsZVBsdWdpbkluZGljYXRvcik6CisgICAgICAgIChXZWJDb3JlOjpzaG91bGRVbmF2YWls YWJsZVBsdWdpbk1lc3NhZ2VCZUJ1dHRvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbWJl ZGRlZE9iamVjdDo6aGFuZGxlVW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0b3JFdmVudCk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJFbWJlZGRlZE9iamVjdDo6Z2V0Q3Vyc29yKToKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuaDoKKyAgICAgICAgKFJlbmRlckVtYmVk ZGVkT2JqZWN0KToKKwogMjAxMi0wNS0xMCAgRXJpayBBcnZpZHNzb24gIDxhcnZAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJlYmFzZWxpbmVkIHJ1bi1iaW5kaW5ncy10ZXN0 cyByZXN1bHRzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IDE4ZmFkOGEyYTAxNTA2MzgyOTRmMTUzNTA0 ZWI1OWNhZmJhMjBjODMuLjUzZTE0ZDM0YzUzNmY3ZmE5ZWI1Nzk3OTJjN2Y3MzgxMGEwODE0MjAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0wNS0xMCAgQW5kZXJzIENh cmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSB0aGUgbWlzc2lu ZyBwbHVnLWluIGluZGljYXRvciB0byB0aGUgdW5hdmFpbGFibGUgcGx1Zy1pbiBpbmRpY2F0b3IK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2MTM2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBQbHVnaW5z L0hvc3RlZC9XZWJIb3N0ZWROZXRzY2FwZVBsdWdpblZpZXcubW06CisgICAgICAgICgtW1dlYkhv c3RlZE5ldHNjYXBlUGx1Z2luVmlldyBwbHVnaW5Ib3N0RGllZF0pOgorICAgICAgICAqIFdlYkNv cmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5oOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dl YkNocm9tZUNsaWVudC5tbToKKyAgICAgICAgKFdlYkNocm9tZUNsaWVudDo6c2hvdWxkVW5hdmFp bGFibGVQbHVnaW5NZXNzYWdlQmVCdXR0b24pOgorICAgICAgICAoV2ViQ2hyb21lQ2xpZW50Ojp1 bmF2YWlsYWJsZVBsdWdpbkJ1dHRvbkNsaWNrZWQpOgorCiAyMDEyLTA1LTA5ICBHeXV5b3VuZyBL aW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CiAKICAgICAgICAgTW92ZSBzdXNwZW5kQW5p bWF0aW9ucyB0byB1c2UgSW50ZXJuYWxzIGludGVyZmFjZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvd2luL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwppbmRleCBh MDU5ZWQ2Yzg0ZjI3M2ZiZGRkYmMwYjZmODM3ZjI4ZTExODllZjE4Li4wNjE4NGU4Zjk3ZmE5ZTZk ZjJjNjlkZDAyMWQxM2RiZjM0YTBlNDgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTItMDUtMTAgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwor ICAgICAgICBSZW5hbWUgdGhlIG1pc3NpbmcgcGx1Zy1pbiBpbmRpY2F0b3IgdG8gdGhlIHVuYXZh aWxhYmxlIHBsdWctaW4gaW5kaWNhdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04NjEzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcDoKKyAg ICAgICAgKFdlYkNocm9tZUNsaWVudDo6c2hvdWxkVW5hdmFpbGFibGVQbHVnaW5NZXNzYWdlQmVC dXR0b24pOgorICAgICAgICAoV2ViQ2hyb21lQ2xpZW50Ojp1bmF2YWlsYWJsZVBsdWdpbkJ1dHRv bkNsaWNrZWQpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5oOgor ICAgICAgICAoV2ViQ2hyb21lQ2xpZW50KToKKwogMjAxMi0wNS0wOSAgR3l1eW91bmcgS2ltICA8 Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgogCiAgICAgICAgIE1vdmUgc3VzcGVuZEFuaW1hdGlv bnMgdG8gdXNlIEludGVybmFscyBpbnRlcmZhY2UuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDIwZDE5MTUxNjBk ZTc5ZmYwZjU4MDJhYzFkZDNiNzc5NzMzMTg3Ny4uYmQxMmQ1NDdmZTc4MjZjMTRlNDEzNjQ1OWNh MjU2YzZkNDM0NTI4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA1LTEwICBB bmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIHRo ZSBtaXNzaW5nIHBsdWctaW4gaW5kaWNhdG9yIHRvIHRoZSB1bmF2YWlsYWJsZSBwbHVnLWluIGlu ZGljYXRvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 ODYxMzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBV cGRhdGUgZm9yIFdlYkNvcmUgY2hhbmdlcy4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lu cy9QbHVnaW5WaWV3LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luVmlldzo6cGx1Z2luUHJv Y2Vzc0NyYXNoZWQpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hy b21lQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ2hyb21lQ2xpZW50OjpzaG91bGRV bmF2YWlsYWJsZVBsdWdpbk1lc3NhZ2VCZUJ1dHRvbik6CisgICAgICAgIChXZWJLaXQ6OldlYkNo cm9tZUNsaWVudDo6dW5hdmFpbGFibGVQbHVnaW5CdXR0b25DbGlja2VkKToKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5oOgorICAgICAgICAoV2Vi Q2hyb21lQ2xpZW50KToKKwogMjAxMi0wNS0xMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2Fy Y2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gVGVzdCAvd2Via2l0Mi9XZWJLaXRXZWJW aWV3L3Jlc291cmNlcyB0aW1lcyBvdXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNv cmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXggN2JjYmUxNWNi Mjk4Y2U4OWMxMjlmNWI3ZDdkNzdhOTA2OTJhNWU5Ni4uYTAwODAzNWEyMGY0MjA1ZTMzYWM4NDY3 NDFlOTA1OGU4NDRhMzE4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAu aW4KKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTYxNSwxMSArNjE1LDEx IEBAIF9fWk43V2ViQ29yZTIwTm9kZVJlbmRlcmluZ0NvbnRleHRDMUVQTlNfNE5vZGVFCiBfX1pO N1dlYkNvcmUyME5vZGVSZW5kZXJpbmdDb250ZXh0RDFFdgogX19aTjdXZWJDb3JlMjBQbGF0Zm9y bUV2ZW50RmFjdG9yeTI0Y3JlYXRlUGxhdGZvcm1Nb3VzZUV2ZW50RVA3TlNFdmVudFA2TlNWaWV3 CiBfX1pON1dlYkNvcmUyMFBsYXRmb3JtRXZlbnRGYWN0b3J5MjdjcmVhdGVQbGF0Zm9ybUtleWJv YXJkRXZlbnRFUDdOU0V2ZW50Ci1fX1pON1dlYkNvcmUyMFJlbmRlckVtYmVkZGVkT2JqZWN0MzBz ZXRTaG93c0NyYXNoZWRQbHVnaW5JbmRpY2F0b3JFdgogX19aTjdXZWJDb3JlMjBSZXNvdXJjZVJl c3BvbnNlQmFzZTExc2V0TWltZVR5cGVFUktOM1dURjZTdHJpbmdFCiBfX1pON1dlYkNvcmUyMFJl c291cmNlUmVzcG9uc2VCYXNlMTdzZXRIVFRQU3RhdHVzQ29kZUVpCiBfX1pON1dlYkNvcmUyMFJl c291cmNlUmVzcG9uc2VCYXNlMjBzZXRTdWdnZXN0ZWRGaWxlbmFtZUVSS04zV1RGNlN0cmluZ0UK IF9fWk43V2ViQ29yZTIwUmVzb3VyY2VSZXNwb25zZUJhc2UyNHNldEV4cGVjdGVkQ29udGVudExl bmd0aEV4CitfX1pON1dlYkNvcmUyMFJlbmRlckVtYmVkZGVkT2JqZWN0MjlzZXRQbHVnaW5VbmF2 YWlsYWJpbGl0eVJlYXNvbkVOUzBfMjZQbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbkUKIF9fWk43 V2ViQ29yZTIwUmVzb3VyY2VSZXNwb25zZUJhc2U2c2V0VVJMRVJLTlNfNEtVUkxFCiBfX1pON1dl YkNvcmUyMFJlc291cmNlUmVzcG9uc2VCYXNlQzJFdgogX19aTjdXZWJDb3JlMjBVc2VyR2VzdHVy ZUluZGljYXRvcjdzX3N0YXRlRQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M RW1iZWRFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVtYmVkRWxlbWVudC5j cHAKaW5kZXggODM5ZjMzYWE1ZWI0NTgxNWY4MjEwOTU4MTRiZGY3MWJmY2I1NmIzNC4uZmZhYWJj ZDJhZDVjOGNiN2ZkM2IzNmJiN2Y1NzQwNzhlYzk3MWUyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MRW1iZWRFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxFbWJlZEVsZW1lbnQuY3BwCkBAIC0xMzIsNyArMTMyLDcgQEAgdm9pZCBIVE1MRW1iZWRF bGVtZW50OjpwYXJhbWV0ZXJzRm9yUGx1Z2luKFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBW ZWN0b3I8U3QKIC8vIG1vdmVkIGRvd24gaW50byBIVE1MUGx1Z2luSW1hZ2VFbGVtZW50LmNwcAog dm9pZCBIVE1MRW1iZWRFbGVtZW50Ojp1cGRhdGVXaWRnZXQoUGx1Z2luQ3JlYXRpb25PcHRpb24g cGx1Z2luQ3JlYXRpb25PcHRpb24pCiB7Ci0gICAgQVNTRVJUKCFyZW5kZXJFbWJlZGRlZE9iamVj dCgpLT5wbHVnaW5DcmFzaGVkT3JXYXNNaXNzaW5nKCkpOworICAgIEFTU0VSVCghcmVuZGVyRW1i ZWRkZWRPYmplY3QoKS0+c2hvd3NVbmF2YWlsYWJsZVBsdWdpbkluZGljYXRvcigpKTsKICAgICBB U1NFUlQobmVlZHNXaWRnZXRVcGRhdGUoKSk7CiAgICAgc2V0TmVlZHNXaWRnZXRVcGRhdGUoZmFs c2UpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPYmplY3RFbGVtZW50 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE9iamVjdEVsZW1lbnQuY3BwCmluZGV4IDcx OGU4ZDBiZDE0YmEwNzRlY2RkYmJhYjZkN2JlMGUwNTIzNWY4OTAuLmI5ZTk0NDdjOTVhYzhkOTQy MDhlODBkOTc4YTFmNzlmNGJhNDg3MTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTE9iamVjdEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE9iamVj dEVsZW1lbnQuY3BwCkBAIC0yNzYsNyArMjc2LDcgQEAgYm9vbCBIVE1MT2JqZWN0RWxlbWVudDo6 aGFzVmFsaWRDbGFzc0lkKCkKIC8vIG1vdmVkIGRvd24gaW50byBIVE1MUGx1Z2luSW1hZ2VFbGVt ZW50LmNwcAogdm9pZCBIVE1MT2JqZWN0RWxlbWVudDo6dXBkYXRlV2lkZ2V0KFBsdWdpbkNyZWF0 aW9uT3B0aW9uIHBsdWdpbkNyZWF0aW9uT3B0aW9uKQogewotICAgIEFTU0VSVCghcmVuZGVyRW1i ZWRkZWRPYmplY3QoKS0+cGx1Z2luQ3Jhc2hlZE9yV2FzTWlzc2luZygpKTsKKyAgICBBU1NFUlQo IXJlbmRlckVtYmVkZGVkT2JqZWN0KCktPnNob3dzVW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0b3Io KSk7CiAgICAgQVNTRVJUKG5lZWRzV2lkZ2V0VXBkYXRlKCkpOwogICAgIHNldE5lZWRzV2lkZ2V0 VXBkYXRlKGZhbHNlKTsKICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgQVNTRVJUIGlzRmluaXNo ZWRQYXJzaW5nQ2hpbGRyZW4oKSBpbnN0ZWFkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MUGx1Z0luRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVn SW5FbGVtZW50LmNwcAppbmRleCA0NThkMTU3NThmNTZkY2NhZmE1ZjMxYjliYjI0NzhmODRkZGQx ZTkxLi5hNmMyNDUyMmNjNjkyZGRjN2Q4ZWFlZDQ1MWY2NGRjMjRhMmIzNzc4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5FbGVtZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxQbHVnSW5FbGVtZW50LmNwcApAQCAtMTY5LDggKzE2OSw4IEBAIHZv aWQgSFRNTFBsdWdJbkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50KQog ICAgIC8vIEZJWE1FOiBNb3VzZSBkb3duIGFuZCBzY3JvbGwgZXZlbnRzIGFyZSBwYXNzZWQgZG93 biB0byBwbHVnLWluIHZpYSBjdXN0b20gY29kZSBpbiBFdmVudEhhbmRsZXI7IHRoZXNlIGNvZGUg cGF0aHMgc2hvdWxkIGJlIHVuaXRlZC4KIAogICAgIFJlbmRlck9iamVjdCogciA9IHJlbmRlcmVy KCk7Ci0gICAgaWYgKHIgJiYgci0+aXNFbWJlZGRlZE9iamVjdCgpICYmIHRvUmVuZGVyRW1iZWRk ZWRPYmplY3QociktPnNob3dzTWlzc2luZ1BsdWdpbkluZGljYXRvcigpKSB7Ci0gICAgICAgIHRv UmVuZGVyRW1iZWRkZWRPYmplY3QociktPmhhbmRsZU1pc3NpbmdQbHVnaW5JbmRpY2F0b3JFdmVu dChldmVudCk7CisgICAgaWYgKHIgJiYgci0+aXNFbWJlZGRlZE9iamVjdCgpICYmIHRvUmVuZGVy RW1iZWRkZWRPYmplY3QociktPnNob3dzVW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0b3IoKSkgewor ICAgICAgICB0b1JlbmRlckVtYmVkZGVkT2JqZWN0KHIpLT5oYW5kbGVVbmF2YWlsYWJsZVBsdWdp bkluZGljYXRvckV2ZW50KGV2ZW50KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5jcHAKaW5kZXggMTNlOGUz ZjJmODdkYTliMWRlMzUxNDdiNWVkYzk5YTY0ODdmYWQ3MC4uNDQ3MWM2M2Q1MWQ5ZDAyMmQ5ODNk NGNjMjYxYmY0YmIyMzFmY2Y1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M UGx1Z0luSW1hZ2VFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVn SW5JbWFnZUVsZW1lbnQuY3BwCkBAIC0xODksNyArMTg5LDcgQEAgdm9pZCBIVE1MUGx1Z0luSW1h Z2VFbGVtZW50Ojp1cGRhdGVXaWRnZXRJZk5lY2Vzc2FyeSgpCiAgICAgaWYgKCFuZWVkc1dpZGdl dFVwZGF0ZSgpIHx8IHVzZUZhbGxiYWNrQ29udGVudCgpIHx8IGlzSW1hZ2VUeXBlKCkpCiAgICAg ICAgIHJldHVybjsKIAotICAgIGlmICghcmVuZGVyRW1iZWRkZWRPYmplY3QoKSB8fCByZW5kZXJF bWJlZGRlZE9iamVjdCgpLT5wbHVnaW5DcmFzaGVkT3JXYXNNaXNzaW5nKCkpCisgICAgaWYgKCFy ZW5kZXJFbWJlZGRlZE9iamVjdCgpIHx8IHJlbmRlckVtYmVkZGVkT2JqZWN0KCktPnNob3dzVW5h dmFpbGFibGVQbHVnaW5JbmRpY2F0b3IoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgdXBkYXRl V2lkZ2V0KENyZWF0ZU9ubHlOb25OZXRzY2FwZVBsdWdpbnMpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9TdWJmcmFtZUxvYWRlci5jcHAKaW5kZXggNGI1YjFkZGI4ZDYwOWI0NmRmNjZjNTJjOTYyNGVm NjIxYzVjNWZhYy4uYTIzYzQ2MmFmYjYwZDhlNDUwMDY4OTdmMWVkYzhmYTc1YzFjMmFlOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwCkBAIC0zNzYsNyArMzc2LDcg QEAgYm9vbCBTdWJmcmFtZUxvYWRlcjo6bG9hZFBsdWdpbihIVE1MUGx1Z0luSW1hZ2VFbGVtZW50 KiBwbHVnaW5FbGVtZW50LCBjb25zdCBLVVIKICAgICAgICAgcGx1Z2luRWxlbWVudCwgdXJsLCBw YXJhbU5hbWVzLCBwYXJhbVZhbHVlcywgbWltZVR5cGUsIGxvYWRNYW51YWxseSk7CiAKICAgICBp ZiAoIXdpZGdldCkgewotICAgICAgICByZW5kZXJlci0+c2V0U2hvd3NNaXNzaW5nUGx1Z2luSW5k aWNhdG9yKCk7CisgICAgICAgIHJlbmRlcmVyLT5zZXRQbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNv bihSZW5kZXJFbWJlZGRlZE9iamVjdDo6UGx1Z2luTWlzc2luZyk7CiAgICAgICAgIHJldHVybiBm YWxzZTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ2hyb21lQ2xp ZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVudC5oCmluZGV4IDViOTI1OWIx MjFlOTE5MWQwNjVhZjlhMTBjZGE2YWQ1NWQzZTUxYWMuLmJiMmFlZTRiODQ1NzNjNzdlMmU0ZjBm OTQ4ZGQ4ZWRkY2I4ZDcwODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ2hyb21l Q2xpZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9DaHJvbWVDbGllbnQuaApAQCAtMzAs NiArMzAsNyBAQAogI2luY2x1ZGUgIkhvc3RXaW5kb3cuaCIKICNpbmNsdWRlICJQb3B1cE1lbnUu aCIKICNpbmNsdWRlICJQb3B1cE1lbnVDbGllbnQuaCIKKyNpbmNsdWRlICJSZW5kZXJFbWJlZGRl ZE9iamVjdC5oIgogI2luY2x1ZGUgIlNjcm9sbFR5cGVzLmgiCiAjaW5jbHVkZSAiU2VhcmNoUG9w dXBNZW51LmgiCiAjaW5jbHVkZSAiV2ViQ29yZUtleWJvYXJkVUlNb2RlLmgiCkBAIC0xNzAsOCAr MTcxLDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2aXJ0dWFsIHZvaWQgbGF5b3V0 VXBkYXRlZChGcmFtZSopIGNvbnN0IHsgfQogICAgICAgICB2aXJ0dWFsIHZvaWQgc2Nyb2xsUmVj dEludG9WaWV3KGNvbnN0IEludFJlY3QmKSBjb25zdCB7IH07IC8vIEN1cnJlbnRseSBvbmx5IE1h YyBoYXMgYSBub24gZW1wdHkgaW1wbGVtZW50YXRpb24uCiAgICAgICAgCi0gICAgICAgIHZpcnR1 YWwgYm9vbCBzaG91bGRNaXNzaW5nUGx1Z2luTWVzc2FnZUJlQnV0dG9uKCkgY29uc3QgeyByZXR1 cm4gZmFsc2U7IH0KLSAgICAgICAgdmlydHVhbCB2b2lkIG1pc3NpbmdQbHVnaW5CdXR0b25DbGlj a2VkKEVsZW1lbnQqKSBjb25zdCB7IH0KKyAgICAgICAgdmlydHVhbCBib29sIHNob3VsZFVuYXZh aWxhYmxlUGx1Z2luTWVzc2FnZUJlQnV0dG9uKFJlbmRlckVtYmVkZGVkT2JqZWN0OjpQbHVnaW5V bmF2YWlsYWJpbGl0eVJlYXNvbikgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAgICAgICAgdmly dHVhbCB2b2lkIHVuYXZhaWxhYmxlUGx1Z2luQnV0dG9uQ2xpY2tlZChFbGVtZW50KiwgUmVuZGVy RW1iZWRkZWRPYmplY3Q6OlBsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uKSBjb25zdCB7IH0KICAg ICAgICAgdmlydHVhbCB2b2lkIG1vdXNlRGlkTW92ZU92ZXJFbGVtZW50KGNvbnN0IEhpdFRlc3RS ZXN1bHQmLCB1bnNpZ25lZCBtb2RpZmllckZsYWdzKSA9IDA7CiAKICAgICAgICAgdmlydHVhbCB2 b2lkIHNldFRvb2xUaXAoY29uc3QgU3RyaW5nJiwgVGV4dERpcmVjdGlvbikgPSAwOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IDU3Mjg1MzYxZjM1YzFjZjkzOTBlN2NkMDY3ZGNjZWJk NWZjOTI1NzcuLjI1NTMxYjA4YmU1MmM5ZmM2Y2I4N2NmMjkzYTIzY2NlNDUxYWZmMmMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTIyNzksNyArMjI3OSw3IEBAIHZvaWQgRnJhbWVW aWV3Ojp1cGRhdGVXaWRnZXQoUmVuZGVyRW1iZWRkZWRPYmplY3QqIG9iamVjdCkKICAgICAgICAg cmV0dXJuOwogCiAgICAgLy8gTm8gbmVlZCB0byB1cGRhdGUgaWYgaXQncyBhbHJlYWR5IGNyYXNo ZWQgb3Iga25vd24gdG8gYmUgbWlzc2luZy4KLSAgICBpZiAob2JqZWN0LT5wbHVnaW5DcmFzaGVk T3JXYXNNaXNzaW5nKCkpCisgICAgaWYgKG9iamVjdC0+c2hvd3NVbmF2YWlsYWJsZVBsdWdpbklu ZGljYXRvcigpKQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBGSVhNRTogVGhpcyBjb3VsZCB0 dXJuIGludG8gYSByZWFsIHZpcnR1YWwgZGlzcGF0Y2ggaWYgd2UgZGVmaW5lZApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5jcHAKaW5kZXggMjE2 OGE0MDBhNTMwODY3M2RjYzRiMGUyMjNjMDJkYjk5OGQwYmExMy4uZDBmMTRiZGEyNTE4YzMwYTE0 ZjllNmQxNmE0ZmJlM2YwMmU5NmVkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuY3BwCkBAIC03NCw5ICs3NCw5IEBAIHN0YXRpYyBjb25z dCBDb2xvciYgcmVwbGFjZW1lbnRUZXh0Um91bmRlZFJlY3RQcmVzc2VkQ29sb3IoKQogUmVuZGVy RW1iZWRkZWRPYmplY3Q6OlJlbmRlckVtYmVkZGVkT2JqZWN0KEVsZW1lbnQqIGVsZW1lbnQpCiAg ICAgOiBSZW5kZXJQYXJ0KGVsZW1lbnQpCiAgICAgLCBtX2hhc0ZhbGxiYWNrQ29udGVudChmYWxz ZSkKLSAgICAsIG1fc2hvd3NNaXNzaW5nUGx1Z2luSW5kaWNhdG9yKGZhbHNlKQotICAgICwgbV9t aXNzaW5nUGx1Z2luSW5kaWNhdG9ySXNQcmVzc2VkKGZhbHNlKQotICAgICwgbV9tb3VzZURvd25X YXNJbk1pc3NpbmdQbHVnaW5JbmRpY2F0b3IoZmFsc2UpCisgICAgLCBtX3Nob3dzVW5hdmFpbGFi bGVQbHVnaW5JbmRpY2F0b3IoZmFsc2UpCisgICAgLCBtX3VuYXZhaWxhYmxlUGx1Z2luSW5kaWNh dG9ySXNQcmVzc2VkKGZhbHNlKQorICAgICwgbV9tb3VzZURvd25XYXNJblVuYXZhaWxhYmxlUGx1 Z2luSW5kaWNhdG9yKGZhbHNlKQogewogICAgIHZpZXcoKS0+ZnJhbWVWaWV3KCktPnNldElzVmlz dWFsbHlOb25FbXB0eSgpOwogfQpAQCAtMTAyLDMwICsxMDIsMjQgQEAgYm9vbCBSZW5kZXJFbWJl ZGRlZE9iamVjdDo6YWxsb3dzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpIGNvbnN0CiB9CiAjZW5k aWYKIAotdm9pZCBSZW5kZXJFbWJlZGRlZE9iamVjdDo6c2V0U2hvd3NNaXNzaW5nUGx1Z2luSW5k aWNhdG9yKCkKK3ZvaWQgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OnNldFBsdWdpblVuYXZhaWxhYmls aXR5UmVhc29uKFBsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uIHBsdWdpblVuYXZhaWxhYmlsaXR5 UmVhc29uKQogewotICAgIEFTU0VSVChtX3JlcGxhY2VtZW50VGV4dC5pc0VtcHR5KCkpOwotICAg IG1fcmVwbGFjZW1lbnRUZXh0ID0gbWlzc2luZ1BsdWdpblRleHQoKTsKLSAgICBtX3Nob3dzTWlz c2luZ1BsdWdpbkluZGljYXRvciA9IHRydWU7CisgICAgQVNTRVJUKCFtX3Nob3dzVW5hdmFpbGFi bGVQbHVnaW5JbmRpY2F0b3IpOworICAgIG1fc2hvd3NVbmF2YWlsYWJsZVBsdWdpbkluZGljYXRv ciA9IHRydWU7CisgICAgbV9wbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbiA9IHBsdWdpblVuYXZh aWxhYmlsaXR5UmVhc29uOwogfQogCi12b2lkIFJlbmRlckVtYmVkZGVkT2JqZWN0OjpzZXRTaG93 c0NyYXNoZWRQbHVnaW5JbmRpY2F0b3IoKQorYm9vbCBSZW5kZXJFbWJlZGRlZE9iamVjdDo6c2hv d3NVbmF2YWlsYWJsZVBsdWdpbkluZGljYXRvcigpIGNvbnN0CiB7Ci0gICAgQVNTRVJUKG1fcmVw bGFjZW1lbnRUZXh0LmlzRW1wdHkoKSk7Ci0gICAgbV9yZXBsYWNlbWVudFRleHQgPSBjcmFzaGVk UGx1Z2luVGV4dCgpOworICAgIHJldHVybiBtX3Nob3dzVW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0 b3I7CiB9CiAKLWJvb2wgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OnBsdWdpbkNyYXNoZWRPcldhc01p c3NpbmcoKSBjb25zdAordm9pZCBSZW5kZXJFbWJlZGRlZE9iamVjdDo6c2V0VW5hdmFpbGFibGVQ bHVnaW5JbmRpY2F0b3JJc1ByZXNzZWQoYm9vbCBwcmVzc2VkKQogewotICAgIHJldHVybiAhbV9y ZXBsYWNlbWVudFRleHQuaXNOdWxsKCk7Ci19Ci0gICAgCi12b2lkIFJlbmRlckVtYmVkZGVkT2Jq ZWN0OjpzZXRNaXNzaW5nUGx1Z2luSW5kaWNhdG9ySXNQcmVzc2VkKGJvb2wgcHJlc3NlZCkKLXsK LSAgICBpZiAobV9taXNzaW5nUGx1Z2luSW5kaWNhdG9ySXNQcmVzc2VkID09IHByZXNzZWQpCisg ICAgaWYgKG1fdW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0b3JJc1ByZXNzZWQgPT0gcHJlc3NlZCkK ICAgICAgICAgcmV0dXJuOwogICAgIAotICAgIG1fbWlzc2luZ1BsdWdpbkluZGljYXRvcklzUHJl c3NlZCA9IHByZXNzZWQ7CisgICAgbV91bmF2YWlsYWJsZVBsdWdpbkluZGljYXRvcklzUHJlc3Nl ZCA9IHByZXNzZWQ7CiAgICAgcmVwYWludCgpOwogfQogCkBAIC0xMzUsNyArMTI5LDcgQEAgdm9p ZCBSZW5kZXJFbWJlZGRlZE9iamVjdDo6cGFpbnQoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0 IExheW91dFBvaW50JiBwYWludE8KICAgICBpZiAoRnJhbWUqIGZyYW1lID0gdGhpcy0+ZnJhbWUo KSkKICAgICAgICAgcGFnZSA9IGZyYW1lLT5wYWdlKCk7CiAKLSAgICBpZiAocGx1Z2luQ3Jhc2hl ZE9yV2FzTWlzc2luZygpKSB7CisgICAgaWYgKHNob3dzVW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0 b3IoKSkgewogICAgICAgICBpZiAocGFnZSAmJiBwYWludEluZm8ucGhhc2UgPT0gUGFpbnRQaGFz ZUZvcmVncm91bmQpCiAgICAgICAgICAgICBwYWdlLT5hZGRSZWxldmFudFVucGFpbnRlZE9iamVj dCh0aGlzLCB2aXN1YWxPdmVyZmxvd1JlY3QoKSk7CiAgICAgICAgIFJlbmRlclJlcGxhY2VkOjpw YWludChwYWludEluZm8sIHBhaW50T2Zmc2V0KTsKQEAgLTE1MCw3ICsxNDQsNyBAQCB2b2lkIFJl bmRlckVtYmVkZGVkT2JqZWN0OjpwYWludChQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5 b3V0UG9pbnQmIHBhaW50TwogCiB2b2lkIFJlbmRlckVtYmVkZGVkT2JqZWN0OjpwYWludFJlcGxh Y2VkKFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQp CiB7Ci0gICAgaWYgKCFwbHVnaW5DcmFzaGVkT3JXYXNNaXNzaW5nKCkpCisgICAgaWYgKCFzaG93 c1VuYXZhaWxhYmxlUGx1Z2luSW5kaWNhdG9yKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIGlm IChwYWludEluZm8ucGhhc2UgPT0gUGFpbnRQaGFzZVNlbGVjdGlvbikKQEAgLTE3MSwxNCArMTY1 LDE0IEBAIHZvaWQgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OnBhaW50UmVwbGFjZWQoUGFpbnRJbmZv JiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50CiAgICAgCiAgICAgR3JhcGhpY3NDb250ZXh0 U3RhdGVTYXZlciBzdGF0ZVNhdmVyKCpjb250ZXh0KTsKICAgICBjb250ZXh0LT5jbGlwKGNvbnRl bnRSZWN0KTsKLSAgICBjb250ZXh0LT5zZXRBbHBoYShtX21pc3NpbmdQbHVnaW5JbmRpY2F0b3JJ c1ByZXNzZWQgPyByZXBsYWNlbWVudFRleHRQcmVzc2VkUm91bmRlZFJlY3RPcGFjaXR5IDogcmVw bGFjZW1lbnRUZXh0Um91bmRlZFJlY3RPcGFjaXR5KTsKLSAgICBjb250ZXh0LT5zZXRGaWxsQ29s b3IobV9taXNzaW5nUGx1Z2luSW5kaWNhdG9ySXNQcmVzc2VkID8gcmVwbGFjZW1lbnRUZXh0Um91 bmRlZFJlY3RQcmVzc2VkQ29sb3IoKSA6IENvbG9yOjp3aGl0ZSwgc3R5bGUoKS0+Y29sb3JTcGFj ZSgpKTsKKyAgICBjb250ZXh0LT5zZXRBbHBoYShtX3VuYXZhaWxhYmxlUGx1Z2luSW5kaWNhdG9y SXNQcmVzc2VkID8gcmVwbGFjZW1lbnRUZXh0UHJlc3NlZFJvdW5kZWRSZWN0T3BhY2l0eSA6IHJl cGxhY2VtZW50VGV4dFJvdW5kZWRSZWN0T3BhY2l0eSk7CisgICAgY29udGV4dC0+c2V0RmlsbENv bG9yKG1fdW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0b3JJc1ByZXNzZWQgPyByZXBsYWNlbWVudFRl eHRSb3VuZGVkUmVjdFByZXNzZWRDb2xvcigpIDogQ29sb3I6OndoaXRlLCBzdHlsZSgpLT5jb2xv clNwYWNlKCkpOwogICAgIGNvbnRleHQtPmZpbGxQYXRoKHBhdGgpOwogCiAgICAgY29uc3QgRm9u dE1ldHJpY3MmIGZvbnRNZXRyaWNzID0gZm9udC5mb250TWV0cmljcygpOwogICAgIGZsb2F0IGxh YmVsWCA9IHJvdW5kZihyZXBsYWNlbWVudFRleHRSZWN0LmxvY2F0aW9uKCkueCgpICsgKHJlcGxh Y2VtZW50VGV4dFJlY3Quc2l6ZSgpLndpZHRoKCkgLSB0ZXh0V2lkdGgpIC8gMik7CiAgICAgZmxv YXQgbGFiZWxZID0gcm91bmRmKHJlcGxhY2VtZW50VGV4dFJlY3QubG9jYXRpb24oKS55KCkgKyAo cmVwbGFjZW1lbnRUZXh0UmVjdC5zaXplKCkuaGVpZ2h0KCkgLSBmb250TWV0cmljcy5oZWlnaHQo KSkgLyAyICsgZm9udE1ldHJpY3MuYXNjZW50KCkpOwotICAgIGNvbnRleHQtPnNldEFscGhhKG1f bWlzc2luZ1BsdWdpbkluZGljYXRvcklzUHJlc3NlZCA/IHJlcGxhY2VtZW50VGV4dFByZXNzZWRU ZXh0T3BhY2l0eSA6IHJlcGxhY2VtZW50VGV4dFRleHRPcGFjaXR5KTsKKyAgICBjb250ZXh0LT5z ZXRBbHBoYShtX3VuYXZhaWxhYmxlUGx1Z2luSW5kaWNhdG9ySXNQcmVzc2VkID8gcmVwbGFjZW1l bnRUZXh0UHJlc3NlZFRleHRPcGFjaXR5IDogcmVwbGFjZW1lbnRUZXh0VGV4dE9wYWNpdHkpOwog ICAgIGNvbnRleHQtPnNldEZpbGxDb2xvcihDb2xvcjo6YmxhY2ssIHN0eWxlKCktPmNvbG9yU3Bh Y2UoKSk7CiAgICAgY29udGV4dC0+ZHJhd0JpZGlUZXh0KGZvbnQsIHJ1biwgRmxvYXRQb2ludChs YWJlbFgsIGxhYmVsWSkpOwogfQpAQCAtMjAwLDcgKzE5NCw3IEBAIGJvb2wgUmVuZGVyRW1iZWRk ZWRPYmplY3Q6OmdldFJlcGxhY2VtZW50VGV4dEdlb21ldHJ5KGNvbnN0IExheW91dFBvaW50JiBh Y2N1bXVsCiAgICAgZm9udCA9IEZvbnQoZm9udERlc2NyaXB0aW9uLCAwLCAwKTsKICAgICBmb250 LnVwZGF0ZSgwKTsKICAgICAKLSAgICBydW4gPSBUZXh0UnVuKG1fcmVwbGFjZW1lbnRUZXh0KTsK KyAgICBydW4gPSBUZXh0UnVuKHVuYXZhaWxhYmxlUGx1Z2luUmVwbGFjZW1lbnRUZXh0KCkpOwog ICAgIHRleHRXaWR0aCA9IGZvbnQud2lkdGgocnVuKTsKICAgICAKICAgICByZXBsYWNlbWVudFRl eHRSZWN0LnNldFNpemUoRmxvYXRTaXplKHRleHRXaWR0aCArIHJlcGxhY2VtZW50VGV4dFJvdW5k ZWRSZWN0TGVmdFJpZ2h0VGV4dE1hcmdpbiAqIDIsIHJlcGxhY2VtZW50VGV4dFJvdW5kZWRSZWN0 SGVpZ2h0KSk7CkBAIC0yMTMsNiArMjA3LDE5IEBAIGJvb2wgUmVuZGVyRW1iZWRkZWRPYmplY3Q6 OmdldFJlcGxhY2VtZW50VGV4dEdlb21ldHJ5KGNvbnN0IExheW91dFBvaW50JiBhY2N1bXVsCiAg ICAgcmV0dXJuIHRydWU7CiB9CiAKK1N0cmluZyBSZW5kZXJFbWJlZGRlZE9iamVjdDo6dW5hdmFp bGFibGVQbHVnaW5SZXBsYWNlbWVudFRleHQoKSBjb25zdAoreworICAgIHN3aXRjaCAobV9wbHVn aW5VbmF2YWlsYWJpbGl0eVJlYXNvbikgeworICAgIGNhc2UgUGx1Z2luTWlzc2luZzoKKyAgICAg ICAgcmV0dXJuIG1pc3NpbmdQbHVnaW5UZXh0KCk7CisgICAgY2FzZSBQbHVnaW5DcmFzaGVkOgor ICAgICAgICByZXR1cm4gY3Jhc2hlZFBsdWdpblRleHQoKTsKKyAgICB9CisKKyAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gU3RyaW5nKCk7Cit9CisKIHZvaWQgUmVuZGVyRW1i ZWRkZWRPYmplY3Q6OmxheW91dCgpCiB7CiAgICAgQVNTRVJUKG5lZWRzTGF5b3V0KCkpOwpAQCAt Mjk1LDcgKzMwMiw3IEBAIGJvb2wgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OmxvZ2ljYWxTY3JvbGwo U2Nyb2xsTG9naWNhbERpcmVjdGlvbiBkaXJlY3Rpb24sIFNjcm9sCiB9CiAKIAotYm9vbCBSZW5k ZXJFbWJlZGRlZE9iamVjdDo6aXNJbk1pc3NpbmdQbHVnaW5JbmRpY2F0b3IoY29uc3QgTGF5b3V0 UG9pbnQmIHBvaW50KSBjb25zdAorYm9vbCBSZW5kZXJFbWJlZGRlZE9iamVjdDo6aXNJblVuYXZh aWxhYmxlUGx1Z2luSW5kaWNhdG9yKGNvbnN0IExheW91dFBvaW50JiBwb2ludCkgY29uc3QKIHsK ICAgICBGbG9hdFJlY3QgY29udGVudFJlY3Q7CiAgICAgUGF0aCBwYXRoOwpAQCAtMzA3LDIwICsz MTQsMjAgQEAgYm9vbCBSZW5kZXJFbWJlZGRlZE9iamVjdDo6aXNJbk1pc3NpbmdQbHVnaW5JbmRp Y2F0b3IoY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50KQogICAgICAgICAmJiBwYXRoLmNvbnRhaW5z KHBvaW50KTsKIH0KIAotYm9vbCBSZW5kZXJFbWJlZGRlZE9iamVjdDo6aXNJbk1pc3NpbmdQbHVn aW5JbmRpY2F0b3IoTW91c2VFdmVudCogZXZlbnQpIGNvbnN0Citib29sIFJlbmRlckVtYmVkZGVk T2JqZWN0Ojppc0luVW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0b3IoTW91c2VFdmVudCogZXZlbnQp IGNvbnN0CiB7Ci0gICAgcmV0dXJuIGlzSW5NaXNzaW5nUGx1Z2luSW5kaWNhdG9yKHJvdW5kZWRM YXlvdXRQb2ludChhYnNvbHV0ZVRvTG9jYWwoZXZlbnQtPmFic29sdXRlTG9jYXRpb24oKSwgZmFs c2UsIHRydWUpKSk7CisgICAgcmV0dXJuIGlzSW5VbmF2YWlsYWJsZVBsdWdpbkluZGljYXRvcihy b3VuZGVkTGF5b3V0UG9pbnQoYWJzb2x1dGVUb0xvY2FsKGV2ZW50LT5hYnNvbHV0ZUxvY2F0aW9u KCksIGZhbHNlLCB0cnVlKSkpOwogfQogCi1zdGF0aWMgYm9vbCBzaG91bGRNaXNzaW5nUGx1Z2lu TWVzc2FnZUJlQnV0dG9uKERvY3VtZW50KiBkb2N1bWVudCkKK3N0YXRpYyBib29sIHNob3VsZFVu YXZhaWxhYmxlUGx1Z2luTWVzc2FnZUJlQnV0dG9uKERvY3VtZW50KiBkb2N1bWVudCwgUmVuZGVy RW1iZWRkZWRPYmplY3Q6OlBsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uIHBsdWdpblVuYXZhaWxh YmlsaXR5UmVhc29uKQogewogICAgIFBhZ2UqIHBhZ2UgPSBkb2N1bWVudC0+cGFnZSgpOwotICAg IHJldHVybiBwYWdlICYmIHBhZ2UtPmNocm9tZSgpLT5jbGllbnQoKS0+c2hvdWxkTWlzc2luZ1Bs dWdpbk1lc3NhZ2VCZUJ1dHRvbigpOworICAgIHJldHVybiBwYWdlICYmIHBhZ2UtPmNocm9tZSgp LT5jbGllbnQoKS0+c2hvdWxkVW5hdmFpbGFibGVQbHVnaW5NZXNzYWdlQmVCdXR0b24ocGx1Z2lu VW5hdmFpbGFiaWxpdHlSZWFzb24pOwogfQogCi12b2lkIFJlbmRlckVtYmVkZGVkT2JqZWN0Ojpo YW5kbGVNaXNzaW5nUGx1Z2luSW5kaWNhdG9yRXZlbnQoRXZlbnQqIGV2ZW50KQordm9pZCBSZW5k ZXJFbWJlZGRlZE9iamVjdDo6aGFuZGxlVW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0b3JFdmVudChF dmVudCogZXZlbnQpCiB7Ci0gICAgaWYgKCFzaG91bGRNaXNzaW5nUGx1Z2luTWVzc2FnZUJlQnV0 dG9uKGRvY3VtZW50KCkpKQorICAgIGlmICghc2hvdWxkVW5hdmFpbGFibGVQbHVnaW5NZXNzYWdl QmVCdXR0b24oZG9jdW1lbnQoKSwgbV9wbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbikpCiAgICAg ICAgIHJldHVybjsKICAgICAKICAgICBpZiAoIWV2ZW50LT5pc01vdXNlRXZlbnQoKSkKQEAgLTMy OSw0MCArMzM2LDQwIEBAIHZvaWQgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OmhhbmRsZU1pc3NpbmdQ bHVnaW5JbmRpY2F0b3JFdmVudChFdmVudCogZXZlbnQpCiAgICAgTW91c2VFdmVudCogbW91c2VF dmVudCA9IHN0YXRpY19jYXN0PE1vdXNlRXZlbnQqPihldmVudCk7CiAgICAgSFRNTFBsdWdJbkVs ZW1lbnQqIGVsZW1lbnQgPSBzdGF0aWNfY2FzdDxIVE1MUGx1Z0luRWxlbWVudCo+KG5vZGUoKSk7 CiAgICAgaWYgKGV2ZW50LT50eXBlKCkgPT0gZXZlbnROYW1lcygpLm1vdXNlZG93bkV2ZW50ICYm IHN0YXRpY19jYXN0PE1vdXNlRXZlbnQqPihldmVudCktPmJ1dHRvbigpID09IExlZnRCdXR0b24p IHsKLSAgICAgICAgbV9tb3VzZURvd25XYXNJbk1pc3NpbmdQbHVnaW5JbmRpY2F0b3IgPSBpc0lu TWlzc2luZ1BsdWdpbkluZGljYXRvcihtb3VzZUV2ZW50KTsKLSAgICAgICAgaWYgKG1fbW91c2VE b3duV2FzSW5NaXNzaW5nUGx1Z2luSW5kaWNhdG9yKSB7CisgICAgICAgIG1fbW91c2VEb3duV2Fz SW5VbmF2YWlsYWJsZVBsdWdpbkluZGljYXRvciA9IGlzSW5VbmF2YWlsYWJsZVBsdWdpbkluZGlj YXRvcihtb3VzZUV2ZW50KTsKKyAgICAgICAgaWYgKG1fbW91c2VEb3duV2FzSW5VbmF2YWlsYWJs ZVBsdWdpbkluZGljYXRvcikgewogICAgICAgICAgICAgaWYgKEZyYW1lKiBmcmFtZSA9IGRvY3Vt ZW50KCktPmZyYW1lKCkpIHsKICAgICAgICAgICAgICAgICBmcmFtZS0+ZXZlbnRIYW5kbGVyKCkt PnNldENhcHR1cmluZ01vdXNlRXZlbnRzTm9kZShlbGVtZW50KTsKICAgICAgICAgICAgICAgICBl bGVtZW50LT5zZXRJc0NhcHR1cmluZ01vdXNlRXZlbnRzKHRydWUpOwogICAgICAgICAgICAgfQot ICAgICAgICAgICAgc2V0TWlzc2luZ1BsdWdpbkluZGljYXRvcklzUHJlc3NlZCh0cnVlKTsKKyAg ICAgICAgICAgIHNldFVuYXZhaWxhYmxlUGx1Z2luSW5kaWNhdG9ySXNQcmVzc2VkKHRydWUpOwog ICAgICAgICB9CiAgICAgICAgIGV2ZW50LT5zZXREZWZhdWx0SGFuZGxlZCgpOwogICAgIH0gICAg ICAgIAogICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5tb3VzZXVwRXZlbnQg JiYgc3RhdGljX2Nhc3Q8TW91c2VFdmVudCo+KGV2ZW50KS0+YnV0dG9uKCkgPT0gTGVmdEJ1dHRv bikgewotICAgICAgICBpZiAobV9taXNzaW5nUGx1Z2luSW5kaWNhdG9ySXNQcmVzc2VkKSB7Cisg ICAgICAgIGlmIChtX3VuYXZhaWxhYmxlUGx1Z2luSW5kaWNhdG9ySXNQcmVzc2VkKSB7CiAgICAg ICAgICAgICBpZiAoRnJhbWUqIGZyYW1lID0gZG9jdW1lbnQoKS0+ZnJhbWUoKSkgewogICAgICAg ICAgICAgICAgIGZyYW1lLT5ldmVudEhhbmRsZXIoKS0+c2V0Q2FwdHVyaW5nTW91c2VFdmVudHNO b2RlKDApOwogICAgICAgICAgICAgICAgIGVsZW1lbnQtPnNldElzQ2FwdHVyaW5nTW91c2VFdmVu dHMoZmFsc2UpOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgc2V0TWlzc2luZ1BsdWdpbklu ZGljYXRvcklzUHJlc3NlZChmYWxzZSk7CisgICAgICAgICAgICBzZXRVbmF2YWlsYWJsZVBsdWdp bkluZGljYXRvcklzUHJlc3NlZChmYWxzZSk7CiAgICAgICAgIH0KLSAgICAgICAgaWYgKG1fbW91 c2VEb3duV2FzSW5NaXNzaW5nUGx1Z2luSW5kaWNhdG9yICYmIGlzSW5NaXNzaW5nUGx1Z2luSW5k aWNhdG9yKG1vdXNlRXZlbnQpKSB7CisgICAgICAgIGlmIChtX21vdXNlRG93bldhc0luVW5hdmFp bGFibGVQbHVnaW5JbmRpY2F0b3IgJiYgaXNJblVuYXZhaWxhYmxlUGx1Z2luSW5kaWNhdG9yKG1v dXNlRXZlbnQpKSB7CiAgICAgICAgICAgICBpZiAoUGFnZSogcGFnZSA9IGRvY3VtZW50KCktPnBh Z2UoKSkKLSAgICAgICAgICAgICAgICBwYWdlLT5jaHJvbWUoKS0+Y2xpZW50KCktPm1pc3NpbmdQ bHVnaW5CdXR0b25DbGlja2VkKGVsZW1lbnQpOyAgICAgICAgICAgIAorICAgICAgICAgICAgICAg IHBhZ2UtPmNocm9tZSgpLT5jbGllbnQoKS0+dW5hdmFpbGFibGVQbHVnaW5CdXR0b25DbGlja2Vk KGVsZW1lbnQsIG1fcGx1Z2luVW5hdmFpbGFiaWxpdHlSZWFzb24pOwogICAgICAgICB9Ci0gICAg ICAgIG1fbW91c2VEb3duV2FzSW5NaXNzaW5nUGx1Z2luSW5kaWNhdG9yID0gZmFsc2U7CisgICAg ICAgIG1fbW91c2VEb3duV2FzSW5VbmF2YWlsYWJsZVBsdWdpbkluZGljYXRvciA9IGZhbHNlOwog ICAgICAgICBldmVudC0+c2V0RGVmYXVsdEhhbmRsZWQoKTsKICAgICB9CiAgICAgaWYgKGV2ZW50 LT50eXBlKCkgPT0gZXZlbnROYW1lcygpLm1vdXNlbW92ZUV2ZW50KSB7Ci0gICAgICAgIHNldE1p c3NpbmdQbHVnaW5JbmRpY2F0b3JJc1ByZXNzZWQobV9tb3VzZURvd25XYXNJbk1pc3NpbmdQbHVn aW5JbmRpY2F0b3IgJiYgaXNJbk1pc3NpbmdQbHVnaW5JbmRpY2F0b3IobW91c2VFdmVudCkpOwor ICAgICAgICBzZXRVbmF2YWlsYWJsZVBsdWdpbkluZGljYXRvcklzUHJlc3NlZChtX21vdXNlRG93 bldhc0luVW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0b3IgJiYgaXNJblVuYXZhaWxhYmxlUGx1Z2lu SW5kaWNhdG9yKG1vdXNlRXZlbnQpKTsKICAgICAgICAgZXZlbnQtPnNldERlZmF1bHRIYW5kbGVk KCk7CiAgICAgfQogfQogCiBDdXJzb3JEaXJlY3RpdmUgUmVuZGVyRW1iZWRkZWRPYmplY3Q6Omdl dEN1cnNvcihjb25zdCBMYXlvdXRQb2ludCYgcG9pbnQsIEN1cnNvciYgY3Vyc29yKSBjb25zdAog ewotICAgIGlmIChtX3Nob3dzTWlzc2luZ1BsdWdpbkluZGljYXRvciAmJiBzaG91bGRNaXNzaW5n UGx1Z2luTWVzc2FnZUJlQnV0dG9uKGRvY3VtZW50KCkpICYmIGlzSW5NaXNzaW5nUGx1Z2luSW5k aWNhdG9yKHBvaW50KSkgeworICAgIGlmIChzaG93c1VuYXZhaWxhYmxlUGx1Z2luSW5kaWNhdG9y KCkgJiYgc2hvdWxkVW5hdmFpbGFibGVQbHVnaW5NZXNzYWdlQmVCdXR0b24oZG9jdW1lbnQoKSwg bV9wbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbikgJiYgaXNJblVuYXZhaWxhYmxlUGx1Z2luSW5k aWNhdG9yKHBvaW50KSkgewogICAgICAgICBjdXJzb3IgPSBoYW5kQ3Vyc29yKCk7CiAgICAgICAg IHJldHVybiBTZXRDdXJzb3I7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyRW1iZWRkZWRPYmplY3QuaAppbmRleCBjNTc5MTYwODc1MDZkZjM1Njg3Njc0OGEwZTJk MTkyYjE3ZjVjODYzLi5mNzQyOGY0OTFlOGU3ZDNhZGYyMzExMTEzM2VmNzE2Mzc5Y2E1Y2Q1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3Qu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuaApA QCAtMzYsMTcgKzM2LDE4IEBAIHB1YmxpYzoKICAgICBSZW5kZXJFbWJlZGRlZE9iamVjdChFbGVt ZW50Kik7CiAgICAgdmlydHVhbCB+UmVuZGVyRW1iZWRkZWRPYmplY3QoKTsKIAotICAgIGJvb2wg cGx1Z2luQ3Jhc2hlZE9yV2FzTWlzc2luZygpIGNvbnN0OwotICAgIAotICAgIHZvaWQgc2V0U2hv d3NNaXNzaW5nUGx1Z2luSW5kaWNhdG9yKCk7Ci0gICAgdm9pZCBzZXRTaG93c0NyYXNoZWRQbHVn aW5JbmRpY2F0b3IoKTsKLSAgICBib29sIHNob3dzTWlzc2luZ1BsdWdpbkluZGljYXRvcigpIGNv bnN0IHsgcmV0dXJuIG1fc2hvd3NNaXNzaW5nUGx1Z2luSW5kaWNhdG9yOyB9CisgICAgZW51bSBQ bHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbiB7CisgICAgICAgIFBsdWdpbk1pc3NpbmcsCisgICAg ICAgIFBsdWdpbkNyYXNoZWQsCisgICAgfTsKKyAgICB2b2lkIHNldFBsdWdpblVuYXZhaWxhYmls aXR5UmVhc29uKFBsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uKTsKKyAgICBib29sIHNob3dzVW5h dmFpbGFibGVQbHVnaW5JbmRpY2F0b3IoKSBjb25zdDsKIAogICAgIC8vIEZJWE1FOiBUaGlzIGJl bG9uZ3Mgb24gSFRNTE9iamVjdEVsZW1lbnQuCiAgICAgYm9vbCBoYXNGYWxsYmFja0NvbnRlbnQo KSBjb25zdCB7IHJldHVybiBtX2hhc0ZhbGxiYWNrQ29udGVudDsgfQogICAgIHZvaWQgc2V0SGFz RmFsbGJhY2tDb250ZW50KGJvb2wgaGFzRmFsbGJhY2tDb250ZW50KSB7IG1faGFzRmFsbGJhY2tD b250ZW50ID0gaGFzRmFsbGJhY2tDb250ZW50OyB9CiAKLSAgICB2b2lkIGhhbmRsZU1pc3NpbmdQ bHVnaW5JbmRpY2F0b3JFdmVudChFdmVudCopOworICAgIHZvaWQgaGFuZGxlVW5hdmFpbGFibGVQ bHVnaW5JbmRpY2F0b3JFdmVudChFdmVudCopOwogCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBP U0lUSU5HKQogICAgIHZpcnR1YWwgYm9vbCBhbGxvd3NBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCkg Y29uc3Q7CkBAIC03MiwxNiArNzMsMTggQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIGJvb2wgc2Ny b2xsKFNjcm9sbERpcmVjdGlvbiwgU2Nyb2xsR3JhbnVsYXJpdHksIGZsb2F0IG11bHRpcGxpZXIs IE5vZGUqKiBzdG9wTm9kZSk7CiAgICAgdmlydHVhbCBib29sIGxvZ2ljYWxTY3JvbGwoU2Nyb2xs TG9naWNhbERpcmVjdGlvbiwgU2Nyb2xsR3JhbnVsYXJpdHksIGZsb2F0IG11bHRpcGxpZXIsIE5v ZGUqKiBzdG9wTm9kZSk7CiAKLSAgICB2b2lkIHNldE1pc3NpbmdQbHVnaW5JbmRpY2F0b3JJc1By ZXNzZWQoYm9vbCk7Ci0gICAgYm9vbCBpc0luTWlzc2luZ1BsdWdpbkluZGljYXRvcihNb3VzZUV2 ZW50KikgY29uc3Q7Ci0gICAgYm9vbCBpc0luTWlzc2luZ1BsdWdpbkluZGljYXRvcihjb25zdCBM YXlvdXRQb2ludCYpIGNvbnN0OworICAgIHZvaWQgc2V0VW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0 b3JJc1ByZXNzZWQoYm9vbCk7CisgICAgYm9vbCBpc0luVW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0 b3IoTW91c2VFdmVudCopIGNvbnN0OworICAgIGJvb2wgaXNJblVuYXZhaWxhYmxlUGx1Z2luSW5k aWNhdG9yKGNvbnN0IExheW91dFBvaW50JikgY29uc3Q7CiAgICAgYm9vbCBnZXRSZXBsYWNlbWVu dFRleHRHZW9tZXRyeShjb25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQsIEZsb2F0 UmVjdCYgY29udGVudFJlY3QsIFBhdGgmLCBGbG9hdFJlY3QmIHJlcGxhY2VtZW50VGV4dFJlY3Qs IEZvbnQmLCBUZXh0UnVuJiwgZmxvYXQmIHRleHRXaWR0aCkgY29uc3Q7CisgICAgU3RyaW5nIHVu YXZhaWxhYmxlUGx1Z2luUmVwbGFjZW1lbnRUZXh0KCkgY29uc3Q7CiAKLSAgICBTdHJpbmcgbV9y ZXBsYWNlbWVudFRleHQ7CiAgICAgYm9vbCBtX2hhc0ZhbGxiYWNrQ29udGVudDsgLy8gRklYTUU6 IFRoaXMgYmVsb25ncyBvbiBIVE1MT2JqZWN0RWxlbWVudC4KLSAgICBib29sIG1fc2hvd3NNaXNz aW5nUGx1Z2luSW5kaWNhdG9yOwotICAgIGJvb2wgbV9taXNzaW5nUGx1Z2luSW5kaWNhdG9ySXNQ cmVzc2VkOwotICAgIGJvb2wgbV9tb3VzZURvd25XYXNJbk1pc3NpbmdQbHVnaW5JbmRpY2F0b3I7 CisKKyAgICBib29sIG1fc2hvd3NVbmF2YWlsYWJsZVBsdWdpbkluZGljYXRvcjsKKyAgICBQbHVn aW5VbmF2YWlsYWJpbGl0eVJlYXNvbiBtX3BsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uOworICAg IGJvb2wgbV91bmF2YWlsYWJsZVBsdWdpbkluZGljYXRvcklzUHJlc3NlZDsKKyAgICBib29sIG1f bW91c2VEb3duV2FzSW5VbmF2YWlsYWJsZVBsdWdpbkluZGljYXRvcjsKIH07CiAKIGlubGluZSBS ZW5kZXJFbWJlZGRlZE9iamVjdCogdG9SZW5kZXJFbWJlZGRlZE9iamVjdChSZW5kZXJPYmplY3Qq IG9iamVjdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL1dl Ykhvc3RlZE5ldHNjYXBlUGx1Z2luVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMv SG9zdGVkL1dlYkhvc3RlZE5ldHNjYXBlUGx1Z2luVmlldy5tbQppbmRleCA4YWQ4ZmUwY2Y5NGUz ODAwNmIyNmZjZmQ3NDBjYjdjYzk0MjI0NmE4Li4xNjVhMDA2NjJhN2U3ZGYxNGM3ZDhjYTk2ZTc0 NGQyZTgyNmZhM2ZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3Rl ZC9XZWJIb3N0ZWROZXRzY2FwZVBsdWdpblZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMv UGx1Z2lucy9Ib3N0ZWQvV2ViSG9zdGVkTmV0c2NhcGVQbHVnaW5WaWV3Lm1tCkBAIC0zOTIsNyAr MzkyLDcgQEAgZXh0ZXJuICJDIiB7CiAgICAgaWYgKF9lbGVtZW50LT5yZW5kZXJlcigpICYmIF9l bGVtZW50LT5yZW5kZXJlcigpLT5pc0VtYmVkZGVkT2JqZWN0KCkpIHsKICAgICAgICAgLy8gRklY TUU6IFRoZSByZW5kZXJlciBjb3VsZCBhbHNvIGJlIGEgUmVuZGVyQXBwbGV0LCB3ZSBzaG91bGQg aGFuZGxlIHRoYXQuCiAgICAgICAgIFJlbmRlckVtYmVkZGVkT2JqZWN0KiByZW5kZXJlciA9IHRv UmVuZGVyRW1iZWRkZWRPYmplY3QoX2VsZW1lbnQtPnJlbmRlcmVyKCkpOwotICAgICAgICByZW5k ZXJlci0+c2V0U2hvd3NDcmFzaGVkUGx1Z2luSW5kaWNhdG9yKCk7CisgICAgICAgIHJlbmRlcmVy LT5zZXRQbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbihSZW5kZXJFbWJlZGRlZE9iamVjdDo6UGx1 Z2luQ3Jhc2hlZCk7CiAgICAgfQogCiAgICAgX3BsdWdpbkxheWVyID0gbmlsOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmggYi9T b3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuaAppbmRleCAw NTc2YWZmODM1NmM4MTZmZDI0Y2VjNjEyNDNhOGU5ZjRkYmNmYmQxLi4xNjA0MWIwY2M2ZWQ5YTMx ZDI3ODhjNmNjYWMwZWFhYWZkZDVlYjY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9X ZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9X ZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuaApAQCAtMTAyLDggKzEwMiw4IEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIHZvaWQgc2V0U3RhdHVzYmFyVGV4dChjb25zdCBXVEY6OlN0cmluZyYp IE9WRVJSSURFOwogCiAgICAgdmlydHVhbCB2b2lkIHNjcm9sbGJhcnNNb2RlRGlkQ2hhbmdlKCkg Y29uc3QgT1ZFUlJJREUgeyB9Ci0gICAgdmlydHVhbCBib29sIHNob3VsZE1pc3NpbmdQbHVnaW5N ZXNzYWdlQmVCdXR0b24oKSBjb25zdCBPVkVSUklERTsKLSAgICB2aXJ0dWFsIHZvaWQgbWlzc2lu Z1BsdWdpbkJ1dHRvbkNsaWNrZWQoV2ViQ29yZTo6RWxlbWVudCopIGNvbnN0IE9WRVJSSURFOwor ICAgIHZpcnR1YWwgYm9vbCBzaG91bGRVbmF2YWlsYWJsZVBsdWdpbk1lc3NhZ2VCZUJ1dHRvbihX ZWJDb3JlOjpSZW5kZXJFbWJlZGRlZE9iamVjdDo6UGx1Z2luVW5hdmFpbGFiaWxpdHlSZWFzb24p IGNvbnN0IE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9pZCB1bmF2YWlsYWJsZVBsdWdpbkJ1dHRv bkNsaWNrZWQoV2ViQ29yZTo6RWxlbWVudCosIFdlYkNvcmU6OlJlbmRlckVtYmVkZGVkT2JqZWN0 OjpQbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbikgY29uc3QgT1ZFUlJJREU7CiAgICAgdmlydHVh bCB2b2lkIG1vdXNlRGlkTW92ZU92ZXJFbGVtZW50KGNvbnN0IFdlYkNvcmU6OkhpdFRlc3RSZXN1 bHQmLCB1bnNpZ25lZCBtb2RpZmllckZsYWdzKSBPVkVSUklERTsKIAogICAgIHZpcnR1YWwgdm9p ZCBzZXRUb29sVGlwKGNvbnN0IFdURjo6U3RyaW5nJiwgV2ViQ29yZTo6VGV4dERpcmVjdGlvbikg T1ZFUlJJREU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9X ZWJDaHJvbWVDbGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJD aHJvbWVDbGllbnQubW0KaW5kZXggOThmNWM1ZDFiYmY0NTZjYzhkNzFiYWYyOTc3MTc2YTVlYmJm ODVkMC4uMmVhMGQ2NjcyYmQwMmQ3YTYyNTg4NzI4YzcyNThmZDA2ZGMwOTEwNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50Lm1tCisr KyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5tbQpA QCAtNTkwLDEzICs1OTAsMTcgQEAgdm9pZCBXZWJDaHJvbWVDbGllbnQ6OnNjcm9sbFJlY3RJbnRv Vmlldyhjb25zdCBJbnRSZWN0JiByKSBjb25zdAogCiAvLyBFbmQgaG9zdCB3aW5kb3cgbWV0aG9k cy4KIAotYm9vbCBXZWJDaHJvbWVDbGllbnQ6OnNob3VsZE1pc3NpbmdQbHVnaW5NZXNzYWdlQmVC dXR0b24oKSBjb25zdAorYm9vbCBXZWJDaHJvbWVDbGllbnQ6OnNob3VsZFVuYXZhaWxhYmxlUGx1 Z2luTWVzc2FnZUJlQnV0dG9uKFJlbmRlckVtYmVkZGVkT2JqZWN0OjpQbHVnaW5VbmF2YWlsYWJp bGl0eVJlYXNvbiBwbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbikgY29uc3QKIHsKLSAgICByZXR1 cm4gW1ttX3dlYlZpZXcgVUlEZWxlZ2F0ZV0gcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcih3 ZWJWaWV3OmRpZFByZXNzTWlzc2luZ1BsdWdpbkJ1dHRvbjopXTsKKyAgICBpZiAocGx1Z2luVW5h dmFpbGFiaWxpdHlSZWFzb24gPT0gUmVuZGVyRW1iZWRkZWRPYmplY3Q6OlBsdWdpbk1pc3Npbmcp CisgICAgICAgIHJldHVybiBbW21fd2ViVmlldyBVSURlbGVnYXRlXSByZXNwb25kc1RvU2VsZWN0 b3I6QHNlbGVjdG9yKHdlYlZpZXc6ZGlkUHJlc3NNaXNzaW5nUGx1Z2luQnV0dG9uOildOworCisg ICAgcmV0dXJuIGZhbHNlOwogfQogCi12b2lkIFdlYkNocm9tZUNsaWVudDo6bWlzc2luZ1BsdWdp bkJ1dHRvbkNsaWNrZWQoRWxlbWVudCogZWxlbWVudCkgY29uc3QKK3ZvaWQgV2ViQ2hyb21lQ2xp ZW50Ojp1bmF2YWlsYWJsZVBsdWdpbkJ1dHRvbkNsaWNrZWQoRWxlbWVudCogZWxlbWVudCwgUmVu ZGVyRW1iZWRkZWRPYmplY3Q6OlBsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uIHBsdWdpblVuYXZh aWxhYmlsaXR5UmVhc29uKSBjb25zdAogeworICAgIEFTU0VSVF9VTlVTRUQocGx1Z2luVW5hdmFp bGFiaWxpdHlSZWFzb24sIHBsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uID09IFJlbmRlckVtYmVk ZGVkT2JqZWN0OjpQbHVnaW5NaXNzaW5nKTsKICAgICBDYWxsVUlEZWxlZ2F0ZShtX3dlYlZpZXcs IEBzZWxlY3Rvcih3ZWJWaWV3OmRpZFByZXNzTWlzc2luZ1BsdWdpbkJ1dHRvbjopLCBraXQoZWxl bWVudCkpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9y dC9XZWJDaHJvbWVDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQv V2ViQ2hyb21lQ2xpZW50LmNwcAppbmRleCA0NDM1YjQ4ZDY2NmMwZTA3YjU0OTQxMjdkMzJiOWJj MDNmNWMyMzU5Li4xZGZhZWVmMDNkNDliMmZmYTZmMzU1ZDNlYjMwNzQ3MzMwY2YxYzRlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVu dC5jcHAKQEAgLTUzOSw4ICs1MzksMTEgQEAgdm9pZCBXZWJDaHJvbWVDbGllbnQ6Om1vdXNlRGlk TW92ZU92ZXJFbGVtZW50KGNvbnN0IEhpdFRlc3RSZXN1bHQmIHJlc3VsdCwgdW5zaWcKICAgICB1 aURlbGVnYXRlLT5tb3VzZURpZE1vdmVPdmVyRWxlbWVudChtX3dlYlZpZXcsIGVsZW1lbnQuZ2V0 KCksIG1vZGlmaWVyRmxhZ3MpOwogfQogCi1ib29sIFdlYkNocm9tZUNsaWVudDo6c2hvdWxkTWlz c2luZ1BsdWdpbk1lc3NhZ2VCZUJ1dHRvbigpIGNvbnN0Citib29sIFdlYkNocm9tZUNsaWVudDo6 c2hvdWxkVW5hdmFpbGFibGVQbHVnaW5NZXNzYWdlQmVCdXR0b24oUmVuZGVyRW1iZWRkZWRPYmpl Y3Q6OlBsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uIHBsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29u KSBjb25zdAogeworICAgIGlmIChwbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbiAhPSBSZW5kZXJF bWJlZGRlZE9iamVjdDo6UGx1Z2luTWlzc2luZykKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAg ICAgQ09NUHRyPElXZWJVSURlbGVnYXRlPiB1aURlbGVnYXRlOwogICAgIGlmIChGQUlMRUQobV93 ZWJWaWV3LT51aURlbGVnYXRlKCZ1aURlbGVnYXRlKSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK QEAgLTU1MSw4ICs1NTQsMTAgQEAgYm9vbCBXZWJDaHJvbWVDbGllbnQ6OnNob3VsZE1pc3NpbmdQ bHVnaW5NZXNzYWdlQmVCdXR0b24oKSBjb25zdAogICAgIHJldHVybiB1aURlbGVnYXRlUHJpdmF0 ZTM7CiB9CiAKLXZvaWQgV2ViQ2hyb21lQ2xpZW50OjptaXNzaW5nUGx1Z2luQnV0dG9uQ2xpY2tl ZChFbGVtZW50KiBlbGVtZW50KSBjb25zdAordm9pZCBXZWJDaHJvbWVDbGllbnQ6OnVuYXZhaWxh YmxlUGx1Z2luQnV0dG9uQ2xpY2tlZChXZWJDb3JlOjpFbGVtZW50KiwgV2ViQ29yZTo6UmVuZGVy RW1iZWRkZWRPYmplY3Q6OlBsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uIHBsdWdpblVuYXZhaWxh YmlsaXR5UmVhc29uKSBjb25zdAogeworICAgIEFTU0VSVF9VTlVTRUQocGx1Z2luVW5hdmFpbGFi aWxpdHlSZWFzb24sIHBsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uID09IFJlbmRlckVtYmVkZGVk T2JqZWN0OjpQbHVnaW5NaXNzaW5nKTsKKwogICAgIENPTVB0cjxJV2ViVUlEZWxlZ2F0ZT4gdWlE ZWxlZ2F0ZTsKICAgICBpZiAoRkFJTEVEKG1fd2ViVmlldy0+dWlEZWxlZ2F0ZSgmdWlEZWxlZ2F0 ZSkpKQogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJD b3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVT dXBwb3J0L1dlYkNocm9tZUNsaWVudC5oCmluZGV4IGYyMmQ2ZjNhYjM2N2M4ODJhZWY0NTlhY2U0 ZWJhMzE3MjgxZTAzMjMuLjlhNWFmMzg5MzBkZGYzMzA3ODQ0OGFjYjM5ZGI2MGMyMDI3MjYwYzAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNs aWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNs aWVudC5oCkBAIC0xMDYsOCArMTA2LDggQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB2b2lkIHNj cm9sbGJhcnNNb2RlRGlkQ2hhbmdlKCkgY29uc3QgeyB9CiAgICAgdmlydHVhbCB2b2lkIG1vdXNl RGlkTW92ZU92ZXJFbGVtZW50KGNvbnN0IFdlYkNvcmU6OkhpdFRlc3RSZXN1bHQmLCB1bnNpZ25l ZCBtb2RpZmllckZsYWdzKTsKLSAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkTWlzc2luZ1BsdWdpbk1l c3NhZ2VCZUJ1dHRvbigpIGNvbnN0OwotICAgIHZpcnR1YWwgdm9pZCBtaXNzaW5nUGx1Z2luQnV0 dG9uQ2xpY2tlZChXZWJDb3JlOjpFbGVtZW50KikgY29uc3Q7CisgICAgdmlydHVhbCBib29sIHNo b3VsZFVuYXZhaWxhYmxlUGx1Z2luTWVzc2FnZUJlQnV0dG9uKFdlYkNvcmU6OlJlbmRlckVtYmVk ZGVkT2JqZWN0OjpQbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbikgY29uc3Q7CisgICAgdmlydHVh bCB2b2lkIHVuYXZhaWxhYmxlUGx1Z2luQnV0dG9uQ2xpY2tlZChXZWJDb3JlOjpFbGVtZW50Kiwg V2ViQ29yZTo6UmVuZGVyRW1iZWRkZWRPYmplY3Q6OlBsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29u KSBjb25zdDsKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRUb29sVGlwKGNvbnN0IFdURjo6U3RyaW5n JiwgV2ViQ29yZTo6VGV4dERpcmVjdGlvbik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcAppbmRleCAzNzE2NGYxYjc3NmE4ODg3YzYzN2Fk Yjk5YmFmNDEyMDgyMDM1ZTZiLi4wYjAyYjE4YmU5Zjg1ZGNhMWVlODE2YTU2NTllZDFhYmM0NWQw MGIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2lu Vmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZp ZXcuY3BwCkBAIC0xMTA5LDcgKzExMDksNyBAQCB2b2lkIFBsdWdpblZpZXc6OnBsdWdpblByb2Nl c3NDcmFzaGVkKCkKICAgICAgICAgcmV0dXJuOwogICAgICAgICAKICAgICBSZW5kZXJFbWJlZGRl ZE9iamVjdCogcmVuZGVyZXIgPSB0b1JlbmRlckVtYmVkZGVkT2JqZWN0KG1fcGx1Z2luRWxlbWVu dC0+cmVuZGVyZXIoKSk7Ci0gICAgcmVuZGVyZXItPnNldFNob3dzQ3Jhc2hlZFBsdWdpbkluZGlj YXRvcigpOworICAgIHJlbmRlcmVyLT5zZXRQbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbihSZW5k ZXJFbWJlZGRlZE9iamVjdDo6UGx1Z2luQ3Jhc2hlZCk7CiAgICAgCiAgICAgV2lkZ2V0OjppbnZh bGlkYXRlKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNv cmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAKaW5kZXggNWQzYWZlNjhhMjllYWE0 ZWM1ZDhkNWFhY2I0Y2E3ZGVjM2I5NTNmYy4uNzE2MTVkYjNiMGI2MjA2ODY3ZWYzOWMwZWQwYjc5 YmQzYjY1MjhjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcApAQCAtNDY4LDIwICs0NjgsMjYg QEAgdm9pZCBXZWJDaHJvbWVDbGllbnQ6OnNjcm9sbFJlY3RJbnRvVmlldyhjb25zdCBJbnRSZWN0 JikgY29uc3QKICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQogCi1ib29sIFdlYkNocm9tZUNsaWVu dDo6c2hvdWxkTWlzc2luZ1BsdWdpbk1lc3NhZ2VCZUJ1dHRvbigpIGNvbnN0Citib29sIFdlYkNo cm9tZUNsaWVudDo6c2hvdWxkVW5hdmFpbGFibGVQbHVnaW5NZXNzYWdlQmVCdXR0b24oUmVuZGVy RW1iZWRkZWRPYmplY3Q6OlBsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uIHBsdWdpblVuYXZhaWxh YmlsaXR5UmVhc29uKSBjb25zdAogewotICAgIC8vIEZJWE1FOiA8cmRhcjovL3Byb2JsZW0vODc5 NDM5Nz4gV2Ugc2hvdWxkIG9ubHkgcmV0dXJuIHRydWUgd2hlbiB0aGVyZSBpcyBhIAotICAgIC8v IG1pc3NpbmdQbHVnaW5CdXR0b25DbGlja2VkIGNhbGxiYWNrIGRlZmluZWQgb24gdGhlIFBhZ2Ug VUkgY2xpZW50LgotICAgIHJldHVybiB0cnVlOworICAgIGlmIChwbHVnaW5VbmF2YWlsYWJpbGl0 eVJlYXNvbiA9PSBSZW5kZXJFbWJlZGRlZE9iamVjdDo6UGx1Z2luTWlzc2luZykgeworICAgICAg ICAvLyBGSVhNRTogPHJkYXI6Ly9wcm9ibGVtLzg3OTQzOTc+IFdlIHNob3VsZCBvbmx5IHJldHVy biB0cnVlIHdoZW4gdGhlcmUgaXMgYQorICAgICAgICAvLyBtaXNzaW5nUGx1Z2luQnV0dG9uQ2xp Y2tlZCBjYWxsYmFjayBkZWZpbmVkIG9uIHRoZSBQYWdlIFVJIGNsaWVudC4KKyAgICAgICAgcmV0 dXJuIHRydWU7CisgICAgfQorCisgICAgcmV0dXJuIGZhbHNlOwogfQogICAgIAotdm9pZCBXZWJD aHJvbWVDbGllbnQ6Om1pc3NpbmdQbHVnaW5CdXR0b25DbGlja2VkKEVsZW1lbnQqIGVsZW1lbnQp IGNvbnN0Cit2b2lkIFdlYkNocm9tZUNsaWVudDo6dW5hdmFpbGFibGVQbHVnaW5CdXR0b25DbGlj a2VkKEVsZW1lbnQqIGVsZW1lbnQsIFJlbmRlckVtYmVkZGVkT2JqZWN0OjpQbHVnaW5VbmF2YWls YWJpbGl0eVJlYXNvbiBwbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbikgY29uc3QKIHsKICAgICBB U1NFUlQoZWxlbWVudC0+aGFzVGFnTmFtZShvYmplY3RUYWcpIHx8IGVsZW1lbnQtPmhhc1RhZ05h bWUoZW1iZWRUYWcpKTsKKyAgICBBU1NFUlQocGx1Z2luVW5hdmFpbGFiaWxpdHlSZWFzb24gPT0g UmVuZGVyRW1iZWRkZWRPYmplY3Q6OlBsdWdpbk1pc3NpbmcpOwogCiAgICAgSFRNTFBsdWdJbklt YWdlRWxlbWVudCogcGx1Z2luRWxlbWVudCA9IHN0YXRpY19jYXN0PEhUTUxQbHVnSW5JbWFnZUVs ZW1lbnQqPihlbGVtZW50KTsKIAotICAgIG1fcGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpNaXNzaW5nUGx1Z2luQnV0dG9uQ2xpY2tlZChwbHVnaW5FbGVtZW50LT5zZXJ2aWNlVHlw ZSgpLCBwbHVnaW5FbGVtZW50LT51cmwoKSwgcGx1Z2luRWxlbWVudC0+Z2V0QXR0cmlidXRlKHBs dWdpbnNwYWdlQXR0cikpKTsKKyAgICBpZiAocGx1Z2luVW5hdmFpbGFiaWxpdHlSZWFzb24gPT0g UmVuZGVyRW1iZWRkZWRPYmplY3Q6OlBsdWdpbk1pc3NpbmcpCisgICAgICAgIG1fcGFnZS0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpNaXNzaW5nUGx1Z2luQnV0dG9uQ2xpY2tlZChwbHVn aW5FbGVtZW50LT5zZXJ2aWNlVHlwZSgpLCBwbHVnaW5FbGVtZW50LT51cmwoKSwgcGx1Z2luRWxl bWVudC0+Z2V0QXR0cmlidXRlKHBsdWdpbnNwYWdlQXR0cikpKTsKIH0KIAogdm9pZCBXZWJDaHJv bWVDbGllbnQ6OnNjcm9sbGJhcnNNb2RlRGlkQ2hhbmdlKCkgY29uc3QKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50Lmgg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVu dC5oCmluZGV4IDk2OTA0OWZhYzlmZGEzYjhlYWFlN2M4MDIyOTJhNmRkZjQzYTJkYjIuLjU5ZTc2 ODhjYzE5ZGJkYTBhMzVmZTE3OWE0MjBhYWVjMGM5YmY2NGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmgKKysrIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQu aApAQCAtMTIxLDggKzEyMSw4IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGNvbnRlbnRz U2l6ZUNoYW5nZWQoV2ViQ29yZTo6RnJhbWUqLCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJikgY29u c3QgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIHNjcm9sbFJlY3RJbnRvVmlldyhjb25zdCBX ZWJDb3JlOjpJbnRSZWN0JikgY29uc3QgT1ZFUlJJREU7IC8vIEN1cnJlbnRseSBvbmx5IE1hYyBo YXMgYSBub24gZW1wdHkgaW1wbGVtZW50YXRpb24uCiAKLSAgICB2aXJ0dWFsIGJvb2wgc2hvdWxk TWlzc2luZ1BsdWdpbk1lc3NhZ2VCZUJ1dHRvbigpIGNvbnN0IE9WRVJSSURFOwotICAgIHZpcnR1 YWwgdm9pZCBtaXNzaW5nUGx1Z2luQnV0dG9uQ2xpY2tlZChXZWJDb3JlOjpFbGVtZW50KikgY29u c3QgT1ZFUlJJREU7CisgICAgdmlydHVhbCBib29sIHNob3VsZFVuYXZhaWxhYmxlUGx1Z2luTWVz c2FnZUJlQnV0dG9uKFdlYkNvcmU6OlJlbmRlckVtYmVkZGVkT2JqZWN0OjpQbHVnaW5VbmF2YWls YWJpbGl0eVJlYXNvbikgY29uc3QgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIHVuYXZhaWxh YmxlUGx1Z2luQnV0dG9uQ2xpY2tlZChXZWJDb3JlOjpFbGVtZW50KiwgV2ViQ29yZTo6UmVuZGVy RW1iZWRkZWRPYmplY3Q6OlBsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uKSBjb25zdCBPVkVSUklE RTsKIAogICAgIHZpcnR1YWwgdm9pZCBzY3JvbGxiYXJzTW9kZURpZENoYW5nZSgpIGNvbnN0IE9W RVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBtb3VzZURpZE1vdmVPdmVyRWxlbWVudChjb25zdCBX ZWJDb3JlOjpIaXRUZXN0UmVzdWx0JiwgdW5zaWduZWQgbW9kaWZpZXJGbGFncykgT1ZFUlJJREU7 Cg==