52069 2011-01-07 10:38:25 -0800 Support argument list for custom function 2011-01-07 12:17:55 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC OS X 10.5 RESOLVED INVALID P2 Normal --- 51196 1 cshu cshu kenneth sam oldest_to_newest 330858 0 cshu 2011-01-07 10:38:25 -0800 In certain cases, such as createTouchList(), we want to provide a list of arguments to the generated function. 330864 1 78249 cshu 2011-01-07 10:47:53 -0800 Created attachment 78249 fix patch 330870 2 sam 2011-01-07 10:58:17 -0800 What will this mean for non-JS bindings? 330915 3 cshu 2011-01-07 12:17:33 -0800 The "feature" is already supported. Just use exec->argument() and exec->argumentCount(). 78249 2011-01-07 10:47:53 -0800 2011-01-07 12:17:55 -0800 fix patch 52069_1.patch text/plain 14109 cshu SW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQkocmV2 aXNpb24gNzQ5MjUpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpT LnBtCSh3b3JraW5nIGNvcHkpCkBAIC04NTUsNyArODU1LDEyIEBAIHN1YiBHZW5lcmF0ZUhlYWRl cgogICAgICAgICBmb3JlYWNoIG15ICRmdW5jdGlvbiAoQHskZGF0YU5vZGUtPmZ1bmN0aW9uc30p IHsKICAgICAgICAgICAgIGlmICgkZnVuY3Rpb24tPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1 dGVzLT57IkN1c3RvbSJ9IHx8ICRmdW5jdGlvbi0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0 ZXMtPnsiSlNDQ3VzdG9tIn0pIHsKICAgICAgICAgICAgICAgICBteSAkZnVuY3Rpb25JbXBsZW1l bnRhdGlvbk5hbWUgPSAkZnVuY3Rpb24tPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57 IkltcGxlbWVudGF0aW9uRnVuY3Rpb24ifSB8fCAkY29kZUdlbmVyYXRvci0+V0tfbGNmaXJzdCgk ZnVuY3Rpb24tPnNpZ25hdHVyZS0+bmFtZSk7Ci0gICAgICAgICAgICAgICAgcHVzaChAaGVhZGVy Q29udGVudCwgIiAgICBKU0M6OkpTVmFsdWUgIiAuICRmdW5jdGlvbkltcGxlbWVudGF0aW9uTmFt ZSAuICIoSlNDOjpFeGVjU3RhdGUqKTtcbiIpOworICAgICAgICAgICAgICAgIG15ICRwYXJhbWV0 ZXIgPSBAeyRmdW5jdGlvbi0+cGFyYW1ldGVyc31bMF07CisgICAgICAgICAgICAgICAgaWYgKCRw YXJhbWV0ZXIgJiYgJGNvZGVHZW5lcmF0b3ItPlN0cmlwTW9kdWxlKCRwYXJhbWV0ZXItPnR5cGUp ID1+IC9hcmdMaXN0LykgeworICAgICAgICAgICAgICAgICAgICBwdXNoKEBoZWFkZXJDb250ZW50 LCAiICAgIEpTQzo6SlNWYWx1ZSAiIC4gJGZ1bmN0aW9uSW1wbGVtZW50YXRpb25OYW1lIC4gIihK U0M6OkV4ZWNTdGF0ZSosIGNvbnN0IEpTQzo6QXJnTGlzdCYpO1xuIik7CisgICAgICAgICAgICAg ICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAgcHVzaChAaGVhZGVyQ29udGVudCwgIiAg ICBKU0M6OkpTVmFsdWUgIiAuICRmdW5jdGlvbkltcGxlbWVudGF0aW9uTmFtZSAuICIoSlNDOjpF eGVjU3RhdGUqKTtcbiIpOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAg ICAgfQogICAgIH0KQEAgLTE4OTUsNyArMTkwMCwxMiBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRh dGlvbgogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBpZiAoJGZ1bmN0aW9uLT5zaWduYXR1 cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDdXN0b20ifSB8fCAkZnVuY3Rpb24tPnNpZ25hdHVy ZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkpTQ0N1c3RvbSJ9KSB7Ci0gICAgICAgICAgICAgICAg cHVzaChAaW1wbENvbnRlbnQsICIgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShjYXN0ZWRUaGlz LT4iIC4gJGZ1bmN0aW9uSW1wbGVtZW50YXRpb25OYW1lIC4gIihleGVjKSk7XG4iKTsKKyAgICAg ICAgICAgICAgICBteSAkcGFyYW1ldGVyID0gQHskZnVuY3Rpb24tPnBhcmFtZXRlcnN9WzBdOwor ICAgICAgICAgICAgICAgIGlmICgkcGFyYW1ldGVyICYmICRjb2RlR2VuZXJhdG9yLT5TdHJpcE1v ZHVsZSgkcGFyYW1ldGVyLT50eXBlKSA9fiAvYXJnTGlzdC8pIHsKKyAgICAgICAgICAgICAgICAg ICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShjYXN0ZWRU aGlzLT4iIC4gJGZ1bmN0aW9uSW1wbGVtZW50YXRpb25OYW1lIC4gIihleGVjLCBBcmdMaXN0KGV4 ZWMpKSk7XG4iKTsKKyAgICAgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgICAg ICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGNhc3RlZFRo aXMtPiIgLiAkZnVuY3Rpb25JbXBsZW1lbnRhdGlvbk5hbWUgLiAiKGV4ZWMpKTtcbiIpOworICAg ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgcHVz aChAaW1wbENvbnRlbnQsICIgICAgJGltcGxUeXBlKiBpbXAgPSBzdGF0aWNfY2FzdDwkaW1wbFR5 cGUqPihjYXN0ZWRUaGlzLT5pbXBsKCkpO1xuIik7CiAgICAgICAgICAgICAgICAgaWYgKCRzdmdQ cm9wZXJ0eVR5cGUpIHsKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3RP YmouaWRsCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3RP YmouaWRsCShyZXZpc2lvbiA3NDkyNSkKKysrIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0 L1Rlc3RPYmouaWRsCSh3b3JraW5nIGNvcHkpCkBAIC04OCw2ICs4OCw3IEBAIG1vZHVsZSB0ZXN0 IHsKICAgICAgICAgYXR0cmlidXRlIFtDdXN0b21dIGxvbmcgICAgICAgICAgICBjdXN0b21BdHRy OwogICAgICAgICBbQ3VzdG9tXSB2b2lkIGN1c3RvbU1ldGhvZCgpOwogICAgICAgICBbQ3VzdG9t XSB2b2lkIGN1c3RvbU1ldGhvZFdpdGhBcmdzKGluIGxvbmcgaW50QXJnLCBpbiBET01TdHJpbmcg c3RyQXJnLCBpbiBUZXN0T2JqIG9iakFyZyk7CisgICAgICAgIFtDdXN0b21dIHZvaWQgY3VzdG9t TWV0aG9kV2l0aEFyZ0xpc3QoaW4gYXJnTGlzdCk7CiAKICAgICAgICAgW0N1c3RvbUFyZ3VtZW50 SGFuZGxpbmddIHZvaWQgY3VzdG9tQXJnc0FuZEV4Y2VwdGlvbihpbiBsb2cgaW50QXJnKQogICAg ICAgICAgICAgcmFpc2VzKERPTUV4Y2VwdGlvbik7CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvdGVzdC9DUFAvV2ViRE9NVGVzdE9iai5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy90ZXN0L0NQUC9XZWJET01UZXN0T2JqLmgJKHJldmlzaW9uIDc0OTI1KQor KysgV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvQ1BQL1dlYkRPTVRlc3RPYmouaAkod29y a2luZyBjb3B5KQpAQCAtMzUsNiArMzUsNyBAQCBjbGFzcyBXZWJET01JREJLZXk7CiBjbGFzcyBX ZWJET01PcHRpb25zT2JqZWN0OwogY2xhc3MgV2ViRE9NU3RyaW5nOwogY2xhc3MgV2ViRE9NVGVz dE9iajsKK2NsYXNzIFdlYkRPTWFyZ0xpc3Q7CiAKIGNsYXNzIFdlYkRPTVRlc3RPYmogOiBwdWJs aWMgV2ViRE9NT2JqZWN0IHsKIHB1YmxpYzoKQEAgLTE0Myw2ICsxNDQsNyBAQCBwdWJsaWM6CiAg ICAgdm9pZCBtZXRob2RXaXRoRXhjZXB0aW9uKCk7CiAgICAgdm9pZCBjdXN0b21NZXRob2QoKTsK ICAgICB2b2lkIGN1c3RvbU1ldGhvZFdpdGhBcmdzKGludCBpbnRBcmcsIGNvbnN0IFdlYkRPTVN0 cmluZyYgc3RyQXJnLCBjb25zdCBXZWJET01UZXN0T2JqJiBvYmpBcmcpOworICAgIHZvaWQgY3Vz dG9tTWV0aG9kV2l0aEFyZ0xpc3QoY29uc3QgV2ViRE9NYXJnTGlzdCYgKTsKICAgICB2b2lkIGFk ZEV2ZW50TGlzdGVuZXIoY29uc3QgV2ViRE9NU3RyaW5nJiB0eXBlLCBjb25zdCBXZWJET01FdmVu dExpc3RlbmVyJiBsaXN0ZW5lciwgYm9vbCB1c2VDYXB0dXJlKTsKICAgICB2b2lkIHJlbW92ZUV2 ZW50TGlzdGVuZXIoY29uc3QgV2ViRE9NU3RyaW5nJiB0eXBlLCBjb25zdCBXZWJET01FdmVudExp c3RlbmVyJiBsaXN0ZW5lciwgYm9vbCB1c2VDYXB0dXJlKTsKICAgICB2b2lkIHdpdGhEeW5hbWlj RnJhbWUoKTsKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdElu dGVyZmFjZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3Qv SlMvSlNUZXN0SW50ZXJmYWNlLmNwcAkocmV2aXNpb24gNzQ5MjUpCisrKyBXZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RJbnRlcmZhY2UuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xNjYsNiArMTY2LDcgQEAgSlNWYWx1ZSBqc1Rlc3RJbnRlcmZhY2VDb25zdHJ1Y3RvcihFeGVj UwogICAgIEpTVGVzdEludGVyZmFjZSogZG9tT2JqZWN0ID0gc3RhdGljX2Nhc3Q8SlNUZXN0SW50 ZXJmYWNlKj4oYXNPYmplY3Qoc2xvdEJhc2UpKTsKICAgICByZXR1cm4gSlNUZXN0SW50ZXJmYWNl OjpnZXRDb25zdHJ1Y3RvcihleGVjLCBkb21PYmplY3QtPmdsb2JhbE9iamVjdCgpKTsKIH0KKwog SlNWYWx1ZSBKU1Rlc3RJbnRlcmZhY2U6OmdldENvbnN0cnVjdG9yKEV4ZWNTdGF0ZSogZXhlYywg SlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCkKIHsKICAgICByZXR1cm4gZ2V0RE9NQ29uc3Ry dWN0b3I8SlNUZXN0SW50ZXJmYWNlQ29uc3RydWN0b3I+KGV4ZWMsIHN0YXRpY19jYXN0PEpTRE9N R2xvYmFsT2JqZWN0Kj4oZ2xvYmFsT2JqZWN0KSk7CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvdGVzdC9KUy9KU1Rlc3RNZWRpYVF1ZXJ5TGlzdExpc3RlbmVyLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RNZWRpYVF1ZXJ5TGlz dExpc3RlbmVyLmNwcAkocmV2aXNpb24gNzQ5MjUpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvdGVzdC9KUy9KU1Rlc3RNZWRpYVF1ZXJ5TGlzdExpc3RlbmVyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTYyLDYgKzE2Miw3IEBAIEpTVmFsdWUganNUZXN0TWVkaWFRdWVyeUxpc3RMaXN0ZW5l ckNvbnMKICAgICBKU1Rlc3RNZWRpYVF1ZXJ5TGlzdExpc3RlbmVyKiBkb21PYmplY3QgPSBzdGF0 aWNfY2FzdDxKU1Rlc3RNZWRpYVF1ZXJ5TGlzdExpc3RlbmVyKj4oYXNPYmplY3Qoc2xvdEJhc2Up KTsKICAgICByZXR1cm4gSlNUZXN0TWVkaWFRdWVyeUxpc3RMaXN0ZW5lcjo6Z2V0Q29uc3RydWN0 b3IoZXhlYywgZG9tT2JqZWN0LT5nbG9iYWxPYmplY3QoKSk7CiB9CisKIEpTVmFsdWUgSlNUZXN0 TWVkaWFRdWVyeUxpc3RMaXN0ZW5lcjo6Z2V0Q29uc3RydWN0b3IoRXhlY1N0YXRlKiBleGVjLCBK U0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0KQogewogICAgIHJldHVybiBnZXRET01Db25zdHJ1 Y3RvcjxKU1Rlc3RNZWRpYVF1ZXJ5TGlzdExpc3RlbmVyQ29uc3RydWN0b3I+KGV4ZWMsIHN0YXRp Y19jYXN0PEpTRE9NR2xvYmFsT2JqZWN0Kj4oZ2xvYmFsT2JqZWN0KSk7CkluZGV4OiBXZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RPYmouY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdE9iai5jcHAJKHJldmlzaW9uIDc0 OTI1KQorKysgV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0T2JqLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTgzLDcgKzE4Myw3IEBAIGJvb2wgSlNUZXN0T2JqQ29uc3RydWN0 b3I6OmdldE93blByb3BlcnQKICNkZWZpbmUgVEhVTktfR0VORVJBVE9SKGdlbmVyYXRvcikKICNl bmRpZgogCi1zdGF0aWMgY29uc3QgSGFzaFRhYmxlVmFsdWUgSlNUZXN0T2JqUHJvdG90eXBlVGFi bGVWYWx1ZXNbNDhdID0KK3N0YXRpYyBjb25zdCBIYXNoVGFibGVWYWx1ZSBKU1Rlc3RPYmpQcm90 b3R5cGVUYWJsZVZhbHVlc1s0OV0gPQogewogICAgIHsgIkNPTlNUX1ZBTFVFXzAiLCBEb250RGVs ZXRlIHwgUmVhZE9ubHksIChpbnRwdHJfdClzdGF0aWNfY2FzdDxQcm9wZXJ0eVNsb3Q6OkdldFZh bHVlRnVuYz4oanNUZXN0T2JqQ09OU1RfVkFMVUVfMCksIChpbnRwdHJfdCkwIFRIVU5LX0dFTkVS QVRPUigwKSB9LAogICAgIHsgIkNPTlNUX1ZBTFVFXzEiLCBEb250RGVsZXRlIHwgUmVhZE9ubHks IChpbnRwdHJfdClzdGF0aWNfY2FzdDxQcm9wZXJ0eVNsb3Q6OkdldFZhbHVlRnVuYz4oanNUZXN0 T2JqQ09OU1RfVkFMVUVfMSksIChpbnRwdHJfdCkwIFRIVU5LX0dFTkVSQVRPUigwKSB9LApAQCAt MjEwLDYgKzIxMCw3IEBAIHN0YXRpYyBjb25zdCBIYXNoVGFibGVWYWx1ZSBKU1Rlc3RPYmpQcm8K ICAgICB7ICJtZXRob2RXaXRoRXhjZXB0aW9uIiwgRG9udERlbGV0ZSB8IEZ1bmN0aW9uLCAoaW50 cHRyX3Qpc3RhdGljX2Nhc3Q8TmF0aXZlRnVuY3Rpb24+KGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0 aW9uTWV0aG9kV2l0aEV4Y2VwdGlvbiksIChpbnRwdHJfdCkwIFRIVU5LX0dFTkVSQVRPUigwKSB9 LAogICAgIHsgImN1c3RvbU1ldGhvZCIsIERvbnREZWxldGUgfCBGdW5jdGlvbiwgKGludHB0cl90 KXN0YXRpY19jYXN0PE5hdGl2ZUZ1bmN0aW9uPihqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbkN1 c3RvbU1ldGhvZCksIChpbnRwdHJfdCkwIFRIVU5LX0dFTkVSQVRPUigwKSB9LAogICAgIHsgImN1 c3RvbU1ldGhvZFdpdGhBcmdzIiwgRG9udERlbGV0ZSB8IEZ1bmN0aW9uLCAoaW50cHRyX3Qpc3Rh dGljX2Nhc3Q8TmF0aXZlRnVuY3Rpb24+KGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uQ3VzdG9t TWV0aG9kV2l0aEFyZ3MpLCAoaW50cHRyX3QpMyBUSFVOS19HRU5FUkFUT1IoMCkgfSwKKyAgICB7 ICJjdXN0b21NZXRob2RXaXRoQXJnTGlzdCIsIERvbnREZWxldGUgfCBGdW5jdGlvbiwgKGludHB0 cl90KXN0YXRpY19jYXN0PE5hdGl2ZUZ1bmN0aW9uPihqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlv bkN1c3RvbU1ldGhvZFdpdGhBcmdMaXN0KSwgKGludHB0cl90KTEgVEhVTktfR0VORVJBVE9SKDAp IH0sCiAgICAgeyAiY3VzdG9tQXJnc0FuZEV4Y2VwdGlvbiIsIERvbnREZWxldGUgfCBGdW5jdGlv biwgKGludHB0cl90KXN0YXRpY19jYXN0PE5hdGl2ZUZ1bmN0aW9uPihqc1Rlc3RPYmpQcm90b3R5 cGVGdW5jdGlvbkN1c3RvbUFyZ3NBbmRFeGNlcHRpb24pLCAoaW50cHRyX3QpMSBUSFVOS19HRU5F UkFUT1IoMCkgfSwKICAgICB7ICJhZGRFdmVudExpc3RlbmVyIiwgRG9udERlbGV0ZSB8IEZ1bmN0 aW9uLCAoaW50cHRyX3Qpc3RhdGljX2Nhc3Q8TmF0aXZlRnVuY3Rpb24+KGpzVGVzdE9ialByb3Rv dHlwZUZ1bmN0aW9uQWRkRXZlbnRMaXN0ZW5lciksIChpbnRwdHJfdCkzIFRIVU5LX0dFTkVSQVRP UigwKSB9LAogICAgIHsgInJlbW92ZUV2ZW50TGlzdGVuZXIiLCBEb250RGVsZXRlIHwgRnVuY3Rp b24sIChpbnRwdHJfdClzdGF0aWNfY2FzdDxOYXRpdmVGdW5jdGlvbj4oanNUZXN0T2JqUHJvdG90 eXBlRnVuY3Rpb25SZW1vdmVFdmVudExpc3RlbmVyKSwgKGludHB0cl90KTMgVEhVTktfR0VORVJB VE9SKDApIH0sCkBAIC02MDcsNiArNjA4LDcgQEAgSlNWYWx1ZSBqc1Rlc3RPYmpDb25zdHJ1Y3Rv cihFeGVjU3RhdGUqIAogICAgIEpTVGVzdE9iaiogZG9tT2JqZWN0ID0gc3RhdGljX2Nhc3Q8SlNU ZXN0T2JqKj4oYXNPYmplY3Qoc2xvdEJhc2UpKTsKICAgICByZXR1cm4gSlNUZXN0T2JqOjpnZXRD b25zdHJ1Y3RvcihleGVjLCBkb21PYmplY3QtPmdsb2JhbE9iamVjdCgpKTsKIH0KKwogdm9pZCBK U1Rlc3RPYmo6OnB1dChFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IElkZW50aWZpZXImIHByb3BlcnR5 TmFtZSwgSlNWYWx1ZSB2YWx1ZSwgUHV0UHJvcGVydHlTbG90JiBzbG90KQogewogICAgIGxvb2t1 cFB1dDxKU1Rlc3RPYmosIEJhc2U+KGV4ZWMsIHByb3BlcnR5TmFtZSwgdmFsdWUsICZKU1Rlc3RP YmpUYWJsZSwgdGhpcywgc2xvdCk7CkBAIC0xMDY2LDYgKzEwNjgsMTUgQEAgRW5jb2RlZEpTVmFs dWUgSlNDX0hPU1RfQ0FMTCBqc1Rlc3RPYmpQcgogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUo Y2FzdGVkVGhpcy0+Y3VzdG9tTWV0aG9kV2l0aEFyZ3MoZXhlYykpOwogfQogCitFbmNvZGVkSlNW YWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uQ3VzdG9tTWV0aG9k V2l0aEFyZ0xpc3QoRXhlY1N0YXRlKiBleGVjKQoreworICAgIEpTVmFsdWUgdGhpc1ZhbHVlID0g ZXhlYy0+aG9zdFRoaXNWYWx1ZSgpOworICAgIGlmICghdGhpc1ZhbHVlLmluaGVyaXRzKCZKU1Rl c3RPYmo6OnNfaW5mbykpCisgICAgICAgIHJldHVybiB0aHJvd1ZNVHlwZUVycm9yKGV4ZWMpOwor ICAgIEpTVGVzdE9iaiogY2FzdGVkVGhpcyA9IHN0YXRpY19jYXN0PEpTVGVzdE9iaio+KGFzT2Jq ZWN0KHRoaXNWYWx1ZSkpOworICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoY2FzdGVkVGhpcy0+ Y3VzdG9tTWV0aG9kV2l0aEFyZ0xpc3QoZXhlYywgQXJnTGlzdChleGVjKSkpOworfQorCiBFbmNv ZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uQ3VzdG9t QXJnc0FuZEV4Y2VwdGlvbihFeGVjU3RhdGUqIGV4ZWMpCiB7CiAgICAgSlNWYWx1ZSB0aGlzVmFs dWUgPSBleGVjLT5ob3N0VGhpc1ZhbHVlKCk7CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvdGVzdC9KUy9KU1Rlc3RPYmouaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvdGVzdC9KUy9KU1Rlc3RPYmouaAkocmV2aXNpb24gNzQ5MjUpCisrKyBXZWJDb3JlL2Jp bmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RPYmouaAkod29ya2luZyBjb3B5KQpAQCAtNTYs NiArNTYsNyBAQCBwdWJsaWM6CiAgICAgLy8gQ3VzdG9tIGZ1bmN0aW9ucwogICAgIEpTQzo6SlNW YWx1ZSBjdXN0b21NZXRob2QoSlNDOjpFeGVjU3RhdGUqKTsKICAgICBKU0M6OkpTVmFsdWUgY3Vz dG9tTWV0aG9kV2l0aEFyZ3MoSlNDOjpFeGVjU3RhdGUqKTsKKyAgICBKU0M6OkpTVmFsdWUgY3Vz dG9tTWV0aG9kV2l0aEFyZ0xpc3QoSlNDOjpFeGVjU3RhdGUqLCBjb25zdCBKU0M6OkFyZ0xpc3Qm KTsKICAgICBUZXN0T2JqKiBpbXBsKCkgY29uc3QgeyByZXR1cm4gbV9pbXBsLmdldCgpOyB9CiAK IHByaXZhdGU6CkBAIC0xMDAsNiArMTAxLDcgQEAgSlNDOjpFbmNvZGVkSlNWYWx1ZSBKU0NfSE9T VF9DQUxMIGpzVGVzdAogSlNDOjpFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdE9i alByb3RvdHlwZUZ1bmN0aW9uTWV0aG9kV2l0aEV4Y2VwdGlvbihKU0M6OkV4ZWNTdGF0ZSopOwog SlNDOjpFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0 aW9uQ3VzdG9tTWV0aG9kKEpTQzo6RXhlY1N0YXRlKik7CiBKU0M6OkVuY29kZWRKU1ZhbHVlIEpT Q19IT1NUX0NBTEwganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25DdXN0b21NZXRob2RXaXRoQXJn cyhKU0M6OkV4ZWNTdGF0ZSopOworSlNDOjpFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpz VGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uQ3VzdG9tTWV0aG9kV2l0aEFyZ0xpc3QoSlNDOjpFeGVj U3RhdGUqKTsKIEpTQzo6RW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc1Rlc3RPYmpQcm90 b3R5cGVGdW5jdGlvbkN1c3RvbUFyZ3NBbmRFeGNlcHRpb24oSlNDOjpFeGVjU3RhdGUqKTsKIEpT Qzo6RW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlv bkFkZEV2ZW50TGlzdGVuZXIoSlNDOjpFeGVjU3RhdGUqKTsKIEpTQzo6RW5jb2RlZEpTVmFsdWUg SlNDX0hPU1RfQ0FMTCBqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvblJlbW92ZUV2ZW50TGlzdGVu ZXIoSlNDOjpFeGVjU3RhdGUqKTsKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0 L09iakMvRE9NVGVzdE9iai5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0 cy90ZXN0L09iakMvRE9NVGVzdE9iai5oCShyZXZpc2lvbiA3NDkyNSkKKysrIFdlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy90ZXN0L09iakMvRE9NVGVzdE9iai5oCSh3b3JraW5nIGNvcHkpCkBAIC0z MSw2ICszMSw3IEBACiBAY2xhc3MgRE9NSURCS2V5OwogQGNsYXNzIERPTU9wdGlvbnNPYmplY3Q7 CiBAY2xhc3MgRE9NVGVzdE9iajsKK0BjbGFzcyBET01hcmdMaXN0OwogQGNsYXNzIERPTWxvZzsK IEBjbGFzcyBOU1N0cmluZzsKIEBwcm90b2NvbCBET01FdmVudExpc3RlbmVyOwpAQCAtMTM0LDYg KzEzNSw3IEBAIGVudW0gewogLSAodm9pZCltZXRob2RXaXRoRXhjZXB0aW9uOwogLSAodm9pZClj dXN0b21NZXRob2Q7CiAtICh2b2lkKWN1c3RvbU1ldGhvZFdpdGhBcmdzOihpbnQpaW50QXJnIHN0 ckFyZzooTlNTdHJpbmcgKilzdHJBcmcgb2JqQXJnOihET01UZXN0T2JqICopb2JqQXJnOworLSAo dm9pZCljdXN0b21NZXRob2RXaXRoQXJnTGlzdDooRE9NYXJnTGlzdCAqKTsKIC0gKHZvaWQpY3Vz dG9tQXJnc0FuZEV4Y2VwdGlvbjooRE9NbG9nICopaW50QXJnOwogLSAodm9pZClhZGRFdmVudExp c3RlbmVyOihOU1N0cmluZyAqKXR5cGUgbGlzdGVuZXI6KGlkIDxET01FdmVudExpc3RlbmVyPils aXN0ZW5lciB1c2VDYXB0dXJlOihCT09MKXVzZUNhcHR1cmU7CiAtICh2b2lkKXJlbW92ZUV2ZW50 TGlzdGVuZXI6KE5TU3RyaW5nICopdHlwZSBsaXN0ZW5lcjooaWQgPERPTUV2ZW50TGlzdGVuZXI+ KWxpc3RlbmVyIHVzZUNhcHR1cmU6KEJPT0wpdXNlQ2FwdHVyZTsKSW5kZXg6IFdlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy90ZXN0L09iakMvRE9NVGVzdE9iai5tbQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9PYmpDL0RPTVRlc3RPYmoubW0JKHJldmlzaW9uIDc0 OTI1KQorKysgV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvT2JqQy9ET01UZXN0T2JqLm1t CSh3b3JraW5nIGNvcHkpCkBAIC0zOCw2ICszOCw3IEBACiAjaW1wb3J0ICJET01PcHRpb25zT2Jq ZWN0SW50ZXJuYWwuaCIKICNpbXBvcnQgIkRPTVN0eWxlU2hlZXRJbnRlcm5hbC5oIgogI2ltcG9y dCAiRE9NVGVzdE9iakludGVybmFsLmgiCisjaW1wb3J0ICJET01hcmdMaXN0SW50ZXJuYWwuaCIK ICNpbXBvcnQgIkRPTWxvZ0ludGVybmFsLmgiCiAjaW1wb3J0ICJFdmVudExpc3RlbmVyLmgiCiAj aW1wb3J0ICJFeGNlcHRpb25IYW5kbGVycy5oIgpAQCAtNTIsNiArNTMsNyBAQAogI2ltcG9ydCAi VGhyZWFkQ2hlY2suaCIKICNpbXBvcnQgIldlYkNvcmVPYmpDRXh0cmFzLmgiCiAjaW1wb3J0ICJX ZWJTY3JpcHRPYmplY3RQcml2YXRlLmgiCisjaW1wb3J0ICJhcmdMaXN0LmgiCiAjaW1wb3J0ICJs b2cuaCIKICNpbXBvcnQgPHd0Zi9HZXRQdHIuaD4KIApAQCAtNTczLDYgKzU3NSwxMiBAQCAtICh2 b2lkKWN1c3RvbU1ldGhvZFdpdGhBcmdzOihpbnQpaW50QXJnCiAgICAgSU1QTC0+Y3VzdG9tTWV0 aG9kV2l0aEFyZ3MoaW50QXJnLCBzdHJBcmcsIGNvcmUob2JqQXJnKSk7CiB9CiAKKy0gKHZvaWQp Y3VzdG9tTWV0aG9kV2l0aEFyZ0xpc3Q6KERPTWFyZ0xpc3QgKikKK3sKKyAgICBXZWJDb3JlOjpK U01haW5UaHJlYWROdWxsU3RhdGUgc3RhdGU7CisgICAgSU1QTC0+Y3VzdG9tTWV0aG9kV2l0aEFy Z0xpc3QoY29yZSgpKTsKK30KKwogLSAodm9pZCljdXN0b21BcmdzQW5kRXhjZXB0aW9uOihET01s b2cgKilpbnRBcmcKIHsKICAgICBXZWJDb3JlOjpKU01haW5UaHJlYWROdWxsU3RhdGUgc3RhdGU7 CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RPYmouY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdE9iai5j cHAJKHJldmlzaW9uIDc0OTI1KQorKysgV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgv VjhUZXN0T2JqLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYwLDcgKzI2MCw3IEBAIHN0YXRpYyB2 ODo6SGFuZGxlPHY4OjpWYWx1ZT4gcmVmbGVjdGVkVW4KIHsKICAgICBJTkNfU1RBVFMoIkRPTS5U ZXN0T2JqLnJlZmxlY3RlZFVuc2lnbmVkSW50ZWdyYWxBdHRyLl9nZXQiKTsKICAgICBUZXN0T2Jq KiBpbXAgPSBWOFRlc3RPYmo6OnRvTmF0aXZlKGluZm8uSG9sZGVyKCkpOwotICAgIHJldHVybiB2 ODo6SW50ZWdlcjo6TmV3RnJvbVVuc2lnbmVkKGltcC0+Z2V0VW5zaWduZWRJbnRlZ3JhbEF0dHJp YnV0ZShXZWJDb3JlOjpIVE1MTmFtZXM6OnJlZmxlY3RlZHVuc2lnbmVkaW50ZWdyYWxhdHRyQXR0 cikpOworICAgIHJldHVybiB2ODo6SW50ZWdlcjo6TmV3RnJvbVVuc2lnbmVkKHN0ZDo6bWF4KDAs IGltcC0+Z2V0SW50ZWdyYWxBdHRyaWJ1dGUoV2ViQ29yZTo6SFRNTE5hbWVzOjpyZWZsZWN0ZWR1 bnNpZ25lZGludGVncmFsYXR0ckF0dHIpKSk7CiB9CiAKIHN0YXRpYyB2b2lkIHJlZmxlY3RlZFVu c2lnbmVkSW50ZWdyYWxBdHRyQXR0clNldHRlcih2ODo6TG9jYWw8djg6OlN0cmluZz4gbmFtZSwg djg6OkxvY2FsPHY4OjpWYWx1ZT4gdmFsdWUsIGNvbnN0IHY4OjpBY2Nlc3NvckluZm8mIGluZm8p CkBAIC0xMjM4LDYgKzEyMzgsNyBAQCBzdGF0aWMgY29uc3QgQmF0Y2hlZENhbGxiYWNrIFRlc3RP YmpDYWxsCiAgICAgeyJtZXRob2RXaXRoRXhjZXB0aW9uIiwgVGVzdE9iakludGVybmFsOjptZXRo b2RXaXRoRXhjZXB0aW9uQ2FsbGJhY2t9LAogICAgIHsiY3VzdG9tTWV0aG9kIiwgVjhUZXN0T2Jq OjpjdXN0b21NZXRob2RDYWxsYmFja30sCiAgICAgeyJjdXN0b21NZXRob2RXaXRoQXJncyIsIFY4 VGVzdE9iajo6Y3VzdG9tTWV0aG9kV2l0aEFyZ3NDYWxsYmFja30sCisgICAgeyJjdXN0b21NZXRo b2RXaXRoQXJnTGlzdCIsIFY4VGVzdE9iajo6Y3VzdG9tTWV0aG9kV2l0aEFyZ0xpc3RDYWxsYmFj a30sCiAgICAgeyJhZGRFdmVudExpc3RlbmVyIiwgVGVzdE9iakludGVybmFsOjphZGRFdmVudExp c3RlbmVyQ2FsbGJhY2t9LAogICAgIHsicmVtb3ZlRXZlbnRMaXN0ZW5lciIsIFRlc3RPYmpJbnRl cm5hbDo6cmVtb3ZlRXZlbnRMaXN0ZW5lckNhbGxiYWNrfSwKICAgICB7IndpdGhEeW5hbWljRnJh bWUiLCBUZXN0T2JqSW50ZXJuYWw6OndpdGhEeW5hbWljRnJhbWVDYWxsYmFja30sCkluZGV4OiBX ZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RPYmouaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RPYmouaAkocmV2aXNpb24g NzQ5MjUpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RPYmouaAko d29ya2luZyBjb3B5KQpAQCAtNDUsNiArNDUsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFdyYXBw ZXJUeXBlSW5mbyBpbmZvOwogICAgIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gY3VzdG9t TWV0aG9kQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYpOwogICAgIHN0YXRpYyB2ODo6SGFu ZGxlPHY4OjpWYWx1ZT4gY3VzdG9tTWV0aG9kV2l0aEFyZ3NDYWxsYmFjayhjb25zdCB2ODo6QXJn dW1lbnRzJik7CisgICAgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBjdXN0b21NZXRob2RX aXRoQXJnTGlzdENhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmKTsKICAgICBzdGF0aWMgdjg6 OkhhbmRsZTx2ODo6VmFsdWU+IGN1c3RvbUF0dHJBY2Nlc3NvckdldHRlcih2ODo6TG9jYWw8djg6 OlN0cmluZz4gbmFtZSwgY29uc3Qgdjg6OkFjY2Vzc29ySW5mbyYgaW5mbyk7CiAgICAgc3RhdGlj IHZvaWQgY3VzdG9tQXR0ckFjY2Vzc29yU2V0dGVyKHY4OjpMb2NhbDx2ODo6U3RyaW5nPiBuYW1l LCB2ODo6TG9jYWw8djg6OlZhbHVlPiB2YWx1ZSwgY29uc3Qgdjg6OkFjY2Vzc29ySW5mbyYgaW5m byk7CiAgICAgc3RhdGljIGNvbnN0IGludCBpbnRlcm5hbEZpZWxkQ291bnQgPSB2OERlZmF1bHRX cmFwcGVySW50ZXJuYWxGaWVsZENvdW50ICsgMDsK