32254 2009-12-07 15:30:26 -0800 Implement property enumerator for V8NPObject 2009-12-07 20:33:49 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 victorw webkit-unassigned ager commit-queue webkit.review.bot oldest_to_newest 169499 0 victorw 2009-12-07 15:30:26 -0800 Need to implement NamedPropertyEnumerator and IndexedPropertyEnumerator for V8NPObject so it can be enumerated. This is one reason why the following layout test fails in Chromium: LayoutTests/plugins/netscape-enumerate.html 169503 1 44439 victorw 2009-12-07 15:42:41 -0800 Created attachment 44439 Proposed Patch 169506 2 webkit.review.bot 2009-12-07 15:46:02 -0800 style-queue ran check-webkit-style on attachment 44439 without any errors. 169517 3 44441 victorw 2009-12-07 16:16:33 -0800 Created attachment 44441 Proposed Patch + Style fixes Some existing code do not meet the Webkit style guidelines, the new patch fixes them. 169519 4 webkit.review.bot 2009-12-07 16:16:58 -0800 style-queue ran check-webkit-style on attachment 44441 without any errors. 169588 5 44441 dglazkov 2009-12-07 20:18:34 -0800 Comment on attachment 44441 Proposed Patch + Style fixes Looks great, thanks for working on this. 169590 6 44441 commit-queue 2009-12-07 20:33:43 -0800 Comment on attachment 44441 Proposed Patch + Style fixes Clearing flags on attachment: 44441 Committed r51831: <http://trac.webkit.org/changeset/51831> 169591 7 commit-queue 2009-12-07 20:33:49 -0800 All reviewed patches have been landed. Closing bug. 44439 2009-12-07 15:42:41 -0800 2009-12-07 16:16:33 -0800 Proposed Patch v8npobject.patch text/plain 4050 victorw SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MTc5MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDktMTItMDcgIFZpY3RvciBXYW5nICA8dmljdG9yd0BjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg SW1wbGVtZW50IE5hbWVkUHJvcGVydHlFbnVtZXJhdG9yIGFuZCBJbmRleGVkUHJvcGVydHlFbnVt ZXJhdG9yIGZvcgorICAgICAgICBWOCBOUE9iamVjdC4gVGhpcyBzaG91bGQgbWFrZSB0aGUgb2Jq ZWN0IGVudW1lcmFibGUgYW5kIGZpeCB0aGUKKyAgICAgICAgZW51bWVyYXRpb24gaXNzdWUgaW4g bGF5b3V0IHRlc3QgcGx1Z2lucy9uZXRzY2FwZS1lbnVtZXJhdGUuaHRtbC4KKworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzIyNTQKKworICAgICAgICBU ZXN0OiBwbHVnaW5zL25ldHNjYXBlLWVudW1lcmF0ZS5odG1sCisKKyAgICAgICAgKiBiaW5kaW5n cy92OC9WOE5QT2JqZWN0LmNwcDoKKyAgICAgICAgKG5wT2JqZWN0UHJvcGVydHlFbnVtZXJhdG9y KToKKyAgICAgICAgKG5wT2JqZWN0TmFtZWRQcm9wZXJ0eUVudW1lcmF0b3IpOgorICAgICAgICAo bnBPYmplY3RJbmRleGVkUHJvcGVydHlFbnVtZXJhdG9yKToKKyAgICAgICAgKGNyZWF0ZVY4T2Jq ZWN0Rm9yTlBPYmplY3QpOgorCiAyMDA5LTEyLTA3ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBA YXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5pa29sYXMgWmltbWVybWFubi4KSW5k ZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvVjhOUE9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9iaW5kaW5ncy92OC9WOE5QT2JqZWN0LmNwcAkocmV2aXNpb24gNTEwNDMpCisrKyBXZWJD b3JlL2JpbmRpbmdzL3Y4L1Y4TlBPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICsz Myw3IEBACiAjaW5jbHVkZSAiVjhOUE9iamVjdC5oIgogCiAjaW5jbHVkZSAiSFRNTFBsdWdJbkVs ZW1lbnQuaCIKKyNpbmNsdWRlICJJZGVudGlmaWVyUmVwLmgiCiAjaW5jbHVkZSAiTlBWOE9iamVj dC5oIgogI2luY2x1ZGUgIlY4Q3VzdG9tQmluZGluZy5oIgogI2luY2x1ZGUgIlY4RE9NTWFwLmgi CkBAIC0yNzUsNiArMjc2LDQ0IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBucE9iamVjdFNldElu ZGV4ZWQKICAgICByZXR1cm4gbnBPYmplY3RTZXRQcm9wZXJ0eShzZWxmLCBpZGVudGlmaWVyLCB2 YWx1ZSk7CiB9CiAKK3Y4OjpIYW5kbGU8djg6OkFycmF5PiBucE9iamVjdFByb3BlcnR5RW51bWVy YXRvcihjb25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZvLCBib29sIG5hbWVkUHJvcGVydHkpCit7 CisgICAgTlBPYmplY3QqIG5wT2JqZWN0ID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9OYXRpdmVP YmplY3Q8TlBPYmplY3Q+KFY4Q2xhc3NJbmRleDo6TlBPQkpFQ1QsIGluZm8uSG9sZGVyKCkpOwor CisgICAgLy8gVmVyaWZ5IHRoYXQgb3VyIHdyYXBwZXIgd2Fzbid0IHVzaW5nIGEgTlBPYmplY3Qg d2hpY2gKKyAgICAvLyBoYXMgYWxyZWFkeSBiZWVuIGRlbGV0ZWQuCisgICAgaWYgKCFucE9iamVj dCB8fCAhX05QTl9Jc0FsaXZlKG5wT2JqZWN0KSkKKyAgICAgICAgdGhyb3dFcnJvcigiTlBPYmpl Y3QgZGVsZXRlZCIsIFY4UHJveHk6OlJlZmVyZW5jZUVycm9yKTsKKworICAgIGlmIChOUF9DTEFT U19TVFJVQ1RfVkVSU0lPTl9IQVNfRU5VTShucE9iamVjdC0+X2NsYXNzKSAmJiBucE9iamVjdC0+ X2NsYXNzLT5lbnVtZXJhdGUpIHsKKyAgICAgICAgdWludDMyX3QgY291bnQ7CisgICAgICAgIE5Q SWRlbnRpZmllciogaWRlbnRpZmllcnM7CisgICAgICAgIGlmIChucE9iamVjdC0+X2NsYXNzLT5l bnVtZXJhdGUobnBPYmplY3QsICZpZGVudGlmaWVycywgJmNvdW50KSkgeworICAgICAgICAgICAg djg6OkhhbmRsZTx2ODo6QXJyYXk+IHByb3BlcnRpZXMgPSB2ODo6QXJyYXk6Ok5ldyhjb3VudCk7 CisgICAgICAgICAgICBmb3IgKHVpbnQzMl90IGkgPSAwOyBpIDwgY291bnQ7ICsraSkgeworICAg ICAgICAgICAgICAgIElkZW50aWZpZXJSZXAqIGlkZW50aWZpZXIgPSBzdGF0aWNfY2FzdDxJZGVu dGlmaWVyUmVwKj4oaWRlbnRpZmllcnNbaV0pOworICAgICAgICAgICAgICAgIGlmIChuYW1lZFBy b3BlcnR5KQorICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0aWVzLT5TZXQodjg6OkludGVnZXI6 Ok5ldyhpKSwgdjg6OlN0cmluZzo6TmV3KGlkZW50aWZpZXItPnN0cmluZygpKSk7CisgICAgICAg ICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0aWVzLT5TZXQodjg6Oklu dGVnZXI6Ok5ldyhpKSwgdjg6OkludGVnZXI6Ok5ldyhpZGVudGlmaWVyLT5udW1iZXIoKSkpOwor ICAgICAgICAgICAgfQorCisgICAgICAgICAgICByZXR1cm4gcHJvcGVydGllczsKKyAgICAgICAg fQorICAgIH0KKworICAgIHJldHVybiB2ODo6SGFuZGxlPHY4OjpBcnJheT4oKTsKK30KKwordjg6 OkhhbmRsZTx2ODo6QXJyYXk+IG5wT2JqZWN0TmFtZWRQcm9wZXJ0eUVudW1lcmF0b3IoY29uc3Qg djg6OkFjY2Vzc29ySW5mbyYgaW5mbykKK3sKKyAgICByZXR1cm4gbnBPYmplY3RQcm9wZXJ0eUVu dW1lcmF0b3IoaW5mbywgdHJ1ZSk7Cit9CisKK3Y4OjpIYW5kbGU8djg6OkFycmF5PiBucE9iamVj dEluZGV4ZWRQcm9wZXJ0eUVudW1lcmF0b3IoY29uc3Qgdjg6OkFjY2Vzc29ySW5mbyYgaW5mbykK K3sKKyAgICByZXR1cm4gbnBPYmplY3RQcm9wZXJ0eUVudW1lcmF0b3IoaW5mbywgZmFsc2UpOwor fQogCiBzdGF0aWMgdm9pZCB3ZWFrTlBPYmplY3RDYWxsYmFjayh2ODo6UGVyc2lzdGVudDx2ODo6 VmFsdWU+LCB2b2lkKiBwYXJhbWV0ZXIpOwogCkBAIC0zMTcsOCArMzU2LDggQEAgdjg6OkxvY2Fs PHY4OjpPYmplY3Q+IGNyZWF0ZVY4T2JqZWN0Rm9yTgogICAgIGlmIChucE9iamVjdERlc2MuSXNF bXB0eSgpKSB7CiAgICAgICAgIG5wT2JqZWN0RGVzYyA9IHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5j dGlvblRlbXBsYXRlPjo6TmV3KHY4OjpGdW5jdGlvblRlbXBsYXRlOjpOZXcoKSk7CiAgICAgICAg IG5wT2JqZWN0RGVzYy0+SW5zdGFuY2VUZW1wbGF0ZSgpLT5TZXRJbnRlcm5hbEZpZWxkQ291bnQo VjhDdXN0b206OmtOUE9iamVjdEludGVybmFsRmllbGRDb3VudCk7Ci0gICAgICAgIG5wT2JqZWN0 RGVzYy0+SW5zdGFuY2VUZW1wbGF0ZSgpLT5TZXROYW1lZFByb3BlcnR5SGFuZGxlcihucE9iamVj dE5hbWVkUHJvcGVydHlHZXR0ZXIsIG5wT2JqZWN0TmFtZWRQcm9wZXJ0eVNldHRlcik7Ci0gICAg ICAgIG5wT2JqZWN0RGVzYy0+SW5zdGFuY2VUZW1wbGF0ZSgpLT5TZXRJbmRleGVkUHJvcGVydHlI YW5kbGVyKG5wT2JqZWN0SW5kZXhlZFByb3BlcnR5R2V0dGVyLCBucE9iamVjdEluZGV4ZWRQcm9w ZXJ0eVNldHRlcik7CisgICAgICAgIG5wT2JqZWN0RGVzYy0+SW5zdGFuY2VUZW1wbGF0ZSgpLT5T ZXROYW1lZFByb3BlcnR5SGFuZGxlcihucE9iamVjdE5hbWVkUHJvcGVydHlHZXR0ZXIsIG5wT2Jq ZWN0TmFtZWRQcm9wZXJ0eVNldHRlciwgMCwgMCwgbnBPYmplY3ROYW1lZFByb3BlcnR5RW51bWVy YXRvcik7CisgICAgICAgIG5wT2JqZWN0RGVzYy0+SW5zdGFuY2VUZW1wbGF0ZSgpLT5TZXRJbmRl eGVkUHJvcGVydHlIYW5kbGVyKG5wT2JqZWN0SW5kZXhlZFByb3BlcnR5R2V0dGVyLCBucE9iamVj dEluZGV4ZWRQcm9wZXJ0eVNldHRlciwgMCwgMCwgbnBPYmplY3RJbmRleGVkUHJvcGVydHlFbnVt ZXJhdG9yKTsKICAgICAgICAgbnBPYmplY3REZXNjLT5JbnN0YW5jZVRlbXBsYXRlKCktPlNldENh bGxBc0Z1bmN0aW9uSGFuZGxlcihucE9iamVjdEludm9rZURlZmF1bHRIYW5kbGVyKTsKICAgICB9 CiAK 44441 2009-12-07 16:16:33 -0800 2009-12-07 20:33:43 -0800 Proposed Patch + Style fixes v8npobject.patch text/plain 5692 victorw SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MTgwOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjYgQEAKKzIwMDktMTItMDcgIFZpY3RvciBXYW5nICA8dmljdG9yd0BjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg SW1wbGVtZW50IE5hbWVkUHJvcGVydHlFbnVtZXJhdG9yIGFuZCBJbmRleGVkUHJvcGVydHlFbnVt ZXJhdG9yIGZvcgorICAgICAgICBWOCBOUE9iamVjdC4gVGhpcyBzaG91bGQgbWFrZSB0aGUgb2Jq ZWN0IGVudW1lcmFibGUgYW5kIGZpeCB0aGUKKyAgICAgICAgZW51bWVyYXRpb24gaXNzdWUgaW4g bGF5b3V0IHRlc3QgcGx1Z2lucy9uZXRzY2FwZS1lbnVtZXJhdGUuaHRtbC4KKworICAgICAgICBB bHNvIGZpeCBzb21lIGV4aXN0aW5nIHN0eWxlIGlzc3VlcyBwZXIgd2Via2l0IHN0eWxlIGd1aWRl bGluZXMuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTMyMjU0CisKKyAgICAgICAgVGVzdDogcGx1Z2lucy9uZXRzY2FwZS1lbnVtZXJhdGUuaHRtbAor CisgICAgICAgICogYmluZGluZ3MvdjgvVjhOUE9iamVjdC5jcHA6CisgICAgICAgIChucE9iamVj dEludm9rZUltcGwpOgorICAgICAgICAobnBPYmplY3RJbnZva2VEZWZhdWx0SGFuZGxlcik6Cisg ICAgICAgIChucE9iamVjdEdldFByb3BlcnR5KToKKyAgICAgICAgKG5wT2JqZWN0UHJvcGVydHlF bnVtZXJhdG9yKToKKyAgICAgICAgKG5wT2JqZWN0TmFtZWRQcm9wZXJ0eUVudW1lcmF0b3IpOgor ICAgICAgICAobnBPYmplY3RJbmRleGVkUHJvcGVydHlFbnVtZXJhdG9yKToKKyAgICAgICAgKGNy ZWF0ZVY4T2JqZWN0Rm9yTlBPYmplY3QpOgorCiAyMDA5LTEyLTA3ICBOaWtvbGFzIFppbW1lcm1h bm4gIDxuemltbWVybWFubkByaW0uY29tPgogCiAgICAgICAgIE5vdCByZXZpZXdlZC4gVHJ5IHRv IGZpeCBtYWMgYnVpbGRzIGJ5IHRvdWNoaW5nIHN2Z3RhZ3MuaW4gLSBJIG9ubHkgdHJpZWQgZnJv bS1zY3JhdGNoIGJ1aWxkcy4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvVjhOUE9iamVjdC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9WOE5QT2JqZWN0LmNwcAkocmV2 aXNpb24gNTEwNDMpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4TlBPYmplY3QuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAiVjhOUE9iamVjdC5oIgogCiAj aW5jbHVkZSAiSFRNTFBsdWdJbkVsZW1lbnQuaCIKKyNpbmNsdWRlICJJZGVudGlmaWVyUmVwLmgi CiAjaW5jbHVkZSAiTlBWOE9iamVjdC5oIgogI2luY2x1ZGUgIlY4Q3VzdG9tQmluZGluZy5oIgog I2luY2x1ZGUgIlY4RE9NTWFwLmgiCkBAIC00NCw3ICs0NSw3IEBACiAjaW5jbHVkZSAiVjhQcm94 eS5oIgogI2luY2x1ZGUgIm5wcnVudGltZV9pbXBsLmgiCiAjaW5jbHVkZSAibnBydW50aW1lX3By aXYuaCIKLSNpbmNsdWRlICJ3dGYvT3duQXJyYXlQdHIuaCIKKyNpbmNsdWRlIDx3dGYvT3duQXJy YXlQdHIuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTExNyw3ICsxMTgsNyBA QCBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IG5wT2JqZWN0SW52CiAgICAgaWYgKCFyZXR2 YWwpCiAgICAgICAgIHRocm93RXJyb3IoIkVycm9yIGNhbGxpbmcgbWV0aG9kIG9uIE5QT2JqZWN0 ISIsIFY4UHJveHk6OkdlbmVyYWxFcnJvcik7CiAKLSAgICBmb3IgKGludCBpPTA7IGkgPCBudW1B cmdzOyBpKyspCisgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBudW1BcmdzOyBpKyspCiAgICAgICAg IF9OUE5fUmVsZWFzZVZhcmlhbnRWYWx1ZSgmbnBBcmdzW2ldKTsKIAogICAgIC8vIFVud3JhcCBy ZXR1cm4gdmFsdWVzLgpAQCAtMTM4LDggKzEzOSw4IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBu cE9iamVjdEludm9rZURlZmEKIHsKICAgICBpZiAoYXJncy5Jc0NvbnN0cnVjdENhbGwoKSkKICAg ICAgICAgcmV0dXJuIG5wT2JqZWN0SW52b2tlSW1wbChhcmdzLCBJbnZva2VDb25zdHJ1Y3QpOwot ICAgIGVsc2UKLSAgICAgICAgcmV0dXJuIG5wT2JqZWN0SW52b2tlSW1wbChhcmdzLCBJbnZva2VE ZWZhdWx0KTsKKworICAgIHJldHVybiBucE9iamVjdEludm9rZUltcGwoYXJncywgSW52b2tlRGVm YXVsdCk7CiB9CiAKIApAQCAtMTgwLDcgKzE4MSw5IEBAIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpW YWx1ZT4gbnBPYmplY3RHZXQKICAgICAgICAgX05QTl9SZWxlYXNlVmFyaWFudFZhbHVlKCZyZXN1 bHQpOwogICAgICAgICByZXR1cm4gcmV0dXJuVmFsdWU7CiAKLSAgICB9IGVsc2UgaWYgKGtleS0+ SXNTdHJpbmcoKSAmJiBucE9iamVjdC0+X2NsYXNzLT5oYXNNZXRob2QgJiYgbnBPYmplY3QtPl9j bGFzcy0+aGFzTWV0aG9kKG5wT2JqZWN0LCBpZGVudGlmaWVyKSkgeworICAgIH0KKworICAgIGlm IChrZXktPklzU3RyaW5nKCkgJiYgbnBPYmplY3QtPl9jbGFzcy0+aGFzTWV0aG9kICYmIG5wT2Jq ZWN0LT5fY2xhc3MtPmhhc01ldGhvZChucE9iamVjdCwgaWRlbnRpZmllcikpIHsKICAgICAgICAg UHJpdmF0ZUlkZW50aWZpZXIqIGlkID0gc3RhdGljX2Nhc3Q8UHJpdmF0ZUlkZW50aWZpZXIqPihp ZGVudGlmaWVyKTsKICAgICAgICAgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+ IGZ1bmN0aW9uVGVtcGxhdGUgPSBzdGF0aWNUZW1wbGF0ZU1hcC5nZXQoaWQpOwogICAgICAgICAv LyBDYWNoZSB0ZW1wbGF0ZXMgdXNpbmcgaWRlbnRpZmllciBhcyB0aGUga2V5LgpAQCAtMjc1LDYg KzI3OCw0NCBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gbnBPYmplY3RTZXRJbmRleGVkCiAgICAg cmV0dXJuIG5wT2JqZWN0U2V0UHJvcGVydHkoc2VsZiwgaWRlbnRpZmllciwgdmFsdWUpOwogfQog Cit2ODo6SGFuZGxlPHY4OjpBcnJheT4gbnBPYmplY3RQcm9wZXJ0eUVudW1lcmF0b3IoY29uc3Qg djg6OkFjY2Vzc29ySW5mbyYgaW5mbywgYm9vbCBuYW1lZFByb3BlcnR5KQoreworICAgIE5QT2Jq ZWN0KiBucE9iamVjdCA9IFY4RE9NV3JhcHBlcjo6Y29udmVydFRvTmF0aXZlT2JqZWN0PE5QT2Jq ZWN0PihWOENsYXNzSW5kZXg6Ok5QT0JKRUNULCBpbmZvLkhvbGRlcigpKTsKKworICAgIC8vIFZl cmlmeSB0aGF0IG91ciB3cmFwcGVyIHdhc24ndCB1c2luZyBhIE5QT2JqZWN0IHdoaWNoCisgICAg Ly8gaGFzIGFscmVhZHkgYmVlbiBkZWxldGVkLgorICAgIGlmICghbnBPYmplY3QgfHwgIV9OUE5f SXNBbGl2ZShucE9iamVjdCkpCisgICAgICAgIHRocm93RXJyb3IoIk5QT2JqZWN0IGRlbGV0ZWQi LCBWOFByb3h5OjpSZWZlcmVuY2VFcnJvcik7CisKKyAgICBpZiAoTlBfQ0xBU1NfU1RSVUNUX1ZF UlNJT05fSEFTX0VOVU0obnBPYmplY3QtPl9jbGFzcykgJiYgbnBPYmplY3QtPl9jbGFzcy0+ZW51 bWVyYXRlKSB7CisgICAgICAgIHVpbnQzMl90IGNvdW50OworICAgICAgICBOUElkZW50aWZpZXIq IGlkZW50aWZpZXJzOworICAgICAgICBpZiAobnBPYmplY3QtPl9jbGFzcy0+ZW51bWVyYXRlKG5w T2JqZWN0LCAmaWRlbnRpZmllcnMsICZjb3VudCkpIHsKKyAgICAgICAgICAgIHY4OjpIYW5kbGU8 djg6OkFycmF5PiBwcm9wZXJ0aWVzID0gdjg6OkFycmF5OjpOZXcoY291bnQpOworICAgICAgICAg ICAgZm9yICh1aW50MzJfdCBpID0gMDsgaSA8IGNvdW50OyArK2kpIHsKKyAgICAgICAgICAgICAg ICBJZGVudGlmaWVyUmVwKiBpZGVudGlmaWVyID0gc3RhdGljX2Nhc3Q8SWRlbnRpZmllclJlcCo+ KGlkZW50aWZpZXJzW2ldKTsKKyAgICAgICAgICAgICAgICBpZiAobmFtZWRQcm9wZXJ0eSkKKyAg ICAgICAgICAgICAgICAgICAgcHJvcGVydGllcy0+U2V0KHY4OjpJbnRlZ2VyOjpOZXcoaSksIHY4 OjpTdHJpbmc6Ok5ldyhpZGVudGlmaWVyLT5zdHJpbmcoKSkpOworICAgICAgICAgICAgICAgIGVs c2UKKyAgICAgICAgICAgICAgICAgICAgcHJvcGVydGllcy0+U2V0KHY4OjpJbnRlZ2VyOjpOZXco aSksIHY4OjpJbnRlZ2VyOjpOZXcoaWRlbnRpZmllci0+bnVtYmVyKCkpKTsKKyAgICAgICAgICAg IH0KKworICAgICAgICAgICAgcmV0dXJuIHByb3BlcnRpZXM7CisgICAgICAgIH0KKyAgICB9CisK KyAgICByZXR1cm4gdjg6OkhhbmRsZTx2ODo6QXJyYXk+KCk7Cit9CisKK3Y4OjpIYW5kbGU8djg6 OkFycmF5PiBucE9iamVjdE5hbWVkUHJvcGVydHlFbnVtZXJhdG9yKGNvbnN0IHY4OjpBY2Nlc3Nv ckluZm8mIGluZm8pCit7CisgICAgcmV0dXJuIG5wT2JqZWN0UHJvcGVydHlFbnVtZXJhdG9yKGlu Zm8sIHRydWUpOworfQorCit2ODo6SGFuZGxlPHY4OjpBcnJheT4gbnBPYmplY3RJbmRleGVkUHJv cGVydHlFbnVtZXJhdG9yKGNvbnN0IHY4OjpBY2Nlc3NvckluZm8mIGluZm8pCit7CisgICAgcmV0 dXJuIG5wT2JqZWN0UHJvcGVydHlFbnVtZXJhdG9yKGluZm8sIGZhbHNlKTsKK30KIAogc3RhdGlj IHZvaWQgd2Vha05QT2JqZWN0Q2FsbGJhY2sodjg6OlBlcnNpc3RlbnQ8djg6OlZhbHVlPiwgdm9p ZCogcGFyYW1ldGVyKTsKIApAQCAtMzE3LDggKzM1OCw4IEBAIHY4OjpMb2NhbDx2ODo6T2JqZWN0 PiBjcmVhdGVWOE9iamVjdEZvck4KICAgICBpZiAobnBPYmplY3REZXNjLklzRW1wdHkoKSkgewog ICAgICAgICBucE9iamVjdERlc2MgPSB2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0 ZT46Ok5ldyh2ODo6RnVuY3Rpb25UZW1wbGF0ZTo6TmV3KCkpOwogICAgICAgICBucE9iamVjdERl c2MtPkluc3RhbmNlVGVtcGxhdGUoKS0+U2V0SW50ZXJuYWxGaWVsZENvdW50KFY4Q3VzdG9tOjpr TlBPYmplY3RJbnRlcm5hbEZpZWxkQ291bnQpOwotICAgICAgICBucE9iamVjdERlc2MtPkluc3Rh bmNlVGVtcGxhdGUoKS0+U2V0TmFtZWRQcm9wZXJ0eUhhbmRsZXIobnBPYmplY3ROYW1lZFByb3Bl cnR5R2V0dGVyLCBucE9iamVjdE5hbWVkUHJvcGVydHlTZXR0ZXIpOwotICAgICAgICBucE9iamVj dERlc2MtPkluc3RhbmNlVGVtcGxhdGUoKS0+U2V0SW5kZXhlZFByb3BlcnR5SGFuZGxlcihucE9i amVjdEluZGV4ZWRQcm9wZXJ0eUdldHRlciwgbnBPYmplY3RJbmRleGVkUHJvcGVydHlTZXR0ZXIp OworICAgICAgICBucE9iamVjdERlc2MtPkluc3RhbmNlVGVtcGxhdGUoKS0+U2V0TmFtZWRQcm9w ZXJ0eUhhbmRsZXIobnBPYmplY3ROYW1lZFByb3BlcnR5R2V0dGVyLCBucE9iamVjdE5hbWVkUHJv cGVydHlTZXR0ZXIsIDAsIDAsIG5wT2JqZWN0TmFtZWRQcm9wZXJ0eUVudW1lcmF0b3IpOworICAg ICAgICBucE9iamVjdERlc2MtPkluc3RhbmNlVGVtcGxhdGUoKS0+U2V0SW5kZXhlZFByb3BlcnR5 SGFuZGxlcihucE9iamVjdEluZGV4ZWRQcm9wZXJ0eUdldHRlciwgbnBPYmplY3RJbmRleGVkUHJv cGVydHlTZXR0ZXIsIDAsIDAsIG5wT2JqZWN0SW5kZXhlZFByb3BlcnR5RW51bWVyYXRvcik7CiAg ICAgICAgIG5wT2JqZWN0RGVzYy0+SW5zdGFuY2VUZW1wbGF0ZSgpLT5TZXRDYWxsQXNGdW5jdGlv bkhhbmRsZXIobnBPYmplY3RJbnZva2VEZWZhdWx0SGFuZGxlcik7CiAgICAgfQogCg==