133983 2014-06-17 08:16:40 -0700 [GTK] Add support for constants in GObject DOM bindings 2014-06-26 00:46:12 -0700 1 1 1 Unclassified WebKit Bindings 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned cdumez commit-queue gustavo oldest_to_newest 1016117 0 cgarcia 2014-06-17 08:16:40 -0700 We don't expose any constant. 1016119 1 233230 cgarcia 2014-06-17 08:19:17 -0700 Created attachment 233230 Patch The support for constants in .symbols files and the docs is added in bug #93002, I'll update this patch once that bug is fixed. 1016896 2 233415 cgarcia 2014-06-20 01:57:53 -0700 Created attachment 233415 Updated patch Patch updated now that both bug #133726 and #93002 are fixed. 1018348 3 233415 mrobinson 2014-06-25 09:29:01 -0700 Comment on attachment 233415 Updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=233415&action=review > Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm:896 > + push(@hBody, $implContent); > + > + if ($isStableClass) { > + push(@symbols, "GType ${lowerCaseIfaceName}_get_type(void)\n"); > + } > + > + if (@{$interface->constants}) { > + my @constants = @{$interface->constants}; > + foreach my $constant (@constants) { > + my $conditionalString = $codeGenerator->GenerateConditionalString($constant); > + my $constantName = "WEBKIT_DOM_${clsCaps}_" . $constant->name; > + my $constantValue = $constant->value; > + my $isStableSymbol = grep {$_ eq $constantName} @stableSymbols; > + if ($isStableSymbol) { > + push(@symbols, "$constantName\n"); > + } > + > + my @constantHeader = (); > + push(@constantHeader, "#if ${conditionalString}") if $conditionalString; > + push(@constantHeader, "/**"); > + push(@constantHeader, " * ${constantName}:"); > + push(@constantHeader, " */"); > + push(@constantHeader, "#define $constantName $constantValue"); > + push(@constantHeader, "#endif /* ${conditionalString} */") if $conditionalString; > + push(@constantHeader, "\n"); > + > + if ($isStableSymbol or !$isStableClass) { > + push(@hBody, join("\n", @constantHeader)); > + } else { > + push(@hBodyUnstable, join("\n", @constantHeader)); > + } > + } > + } > + I think it makes sense to move this to a helper. We don't do that a lot, but these files need serious cleanup. 1018592 4 cgarcia 2014-06-26 00:46:12 -0700 Committed r170475: <http://trac.webkit.org/changeset/170475> 233230 2014-06-17 08:19:17 -0700 2014-06-20 01:57:53 -0700 Patch wkdom-constants.diff text/plain 6517 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyNDgzYzE2Li4zYWFmZjFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTQtMDYtMTcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIEFkZCBzdXBwb3J0IGZvciBjb25zdGFudHMgaW4gR09iamVjdCBE T00gYmluZGluZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEzMzk4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yR09iamVjdC5wbToKKyAgICAgICAg KEdlbmVyYXRlSGVhZGVyKTogQWRkIGNvbnN0YW50cyB0byB0aGUgaGVhZGVyLgorICAgICAgICAo R2VuZXJhdGUpOiBQYXNzIHRoZSBpbnRlcmZhY2Ugb2JqZWN0IHRvIEdlbmVyYXRlSGVhZGVyIHRv IGdldCB0aGUgY29uc3RhbnRzLgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9HT2Jq ZWN0L1dlYktpdERPTVRlc3RJbnRlcmZhY2UuaDoKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRz L3Rlc3QvR09iamVjdC9XZWJLaXRET01UZXN0T2JqLmg6CisKIDIwMTQtMDYtMTcgIFphbiBEb2Jl cnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIENhY2hlIHRoZSBnc3RfcXVl cnlfZ2V0X25fYnVmZmVyaW5nX3JhbmdlcygpIHJldHVybiB2YWx1ZSBmb3IgdGhlIGZvci1sb29w IGNvbmRpdGlvbmFsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRz L0NvZGVHZW5lcmF0b3JHT2JqZWN0LnBtIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0 cy9Db2RlR2VuZXJhdG9yR09iamVjdC5wbQppbmRleCBhMTkxZDgyLi4xY2JlZGUwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0 LnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckdP YmplY3QucG0KQEAgLTgwNSw3ICs4MDUsNyBAQCBFT0YKIH0KIAogc3ViIEdlbmVyYXRlSGVhZGVy IHsKLSAgICBteSAoJG9iamVjdCwgJGludGVyZmFjZU5hbWUsICRwYXJlbnRDbGFzc05hbWUpID0g QF87CisgICAgbXkgKCRvYmplY3QsICRpbnRlcmZhY2VOYW1lLCAkcGFyZW50Q2xhc3NOYW1lLCAk aW50ZXJmYWNlKSA9IEBfOwogCiAgICAgbXkgJGltcGxDb250ZW50ID0gIiI7CiAKQEAgLTg1MCw2 ICs4NTAsMjcgQEAgRU9GCiAjZGVmaW5lIFdFQktJVF9ET01fSVNfJHtjbHNDYXBzfV9DTEFTUyhr bGFzcykgKEdfVFlQRV9DSEVDS19DTEFTU19UWVBFKChrbGFzcyksICBXRUJLSVRfVFlQRV9ET01f JHtjbHNDYXBzfSkpCiAjZGVmaW5lIFdFQktJVF9ET01fJHtjbHNDYXBzfV9HRVRfQ0xBU1Mob2Jq KSAgKEdfVFlQRV9JTlNUQU5DRV9HRVRfQ0xBU1MoKG9iaiksICBXRUJLSVRfVFlQRV9ET01fJHtj bHNDYXBzfSwgJHtjbGFzc05hbWV9Q2xhc3MpKQogCitFT0YKKworICAgIHB1c2goQGhCb2R5LCAk aW1wbENvbnRlbnQpOworCisgICAgaWYgKEB7JGludGVyZmFjZS0+Y29uc3RhbnRzfSkgeworICAg ICAgICBteSBAY29uc3RhbnRzID0gQHskaW50ZXJmYWNlLT5jb25zdGFudHN9OworICAgICAgICBm b3JlYWNoIG15ICRjb25zdGFudCAoQGNvbnN0YW50cykgeworICAgICAgICAgICAgbXkgJGNvbmRp dGlvbmFsU3RyaW5nID0gJGNvZGVHZW5lcmF0b3ItPkdlbmVyYXRlQ29uZGl0aW9uYWxTdHJpbmco JGNvbnN0YW50KTsKKyAgICAgICAgICAgIG15ICRjb25zdGFudE5hbWUgPSAiV0VCS0lUX0RPTV8k e2Nsc0NhcHN9XyIgLiAkY29uc3RhbnQtPm5hbWU7CisgICAgICAgICAgICBteSAkY29uc3RhbnRW YWx1ZSA9ICRjb25zdGFudC0+dmFsdWU7CisgICAgICAgICAgICBwdXNoKEBoQm9keSwgIiNpZiAk e2NvbmRpdGlvbmFsU3RyaW5nfVxuIikgaWYgJGNvbmRpdGlvbmFsU3RyaW5nOworICAgICAgICAg ICAgcHVzaChAaEJvZHksICIvKipcbiIpOworICAgICAgICAgICAgcHVzaChAaEJvZHksICIgKiAk e2NvbnN0YW50TmFtZX06XG4iKTsKKyAgICAgICAgICAgIHB1c2goQGhCb2R5LCAiICovXG4iKTsK KyAgICAgICAgICAgIHB1c2goQGhCb2R5LCAiI2RlZmluZSAkY29uc3RhbnROYW1lICRjb25zdGFu dFZhbHVlXG4iKTsKKyAgICAgICAgICAgIHB1c2goQGhCb2R5LCAiI2VuZGlmIC8qICR7Y29uZGl0 aW9uYWxTdHJpbmd9ICovXG4iKSBpZiAkY29uZGl0aW9uYWxTdHJpbmc7CisgICAgICAgICAgICBw dXNoKEBoQm9keSwgIlxuIik7CisgICAgICAgIH0KKyAgICB9CisKKyAgICAkaW1wbENvbnRlbnQg PSA8PCAiRU9GIjsKIHN0cnVjdCBfJHtjbGFzc05hbWV9IHsKICAgICAke3BhcmVudENsYXNzTmFt ZX0gcGFyZW50X2luc3RhbmNlOwogfTsKQEAgLTE0OTgsNyArMTUxOSw3IEBAIHN1YiBHZW5lcmF0 ZSB7CiAKICAgICAkaGRySW5jbHVkZXN7IndlYmtpdGRvbS8ke3BhcmVudENsYXNzTmFtZX0uaCJ9 ID0gMTsKIAotICAgICRvYmplY3QtPkdlbmVyYXRlSGVhZGVyKCRpbnRlcmZhY2VOYW1lLCAkcGFy ZW50Q2xhc3NOYW1lKTsKKyAgICAkb2JqZWN0LT5HZW5lcmF0ZUhlYWRlcigkaW50ZXJmYWNlTmFt ZSwgJHBhcmVudENsYXNzTmFtZSwgJGludGVyZmFjZSk7CiAgICAgJG9iamVjdC0+R2VuZXJhdGVD RmlsZSgkaW50ZXJmYWNlTmFtZSwgJHBhcmVudENsYXNzTmFtZSwgJHBhcmVudEdPYmpUeXBlLCAk aW50ZXJmYWNlKTsKICAgICAkb2JqZWN0LT5HZW5lcmF0ZUVuZEhlYWRlcigpOwogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0dPYmplY3QvV2ViS2l0 RE9NVGVzdEludGVyZmFjZS5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0 L0dPYmplY3QvV2ViS2l0RE9NVGVzdEludGVyZmFjZS5oCmluZGV4IDU1OGY1YjkuLjI2MThkNDkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9HT2JqZWN0 L1dlYktpdERPTVRlc3RJbnRlcmZhY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL3Rlc3QvR09iamVjdC9XZWJLaXRET01UZXN0SW50ZXJmYWNlLmgKQEAgLTM4LDYgKzM4 LDM0IEBAIEdfQkVHSU5fREVDTFMKICNkZWZpbmUgV0VCS0lUX0RPTV9JU19URVNUX0lOVEVSRkFD RV9DTEFTUyhrbGFzcykgKEdfVFlQRV9DSEVDS19DTEFTU19UWVBFKChrbGFzcyksICBXRUJLSVRf VFlQRV9ET01fVEVTVF9JTlRFUkZBQ0UpKQogI2RlZmluZSBXRUJLSVRfRE9NX1RFU1RfSU5URVJG QUNFX0dFVF9DTEFTUyhvYmopICAoR19UWVBFX0lOU1RBTkNFX0dFVF9DTEFTUygob2JqKSwgIFdF QktJVF9UWVBFX0RPTV9URVNUX0lOVEVSRkFDRSwgV2ViS2l0RE9NVGVzdEludGVyZmFjZUNsYXNz KSkKIAorI2lmIEVOQUJMRShDb25kaXRpb24yMikgfHwgRU5BQkxFKENvbmRpdGlvbjIzKQorLyoq CisgKiBXRUJLSVRfRE9NX1RFU1RfSU5URVJGQUNFX0lNUExFTUVOVFNDT05TVEFOVDE6CisgKi8K KyNkZWZpbmUgV0VCS0lUX0RPTV9URVNUX0lOVEVSRkFDRV9JTVBMRU1FTlRTQ09OU1RBTlQxIDEK KyNlbmRpZiAvKiBFTkFCTEUoQ29uZGl0aW9uMjIpIHx8IEVOQUJMRShDb25kaXRpb24yMykgKi8K KworI2lmIEVOQUJMRShDb25kaXRpb24yMikgfHwgRU5BQkxFKENvbmRpdGlvbjIzKQorLyoqCisg KiBXRUJLSVRfRE9NX1RFU1RfSU5URVJGQUNFX0lNUExFTUVOVFNDT05TVEFOVDI6CisgKi8KKyNk ZWZpbmUgV0VCS0lUX0RPTV9URVNUX0lOVEVSRkFDRV9JTVBMRU1FTlRTQ09OU1RBTlQyIDIKKyNl bmRpZiAvKiBFTkFCTEUoQ29uZGl0aW9uMjIpIHx8IEVOQUJMRShDb25kaXRpb24yMykgKi8KKwor I2lmIEVOQUJMRShDb25kaXRpb24xMSkgfHwgRU5BQkxFKENvbmRpdGlvbjEyKQorLyoqCisgKiBX RUJLSVRfRE9NX1RFU1RfSU5URVJGQUNFX1NVUFBMRU1FTlRBTENPTlNUQU5UMToKKyAqLworI2Rl ZmluZSBXRUJLSVRfRE9NX1RFU1RfSU5URVJGQUNFX1NVUFBMRU1FTlRBTENPTlNUQU5UMSAxCisj ZW5kaWYgLyogRU5BQkxFKENvbmRpdGlvbjExKSB8fCBFTkFCTEUoQ29uZGl0aW9uMTIpICovCisK KyNpZiBFTkFCTEUoQ29uZGl0aW9uMTEpIHx8IEVOQUJMRShDb25kaXRpb24xMikKKy8qKgorICog V0VCS0lUX0RPTV9URVNUX0lOVEVSRkFDRV9TVVBQTEVNRU5UQUxDT05TVEFOVDI6CisgKi8KKyNk ZWZpbmUgV0VCS0lUX0RPTV9URVNUX0lOVEVSRkFDRV9TVVBQTEVNRU5UQUxDT05TVEFOVDIgMgor I2VuZGlmIC8qIEVOQUJMRShDb25kaXRpb24xMSkgfHwgRU5BQkxFKENvbmRpdGlvbjEyKSAqLwor CiBzdHJ1Y3QgX1dlYktpdERPTVRlc3RJbnRlcmZhY2UgewogICAgIFdlYktpdERPTU9iamVjdCBw YXJlbnRfaW5zdGFuY2U7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy90ZXN0L0dPYmplY3QvV2ViS2l0RE9NVGVzdE9iai5oIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy90ZXN0L0dPYmplY3QvV2ViS2l0RE9NVGVzdE9iai5oCmluZGV4IDAx YmU2M2MuLmZiMGI4ZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvdGVzdC9HT2JqZWN0L1dlYktpdERPTVRlc3RPYmouaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL3Rlc3QvR09iamVjdC9XZWJLaXRET01UZXN0T2JqLmgKQEAgLTM4LDYg KzM4LDczIEBAIEdfQkVHSU5fREVDTFMKICNkZWZpbmUgV0VCS0lUX0RPTV9JU19URVNUX09CSl9D TEFTUyhrbGFzcykgKEdfVFlQRV9DSEVDS19DTEFTU19UWVBFKChrbGFzcyksICBXRUJLSVRfVFlQ RV9ET01fVEVTVF9PQkopKQogI2RlZmluZSBXRUJLSVRfRE9NX1RFU1RfT0JKX0dFVF9DTEFTUyhv YmopICAoR19UWVBFX0lOU1RBTkNFX0dFVF9DTEFTUygob2JqKSwgIFdFQktJVF9UWVBFX0RPTV9U RVNUX09CSiwgV2ViS2l0RE9NVGVzdE9iakNsYXNzKSkKIAorI2lmIEVOQUJMRShDb25kaXRpb24x KQorLyoqCisgKiBXRUJLSVRfRE9NX1RFU1RfT0JKX0NPTkRJVElPTkFMX0NPTlNUOgorICovCisj ZGVmaW5lIFdFQktJVF9ET01fVEVTVF9PQkpfQ09ORElUSU9OQUxfQ09OU1QgMAorI2VuZGlmIC8q IEVOQUJMRShDb25kaXRpb24xKSAqLworCisvKioKKyAqIFdFQktJVF9ET01fVEVTVF9PQkpfQ09O U1RfVkFMVUVfMDoKKyAqLworI2RlZmluZSBXRUJLSVRfRE9NX1RFU1RfT0JKX0NPTlNUX1ZBTFVF XzAgMAorCisvKioKKyAqIFdFQktJVF9ET01fVEVTVF9PQkpfQ09OU1RfVkFMVUVfMToKKyAqLwor I2RlZmluZSBXRUJLSVRfRE9NX1RFU1RfT0JKX0NPTlNUX1ZBTFVFXzEgMQorCisvKioKKyAqIFdF QktJVF9ET01fVEVTVF9PQkpfQ09OU1RfVkFMVUVfMjoKKyAqLworI2RlZmluZSBXRUJLSVRfRE9N X1RFU1RfT0JKX0NPTlNUX1ZBTFVFXzIgMgorCisvKioKKyAqIFdFQktJVF9ET01fVEVTVF9PQkpf Q09OU1RfVkFMVUVfNDoKKyAqLworI2RlZmluZSBXRUJLSVRfRE9NX1RFU1RfT0JKX0NPTlNUX1ZB TFVFXzQgNAorCisvKioKKyAqIFdFQktJVF9ET01fVEVTVF9PQkpfQ09OU1RfVkFMVUVfODoKKyAq LworI2RlZmluZSBXRUJLSVRfRE9NX1RFU1RfT0JKX0NPTlNUX1ZBTFVFXzggOAorCisvKioKKyAq IFdFQktJVF9ET01fVEVTVF9PQkpfQ09OU1RfVkFMVUVfOToKKyAqLworI2RlZmluZSBXRUJLSVRf RE9NX1RFU1RfT0JKX0NPTlNUX1ZBTFVFXzkgLTEKKworLyoqCisgKiBXRUJLSVRfRE9NX1RFU1Rf T0JKX0NPTlNUX1ZBTFVFXzExOgorICovCisjZGVmaW5lIFdFQktJVF9ET01fVEVTVF9PQkpfQ09O U1RfVkFMVUVfMTEgMHhmZmZmZmZmZgorCisvKioKKyAqIFdFQktJVF9ET01fVEVTVF9PQkpfQ09O U1RfVkFMVUVfMTI6CisgKi8KKyNkZWZpbmUgV0VCS0lUX0RPTV9URVNUX09CSl9DT05TVF9WQUxV RV8xMiAweDAxCisKKy8qKgorICogV0VCS0lUX0RPTV9URVNUX09CSl9DT05TVF9WQUxVRV8xMzoK KyAqLworI2RlZmluZSBXRUJLSVRfRE9NX1RFU1RfT0JKX0NPTlNUX1ZBTFVFXzEzIDBYMjAKKwor LyoqCisgKiBXRUJLSVRfRE9NX1RFU1RfT0JKX0NPTlNUX1ZBTFVFXzE0OgorICovCisjZGVmaW5l IFdFQktJVF9ET01fVEVTVF9PQkpfQ09OU1RfVkFMVUVfMTQgMHgxYWJjCisKKy8qKgorICogV0VC S0lUX0RPTV9URVNUX09CSl9DT05TVF9KQVZBU0NSSVBUOgorICovCisjZGVmaW5lIFdFQktJVF9E T01fVEVTVF9PQkpfQ09OU1RfSkFWQVNDUklQVCAxNQorCisvKioKKyAqIFdFQktJVF9ET01fVEVT VF9PQkpfcmVhZG9ubHk6CisgKi8KKyNkZWZpbmUgV0VCS0lUX0RPTV9URVNUX09CSl9yZWFkb25s eSAwCisKIHN0cnVjdCBfV2ViS2l0RE9NVGVzdE9iaiB7CiAgICAgV2ViS2l0RE9NT2JqZWN0IHBh cmVudF9pbnN0YW5jZTsKIH07Cg== 233415 2014-06-20 01:57:53 -0700 2014-06-25 09:33:33 -0700 Updated patch wkdom-constants.diff text/plain 14884 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5YWQ3MmE5Li40NDZlNWMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjIg QEAKIDIwMTQtMDYtMjAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIEFkZCBzdXBwb3J0IGZvciBjb25zdGFudHMgaW4gR09iamVjdCBE T00gYmluZGluZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEzMzk4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogYmluZGluZ3MvZ29iamVjdC93ZWJraXRkb20uc3ltYm9sczogQWRkIHN0YWJsZSBjb25z dGFudHMuCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yR09iamVjdC5w bToKKyAgICAgICAgKEdlbmVyYXRlSGVhZGVyKTogQWRkIGNvbnN0YW50cyB0byB0aGUgaGVhZGVy LgorICAgICAgICAoR2VuZXJhdGUpOiBQYXNzIHRoZSBpbnRlcmZhY2Ugb2JqZWN0IHRvIEdlbmVy YXRlSGVhZGVyIHRvIGdldCB0aGUgY29uc3RhbnRzCisgICAgICAgIChJc0ludGVyZmFjZVN5bWJv bCk6IEhlbHBlciBmdW5jdGlvbiB0aGF0IHJldHVybnMgd2hldGhlciB0aGUgZ2l2ZW4KKyAgICAg ICAgc3ltYm9sIGJlbG9uZ3MgdG8gdGhlIGludGVyZmFjZS4gQ2hlY2sgYWxzbyBjb25zdGFudHMg bm93LgorICAgICAgICAoUmVhZFN0YWJsZVN5bWJvbHMpOiBVc2UgSXNJbnRlcmZhY2VTeW1ib2wo KS4KKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvR09iamVjdC9XZWJLaXRET01UZXN0 SW50ZXJmYWNlLmg6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0dPYmplY3QvV2Vi S2l0RE9NVGVzdE9iai5oOgorCisyMDE0LTA2LTIwICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNn YXJjaWFAaWdhbGlhLmNvbT4KKwogICAgICAgICBVbnJldmlld2VkLiBGaXggR1RLKyBkZWJ1ZyBi dWlsZCBhZnRlciByMTcwMTc0LgogCiAgICAgICAgICogYmluZGluZ3MvZ29iamVjdC9XZWJLaXRE T01Ob2RlRmlsdGVyLmNwcDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2dv YmplY3Qvd2Via2l0ZG9tLnN5bWJvbHMgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9nb2JqZWN0 L3dlYmtpdGRvbS5zeW1ib2xzCmluZGV4IGE3OThmNWYuLmQ0ZTQ4NTYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL2dvYmplY3Qvd2Via2l0ZG9tLnN5bWJvbHMKKysrIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvZ29iamVjdC93ZWJraXRkb20uc3ltYm9scwpAQCAtMTc2LDYg KzE3NiwyNCBAQCBXZWJLaXRET01Ob2RlKiB3ZWJraXRfZG9tX25hbWVkX25vZGVfbWFwX3JlbW92 ZV9uYW1lZF9pdGVtKFdlYktpdERPTU5hbWVkTm9kZU1hcAogV2ViS2l0RE9NTm9kZSogd2Via2l0 X2RvbV9uYW1lZF9ub2RlX21hcF9yZW1vdmVfbmFtZWRfaXRlbV9ucyhXZWJLaXRET01OYW1lZE5v ZGVNYXAqLCBjb25zdCBnY2hhciosIGNvbnN0IGdjaGFyKiwgR0Vycm9yKiopCiBXZWJLaXRET01O b2RlKiB3ZWJraXRfZG9tX25hbWVkX25vZGVfbWFwX2l0ZW0oV2ViS2l0RE9NTmFtZWROb2RlTWFw KiwgZ3Vsb25nKQogR1R5cGUgd2Via2l0X2RvbV9ub2RlX2dldF90eXBlKHZvaWQpCitXRUJLSVRf RE9NX05PREVfRUxFTUVOVF9OT0RFCitXRUJLSVRfRE9NX05PREVfQVRUUklCVVRFX05PREUKK1dF QktJVF9ET01fTk9ERV9URVhUX05PREUKK1dFQktJVF9ET01fTk9ERV9DREFUQV9TRUNUSU9OX05P REUKK1dFQktJVF9ET01fTk9ERV9FTlRJVFlfUkVGRVJFTkNFX05PREUKK1dFQktJVF9ET01fTk9E RV9FTlRJVFlfTk9ERQorV0VCS0lUX0RPTV9OT0RFX1BST0NFU1NJTkdfSU5TVFJVQ1RJT05fTk9E RQorV0VCS0lUX0RPTV9OT0RFX0NPTU1FTlRfTk9ERQorV0VCS0lUX0RPTV9OT0RFX0RPQ1VNRU5U X05PREUKK1dFQktJVF9ET01fTk9ERV9ET0NVTUVOVF9UWVBFX05PREUKK1dFQktJVF9ET01fTk9E RV9ET0NVTUVOVF9GUkFHTUVOVF9OT0RFCitXRUJLSVRfRE9NX05PREVfTk9UQVRJT05fTk9ERQor V0VCS0lUX0RPTV9OT0RFX0RPQ1VNRU5UX1BPU0lUSU9OX0RJU0NPTk5FQ1RFRAorV0VCS0lUX0RP TV9OT0RFX0RPQ1VNRU5UX1BPU0lUSU9OX1BSRUNFRElORworV0VCS0lUX0RPTV9OT0RFX0RPQ1VN RU5UX1BPU0lUSU9OX0ZPTExPV0lORworV0VCS0lUX0RPTV9OT0RFX0RPQ1VNRU5UX1BPU0lUSU9O X0NPTlRBSU5TCitXRUJLSVRfRE9NX05PREVfRE9DVU1FTlRfUE9TSVRJT05fQ09OVEFJTkVEX0JZ CitXRUJLSVRfRE9NX05PREVfRE9DVU1FTlRfUE9TSVRJT05fSU1QTEVNRU5UQVRJT05fU1BFQ0lG SUMKIGd1c2hvcnQgd2Via2l0X2RvbV9ub2RlX2dldF9ub2RlX3R5cGUoV2ViS2l0RE9NTm9kZSop CiBnY2hhciogd2Via2l0X2RvbV9ub2RlX2dldF9ub2RlX25hbWUoV2ViS2l0RE9NTm9kZSopCiBn Y2hhciogd2Via2l0X2RvbV9ub2RlX2dldF9sb2NhbF9uYW1lKFdlYktpdERPTU5vZGUqKQpAQCAt OTM5LDEwICs5NTcsMTggQEAgV2ViS2l0RE9NQ1NTUnVsZUxpc3QqIHdlYmtpdF9kb21fY3NzX3N0 eWxlX3NoZWV0X2dldF9ydWxlcyhXZWJLaXRET01DU1NTdHlsZVNoZWUKIGd1bG9uZyB3ZWJraXRf ZG9tX2Nzc19zdHlsZV9zaGVldF9pbnNlcnRfcnVsZShXZWJLaXRET01DU1NTdHlsZVNoZWV0Kiwg Y29uc3QgZ2NoYXIqLCBndWxvbmcsIEdFcnJvcioqKQogdm9pZCB3ZWJraXRfZG9tX2Nzc19zdHls ZV9zaGVldF9yZW1vdmVfcnVsZShXZWJLaXRET01DU1NTdHlsZVNoZWV0KiwgZ3Vsb25nLCBHRXJy b3IqKikKIEdUeXBlIHdlYmtpdF9kb21fY3NzX3ZhbHVlX2dldF90eXBlKHZvaWQpCitXRUJLSVRf RE9NX0NTU19WQUxVRV9DU1NfSU5IRVJJVAorV0VCS0lUX0RPTV9DU1NfVkFMVUVfQ1NTX1BSSU1J VElWRV9WQUxVRQorV0VCS0lUX0RPTV9DU1NfVkFMVUVfQ1NTX1ZBTFVFX0xJU1QKK1dFQktJVF9E T01fQ1NTX1ZBTFVFX0NTU19DVVNUT00KIGdjaGFyKiB3ZWJraXRfZG9tX2Nzc192YWx1ZV9nZXRf Y3NzX3RleHQoV2ViS2l0RE9NQ1NTVmFsdWUqKQogZ3VzaG9ydCB3ZWJraXRfZG9tX2Nzc192YWx1 ZV9nZXRfY3NzX3ZhbHVlX3R5cGUoV2ViS2l0RE9NQ1NTVmFsdWUqKQogdm9pZCB3ZWJraXRfZG9t X2Nzc192YWx1ZV9zZXRfY3NzX3RleHQoV2ViS2l0RE9NQ1NTVmFsdWUqLCBjb25zdCBnY2hhcios IEdFcnJvcioqKQogR1R5cGUgd2Via2l0X2RvbV9ldmVudF9nZXRfdHlwZSh2b2lkKQorV0VCS0lU X0RPTV9FVkVOVF9OT05FCitXRUJLSVRfRE9NX0VWRU5UX0NBUFRVUklOR19QSEFTRQorV0VCS0lU X0RPTV9FVkVOVF9BVF9UQVJHRVQKK1dFQktJVF9ET01fRVZFTlRfQlVCQkxJTkdfUEhBU0UKIGdi b29sZWFuIHdlYmtpdF9kb21fZXZlbnRfZ2V0X2J1YmJsZXMoV2ViS2l0RE9NRXZlbnQqKQogZ2Jv b2xlYW4gd2Via2l0X2RvbV9ldmVudF9nZXRfY2FuY2VsYWJsZShXZWJLaXRET01FdmVudCopCiBn Ym9vbGVhbiB3ZWJraXRfZG9tX2V2ZW50X2dldF9jYW5jZWxfYnViYmxlKFdlYktpdERPTUV2ZW50 KikKQEAgLTk3Myw2ICs5OTksMTAgQEAgZ2xvbmcgd2Via2l0X2RvbV93aGVlbF9ldmVudF9nZXRf d2hlZWxfZGVsdGFfeChXZWJLaXRET01XaGVlbEV2ZW50KikKIGdsb25nIHdlYmtpdF9kb21fd2hl ZWxfZXZlbnRfZ2V0X3doZWVsX2RlbHRhX3koV2ViS2l0RE9NV2hlZWxFdmVudCopCiB2b2lkIHdl YmtpdF9kb21fd2hlZWxfZXZlbnRfaW5pdF93aGVlbF9ldmVudChXZWJLaXRET01XaGVlbEV2ZW50 KiwgZ2xvbmcsIGdsb25nLCBXZWJLaXRET01ET01XaW5kb3cqLCBnbG9uZywgZ2xvbmcsIGdsb25n LCBnbG9uZywgZ2Jvb2xlYW4sIGdib29sZWFuLCBnYm9vbGVhbiwgZ2Jvb2xlYW4pCiBHVHlwZSB3 ZWJraXRfZG9tX2tleWJvYXJkX2V2ZW50X2dldF90eXBlKHZvaWQpCitXRUJLSVRfRE9NX0tFWUJP QVJEX0VWRU5UX0tFWV9MT0NBVElPTl9TVEFOREFSRAorV0VCS0lUX0RPTV9LRVlCT0FSRF9FVkVO VF9LRVlfTE9DQVRJT05fTEVGVAorV0VCS0lUX0RPTV9LRVlCT0FSRF9FVkVOVF9LRVlfTE9DQVRJ T05fUklHSFQKK1dFQktJVF9ET01fS0VZQk9BUkRfRVZFTlRfS0VZX0xPQ0FUSU9OX05VTVBBRAog Z2Jvb2xlYW4gd2Via2l0X2RvbV9rZXlib2FyZF9ldmVudF9nZXRfYWx0X2dyYXBoX2tleShXZWJL aXRET01LZXlib2FyZEV2ZW50KikKIGdib29sZWFuIHdlYmtpdF9kb21fa2V5Ym9hcmRfZXZlbnRf Z2V0X2FsdF9rZXkoV2ViS2l0RE9NS2V5Ym9hcmRFdmVudCopCiBnYm9vbGVhbiB3ZWJraXRfZG9t X2tleWJvYXJkX2V2ZW50X2dldF9jdHJsX2tleShXZWJLaXRET01LZXlib2FyZEV2ZW50KikKQEAg LTEwMDIsNiArMTAzMiwxNCBAQCBnbG9uZyB3ZWJraXRfZG9tX21vdXNlX2V2ZW50X2dldF95KFdl YktpdERPTU1vdXNlRXZlbnQqKQogdm9pZCB3ZWJraXRfZG9tX21vdXNlX2V2ZW50X2luaXRfbW91 c2VfZXZlbnQoV2ViS2l0RE9NTW91c2VFdmVudCosIGNvbnN0IGdjaGFyKiwgZ2Jvb2xlYW4sIGdi b29sZWFuLCBXZWJLaXRET01ET01XaW5kb3cqLCBnbG9uZywgZ2xvbmcsIGdsb25nLCBnbG9uZywg Z2xvbmcsIGdib29sZWFuLCBnYm9vbGVhbiwgZ2Jvb2xlYW4sIGdib29sZWFuLCBndXNob3J0LCBX ZWJLaXRET01FdmVudFRhcmdldCopCiBHVHlwZSB3ZWJraXRfZG9tX29iamVjdF9nZXRfdHlwZSh2 b2lkKQogR1R5cGUgd2Via2l0X2RvbV9yYW5nZV9nZXRfdHlwZSh2b2lkKQorV0VCS0lUX0RPTV9S QU5HRV9TVEFSVF9UT19TVEFSVAorV0VCS0lUX0RPTV9SQU5HRV9TVEFSVF9UT19FTkQKK1dFQktJ VF9ET01fUkFOR0VfRU5EX1RPX0VORAorV0VCS0lUX0RPTV9SQU5HRV9FTkRfVE9fU1RBUlQKK1dF QktJVF9ET01fUkFOR0VfTk9ERV9CRUZPUkUKK1dFQktJVF9ET01fUkFOR0VfTk9ERV9BRlRFUgor V0VCS0lUX0RPTV9SQU5HRV9OT0RFX0JFRk9SRV9BTkRfQUZURVIKK1dFQktJVF9ET01fUkFOR0Vf Tk9ERV9JTlNJREUKIFdlYktpdERPTURvY3VtZW50RnJhZ21lbnQqIHdlYmtpdF9kb21fcmFuZ2Vf Y2xvbmVfY29udGVudHMoV2ViS2l0RE9NUmFuZ2UqLCBHRXJyb3IqKikKIFdlYktpdERPTVJhbmdl KiB3ZWJraXRfZG9tX3JhbmdlX2Nsb25lX3JhbmdlKFdlYktpdERPTVJhbmdlKiwgR0Vycm9yKiop CiB2b2lkIHdlYmtpdF9kb21fcmFuZ2VfY29sbGFwc2UoV2ViS2l0RE9NUmFuZ2UqLCBnYm9vbGVh biwgR0Vycm9yKiopCkBAIC0xMDY0LDYgKzExMDIsMTYgQEAgV2ViS2l0RE9NTm9kZSogd2Via2l0 X2RvbV90cmVlX3dhbGtlcl9wcmV2aW91c19ub2RlKFdlYktpdERPTVRyZWVXYWxrZXIqKQogV2Vi S2l0RE9NTm9kZSogd2Via2l0X2RvbV90cmVlX3dhbGtlcl9wcmV2aW91c19zaWJsaW5nKFdlYktp dERPTVRyZWVXYWxrZXIqKQogdm9pZCB3ZWJraXRfZG9tX3RyZWVfd2Fsa2VyX3NldF9jdXJyZW50 X25vZGUoV2ViS2l0RE9NVHJlZVdhbGtlciosIFdlYktpdERPTU5vZGUqLCBHRXJyb3IqKikKIEdU eXBlIHdlYmtpdF9kb21feHBhdGhfcmVzdWx0X2dldF90eXBlKHZvaWQpCitXRUJLSVRfRE9NX1hQ QVRIX1JFU1VMVF9BTllfVFlQRQorV0VCS0lUX0RPTV9YUEFUSF9SRVNVTFRfTlVNQkVSX1RZUEUK K1dFQktJVF9ET01fWFBBVEhfUkVTVUxUX1NUUklOR19UWVBFCitXRUJLSVRfRE9NX1hQQVRIX1JF U1VMVF9CT09MRUFOX1RZUEUKK1dFQktJVF9ET01fWFBBVEhfUkVTVUxUX1VOT1JERVJFRF9OT0RF X0lURVJBVE9SX1RZUEUKK1dFQktJVF9ET01fWFBBVEhfUkVTVUxUX09SREVSRURfTk9ERV9JVEVS QVRPUl9UWVBFCitXRUJLSVRfRE9NX1hQQVRIX1JFU1VMVF9VTk9SREVSRURfTk9ERV9TTkFQU0hP VF9UWVBFCitXRUJLSVRfRE9NX1hQQVRIX1JFU1VMVF9PUkRFUkVEX05PREVfU05BUFNIT1RfVFlQ RQorV0VCS0lUX0RPTV9YUEFUSF9SRVNVTFRfQU5ZX1VOT1JERVJFRF9OT0RFX1RZUEUKK1dFQktJ VF9ET01fWFBBVEhfUkVTVUxUX0ZJUlNUX09SREVSRURfTk9ERV9UWVBFCiBnYm9vbGVhbiB3ZWJr aXRfZG9tX3hwYXRoX3Jlc3VsdF9nZXRfYm9vbGVhbl92YWx1ZShXZWJLaXRET01YUGF0aFJlc3Vs dCosIEdFcnJvcioqKQogZ2Jvb2xlYW4gd2Via2l0X2RvbV94cGF0aF9yZXN1bHRfZ2V0X2ludmFs aWRfaXRlcmF0b3Jfc3RhdGUoV2ViS2l0RE9NWFBhdGhSZXN1bHQqKQogZ2RvdWJsZSB3ZWJraXRf ZG9tX3hwYXRoX3Jlc3VsdF9nZXRfbnVtYmVyX3ZhbHVlKFdlYktpdERPTVhQYXRoUmVzdWx0Kiwg R0Vycm9yKiopCkBAIC0xMDgyLDYgKzExMzAsMjIgQEAgdm9pZCB3ZWJraXRfZG9tX2V2ZW50X3Rh cmdldF9kaXNwYXRjaF9ldmVudChXZWJLaXRET01FdmVudFRhcmdldCosIFdlYktpdERPTUV2ZW4K IGdib29sZWFuIHdlYmtpdF9kb21fZXZlbnRfdGFyZ2V0X3JlbW92ZV9ldmVudF9saXN0ZW5lcihX ZWJLaXRET01FdmVudFRhcmdldCosIGNvbnN0IGNoYXIqLCBHQ2FsbGJhY2ssIGdib29sZWFuKQog Z2Jvb2xlYW4gd2Via2l0X2RvbV9ldmVudF90YXJnZXRfcmVtb3ZlX2V2ZW50X2xpc3RlbmVyX3dp dGhfY2xvc3VyZShXZWJLaXRET01FdmVudFRhcmdldCosIGNvbnN0IGNoYXIqLCBHQ2xvc3VyZSos IGdib29sZWFuKQogR1R5cGUgd2Via2l0X2RvbV9ub2RlX2ZpbHRlcl9nZXRfdHlwZSh2b2lkKQor V0VCS0lUX0RPTV9OT0RFX0ZJTFRFUl9BQ0NFUFQKK1dFQktJVF9ET01fTk9ERV9GSUxURVJfUkVK RUNUCitXRUJLSVRfRE9NX05PREVfRklMVEVSX1NLSVAKK1dFQktJVF9ET01fTk9ERV9GSUxURVJf U0hPV19BTEwKK1dFQktJVF9ET01fTk9ERV9GSUxURVJfU0hPV19FTEVNRU5UCitXRUJLSVRfRE9N X05PREVfRklMVEVSX1NIT1dfQVRUUklCVVRFCitXRUJLSVRfRE9NX05PREVfRklMVEVSX1NIT1df VEVYVAorV0VCS0lUX0RPTV9OT0RFX0ZJTFRFUl9TSE9XX0NEQVRBX1NFQ1RJT04KK1dFQktJVF9E T01fTk9ERV9GSUxURVJfU0hPV19FTlRJVFlfUkVGRVJFTkNFCitXRUJLSVRfRE9NX05PREVfRklM VEVSX1NIT1dfRU5USVRZCitXRUJLSVRfRE9NX05PREVfRklMVEVSX1NIT1dfUFJPQ0VTU0lOR19J TlNUUlVDVElPTgorV0VCS0lUX0RPTV9OT0RFX0ZJTFRFUl9TSE9XX0NPTU1FTlQKK1dFQktJVF9E T01fTk9ERV9GSUxURVJfU0hPV19ET0NVTUVOVAorV0VCS0lUX0RPTV9OT0RFX0ZJTFRFUl9TSE9X X0RPQ1VNRU5UX1RZUEUKK1dFQktJVF9ET01fTk9ERV9GSUxURVJfU0hPV19ET0NVTUVOVF9GUkFH TUVOVAorV0VCS0lUX0RPTV9OT0RFX0ZJTFRFUl9TSE9XX05PVEFUSU9OCiBnc2hvcnQgd2Via2l0 X2RvbV9ub2RlX2ZpbHRlcl9hY2NlcHRfbm9kZShXZWJLaXRET01Ob2RlRmlsdGVyKiwgV2ViS2l0 RE9NTm9kZSopCiBHVHlwZSB3ZWJraXRfZG9tX3hwYXRoX25zX3Jlc29sdmVyX2dldF90eXBlKHZv aWQpCiBnY2hhciogd2Via2l0X2RvbV94cGF0aF9uc19yZXNvbHZlcl9sb29rdXBfbmFtZXNwYWNl X3VyaShXZWJLaXRET01YUGF0aE5TUmVzb2x2ZXIqLCBjb25zdCBnY2hhciopCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0LnBt IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yR09iamVjdC5w bQppbmRleCAxZTEyNjA1Li45NTRiOGI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0LnBtCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckdPYmplY3QucG0KQEAgLTgwNiw3ICs4MDYs NyBAQCBFT0YKIH0KIAogc3ViIEdlbmVyYXRlSGVhZGVyIHsKLSAgICBteSAoJG9iamVjdCwgJGlu dGVyZmFjZU5hbWUsICRwYXJlbnRDbGFzc05hbWUpID0gQF87CisgICAgbXkgKCRvYmplY3QsICRp bnRlcmZhY2VOYW1lLCAkcGFyZW50Q2xhc3NOYW1lLCAkaW50ZXJmYWNlKSA9IEBfOwogCiAgICAg bXkgJGltcGxDb250ZW50ID0gIiI7CiAKQEAgLTg1OCw2ICs4NTgsNDMgQEAgRU9GCiAjZGVmaW5l IFdFQktJVF9ET01fSVNfJHtjbHNDYXBzfV9DTEFTUyhrbGFzcykgKEdfVFlQRV9DSEVDS19DTEFT U19UWVBFKChrbGFzcyksICBXRUJLSVRfVFlQRV9ET01fJHtjbHNDYXBzfSkpCiAjZGVmaW5lIFdF QktJVF9ET01fJHtjbHNDYXBzfV9HRVRfQ0xBU1Mob2JqKSAgKEdfVFlQRV9JTlNUQU5DRV9HRVRf Q0xBU1MoKG9iaiksICBXRUJLSVRfVFlQRV9ET01fJHtjbHNDYXBzfSwgJHtjbGFzc05hbWV9Q2xh c3MpKQogCitFT0YKKworICAgIHB1c2goQGhCb2R5LCAkaW1wbENvbnRlbnQpOworCisgICAgaWYg KCRpc1N0YWJsZUNsYXNzKSB7CisgICAgICAgIHB1c2goQHN5bWJvbHMsICJHVHlwZSAke2xvd2Vy Q2FzZUlmYWNlTmFtZX1fZ2V0X3R5cGUodm9pZClcbiIpOworICAgIH0KKworICAgIGlmIChAeyRp bnRlcmZhY2UtPmNvbnN0YW50c30pIHsKKyAgICAgICAgbXkgQGNvbnN0YW50cyA9IEB7JGludGVy ZmFjZS0+Y29uc3RhbnRzfTsKKyAgICAgICAgZm9yZWFjaCBteSAkY29uc3RhbnQgKEBjb25zdGFu dHMpIHsKKyAgICAgICAgICAgIG15ICRjb25kaXRpb25hbFN0cmluZyA9ICRjb2RlR2VuZXJhdG9y LT5HZW5lcmF0ZUNvbmRpdGlvbmFsU3RyaW5nKCRjb25zdGFudCk7CisgICAgICAgICAgICBteSAk Y29uc3RhbnROYW1lID0gIldFQktJVF9ET01fJHtjbHNDYXBzfV8iIC4gJGNvbnN0YW50LT5uYW1l OworICAgICAgICAgICAgbXkgJGNvbnN0YW50VmFsdWUgPSAkY29uc3RhbnQtPnZhbHVlOworICAg ICAgICAgICAgbXkgJGlzU3RhYmxlU3ltYm9sID0gZ3JlcCB7JF8gZXEgJGNvbnN0YW50TmFtZX0g QHN0YWJsZVN5bWJvbHM7CisgICAgICAgICAgICBpZiAoJGlzU3RhYmxlU3ltYm9sKSB7CisgICAg ICAgICAgICAgICAgcHVzaChAc3ltYm9scywgIiRjb25zdGFudE5hbWVcbiIpOworICAgICAgICAg ICAgfQorCisgICAgICAgICAgICBteSBAY29uc3RhbnRIZWFkZXIgPSAoKTsKKyAgICAgICAgICAg IHB1c2goQGNvbnN0YW50SGVhZGVyLCAiI2lmICR7Y29uZGl0aW9uYWxTdHJpbmd9IikgaWYgJGNv bmRpdGlvbmFsU3RyaW5nOworICAgICAgICAgICAgcHVzaChAY29uc3RhbnRIZWFkZXIsICIvKioi KTsKKyAgICAgICAgICAgIHB1c2goQGNvbnN0YW50SGVhZGVyLCAiICogJHtjb25zdGFudE5hbWV9 OiIpOworICAgICAgICAgICAgcHVzaChAY29uc3RhbnRIZWFkZXIsICIgKi8iKTsKKyAgICAgICAg ICAgIHB1c2goQGNvbnN0YW50SGVhZGVyLCAiI2RlZmluZSAkY29uc3RhbnROYW1lICRjb25zdGFu dFZhbHVlIik7CisgICAgICAgICAgICBwdXNoKEBjb25zdGFudEhlYWRlciwgIiNlbmRpZiAvKiAk e2NvbmRpdGlvbmFsU3RyaW5nfSAqLyIpIGlmICRjb25kaXRpb25hbFN0cmluZzsKKyAgICAgICAg ICAgIHB1c2goQGNvbnN0YW50SGVhZGVyLCAiXG4iKTsKKworICAgICAgICAgICAgaWYgKCRpc1N0 YWJsZVN5bWJvbCBvciAhJGlzU3RhYmxlQ2xhc3MpIHsKKyAgICAgICAgICAgICAgICBwdXNoKEBo Qm9keSwgam9pbigiXG4iLCBAY29uc3RhbnRIZWFkZXIpKTsKKyAgICAgICAgICAgIH0gZWxzZSB7 CisgICAgICAgICAgICAgICAgcHVzaChAaEJvZHlVbnN0YWJsZSwgam9pbigiXG4iLCBAY29uc3Rh bnRIZWFkZXIpKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0KKworICAgICRpbXBs Q29udGVudCA9IDw8ICJFT0YiOwogc3RydWN0IF8ke2NsYXNzTmFtZX0gewogICAgICR7cGFyZW50 Q2xhc3NOYW1lfSBwYXJlbnRfaW5zdGFuY2U7CiB9OwpAQCAtODcwLDkgKzkwNyw2IEBAIEVPRgog CiAgICAgcHVzaChAaEJvZHksICRpbXBsQ29udGVudCk7CiAKLSAgICBpZiAoJGlzU3RhYmxlQ2xh c3MpIHsKLSAgICAgICAgcHVzaChAc3ltYm9scywgIkdUeXBlICR7bG93ZXJDYXNlSWZhY2VOYW1l fV9nZXRfdHlwZSh2b2lkKVxuIik7Ci0gICAgfQogICAgIHB1c2goQGhCb2R5LCAiV0VCS0lUX0FQ SSBHVHlwZVxuJHtsb3dlckNhc2VJZmFjZU5hbWV9X2dldF90eXBlKHZvaWQpO1xuIik7CiAgICAg cHVzaChAaEJvZHksICJcbiIpOwogfQpAQCAtMTUzOSw3ICsxNTczLDcgQEAgc3ViIEdlbmVyYXRl IHsKIAogICAgICRoZHJJbmNsdWRlc3sid2Via2l0ZG9tLyR7cGFyZW50Q2xhc3NOYW1lfS5oIn0g PSAxOwogCi0gICAgJG9iamVjdC0+R2VuZXJhdGVIZWFkZXIoJGludGVyZmFjZU5hbWUsICRwYXJl bnRDbGFzc05hbWUpOworICAgICRvYmplY3QtPkdlbmVyYXRlSGVhZGVyKCRpbnRlcmZhY2VOYW1l LCAkcGFyZW50Q2xhc3NOYW1lLCAkaW50ZXJmYWNlKTsKICAgICAkb2JqZWN0LT5HZW5lcmF0ZUNG aWxlKCRpbnRlcmZhY2VOYW1lLCAkcGFyZW50Q2xhc3NOYW1lLCAkcGFyZW50R09ialR5cGUsICRp bnRlcmZhY2UpOwogICAgICRvYmplY3QtPkdlbmVyYXRlRW5kSGVhZGVyKCk7CiB9CkBAIC0xNzAz LDYgKzE3MzcsMTggQEAgRU9GCiAgICAgQHN0YWJsZVN5bWJvbHMgPSAoKTsKIH0KIAorc3ViIElz SW50ZXJmYWNlU3ltYm9sIHsKKyAgICBteSAoJGxpbmUsICRsb3dlckNhc2VJZmFjZU5hbWUpID0g QF87CisKKyAgICAjIEZ1bmN0aW9uLgorICAgIHJldHVybiAxIGlmICRsaW5lID1+IC9eW2EtekEt WjAtOVwqXStccyR7bG93ZXJDYXNlSWZhY2VOYW1lfV8uKyQvOworCisgICAgIyBDb25zdGFudC4K KyAgICBteSAkcHJlZml4ID0gdWMoJGxvd2VyQ2FzZUlmYWNlTmFtZSk7CisgICAgcmV0dXJuIDEg aWYgJGxpbmUgPX4gL14ke3ByZWZpeH1fW0EtWl9dKyQvOworICAgIHJldHVybiAwOworfQorCiBz dWIgUmVhZFN0YWJsZVN5bWJvbHMgewogICAgIG15ICRpbnRlcmZhY2VOYW1lID0gc2hpZnQ7CiAK QEAgLTE3MjUsNyArMTc3MSw3IEBAIHN1YiBSZWFkU3RhYmxlU3ltYm9scyB7CiAgICAgICAgICAg ICBuZXh0OwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKHNjYWxhcihAc3RhYmxlU3ltYm9scykg YW5kICRsaW5lID1+IC9eW2EtekEtWjAtOVwqXStccyR7bG93ZXJDYXNlSWZhY2VOYW1lfV8uKyQv IGFuZCAkbGluZSAhfiAvXkdUeXBlLykgeworICAgICAgICBpZiAoc2NhbGFyKEBzdGFibGVTeW1i b2xzKSBhbmQgSXNJbnRlcmZhY2VTeW1ib2woJGxpbmUsICRsb3dlckNhc2VJZmFjZU5hbWUpIGFu ZCAkbGluZSAhfiAvXkdUeXBlLykgewogICAgICAgICAgICAgcHVzaChAc3RhYmxlU3ltYm9scywg JGxpbmUpOwogICAgICAgICAgICAgbmV4dDsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0dPYmplY3QvV2ViS2l0RE9NVGVzdEludGVy ZmFjZS5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0dPYmplY3QvV2Vi S2l0RE9NVGVzdEludGVyZmFjZS5oCmluZGV4IDUzMTJjYjguLjg4Y2Y0MjYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9HT2JqZWN0L1dlYktpdERPTVRl c3RJbnRlcmZhY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3Qv R09iamVjdC9XZWJLaXRET01UZXN0SW50ZXJmYWNlLmgKQEAgLTM2LDYgKzM2LDM0IEBAIEdfQkVH SU5fREVDTFMKICNkZWZpbmUgV0VCS0lUX0RPTV9JU19URVNUX0lOVEVSRkFDRV9DTEFTUyhrbGFz cykgKEdfVFlQRV9DSEVDS19DTEFTU19UWVBFKChrbGFzcyksICBXRUJLSVRfVFlQRV9ET01fVEVT VF9JTlRFUkZBQ0UpKQogI2RlZmluZSBXRUJLSVRfRE9NX1RFU1RfSU5URVJGQUNFX0dFVF9DTEFT UyhvYmopICAoR19UWVBFX0lOU1RBTkNFX0dFVF9DTEFTUygob2JqKSwgIFdFQktJVF9UWVBFX0RP TV9URVNUX0lOVEVSRkFDRSwgV2ViS2l0RE9NVGVzdEludGVyZmFjZUNsYXNzKSkKIAorI2lmIEVO QUJMRShDb25kaXRpb24yMikgfHwgRU5BQkxFKENvbmRpdGlvbjIzKQorLyoqCisgKiBXRUJLSVRf RE9NX1RFU1RfSU5URVJGQUNFX0lNUExFTUVOVFNDT05TVEFOVDE6CisgKi8KKyNkZWZpbmUgV0VC S0lUX0RPTV9URVNUX0lOVEVSRkFDRV9JTVBMRU1FTlRTQ09OU1RBTlQxIDEKKyNlbmRpZiAvKiBF TkFCTEUoQ29uZGl0aW9uMjIpIHx8IEVOQUJMRShDb25kaXRpb24yMykgKi8KKworI2lmIEVOQUJM RShDb25kaXRpb24yMikgfHwgRU5BQkxFKENvbmRpdGlvbjIzKQorLyoqCisgKiBXRUJLSVRfRE9N X1RFU1RfSU5URVJGQUNFX0lNUExFTUVOVFNDT05TVEFOVDI6CisgKi8KKyNkZWZpbmUgV0VCS0lU X0RPTV9URVNUX0lOVEVSRkFDRV9JTVBMRU1FTlRTQ09OU1RBTlQyIDIKKyNlbmRpZiAvKiBFTkFC TEUoQ29uZGl0aW9uMjIpIHx8IEVOQUJMRShDb25kaXRpb24yMykgKi8KKworI2lmIEVOQUJMRShD b25kaXRpb24xMSkgfHwgRU5BQkxFKENvbmRpdGlvbjEyKQorLyoqCisgKiBXRUJLSVRfRE9NX1RF U1RfSU5URVJGQUNFX1NVUFBMRU1FTlRBTENPTlNUQU5UMToKKyAqLworI2RlZmluZSBXRUJLSVRf RE9NX1RFU1RfSU5URVJGQUNFX1NVUFBMRU1FTlRBTENPTlNUQU5UMSAxCisjZW5kaWYgLyogRU5B QkxFKENvbmRpdGlvbjExKSB8fCBFTkFCTEUoQ29uZGl0aW9uMTIpICovCisKKyNpZiBFTkFCTEUo Q29uZGl0aW9uMTEpIHx8IEVOQUJMRShDb25kaXRpb24xMikKKy8qKgorICogV0VCS0lUX0RPTV9U RVNUX0lOVEVSRkFDRV9TVVBQTEVNRU5UQUxDT05TVEFOVDI6CisgKi8KKyNkZWZpbmUgV0VCS0lU X0RPTV9URVNUX0lOVEVSRkFDRV9TVVBQTEVNRU5UQUxDT05TVEFOVDIgMgorI2VuZGlmIC8qIEVO QUJMRShDb25kaXRpb24xMSkgfHwgRU5BQkxFKENvbmRpdGlvbjEyKSAqLworCiBzdHJ1Y3QgX1dl YktpdERPTVRlc3RJbnRlcmZhY2UgewogICAgIFdlYktpdERPTU9iamVjdCBwYXJlbnRfaW5zdGFu Y2U7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0 L0dPYmplY3QvV2ViS2l0RE9NVGVzdE9iai5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy90ZXN0L0dPYmplY3QvV2ViS2l0RE9NVGVzdE9iai5oCmluZGV4IGM1Y2YyY2EuLmVlN2Ni NWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9HT2Jq ZWN0L1dlYktpdERPTVRlc3RPYmouaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL3Rlc3QvR09iamVjdC9XZWJLaXRET01UZXN0T2JqLmgKQEAgLTM2LDYgKzM2LDczIEBAIEdf QkVHSU5fREVDTFMKICNkZWZpbmUgV0VCS0lUX0RPTV9JU19URVNUX09CSl9DTEFTUyhrbGFzcykg KEdfVFlQRV9DSEVDS19DTEFTU19UWVBFKChrbGFzcyksICBXRUJLSVRfVFlQRV9ET01fVEVTVF9P QkopKQogI2RlZmluZSBXRUJLSVRfRE9NX1RFU1RfT0JKX0dFVF9DTEFTUyhvYmopICAoR19UWVBF X0lOU1RBTkNFX0dFVF9DTEFTUygob2JqKSwgIFdFQktJVF9UWVBFX0RPTV9URVNUX09CSiwgV2Vi S2l0RE9NVGVzdE9iakNsYXNzKSkKIAorI2lmIEVOQUJMRShDb25kaXRpb24xKQorLyoqCisgKiBX RUJLSVRfRE9NX1RFU1RfT0JKX0NPTkRJVElPTkFMX0NPTlNUOgorICovCisjZGVmaW5lIFdFQktJ VF9ET01fVEVTVF9PQkpfQ09ORElUSU9OQUxfQ09OU1QgMAorI2VuZGlmIC8qIEVOQUJMRShDb25k aXRpb24xKSAqLworCisvKioKKyAqIFdFQktJVF9ET01fVEVTVF9PQkpfQ09OU1RfVkFMVUVfMDoK KyAqLworI2RlZmluZSBXRUJLSVRfRE9NX1RFU1RfT0JKX0NPTlNUX1ZBTFVFXzAgMAorCisvKioK KyAqIFdFQktJVF9ET01fVEVTVF9PQkpfQ09OU1RfVkFMVUVfMToKKyAqLworI2RlZmluZSBXRUJL SVRfRE9NX1RFU1RfT0JKX0NPTlNUX1ZBTFVFXzEgMQorCisvKioKKyAqIFdFQktJVF9ET01fVEVT VF9PQkpfQ09OU1RfVkFMVUVfMjoKKyAqLworI2RlZmluZSBXRUJLSVRfRE9NX1RFU1RfT0JKX0NP TlNUX1ZBTFVFXzIgMgorCisvKioKKyAqIFdFQktJVF9ET01fVEVTVF9PQkpfQ09OU1RfVkFMVUVf NDoKKyAqLworI2RlZmluZSBXRUJLSVRfRE9NX1RFU1RfT0JKX0NPTlNUX1ZBTFVFXzQgNAorCisv KioKKyAqIFdFQktJVF9ET01fVEVTVF9PQkpfQ09OU1RfVkFMVUVfODoKKyAqLworI2RlZmluZSBX RUJLSVRfRE9NX1RFU1RfT0JKX0NPTlNUX1ZBTFVFXzggOAorCisvKioKKyAqIFdFQktJVF9ET01f VEVTVF9PQkpfQ09OU1RfVkFMVUVfOToKKyAqLworI2RlZmluZSBXRUJLSVRfRE9NX1RFU1RfT0JK X0NPTlNUX1ZBTFVFXzkgLTEKKworLyoqCisgKiBXRUJLSVRfRE9NX1RFU1RfT0JKX0NPTlNUX1ZB TFVFXzExOgorICovCisjZGVmaW5lIFdFQktJVF9ET01fVEVTVF9PQkpfQ09OU1RfVkFMVUVfMTEg MHhmZmZmZmZmZgorCisvKioKKyAqIFdFQktJVF9ET01fVEVTVF9PQkpfQ09OU1RfVkFMVUVfMTI6 CisgKi8KKyNkZWZpbmUgV0VCS0lUX0RPTV9URVNUX09CSl9DT05TVF9WQUxVRV8xMiAweDAxCisK Ky8qKgorICogV0VCS0lUX0RPTV9URVNUX09CSl9DT05TVF9WQUxVRV8xMzoKKyAqLworI2RlZmlu ZSBXRUJLSVRfRE9NX1RFU1RfT0JKX0NPTlNUX1ZBTFVFXzEzIDBYMjAKKworLyoqCisgKiBXRUJL SVRfRE9NX1RFU1RfT0JKX0NPTlNUX1ZBTFVFXzE0OgorICovCisjZGVmaW5lIFdFQktJVF9ET01f VEVTVF9PQkpfQ09OU1RfVkFMVUVfMTQgMHgxYWJjCisKKy8qKgorICogV0VCS0lUX0RPTV9URVNU X09CSl9DT05TVF9KQVZBU0NSSVBUOgorICovCisjZGVmaW5lIFdFQktJVF9ET01fVEVTVF9PQkpf Q09OU1RfSkFWQVNDUklQVCAxNQorCisvKioKKyAqIFdFQktJVF9ET01fVEVTVF9PQkpfcmVhZG9u bHk6CisgKi8KKyNkZWZpbmUgV0VCS0lUX0RPTV9URVNUX09CSl9yZWFkb25seSAwCisKIHN0cnVj dCBfV2ViS2l0RE9NVGVzdE9iaiB7CiAgICAgV2ViS2l0RE9NT2JqZWN0IHBhcmVudF9pbnN0YW5j ZTsKIH07Cg==