43695 2010-08-08 12:09:52 -0700 [Qt] Inconsistent Qt version checks 2010-08-08 22:50:00 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED Qt P2 Normal --- 1 ariya.hidayat ariya.hidayat oldest_to_newest 261912 0 ariya.hidayat 2010-08-08 12:09:52 -0700 Inconsistent Qt version checks 261913 1 ariya.hidayat 2010-08-08 12:12:14 -0700 Some are using the encoded hex, some others are using QT_VERSION_CHECK macro. Will upload a patch. 261915 2 63848 ariya.hidayat 2010-08-08 12:16:07 -0700 Created attachment 63848 Patch 261955 3 63848 tonikitoo 2010-08-08 19:23:16 -0700 Comment on attachment 63848 Patch r=me 261980 4 ariya.hidayat 2010-08-08 22:50:00 -0700 Manually committed r64965: http://trac.webkit.org/changeset/64965 63848 2010-08-08 12:16:07 -0700 2010-08-08 19:23:16 -0700 Patch bug-43695-20100808121451.patch text/plain 14379 ariya.hidayat ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Y2E1ZDllZTM3ZTY0OWYzMjQzNzIzMzgxYWExMzRhMDhhYjkwNzMwMy4uZjZkMGEwOWY0MWFkOWMw ZDkwNTVjNTVlNGM2ZDRiYTlhZmQ0NDIyNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0wOC0wOCAgQXJp eWEgSGlkYXlhdCAgPGFyaXlhQHNlbmNoYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgSW5jb25zaXN0ZW50IFF0IHZlcnNpb24gY2hlY2tzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MzY5NQorCisg ICAgICAgIFVzZSBRVF9WRVJTSU9OX0NIRUNLIG1hY3JvIGluc3RlYWQgb2YgZW5jb2RlZCBoZXgu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9JbWFnZUJ1ZmZlclF0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OmdldEltYWdlRGF0YSk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29y ay9xdC9OZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGUuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9u ZXR3b3JrL3F0L05ldHdvcmtTdGF0ZU5vdGlmaWVyUXQuY3BwOgorICAgICAgICAqIHBsYXRmb3Jt L25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UU5ldHdvcmtSZXBseUhhbmRsZXI6OlFOZXR3b3JrUmVwbHlIYW5kbGVyKToKKyAgICAgICAgKFdl YkNvcmU6OlFOZXR3b3JrUmVwbHlIYW5kbGVyOjpzdGFydCk6CisgICAgICAgICogcGxhdGZvcm0v cXQvUmVuZGVyVGhlbWVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVF0Ojpw YWludE1lZGlhU2xpZGVyVHJhY2spOgorCiAyMDEwLTA4LTA3ICBEYW4gQmVybnN0ZWluICA8bWl0 ekBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENhcmxzc29uLgpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9JbWFnZUJ1ZmZlclF0LmNwcCBi L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvSW1hZ2VCdWZmZXJRdC5jcHAKaW5kZXggYmMy NTAwMzg2YTBhZjkyNjQ3MTViMWQ5ZDNiOGIxYzZjMWVmNGI1OC4uNzYxYTRmZTYyZTJmMjgyOWMx NjFhODE0ZTk2MjAxMzYxMWUzYTBhNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9xdC9JbWFnZUJ1ZmZlclF0LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3F0L0ltYWdlQnVmZmVyUXQuY3BwCkBAIC0xODEsNyArMTgxLDcgQEAgUGFzc1JlZlB0cjxJbWFn ZURhdGE+IGdldEltYWdlRGF0YShjb25zdCBJbnRSZWN0JiByZWN0LCBjb25zdCBJbWFnZUJ1ZmZl ckRhdGEmIGkKICAgICBBU1NFUlQoIWltYWdlLmlzTnVsbCgpKTsKIAogICAgIGNvbnN0IGludCBi eXRlc1BlckxpbmUgPSBpbWFnZS5ieXRlc1BlckxpbmUoKTsKLSNpZiBRVF9WRVJTSU9OID49IDB4 MDQwNzAwCisjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDQsIDcsIDApCiAgICAg Y29uc3QgdWNoYXIqIGJpdHMgPSBpbWFnZS5jb25zdEJpdHMoKTsKICNlbHNlCiAgICAgY29uc3Qg dWNoYXIqIGJpdHMgPSBpbWFnZS5iaXRzKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvcXQvTmV0d29ya1N0YXRlTm90aWZpZXJQcml2YXRlLmggYi9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvcXQvTmV0d29ya1N0YXRlTm90aWZpZXJQcml2YXRlLmgKaW5kZXggMTVhNDhj ZDFjZmM5OGJhYTQ5YzUzZjM5YmE1YWI0ZmQ5ZTk2YTgyMi4uNzY2ZGM5MGY2MTQ5YTk2ZWQ5YjA1 NTA5NGExMjU2YjI5MWIxMjUzMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L3F0L05ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZS5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9xdC9OZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGUuaApAQCAtMjIsNyArMjIsNyBA QAogCiAjaW5jbHVkZSA8UU9iamVjdD4KIAotI2lmIFFUX1ZFUlNJT04gPCAweDA0MDcwMAorI2lm IFFUX1ZFUlNJT04gPCBRVF9WRVJTSU9OX0NIRUNLKDQsIDcsIDApCiBuYW1lc3BhY2UgUXRNb2Jp bGl0eSB7CiBjbGFzcyBRTmV0d29ya0NvbmZpZ3VyYXRpb25NYW5hZ2VyOwogfQpAQCAtNDYsNyAr NDYsNyBAQCBwdWJsaWMgc2xvdHM6CiAgICAgdm9pZCBuZXR3b3JrQWNjZXNzUGVybWlzc2lvbkNo YW5nZWQoYm9vbCk7CiAKIHB1YmxpYzoKLSNpZiBRVF9WRVJTSU9OIDwgMHgwNDA3MDAKKyNpZiBR VF9WRVJTSU9OIDwgUVRfVkVSU0lPTl9DSEVDSyg0LCA3LCAwKQogICAgIFF0TW9iaWxpdHk6OlFO ZXR3b3JrQ29uZmlndXJhdGlvbk1hbmFnZXIqIG1fY29uZmlndXJhdGlvbk1hbmFnZXI7CiAjZWxz ZQogICAgIFFOZXR3b3JrQ29uZmlndXJhdGlvbk1hbmFnZXIqIG1fY29uZmlndXJhdGlvbk1hbmFn ZXI7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvTmV0d29ya1N0YXRl Tm90aWZpZXJRdC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvTmV0d29ya1N0YXRl Tm90aWZpZXJRdC5jcHAKaW5kZXggM2FhZTkyYTI1NWFhN2E5YzVkOGU5ODg5ODcwNDk5YmI0Mjdk YmNiNS4uOTU5ZTc0YTIwYjIzYTY4MDUwNjVjNDZkMzkwMmU2MGNjZmNiNDYwZCAxMDA2NDQKLS0t IGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L05ldHdvcmtTdGF0ZU5vdGlmaWVyUXQuY3Bw CisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9OZXR3b3JrU3RhdGVOb3RpZmllclF0 LmNwcApAQCAtMjUsNyArMjUsNyBAQAogI2luY2x1ZGUgIk5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJp dmF0ZS5oIgogI2luY2x1ZGUgInFuZXR3b3JrY29uZmlnbWFuYWdlci5oIgogCi0jaWYgUVRfVkVS U0lPTiA8IDB4MDQwNzAwCisjaWYgUVRfVkVSU0lPTiA8IFFUX1ZFUlNJT05fQ0hFQ0soNCwgNywg MCkKIHVzaW5nIG5hbWVzcGFjZSBRdE1vYmlsaXR5OwogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxlci5jcHAgYi9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIuY3BwCmluZGV4IDEz MWY5MjQ5YzQxMDcwYmQ2NmE0OWZjNzkyOGZiNzY1ZjFmODA5MzAuLmZkMTcyZTAzNjc0NmY5YjRk NDdkNjg4ZWRlZjk4YzY0NGQzZmVhOTggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxlci5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmNwcApAQCAtMTYwLDExICsxNjAsMTEgQEAg UU5ldHdvcmtSZXBseUhhbmRsZXI6OlFOZXR3b3JrUmVwbHlIYW5kbGVyKFJlc291cmNlSGFuZGxl KiBoYW5kbGUsIExvYWRNb2RlIGxvYWQKICAgICAgICAgbV9tZXRob2QgPSBRTmV0d29ya0FjY2Vz c01hbmFnZXI6OlBvc3RPcGVyYXRpb247CiAgICAgZWxzZSBpZiAoci5odHRwTWV0aG9kKCkgPT0g IlBVVCIpCiAgICAgICAgIG1fbWV0aG9kID0gUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyOjpQdXRPcGVy YXRpb247Ci0jaWYgUVRfVkVSU0lPTiA+PSAweDA0MDYwMAorI2lmIFFUX1ZFUlNJT04gPj0gUVRf VkVSU0lPTl9DSEVDSyg0LCA2LCAwKQogICAgIGVsc2UgaWYgKHIuaHR0cE1ldGhvZCgpID09ICJE RUxFVEUiKQogICAgICAgICBtX21ldGhvZCA9IFFOZXR3b3JrQWNjZXNzTWFuYWdlcjo6RGVsZXRl T3BlcmF0aW9uOwogI2VuZGlmCi0jaWYgUVRfVkVSU0lPTiA+PSAweDA0MDcwMAorI2lmIFFUX1ZF UlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg0LCA3LCAwKQogICAgIGVsc2UgaWYgKHIuaHR0cE1l dGhvZCgpID09ICJPUFRJT05TIikKICAgICAgICAgbV9tZXRob2QgPSBRTmV0d29ya0FjY2Vzc01h bmFnZXI6OkN1c3RvbU9wZXJhdGlvbjsKICNlbmRpZgpAQCAtNDU2LDEzICs0NTYsMTMgQEAgdm9p ZCBRTmV0d29ya1JlcGx5SGFuZGxlcjo6c3RhcnQoKQogICAgICAgICAgICAgcHV0RGV2aWNlLT5z ZXRQYXJlbnQobV9yZXBseSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQotI2lmIFFU X1ZFUlNJT04gPj0gMHgwNDA2MDAKKyNpZiBRVF9WRVJTSU9OID49IFFUX1ZFUlNJT05fQ0hFQ0so NCwgNiwgMCkKICAgICAgICAgY2FzZSBRTmV0d29ya0FjY2Vzc01hbmFnZXI6OkRlbGV0ZU9wZXJh dGlvbjogewogICAgICAgICAgICAgbV9yZXBseSA9IG1hbmFnZXItPmRlbGV0ZVJlc291cmNlKG1f cmVxdWVzdCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogI2VuZGlmCi0jaWYgUVRf VkVSU0lPTiA+PSAweDA0MDcwMAorI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg0 LCA3LCAwKQogICAgICAgICBjYXNlIFFOZXR3b3JrQWNjZXNzTWFuYWdlcjo6Q3VzdG9tT3BlcmF0 aW9uOgogICAgICAgICAgICAgbV9yZXBseSA9IG1hbmFnZXItPnNlbmRDdXN0b21SZXF1ZXN0KG1f cmVxdWVzdCwgbV9yZXNvdXJjZUhhbmRsZS0+Zmlyc3RSZXF1ZXN0KCkuaHR0cE1ldGhvZCgpLmxh dGluMSgpLmRhdGEoKSk7CiAgICAgICAgICAgICBicmVhazsKZGlmZiAtLWdpdCBhL1dlYkNvcmUv cGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL3F0L1JlbmRl clRoZW1lUXQuY3BwCmluZGV4IDIyZDk5YTFjYWFkOWMzZDJkYWUzMzMxZWY2NWY2YTI2MDcwODM4 MzIuLjg3MGYwZWI0NmJlMzgxNjhjNTkwODI4OWNiZTk0YmY3NTVhZWVlMjIgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0 Zm9ybS9xdC9SZW5kZXJUaGVtZVF0LmNwcApAQCAtMTIwMiw3ICsxMjAyLDcgQEAgYm9vbCBSZW5k ZXJUaGVtZVF0OjpwYWludE1lZGlhU2xpZGVyVHJhY2soUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQ YWludEluZm8mIHBhaW4KIAogICAgIHBhaW50TWVkaWFCYWNrZ3JvdW5kKHAucGFpbnRlciwgcik7 CiAKLSNpZiBRVF9WRVJTSU9OID49IDB4MDQwNzAwCisjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJT SU9OX0NIRUNLKDQsIDcsIDApCiAgICAgaWYgKE1lZGlhUGxheWVyKiBwbGF5ZXIgPSBtZWRpYUVs ZW1lbnQtPnBsYXllcigpKSB7CiAgICAgICAgIC8vIEdldCB0aGUgYnVmZmVyZWQgcGFydHMgb2Yg dGhlIG1lZGlhCiAgICAgICAgIFBhc3NSZWZQdHI8VGltZVJhbmdlcz4gYnVmZmVyZWQgPSBwbGF5 ZXItPmJ1ZmZlcmVkKCk7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZp ZXcuY3BwIGIvV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcAppbmRleCA1M2MxNDk0 NDg3YTg4MzNjMWUyZWU4ZjI1MjZkOGY3Mjg4Yjg4ZWM5Li40N2FiODJhYWQ3MTkwMGY1ZjI1ZmM5 YmRjYzE0MGU2MjFhYmM3OGMwIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3FncmFwaGljc3dl YnZpZXcuY3BwCisrKyBiL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKQEAgLTI0 MSw3ICsyNDEsNyBAQCBRR3JhcGhpY3NXZWJWaWV3OjpRR3JhcGhpY3NXZWJWaWV3KFFHcmFwaGlj c0l0ZW0qIHBhcmVudCkKICAgICA6IFFHcmFwaGljc1dpZGdldChwYXJlbnQpCiAgICAgLCBkKG5l dyBRR3JhcGhpY3NXZWJWaWV3UHJpdmF0ZSh0aGlzKSkKIHsKLSNpZiBRVF9WRVJTSU9OID49IDB4 MDQwNjAwCisjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDQsIDYsIDApCiAgICAg c2V0RmxhZyhRR3JhcGhpY3NJdGVtOjpJdGVtVXNlc0V4dGVuZGVkU3R5bGVPcHRpb24sIHRydWUp OwogI2VuZGlmCiAgICAgc2V0QWNjZXB0RHJvcHModHJ1ZSk7CkBAIC00MTcsNyArNDE3LDcgQEAg dm9pZCBRR3JhcGhpY3NXZWJWaWV3UHJpdmF0ZTo6ZGV0YWNoQ3VycmVudFBhZ2UoKQogICAgIGlm ICghcGFnZSkKICAgICAgICAgcmV0dXJuOwogCi0jaWYgUVRfVkVSU0lPTiA+PSAweDA0MDYwMAor I2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg0LCA2LCAwKQogICAgIHBhZ2UtPmQt PnZpZXcuY2xlYXIoKTsKICNlbHNlCiAgICAgcGFnZS0+ZC0+dmlldyA9IDA7CmRpZmYgLS1naXQg YS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5j cHAKaW5kZXggODYyMDI5MGRmMmJhMzk1Y2EyYzhiYWEzNmRkMTkyNjllYTcyMTMyYi4uODExYTll Nzk5N2UyNzdhZDI1YjViOGY3ZTVlOTRmYThhMmVjMWFjZiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0 L0FwaS9xd2ViZnJhbWUuY3BwCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcApAQCAt NzU0LDcgKzc1NCw3IEBAIHZvaWQgUVdlYkZyYW1lOjpsb2FkKGNvbnN0IFFOZXR3b3JrUmVxdWVz dCAmcmVxLAogICAgICAgICBjYXNlIFFOZXR3b3JrQWNjZXNzTWFuYWdlcjo6UG9zdE9wZXJhdGlv bjoKICAgICAgICAgICAgIHJlcXVlc3Quc2V0SFRUUE1ldGhvZCgiUE9TVCIpOwogICAgICAgICAg ICAgYnJlYWs7Ci0jaWYgUVRfVkVSU0lPTiA+PSAweDA0MDYwMAorI2lmIFFUX1ZFUlNJT04gPj0g UVRfVkVSU0lPTl9DSEVDSyg0LCA2LCAwKQogICAgICAgICBjYXNlIFFOZXR3b3JrQWNjZXNzTWFu YWdlcjo6RGVsZXRlT3BlcmF0aW9uOgogICAgICAgICAgICAgcmVxdWVzdC5zZXRIVFRQTWV0aG9k KCJERUxFVEUiKTsKICAgICAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0Fw aS9xd2VicGFnZS5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAppbmRleCBhOGJkMDZh OGViNzNhOWRlNjVjNWRmOGI0NjE1N2I4OGMxYjQxMzZmLi41MTZlYmM5ZGY5MGJmODkwMjI0OGRh NjMzMDVkY2FmMjZmMTNiNjlhIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNw cAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcApAQCAtMjUyLDcgKzI1Miw3IEBAIHN0 YXRpYyBpbmxpbmUgUXQ6OkRyb3BBY3Rpb24gZHJhZ09wVG9Ecm9wQWN0aW9uKHVuc2lnbmVkIGFj dGlvbnMpCiBRV2ViUGFnZVByaXZhdGU6OlFXZWJQYWdlUHJpdmF0ZShRV2ViUGFnZSAqcXEpCiAg ICAgOiBxKHFxKQogICAgICwgY2xpZW50KDApCi0jaWYgUVRfVkVSU0lPTiA8IDB4MDQwNjAwCisj aWYgUVRfVkVSU0lPTiA8IFFUX1ZFUlNJT05fQ0hFQ0soNCwgNiwgMCkKICAgICAsIHZpZXcoMCkK ICNlbmRpZgogICAgICwgY2xpY2tDYXVzZWRGb2N1cyhmYWxzZSkKQEAgLTExMzEsNyArMTEzMSw3 IEBAIHZvaWQgUVdlYlBhZ2VQcml2YXRlOjppbnB1dE1ldGhvZEV2ZW50KFFJbnB1dE1ldGhvZEV2 ZW50ICpldikKIHsKICAgICBXZWJDb3JlOjpGcmFtZSAqZnJhbWUgPSBwYWdlLT5mb2N1c0NvbnRy b2xsZXIoKS0+Zm9jdXNlZE9yTWFpbkZyYW1lKCk7CiAgICAgV2ViQ29yZTo6RWRpdG9yICplZGl0 b3IgPSBmcmFtZS0+ZWRpdG9yKCk7Ci0jaWYgUVRfVkVSU0lPTiA+PSAweDA0MDYwMAorI2lmIFFU X1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg0LCA2LCAwKQogICAgIFFJbnB1dE1ldGhvZEV2 ZW50OjpBdHRyaWJ1dGUgc2VsZWN0aW9uKFFJbnB1dE1ldGhvZEV2ZW50OjpTZWxlY3Rpb24sIDAs IDAsIFFWYXJpYW50KCkpOwogI2VuZGlmCiAKQEAgLTExNzIsNyArMTE3Miw3IEBAIHZvaWQgUVdl YlBhZ2VQcml2YXRlOjppbnB1dE1ldGhvZEV2ZW50KFFJbnB1dE1ldGhvZEV2ZW50ICpldikKICAg ICAgICAgICAgIH0KICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9Ci0jaWYgUVRfVkVSU0lP TiA+PSAweDA0MDYwMAorI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg0LCA2LCAw KQogICAgICAgICBjYXNlIFFJbnB1dE1ldGhvZEV2ZW50OjpTZWxlY3Rpb246IHsKICAgICAgICAg ICAgIHNlbGVjdGlvbiA9IGE7CiAgICAgICAgICAgICBoYXNTZWxlY3Rpb24gPSB0cnVlOwpAQCAt MTE5MCw3ICsxMTkwLDcgQEAgdm9pZCBRV2ViUGFnZVByaXZhdGU6OmlucHV0TWV0aG9kRXZlbnQo UUlucHV0TWV0aG9kRXZlbnQgKmV2KQogICAgICAgICAvLyAzLiBwb3B1bGF0ZWQgcHJlZWRpdCB3 aXRoIGEgc2VsZWN0aW9uIGF0dHJpYnV0ZSwgYW5kIHN0YXJ0L2VuZCBvZiAwIG9yIG5vbi0wIHVw ZGF0ZXMgc2VsZWN0aW9uIG9mIHN1cHBsaWVkIHByZWVkaXQgdGV4dAogICAgICAgICAvLyA0LiBv dGhlcndpc2UgZXZlbnQgaXMgdXBkYXRpbmcgc3VwcGxpZWQgcHJlLWVkaXQgdGV4dAogICAgICAg ICBRU3RyaW5nIHByZWVkaXQgPSBldi0+cHJlZWRpdFN0cmluZygpOwotI2lmIFFUX1ZFUlNJT04g Pj0gMHgwNDA2MDAKKyNpZiBRVF9WRVJTSU9OID49IFFUX1ZFUlNJT05fQ0hFQ0soNCwgNiwgMCkK ICAgICAgICAgaWYgKGhhc1NlbGVjdGlvbikgewogICAgICAgICAgICAgUVN0cmluZyB0ZXh0ID0g KHJlbmRlclRleHRDb250cm9sKSA/IFFTdHJpbmcocmVuZGVyVGV4dENvbnRyb2wtPnRleHQoKSkg OiBRU3RyaW5nKCk7CiAgICAgICAgICAgICBpZiAocHJlZWRpdC5pc0VtcHR5KCkgJiYgc2VsZWN0 aW9uLnN0YXJ0ICsgc2VsZWN0aW9uLmxlbmd0aCA+IDApCkBAIC0xNDczLDcgKzE0NzMsNyBAQCBR VmFyaWFudCBRV2ViUGFnZTo6aW5wdXRNZXRob2RRdWVyeShRdDo6SW5wdXRNZXRob2RRdWVyeSBw cm9wZXJ0eSkgY29uc3QKICAgICAgICAgICAgIHJldHVybiBRVmFyaWFudCgpOwogCiAgICAgICAg IH0KLSNpZiBRVF9WRVJTSU9OID49IDB4MDQwNjAwCisjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJT SU9OX0NIRUNLKDQsIDYsIDApCiAgICAgICAgIGNhc2UgUXQ6OkltQW5jaG9yUG9zaXRpb246IHsK ICAgICAgICAgICAgIGlmIChyZW5kZXJUZXh0Q29udHJvbCkgewogICAgICAgICAgICAgICAgIGlm IChlZGl0b3ItPmhhc0NvbXBvc2l0aW9uKCkpIHsKQEAgLTE5NzgsNyArMTk3OCw3IEBAIHZvaWQg UVdlYlBhZ2U6OnNldFZpZXcoUVdpZGdldCogdmlldykKICovCiBRV2lkZ2V0ICpRV2ViUGFnZTo6 dmlldygpIGNvbnN0CiB7Ci0jaWYgUVRfVkVSU0lPTiA8IDB4MDQwNjAwCisjaWYgUVRfVkVSU0lP TiA8IFFUX1ZFUlNJT05fQ0hFQ0soNCwgNiwgMCkKICAgICByZXR1cm4gZC0+dmlldzsKICNlbHNl CiAgICAgcmV0dXJuIGQtPnZpZXcuZGF0YSgpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9x d2Vidmlldy5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcAppbmRleCA3NzNjNzlhNWYx ZjkxNmU5Nzc0MTU0ZGQ2MGU5YzBiMTg4Y2VhZjY5Li41ZTcyNjVmNzQyOWE2ZjAyMjBhMzM0ZGU4 ZjJiYWM2MjYzYWU5YWQ5IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcAor KysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcApAQCAtMzQ5LDcgKzM0OSw3IEBAIHZvaWQg UVdlYlZpZXdQcml2YXRlOjpkZXRhY2hDdXJyZW50UGFnZSgpCiAgICAgICAgIHJldHVybjsKIAog ICAgIGlmIChwYWdlKSB7Ci0jaWYgUVRfVkVSU0lPTiA+PSAweDA0MDYwMAorI2lmIFFUX1ZFUlNJ T04gPj0gUVRfVkVSU0lPTl9DSEVDSyg0LCA2LCAwKQogICAgICAgICBwYWdlLT5kLT52aWV3LmNs ZWFyKCk7CiAjZWxzZQogICAgICAgICBwYWdlLT5kLT52aWV3ID0gMDsKZGlmZiAtLWdpdCBhL1dl YktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDVlMDBlNDFkYTc4 ODE2N2I2ZmI2NzI5NmUwMjY2MmU5ZmQzZGI5ZWUuLjRmMjgxODY0YTY4ZDk4NTZiOGEyNDI4NWE0 MTg1MWQ1NmRmN2QzZWQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2Vi S2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEwLTA4LTA4ICBBcml5YSBIaWRh eWF0ICA8YXJpeWFAc2VuY2hhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBJbmNvbnNpc3RlbnQgUXQgdmVyc2lvbiBjaGVja3MKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQzNjk1CisKKyAgICAgICAg VXNlIFFUX1ZFUlNJT05fQ0hFQ0sgbWFjcm8gaW5zdGVhZCBvZiBlbmNvZGVkIGhleC4KKworICAg ICAgICAqIEFwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKFFHcmFwaGljc1dlYlZp ZXc6OlFHcmFwaGljc1dlYlZpZXcpOgorICAgICAgICAoUUdyYXBoaWNzV2ViVmlld1ByaXZhdGU6 OmRldGFjaEN1cnJlbnRQYWdlKToKKyAgICAgICAgKiBBcGkvcXdlYmZyYW1lLmNwcDoKKyAgICAg ICAgKFFXZWJGcmFtZTo6bG9hZCk6CisgICAgICAgICogQXBpL3F3ZWJwYWdlLmNwcDoKKyAgICAg ICAgKFFXZWJQYWdlUHJpdmF0ZTo6UVdlYlBhZ2VQcml2YXRlKToKKyAgICAgICAgKFFXZWJQYWdl UHJpdmF0ZTo6aW5wdXRNZXRob2RFdmVudCk6CisgICAgICAgIChRV2ViUGFnZTo6aW5wdXRNZXRo b2RRdWVyeSk6CisgICAgICAgIChRV2ViUGFnZTo6dmlldyk6CisgICAgICAgICogQXBpL3F3ZWJ2 aWV3LmNwcDoKKyAgICAgICAgKFFXZWJWaWV3UHJpdmF0ZTo6ZGV0YWNoQ3VycmVudFBhZ2UpOgor ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkVkaXRvckNsaWVudFF0OjpzZXRJbnB1dE1ldGhvZFN0YXRlKToKKyAgICAgICAgKiBX ZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkZyYW1lTG9hZGVyQ2xpZW50UXQ6OmNyZWF0ZVBsdWdpbik6CisgICAgICAgICogV2ViQ29yZVN1 cHBvcnQvUGFnZUNsaWVudFF0LmNwcDoKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9QYWdlQ2xp ZW50UXQuaDoKKwogMjAxMC0wOC0wNiAgSmVzc2llIEJlcmxpbiAgPGpiZXJsaW5AYXBwbGUuY29t PgogCiAgICAgICAgIFJvbGwgb3V0IGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzY0 ODAxLCB3aGljaCBicm9rZSB0aGUgU2FmYXJpIFdpbmRvd3MgQnVpbGQuCmRpZmYgLS1naXQgYS9X ZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50UXQuY3BwIGIvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNwcAppbmRleCAyYmNkM2NiZjA4N2E2OThlNTRi OWVhNjdmZDM5ZGM0ZDNlM2QwODdjLi4wYTlhMGVhODRiNWY3MDJkNWM1ZDQ5M2RkZjE2MmViNzc5 ZWNjYzIwIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50 UXQuY3BwCisrKyBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHAK QEAgLTU5NSw3ICs1OTUsNyBAQCB2b2lkIEVkaXRvckNsaWVudFF0OjpzZXRJbnB1dE1ldGhvZFN0 YXRlKGJvb2wgYWN0aXZlKQogewogICAgIFFXZWJQYWdlQ2xpZW50KiB3ZWJQYWdlQ2xpZW50ID0g bV9wYWdlLT5kLT5jbGllbnQ7CiAgICAgaWYgKHdlYlBhZ2VDbGllbnQpIHsKLSNpZiBRVF9WRVJT SU9OID49IDB4MDQwNjAwCisjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDQsIDYs IDApCiAgICAgICAgIFF0OjpJbnB1dE1ldGhvZEhpbnRzIGhpbnRzOwogCiAgICAgICAgIEhUTUxJ bnB1dEVsZW1lbnQqIGlucHV0RWxlbWVudCA9IDA7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvV2Vi Q29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAgYi9XZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKaW5kZXggOWZlNjZkOWFjNTkyYjczOGY4Y2Nm YjI5NmFmYzZlNWExMDUyNGRmOC4uMTA2MDAyM2Q1ZDc5OTY1MTcxMjY3ODIyM2VmYThkZGI4Yzc2 NDQwZiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50UXQuY3BwCisrKyBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVu dFF0LmNwcApAQCAtMTMyMSw3ICsxMzIxLDcgQEAgcHJpdmF0ZToKICAgICB9CiB9OwogCi0jaWYg UVRfVkVSU0lPTiA+PSAweDA0MDYwMAorI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVD Syg0LCA2LCAwKQogY2xhc3MgUXRQbHVnaW5HcmFwaGljc1dpZGdldDogcHVibGljIFdpZGdldAog ewogcHVibGljOgpAQCAtMTQzOSw3ICsxNDM5LDcgQEAgUGFzc1JlZlB0cjxXaWRnZXQ+IEZyYW1l TG9hZGVyQ2xpZW50UXQ6OmNyZWF0ZVBsdWdpbihjb25zdCBJbnRTaXplJiBwbHVnaW5TaXplLAog ICAgICAgICAgICAgICAgIHctPnNldEZyYW1lUmVjdChJbnRSZWN0KDAsIDAsIDAsIDApKTsKICAg ICAgICAgICAgICAgICByZXR1cm4gdzsKICAgICAgICAgICAgIH0KLSNpZiBRVF9WRVJTSU9OID49 IDB4MDQwNjAwCisjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDQsIDYsIDApCiAg ICAgICAgICAgICBRR3JhcGhpY3NXaWRnZXQqIGdyYXBoaWNzV2lkZ2V0ID0gcW9iamVjdF9jYXN0 PFFHcmFwaGljc1dpZGdldCo+KG9iamVjdCk7CiAgICAgICAgICAgICBpZiAoZ3JhcGhpY3NXaWRn ZXQpIHsKICAgICAgICAgICAgICAgICBRR3JhcGhpY3NPYmplY3QqIHBhcmVudFdpZGdldCA9IDA7 CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvUGFnZUNsaWVudFF0LmNwcCBi L1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9QYWdlQ2xpZW50UXQuY3BwCmluZGV4IDVkMDY0MDA0 YzBjMTEwN2U2OWMxZDkzZjgyMjRhNGJjMDAxZmU0YjIuLjYyZjQ4ZmY0M2YzOTM2ZGQ4MmRiNjFk ZTkwZWVkNDVjY2M0YTkzZmIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9Q YWdlQ2xpZW50UXQuY3BwCisrKyBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9QYWdlQ2xpZW50 UXQuY3BwCkBAIC00OCw3ICs0OCw3IEBAIGJvb2wgUGFnZUNsaWVudFFXaWRnZXQ6OmlucHV0TWV0 aG9kRW5hYmxlZCgpIGNvbnN0CiAgICAgcmV0dXJuIHZpZXctPnRlc3RBdHRyaWJ1dGUoUXQ6OldB X0lucHV0TWV0aG9kRW5hYmxlZCk7CiB9CiAKLSNpZiBRVF9WRVJTSU9OID49IDB4MDQwNjAwCisj aWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDQsIDYsIDApCiB2b2lkIFBhZ2VDbGll bnRRV2lkZ2V0OjpzZXRJbnB1dE1ldGhvZEhpbnRzKFF0OjpJbnB1dE1ldGhvZEhpbnRzIGhpbnRz KQogewogICAgIHZpZXctPnNldElucHV0TWV0aG9kSGludHMoaGludHMpOwpAQCAtMjI5LDcgKzIy OSw3IEBAIGJvb2wgUGFnZUNsaWVudFFHcmFwaGljc1dpZGdldDo6aW5wdXRNZXRob2RFbmFibGVk KCkgY29uc3QKICNlbmRpZgogfQogCi0jaWYgUVRfVkVSU0lPTiA+PSAweDA0MDYwMAorI2lmIFFU X1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg0LCA2LCAwKQogdm9pZCBQYWdlQ2xpZW50UUdy YXBoaWNzV2lkZ2V0OjpzZXRJbnB1dE1ldGhvZEhpbnRzKFF0OjpJbnB1dE1ldGhvZEhpbnRzIGhp bnRzKQogewogICAgIHZpZXctPnNldElucHV0TWV0aG9kSGludHMoaGludHMpOwpkaWZmIC0tZ2l0 IGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1BhZ2VDbGllbnRRdC5oIGIvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L1BhZ2VDbGllbnRRdC5oCmluZGV4IGQ5MjMwNmEzMGIwYWI5ZjIxNmEwMDY2 YzY4MjZlZGQ2NjNmNmJmOTkuLjY1ZWU4NDkzOGUzNzBjNDczNjM3YzRlNzdmODQ1ZGU3MDJlZTZm MzAgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9QYWdlQ2xpZW50UXQuaAor KysgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvUGFnZUNsaWVudFF0LmgKQEAgLTU4LDcgKzU4 LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGUoY29uc3QgUVJlY3QmIGRpcnR5 UmVjdCk7CiAgICAgdmlydHVhbCB2b2lkIHNldElucHV0TWV0aG9kRW5hYmxlZChib29sIGVuYWJs ZSk7CiAgICAgdmlydHVhbCBib29sIGlucHV0TWV0aG9kRW5hYmxlZCgpIGNvbnN0OwotI2lmIFFU X1ZFUlNJT04gPj0gMHgwNDA2MDAKKyNpZiBRVF9WRVJTSU9OID49IFFUX1ZFUlNJT05fQ0hFQ0so NCwgNiwgMCkKICAgICB2aXJ0dWFsIHZvaWQgc2V0SW5wdXRNZXRob2RIaW50cyhRdDo6SW5wdXRN ZXRob2RIaW50cyBoaW50cyk7CiAjZW5kaWYKIApAQCAtMTQ2LDcgKzE0Niw3IEBAIHB1YmxpYzoK ICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlKGNvbnN0IFFSZWN0JiBkaXJ0eVJlY3QpOwogICAgIHZp cnR1YWwgdm9pZCBzZXRJbnB1dE1ldGhvZEVuYWJsZWQoYm9vbCBlbmFibGUpOwogICAgIHZpcnR1 YWwgYm9vbCBpbnB1dE1ldGhvZEVuYWJsZWQoKSBjb25zdDsKLSNpZiBRVF9WRVJTSU9OID49IDB4 MDQwNjAwCisjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDQsIDYsIDApCiAgICAg dmlydHVhbCB2b2lkIHNldElucHV0TWV0aG9kSGludHMoUXQ6OklucHV0TWV0aG9kSGludHMgaGlu dHMpOwogI2VuZGlmCiAK