42308 2010-07-14 17:42:59 -0700 More work on plug-in streams 2010-07-14 19:20:39 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca abarth dbates eric webkit.review.bot oldest_to_newest 251550 0 andersca 2010-07-14 17:42:59 -0700 More work on plug-in streams 251555 1 61591 andersca 2010-07-14 17:52:59 -0700 Created attachment 61591 Patch 251556 2 webkit.review.bot 2010-07-14 17:53:54 -0700 Attachment 61591 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h:36: Code inside a namespace should not be indented. [whitespace/indent] [4] WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h:60: NPP_New is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h:61: NPP_Destroy is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h:63: NPP_NewStream is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h:64: NPP_DestroyStream is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp:80: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp:90: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp:151: NetscapePlugin::NPP_NewStream is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp:156: NetscapePlugin::NPP_DestroyStream is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 9 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 251561 3 andersca 2010-07-14 18:03:48 -0700 Committed r63385: <http://trac.webkit.org/changeset/63385> 251569 4 dbates 2010-07-14 18:34:21 -0700 This change broke the Apple Windows build bots. There are unresolved externals symbols: See <http://build.webkit.org/builders/Windows%20Debug%20%28Build%29/builds/19414/steps/compile-webkit/logs/stdio>. 251577 5 andersca 2010-07-14 19:06:05 -0700 I checked in a speculative build fix, let's see if it's enough. 251584 6 webkit.review.bot 2010-07-14 19:20:39 -0700 http://trac.webkit.org/changeset/63385 might have broken Chromium Mac Release The following changes are on the blame list: http://trac.webkit.org/changeset/63384 http://trac.webkit.org/changeset/63385 http://trac.webkit.org/changeset/63386 http://trac.webkit.org/changeset/63389 http://trac.webkit.org/changeset/63383 61591 2010-07-14 17:52:59 -0700 2010-07-14 17:55:10 -0700 Patch bug-42308-20100714175258.patch text/plain 13478 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg NWE2YjllZDE0NTI0NTU3ODNjZmU1MGRmNmIwZTRmNmEyNjA2Zjk4NS4uZTI0MjY0ZTAxZDg0NTA4 ZDkxZGQzMTU3OGY4NTRlOWE2NDQ2NjVkMSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw1MSBAQAogMjAxMC0wNy0xNCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vcmUgd29yayBvbiBwbHVnLWluIHN0cmVhbXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyMzA4CisK KyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3Bw OgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6bG9hZFVSTCk6CisgICAgICAgIElm IHRoZSB0YXJnZXQgaXMgbnVsbCwgY3JlYXRlIGEgTmV0c2NhcGVQbHVnaW5TdHJlYW0gYW5kIGFk ZCBpdCB0byB0aGUgbV9zdHJlYW1zIG1hcC4KKworICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBs dWdpbjo6cmVtb3ZlUGx1Z2luU3RyZWFtKToKKyAgICAgICAgUmVtb3ZlIHRoZSBnaXZlbiBOZXRz Y2FwZVBsdWdpblN0cmVhbSBmcm9tIHRoZSBtX3N0cmVhbXMgbWFwLgorCisgICAgICAgIChXZWJL aXQ6Ok5ldHNjYXBlUGx1Z2luOjpOUFBfTmV3U3RyZWFtKToKKyAgICAgICAgKFdlYktpdDo6TmV0 c2NhcGVQbHVnaW46Ok5QUF9EZXN0cm95U3RyZWFtKToKKyAgICAgICAgQWRkIE5QUF8gd3JhcHBl cnMuCisKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW46OnN0cmVhbUZyb21JRCk6Cisg ICAgICAgIFJldHVybiB0aGUgcGx1Zy1pbiBzdHJlYW0gZ2l2ZW4gYSBzdHJlYW0gSUQuCisKKyAg ICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW46OmRpZEV2YWx1YXRlSmF2YVNjcmlwdCk6Cisg ICAgICAgIEZpbmQgdGhlIHBsdWctaW4gc3RyZWFtIGFuZCBjYWxsIHNlbmRKYXZhU2NyaXB0U3Ry ZWFtLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1 Z2luU3RyZWFtLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW5TdHJlYW06Ok5l dHNjYXBlUGx1Z2luU3RyZWFtKToKKyAgICAgICAgSW5pdGlhbGl6ZSBtZW1iZXIgdmFyaWFibGVz LgorCisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luU3RyZWFtOjp+TmV0c2NhcGVQbHVn aW5TdHJlYW0pOgorICAgICAgICBBc3NlcnQgdGhhdCB3ZSBhcmVuJ3Qgc3RhcnRlZC4KKworICAg ICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpblN0cmVhbTo6c2VuZEphdmFTY3JpcHRTdHJlYW0p OgorICAgICAgICBJZiB0aGUgSmF2YVNjcmlwdCByZXF1ZXN0IHdhcyBzdWNjZXNzZnVsLCBzdGFy dCB0aGUgc3RyZWFtLiBPdGhlcndpc2UgY2FsbCBzdG9wKCkgd2hpY2gganVzdAorICAgICAgICBl bmRzIHVwIGNhbGxpbmcgTlBQX1VSTE5vdGlmeSB3aGVuIHRoZSBzdHJlYW0gaXNuJ3Qgc3RhcnRl ZC4KKworICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpblN0cmVhbTo6c3RhcnQpOgorICAg ICAgICBTZXQgdXAgdGhlIE5QU3RyZWFtIG9iamVjdC4gQ2FsbCBOUFBfTmV3U3RyZWFtLiBSZXR1 cm4gZmFsc2UgaWYgdGhlIGNhbGwgd2FzIG5vdCBzdWNjZXNzZnVsLCBvciBpZgorICAgICAgICB0 aGUgcmVxdWVzdGVkIHN0cmVhbSB0eXBlIGlzIG9uZSB0aGF0IHdlIGRvbid0IHlldCBzdXBwb3J0 LgorCisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luU3RyZWFtOjpzdG9wKToKKyAgICAg ICAgQ2FsbCBOUFBfRGVzdHJveVN0cmVhbSBpZiB0aGUgc3RyZWFtIGlzIHN0YXJ0ZWQuIENhbGwg TlBQX1VSTE5vdGlmeSBpZiBuZWNlc3NhcnkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdp bnMvUGx1Z2luVmlldy5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpblZpZXc6OnBlcmZvcm1K YXZhU2NyaXB0VVJMUmVxdWVzdCk6CisgICAgICAgIFJlbW92ZSB1bm5lZWRlZCBjb21tZW50Lgor CisyMDEwLTA3LTE0ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAg ICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCiAKICAgICAgICAgQWRkIE5ldHNjYXBlUGx1 Z2luU3RyZWFtIGNsYXNzCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9O ZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9O ZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAKaW5kZXggYTg4Y2FkMzQ3YzE2ZDY1MzMxZWY1MGUz MGM5N2EwZWI2MmRlOTk0Ni4uMGExYzg3NmVmY2VmZTgwN2FiZmVmMTlmNjAwNzdkYzk2ZmRhN2Rj YiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2Nh cGVQbHVnaW4uY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05l dHNjYXBlUGx1Z2luLmNwcApAQCAtMjUsNiArMjUsNyBAQAogCiAjaW5jbHVkZSAiTmV0c2NhcGVQ bHVnaW4uaCIKIAorI2luY2x1ZGUgIk5ldHNjYXBlUGx1Z2luU3RyZWFtLmgiCiAjaW5jbHVkZSAi UGx1Z2luQ29udHJvbGxlci5oIgogI2luY2x1ZGUgPFdlYkNvcmUvR3JhcGhpY3NDb250ZXh0Lmg+ CiAjaW5jbHVkZSA8V2ViQ29yZS9JbnRSZWN0Lmg+CkBAIC0xMDQsMTcgKzEwNSwzMiBAQCB2b2lk IE5ldHNjYXBlUGx1Z2luOjpsb2FkVVJMKGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nLCBjb25zdCBT dHJpbmcmIHRhcmdldCwgYm9vbAogewogICAgIHVpbnQ2NF90IHJlcXVlc3RJRCA9ICsrbV9uZXh0 UmVxdWVzdElEOwogCi0gICAgaWYgKCF0YXJnZXQuaXNOdWxsKCkgJiYgc2VuZE5vdGlmaWNhdGlv bikgeworICAgIC8vIEZJWE1FOiBIYW5kbGUgcG9wdXBzLgorICAgIGJvb2wgYWxsb3dQb3B1cHMg PSBmYWxzZTsKKyAgICBtX3BsdWdpbkNvbnRyb2xsZXItPmxvYWRVUkwocmVxdWVzdElELCB1cmxT dHJpbmcsIHRhcmdldCwgYWxsb3dQb3B1cHMpOworICAgIAorICAgIGlmICh0YXJnZXQuaXNOdWxs KCkpIHsKKyAgICAgICAgLy8gVGhlIGJyb3dzZXIgaXMgZ29pbmcgdG8gc2VuZCB0aGUgZGF0YSBp biBhIHN0cmVhbSwgY3JlYXRlIGEgcGx1Zy1pbiBzdHJlYW0uCisgICAgICAgIFJlZlB0cjxOZXRz Y2FwZVBsdWdpblN0cmVhbT4gcGx1Z2luU3RyZWFtID0gTmV0c2NhcGVQbHVnaW5TdHJlYW06OmNy ZWF0ZSh0aGlzLCByZXF1ZXN0SUQsIHNlbmROb3RpZmljYXRpb24sIG5vdGlmaWNhdGlvbkRhdGEp OworICAgICAgICBBU1NFUlQoIW1fc3RyZWFtcy5jb250YWlucyhyZXF1ZXN0SUQpKTsKKworICAg ICAgICBtX3N0cmVhbXMuc2V0KHJlcXVlc3RJRCwgcGx1Z2luU3RyZWFtLnJlbGVhc2UoKSk7Cisg ICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoc2VuZE5vdGlmaWNhdGlvbikgewogICAg ICAgICAvLyBFdmVudHVhbGx5IHdlIGFyZSBnb2luZyB0byBnZXQgYSBmcmFtZURpZEZpbmlzaExv YWRpbmcgb3IgZnJhbWVEaWRGYWlsIGNhbGwgZm9yIHRoaXMgcmVxdWVzdC4KICAgICAgICAgLy8g S2VlcCB0cmFjayBvZiB0aGUgbm90aWZpY2F0aW9uIGRhdGEgc28gd2UgY2FuIGNhbGwgTlBQX1VS TE5vdGlmeS4KICAgICAgICAgQVNTRVJUKCFtX3BlbmRpbmdVUkxOb3RpZmljYXRpb25zLmNvbnRh aW5zKHJlcXVlc3RJRCkpOwogICAgICAgICBtX3BlbmRpbmdVUkxOb3RpZmljYXRpb25zLnNldChy ZXF1ZXN0SUQsIG1ha2VfcGFpcih1cmxTdHJpbmcsIG5vdGlmaWNhdGlvbkRhdGEpKTsKICAgICB9 Cit9CiAKLSAgICAvLyBGSVhNRTogSGFuZGxlIHBvcHVwcy4KLSAgICBib29sIGFsbG93UG9wdXBz ID0gZmFsc2U7Ci0gICAgbV9wbHVnaW5Db250cm9sbGVyLT5sb2FkVVJMKHJlcXVlc3RJRCwgdXJs U3RyaW5nLCB0YXJnZXQsIGFsbG93UG9wdXBzKTsKK3ZvaWQgTmV0c2NhcGVQbHVnaW46OnJlbW92 ZVBsdWdpblN0cmVhbShOZXRzY2FwZVBsdWdpblN0cmVhbSogcGx1Z2luU3RyZWFtKQoreworICAg IEFTU0VSVChtX3N0cmVhbXMuZ2V0KHBsdWdpblN0cmVhbS0+c3RyZWFtSUQoKSkgPT0gcGx1Z2lu U3RyZWFtKTsKICAgICAKKyAgICBtX3N0cmVhbXMucmVtb3ZlKHBsdWdpblN0cmVhbS0+c3RyZWFt SUQoKSk7CiB9CiAKIE5QRXJyb3IgTmV0c2NhcGVQbHVnaW46Ok5QUF9OZXcoTlBNSU1FVHlwZSBw bHVnaW5UeXBlLCB1aW50MTZfdCBtb2RlLCBpbnQxNl90IGFyZ2MsIGNoYXIqIGFyZ25bXSwgY2hh ciogYXJndltdLCBOUFNhdmVkRGF0YSogc2F2ZWREYXRhKQpAQCAtMTMyLDYgKzE0OCwxNiBAQCBO UEVycm9yIE5ldHNjYXBlUGx1Z2luOjpOUFBfU2V0V2luZG93KE5QV2luZG93KiBucFdpbmRvdykK ICAgICByZXR1cm4gbV9wbHVnaW5Nb2R1bGUtPnBsdWdpbkZ1bmNzKCkuc2V0d2luZG93KCZtX25w cCwgbnBXaW5kb3cpOwogfQogCitOUEVycm9yIE5ldHNjYXBlUGx1Z2luOjpOUFBfTmV3U3RyZWFt KE5QTUlNRVR5cGUgbWltZVR5cGUsIE5QU3RyZWFtKiBzdHJlYW0sIE5QQm9vbCBzZWVrYWJsZSwg dWludDE2X3QqIHN0cmVhbVR5cGUpCit7CisgICAgcmV0dXJuIG1fcGx1Z2luTW9kdWxlLT5wbHVn aW5GdW5jcygpLm5ld3N0cmVhbSgmbV9ucHAsIG1pbWVUeXBlLCBzdHJlYW0sIHNlZWthYmxlLCBz dHJlYW1UeXBlKTsKK30KKworTlBFcnJvciBOZXRzY2FwZVBsdWdpbjo6TlBQX0Rlc3Ryb3lTdHJl YW0oTlBTdHJlYW0qIHN0cmVhbSwgTlBSZWFzb24gcmVhc29uKQoreworICAgIHJldHVybiBtX3Bs dWdpbk1vZHVsZS0+cGx1Z2luRnVuY3MoKS5kZXN0cm95c3RyZWFtKCZtX25wcCwgc3RyZWFtLCBy ZWFzb24pOworfQorCiB2b2lkIE5ldHNjYXBlUGx1Z2luOjpOUFBfVVJMTm90aWZ5KGNvbnN0IGNo YXIqIHVybCwgTlBSZWFzb24gcmVhc29uLCB2b2lkKiBub3RpZnlEYXRhKQogewogICAgIG1fcGx1 Z2luTW9kdWxlLT5wbHVnaW5GdW5jcygpLnVybG5vdGlmeSgmbV9ucHAsIHVybCwgcmVhc29uLCBu b3RpZnlEYXRhKTsKQEAgLTE1MSw2ICsxNzcsMTEgQEAgdm9pZCBOZXRzY2FwZVBsdWdpbjo6Y2Fs bFNldFdpbmRvdygpCiAgICAgTlBQX1NldFdpbmRvdygmbV9ucFdpbmRvdyk7CiB9CiAKK05ldHNj YXBlUGx1Z2luU3RyZWFtKiBOZXRzY2FwZVBsdWdpbjo6c3RyZWFtRnJvbUlEKHVpbnQ2NF90IHN0 cmVhbUlEKQoreworICAgIHJldHVybiBtX3N0cmVhbXMuZ2V0KHN0cmVhbUlEKS5nZXQoKTsKK30K KwogYm9vbCBOZXRzY2FwZVBsdWdpbjo6aW5pdGlhbGl6ZShQbHVnaW5Db250cm9sbGVyKiBwbHVn aW5Db250cm9sbGVyLCBjb25zdCBQYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogewogICAgIEFTU0VS VCghbV9wbHVnaW5Db250cm9sbGVyKTsKQEAgLTI2Myw3ICsyOTQsOCBAQCB2b2lkIE5ldHNjYXBl UGx1Z2luOjpmcmFtZURpZEZhaWwodWludDY0X3QgcmVxdWVzdElELCBib29sIHdhc0NhbmNlbGxl ZCkKIAogdm9pZCBOZXRzY2FwZVBsdWdpbjo6ZGlkRXZhbHVhdGVKYXZhU2NyaXB0KHVpbnQ2NF90 IHJlcXVlc3RJRCwgY29uc3QgU3RyaW5nJiByZXF1ZXN0VVJMU3RyaW5nLCBjb25zdCBTdHJpbmcm IHJlc3VsdCkKIHsKLSAgICAvLyBGSVhNRTogSW1wbGVtZW50LgorICAgIGlmIChOZXRzY2FwZVBs dWdpblN0cmVhbSogcGx1Z2luU3RyZWFtID0gc3RyZWFtRnJvbUlEKHJlcXVlc3RJRCkpCisgICAg ICAgIHBsdWdpblN0cmVhbS0+c2VuZEphdmFTY3JpcHRTdHJlYW0ocmVxdWVzdFVSTFN0cmluZywg cmVzdWx0KTsKIH0KIAogUGx1Z2luQ29udHJvbGxlciogTmV0c2NhcGVQbHVnaW46OmNvbnRyb2xs ZXIoKQpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0 c2NhcGVQbHVnaW4uaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNj YXBlUGx1Z2luLmgKaW5kZXggNzQ3NWQ1ZDE5MWVlODMwYzQ4YWQxNTRkNDA0YTc4MGVhNzUyMmE2 NS4uNDc4NjAzNGE5YzAzNjBhMjFjOWU2OTZkNGE0Njc0YWZhODUyZjYwMyAxMDA2NDQKLS0tIGEv V2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaAorKysg Yi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oCkBA IC0zMyw2ICszMyw4IEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCitjbGFzcyBOZXRzY2FwZVBs dWdpblN0cmVhbTsKKyAgICAKIGNsYXNzIE5ldHNjYXBlUGx1Z2luIDogcHVibGljIFBsdWdpbiB7 CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8TmV0c2NhcGVQbHVnaW4+IGNyZWF0ZShQ YXNzUmVmUHRyPE5ldHNjYXBlUGx1Z2luTW9kdWxlPiBwbHVnaW5Nb2R1bGUpCkBAIC01MiwxMCAr NTQsMTQgQEAgcHVibGljOgogICAgIGNvbnN0IGNoYXIqIHVzZXJBZ2VudCgpOwogICAgIHZvaWQg bG9hZFVSTChjb25zdCBXZWJDb3JlOjpTdHJpbmcmIHVybFN0cmluZywgY29uc3QgV2ViQ29yZTo6 U3RyaW5nJiB0YXJnZXQsIGJvb2wgc2VuZE5vdGlmaWNhdGlvbiwgdm9pZCogbm90aWZpY2F0aW9u RGF0YSk7CiAKKyAgICB2b2lkIHJlbW92ZVBsdWdpblN0cmVhbShOZXRzY2FwZVBsdWdpblN0cmVh bSopOworCiAgICAgLy8gTWVtYmVyIGZ1bmN0aW9ucyBmb3IgY2FsbGluZyBpbnRvIHRoZSBwbHVn LWluLgotICAgIE5QRXJyb3IgTlBQX05ldyhOUE1JTUVUeXBlIHBsdWdpblR5cGUsIHVpbnQxNl90 IG1vZGUsIGludDE2X3QgYXJnYywgY2hhciogYXJnbltdLCBjaGFyKiBhcmd2W10sIE5QU2F2ZWRE YXRhKiBzYXZlZERhdGEpOwotICAgIE5QRXJyb3IgTlBQX0Rlc3Ryb3koTlBTYXZlZERhdGEqKiBz YXZlZERhdGEpOworICAgIE5QRXJyb3IgTlBQX05ldyhOUE1JTUVUeXBlIHBsdWdpblR5cGUsIHVp bnQxNl90IG1vZGUsIGludDE2X3QgYXJnYywgY2hhciogYXJnbltdLCBjaGFyKiBhcmd2W10sIE5Q U2F2ZWREYXRhKik7CisgICAgTlBFcnJvciBOUFBfRGVzdHJveShOUFNhdmVkRGF0YSoqKTsKICAg ICBOUEVycm9yIE5QUF9TZXRXaW5kb3coTlBXaW5kb3cqKTsKKyAgICBOUEVycm9yIE5QUF9OZXdT dHJlYW0oTlBNSU1FVHlwZSwgTlBTdHJlYW0qLCBOUEJvb2wgc2Vla2FibGUsIHVpbnQxNl90KiBz dHlwZSk7CisgICAgTlBFcnJvciBOUFBfRGVzdHJveVN0cmVhbShOUFN0cmVhbSosIE5QUmVhc29u KTsKICAgICB2b2lkIE5QUF9VUkxOb3RpZnkoY29uc3QgY2hhciogdXJsLCBOUFJlYXNvbiByZWFz b24sIHZvaWQqIG5vdGlmeURhdGEpOwogCiBwcml2YXRlOgpAQCAtNjMsNiArNjksOCBAQCBwcml2 YXRlOgogCiAgICAgdm9pZCBjYWxsU2V0V2luZG93KCk7CiAKKyAgICBOZXRzY2FwZVBsdWdpblN0 cmVhbSogc3RyZWFtRnJvbUlEKHVpbnQ2NF90IHN0cmVhbUlEKTsKKwogICAgIGJvb2wgcGxhdGZv cm1Qb3N0SW5pdGlhbGl6ZSgpOwogICAgIHZvaWQgcGxhdGZvcm1QYWludChXZWJDb3JlOjpHcmFw aGljc0NvbnRleHQqLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBkaXJ0eVJlY3QpOwogCkBAIC04 Myw2ICs5MSw4IEBAIHByaXZhdGU6CiAgICAgdHlwZWRlZiBIYXNoTWFwPHVpbnQ2NF90LCBzdGQ6 OnBhaXI8V2ViQ29yZTo6U3RyaW5nLCB2b2lkKj4gPiBQZW5kaW5nVVJMTm90aWZ5TWFwOwogICAg IFBlbmRpbmdVUkxOb3RpZnlNYXAgbV9wZW5kaW5nVVJMTm90aWZpY2F0aW9uczsKIAorICAgIEhh c2hNYXA8dWludDY0X3QsIFJlZlB0cjxOZXRzY2FwZVBsdWdpblN0cmVhbT4gPiBtX3N0cmVhbXM7 CisKICAgICBSZWZQdHI8TmV0c2NhcGVQbHVnaW5Nb2R1bGU+IG1fcGx1Z2luTW9kdWxlOwogICAg IE5QUF90IG1fbnBwOwogICAgIE5QV2luZG93IG1fbnBXaW5kb3c7CmRpZmYgLS1naXQgYS9XZWJL aXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpblN0cmVhbS5jcHAg Yi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpblN0cmVh bS5jcHAKaW5kZXggYzJmYTU3Mjc3MzIyNDE1NDZmNTUzZTNmODY4OGNhODEyODViODA1MC4uNjUx YjZmOTIxNjVlZjZkOTAwMjY5ZTkyMmYyNTViMzkyYjZlNmZmYyAxMDA2NDQKLS0tIGEvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW5TdHJlYW0uY3BwCisr KyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luU3Ry ZWFtLmNwcApAQCAtMjcsNiArMjcsOCBAQAogCiAjaW5jbHVkZSAiTmV0c2NhcGVQbHVnaW4uaCIK IAordXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CisKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBOZXRz Y2FwZVBsdWdpblN0cmVhbTo6TmV0c2NhcGVQbHVnaW5TdHJlYW0oUGFzc1JlZlB0cjxOZXRzY2Fw ZVBsdWdpbj4gcGx1Z2luLCB1aW50NjRfdCBzdHJlYW1JRCwgYm9vbCBzZW5kTm90aWZpY2F0aW9u LCB2b2lkKiBub3RpZmljYXRpb25EYXRhKQpAQCAtMzQsMTEgKzM2LDgyIEBAIE5ldHNjYXBlUGx1 Z2luU3RyZWFtOjpOZXRzY2FwZVBsdWdpblN0cmVhbShQYXNzUmVmUHRyPE5ldHNjYXBlUGx1Z2lu PiBwbHVnaW4sIHVpCiAgICAgLCBtX3N0cmVhbUlEKHN0cmVhbUlEKQogICAgICwgbV9zZW5kTm90 aWZpY2F0aW9uKHNlbmROb3RpZmljYXRpb24pCiAgICAgLCBtX25vdGlmaWNhdGlvbkRhdGEobm90 aWZpY2F0aW9uRGF0YSkKKyAgICAsIG1fbnBTdHJlYW0oKQorICAgICwgbV90cmFuc2Zlck1vZGUo TlBfTk9STUFMKQorICAgICwgbV9vZmZzZXQoMCkKKyAgICAsIG1faXNTdGFydGVkKGZhbHNlKQog ewogfQogCiBOZXRzY2FwZVBsdWdpblN0cmVhbTo6fk5ldHNjYXBlUGx1Z2luU3RyZWFtKCkKIHsK KyAgICBBU1NFUlQoIW1faXNTdGFydGVkKTsKK30KKwordm9pZCBOZXRzY2FwZVBsdWdpblN0cmVh bTo6c2VuZEphdmFTY3JpcHRTdHJlYW0oY29uc3QgU3RyaW5nJiByZXF1ZXN0VVJMU3RyaW5nLCBj b25zdCBTdHJpbmcmIHJlc3VsdCkKK3sKKyAgICBDU3RyaW5nIHJlc3VsdENTdHJpbmcgPSByZXF1 ZXN0VVJMU3RyaW5nLnV0ZjgoKTsKKyAgICBpZiAocmVzdWx0Q1N0cmluZy5pc051bGwoKSkgewor ICAgICAgICAvLyBUaGVyZSB3YXMgYW4gZXJyb3IgZXZhbHVhdGluZyB0aGUgSmF2YVNjcmlwdCwg anVzdCBjYWxsIHN0b3AuCisgICAgICAgIHN0b3AoTlBSRVNfTkVUV09SS19FUlIpOworICAgICAg ICByZXR1cm47CisgICAgfQorCisgICAgaWYgKCFzdGFydChyZXF1ZXN0VVJMU3RyaW5nLCByZXN1 bHRDU3RyaW5nLmxlbmd0aCgpLCAwLCAidGV4dC9wbGFpbiIsICIiKSkgeworICAgICAgICBzdG9w KE5QUkVTX05FVFdPUktfRVJSKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIC8vIEZJ WE1FOiBTZW5kIHRoZSBKYXZhU2NyaXB0IHN0cmluZyBhcyB3ZWxsLgorfQorCitib29sIE5ldHNj YXBlUGx1Z2luU3RyZWFtOjpzdGFydChjb25zdCBXZWJDb3JlOjpTdHJpbmcmIHJlc3BvbnNlVVJM U3RyaW5nLCB1aW50MzJfdCBleHBlY3RlZENvbnRlbnRMZW5ndGgsIAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdWludDMyX3QgbGFzdE1vZGlmaWVkVGltZSwgY29uc3QgV2ViQ29y ZTo6U3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgV2ViQ29yZTo6U3RyaW5nJiBoZWFkZXJzKQorewor ICAgIG1fcmVzcG9uc2VVUkwgPSByZXNwb25zZVVSTFN0cmluZy51dGY4KCk7CisgICAgbV9taW1l VHlwZSA9IG1pbWVUeXBlLnV0ZjgoKTsKKyAgICBtX2hlYWRlcnMgPSBoZWFkZXJzLnV0ZjgoKTsK KworICAgIG1fbnBTdHJlYW0ubmRhdGEgPSB0aGlzOworICAgIG1fbnBTdHJlYW0udXJsID0gbV9y ZXNwb25zZVVSTC5kYXRhKCk7CisgICAgbV9ucFN0cmVhbS5lbmQgPSBleHBlY3RlZENvbnRlbnRM ZW5ndGg7CisgICAgbV9ucFN0cmVhbS5sYXN0bW9kaWZpZWQgPSBsYXN0TW9kaWZpZWRUaW1lOwor ICAgIG1fbnBTdHJlYW0ubm90aWZ5RGF0YSA9IDA7CisgICAgbV9ucFN0cmVhbS5oZWFkZXJzID0g bV9oZWFkZXJzLmxlbmd0aCgpID09IDAgPyAwIDogbV9oZWFkZXJzLmRhdGEoKTsKKworICAgIE5Q RXJyb3IgZXJyb3IgPSBtX3BsdWdpbi0+TlBQX05ld1N0cmVhbShjb25zdF9jYXN0PGNoYXIqPiht X21pbWVUeXBlLmRhdGEoKSksICZtX25wU3RyZWFtLCBmYWxzZSwgJm1fdHJhbnNmZXJNb2RlKTsK KyAgICBpZiAoZXJyb3IgIT0gTlBFUlJfTk9fRVJST1IpCisgICAgICAgIHJldHVybiBmYWxzZTsK KworICAgIC8vIFdlIHN1Y2Nlc3NmdWxseSBzdGFydGVkIHRoZSBzdHJlYW0uCisgICAgbV9pc1N0 YXJ0ZWQgPSB0cnVlOworCisgICAgc3dpdGNoIChtX3RyYW5zZmVyTW9kZSkgeworICAgICAgICBj YXNlIE5QX05PUk1BTDoKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICAvLyBGSVhNRTogV2Ug ZG9uJ3Qgc3VwcG9ydCBzdHJlYW1pbmcgdG8gZmlsZXMuCisgICAgICAgIGNhc2UgTlBfQVNGSUxF T05MWToKKyAgICAgICAgY2FzZSBOUF9BU0ZJTEU6CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgICAgIC8vIEZJWE1FOiBXZSBkb24ndCBzdXBwb3J0IHNlZWthYmxlIHN0cmVhbXMuCisg ICAgICAgIGNhc2UgTlBfU0VFSzoKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisK KyAgICByZXR1cm4gdHJ1ZTsKK30KKyAgICAKK3ZvaWQgTmV0c2NhcGVQbHVnaW5TdHJlYW06OnN0 b3AoTlBSZWFzb24gcmVhc29uKQoreworICAgIGlmIChtX2lzU3RhcnRlZCkgeworICAgICAgICBt X3BsdWdpbi0+TlBQX0Rlc3Ryb3lTdHJlYW0oJm1fbnBTdHJlYW0sIHJlYXNvbik7CisgICAgICAg IG1faXNTdGFydGVkID0gZmFsc2U7CisgICAgfQorCisgICAgaWYgKG1fc2VuZE5vdGlmaWNhdGlv bikKKyAgICAgICAgbV9wbHVnaW4tPk5QUF9VUkxOb3RpZnkobV9yZXNwb25zZVVSTC5kYXRhKCks IHJlYXNvbiwgbV9ub3RpZmljYXRpb25EYXRhKTsKKworICAgIG1fcGx1Z2luLT5yZW1vdmVQbHVn aW5TdHJlYW0odGhpcyk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEv V2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW5TdHJlYW0u aCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luU3Ry ZWFtLmgKaW5kZXggNjI3NDQ1NjM0MDRkMjU3ZjI2YTQ4ZjdmOTI0MzdjYjlmNDdhMjAxNi4uZTAy ZDcwNzBlNTUwZTNmNTg1YTk0M2U5NGMwNzVlNmRhYTExZDFmOCAxMDA2NDQKLS0tIGEvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW5TdHJlYW0uaAorKysg Yi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpblN0cmVh bS5oCkBAIC0yNiw5ICsyNiwxNSBAQAogI2lmbmRlZiBOZXRzY2FwZVBsdWdpblN0cmVhbV9oCiAj ZGVmaW5lIE5ldHNjYXBlUGx1Z2luU3RyZWFtX2gKIAorI2luY2x1ZGUgPFdlYkNvcmUvbnBhcGku aD4KICNpbmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVk Lmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcu aD4KKworbmFtZXNwYWNlIFdlYkNvcmUgeworICAgIGNsYXNzIFN0cmluZzsKK30KIAogbmFtZXNw YWNlIFdlYktpdCB7CiAKQEAgLTQyLDE0ICs0OCwzMyBAQCBwdWJsaWM6CiAgICAgfQogICAgIH5O ZXRzY2FwZVBsdWdpblN0cmVhbSgpOwogCisgICAgdWludDY0X3Qgc3RyZWFtSUQoKSBjb25zdCB7 IHJldHVybiBtX3N0cmVhbUlEOyB9CisKKyAgICB2b2lkIHNlbmRKYXZhU2NyaXB0U3RyZWFtKGNv bnN0IFdlYkNvcmU6OlN0cmluZyYgcmVxdWVzdFVSTFN0cmluZywgY29uc3QgV2ViQ29yZTo6U3Ry aW5nJiByZXN1bHQpOworCiBwcml2YXRlOgogICAgIE5ldHNjYXBlUGx1Z2luU3RyZWFtKFBhc3NS ZWZQdHI8TmV0c2NhcGVQbHVnaW4+LCB1aW50NjRfdCBzdHJlYW1JRCwgYm9vbCBzZW5kTm90aWZp Y2F0aW9uLCB2b2lkKiBub3RpZmljYXRpb25EYXRhKTsKIAorICAgIGJvb2wgc3RhcnQoY29uc3Qg V2ViQ29yZTo6U3RyaW5nJiByZXNwb25zZVVSTFN0cmluZywgdWludDMyX3QgZXhwZWN0ZWRDb250 ZW50TGVuZ3RoLCAKKyAgICAgICAgICAgICAgIHVpbnQzMl90IGxhc3RNb2RpZmllZFRpbWUsIGNv bnN0IFdlYkNvcmU6OlN0cmluZyYgbWltZVR5cGUsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgaGVh ZGVycyk7CisgICAgdm9pZCBzdG9wKE5QUmVhc29uKTsKKwogICAgIFJlZlB0cjxOZXRzY2FwZVBs dWdpbj4gbV9wbHVnaW47CiAgICAgdWludDY0X3QgbV9zdHJlYW1JRDsKICAgICAKICAgICBib29s IG1fc2VuZE5vdGlmaWNhdGlvbjsKICAgICB2b2lkKiBtX25vdGlmaWNhdGlvbkRhdGE7CisKKyAg ICBOUFN0cmVhbSBtX25wU3RyZWFtOworICAgIHVpbnQxNl90IG1fdHJhbnNmZXJNb2RlOworICAg IGludDMyX3QgbV9vZmZzZXQ7CisKKyAgICAvLyBXaGV0aGVyIE5QUF9OZXdTdHJlYW0gaGFzIHN1 Y2Nlc3NmdWxseSBiZWVuIGNhbGxlZC4KKyAgICBib29sIG1faXNTdGFydGVkOworCisgICAgQ1N0 cmluZyBtX3Jlc3BvbnNlVVJMOworICAgIENTdHJpbmcgbV9taW1lVHlwZTsKKyAgICBDU3RyaW5n IG1faGVhZGVyczsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvV2Vi S2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAgYi9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcAppbmRleCBhZWE3ZjM3YWVlMWJhYzc4YTk3ZDQ1NGE0 OTc0Y2NhNmFjMTcxOWNkLi44OGJiM2UxNTE0MWFiZmViNmI3MTQ1NDQwNWJmMGViZWVlZmYxYTYz IDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcAor KysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcApAQCAtMjc5LDcg KzI3OSw3IEBAIHZvaWQgUGx1Z2luVmlldzo6cGVyZm9ybUphdmFTY3JpcHRVUkxSZXF1ZXN0KFVS TFJlcXVlc3QqIHJlcXVlc3QpCiAgICAgfQogCiAgICAgLy8gRXZhbHVhdGUgdGhlIEphdmFTY3Jp cHQgY29kZS4gTm90ZSB0aGF0IHJ1bm5pbmcgSmF2YVNjcmlwdCBoZXJlIGNvdWxkIGNhdXNlIHRo ZSBwbHVnLWluIHRvIGJlIGRlc3Ryb3llZCwgc28gd2UKLSAgICAvLyBncmFiIHJlZmVyZW5jZXMg dG8gdGhlIHBsdWctaW4gaGVyZS4gKFdlIGFscmVhZHkgaGF2ZSBhIHJlZmVyZW5jZSB0byB0aGUg ZnJhbWUpLgorICAgIC8vIGdyYWIgcmVmZXJlbmNlcyB0byB0aGUgcGx1Zy1pbiBoZXJlLgogICAg IFJlZlB0cjxQbHVnaW4+IHBsdWdpbiA9IG1fcGx1Z2luOwogICAgIAogICAgIFNjcmlwdFZhbHVl IHJlc3VsdCA9IG1fcGx1Z2luRWxlbWVudC0+ZG9jdW1lbnQoKS0+ZnJhbWUoKS0+c2NyaXB0KCkt PmV4ZWN1dGVTY3JpcHQoanNTdHJpbmcpOwo=