43268 2010-07-30 13:35:06 -0700 Implement NPN_Evaluate 2010-07-30 14:44:24 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 258354 0 andersca 2010-07-30 13:35:06 -0700 Implement NPN_Evaluate 258358 1 63098 andersca 2010-07-30 13:43:42 -0700 Created attachment 63098 Patch 258389 2 63098 sam 2010-07-30 14:36:38 -0700 Comment on attachment 63098 Patch > + bool evaluate(NPObject*, const WebCore::String &scriptString, NPVariant* result); & on the wrong side. > + > void setStatusbarText(const WebCore::String&); > + bool evaluate(NPObject*, const WebCore::String &scriptString, NPVariant* result); Here too. > + // Evaluates the given script string in the context of the given NPObject. > + virtual bool evaluate(NPObject*, const WebCore::String &scriptString, NPVariant* result, bool allowPopups) = 0; > + And here too. > > +bool PluginView::evaluate(NPObject* npObject, const String &scriptString, NPVariant* result, bool allowPopups) > +{ And again. > + virtual bool evaluate(NPObject*, const WebCore::String &scriptString, NPVariant* result, bool allowPopups); Once more! r=me 258398 3 andersca 2010-07-30 14:44:24 -0700 Committed r64377: <http://trac.webkit.org/changeset/64377> 63098 2010-07-30 13:43:42 -0700 2010-07-30 14:36:38 -0700 Patch bug-43268-20100730134340.patch text/plain 14213 andersca ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxOGJlNmYwMDNiNjJmMWY1ZTJmNTYzMzFkYTdlYjI4YTA0MGM2ZjIzLi45OGMzZjc3 NWQyMzcxNjU3ZmY4MzA2MTgyOTMzMzBjZGUzOGM4YWQ3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMDctMzAgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgTlBO X0V2YWx1YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00MzI2OAorCisgICAgICAgIEFkZCB0ZXN0LgorCisgICAgICAgICogcGx1Z2lucy9ucHJ1bnRp bWUvZXZhbHVhdGUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBwbHVnaW5zL25wcnVu dGltZS9ldmFsdWF0ZS5odG1sOiBBZGRlZC4KKwogMjAxMC0wNy0yOSAgQW5kZXJzIENhcmxzc29u ICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4u CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbHVnaW5zL25wcnVudGltZS9ldmFsdWF0ZS1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbHVnaW5zL25wcnVudGltZS9ldmFsdWF0ZS1leHBlY3Rl ZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uZWUyZjY0ZDBmNmM5ZWU4MDI4MjQzNzk2NWJmOGY3Y2QzYTZjNmM0 MQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsdWdpbnMvbnBydW50aW1lL2V2YWx1 YXRlLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDExIEBACisKK1Rlc3QgTlBOX0V2YWx1YXRlCisK K09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZv bGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQQVNTIHBsdWdpbi50ZXN0RXZhbHVhdGUo JzEnKSBpcyAxCitQQVNTIHBsdWdpbi50ZXN0RXZhbHVhdGUoJ3BsdWdpbicpIGlzIHBsdWdpbgor UEFTUyBwbHVnaW4udGVzdEV2YWx1YXRlKCd3aW5kb3cnKSBpcyB3aW5kb3cKK1BBU1MgcGx1Z2lu LnRlc3RFdmFsdWF0ZSgnMSArIDEnKSBpcyAyCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Bs dWdpbnMvbnBydW50aW1lL2V2YWx1YXRlLmh0bWwgYi9MYXlvdXRUZXN0cy9wbHVnaW5zL25wcnVu dGltZS9ldmFsdWF0ZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjc0YzllNDA5NGJkMTI2M2FjNDBhM2NhMDk1 M2IzNTczMDMzYjE3OTUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbHVnaW5zL25w cnVudGltZS9ldmFsdWF0ZS5odG1sCkBAIC0wLDAgKzEsMjMgQEAKKzxsaW5rIHJlbD0ic3R5bGVz aGVldCIgaHJlZj0iLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgor PHNjcmlwdCBzcmM9Ii4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3Nj cmlwdD4KKzwvaGVhZD4KKzxzY3JpcHQ+CitmdW5jdGlvbiBydW5UZXN0KCkgeworICAgIHBsdWdp biA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdwbHVnaW4nKTsKKworICAgIHNob3VsZEJlKCJw bHVnaW4udGVzdEV2YWx1YXRlKCcxJykiLCAiMSIpOworICAgIHNob3VsZEJlKCJwbHVnaW4udGVz dEV2YWx1YXRlKCdwbHVnaW4nKSIsICJwbHVnaW4iKTsKKyAgICBzaG91bGRCZSgicGx1Z2luLnRl c3RFdmFsdWF0ZSgnd2luZG93JykiLCAid2luZG93Iik7CisgICAgc2hvdWxkQmUoInBsdWdpbi50 ZXN0RXZhbHVhdGUoJzEgKyAxJykiLCAiMiIpOworfQorPC9zY3JpcHQ+Cis8Ym9keSBvbkxvYWQ9 InJ1blRlc3QoKSI+Cis8ZW1iZWQgaWQ9InBsdWdpbiIgdHlwZT0iYXBwbGljYXRpb24veC13ZWJr aXQtdGVzdC1uZXRzY2FwZSIgd2lkdGg9MTAwIGhlaWdodD0xMDA+PC9lbWJlZD4KKzxwIGlkPSJk ZXNjcmlwdGlvbiI+PC9wPgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+CisKKzxzY3JpcHQ+Citk ZXNjcmlwdGlvbigiVGVzdCBOUE5fRXZhbHVhdGUiKTsKKworc3VjY2Vzc2Z1bGx5UGFyc2VkID0g dHJ1ZTsKKzwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9XZWJLaXQy L0NoYW5nZUxvZwppbmRleCAwM2NjOTU2MTRkZmE5MGMyYjg0YjM0M2I2OGQ2N2Q4NzdlMWEyYTVh Li44NWI5YjQ3NzMxNzhiYWNlYTY1MjFjMDUzN2UyY2RjY2I0MTYxYTUzIDEwMDY0NAotLS0gYS9X ZWJLaXQyL0NoYW5nZUxvZworKysgYi9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBA CiAyMDEwLTA3LTMwICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50IE5Q Tl9FdmFsdWF0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NDMyNjgKKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9OUFJ1bnRpbWVPYmplY3RN YXAuY3BwOgorICAgICAgICAoV2ViS2l0OjpOUFJ1bnRpbWVPYmplY3RNYXA6OmV2YWx1YXRlKToK KyAgICAgICAgRXZhbHVhdGUgdGhlIHBhc3NlZCBpbiBzdHJpbmcuCisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVCcm93c2VyRnVuY3MuY3BwOgorICAgICAg ICAoV2ViS2l0OjpOUE5fRXZhbHVhdGUpOgorICAgICAgICBDYWxsIE5ldHNjYXBlUGx1Z2luOjpl dmFsdWF0ZS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2Fw ZVBsdWdpbi5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpldmFsdWF0ZSk6 CisgICAgICAgIENhbGwgUGx1Z2luQ29udHJvbGxlcjo6ZXZhbHVhdGUuCisKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luQ29udHJvbGxlci5oOgorICAgICAgICBBZGQgZXZhbHVh dGUgcHVyZSB2aXJ0dWFsIG1lbWJlciBmdW5jdGlvbi4KKworICAgICAgICAqIFdlYlByb2Nlc3Mv UGx1Z2lucy9QbHVnaW5WaWV3LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luVmlldzo6ZXZh bHVhdGUpOgorICAgICAgICBVcGRhdGUgdGhlIHBvcHVwIHdpbmRvdyBzdGF0ZSBhbmQgY2FsbCBO UFJ1bnRpbWVPYmplY3RNYXA6OmV2YWx1YXRlLgorCisyMDEwLTA3LTMwICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5p Zy4KIAogICAgICAgICBJbXBsZW1lbnQgTlBOX0ludm9rZURlZmF1bHQKZGlmZiAtLWdpdCBhL1dl YktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QSlNPYmplY3QuY3BwIGIvV2ViS2l0Mi9XZWJQcm9j ZXNzL1BsdWdpbnMvTlBKU09iamVjdC5jcHAKaW5kZXggOWE0YmIwNTRmZTFmNTYxNmU3NzM3ZDBj Y2Q1ZTRlMzlhYTVlZmFjNy4uZGRhNmFmMzgxNTc3MjBiNDdjM2QwMzdhYzg0OGI5ZmYwYjBlYWQw OSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTlBKU09iamVjdC5jcHAK KysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTlBKU09iamVjdC5jcHAKQEAgLTExOSw3 ICsxMTksNyBAQCBib29sIE5QSlNPYmplY3Q6Omludm9rZShOUElkZW50aWZpZXIgbWV0aG9kTmFt ZSwgY29uc3QgTlBWYXJpYW50KiBhcmd1bWVudHMsIHVpbgogICAgIHJldHVybiBpbnZva2UoZXhl YywgbV9vYmplY3RNYXAtPmdsb2JhbE9iamVjdCgpLCBmdW5jdGlvbiwgYXJndW1lbnRzLCBhcmd1 bWVudENvdW50LCByZXN1bHQpOwogfQogCi1ib29sIE5QSlNPYmplY3Q6Omludm9rZURlZmF1bHQo Y29uc3QgTlBWYXJpYW50ICphcmd1bWVudHMsIHVpbnQzMl90IGFyZ3VtZW50Q291bnQsIE5QVmFy aWFudCAqcmVzdWx0KQorYm9vbCBOUEpTT2JqZWN0OjppbnZva2VEZWZhdWx0KGNvbnN0IE5QVmFy aWFudCogYXJndW1lbnRzLCB1aW50MzJfdCBhcmd1bWVudENvdW50LCBOUFZhcmlhbnQqIHJlc3Vs dCkKIHsKICAgICBFeGVjU3RhdGUqIGV4ZWMgPSBtX29iamVjdE1hcC0+Z2xvYmFsRXhlYygpOwog ICAgIGlmICghZXhlYykKQEAgLTIxNSw3ICsyMTUsNyBAQCBib29sIE5QSlNPYmplY3Q6OmVudW1l cmF0ZShOUElkZW50aWZpZXIqKiBpZGVudGlmaWVycywgdWludDMyX3QqIGlkZW50aWZpZXJDb3Vu dAogICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIE5QSlNPYmplY3Q6OmNvbnN0cnVjdChjb25z dCBOUFZhcmlhbnQgKmFyZ3VtZW50cywgdWludDMyX3QgYXJndW1lbnRDb3VudCwgTlBWYXJpYW50 ICpyZXN1bHQpCitib29sIE5QSlNPYmplY3Q6OmNvbnN0cnVjdChjb25zdCBOUFZhcmlhbnQqIGFy Z3VtZW50cywgdWludDMyX3QgYXJndW1lbnRDb3VudCwgTlBWYXJpYW50KiByZXN1bHQpCiB7CiAg ICAgRXhlY1N0YXRlKiBleGVjID0gbV9vYmplY3RNYXAtPmdsb2JhbEV4ZWMoKTsKICAgICBpZiAo IWV4ZWMpCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OUFJ1bnRpbWVP YmplY3RNYXAuY3BwIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTlBSdW50aW1lT2JqZWN0 TWFwLmNwcAppbmRleCA3NmYzNmM4MzMwMDIyZTUzYjVjNjEyNWRlOGM0Zjc4N2VlZmY5MzM3Li5j ZWRjMjUyN2I5YjYwZmVjNmY0ZGMwOGQxYTdjMmY3YTUwMGQxYjkyIDEwMDY0NAotLS0gYS9XZWJL aXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OUFJ1bnRpbWVPYmplY3RNYXAuY3BwCisrKyBiL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QUnVudGltZU9iamVjdE1hcC5jcHAKQEAgLTI1LDEzICsy NSwxMyBAQAogCiAjaW5jbHVkZSAiTlBSdW50aW1lT2JqZWN0TWFwLmgiCiAKLSNpbmNsdWRlIDxK YXZhU2NyaXB0Q29yZS9KU0xvY2suaD4KLQogI2luY2x1ZGUgIkpTTlBPYmplY3QuaCIKICNpbmNs dWRlICJOUEpTT2JqZWN0LmgiCiAjaW5jbHVkZSAiTlBSdW50aW1lVXRpbGl0aWVzLmgiCiAjaW5j bHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKICNpbmNsdWRlICJQbHVnaW5WaWV3LmgiCisjaW5jbHVk ZSA8SmF2YVNjcmlwdENvcmUvSlNMb2NrLmg+CisjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvU291 cmNlQ29kZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRnJhbWUuaD4KIAogdXNpbmcgbmFtZXNwYWNl IEpTQzsKQEAgLTE2OCw2ICsxNjgsMzcgQEAgdm9pZCBOUFJ1bnRpbWVPYmplY3RNYXA6OmNvbnZl cnRKU1ZhbHVlVG9OUFZhcmlhbnQoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIHZhbHUKICAgICBB U1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAorYm9vbCBOUFJ1bnRpbWVPYmplY3RNYXA6OmV2YWx1 YXRlKE5QT2JqZWN0KiBucE9iamVjdCwgY29uc3QgU3RyaW5nICZzY3JpcHRTdHJpbmcsIE5QVmFy aWFudCogcmVzdWx0KQoreworICAgIFByb3RlY3RlZFB0cjxKU0dsb2JhbE9iamVjdD4gZ2xvYmFs T2JqZWN0ID0gdGhpcy0+Z2xvYmFsT2JqZWN0KCk7CisgICAgaWYgKCFnbG9iYWxPYmplY3QpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIEV4ZWNTdGF0ZSogZXhlYyA9IGdsb2JhbE9iamVj dC0+Z2xvYmFsRXhlYygpOworICAgIAorICAgIEpTTG9jayBsb2NrKFNpbGVuY2VBc3NlcnRpb25z T25seSk7CisgICAgSlNWYWx1ZSB0aGlzVmFsdWUgPSBnZXRPckNyZWF0ZUpTT2JqZWN0KGdsb2Jh bE9iamVjdCwgbnBPYmplY3QpOworCisgICAgZ2xvYmFsT2JqZWN0LT5nbG9iYWxEYXRhKCktPnRp bWVvdXRDaGVja2VyLnN0YXJ0KCk7CisgICAgQ29tcGxldGlvbiBjb21wbGV0aW9uID0gSlNDOjpl dmFsdWF0ZShleGVjLCBnbG9iYWxPYmplY3QtPmdsb2JhbFNjb3BlQ2hhaW4oKSwgbWFrZVNvdXJj ZShVU3RyaW5nKHNjcmlwdFN0cmluZy5pbXBsKCkpKSwgdGhpc1ZhbHVlKTsKKyAgICBnbG9iYWxP YmplY3QtPmdsb2JhbERhdGEoKS0+dGltZW91dENoZWNrZXIuc3RvcCgpOworCisgICAgQ29tcGxU eXBlIGNvbXBsZXRpb25UeXBlID0gY29tcGxldGlvbi5jb21wbFR5cGUoKTsKKworICAgIEpTVmFs dWUgcmVzdWx0VmFsdWU7CisgICAgaWYgKGNvbXBsZXRpb25UeXBlID09IE5vcm1hbCkgeworICAg ICAgICByZXN1bHRWYWx1ZSA9IGNvbXBsZXRpb24udmFsdWUoKTsKKyAgICAgICAgaWYgKCFyZXN1 bHRWYWx1ZSkKKyAgICAgICAgICAgIHJlc3VsdFZhbHVlID0ganNVbmRlZmluZWQoKTsKKyAgICB9 IGVsc2UKKyAgICAgICAgcmVzdWx0VmFsdWUgPSBqc1VuZGVmaW5lZCgpOworCisgICAgZXhlYy0+ Y2xlYXJFeGNlcHRpb24oKTsKKyAgICAKKyAgICBjb252ZXJ0SlNWYWx1ZVRvTlBWYXJpYW50KGV4 ZWMsIHJlc3VsdFZhbHVlLCAqcmVzdWx0KTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogdm9pZCBO UFJ1bnRpbWVPYmplY3RNYXA6OmludmFsaWRhdGUoKQogewogICAgIFZlY3RvcjxOUEpTT2JqZWN0 Kj4gbnBKU09iamVjdHM7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9O UFJ1bnRpbWVPYmplY3RNYXAuaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QUnVudGlt ZU9iamVjdE1hcC5oCmluZGV4IDY3YTU4NjA5MWY0OTQyZDkxYmY3MjBhMmMzZWEwNzRmOGUwZDBk ODYuLjM4ZTc1OTVkZmFjNDM2OWQ1ZTI1MTVmYzA1MTM1OWYyMjI2MGE1MDUgMTAwNjQ0Ci0tLSBh L1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QUnVudGltZU9iamVjdE1hcC5oCisrKyBiL1dl YktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QUnVudGltZU9iamVjdE1hcC5oCkBAIC0zOCw2ICsz OCwxMCBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICBjbGFzcyBKU1ZhbHVlOwogfQogCituYW1lc3Bh Y2UgV2ViQ29yZSB7CisgICAgY2xhc3MgU3RyaW5nOworfQorCiBuYW1lc3BhY2UgV2ViS2l0IHsK IAogY2xhc3MgSlNOUE9iamVjdDsKQEAgLTUyLDE3ICs1NiwxNyBAQCBwdWJsaWM6CiAgICAgLy8g UmV0dXJucyBhbiBOUE9iamVjdCB0aGF0IHdyYXBzIHRoZSBnaXZlbiBKU09iamVjdCBvYmplY3Qu IElmIHRoZXJlIGlzIGFscmVhZHkgYW4gTlBPYmplY3QgdGhhdCB3cmFwcyB0aGlzIEpTT2JqZWN0 LCBpdCB3aWxsCiAgICAgLy8gcmV0YWluIGl0IGFuZCByZXR1cm4gaXQuCiAgICAgTlBPYmplY3Qq IGdldE9yQ3JlYXRlTlBPYmplY3QoSlNDOjpKU09iamVjdCopOwotCiAgICAgdm9pZCBucEpTT2Jq ZWN0RGVzdHJveWVkKE5QSlNPYmplY3QqKTsKIAogICAgIC8vIFJldHVybnMgYSBKU09iamVjdCBv YmplY3QgdGhhdCB3cmFwcyB0aGUgZ2l2ZW4gTlBPYmplY3QuCiAgICAgSlNDOjpKU09iamVjdCog Z2V0T3JDcmVhdGVKU09iamVjdChKU0M6OkpTR2xvYmFsT2JqZWN0KiwgTlBPYmplY3QqKTsKLQog ICAgIHZvaWQganNOUE9iamVjdERlc3Ryb3llZChKU05QT2JqZWN0Kik7CiAKICAgICB2b2lkIGNv bnZlcnRKU1ZhbHVlVG9OUFZhcmlhbnQoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTVmFsdWUsIE5Q VmFyaWFudCYpOwogICAgIEpTQzo6SlNWYWx1ZSBjb252ZXJ0TlBWYXJpYW50VG9KU1ZhbHVlKEpT Qzo6RXhlY1N0YXRlKiwgSlNDOjpKU0dsb2JhbE9iamVjdCosIGNvbnN0IE5QVmFyaWFudCYpOwog CisgICAgYm9vbCBldmFsdWF0ZShOUE9iamVjdCosIGNvbnN0IFdlYkNvcmU6OlN0cmluZyAmc2Ny aXB0U3RyaW5nLCBOUFZhcmlhbnQqIHJlc3VsdCk7CisKICAgICAvLyBDYWxsZWQgd2hlbiB0aGUg cGx1Zy1pbiBpcyBkZXN0cm95ZWQuIFdpbGwgaW52YWxpZGF0ZSBhbGwgdGhlIE5QT2JqZWN0cy4K ICAgICB2b2lkIGludmFsaWRhdGUoKTsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNz L1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVCcm93c2VyRnVuY3MuY3BwIGIvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVCcm93c2VyRnVuY3MuY3BwCmluZGV4IDc0 MDQyMjZmMzBmYTAyMzg5ODEwNDdkZTkyNmU1YjJiMTcxN2Q4MTguLjczMTkzMzhmMWYzMDYzZDA0 OGFkNjA1Y2RmOGM2YzY5ZTVkMzQzNWMgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9Q bHVnaW5zL05ldHNjYXBlL05ldHNjYXBlQnJvd3NlckZ1bmNzLmNwcAorKysgYi9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZUJyb3dzZXJGdW5jcy5jcHAKQEAgLTU1 MCw3ICs1NTAsNyBAQCBzdGF0aWMgdm9pZCBOUE5fUmVsZWFzZU9iamVjdChOUE9iamVjdCAqbnBP YmplY3QpCiAgICAgcmVsZWFzZU5QT2JqZWN0KG5wT2JqZWN0KTsKIH0KIAotc3RhdGljIGJvb2wg TlBOX0ludm9rZShOUFAsIE5QT2JqZWN0ICpucE9iamVjdCwgTlBJZGVudGlmaWVyIG1ldGhvZE5h bWUsIGNvbnN0IE5QVmFyaWFudCAqYXJndW1lbnRzLCB1aW50MzJfdCBhcmd1bWVudENvdW50LCBO UFZhcmlhbnQgKnJlc3VsdCkKK3N0YXRpYyBib29sIE5QTl9JbnZva2UoTlBQLCBOUE9iamVjdCAq bnBPYmplY3QsIE5QSWRlbnRpZmllciBtZXRob2ROYW1lLCBjb25zdCBOUFZhcmlhbnQqIGFyZ3Vt ZW50cywgdWludDMyX3QgYXJndW1lbnRDb3VudCwgTlBWYXJpYW50KiByZXN1bHQpCiB7CiAgICAg aWYgKG5wT2JqZWN0LT5fY2xhc3MtPmludm9rZSkKICAgICAgICAgcmV0dXJuIG5wT2JqZWN0LT5f Y2xhc3MtPmludm9rZShucE9iamVjdCwgbWV0aG9kTmFtZSwgYXJndW1lbnRzLCBhcmd1bWVudENv dW50LCByZXN1bHQpOwpAQCAtNTU4LDcgKzU1OCw3IEBAIHN0YXRpYyBib29sIE5QTl9JbnZva2Uo TlBQLCBOUE9iamVjdCAqbnBPYmplY3QsIE5QSWRlbnRpZmllciBtZXRob2ROYW1lLCBjb25zdCBO CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1zdGF0aWMgYm9vbCBOUE5fSW52b2tlRGVmYXVsdChO UFAsIE5QT2JqZWN0ICpucE9iamVjdCwgY29uc3QgTlBWYXJpYW50ICphcmd1bWVudHMsIHVpbnQz Ml90IGFyZ3VtZW50Q291bnQsIE5QVmFyaWFudCAqcmVzdWx0KQorc3RhdGljIGJvb2wgTlBOX0lu dm9rZURlZmF1bHQoTlBQLCBOUE9iamVjdCAqbnBPYmplY3QsIGNvbnN0IE5QVmFyaWFudCogYXJn dW1lbnRzLCB1aW50MzJfdCBhcmd1bWVudENvdW50LCBOUFZhcmlhbnQqIHJlc3VsdCkKIHsKICAg ICBpZiAobnBPYmplY3QtPl9jbGFzcy0+aW52b2tlRGVmYXVsdCkKICAgICAgICAgcmV0dXJuIG5w T2JqZWN0LT5fY2xhc3MtPmludm9rZURlZmF1bHQobnBPYmplY3QsIGFyZ3VtZW50cywgYXJndW1l bnRDb3VudCwgcmVzdWx0KTsKQEAgLTU2NiwxMCArNTY2LDEyIEBAIHN0YXRpYyBib29sIE5QTl9J bnZva2VEZWZhdWx0KE5QUCwgTlBPYmplY3QgKm5wT2JqZWN0LCBjb25zdCBOUFZhcmlhbnQgKmFy Z3VtZW50CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1zdGF0aWMgYm9vbCBOUE5fRXZhbHVhdGUo TlBQIG5wcCwgTlBPYmplY3QgKm5wb2JqLCBOUFN0cmluZyAqc2NyaXB0LCBOUFZhcmlhbnQgKnJl c3VsdCkKK3N0YXRpYyBib29sIE5QTl9FdmFsdWF0ZShOUFAgbnBwLCBOUE9iamVjdCAqbnBPYmpl Y3QsIE5QU3RyaW5nICpzY3JpcHQsIE5QVmFyaWFudCogcmVzdWx0KQogewotICAgIG5vdEltcGxl bWVudGVkKCk7Ci0gICAgcmV0dXJuIGZhbHNlOworICAgIFJlZlB0cjxOZXRzY2FwZVBsdWdpbj4g cGx1Z2luID0gTmV0c2NhcGVQbHVnaW46OmZyb21OUFAobnBwKTsKKyAgICBTdHJpbmcgc2NyaXB0 U3RyaW5nID0gU3RyaW5nOjpmcm9tVVRGOFdpdGhMYXRpbjFGYWxsYmFjayhzY3JpcHQtPlVURjhD aGFyYWN0ZXJzLCBzY3JpcHQtPlVURjhMZW5ndGgpOworICAgIAorICAgIHJldHVybiBwbHVnaW4t PmV2YWx1YXRlKG5wT2JqZWN0LCBzY3JpcHRTdHJpbmcsIHJlc3VsdCk7CiB9CiAKIHN0YXRpYyBi b29sIE5QTl9HZXRQcm9wZXJ0eShOUFAsIE5QT2JqZWN0KiBucE9iamVjdCwgTlBJZGVudGlmaWVy IHByb3BlcnR5TmFtZSwgTlBWYXJpYW50KiByZXN1bHQpCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAgYi9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAKaW5kZXggZWViOWVh N2Q1ZDhmM2YzYmY0OTFjNjFhNThhOTAxZWY4YjVlNmFkNi4uZTIwOWNlMjAzMDUzMmU2YWE4ZmNm ZWM3N2M0NDkyNDkzMjZlODBiMyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9Q bHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmNwcApAQCAtMTQ4LDYgKzE0OCwxMSBAQCB2 b2lkIE5ldHNjYXBlUGx1Z2luOjpzZXRTdGF0dXNiYXJUZXh0KGNvbnN0IFN0cmluZyYgc3RhdHVz YmFyVGV4dCkKICAgICBtX3BsdWdpbkNvbnRyb2xsZXItPnNldFN0YXR1c2JhclRleHQoc3RhdHVz YmFyVGV4dCk7CiB9CiAKK2Jvb2wgTmV0c2NhcGVQbHVnaW46OmV2YWx1YXRlKE5QT2JqZWN0KiBu cE9iamVjdCwgY29uc3QgU3RyaW5nJiBzY3JpcHRTdHJpbmcsIE5QVmFyaWFudCogcmVzdWx0KQor eworICAgIHJldHVybiBtX3BsdWdpbkNvbnRyb2xsZXItPmV2YWx1YXRlKG5wT2JqZWN0LCBzY3Jp cHRTdHJpbmcsIHJlc3VsdCwgYWxsb3dQb3B1cHMoKSk7Cit9CisKIE5QT2JqZWN0KiBOZXRzY2Fw ZVBsdWdpbjo6d2luZG93U2NyaXB0TlBPYmplY3QoKQogewogICAgIHJldHVybiBtX3BsdWdpbkNv bnRyb2xsZXItPndpbmRvd1NjcmlwdE5QT2JqZWN0KCk7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oIGIvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaAppbmRleCBmMGI5ODdlMmJl YTczZDI1NmVhZDA2M2QzMmExYzQzZGEzOTkzMDEwLi4zMzc2NDAwMWY1MTQ0ZGVjNzBhOTQ3MjI4 N2YwOWM2NzkzODM0MGRjIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9O ZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmgKQEAgLTYwLDYgKzYwLDcgQEAgcHVibGljOgogICAg ICAgICAgICAgICAgICBjb25zdCBWZWN0b3I8Y2hhcj4mIGh0dHBCb2R5LCBib29sIHNlbmROb3Rp ZmljYXRpb24sIHZvaWQqIG5vdGlmaWNhdGlvbkRhdGEpOwogICAgIE5QRXJyb3IgZGVzdHJveVN0 cmVhbShOUFN0cmVhbSosIE5QUmVhc29uKTsKICAgICB2b2lkIHNldFN0YXR1c2JhclRleHQoY29u c3QgV2ViQ29yZTo6U3RyaW5nJik7CisgICAgYm9vbCBldmFsdWF0ZShOUE9iamVjdCosIGNvbnN0 IFdlYkNvcmU6OlN0cmluZyAmc2NyaXB0U3RyaW5nLCBOUFZhcmlhbnQqIHJlc3VsdCk7CiAKICAg ICAvLyBUaGVzZSByZXR1cm4gcmV0YWluZWQgb2JqZWN0cy4KICAgICBOUE9iamVjdCogd2luZG93 U2NyaXB0TlBPYmplY3QoKTsKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L1BsdWdpbkNvbnRyb2xsZXIuaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkNv bnRyb2xsZXIuaAppbmRleCAxZDhlYjM4OWJiYmEyZGRjZmE0NDUxOWRlNzg1ZDJkMzAxNDYyOGNh Li45NWFlYTYwMzIzZGY2ZTQyMzU3MzdkYzhhYTNiMTEzODEyYjVmN2JjIDEwMDY0NAotLS0gYS9X ZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Db250cm9sbGVyLmgKKysrIGIvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luQ29udHJvbGxlci5oCkBAIC0yNyw2ICsyNyw3IEBA CiAjZGVmaW5lIFBsdWdpbkNvbnRyb2xsZXJfaAogCiBzdHJ1Y3QgTlBPYmplY3Q7Cit0eXBlZGVm IHN0cnVjdCBfTlBWYXJpYW50IE5QVmFyaWFudDsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogICAg IGNsYXNzIEhUVFBIZWFkZXJNYXA7CkBAIC02NCw2ICs2NSw5IEBAIHB1YmxpYzoKICAgICAvLyBH ZXQgdGhlIE5QT2JqZWN0IHRoYXQgY29ycmVzcG9uZHMgdG8gdGhlIHBsdWctaW4ncyBlbGVtZW50 LiBSZXR1cm5zIGEgcmV0YWluZWQgb2JqZWN0LgogICAgIHZpcnR1YWwgTlBPYmplY3QqIHBsdWdp bkVsZW1lbnROUE9iamVjdCgpID0gMDsKIAorICAgIC8vIEV2YWx1YXRlcyB0aGUgZ2l2ZW4gc2Ny aXB0IHN0cmluZyBpbiB0aGUgY29udGV4dCBvZiB0aGUgZ2l2ZW4gTlBPYmplY3QuCisgICAgdmly dHVhbCBib29sIGV2YWx1YXRlKE5QT2JqZWN0KiwgY29uc3QgV2ViQ29yZTo6U3RyaW5nICZzY3Jp cHRTdHJpbmcsIE5QVmFyaWFudCogcmVzdWx0LCBib29sIGFsbG93UG9wdXBzKSA9IDA7CisKICAg ICAvLyBTZXQgdGhlIHN0YXR1c2JhciB0ZXh0LgogICAgIHZpcnR1YWwgdm9pZCBzZXRTdGF0dXNi YXJUZXh0KGNvbnN0IFdlYkNvcmU6OlN0cmluZyYpID0gMDsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9QbHVnaW5WaWV3LmNwcAppbmRleCBhOWYyOGVjYTc3YTU5Nzk0OWIyMGU4N2E0YTBi NTM1MThkNzYyYjhkLi40ZGE3Yjg2ZWU4OTZkMWU2MDZiMzEzOWU1ZmViZTZhYWNjMTUxZDZjIDEw MDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcAorKysg Yi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcApAQCAtNjM2LDYgKzYz NiwyMiBAQCBOUE9iamVjdCogUGx1Z2luVmlldzo6cGx1Z2luRWxlbWVudE5QT2JqZWN0KCkKICAg ICByZXR1cm4gbV9ucFJ1bnRpbWVPYmplY3RNYXAuZ2V0T3JDcmVhdGVOUE9iamVjdChvYmplY3Qp OwogfQogCitib29sIFBsdWdpblZpZXc6OmV2YWx1YXRlKE5QT2JqZWN0KiBucE9iamVjdCwgY29u c3QgU3RyaW5nICZzY3JpcHRTdHJpbmcsIE5QVmFyaWFudCogcmVzdWx0LCBib29sIGFsbG93UG9w dXBzKQoreworICAgIGlmICghZnJhbWUoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAg Ym9vbCBvbGRBbGxvd1BvcHVwcyA9IGZyYW1lKCktPnNjcmlwdCgpLT5hbGxvd1BvcHVwc0Zyb21Q bHVnaW4oKTsKKyAgICBmcmFtZSgpLT5zY3JpcHQoKS0+c2V0QWxsb3dQb3B1cHNGcm9tUGx1Z2lu KGFsbG93UG9wdXBzKTsKKworICAgIC8vIEZJWE1FOiBXaGF0IGhhcHBlbnMgaWYgY2FsbGluZyBl dmFsdWF0ZSB3aWxsIGNhdXNlIHRoZSBwbHVnLWluIHZpZXcgdG8gZ28gYXdheS4KKyAgICBib29s IHJldHVyblZhbHVlID0gbV9ucFJ1bnRpbWVPYmplY3RNYXAuZXZhbHVhdGUobnBPYmplY3QsIHNj cmlwdFN0cmluZywgcmVzdWx0KTsKKworICAgIGZyYW1lKCktPnNjcmlwdCgpLT5zZXRBbGxvd1Bv cHVwc0Zyb21QbHVnaW4ob2xkQWxsb3dQb3B1cHMpOworCisgICAgcmV0dXJuIHJldHVyblZhbHVl OworfQorCiB2b2lkIFBsdWdpblZpZXc6OnNldFN0YXR1c2JhclRleHQoY29uc3QgU3RyaW5nJiBz dGF0dXNiYXJUZXh0KQogewogICAgIGlmICghZnJhbWUoKSkKZGlmZiAtLWdpdCBhL1dlYktpdDIv V2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVn aW5zL1BsdWdpblZpZXcuaAppbmRleCBiZWU4NTUzZGJjMDQ5MWYxMmQ0YTUzMDJlYzI5ZWI2MGE2 ZjllMWNmLi41MGMxZGQxYjE1NGU4ODQzMWM0MGJhOGI5NDY5YzkyZTIxYjMwZjE5IDEwMDY0NAot LS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmgKKysrIGIvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5oCkBAIC0xMDMsNiArMTAzLDcgQEAgcHJp dmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgY2FuY2VsU3RyZWFtTG9hZCh1aW50NjRfdCBzdHJlYW1J RCk7CiAgICAgdmlydHVhbCBOUE9iamVjdCogd2luZG93U2NyaXB0TlBPYmplY3QoKTsKICAgICB2 aXJ0dWFsIE5QT2JqZWN0KiBwbHVnaW5FbGVtZW50TlBPYmplY3QoKTsKKyAgICB2aXJ0dWFsIGJv b2wgZXZhbHVhdGUoTlBPYmplY3QqLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcgJnNjcmlwdFN0cmlu ZywgTlBWYXJpYW50KiByZXN1bHQsIGJvb2wgYWxsb3dQb3B1cHMpOwogICAgIHZpcnR1YWwgdm9p ZCBzZXRTdGF0dXNiYXJUZXh0KGNvbnN0IFdlYkNvcmU6OlN0cmluZyYpOwogCiAgICAgLy8gV2Vi RnJhbWU6OkxvYWRMaXN0ZW5lcgo=