29054 2009-09-08 14:17:38 -0700 Remove dead ActiveX code in RenderPartObject 2009-09-11 10:29:32 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jam webkit-unassigned andersca aroben darin eric fishd jhoneycutt mjs sfalken oldest_to_newest 145536 0 jam 2009-09-08 14:17:38 -0700 There's some code in that file that was added when Chromium was hosting some ActiveX controls. That's not the case anymore, so that code can be removed from WebKit to clean things up. 145537 1 39213 jam 2009-09-08 14:21:06 -0700 Created attachment 39213 Proposed patch 145539 2 39215 jam 2009-09-08 14:23:02 -0700 Created attachment 39215 Proposed patch Previous patch didn't have an updated ChangeLog. 145762 3 eric 2009-09-09 08:12:22 -0700 It's difficult for me to tell at first glance if all of this code is only used by Chromium or not. I guess it would be slightly easier if we referenced the original revision where this all was added, as then I would compare this removal with the additions in the original patch. 145801 4 jam 2009-09-09 09:43:35 -0700 (In reply to comment #3) > It's difficult for me to tell at first glance if all of this code is only used > by Chromium or not. I guess it would be slightly easier if we referenced the > original revision where this all was added, as then I would compare this > removal with the additions in the original patch. Here's the original patch: http://trac.webkit.org/changeset/39115 The code has changed a bit since then through refactoring/cleaning up by others. Thanks 146382 5 39215 dglazkov 2009-09-10 16:07:03 -0700 Comment on attachment 39215 Proposed patch sounds good. 146383 6 39215 dglazkov 2009-09-10 16:07:22 -0700 Comment on attachment 39215 Proposed patch jam will commit by hand. 146401 7 darin 2009-09-10 16:54:13 -0700 I'm pretty sure this patch changed the behavior of Safari on Windows. Was that intentional? Was it correct? 146411 8 jam 2009-09-10 17:20:22 -0700 (In reply to comment #7) > I'm pretty sure this patch changed the behavior of Safari on Windows. Was that > intentional? Was it correct? This would only be the case if Safari provides a generic ActiveX host control, i.e. one that supports the "application/x-oleobject" mime type. I don't think that's the case? Chrome used to do that as an experiment in web compat, but it hurt more than it helped, so we removed it. 146412 9 darin 2009-09-10 17:23:26 -0700 (In reply to comment #8) > This would only be the case if Safari provides a generic ActiveX host control, > i.e. one that supports the "application/x-oleobject" mime type. I don't think > that's the case? Chrome used to do that as an experiment in web compat, but it > hurt more than it helped, so we removed it. Of course Safari does not provide such a thing, but I had the impression that it could be a plug-in that provides it, not Safari itself. I guess I didn't realize this was a Chrome-specific experiment. If so, then I think the ifdefs were done wrong, because the hook was included in all WebKit browsers, not just Chrome. I guess it was included in the non-Chrome versions of WebKit for no good reason, and there's a good chance nobody tried to use this hook on other platforms, so it's probably OK to take it out. 146419 10 jam 2009-09-10 17:41:39 -0700 (In reply to comment #9) > (In reply to comment #8) > > This would only be the case if Safari provides a generic ActiveX host control, > > i.e. one that supports the "application/x-oleobject" mime type. I don't think > > that's the case? Chrome used to do that as an experiment in web compat, but it > > hurt more than it helped, so we removed it. > > Of course Safari does not provide such a thing, but I had the impression that > it could be a plug-in that provides it, not Safari itself. > > I guess I didn't realize this was a Chrome-specific experiment. If so, then I > think the ifdefs were done wrong, because the hook was included in all WebKit > browsers, not just Chrome. I guess it was included in the non-Chrome versions > of WebKit for no good reason, and there's a good chance nobody tried to use > this hook on other platforms, so it's probably OK to take it out. I'm not aware of any NPAPI plugin that registers for that mime type, since it's really a generic type used for ActiveX. I'm quite certain no other WebKit port is crazy enough to try this, but if there are any regressions we can revisit this. 146628 11 jam 2009-09-11 10:29:32 -0700 Committed in r48274. 39213 2009-09-08 14:21:06 -0700 2009-09-08 14:23:02 -0700 Proposed patch noactivex.txt text/plain 5570 jam SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ4MTgyKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDktMDktMDggIEpvaG4gQWJk LUVsLU1hbGVrICA8amFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgdW5uZWVkZWQgZGVmaW5lIGZvciBBY3RpdmVY LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjkwNTQK KworICAgICAgICAqIHd0Zi9QbGF0Zm9ybS5oOgorCiAyMDA5LTA5LTA4ICBMYXN6bG8gR29tYm9z ICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1v biBIYXVzbWFubi4KSW5kZXg6IEphdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIEphdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCShyZXZpc2lvbiA0ODE2MykKKysr IEphdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCSh3b3JraW5nIGNvcHkpCkBAIC03MjUsMTAg KzcyNSw2IEBACiAjZGVmaW5lIEVOQUJMRV9QQU5fU0NST0xMSU5HIDEKICNlbmRpZgogCi0jaWYg IWRlZmluZWQoRU5BQkxFX0FDVElWRVhfVFlQRV9DT05WRVJTSU9OX1dNUExBWUVSKQotI2RlZmlu ZSBFTkFCTEVfQUNUSVZFWF9UWVBFX0NPTlZFUlNJT05fV01QTEFZRVIgMQotI2VuZGlmCi0KIC8q IFVzZSB0aGUgUXRYbWxTdHJlYW1SZWFkZXIgaW1wbGVtZW50YXRpb24gZm9yIFhNTFRva2VuaXpl ciAqLwogI2lmIFBMQVRGT1JNKFFUKQogI2lmICFFTkFCTEUoWFNMVCkKSW5kZXg6IFdlYkNvcmUv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiA0ODE4 MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAK KzIwMDktMDktMDggIEpvaG4gQWJkLUVsLU1hbGVrICA8amFtQGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOZWVkIGEgc2hvcnQg ZGVzY3JpcHRpb24gYW5kIGJ1ZyBVUkwgKE9PUFMhKQorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4g KE9PUFMhKQorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclBhcnRPYmplY3QuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Y3JlYXRlQ2xhc3NJZFRvVHlwZU1hcCk6CisgICAgICAgIChXZWJDb3Jl OjpzZXJ2aWNlVHlwZUZvckNsYXNzSWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyUGFydE9i amVjdDo6dXBkYXRlV2lkZ2V0KToKKwogMjAwOS0wOS0wOCAgWGFuIExvcGV6ICA8eGxvcGV6QGln YWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBhdHRlbXB0IHRvIGZpeCB0aGUgR1RLKyBi dWlsZC4KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclBhcnRPYmplY3QuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclBhcnRPYmplY3QuY3BwCShyZXZpc2lv biA0ODE2MykKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclBhcnRPYmplY3QuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC05MCwyNCArOTAsMTEgQEAgc3RhdGljIENsYXNzSWRUb1R5cGVNYXAqIGNy ZWF0ZUNsYXNzSWRUbwogICAgIG1hcC0+YWRkKCJjbHNpZDpDRkNEQUEwMy04QkU0LTExQ0YtQjg0 Qi0wMDIwQUZCQkNDRkEiLCAiYXVkaW8veC1wbi1yZWFsYXVkaW8tcGx1Z2luIik7CiAgICAgbWFw LT5hZGQoImNsc2lkOjAyQkYyNUQ1LThDMTctNEIyMy1CQzgwLUQzNDg4QUJEREM2QiIsICJ2aWRl by9xdWlja3RpbWUiKTsKICAgICBtYXAtPmFkZCgiY2xzaWQ6MTY2QjFCQ0EtM0Y5Qy0xMUNGLTgw NzUtNDQ0NTUzNTQwMDAwIiwgImFwcGxpY2F0aW9uL3gtZGlyZWN0b3IiKTsKLSNpZiBFTkFCTEUo QUNUSVZFWF9UWVBFX0NPTlZFUlNJT05fV01QTEFZRVIpCiAgICAgbWFwLT5hZGQoImNsc2lkOjZC RjUyQTUyLTM5NEEtMTFEMy1CMTUzLTAwQzA0Rjc5RkFBNiIsICJhcHBsaWNhdGlvbi94LW1wbGF5 ZXIyIik7CiAgICAgbWFwLT5hZGQoImNsc2lkOjIyRDZGMzEyLUIwRjYtMTFEMC05NEFCLTAwODBD NzRDN0U5NSIsICJhcHBsaWNhdGlvbi94LW1wbGF5ZXIyIik7Ci0jZW5kaWYKICAgICByZXR1cm4g bWFwOwogfQogCi1zdGF0aWMgY29uc3QgU3RyaW5nJiBhY3RpdmVYVHlwZSgpCi17Ci0gICAgREVG SU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIGFjdGl2ZVhUeXBlLCAoImFwcGxpY2F0aW9uL3gtb2xl b2JqZWN0IikpOwotICAgIHJldHVybiBhY3RpdmVYVHlwZTsKLX0KLQotc3RhdGljIGlubGluZSBi b29sIGhhdmVQbHVnaW4oY29uc3QgUGx1Z2luRGF0YSogcGx1Z2luRGF0YSwgY29uc3QgU3RyaW5n JiB0eXBlKQotewotICAgIHJldHVybiBwbHVnaW5EYXRhICYmICF0eXBlLmlzRW1wdHkoKSAmJiBw bHVnaW5EYXRhLT5zdXBwb3J0c01pbWVUeXBlKHR5cGUpOwotfQotCiBzdGF0aWMgU3RyaW5nIHNl cnZpY2VUeXBlRm9yQ2xhc3NJZChjb25zdCBTdHJpbmcmIGNsYXNzSWQsIGNvbnN0IFBsdWdpbkRh dGEqIHBsdWdpbkRhdGEpCiB7CiAgICAgLy8gUmV0dXJuIGVhcmx5IGlmIGNsYXNzSWQgaXMgZW1w dHkgKHNpbmNlIHdlIHdvbid0IGRvIGFueXRoaW5nIGJlbG93KS4KQEAgLTExNiwzMCArMTAzLDcg QEAgc3RhdGljIFN0cmluZyBzZXJ2aWNlVHlwZUZvckNsYXNzSWQoY29ucwogICAgICAgICByZXR1 cm4gU3RyaW5nKCk7CiAKICAgICBzdGF0aWMgQ2xhc3NJZFRvVHlwZU1hcCogbWFwID0gY3JlYXRl Q2xhc3NJZFRvVHlwZU1hcCgpOwotICAgIFN0cmluZyB0eXBlID0gbWFwLT5nZXQoY2xhc3NJZCk7 Ci0KLSAgICAvLyBJZiB3ZSBkbyBoYXZlIGEgcGx1Zy1pbiB0aGF0IHN1cHBvcnRzIGdlbmVyaWMg QWN0aXZlWCBjb250ZW50IGFuZCBkb24ndCBoYXZlIGEgcGx1Zy1pbgotICAgIC8vIGZvciB0aGUg TUlNRSB0eXBlIHdlIGNhbWUgdXAgd2l0aCwgaWdub3JlIHRoZSBNSU1FIHR5cGUgd2UgY2FtZSB1 cCB3aXRoIGFuZCBqdXN0IHVzZQotICAgIC8vIHRoZSBBY3RpdmVYIHR5cGUuCi0gICAgaWYgKGhh dmVQbHVnaW4ocGx1Z2luRGF0YSwgYWN0aXZlWFR5cGUoKSkgJiYgIWhhdmVQbHVnaW4ocGx1Z2lu RGF0YSwgdHlwZSkpCi0gICAgICAgIHJldHVybiBhY3RpdmVYVHlwZSgpOwotCi0gICAgcmV0dXJu IHR5cGU7Ci19Ci0KLXN0YXRpYyBpbmxpbmUgYm9vbCBzaG91bGRVc2VFbWJlZERlc2NlbmRhbnQo SFRNTE9iamVjdEVsZW1lbnQqIG9iamVjdEVsZW1lbnQsIGNvbnN0IFBsdWdpbkRhdGEqIHBsdWdp bkRhdGEpCi17Ci0jaWYgUExBVEZPUk0oTUFDKQotICAgIFVOVVNFRF9QQVJBTShvYmplY3RFbGVt ZW50KTsKLSAgICBVTlVTRURfUEFSQU0ocGx1Z2luRGF0YSk7Ci0gICAgLy8gT24gTWFjLCB3ZSBh bHdheXMgd2FudCB0byB1c2UgdGhlIGVtYmVkIGRlc2NlbmRhbnQuCi0gICAgcmV0dXJuIHRydWU7 Ci0jZWxzZQotICAgIC8vIElmIHdlIGhhdmUgYm90aCBhbiA8b2JqZWN0PiBhbmQgPGVtYmVkPiwg d2UgYWx3YXlzIHdhbnQgdG8gdXNlIHRoZSA8ZW1iZWQ+IGV4Y2VwdCB3aGVuIHdlIGhhdmUKLSAg ICAvLyBhbiBBY3RpdmVYIHBsdWctaW4gYW5kIHBsYW4gdG8gdXNlIGl0LgotICAgIHJldHVybiAh KGhhdmVQbHVnaW4ocGx1Z2luRGF0YSwgYWN0aXZlWFR5cGUoKSkKLSAgICAgICAgJiYgc2Vydmlj ZVR5cGVGb3JDbGFzc0lkKG9iamVjdEVsZW1lbnQtPmNsYXNzSWQoKSwgcGx1Z2luRGF0YSkgPT0g YWN0aXZlWFR5cGUoKSk7Ci0jZW5kaWYKKyAgICByZXR1cm4gbWFwLT5nZXQoY2xhc3NJZCk7CiB9 CiAKIHN0YXRpYyB2b2lkIG1hcERhdGFQYXJhbVRvU3JjKFZlY3RvcjxTdHJpbmc+KiBwYXJhbU5h bWVzLCBWZWN0b3I8U3RyaW5nPiogcGFyYW1WYWx1ZXMpCkBAIC0xNzgsMTYgKzE0MiwxNCBAQCB2 b2lkIFJlbmRlclBhcnRPYmplY3Q6OnVwZGF0ZVdpZGdldChib29sCiAgICAgICAgIC8vIENoZWNr IGZvciBhIGNoaWxkIEVNQkVEIHRhZy4KICAgICAgICAgSFRNTEVtYmVkRWxlbWVudCogZW1iZWQg PSAwOwogICAgICAgICBjb25zdCBQbHVnaW5EYXRhKiBwbHVnaW5EYXRhID0gZnJhbWUtPnBhZ2Uo KS0+cGx1Z2luRGF0YSgpOwotICAgICAgICBpZiAoc2hvdWxkVXNlRW1iZWREZXNjZW5kYW50KG8s IHBsdWdpbkRhdGEpKSB7Ci0gICAgICAgICAgICBmb3IgKE5vZGUqIGNoaWxkID0gby0+Zmlyc3RD aGlsZCgpOyBjaGlsZDsgKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGNoaWxkLT5oYXNUYWdOYW1l KGVtYmVkVGFnKSkgewotICAgICAgICAgICAgICAgICAgICBlbWJlZCA9IHN0YXRpY19jYXN0PEhU TUxFbWJlZEVsZW1lbnQqPihjaGlsZCk7Ci0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAg ICAgICAgICAgICAgIH0gZWxzZSBpZiAoY2hpbGQtPmhhc1RhZ05hbWUob2JqZWN0VGFnKSkKLSAg ICAgICAgICAgICAgICAgICAgY2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxpbmcoKTsgICAgICAgICAv LyBEb24ndCBkZXNjZW5kIGludG8gbmVzdGVkIE9CSkVDVCB0YWdzCi0gICAgICAgICAgICAgICAg ZWxzZQotICAgICAgICAgICAgICAgICAgICBjaGlsZCA9IGNoaWxkLT50cmF2ZXJzZU5leHROb2Rl KG8pOyAgIC8vIE90aGVyd2lzZSBkZXNjZW5kIChFTUJFRHMgbWF5IGJlIGluc2lkZSBDT01NRU5U IHRhZ3MpCi0gICAgICAgICAgICB9CisgICAgICAgIGZvciAoTm9kZSogY2hpbGQgPSBvLT5maXJz dENoaWxkKCk7IGNoaWxkOyApIHsKKyAgICAgICAgICAgIGlmIChjaGlsZC0+aGFzVGFnTmFtZShl bWJlZFRhZykpIHsKKyAgICAgICAgICAgICAgICBlbWJlZCA9IHN0YXRpY19jYXN0PEhUTUxFbWJl ZEVsZW1lbnQqPihjaGlsZCk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9 IGVsc2UgaWYgKGNoaWxkLT5oYXNUYWdOYW1lKG9iamVjdFRhZykpCisgICAgICAgICAgICAgICAg Y2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxpbmcoKTsgICAgICAgICAvLyBEb24ndCBkZXNjZW5kIGlu dG8gbmVzdGVkIE9CSkVDVCB0YWdzCisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAg Y2hpbGQgPSBjaGlsZC0+dHJhdmVyc2VOZXh0Tm9kZShvKTsgICAvLyBPdGhlcndpc2UgZGVzY2Vu ZCAoRU1CRURzIG1heSBiZSBpbnNpZGUgQ09NTUVOVCB0YWdzKQogICAgICAgICB9CiAKICAgICAg ICAgLy8gVXNlIHRoZSBhdHRyaWJ1dGVzIGZyb20gdGhlIEVNQkVEIHRhZyBpbnN0ZWFkIG9mIHRo ZSBPQkpFQ1QgdGFnIGluY2x1ZGluZyBXSURUSCBhbmQgSEVJR0hULgo= 39215 2009-09-08 14:23:02 -0700 2009-09-10 16:07:22 -0700 Proposed patch noactivex.txt text/plain 5583 jam SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ4MTgyKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDktMDktMDggIEpvaG4gQWJk LUVsLU1hbGVrICA8amFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgdW5uZWVkZWQgZGVmaW5lIGZvciBBY3RpdmVY LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjkwNTQK KworICAgICAgICAqIHd0Zi9QbGF0Zm9ybS5oOgorCiAyMDA5LTA5LTA4ICBMYXN6bG8gR29tYm9z ICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1v biBIYXVzbWFubi4KSW5kZXg6IEphdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIEphdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCShyZXZpc2lvbiA0ODE2MykKKysr IEphdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCSh3b3JraW5nIGNvcHkpCkBAIC03MjUsMTAg KzcyNSw2IEBACiAjZGVmaW5lIEVOQUJMRV9QQU5fU0NST0xMSU5HIDEKICNlbmRpZgogCi0jaWYg IWRlZmluZWQoRU5BQkxFX0FDVElWRVhfVFlQRV9DT05WRVJTSU9OX1dNUExBWUVSKQotI2RlZmlu ZSBFTkFCTEVfQUNUSVZFWF9UWVBFX0NPTlZFUlNJT05fV01QTEFZRVIgMQotI2VuZGlmCi0KIC8q IFVzZSB0aGUgUXRYbWxTdHJlYW1SZWFkZXIgaW1wbGVtZW50YXRpb24gZm9yIFhNTFRva2VuaXpl ciAqLwogI2lmIFBMQVRGT1JNKFFUKQogI2lmICFFTkFCTEUoWFNMVCkKSW5kZXg6IFdlYkNvcmUv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiA0ODE4 MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAK KzIwMDktMDktMDggIEpvaG4gQWJkLUVsLU1hbGVrICA8amFtQGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgdW5uZWVk ZWQgZGVmaW5lIGZvciBBY3RpdmVYLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjkwNTQKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJQYXJ0T2Jq ZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZUNsYXNzSWRUb1R5cGVNYXApOgorICAg ICAgICAoV2ViQ29yZTo6c2VydmljZVR5cGVGb3JDbGFzc0lkKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclBhcnRPYmplY3Q6OnVwZGF0ZVdpZGdldCk6CisKIDIwMDktMDktMDggIFhhbiBMb3Bl eiAgPHhsb3BlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYXR0ZW1wdCB0byBm aXggdGhlIEdUSysgYnVpbGQuCkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJQYXJ0T2Jq ZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJQYXJ0T2JqZWN0 LmNwcAkocmV2aXNpb24gNDgxNjMpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJQYXJ0T2Jq ZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTAsMjQgKzkwLDExIEBAIHN0YXRpYyBDbGFzc0lk VG9UeXBlTWFwKiBjcmVhdGVDbGFzc0lkVG8KICAgICBtYXAtPmFkZCgiY2xzaWQ6Q0ZDREFBMDMt OEJFNC0xMUNGLUI4NEItMDAyMEFGQkJDQ0ZBIiwgImF1ZGlvL3gtcG4tcmVhbGF1ZGlvLXBsdWdp biIpOwogICAgIG1hcC0+YWRkKCJjbHNpZDowMkJGMjVENS04QzE3LTRCMjMtQkM4MC1EMzQ4OEFC RERDNkIiLCAidmlkZW8vcXVpY2t0aW1lIik7CiAgICAgbWFwLT5hZGQoImNsc2lkOjE2NkIxQkNB LTNGOUMtMTFDRi04MDc1LTQ0NDU1MzU0MDAwMCIsICJhcHBsaWNhdGlvbi94LWRpcmVjdG9yIik7 Ci0jaWYgRU5BQkxFKEFDVElWRVhfVFlQRV9DT05WRVJTSU9OX1dNUExBWUVSKQogICAgIG1hcC0+ YWRkKCJjbHNpZDo2QkY1MkE1Mi0zOTRBLTExRDMtQjE1My0wMEMwNEY3OUZBQTYiLCAiYXBwbGlj YXRpb24veC1tcGxheWVyMiIpOwogICAgIG1hcC0+YWRkKCJjbHNpZDoyMkQ2RjMxMi1CMEY2LTEx RDAtOTRBQi0wMDgwQzc0QzdFOTUiLCAiYXBwbGljYXRpb24veC1tcGxheWVyMiIpOwotI2VuZGlm CiAgICAgcmV0dXJuIG1hcDsKIH0KIAotc3RhdGljIGNvbnN0IFN0cmluZyYgYWN0aXZlWFR5cGUo KQotewotICAgIERFRklORV9TVEFUSUNfTE9DQUwoU3RyaW5nLCBhY3RpdmVYVHlwZSwgKCJhcHBs aWNhdGlvbi94LW9sZW9iamVjdCIpKTsKLSAgICByZXR1cm4gYWN0aXZlWFR5cGU7Ci19Ci0KLXN0 YXRpYyBpbmxpbmUgYm9vbCBoYXZlUGx1Z2luKGNvbnN0IFBsdWdpbkRhdGEqIHBsdWdpbkRhdGEs IGNvbnN0IFN0cmluZyYgdHlwZSkKLXsKLSAgICByZXR1cm4gcGx1Z2luRGF0YSAmJiAhdHlwZS5p c0VtcHR5KCkgJiYgcGx1Z2luRGF0YS0+c3VwcG9ydHNNaW1lVHlwZSh0eXBlKTsKLX0KLQogc3Rh dGljIFN0cmluZyBzZXJ2aWNlVHlwZUZvckNsYXNzSWQoY29uc3QgU3RyaW5nJiBjbGFzc0lkLCBj b25zdCBQbHVnaW5EYXRhKiBwbHVnaW5EYXRhKQogewogICAgIC8vIFJldHVybiBlYXJseSBpZiBj bGFzc0lkIGlzIGVtcHR5IChzaW5jZSB3ZSB3b24ndCBkbyBhbnl0aGluZyBiZWxvdykuCkBAIC0x MTYsMzAgKzEwMyw3IEBAIHN0YXRpYyBTdHJpbmcgc2VydmljZVR5cGVGb3JDbGFzc0lkKGNvbnMK ICAgICAgICAgcmV0dXJuIFN0cmluZygpOwogCiAgICAgc3RhdGljIENsYXNzSWRUb1R5cGVNYXAq IG1hcCA9IGNyZWF0ZUNsYXNzSWRUb1R5cGVNYXAoKTsKLSAgICBTdHJpbmcgdHlwZSA9IG1hcC0+ Z2V0KGNsYXNzSWQpOwotCi0gICAgLy8gSWYgd2UgZG8gaGF2ZSBhIHBsdWctaW4gdGhhdCBzdXBw b3J0cyBnZW5lcmljIEFjdGl2ZVggY29udGVudCBhbmQgZG9uJ3QgaGF2ZSBhIHBsdWctaW4KLSAg ICAvLyBmb3IgdGhlIE1JTUUgdHlwZSB3ZSBjYW1lIHVwIHdpdGgsIGlnbm9yZSB0aGUgTUlNRSB0 eXBlIHdlIGNhbWUgdXAgd2l0aCBhbmQganVzdCB1c2UKLSAgICAvLyB0aGUgQWN0aXZlWCB0eXBl LgotICAgIGlmIChoYXZlUGx1Z2luKHBsdWdpbkRhdGEsIGFjdGl2ZVhUeXBlKCkpICYmICFoYXZl UGx1Z2luKHBsdWdpbkRhdGEsIHR5cGUpKQotICAgICAgICByZXR1cm4gYWN0aXZlWFR5cGUoKTsK LQotICAgIHJldHVybiB0eXBlOwotfQotCi1zdGF0aWMgaW5saW5lIGJvb2wgc2hvdWxkVXNlRW1i ZWREZXNjZW5kYW50KEhUTUxPYmplY3RFbGVtZW50KiBvYmplY3RFbGVtZW50LCBjb25zdCBQbHVn aW5EYXRhKiBwbHVnaW5EYXRhKQotewotI2lmIFBMQVRGT1JNKE1BQykKLSAgICBVTlVTRURfUEFS QU0ob2JqZWN0RWxlbWVudCk7Ci0gICAgVU5VU0VEX1BBUkFNKHBsdWdpbkRhdGEpOwotICAgIC8v IE9uIE1hYywgd2UgYWx3YXlzIHdhbnQgdG8gdXNlIHRoZSBlbWJlZCBkZXNjZW5kYW50LgotICAg IHJldHVybiB0cnVlOwotI2Vsc2UKLSAgICAvLyBJZiB3ZSBoYXZlIGJvdGggYW4gPG9iamVjdD4g YW5kIDxlbWJlZD4sIHdlIGFsd2F5cyB3YW50IHRvIHVzZSB0aGUgPGVtYmVkPiBleGNlcHQgd2hl biB3ZSBoYXZlCi0gICAgLy8gYW4gQWN0aXZlWCBwbHVnLWluIGFuZCBwbGFuIHRvIHVzZSBpdC4K LSAgICByZXR1cm4gIShoYXZlUGx1Z2luKHBsdWdpbkRhdGEsIGFjdGl2ZVhUeXBlKCkpCi0gICAg ICAgICYmIHNlcnZpY2VUeXBlRm9yQ2xhc3NJZChvYmplY3RFbGVtZW50LT5jbGFzc0lkKCksIHBs dWdpbkRhdGEpID09IGFjdGl2ZVhUeXBlKCkpOwotI2VuZGlmCisgICAgcmV0dXJuIG1hcC0+Z2V0 KGNsYXNzSWQpOwogfQogCiBzdGF0aWMgdm9pZCBtYXBEYXRhUGFyYW1Ub1NyYyhWZWN0b3I8U3Ry aW5nPiogcGFyYW1OYW1lcywgVmVjdG9yPFN0cmluZz4qIHBhcmFtVmFsdWVzKQpAQCAtMTc4LDE2 ICsxNDIsMTQgQEAgdm9pZCBSZW5kZXJQYXJ0T2JqZWN0Ojp1cGRhdGVXaWRnZXQoYm9vbAogICAg ICAgICAvLyBDaGVjayBmb3IgYSBjaGlsZCBFTUJFRCB0YWcuCiAgICAgICAgIEhUTUxFbWJlZEVs ZW1lbnQqIGVtYmVkID0gMDsKICAgICAgICAgY29uc3QgUGx1Z2luRGF0YSogcGx1Z2luRGF0YSA9 IGZyYW1lLT5wYWdlKCktPnBsdWdpbkRhdGEoKTsKLSAgICAgICAgaWYgKHNob3VsZFVzZUVtYmVk RGVzY2VuZGFudChvLCBwbHVnaW5EYXRhKSkgewotICAgICAgICAgICAgZm9yIChOb2RlKiBjaGls ZCA9IG8tPmZpcnN0Q2hpbGQoKTsgY2hpbGQ7ICkgewotICAgICAgICAgICAgICAgIGlmIChjaGls ZC0+aGFzVGFnTmFtZShlbWJlZFRhZykpIHsKLSAgICAgICAgICAgICAgICAgICAgZW1iZWQgPSBz dGF0aWNfY2FzdDxIVE1MRW1iZWRFbGVtZW50Kj4oY2hpbGQpOwotICAgICAgICAgICAgICAgICAg ICBicmVhazsKLSAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKGNoaWxkLT5oYXNUYWdOYW1lKG9i amVjdFRhZykpCi0gICAgICAgICAgICAgICAgICAgIGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5n KCk7ICAgICAgICAgLy8gRG9uJ3QgZGVzY2VuZCBpbnRvIG5lc3RlZCBPQkpFQ1QgdGFncwotICAg ICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgY2hpbGQgPSBjaGlsZC0+dHJh dmVyc2VOZXh0Tm9kZShvKTsgICAvLyBPdGhlcndpc2UgZGVzY2VuZCAoRU1CRURzIG1heSBiZSBp bnNpZGUgQ09NTUVOVCB0YWdzKQotICAgICAgICAgICAgfQorICAgICAgICBmb3IgKE5vZGUqIGNo aWxkID0gby0+Zmlyc3RDaGlsZCgpOyBjaGlsZDsgKSB7CisgICAgICAgICAgICBpZiAoY2hpbGQt Pmhhc1RhZ05hbWUoZW1iZWRUYWcpKSB7CisgICAgICAgICAgICAgICAgZW1iZWQgPSBzdGF0aWNf Y2FzdDxIVE1MRW1iZWRFbGVtZW50Kj4oY2hpbGQpOworICAgICAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICAgICAgfSBlbHNlIGlmIChjaGlsZC0+aGFzVGFnTmFtZShvYmplY3RUYWcpKQorICAg ICAgICAgICAgICAgIGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCk7ICAgICAgICAgLy8gRG9u J3QgZGVzY2VuZCBpbnRvIG5lc3RlZCBPQkpFQ1QgdGFncworICAgICAgICAgICAgZWxzZQorICAg ICAgICAgICAgICAgIGNoaWxkID0gY2hpbGQtPnRyYXZlcnNlTmV4dE5vZGUobyk7ICAgLy8gT3Ro ZXJ3aXNlIGRlc2NlbmQgKEVNQkVEcyBtYXkgYmUgaW5zaWRlIENPTU1FTlQgdGFncykKICAgICAg ICAgfQogCiAgICAgICAgIC8vIFVzZSB0aGUgYXR0cmlidXRlcyBmcm9tIHRoZSBFTUJFRCB0YWcg aW5zdGVhZCBvZiB0aGUgT0JKRUNUIHRhZyBpbmNsdWRpbmcgV0lEVEggYW5kIEhFSUdIVC4K