43160 2010-07-28 17:00:30 -0700 Implement NPN_InvokeDefault and NPN_Construct 2010-07-28 17:14:24 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 257451 0 andersca 2010-07-28 17:00:30 -0700 Implement NPN_InvokeDefault and NPN_Construct 257454 1 62894 andersca 2010-07-28 17:04:22 -0700 Created attachment 62894 Patch 257455 2 webkit.review.bot 2010-07-28 17:06:35 -0700 Attachment 62894 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:551: NPN_InvokeDefault is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:635: NPN_Construct is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit2/WebProcess/Plugins/NPJSObject.cpp:270: NPJSObject::NP_InvokeDefault is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit2/WebProcess/Plugins/NPJSObject.cpp:291: NPJSObject::NP_Construct is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit2/WebProcess/Plugins/NPJSObject.h:80: NP_Construct is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 5 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 257457 3 62894 sam 2010-07-28 17:12:17 -0700 Comment on attachment 62894 Patch More * issues :(. Otherwise, r=me. 257459 4 andersca 2010-07-28 17:14:24 -0700 Committed r64246: <http://trac.webkit.org/changeset/64246> 62894 2010-07-28 17:04:22 -0700 2010-07-28 17:12:17 -0700 Patch bug-43160-20100728170420.patch text/plain 11667 andersca ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1N2Y1Y2ExNWIyN2MyYTFkMjRkYWJjOWNlYjFhMDYzZGEwM2M5N2JjLi5lMmE2NjU5 MDVkZTlkNDE4NzQ4ZWEyZjc3ZThkZDk1NmY4MGU3NTQwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTAtMDctMjggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgTlBO X0ludm9rZURlZmF1bHQgYW5kIE5QTl9Db25zdHJ1Y3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQzMTYwCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMt d2syL1NraXBwZWQ6CisgICAgICAgIFJlbW92ZSBwbHVnaW5zL25wcnVudGltZS9pbnZva2UtZGVm YXVsdC5odG1sCisKIDIwMTAtMDctMjggIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBPamFuIFZhZmFpLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjLXdrMi9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdr Mi9Ta2lwcGVkCmluZGV4IDU5M2Q4ZGQ0MTEzMzhmYzlhZjA5Yzc1YzdiYzQ3ZTliMmU0ZjE3NGIu Ljg3YTA5NTcyYjVjZGVlMjBhMDI2ODg2ZTc0MjQ5NDJmMTI0NzlhODUgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9tYWMtd2syL1NraXBwZWQKQEAgLTE0MTQsNyArMTQxNCw2IEBAIHBsdWdpbnMvbmV0c2Nh cGUtcGx1Z2luLXNldHdpbmRvdy1zaXplLmh0bWwKIHBsdWdpbnMvbnBydW50aW1lL2JpbmRpbmdz LXRlc3QuaHRtbAogcGx1Z2lucy9ucHJ1bnRpbWUvZW51bWVyYXRlLmh0bWwKIHBsdWdpbnMvbnBy dW50aW1lL2dldC1wcm9wZXJ0eS1yZXR1cm4tdmFsdWUuaHRtbAotcGx1Z2lucy9ucHJ1bnRpbWUv aW52b2tlLWRlZmF1bHQuaHRtbAogcGx1Z2lucy9ucHJ1bnRpbWUvbnBydW50aW1lLmh0bWwKIHBs dWdpbnMvbnBydW50aW1lL3JvdW5kLXRyaXAtbnBvYmplY3QuaHRtbAogcGx1Z2lucy9vdmVycmlk ZS1ub2RlLW1ldGhvZC5odG1sCmRpZmYgLS1naXQgYS9XZWJLaXQyL0NoYW5nZUxvZyBiL1dlYktp dDIvQ2hhbmdlTG9nCmluZGV4IDdlZjE5ZWJmNDYyNTFhM2QyOThjOGFhMGM3YTc2MDliOGZhNDJi NGIuLmM5NTA0NTZiZjRhZWVlZTYxNmU5MjVlZDNmZTlhNGE1ODgxODZjZDcgMTAwNjQ0Ci0tLSBh L1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDUg QEAKIDIwMTAtMDctMjggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnQg TlBOX0ludm9rZURlZmF1bHQgYW5kIE5QTl9Db25zdHJ1Y3QKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQzMTYwCisKKyAgICAgICAgKiBXZWJQcm9jZXNz L1BsdWdpbnMvTlBKU09iamVjdC5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5QSlNPYmplY3Q6Omlu dm9rZSk6CisgICAgICAgIEp1c3QgY2FsbCBpbnZva2UgZGlyZWN0bHkuCisKKyAgICAgICAgKFdl YktpdDo6TlBKU09iamVjdDo6aW52b2tlRGVmYXVsdCk6CisgICAgICAgIENhbGwgaW52b2tlLgor CisgICAgICAgIChXZWJLaXQ6Ok5QSlNPYmplY3Q6OmNvbnN0cnVjdCk6CisgICAgICAgIEltcGxl bWVudCB0aGlzLgorCisgICAgICAgIChXZWJLaXQ6Ok5QSlNPYmplY3Q6Omludm9rZSk6CisgICAg ICAgIEFkZCBuZXcgaW52b2tlIG92ZXJsb2FkIHRoYXQgdGFrZXMgdGhlIGZ1bmN0aW9uIGFzIGEg SlNWYWx1ZS4KKworICAgICAgICAoV2ViS2l0OjpOUEpTT2JqZWN0OjpucENsYXNzKToKKyAgICAg ICAgQWRkIE5QX0NvbnN0cnVjdC4KKworICAgICAgICAoV2ViS2l0OjpOUEpTT2JqZWN0OjpOUF9J bnZva2VEZWZhdWx0KToKKyAgICAgICAgQ2FsbCBOUEpTT2JqZWN0OjppbnZva2VEZWZhdWx0Lgor CisgICAgICAgIChXZWJLaXQ6Ok5QSlNPYmplY3Q6Ok5QX0NvbnN0cnVjdCk6CisgICAgICAgIENh bGwgTlBKU09iamVjdDo6Y29uc3RydWN0LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5z L05QSlNPYmplY3QuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0 c2NhcGVCcm93c2VyRnVuY3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpOUE5fR2V0VmFsdWUpOgor ICAgICAgICBIYW5kbGUgdGhlIENvcmUgQW5pbWF0aW9uIGRyYXdpbmcgbW9kZWwgYW5kIHRoZSBD YXJib24gZXZlbnQgbW9kZWwuCisKKyAgICAgICAgKFdlYktpdDo6TlBOX0ludm9rZURlZmF1bHQp OgorICAgICAgICBDYWxsIHRoZSBOUENsYXNzOjppbnZva2VEZWZhdWx0IGZ1bmN0aW9uLgorCisg ICAgICAgIChXZWJLaXQ6Ok5QTl9Db25zdHJ1Y3QpOgorICAgICAgICBDYWxsIHRoZSBOUENsYXNz Ojpjb25zdHJ1Y3QgZnVuY3Rpb24uCisKKzIwMTAtMDctMjggIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgogCiAg ICAgICAgIEltcGxlbWVudCBOUE5fSW52b2tlCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9OUEpTT2JqZWN0LmNwcCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05Q SlNPYmplY3QuY3BwCmluZGV4IDBlZTk1YzI0MDdmMzYwMjIyY2RiODVkMTVkMTI3NTM3ZjBhZGUw MjEuLmMyMzJkYzViNWQxMTU4NzEwMTI5NDUxYTg3NmZlOGY0NmY5NzIxMmYgMTAwNjQ0Ci0tLSBh L1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QSlNPYmplY3QuY3BwCisrKyBiL1dlYktpdDIv V2ViUHJvY2Vzcy9QbHVnaW5zL05QSlNPYmplY3QuY3BwCkBAIC0xMTYsMjUgKzExNiwxOSBAQCBi b29sIE5QSlNPYmplY3Q6Omludm9rZShOUElkZW50aWZpZXIgbWV0aG9kTmFtZSwgY29uc3QgTlBW YXJpYW50KiBhcmd1bWVudHMsIHVpbgogICAgIEpTTG9jayBsb2NrKFNpbGVuY2VBc3NlcnRpb25z T25seSk7CiAKICAgICBKU1ZhbHVlIGZ1bmN0aW9uID0gbV9qc09iamVjdC0+Z2V0KGV4ZWMsIGlk ZW50aWZpZXJGcm9tSWRlbnRpZmllclJlcChleGVjLCBpZGVudGlmaWVyUmVwKSk7Ci0gICAgQ2Fs bERhdGEgY2FsbERhdGE7Ci0gICAgQ2FsbFR5cGUgY2FsbFR5cGUgPSBnZXRDYWxsRGF0YShmdW5j dGlvbiwgY2FsbERhdGEpOwotICAgIGlmIChjYWxsVHlwZSA9PSBDYWxsVHlwZU5vbmUpCi0gICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gaW52b2tlKGV4ZWMsIGZ1bmN0aW9uLCBhcmd1 bWVudHMsIGFyZ3VtZW50Q291bnQsIHJlc3VsdCk7Cit9CiAKLSAgICAvLyBDb252ZXJ0IHRoZSBw YXNzZWQgaW4gYXJndW1lbnRzLgotICAgIE1hcmtlZEFyZ3VtZW50QnVmZmVyIGFyZ3VtZW50TGlz dDsKLSAgICBmb3IgKHVpbnQzMl90IGkgPSAwOyBpIDwgYXJndW1lbnRDb3VudDsgKytpKQotICAg ICAgICBhcmd1bWVudExpc3QuYXBwZW5kKG1fb2JqZWN0TWFwLT5jb252ZXJ0TlBWYXJpYW50VG9K U1ZhbHVlKGV4ZWMsIGFyZ3VtZW50c1tpXSkpOworYm9vbCBOUEpTT2JqZWN0OjppbnZva2VEZWZh dWx0KGNvbnN0IE5QVmFyaWFudCAqYXJndW1lbnRzLCB1aW50MzJfdCBhcmd1bWVudENvdW50LCBO UFZhcmlhbnQgKnJlc3VsdCkKK3sKKyAgICBFeGVjU3RhdGUqIGV4ZWMgPSBtX29iamVjdE1hcC0+ Z2xvYmFsRXhlYygpOworICAgIGlmICghZXhlYykKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0g ICAgZXhlYy0+Z2xvYmFsRGF0YSgpLnRpbWVvdXRDaGVja2VyLnN0YXJ0KCk7Ci0gICAgSlNWYWx1 ZSB2YWx1ZSA9IEpTQzo6Y2FsbChleGVjLCBmdW5jdGlvbiwgY2FsbFR5cGUsIGNhbGxEYXRhLCBt X2pzT2JqZWN0LCBhcmd1bWVudExpc3QpOwotICAgIGV4ZWMtPmdsb2JhbERhdGEoKS50aW1lb3V0 Q2hlY2tlci5zdG9wKCk7CisgICAgSlNMb2NrIGxvY2soU2lsZW5jZUFzc2VydGlvbnNPbmx5KTsK IAotICAgIC8vIENvbnZlcnQgYW5kIHJldHVybiB0aGUgcmVzdWx0IG9mIHRoZSBmdW5jdGlvbiBj YWxsLgotICAgIG1fb2JqZWN0TWFwLT5jb252ZXJ0SlNWYWx1ZVRvTlBWYXJpYW50KGV4ZWMsIHZh bHVlLCAqcmVzdWx0KTsKLSAgICBleGVjLT5jbGVhckV4Y2VwdGlvbigpOwotICAgIAotICAgIHJl dHVybiB0cnVlOworICAgIEpTVmFsdWUgZnVuY3Rpb24gPSBtX2pzT2JqZWN0OworICAgIHJldHVy biBpbnZva2UoZXhlYywgZnVuY3Rpb24sIGFyZ3VtZW50cywgYXJndW1lbnRDb3VudCwgcmVzdWx0 KTsKIH0KIAogYm9vbCBOUEpTT2JqZWN0OjpoYXNQcm9wZXJ0eShOUElkZW50aWZpZXIgaWRlbnRp ZmllcikKQEAgLTE3Nyw2ICsxNzEsNTggQEAgYm9vbCBOUEpTT2JqZWN0OjpnZXRQcm9wZXJ0eShO UElkZW50aWZpZXIgcHJvcGVydHlOYW1lLCBOUFZhcmlhbnQqIHJlc3VsdCkKICAgICByZXR1cm4g dHJ1ZTsKIH0KIAorYm9vbCBOUEpTT2JqZWN0Ojpjb25zdHJ1Y3QoY29uc3QgTlBWYXJpYW50ICph cmd1bWVudHMsIHVpbnQzMl90IGFyZ3VtZW50Q291bnQsIE5QVmFyaWFudCAqcmVzdWx0KQorewor ICAgIEV4ZWNTdGF0ZSogZXhlYyA9IG1fb2JqZWN0TWFwLT5nbG9iYWxFeGVjKCk7CisgICAgaWYg KCFleGVjKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBKU0xvY2sgbG9jayhTaWxlbmNl QXNzZXJ0aW9uc09ubHkpOworCisgICAgQ29uc3RydWN0RGF0YSBjb25zdHJ1Y3REYXRhOworICAg IENvbnN0cnVjdFR5cGUgY29uc3RydWN0VHlwZSA9IGdldENvbnN0cnVjdERhdGEobV9qc09iamVj dCwgY29uc3RydWN0RGF0YSk7CisgICAgaWYgKGNvbnN0cnVjdFR5cGUgPT0gQ29uc3RydWN0VHlw ZU5vbmUpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIC8vIENvbnZlcnQgdGhlIHBhc3Nl ZCBpbiBhcmd1bWVudHMuCisgICAgTWFya2VkQXJndW1lbnRCdWZmZXIgYXJndW1lbnRMaXN0Owor ICAgIGZvciAodWludDMyX3QgaSA9IDA7IGkgPCBhcmd1bWVudENvdW50OyArK2kpCisgICAgICAg IGFyZ3VtZW50TGlzdC5hcHBlbmQobV9vYmplY3RNYXAtPmNvbnZlcnROUFZhcmlhbnRUb0pTVmFs dWUoZXhlYywgYXJndW1lbnRzW2ldKSk7CisKKyAgICBleGVjLT5nbG9iYWxEYXRhKCkudGltZW91 dENoZWNrZXIuc3RhcnQoKTsKKyAgICBKU1ZhbHVlIHZhbHVlID0gSlNDOjpjb25zdHJ1Y3QoZXhl YywgbV9qc09iamVjdCwgY29uc3RydWN0VHlwZSwgY29uc3RydWN0RGF0YSwgYXJndW1lbnRMaXN0 KTsKKyAgICBleGVjLT5nbG9iYWxEYXRhKCkudGltZW91dENoZWNrZXIuc3RvcCgpOworICAgIAor ICAgIC8vIENvbnZlcnQgYW5kIHJldHVybiB0aGUgbmV3IG9iamVjdC4KKyAgICBtX29iamVjdE1h cC0+Y29udmVydEpTVmFsdWVUb05QVmFyaWFudChleGVjLCB2YWx1ZSwgKnJlc3VsdCk7CisgICAg ZXhlYy0+Y2xlYXJFeGNlcHRpb24oKTsKKworICAgIHJldHVybiB0cnVlOworfQorCitib29sIE5Q SlNPYmplY3Q6Omludm9rZShFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgZnVuY3Rpb24sIGNvbnN0 IE5QVmFyaWFudCAqYXJndW1lbnRzLCB1aW50MzJfdCBhcmd1bWVudENvdW50LCBOUFZhcmlhbnQg KnJlc3VsdCkKK3sKKyAgICBDYWxsRGF0YSBjYWxsRGF0YTsKKyAgICBDYWxsVHlwZSBjYWxsVHlw ZSA9IGdldENhbGxEYXRhKGZ1bmN0aW9uLCBjYWxsRGF0YSk7CisgICAgaWYgKGNhbGxUeXBlID09 IENhbGxUeXBlTm9uZSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgLy8gQ29udmVydCB0 aGUgcGFzc2VkIGluIGFyZ3VtZW50cy4KKyAgICBNYXJrZWRBcmd1bWVudEJ1ZmZlciBhcmd1bWVu dExpc3Q7CisgICAgZm9yICh1aW50MzJfdCBpID0gMDsgaSA8IGFyZ3VtZW50Q291bnQ7ICsraSkK KyAgICAgICAgYXJndW1lbnRMaXN0LmFwcGVuZChtX29iamVjdE1hcC0+Y29udmVydE5QVmFyaWFu dFRvSlNWYWx1ZShleGVjLCBhcmd1bWVudHNbaV0pKTsKKworICAgIGV4ZWMtPmdsb2JhbERhdGEo KS50aW1lb3V0Q2hlY2tlci5zdGFydCgpOworICAgIEpTVmFsdWUgdmFsdWUgPSBKU0M6OmNhbGwo ZXhlYywgZnVuY3Rpb24sIGNhbGxUeXBlLCBjYWxsRGF0YSwgbV9qc09iamVjdCwgYXJndW1lbnRM aXN0KTsKKyAgICBleGVjLT5nbG9iYWxEYXRhKCkudGltZW91dENoZWNrZXIuc3RvcCgpOworCisg ICAgLy8gQ29udmVydCBhbmQgcmV0dXJuIHRoZSByZXN1bHQgb2YgdGhlIGZ1bmN0aW9uIGNhbGwu CisgICAgbV9vYmplY3RNYXAtPmNvbnZlcnRKU1ZhbHVlVG9OUFZhcmlhbnQoZXhlYywgdmFsdWUs ICpyZXN1bHQpOworICAgIGV4ZWMtPmNsZWFyRXhjZXB0aW9uKCk7CisgICAgCisgICAgcmV0dXJu IHRydWU7Cit9CisKIE5QQ2xhc3MqIE5QSlNPYmplY3Q6Om5wQ2xhc3MoKQogewogICAgIHN0YXRp YyBOUENsYXNzIG5wQ2xhc3MgPSB7CkBAIC0xOTIsNyArMjM4LDcgQEAgTlBDbGFzcyogTlBKU09i amVjdDo6bnBDbGFzcygpCiAgICAgICAgIE5QX1NldFByb3BlcnR5LAogICAgICAgICAwLAogICAg ICAgICAwLAotICAgICAgICAwCisgICAgICAgIE5QX0NvbnN0cnVjdAogICAgIH07CiAKICAgICBy ZXR1cm4gJm5wQ2xhc3M7CkBAIC0yMjEsMTAgKzI2Nyw5IEBAIGJvb2wgTlBKU09iamVjdDo6TlBf SW52b2tlKE5QT2JqZWN0KiBucE9iamVjdCwgTlBJZGVudGlmaWVyIG1ldGhvZE5hbWUsIGNvbnN0 IE5QCiAgICAgcmV0dXJuIHRvTlBKU09iamVjdChucE9iamVjdCktPmludm9rZShtZXRob2ROYW1l LCBhcmd1bWVudHMsIGFyZ3VtZW50Q291bnQsIHJlc3VsdCk7CiB9CiAgICAgCi1ib29sIE5QSlNP YmplY3Q6Ok5QX0ludm9rZURlZmF1bHQoTlBPYmplY3QqLCBjb25zdCBOUFZhcmlhbnQqIGFyZ3Vt ZW50cywgdWludDMyX3QgYXJndW1lbnRDb3VudCwgTlBWYXJpYW50KiByZXN1bHQpCitib29sIE5Q SlNPYmplY3Q6Ok5QX0ludm9rZURlZmF1bHQoTlBPYmplY3QqIG5wT2JqZWN0LCBjb25zdCBOUFZh cmlhbnQqIGFyZ3VtZW50cywgdWludDMyX3QgYXJndW1lbnRDb3VudCwgTlBWYXJpYW50KiByZXN1 bHQpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0 dXJuIHRvTlBKU09iamVjdChucE9iamVjdCktPmludm9rZURlZmF1bHQoYXJndW1lbnRzLCBhcmd1 bWVudENvdW50LCByZXN1bHQpOwogfQogICAgIAogYm9vbCBOUEpTT2JqZWN0OjpOUF9IYXNQcm9w ZXJ0eShOUE9iamVjdCogbnBPYmplY3QsIE5QSWRlbnRpZmllciBwcm9wZXJ0eU5hbWUpCkBAIC0y NDMsNCArMjg4LDkgQEAgYm9vbCBOUEpTT2JqZWN0OjpOUF9TZXRQcm9wZXJ0eShOUE9iamVjdCos IE5QSWRlbnRpZmllciBwcm9wZXJ0eU5hbWUsIGNvbnN0IE5QVmEKICAgICByZXR1cm4gZmFsc2U7 CiB9CiAKK2Jvb2wgTlBKU09iamVjdDo6TlBfQ29uc3RydWN0KE5QT2JqZWN0KiBucE9iamVjdCwg Y29uc3QgTlBWYXJpYW50ICphcmd1bWVudHMsIHVpbnQzMl90IGFyZ3VtZW50Q291bnQsIE5QVmFy aWFudCAqcmVzdWx0KQoreworICAgIHJldHVybiB0b05QSlNPYmplY3QobnBPYmplY3QpLT5jb25z dHJ1Y3QoYXJndW1lbnRzLCBhcmd1bWVudENvdW50LCByZXN1bHQpOworfQorICAgIAogfSAvLyBu YW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9O UEpTT2JqZWN0LmggYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OUEpTT2JqZWN0LmgKaW5k ZXggNTAyOTI0NzMzYzQ3MTdhNWEyMzY1YjVkNGZiZjk3ZTJmZTNmMjNjMy4uNmY3MzA3MDY1YTk5 NWYwOGRmMzkwODZkYTE5ZDUwNThlNmM2Y2EwMyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9j ZXNzL1BsdWdpbnMvTlBKU09iamVjdC5oCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L05QSlNPYmplY3QuaApAQCAtNjEsOCArNjEsMTIgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgaGFz TWV0aG9kKE5QSWRlbnRpZmllciBtZXRob2ROYW1lKTsKICAgICBib29sIGludm9rZShOUElkZW50 aWZpZXIgbWV0aG9kTmFtZSwgY29uc3QgTlBWYXJpYW50ICphcmd1bWVudHMsIHVpbnQzMl90IGFy Z3VtZW50Q291bnQsIE5QVmFyaWFudCAqcmVzdWx0KTsKKyAgICBib29sIGludm9rZURlZmF1bHQo Y29uc3QgTlBWYXJpYW50ICphcmd1bWVudHMsIHVpbnQzMl90IGFyZ3VtZW50Q291bnQsIE5QVmFy aWFudCAqcmVzdWx0KTsKICAgICBib29sIGhhc1Byb3BlcnR5KE5QSWRlbnRpZmllciBwcm9wZXJ0 eU5hbWUpOwogICAgIGJvb2wgZ2V0UHJvcGVydHkoTlBJZGVudGlmaWVyIHByb3BlcnR5TmFtZSwg TlBWYXJpYW50KiByZXN1bHQpOworICAgIGJvb2wgY29uc3RydWN0KGNvbnN0IE5QVmFyaWFudCAq YXJndW1lbnRzLCB1aW50MzJfdCBhcmd1bWVudENvdW50LCBOUFZhcmlhbnQgKnJlc3VsdCk7CisK KyAgICBib29sIGludm9rZShKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNWYWx1ZSBmdW5jdGlvbiwg Y29uc3QgTlBWYXJpYW50ICphcmd1bWVudHMsIHVpbnQzMl90IGFyZ3VtZW50Q291bnQsIE5QVmFy aWFudCAqcmVzdWx0KTsKIAogICAgIHN0YXRpYyBOUENsYXNzKiBucENsYXNzKCk7CiAgICAgc3Rh dGljIE5QT2JqZWN0KiBOUF9BbGxvY2F0ZShOUFAsIE5QQ2xhc3MqKTsKQEAgLTczLDYgKzc3LDcg QEAgcHJpdmF0ZToKICAgICBzdGF0aWMgYm9vbCBOUF9IYXNQcm9wZXJ0eShOUE9iamVjdCosIE5Q SWRlbnRpZmllciBwcm9wZXJ0eU5hbWUpOwogICAgIHN0YXRpYyBib29sIE5QX0dldFByb3BlcnR5 KE5QT2JqZWN0KiwgTlBJZGVudGlmaWVyIHByb3BlcnR5TmFtZSwgTlBWYXJpYW50KiByZXN1bHQp OwogICAgIHN0YXRpYyBib29sIE5QX1NldFByb3BlcnR5KE5QT2JqZWN0KiwgTlBJZGVudGlmaWVy IHByb3BlcnR5TmFtZSwgY29uc3QgTlBWYXJpYW50KiB2YWx1ZSk7CisgICAgc3RhdGljIGJvb2wg TlBfQ29uc3RydWN0KE5QT2JqZWN0KiwgY29uc3QgTlBWYXJpYW50ICphcmd1bWVudHMsIHVpbnQz Ml90IGFyZ3VtZW50Q291bnQsIE5QVmFyaWFudCAqcmVzdWx0KTsKICAgICAKICAgICBOUFJ1bnRp bWVPYmplY3RNYXAqIG1fb2JqZWN0TWFwOwogICAgIEpTQzo6UHJvdGVjdGVkUHRyPEpTQzo6SlNP YmplY3Q+IG1fanNPYmplY3Q7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lu cy9OZXRzY2FwZS9OZXRzY2FwZUJyb3dzZXJGdW5jcy5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZUJyb3dzZXJGdW5jcy5jcHAKaW5kZXggNTAxZDRmZDYw N2I2MmFkNDE3NzM0NThmZTc0ZTQ4M2I5MjlkNTU0Ny4uM2EzOTZlYzc1YzBlNGVhNjA5ZDdjOTll ZTFjZmNhN2MwNjIzZDU4NyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv TmV0c2NhcGUvTmV0c2NhcGVCcm93c2VyRnVuY3MuY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vz cy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlQnJvd3NlckZ1bmNzLmNwcApAQCAtNDA3LDEyICs0 MDcsMjIgQEAgc3RhdGljIE5QRXJyb3IgTlBOX0dldFZhbHVlKE5QUCBucHAsIE5QTlZhcmlhYmxl IHZhcmlhYmxlLCB2b2lkICp2YWx1ZSkKICNpZiBQTEFURk9STShNQUMpCiAgICAgICAgIGNhc2Ug TlBOVnN1cHBvcnRzQ29yZUdyYXBoaWNzQm9vbDoKICAgICAgICAgICAgIC8vIEFsd2F5cyBjbGFp bSB0byBzdXBwb3J0IHRoZSBDb3JlIEdyYXBoaWNzIGRyYXdpbmcgbW9kZWwuCi0gICAgICAgICAg ICAqKE5QQm9vbCAqKXZhbHVlID0gdHJ1ZTsKKyAgICAgICAgICAgICooTlBCb29sKil2YWx1ZSA9 IHRydWU7CisgICAgICAgICAgICBicmVhazsKKworICAgICAgICBjYXNlIE5QTlZzdXBwb3J0c0Nv cmVBbmltYXRpb25Cb29sOgorICAgICAgICAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBzdXBwb3J0 IHRoZSBDb3JlIEFuaW1hdGlvbiBkcmF3aW5nIG1vZGVsLgorICAgICAgICAgICAgKihOUEJvb2wq KXZhbHVlID0gZmFsc2U7CiAgICAgICAgICAgICBicmVhazsKIAogICAgICAgICBjYXNlIE5QTlZz dXBwb3J0c0NvY29hQm9vbDoKICAgICAgICAgICAgIC8vIEFsd2F5cyBjbGFpbSB0byBzdXBwb3J0 IHRoZSBDb2NvYSBldmVudCBtb2RlbC4KLSAgICAgICAgICAgICooTlBCb29sICopdmFsdWUgPSB0 cnVlOworICAgICAgICAgICAgKihOUEJvb2wqKXZhbHVlID0gdHJ1ZTsKKyAgICAgICAgICAgIGJy ZWFrOworCisgICAgICAgY2FzZSBOUE5Wc3VwcG9ydHNDYXJib25Cb29sOgorICAgICAgICAgICAg Ly8gRklYTUU6IFdlIHNob3VsZCBzdXBwb3J0IHRoZSBDYXJib24gZXZlbnQgbW9kZWwuCisgICAg ICAgICAgICAqKE5QQm9vbCopdmFsdWUgPSBmYWxzZTsKICAgICAgICAgICAgIGJyZWFrOwogI2Vu ZGlmCiAgICAgICAgIGRlZmF1bHQ6CkBAIC01MzgsOSArNTQ4LDExIEBAIHN0YXRpYyBib29sIE5Q Tl9JbnZva2UoTlBQLCBOUE9iamVjdCAqbnBPYmplY3QsIE5QSWRlbnRpZmllciBtZXRob2ROYW1l LCBjb25zdCBOCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1zdGF0aWMgYm9vbCBOUE5fSW52b2tl RGVmYXVsdChOUFAgbnBwLCBOUE9iamVjdCAqbnBvYmosIGNvbnN0IE5QVmFyaWFudCAqYXJncywg dWludDMyX3QgYXJnQ291bnQsIE5QVmFyaWFudCAqcmVzdWx0KQorc3RhdGljIGJvb2wgTlBOX0lu dm9rZURlZmF1bHQoTlBQLCBOUE9iamVjdCAqbnBPYmplY3QsIGNvbnN0IE5QVmFyaWFudCAqYXJn dW1lbnRzLCB1aW50MzJfdCBhcmd1bWVudENvdW50LCBOUFZhcmlhbnQgKnJlc3VsdCkKIHsKLSAg ICBub3RJbXBsZW1lbnRlZCgpOworICAgIGlmIChucE9iamVjdC0+X2NsYXNzLT5pbnZva2VEZWZh dWx0KQorICAgICAgICByZXR1cm4gbnBPYmplY3QtPl9jbGFzcy0+aW52b2tlRGVmYXVsdChucE9i amVjdCwgYXJndW1lbnRzLCBhcmd1bWVudENvdW50LCByZXN1bHQpOworCiAgICAgcmV0dXJuIGZh bHNlOwogfQogCkBAIC02MjAsOSArNjMyLDExIEBAIHN0YXRpYyB2b2lkIE5QTl9QbHVnaW5UaHJl YWRBc3luY0NhbGwoTlBQIGluc3RhbmNlLCB2b2lkICgqZnVuYykgKHZvaWQqKSwgdm9pZCoKICAg ICBub3RJbXBsZW1lbnRlZCgpOwogfQogCi1zdGF0aWMgYm9vbCBOUE5fQ29uc3RydWN0KE5QUCBu cHAsIE5QT2JqZWN0KiBucG9iaiwgY29uc3QgTlBWYXJpYW50KiBhcmdzLCB1aW50MzJfdCBhcmdD b3VudCwgTlBWYXJpYW50KiByZXN1bHQpCitzdGF0aWMgYm9vbCBOUE5fQ29uc3RydWN0KE5QUCwg TlBPYmplY3QqIG5wT2JqZWN0LCBjb25zdCBOUFZhcmlhbnQqIGFyZ3VtZW50cywgdWludDMyX3Qg YXJndW1lbnRDb3VudCwgTlBWYXJpYW50KiByZXN1bHQpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQo KTsKKyAgICBpZiAoTlBfQ0xBU1NfU1RSVUNUX1ZFUlNJT05fSEFTX0NUT1IobnBPYmplY3QtPl9j bGFzcykgJiYgbnBPYmplY3QtPl9jbGFzcy0+Y29uc3RydWN0KQorICAgICAgICByZXR1cm4gbnBP YmplY3QtPl9jbGFzcy0+Y29uc3RydWN0KG5wT2JqZWN0LCBhcmd1bWVudHMsIGFyZ3VtZW50Q291 bnQsIHJlc3VsdCk7CisKICAgICByZXR1cm4gZmFsc2U7CiB9CiAK