60900 2011-05-16 10:02:36 -0700 Web Inspector: refactoring: ScriptDebugListener::didParseSource has too many parameters. 2011-05-18 06:51:22 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 404543 0 podivilov 2011-05-16 10:02:36 -0700 Web Inspector: refactoring: ScriptDebugListener::didParseSource has too many parameters. 404544 1 93657 podivilov 2011-05-16 10:03:14 -0700 Created attachment 93657 Patch. 404548 2 webkit.review.bot 2011-05-16 10:05:58 -0700 Attachment 93657 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/inspector/ScriptDebugListener.h:68: The parameter name "script" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebCore/inspector/InspectorDebuggerAgent.h:123: The parameter name "script" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 404552 3 93659 podivilov 2011-05-16 10:10:22 -0700 Created attachment 93659 Fix style. 404555 4 93657 webkit.review.bot 2011-05-16 10:12:50 -0700 Comment on attachment 93657 Patch. Attachment 93657 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/8698919 404567 5 93659 webkit.review.bot 2011-05-16 10:22:28 -0700 Comment on attachment 93659 Fix style. Attachment 93659 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/8699909 404626 6 93676 podivilov 2011-05-16 11:23:18 -0700 Created attachment 93676 Fix warning. 405043 7 93676 yurys 2011-05-17 07:31:09 -0700 Comment on attachment 93676 Fix warning. View in context: https://bugs.webkit.org/attachment.cgi?id=93676&action=review > Source/WebCore/inspector/ScriptDebugListener.h:50 > + , endColumn(0) linesCount(0) is missing > Source/WebCore/inspector/ScriptDebugListener.h:62 > + int linesCount; This field is never used, please remove it. 405127 8 93786 podivilov 2011-05-17 10:21:31 -0700 Created attachment 93786 Patch. 405128 9 podivilov 2011-05-17 10:21:40 -0700 (In reply to comment #7) > (From update of attachment 93676 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=93676&action=review > > > Source/WebCore/inspector/ScriptDebugListener.h:50 > > + , endColumn(0) > > linesCount(0) is missing > > > Source/WebCore/inspector/ScriptDebugListener.h:62 > > + int linesCount; > > This field is never used, please remove it. Done. 405683 10 podivilov 2011-05-18 06:51:22 -0700 Committed r86756: <http://trac.webkit.org/changeset/86756> 93657 2011-05-16 10:03:14 -0700 2011-05-16 10:12:50 -0700 Patch. patch text/plain 11482 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0YzQwYjc3Li42ZDg5ZmQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTEtMDUtMTYgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogcmVmYWN0b3Jpbmc6IFNjcmlwdERlYnVnTGlzdGVuZXI6OmRpZFBhcnNlU291cmNl IGhhcyB0b28gbWFueSBwYXJhbWV0ZXJzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjA5MDAKKworICAgICAgICAqIGJpbmRpbmdzL2pzL1NjcmlwdERl YnVnU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdERlYnVnU2VydmVyOjpkaXNw YXRjaERpZFBhcnNlU291cmNlKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHREZWJ1Z1Nl cnZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlzcGF0Y2hE aWRQYXJzZVNvdXJjZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdl bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6Z2V0U2Ny aXB0U291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRp ZFBhcnNlU291cmNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2Vu dC5oOgorICAgICAgICAqIGluc3BlY3Rvci9TY3JpcHREZWJ1Z0xpc3RlbmVyLmg6CisgICAgICAg IChXZWJDb3JlOjpTY3JpcHREZWJ1Z0xpc3RlbmVyOjpTY3JpcHQ6OlNjcmlwdCk6CisKIDIwMTEt MDUtMTIgIE1PUklUQSBIYWppbWUgIDxtb3JyaXRhQGdvb2dsZS5jb20+CiAKICAgICAgICAgU2hh ZG93Q29udGVudEVsZW1lbnQgc2hvdWxkIGFmZmVjdCB0aGUgb3JkZXIgb2YgcmVuZGVyZXIgY2hp bGRyZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdERlYnVn U2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVy LmNwcAppbmRleCAyY2Q3OTliLi5kZTIxMTQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9TY3JpcHREZWJ1Z1NlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCkBAIC0yMjEsMzEgKzIyMSwzNCBAQCB2b2lk IFNjcmlwdERlYnVnU2VydmVyOjpkaXNwYXRjaERpZENvbnRpbnVlKFNjcmlwdERlYnVnTGlzdGVu ZXIqIGxpc3RlbmVyKQogdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlzcGF0Y2hEaWRQYXJzZVNv dXJjZShjb25zdCBMaXN0ZW5lclNldCYgbGlzdGVuZXJzLCBTb3VyY2VQcm92aWRlciogc291cmNl UHJvdmlkZXIsIGJvb2wgaXNDb250ZW50U2NyaXB0KQogewogICAgIFN0cmluZyBzb3VyY2VJRCA9 IHVzdHJpbmdUb1N0cmluZyhKU0M6OlVTdHJpbmc6Om51bWJlcihzb3VyY2VQcm92aWRlci0+YXNJ RCgpKSk7Ci0gICAgU3RyaW5nIHVybCA9IHVzdHJpbmdUb1N0cmluZyhzb3VyY2VQcm92aWRlci0+ dXJsKCkpOwotICAgIFN0cmluZyBkYXRhID0gdXN0cmluZ1RvU3RyaW5nKEpTQzo6VVN0cmluZyhz b3VyY2VQcm92aWRlci0+ZGF0YSgpLCBzb3VyY2VQcm92aWRlci0+bGVuZ3RoKCkpKTsKLSAgICBp bnQgbGluZU9mZnNldCA9IHNvdXJjZVByb3ZpZGVyLT5zdGFydFBvc2l0aW9uKCkubV9saW5lLmNv bnZlcnRBc1plcm9CYXNlZEludCgpOwotICAgIGludCBjb2x1bW5PZmZzZXQgPSBzb3VyY2VQcm92 aWRlci0+c3RhcnRQb3NpdGlvbigpLm1fY29sdW1uLmNvbnZlcnRBc1plcm9CYXNlZEludCgpOwog CisgICAgU2NyaXB0RGVidWdMaXN0ZW5lcjo6U2NyaXB0IHNjcmlwdDsKKyAgICBzY3JpcHQudXJs ID0gdXN0cmluZ1RvU3RyaW5nKHNvdXJjZVByb3ZpZGVyLT51cmwoKSk7CisgICAgc2NyaXB0LnNv dXJjZSA9IHVzdHJpbmdUb1N0cmluZyhKU0M6OlVTdHJpbmcoc291cmNlUHJvdmlkZXItPmRhdGEo KSwgc291cmNlUHJvdmlkZXItPmxlbmd0aCgpKSk7CisgICAgc2NyaXB0LnN0YXJ0TGluZSA9IHNv dXJjZVByb3ZpZGVyLT5zdGFydFBvc2l0aW9uKCkubV9saW5lLmNvbnZlcnRBc1plcm9CYXNlZElu dCgpOworICAgIHNjcmlwdC5zdGFydENvbHVtbiA9IHNvdXJjZVByb3ZpZGVyLT5zdGFydFBvc2l0 aW9uKCkubV9jb2x1bW4uY29udmVydEFzWmVyb0Jhc2VkSW50KCk7CisgICAgc2NyaXB0LmlzQ29u dGVudFNjcmlwdCA9IGlzQ29udGVudFNjcmlwdDsKKworICAgIGludCBzb3VyY2VMZW5ndGggPSBz Y3JpcHQuc291cmNlLmxlbmd0aCgpOwogICAgIGludCBsaW5lQ291bnQgPSAxOwogICAgIGludCBs YXN0TGluZVN0YXJ0ID0gMDsKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGRhdGEubGVuZ3Ro KCkgLSAxOyArK2kpIHsKLSAgICAgICAgaWYgKGRhdGFbaV0gPT0gJ1xuJykgeworICAgIGZvciAo c2l6ZV90IGkgPSAwOyBpIDwgc291cmNlTGVuZ3RoIC0gMTsgKytpKSB7CisgICAgICAgIGlmIChz Y3JpcHQuc291cmNlW2ldID09ICdcbicpIHsKICAgICAgICAgICAgIGxpbmVDb3VudCArPSAxOwog ICAgICAgICAgICAgbGFzdExpbmVTdGFydCA9IGkgKyAxOwogICAgICAgICB9CiAgICAgfQogCi0g ICAgaW50IGVuZExpbmUgPSBsaW5lT2Zmc2V0ICsgbGluZUNvdW50IC0gMTsKLSAgICBpbnQgZW5k Q29sdW1uOworICAgIHNjcmlwdC5lbmRMaW5lID0gc2NyaXB0LnN0YXJ0TGluZSArIGxpbmVDb3Vu dCAtIDE7CiAgICAgaWYgKGxpbmVDb3VudCA9PSAxKQotICAgICAgICBlbmRDb2x1bW4gPSBkYXRh Lmxlbmd0aCgpICsgY29sdW1uT2Zmc2V0OworICAgICAgICBzY3JpcHQuZW5kQ29sdW1uID0gc2Ny aXB0LnN0YXJ0Q29sdW1uICsgc291cmNlTGVuZ3RoOwogICAgIGVsc2UKLSAgICAgICAgZW5kQ29s dW1uID0gZGF0YS5sZW5ndGgoKSAtIGxhc3RMaW5lU3RhcnQ7CisgICAgICAgIHNjcmlwdC5lbmRD b2x1bW4gPSBzb3VyY2VMZW5ndGggLSBsYXN0TGluZVN0YXJ0OwogCiAgICAgVmVjdG9yPFNjcmlw dERlYnVnTGlzdGVuZXIqPiBjb3B5OwogICAgIGNvcHlUb1ZlY3RvcihsaXN0ZW5lcnMsIGNvcHkp OwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY29weS5zaXplKCk7ICsraSkKLSAgICAgICAg Y29weVtpXS0+ZGlkUGFyc2VTb3VyY2Uoc291cmNlSUQsIHVybCwgZGF0YSwgbGluZU9mZnNldCwg Y29sdW1uT2Zmc2V0LCBlbmRMaW5lLCBlbmRDb2x1bW4sIGlzQ29udGVudFNjcmlwdCk7CisgICAg ICAgIGNvcHlbaV0tPmRpZFBhcnNlU291cmNlKHNvdXJjZUlELCBzY3JpcHQpOwogfQogCiB2b2lk IFNjcmlwdERlYnVnU2VydmVyOjpkaXNwYXRjaEZhaWxlZFRvUGFyc2VTb3VyY2UoY29uc3QgTGlz dGVuZXJTZXQmIGxpc3RlbmVycywgU291cmNlUHJvdmlkZXIqIHNvdXJjZVByb3ZpZGVyLCBpbnQg ZXJyb3JMaW5lLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVnU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVnU2VydmVyLmNwcAppbmRleCA4ZjlkMDNhLi5iOTAw OTMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHREZWJ1Z1Nl cnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0RGVidWdTZXJ2 ZXIuY3BwCkBAIC0zNTIsMTUgKzM1MiwxOSBAQCB2b2lkIFNjcmlwdERlYnVnU2VydmVyOjpoYW5k bGVWOERlYnVnRXZlbnQoY29uc3Qgdjg6OkRlYnVnOjpFdmVudERldGFpbHMmIGV2ZW50RAogCiB2 b2lkIFNjcmlwdERlYnVnU2VydmVyOjpkaXNwYXRjaERpZFBhcnNlU291cmNlKFNjcmlwdERlYnVn TGlzdGVuZXIqIGxpc3RlbmVyLCB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IG9iamVjdCkKIHsKLSAg ICBsaXN0ZW5lci0+ZGlkUGFyc2VTb3VyY2UoCi0gICAgICAgIHRvV2ViQ29yZVN0cmluZ1dpdGhO dWxsT3JVbmRlZmluZWRDaGVjayhvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoImlkIikpKSwK LSAgICAgICAgdG9XZWJDb3JlU3RyaW5nV2l0aE51bGxPclVuZGVmaW5lZENoZWNrKG9iamVjdC0+ R2V0KHY4OjpTdHJpbmc6Ok5ldygibmFtZSIpKSksCi0gICAgICAgIHRvV2ViQ29yZVN0cmluZ1dp dGhOdWxsT3JVbmRlZmluZWRDaGVjayhvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoInNvdXJj ZSIpKSksCi0gICAgICAgIG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygic3RhcnRMaW5lIikp LT5Ub0ludGVnZXIoKS0+VmFsdWUoKSwKLSAgICAgICAgb2JqZWN0LT5HZXQodjg6OlN0cmluZzo6 TmV3KCJzdGFydENvbHVtbiIpKS0+VG9JbnRlZ2VyKCktPlZhbHVlKCksCi0gICAgICAgIG9iamVj dC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygiZW5kTGluZSIpKS0+VG9JbnRlZ2VyKCktPlZhbHVlKCks Ci0gICAgICAgIG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygiZW5kQ29sdW1uIikpLT5Ub0lu dGVnZXIoKS0+VmFsdWUoKSwKLSAgICAgICAgb2JqZWN0LT5HZXQodjg6OlN0cmluZzo6TmV3KCJp c0NvbnRlbnRTY3JpcHQiKSktPlRvQm9vbGVhbigpLT5WYWx1ZSgpKTsKKyAgICBTdHJpbmcgc291 cmNlSUQgPSB0b1dlYkNvcmVTdHJpbmdXaXRoTnVsbE9yVW5kZWZpbmVkQ2hlY2sob2JqZWN0LT5H ZXQodjg6OlN0cmluZzo6TmV3KCJpZCIpKSk7CisKKyAgICBTY3JpcHREZWJ1Z0xpc3RlbmVyOjpT Y3JpcHQgc2NyaXB0OworICAgIHNjcmlwdC51cmwgPSB0b1dlYkNvcmVTdHJpbmdXaXRoTnVsbE9y VW5kZWZpbmVkQ2hlY2sob2JqZWN0LT5HZXQodjg6OlN0cmluZzo6TmV3KCJuYW1lIikpKTsKKyAg ICBzY3JpcHQuc291cmNlID0gdG9XZWJDb3JlU3RyaW5nV2l0aE51bGxPclVuZGVmaW5lZENoZWNr KG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygic291cmNlIikpKTsKKyAgICBzY3JpcHQuc291 cmNlTWFwcGluZ1VSTCA9IHRvV2ViQ29yZVN0cmluZ1dpdGhOdWxsT3JVbmRlZmluZWRDaGVjayhv YmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoInNvdXJjZU1hcHBpbmdVUkwiKSkpOworICAgIHNj cmlwdC5zdGFydExpbmUgPSBvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoInN0YXJ0TGluZSIp KS0+VG9JbnRlZ2VyKCktPlZhbHVlKCk7CisgICAgc2NyaXB0LnN0YXJ0Q29sdW1uID0gb2JqZWN0 LT5HZXQodjg6OlN0cmluZzo6TmV3KCJzdGFydENvbHVtbiIpKS0+VG9JbnRlZ2VyKCktPlZhbHVl KCk7CisgICAgc2NyaXB0LmVuZExpbmUgPSBvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoImVu ZExpbmUiKSktPlRvSW50ZWdlcigpLT5WYWx1ZSgpOworICAgIHNjcmlwdC5lbmRDb2x1bW4gPSBv YmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoImVuZENvbHVtbiIpKS0+VG9JbnRlZ2VyKCktPlZh bHVlKCk7CisgICAgc2NyaXB0LmlzQ29udGVudFNjcmlwdCA9IG9iamVjdC0+R2V0KHY4OjpTdHJp bmc6Ok5ldygiaXNDb250ZW50U2NyaXB0IikpLT5Ub0Jvb2xlYW4oKS0+VmFsdWUoKTsKKworICAg IGxpc3RlbmVyLT5kaWRQYXJzZVNvdXJjZShzb3VyY2VJRCwgc2NyaXB0KTsKIH0KIAogdm9pZCBT Y3JpcHREZWJ1Z1NlcnZlcjo6ZW5zdXJlRGVidWdnZXJTY3JpcHRDb21waWxlZCgpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAKaW5k ZXggZGU1NTBhMi4uMjQ4NzVjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcApAQCAtMjc3LDcgKzI3Nyw3IEBAIHZvaWQgSW5z cGVjdG9yRGVidWdnZXJBZ2VudDo6ZWRpdFNjcmlwdFNvdXJjZShFcnJvclN0cmluZyogZXJyb3Is IGNvbnN0IFN0cmluZyYKIAogdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpnZXRTY3JpcHRT b3VyY2UoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlELCBTdHJpbmcqIHNjcmlw dFNvdXJjZSkKIHsKLSAgICAqc2NyaXB0U291cmNlID0gbV9zY3JpcHRzLmdldChzb3VyY2VJRCku ZGF0YTsKKyAgICAqc2NyaXB0U291cmNlID0gbV9zY3JpcHRzLmdldChzb3VyY2VJRCkuc291cmNl OwogfQogCiB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnNjaGVkdWxlUGF1c2VPbk5leHRT dGF0ZW1lbnQoRGVidWdnZXJFdmVudFR5cGUgdHlwZSwgUGFzc1JlZlB0cjxJbnNwZWN0b3JWYWx1 ZT4gZGF0YSkKQEAgLTM2NywxNCArMzY3LDE0IEBAIFBhc3NSZWZQdHI8SW5zcGVjdG9yQXJyYXk+ IEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmN1cnJlbnRDYWxsRnJhbWVzKCkKIAogLy8gSmF2YVNj cmlwdERlYnVnTGlzdGVuZXIgZnVuY3Rpb25zCiAKLXZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2Vu dDo6ZGlkUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiB1 cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgaW50IHN0YXJ0TGluZSwgaW50IHN0YXJ0Q29sdW1uLCBp bnQgZW5kTGluZSwgaW50IGVuZENvbHVtbiwgYm9vbCBpc0NvbnRlbnRTY3JpcHQpCit2b2lkIElu c3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRpZFBhcnNlU291cmNlKGNvbnN0IFN0cmluZyYgc291cmNl SUQsIGNvbnN0IFNjcmlwdCYgc2NyaXB0KQogewogICAgIC8vIERvbid0IHNlbmQgc2NyaXB0IGNv bnRlbnQgdG8gdGhlIGZyb250IGVuZCB1bnRpbCBpdCdzIHJlYWxseSBuZWVkZWQuCi0gICAgbV9m cm9udGVuZC0+c2NyaXB0UGFyc2VkKHNvdXJjZUlELCB1cmwsIHN0YXJ0TGluZSwgc3RhcnRDb2x1 bW4sIGVuZExpbmUsIGVuZENvbHVtbiwgaXNDb250ZW50U2NyaXB0KTsKKyAgICBtX2Zyb250ZW5k LT5zY3JpcHRQYXJzZWQoc291cmNlSUQsIHNjcmlwdC51cmwsIHNjcmlwdC5zdGFydExpbmUsIHNj cmlwdC5zdGFydENvbHVtbiwgc2NyaXB0LmVuZExpbmUsIHNjcmlwdC5lbmRDb2x1bW4sIHNjcmlw dC5pc0NvbnRlbnRTY3JpcHQpOwogCi0gICAgbV9zY3JpcHRzLnNldChzb3VyY2VJRCwgU2NyaXB0 KHVybCwgZGF0YSwgc3RhcnRMaW5lLCBzdGFydENvbHVtbiwgZW5kTGluZSwgZW5kQ29sdW1uKSk7 CisgICAgbV9zY3JpcHRzLnNldChzb3VyY2VJRCwgc2NyaXB0KTsKIAotICAgIGlmICh1cmwuaXNF bXB0eSgpKQorICAgIGlmIChzY3JpcHQudXJsLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwog CiAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gYnJlYWtwb2ludHNDb29raWUgPSBtX2luc3Bl Y3RvclN0YXRlLT5nZXRPYmplY3QoRGVidWdnZXJBZ2VudFN0YXRlOjpqYXZhU2NyaXB0QnJlYWtw b2ludHMpOwpAQCAtMzgyLDcgKzM4Miw3IEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6 ZGlkUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nCiAgICAg ICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJyZWFrcG9pbnRPYmplY3QgPSBpdC0+c2Vjb25k LT5hc09iamVjdCgpOwogICAgICAgICBTdHJpbmcgYnJlYWtwb2ludFVSTDsKICAgICAgICAgYnJl YWtwb2ludE9iamVjdC0+Z2V0U3RyaW5nKCJ1cmwiLCAmYnJlYWtwb2ludFVSTCk7Ci0gICAgICAg IGlmIChicmVha3BvaW50VVJMICE9IHVybCkKKyAgICAgICAgaWYgKGJyZWFrcG9pbnRVUkwgIT0g c2NyaXB0LnVybCkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBTY3JpcHRCcmVha3Bv aW50IGJyZWFrcG9pbnQ7CiAgICAgICAgIGJyZWFrcG9pbnRPYmplY3QtPmdldE51bWJlcigibGlu ZU51bWJlciIsICZicmVha3BvaW50LmxpbmVOdW1iZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgKaW5kZXggMjc1MzExMC4uOWYyNWYz YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2Vy QWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJB Z2VudC5oCkBAIC0xMjAsNyArMTIwLDcgQEAgcHJpdmF0ZToKIAogICAgIFBhc3NSZWZQdHI8SW5z cGVjdG9yQXJyYXk+IGN1cnJlbnRDYWxsRnJhbWVzKCk7CiAKLSAgICB2aXJ0dWFsIHZvaWQgZGlk UGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGNv bnN0IFN0cmluZyYgZGF0YSwgaW50IHN0YXJ0TGluZSwgaW50IHN0YXJ0Q29sdW1uLCBpbnQgZW5k TGluZSwgaW50IGVuZENvbHVtbiwgYm9vbCBpc0NvbnRlbnRTY3JpcHQpOworICAgIHZpcnR1YWwg dm9pZCBkaWRQYXJzZVNvdXJjZShjb25zdCBTdHJpbmcmIHNvdXJjZUlELCBjb25zdCBTY3JpcHQm IHNjcmlwdCk7CiAgICAgdmlydHVhbCB2b2lkIGZhaWxlZFRvUGFyc2VTb3VyY2UoY29uc3QgU3Ry aW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgaW50IGZpcnN0TGluZSwgaW50IGVycm9yTGlu ZSwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRQYXVz ZShTY3JpcHRTdGF0ZSosIGNvbnN0IFNjcmlwdFZhbHVlJiBjYWxsRnJhbWVzLCBjb25zdCBTY3Jp cHRWYWx1ZSYgZXhjZXB0aW9uKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ29udGludWUoKTsKQEAg LTEyOCwzNSArMTI4LDYgQEAgcHJpdmF0ZToKICAgICBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVj dD4gcmVzb2x2ZUJyZWFrcG9pbnQoY29uc3QgU3RyaW5nJiBicmVha3BvaW50SWQsIGNvbnN0IFN0 cmluZyYgc291cmNlSWQsIGNvbnN0IFNjcmlwdEJyZWFrcG9pbnQmKTsKICAgICB2b2lkIGNsZWFy KCk7CiAKLSAgICBjbGFzcyBTY3JpcHQgewotICAgIHB1YmxpYzoKLSAgICAgICAgU2NyaXB0KCkK LSAgICAgICAgICAgIDogc3RhcnRMaW5lKDApCi0gICAgICAgICAgICAsIHN0YXJ0Q29sdW1uKDAp Ci0gICAgICAgICAgICAsIGVuZExpbmUoMCkKLSAgICAgICAgICAgICwgZW5kQ29sdW1uKDApCi0g ICAgICAgIHsKLSAgICAgICAgfQotCi0gICAgICAgIFNjcmlwdChjb25zdCBTdHJpbmcmIHVybCwg Y29uc3QgU3RyaW5nJiBkYXRhLCBpbnQgc3RhcnRMaW5lLCBpbnQgc3RhcnRDb2x1bW4sIGludCBl bmRMaW5lLCBpbnQgZW5kQ29sdW1uKQotICAgICAgICAgICAgOiB1cmwodXJsKQotICAgICAgICAg ICAgLCBkYXRhKGRhdGEpCi0gICAgICAgICAgICAsIHN0YXJ0TGluZShzdGFydExpbmUpCi0gICAg ICAgICAgICAsIHN0YXJ0Q29sdW1uKHN0YXJ0Q29sdW1uKQotICAgICAgICAgICAgLCBlbmRMaW5l KGVuZExpbmUpCi0gICAgICAgICAgICAsIGVuZENvbHVtbihlbmRDb2x1bW4pCi0gICAgICAgIHsK LSAgICAgICAgfQotCi0gICAgICAgIFN0cmluZyB1cmw7Ci0gICAgICAgIFN0cmluZyBkYXRhOwot ICAgICAgICBpbnQgc3RhcnRMaW5lOwotICAgICAgICBpbnQgc3RhcnRDb2x1bW47Ci0gICAgICAg IGludCBlbmRMaW5lOwotICAgICAgICBpbnQgZW5kQ29sdW1uOwotICAgICAgICBpbnQgbGluZXND b3VudDsKLSAgICB9OwotCiAgICAgdHlwZWRlZiBIYXNoTWFwPFN0cmluZywgU2NyaXB0PiBTY3Jp cHRzTWFwOwogICAgIHR5cGVkZWYgSGFzaE1hcDxTdHJpbmcsIFZlY3RvcjxTdHJpbmc+ID4gQnJl YWtwb2ludElkVG9EZWJ1Z1NlcnZlckJyZWFrcG9pbnRJZHNNYXA7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9TY3JpcHREZWJ1Z0xpc3RlbmVyLmggYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvU2NyaXB0RGVidWdMaXN0ZW5lci5oCmluZGV4IDgwMmY4NWEuLjg5NDRm NTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9TY3JpcHREZWJ1Z0xpc3Rl bmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVnTGlzdGVuZXIu aApAQCAtMzIsNiArMzIsNyBAQAogCiAjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCiAK KyNpbmNsdWRlICJQbGF0Zm9ybVN0cmluZy5oIgogI2luY2x1ZGUgIlNjcmlwdFN0YXRlLmgiCiAj aW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KIApAQCAtNDAsOSArNDEsMzEgQEAgY2xhc3MgU2NyaXB0 VmFsdWU7CiAKIGNsYXNzIFNjcmlwdERlYnVnTGlzdGVuZXIgewogcHVibGljOgorICAgIGNsYXNz IFNjcmlwdCB7CisgICAgcHVibGljOgorICAgICAgICBTY3JpcHQoKQorICAgICAgICAgICAgOiBz dGFydExpbmUoMCkKKyAgICAgICAgICAgICwgc3RhcnRDb2x1bW4oMCkKKyAgICAgICAgICAgICwg ZW5kTGluZSgwKQorICAgICAgICAgICAgLCBlbmRDb2x1bW4oMCkKKyAgICAgICAgICAgICwgaXND b250ZW50U2NyaXB0KGZhbHNlKQorICAgICAgICB7CisgICAgICAgIH0KKworICAgICAgICBTdHJp bmcgdXJsOworICAgICAgICBTdHJpbmcgc291cmNlOworICAgICAgICBTdHJpbmcgc291cmNlTWFw cGluZ1VSTDsKKyAgICAgICAgaW50IHN0YXJ0TGluZTsKKyAgICAgICAgaW50IHN0YXJ0Q29sdW1u OworICAgICAgICBpbnQgZW5kTGluZTsKKyAgICAgICAgaW50IGVuZENvbHVtbjsKKyAgICAgICAg aW50IGxpbmVzQ291bnQ7CisgICAgICAgIGJvb2wgaXNDb250ZW50U2NyaXB0OworICAgIH07CisK ICAgICB2aXJ0dWFsIH5TY3JpcHREZWJ1Z0xpc3RlbmVyKCkgeyB9CiAKLSAgICB2aXJ0dWFsIHZv aWQgZGlkUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiAgc291cmNlSUQsIGNvbnN0IFN0cmluZyYg dXJsLCBjb25zdCBTdHJpbmcmIGRhdGEsICBpbnQgc3RhcnRMaW5lLCBpbnQgc3RhcnRDb2x1bW4s IGludCBlbmRMaW5lLCBpbnQgZW5kQ29sdW1uLCBib29sIGlzQ29udGVudFNjcmlwdCkgPSAwOwor ICAgIHZpcnR1YWwgdm9pZCBkaWRQYXJzZVNvdXJjZShjb25zdCBTdHJpbmcmIHNvdXJjZUlELCBj b25zdCBTY3JpcHQmIHNjcmlwdCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBmYWlsZWRUb1BhcnNl U291cmNlKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRhdGEsIGludCBmaXJzdExp bmUsIGludCBlcnJvckxpbmUsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKSA9IDA7CiAgICAg dmlydHVhbCB2b2lkIGRpZFBhdXNlKFNjcmlwdFN0YXRlKiwgY29uc3QgU2NyaXB0VmFsdWUmIGNh bGxGcmFtZXMsIGNvbnN0IFNjcmlwdFZhbHVlJiBleGNlcHRpb24pID0gMDsKICAgICB2aXJ0dWFs IHZvaWQgZGlkQ29udGludWUoKSA9IDA7Cg== 93659 2011-05-16 10:10:22 -0700 2011-05-16 11:23:18 -0700 Fix style. patch text/plain 11468 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0YzQwYjc3Li42ZDg5ZmQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTEtMDUtMTYgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogcmVmYWN0b3Jpbmc6IFNjcmlwdERlYnVnTGlzdGVuZXI6OmRpZFBhcnNlU291cmNl IGhhcyB0b28gbWFueSBwYXJhbWV0ZXJzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjA5MDAKKworICAgICAgICAqIGJpbmRpbmdzL2pzL1NjcmlwdERl YnVnU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdERlYnVnU2VydmVyOjpkaXNw YXRjaERpZFBhcnNlU291cmNlKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHREZWJ1Z1Nl cnZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlzcGF0Y2hE aWRQYXJzZVNvdXJjZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdl bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6Z2V0U2Ny aXB0U291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRp ZFBhcnNlU291cmNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2Vu dC5oOgorICAgICAgICAqIGluc3BlY3Rvci9TY3JpcHREZWJ1Z0xpc3RlbmVyLmg6CisgICAgICAg IChXZWJDb3JlOjpTY3JpcHREZWJ1Z0xpc3RlbmVyOjpTY3JpcHQ6OlNjcmlwdCk6CisKIDIwMTEt MDUtMTIgIE1PUklUQSBIYWppbWUgIDxtb3JyaXRhQGdvb2dsZS5jb20+CiAKICAgICAgICAgU2hh ZG93Q29udGVudEVsZW1lbnQgc2hvdWxkIGFmZmVjdCB0aGUgb3JkZXIgb2YgcmVuZGVyZXIgY2hp bGRyZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdERlYnVn U2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVy LmNwcAppbmRleCAyY2Q3OTliLi5kZTIxMTQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9TY3JpcHREZWJ1Z1NlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCkBAIC0yMjEsMzEgKzIyMSwzNCBAQCB2b2lk IFNjcmlwdERlYnVnU2VydmVyOjpkaXNwYXRjaERpZENvbnRpbnVlKFNjcmlwdERlYnVnTGlzdGVu ZXIqIGxpc3RlbmVyKQogdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlzcGF0Y2hEaWRQYXJzZVNv dXJjZShjb25zdCBMaXN0ZW5lclNldCYgbGlzdGVuZXJzLCBTb3VyY2VQcm92aWRlciogc291cmNl UHJvdmlkZXIsIGJvb2wgaXNDb250ZW50U2NyaXB0KQogewogICAgIFN0cmluZyBzb3VyY2VJRCA9 IHVzdHJpbmdUb1N0cmluZyhKU0M6OlVTdHJpbmc6Om51bWJlcihzb3VyY2VQcm92aWRlci0+YXNJ RCgpKSk7Ci0gICAgU3RyaW5nIHVybCA9IHVzdHJpbmdUb1N0cmluZyhzb3VyY2VQcm92aWRlci0+ dXJsKCkpOwotICAgIFN0cmluZyBkYXRhID0gdXN0cmluZ1RvU3RyaW5nKEpTQzo6VVN0cmluZyhz b3VyY2VQcm92aWRlci0+ZGF0YSgpLCBzb3VyY2VQcm92aWRlci0+bGVuZ3RoKCkpKTsKLSAgICBp bnQgbGluZU9mZnNldCA9IHNvdXJjZVByb3ZpZGVyLT5zdGFydFBvc2l0aW9uKCkubV9saW5lLmNv bnZlcnRBc1plcm9CYXNlZEludCgpOwotICAgIGludCBjb2x1bW5PZmZzZXQgPSBzb3VyY2VQcm92 aWRlci0+c3RhcnRQb3NpdGlvbigpLm1fY29sdW1uLmNvbnZlcnRBc1plcm9CYXNlZEludCgpOwog CisgICAgU2NyaXB0RGVidWdMaXN0ZW5lcjo6U2NyaXB0IHNjcmlwdDsKKyAgICBzY3JpcHQudXJs ID0gdXN0cmluZ1RvU3RyaW5nKHNvdXJjZVByb3ZpZGVyLT51cmwoKSk7CisgICAgc2NyaXB0LnNv dXJjZSA9IHVzdHJpbmdUb1N0cmluZyhKU0M6OlVTdHJpbmcoc291cmNlUHJvdmlkZXItPmRhdGEo KSwgc291cmNlUHJvdmlkZXItPmxlbmd0aCgpKSk7CisgICAgc2NyaXB0LnN0YXJ0TGluZSA9IHNv dXJjZVByb3ZpZGVyLT5zdGFydFBvc2l0aW9uKCkubV9saW5lLmNvbnZlcnRBc1plcm9CYXNlZElu dCgpOworICAgIHNjcmlwdC5zdGFydENvbHVtbiA9IHNvdXJjZVByb3ZpZGVyLT5zdGFydFBvc2l0 aW9uKCkubV9jb2x1bW4uY29udmVydEFzWmVyb0Jhc2VkSW50KCk7CisgICAgc2NyaXB0LmlzQ29u dGVudFNjcmlwdCA9IGlzQ29udGVudFNjcmlwdDsKKworICAgIGludCBzb3VyY2VMZW5ndGggPSBz Y3JpcHQuc291cmNlLmxlbmd0aCgpOwogICAgIGludCBsaW5lQ291bnQgPSAxOwogICAgIGludCBs YXN0TGluZVN0YXJ0ID0gMDsKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGRhdGEubGVuZ3Ro KCkgLSAxOyArK2kpIHsKLSAgICAgICAgaWYgKGRhdGFbaV0gPT0gJ1xuJykgeworICAgIGZvciAo c2l6ZV90IGkgPSAwOyBpIDwgc291cmNlTGVuZ3RoIC0gMTsgKytpKSB7CisgICAgICAgIGlmIChz Y3JpcHQuc291cmNlW2ldID09ICdcbicpIHsKICAgICAgICAgICAgIGxpbmVDb3VudCArPSAxOwog ICAgICAgICAgICAgbGFzdExpbmVTdGFydCA9IGkgKyAxOwogICAgICAgICB9CiAgICAgfQogCi0g ICAgaW50IGVuZExpbmUgPSBsaW5lT2Zmc2V0ICsgbGluZUNvdW50IC0gMTsKLSAgICBpbnQgZW5k Q29sdW1uOworICAgIHNjcmlwdC5lbmRMaW5lID0gc2NyaXB0LnN0YXJ0TGluZSArIGxpbmVDb3Vu dCAtIDE7CiAgICAgaWYgKGxpbmVDb3VudCA9PSAxKQotICAgICAgICBlbmRDb2x1bW4gPSBkYXRh Lmxlbmd0aCgpICsgY29sdW1uT2Zmc2V0OworICAgICAgICBzY3JpcHQuZW5kQ29sdW1uID0gc2Ny aXB0LnN0YXJ0Q29sdW1uICsgc291cmNlTGVuZ3RoOwogICAgIGVsc2UKLSAgICAgICAgZW5kQ29s dW1uID0gZGF0YS5sZW5ndGgoKSAtIGxhc3RMaW5lU3RhcnQ7CisgICAgICAgIHNjcmlwdC5lbmRD b2x1bW4gPSBzb3VyY2VMZW5ndGggLSBsYXN0TGluZVN0YXJ0OwogCiAgICAgVmVjdG9yPFNjcmlw dERlYnVnTGlzdGVuZXIqPiBjb3B5OwogICAgIGNvcHlUb1ZlY3RvcihsaXN0ZW5lcnMsIGNvcHkp OwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY29weS5zaXplKCk7ICsraSkKLSAgICAgICAg Y29weVtpXS0+ZGlkUGFyc2VTb3VyY2Uoc291cmNlSUQsIHVybCwgZGF0YSwgbGluZU9mZnNldCwg Y29sdW1uT2Zmc2V0LCBlbmRMaW5lLCBlbmRDb2x1bW4sIGlzQ29udGVudFNjcmlwdCk7CisgICAg ICAgIGNvcHlbaV0tPmRpZFBhcnNlU291cmNlKHNvdXJjZUlELCBzY3JpcHQpOwogfQogCiB2b2lk IFNjcmlwdERlYnVnU2VydmVyOjpkaXNwYXRjaEZhaWxlZFRvUGFyc2VTb3VyY2UoY29uc3QgTGlz dGVuZXJTZXQmIGxpc3RlbmVycywgU291cmNlUHJvdmlkZXIqIHNvdXJjZVByb3ZpZGVyLCBpbnQg ZXJyb3JMaW5lLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVnU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVnU2VydmVyLmNwcAppbmRleCA4ZjlkMDNhLi5iOTAw OTMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHREZWJ1Z1Nl cnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0RGVidWdTZXJ2 ZXIuY3BwCkBAIC0zNTIsMTUgKzM1MiwxOSBAQCB2b2lkIFNjcmlwdERlYnVnU2VydmVyOjpoYW5k bGVWOERlYnVnRXZlbnQoY29uc3Qgdjg6OkRlYnVnOjpFdmVudERldGFpbHMmIGV2ZW50RAogCiB2 b2lkIFNjcmlwdERlYnVnU2VydmVyOjpkaXNwYXRjaERpZFBhcnNlU291cmNlKFNjcmlwdERlYnVn TGlzdGVuZXIqIGxpc3RlbmVyLCB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IG9iamVjdCkKIHsKLSAg ICBsaXN0ZW5lci0+ZGlkUGFyc2VTb3VyY2UoCi0gICAgICAgIHRvV2ViQ29yZVN0cmluZ1dpdGhO dWxsT3JVbmRlZmluZWRDaGVjayhvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoImlkIikpKSwK LSAgICAgICAgdG9XZWJDb3JlU3RyaW5nV2l0aE51bGxPclVuZGVmaW5lZENoZWNrKG9iamVjdC0+ R2V0KHY4OjpTdHJpbmc6Ok5ldygibmFtZSIpKSksCi0gICAgICAgIHRvV2ViQ29yZVN0cmluZ1dp dGhOdWxsT3JVbmRlZmluZWRDaGVjayhvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoInNvdXJj ZSIpKSksCi0gICAgICAgIG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygic3RhcnRMaW5lIikp LT5Ub0ludGVnZXIoKS0+VmFsdWUoKSwKLSAgICAgICAgb2JqZWN0LT5HZXQodjg6OlN0cmluZzo6 TmV3KCJzdGFydENvbHVtbiIpKS0+VG9JbnRlZ2VyKCktPlZhbHVlKCksCi0gICAgICAgIG9iamVj dC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygiZW5kTGluZSIpKS0+VG9JbnRlZ2VyKCktPlZhbHVlKCks Ci0gICAgICAgIG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygiZW5kQ29sdW1uIikpLT5Ub0lu dGVnZXIoKS0+VmFsdWUoKSwKLSAgICAgICAgb2JqZWN0LT5HZXQodjg6OlN0cmluZzo6TmV3KCJp c0NvbnRlbnRTY3JpcHQiKSktPlRvQm9vbGVhbigpLT5WYWx1ZSgpKTsKKyAgICBTdHJpbmcgc291 cmNlSUQgPSB0b1dlYkNvcmVTdHJpbmdXaXRoTnVsbE9yVW5kZWZpbmVkQ2hlY2sob2JqZWN0LT5H ZXQodjg6OlN0cmluZzo6TmV3KCJpZCIpKSk7CisKKyAgICBTY3JpcHREZWJ1Z0xpc3RlbmVyOjpT Y3JpcHQgc2NyaXB0OworICAgIHNjcmlwdC51cmwgPSB0b1dlYkNvcmVTdHJpbmdXaXRoTnVsbE9y VW5kZWZpbmVkQ2hlY2sob2JqZWN0LT5HZXQodjg6OlN0cmluZzo6TmV3KCJuYW1lIikpKTsKKyAg ICBzY3JpcHQuc291cmNlID0gdG9XZWJDb3JlU3RyaW5nV2l0aE51bGxPclVuZGVmaW5lZENoZWNr KG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygic291cmNlIikpKTsKKyAgICBzY3JpcHQuc291 cmNlTWFwcGluZ1VSTCA9IHRvV2ViQ29yZVN0cmluZ1dpdGhOdWxsT3JVbmRlZmluZWRDaGVjayhv YmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoInNvdXJjZU1hcHBpbmdVUkwiKSkpOworICAgIHNj cmlwdC5zdGFydExpbmUgPSBvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoInN0YXJ0TGluZSIp KS0+VG9JbnRlZ2VyKCktPlZhbHVlKCk7CisgICAgc2NyaXB0LnN0YXJ0Q29sdW1uID0gb2JqZWN0 LT5HZXQodjg6OlN0cmluZzo6TmV3KCJzdGFydENvbHVtbiIpKS0+VG9JbnRlZ2VyKCktPlZhbHVl KCk7CisgICAgc2NyaXB0LmVuZExpbmUgPSBvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoImVu ZExpbmUiKSktPlRvSW50ZWdlcigpLT5WYWx1ZSgpOworICAgIHNjcmlwdC5lbmRDb2x1bW4gPSBv YmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoImVuZENvbHVtbiIpKS0+VG9JbnRlZ2VyKCktPlZh bHVlKCk7CisgICAgc2NyaXB0LmlzQ29udGVudFNjcmlwdCA9IG9iamVjdC0+R2V0KHY4OjpTdHJp bmc6Ok5ldygiaXNDb250ZW50U2NyaXB0IikpLT5Ub0Jvb2xlYW4oKS0+VmFsdWUoKTsKKworICAg IGxpc3RlbmVyLT5kaWRQYXJzZVNvdXJjZShzb3VyY2VJRCwgc2NyaXB0KTsKIH0KIAogdm9pZCBT Y3JpcHREZWJ1Z1NlcnZlcjo6ZW5zdXJlRGVidWdnZXJTY3JpcHRDb21waWxlZCgpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAKaW5k ZXggZGU1NTBhMi4uMjQ4NzVjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcApAQCAtMjc3LDcgKzI3Nyw3IEBAIHZvaWQgSW5z cGVjdG9yRGVidWdnZXJBZ2VudDo6ZWRpdFNjcmlwdFNvdXJjZShFcnJvclN0cmluZyogZXJyb3Is IGNvbnN0IFN0cmluZyYKIAogdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpnZXRTY3JpcHRT b3VyY2UoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlELCBTdHJpbmcqIHNjcmlw dFNvdXJjZSkKIHsKLSAgICAqc2NyaXB0U291cmNlID0gbV9zY3JpcHRzLmdldChzb3VyY2VJRCku ZGF0YTsKKyAgICAqc2NyaXB0U291cmNlID0gbV9zY3JpcHRzLmdldChzb3VyY2VJRCkuc291cmNl OwogfQogCiB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnNjaGVkdWxlUGF1c2VPbk5leHRT dGF0ZW1lbnQoRGVidWdnZXJFdmVudFR5cGUgdHlwZSwgUGFzc1JlZlB0cjxJbnNwZWN0b3JWYWx1 ZT4gZGF0YSkKQEAgLTM2NywxNCArMzY3LDE0IEBAIFBhc3NSZWZQdHI8SW5zcGVjdG9yQXJyYXk+ IEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmN1cnJlbnRDYWxsRnJhbWVzKCkKIAogLy8gSmF2YVNj cmlwdERlYnVnTGlzdGVuZXIgZnVuY3Rpb25zCiAKLXZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2Vu dDo6ZGlkUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiB1 cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgaW50IHN0YXJ0TGluZSwgaW50IHN0YXJ0Q29sdW1uLCBp bnQgZW5kTGluZSwgaW50IGVuZENvbHVtbiwgYm9vbCBpc0NvbnRlbnRTY3JpcHQpCit2b2lkIElu c3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRpZFBhcnNlU291cmNlKGNvbnN0IFN0cmluZyYgc291cmNl SUQsIGNvbnN0IFNjcmlwdCYgc2NyaXB0KQogewogICAgIC8vIERvbid0IHNlbmQgc2NyaXB0IGNv bnRlbnQgdG8gdGhlIGZyb250IGVuZCB1bnRpbCBpdCdzIHJlYWxseSBuZWVkZWQuCi0gICAgbV9m cm9udGVuZC0+c2NyaXB0UGFyc2VkKHNvdXJjZUlELCB1cmwsIHN0YXJ0TGluZSwgc3RhcnRDb2x1 bW4sIGVuZExpbmUsIGVuZENvbHVtbiwgaXNDb250ZW50U2NyaXB0KTsKKyAgICBtX2Zyb250ZW5k LT5zY3JpcHRQYXJzZWQoc291cmNlSUQsIHNjcmlwdC51cmwsIHNjcmlwdC5zdGFydExpbmUsIHNj cmlwdC5zdGFydENvbHVtbiwgc2NyaXB0LmVuZExpbmUsIHNjcmlwdC5lbmRDb2x1bW4sIHNjcmlw dC5pc0NvbnRlbnRTY3JpcHQpOwogCi0gICAgbV9zY3JpcHRzLnNldChzb3VyY2VJRCwgU2NyaXB0 KHVybCwgZGF0YSwgc3RhcnRMaW5lLCBzdGFydENvbHVtbiwgZW5kTGluZSwgZW5kQ29sdW1uKSk7 CisgICAgbV9zY3JpcHRzLnNldChzb3VyY2VJRCwgc2NyaXB0KTsKIAotICAgIGlmICh1cmwuaXNF bXB0eSgpKQorICAgIGlmIChzY3JpcHQudXJsLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwog CiAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gYnJlYWtwb2ludHNDb29raWUgPSBtX2luc3Bl Y3RvclN0YXRlLT5nZXRPYmplY3QoRGVidWdnZXJBZ2VudFN0YXRlOjpqYXZhU2NyaXB0QnJlYWtw b2ludHMpOwpAQCAtMzgyLDcgKzM4Miw3IEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6 ZGlkUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nCiAgICAg ICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJyZWFrcG9pbnRPYmplY3QgPSBpdC0+c2Vjb25k LT5hc09iamVjdCgpOwogICAgICAgICBTdHJpbmcgYnJlYWtwb2ludFVSTDsKICAgICAgICAgYnJl YWtwb2ludE9iamVjdC0+Z2V0U3RyaW5nKCJ1cmwiLCAmYnJlYWtwb2ludFVSTCk7Ci0gICAgICAg IGlmIChicmVha3BvaW50VVJMICE9IHVybCkKKyAgICAgICAgaWYgKGJyZWFrcG9pbnRVUkwgIT0g c2NyaXB0LnVybCkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBTY3JpcHRCcmVha3Bv aW50IGJyZWFrcG9pbnQ7CiAgICAgICAgIGJyZWFrcG9pbnRPYmplY3QtPmdldE51bWJlcigibGlu ZU51bWJlciIsICZicmVha3BvaW50LmxpbmVOdW1iZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgKaW5kZXggMjc1MzExMC4uZTE5MmQx MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2Vy QWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJB Z2VudC5oCkBAIC0xMjAsNyArMTIwLDcgQEAgcHJpdmF0ZToKIAogICAgIFBhc3NSZWZQdHI8SW5z cGVjdG9yQXJyYXk+IGN1cnJlbnRDYWxsRnJhbWVzKCk7CiAKLSAgICB2aXJ0dWFsIHZvaWQgZGlk UGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGNv bnN0IFN0cmluZyYgZGF0YSwgaW50IHN0YXJ0TGluZSwgaW50IHN0YXJ0Q29sdW1uLCBpbnQgZW5k TGluZSwgaW50IGVuZENvbHVtbiwgYm9vbCBpc0NvbnRlbnRTY3JpcHQpOworICAgIHZpcnR1YWwg dm9pZCBkaWRQYXJzZVNvdXJjZShjb25zdCBTdHJpbmcmIHNvdXJjZUlELCBjb25zdCBTY3JpcHQm KTsKICAgICB2aXJ0dWFsIHZvaWQgZmFpbGVkVG9QYXJzZVNvdXJjZShjb25zdCBTdHJpbmcmIHVy bCwgY29uc3QgU3RyaW5nJiBkYXRhLCBpbnQgZmlyc3RMaW5lLCBpbnQgZXJyb3JMaW5lLCBjb25z dCBTdHJpbmcmIGVycm9yTWVzc2FnZSk7CiAgICAgdmlydHVhbCB2b2lkIGRpZFBhdXNlKFNjcmlw dFN0YXRlKiwgY29uc3QgU2NyaXB0VmFsdWUmIGNhbGxGcmFtZXMsIGNvbnN0IFNjcmlwdFZhbHVl JiBleGNlcHRpb24pOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDb250aW51ZSgpOwpAQCAtMTI4LDM1 ICsxMjgsNiBAQCBwcml2YXRlOgogICAgIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZXNv bHZlQnJlYWtwb2ludChjb25zdCBTdHJpbmcmIGJyZWFrcG9pbnRJZCwgY29uc3QgU3RyaW5nJiBz b3VyY2VJZCwgY29uc3QgU2NyaXB0QnJlYWtwb2ludCYpOwogICAgIHZvaWQgY2xlYXIoKTsKIAot ICAgIGNsYXNzIFNjcmlwdCB7Ci0gICAgcHVibGljOgotICAgICAgICBTY3JpcHQoKQotICAgICAg ICAgICAgOiBzdGFydExpbmUoMCkKLSAgICAgICAgICAgICwgc3RhcnRDb2x1bW4oMCkKLSAgICAg ICAgICAgICwgZW5kTGluZSgwKQotICAgICAgICAgICAgLCBlbmRDb2x1bW4oMCkKLSAgICAgICAg ewotICAgICAgICB9Ci0KLSAgICAgICAgU2NyaXB0KGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBT dHJpbmcmIGRhdGEsIGludCBzdGFydExpbmUsIGludCBzdGFydENvbHVtbiwgaW50IGVuZExpbmUs IGludCBlbmRDb2x1bW4pCi0gICAgICAgICAgICA6IHVybCh1cmwpCi0gICAgICAgICAgICAsIGRh dGEoZGF0YSkKLSAgICAgICAgICAgICwgc3RhcnRMaW5lKHN0YXJ0TGluZSkKLSAgICAgICAgICAg ICwgc3RhcnRDb2x1bW4oc3RhcnRDb2x1bW4pCi0gICAgICAgICAgICAsIGVuZExpbmUoZW5kTGlu ZSkKLSAgICAgICAgICAgICwgZW5kQ29sdW1uKGVuZENvbHVtbikKLSAgICAgICAgewotICAgICAg ICB9Ci0KLSAgICAgICAgU3RyaW5nIHVybDsKLSAgICAgICAgU3RyaW5nIGRhdGE7Ci0gICAgICAg IGludCBzdGFydExpbmU7Ci0gICAgICAgIGludCBzdGFydENvbHVtbjsKLSAgICAgICAgaW50IGVu ZExpbmU7Ci0gICAgICAgIGludCBlbmRDb2x1bW47Ci0gICAgICAgIGludCBsaW5lc0NvdW50Owot ICAgIH07Ci0KICAgICB0eXBlZGVmIEhhc2hNYXA8U3RyaW5nLCBTY3JpcHQ+IFNjcmlwdHNNYXA7 CiAgICAgdHlwZWRlZiBIYXNoTWFwPFN0cmluZywgVmVjdG9yPFN0cmluZz4gPiBCcmVha3BvaW50 SWRUb0RlYnVnU2VydmVyQnJlYWtwb2ludElkc01hcDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVnTGlzdGVuZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9TY3JpcHREZWJ1Z0xpc3RlbmVyLmgKaW5kZXggODAyZjg1YS4uNGYwNGRhZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVnTGlzdGVuZXIuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvU2NyaXB0RGVidWdMaXN0ZW5lci5oCkBAIC0z Miw2ICszMiw3IEBACiAKICNpZiBFTkFCTEUoSkFWQVNDUklQVF9ERUJVR0dFUikKIAorI2luY2x1 ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCiAjaW5jbHVkZSAiU2NyaXB0U3RhdGUuaCIKICNpbmNsdWRl IDx3dGYvRm9yd2FyZC5oPgogCkBAIC00MCw5ICs0MSwzMSBAQCBjbGFzcyBTY3JpcHRWYWx1ZTsK IAogY2xhc3MgU2NyaXB0RGVidWdMaXN0ZW5lciB7CiBwdWJsaWM6CisgICAgY2xhc3MgU2NyaXB0 IHsKKyAgICBwdWJsaWM6CisgICAgICAgIFNjcmlwdCgpCisgICAgICAgICAgICA6IHN0YXJ0TGlu ZSgwKQorICAgICAgICAgICAgLCBzdGFydENvbHVtbigwKQorICAgICAgICAgICAgLCBlbmRMaW5l KDApCisgICAgICAgICAgICAsIGVuZENvbHVtbigwKQorICAgICAgICAgICAgLCBpc0NvbnRlbnRT Y3JpcHQoZmFsc2UpCisgICAgICAgIHsKKyAgICAgICAgfQorCisgICAgICAgIFN0cmluZyB1cmw7 CisgICAgICAgIFN0cmluZyBzb3VyY2U7CisgICAgICAgIFN0cmluZyBzb3VyY2VNYXBwaW5nVVJM OworICAgICAgICBpbnQgc3RhcnRMaW5lOworICAgICAgICBpbnQgc3RhcnRDb2x1bW47CisgICAg ICAgIGludCBlbmRMaW5lOworICAgICAgICBpbnQgZW5kQ29sdW1uOworICAgICAgICBpbnQgbGlu ZXNDb3VudDsKKyAgICAgICAgYm9vbCBpc0NvbnRlbnRTY3JpcHQ7CisgICAgfTsKKwogICAgIHZp cnR1YWwgflNjcmlwdERlYnVnTGlzdGVuZXIoKSB7IH0KIAotICAgIHZpcnR1YWwgdm9pZCBkaWRQ YXJzZVNvdXJjZShjb25zdCBTdHJpbmcmICBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGNv bnN0IFN0cmluZyYgZGF0YSwgIGludCBzdGFydExpbmUsIGludCBzdGFydENvbHVtbiwgaW50IGVu ZExpbmUsIGludCBlbmRDb2x1bW4sIGJvb2wgaXNDb250ZW50U2NyaXB0KSA9IDA7CisgICAgdmly dHVhbCB2b2lkIGRpZFBhcnNlU291cmNlKGNvbnN0IFN0cmluZyYgc291cmNlSUQsIGNvbnN0IFNj cmlwdCYpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZmFpbGVkVG9QYXJzZVNvdXJjZShjb25zdCBT dHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBkYXRhLCBpbnQgZmlyc3RMaW5lLCBpbnQgZXJyb3JM aW5lLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBk aWRQYXVzZShTY3JpcHRTdGF0ZSosIGNvbnN0IFNjcmlwdFZhbHVlJiBjYWxsRnJhbWVzLCBjb25z dCBTY3JpcHRWYWx1ZSYgZXhjZXB0aW9uKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpZENvbnRp bnVlKCkgPSAwOwo= 93676 2011-05-16 11:23:18 -0700 2011-05-17 10:21:31 -0700 Fix warning. patch text/plain 11498 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5ZjQ5NzEwLi4yMDQ3Y2IzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMg QEAKIDIwMTEtMDUtMTYgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogcmVmYWN0b3Jpbmc6IFNjcmlwdERlYnVnTGlzdGVuZXI6OmRpZFBhcnNlU291cmNl IGhhcyB0b28gbWFueSBwYXJhbWV0ZXJzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjA5MDAKKworICAgICAgICAqIGJpbmRpbmdzL2pzL1NjcmlwdERl YnVnU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdERlYnVnU2VydmVyOjpkaXNw YXRjaERpZFBhcnNlU291cmNlKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHREZWJ1Z1Nl cnZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlzcGF0Y2hE aWRQYXJzZVNvdXJjZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdl bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6Z2V0U2Ny aXB0U291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRp ZFBhcnNlU291cmNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2Vu dC5oOgorICAgICAgICAqIGluc3BlY3Rvci9TY3JpcHREZWJ1Z0xpc3RlbmVyLmg6CisgICAgICAg IChXZWJDb3JlOjpTY3JpcHREZWJ1Z0xpc3RlbmVyOjpTY3JpcHQ6OlNjcmlwdCk6CisKKzIwMTEt MDUtMTYgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKICAgICAg ICAgUmV2aWV3ZWQgYnkgWXVyeSBTZW1pa2hhdHNreS4KIAogICAgICAgICBXZWIgSW5zcGVjdG9y OiBtZXJnZSBDb25zb2xlVmlldyBpbnRvIENvbnNvbGVQYW5lbC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmNwcAppbmRleCAyM2MxYzQ3Li5mMDNm YzYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHREZWJ1Z1Nl cnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0RGVidWdTZXJ2 ZXIuY3BwCkBAIC0yMjEsMzEgKzIyMSwzNCBAQCB2b2lkIFNjcmlwdERlYnVnU2VydmVyOjpkaXNw YXRjaERpZENvbnRpbnVlKFNjcmlwdERlYnVnTGlzdGVuZXIqIGxpc3RlbmVyKQogdm9pZCBTY3Jp cHREZWJ1Z1NlcnZlcjo6ZGlzcGF0Y2hEaWRQYXJzZVNvdXJjZShjb25zdCBMaXN0ZW5lclNldCYg bGlzdGVuZXJzLCBTb3VyY2VQcm92aWRlciogc291cmNlUHJvdmlkZXIsIGJvb2wgaXNDb250ZW50 U2NyaXB0KQogewogICAgIFN0cmluZyBzb3VyY2VJRCA9IHVzdHJpbmdUb1N0cmluZyhKU0M6OlVT dHJpbmc6Om51bWJlcihzb3VyY2VQcm92aWRlci0+YXNJRCgpKSk7Ci0gICAgU3RyaW5nIHVybCA9 IHVzdHJpbmdUb1N0cmluZyhzb3VyY2VQcm92aWRlci0+dXJsKCkpOwotICAgIFN0cmluZyBkYXRh ID0gdXN0cmluZ1RvU3RyaW5nKEpTQzo6VVN0cmluZyhzb3VyY2VQcm92aWRlci0+ZGF0YSgpLCBz b3VyY2VQcm92aWRlci0+bGVuZ3RoKCkpKTsKLSAgICBpbnQgbGluZU9mZnNldCA9IHNvdXJjZVBy b3ZpZGVyLT5zdGFydFBvc2l0aW9uKCkubV9saW5lLmNvbnZlcnRBc1plcm9CYXNlZEludCgpOwot ICAgIGludCBjb2x1bW5PZmZzZXQgPSBzb3VyY2VQcm92aWRlci0+c3RhcnRQb3NpdGlvbigpLm1f Y29sdW1uLmNvbnZlcnRBc1plcm9CYXNlZEludCgpOwogCisgICAgU2NyaXB0RGVidWdMaXN0ZW5l cjo6U2NyaXB0IHNjcmlwdDsKKyAgICBzY3JpcHQudXJsID0gdXN0cmluZ1RvU3RyaW5nKHNvdXJj ZVByb3ZpZGVyLT51cmwoKSk7CisgICAgc2NyaXB0LnNvdXJjZSA9IHVzdHJpbmdUb1N0cmluZyhK U0M6OlVTdHJpbmcoc291cmNlUHJvdmlkZXItPmRhdGEoKSwgc291cmNlUHJvdmlkZXItPmxlbmd0 aCgpKSk7CisgICAgc2NyaXB0LnN0YXJ0TGluZSA9IHNvdXJjZVByb3ZpZGVyLT5zdGFydFBvc2l0 aW9uKCkubV9saW5lLmNvbnZlcnRBc1plcm9CYXNlZEludCgpOworICAgIHNjcmlwdC5zdGFydENv bHVtbiA9IHNvdXJjZVByb3ZpZGVyLT5zdGFydFBvc2l0aW9uKCkubV9jb2x1bW4uY29udmVydEFz WmVyb0Jhc2VkSW50KCk7CisgICAgc2NyaXB0LmlzQ29udGVudFNjcmlwdCA9IGlzQ29udGVudFNj cmlwdDsKKworICAgIGludCBzb3VyY2VMZW5ndGggPSBzY3JpcHQuc291cmNlLmxlbmd0aCgpOwog ICAgIGludCBsaW5lQ291bnQgPSAxOwogICAgIGludCBsYXN0TGluZVN0YXJ0ID0gMDsKLSAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IGRhdGEubGVuZ3RoKCkgLSAxOyArK2kpIHsKLSAgICAgICAg aWYgKGRhdGFbaV0gPT0gJ1xuJykgeworICAgIGZvciAoaW50IGkgPSAwOyBpIDwgc291cmNlTGVu Z3RoIC0gMTsgKytpKSB7CisgICAgICAgIGlmIChzY3JpcHQuc291cmNlW2ldID09ICdcbicpIHsK ICAgICAgICAgICAgIGxpbmVDb3VudCArPSAxOwogICAgICAgICAgICAgbGFzdExpbmVTdGFydCA9 IGkgKyAxOwogICAgICAgICB9CiAgICAgfQogCi0gICAgaW50IGVuZExpbmUgPSBsaW5lT2Zmc2V0 ICsgbGluZUNvdW50IC0gMTsKLSAgICBpbnQgZW5kQ29sdW1uOworICAgIHNjcmlwdC5lbmRMaW5l ID0gc2NyaXB0LnN0YXJ0TGluZSArIGxpbmVDb3VudCAtIDE7CiAgICAgaWYgKGxpbmVDb3VudCA9 PSAxKQotICAgICAgICBlbmRDb2x1bW4gPSBkYXRhLmxlbmd0aCgpICsgY29sdW1uT2Zmc2V0Owor ICAgICAgICBzY3JpcHQuZW5kQ29sdW1uID0gc2NyaXB0LnN0YXJ0Q29sdW1uICsgc291cmNlTGVu Z3RoOwogICAgIGVsc2UKLSAgICAgICAgZW5kQ29sdW1uID0gZGF0YS5sZW5ndGgoKSAtIGxhc3RM aW5lU3RhcnQ7CisgICAgICAgIHNjcmlwdC5lbmRDb2x1bW4gPSBzb3VyY2VMZW5ndGggLSBsYXN0 TGluZVN0YXJ0OwogCiAgICAgVmVjdG9yPFNjcmlwdERlYnVnTGlzdGVuZXIqPiBjb3B5OwogICAg IGNvcHlUb1ZlY3RvcihsaXN0ZW5lcnMsIGNvcHkpOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBp IDwgY29weS5zaXplKCk7ICsraSkKLSAgICAgICAgY29weVtpXS0+ZGlkUGFyc2VTb3VyY2Uoc291 cmNlSUQsIHVybCwgZGF0YSwgbGluZU9mZnNldCwgY29sdW1uT2Zmc2V0LCBlbmRMaW5lLCBlbmRD b2x1bW4sIGlzQ29udGVudFNjcmlwdCk7CisgICAgICAgIGNvcHlbaV0tPmRpZFBhcnNlU291cmNl KHNvdXJjZUlELCBzY3JpcHQpOwogfQogCiB2b2lkIFNjcmlwdERlYnVnU2VydmVyOjpkaXNwYXRj aEZhaWxlZFRvUGFyc2VTb3VyY2UoY29uc3QgTGlzdGVuZXJTZXQmIGxpc3RlbmVycywgU291cmNl UHJvdmlkZXIqIHNvdXJjZVByb3ZpZGVyLCBpbnQgZXJyb3JMaW5lLCBjb25zdCBTdHJpbmcmIGVy cm9yTWVzc2FnZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Njcmlw dERlYnVnU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVn U2VydmVyLmNwcAppbmRleCA4ZjlkMDNhLi5iOTAwOTMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9TY3JpcHREZWJ1Z1NlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCkBAIC0zNTIsMTUgKzM1MiwxOSBA QCB2b2lkIFNjcmlwdERlYnVnU2VydmVyOjpoYW5kbGVWOERlYnVnRXZlbnQoY29uc3Qgdjg6OkRl YnVnOjpFdmVudERldGFpbHMmIGV2ZW50RAogCiB2b2lkIFNjcmlwdERlYnVnU2VydmVyOjpkaXNw YXRjaERpZFBhcnNlU291cmNlKFNjcmlwdERlYnVnTGlzdGVuZXIqIGxpc3RlbmVyLCB2ODo6SGFu ZGxlPHY4OjpPYmplY3Q+IG9iamVjdCkKIHsKLSAgICBsaXN0ZW5lci0+ZGlkUGFyc2VTb3VyY2Uo Ci0gICAgICAgIHRvV2ViQ29yZVN0cmluZ1dpdGhOdWxsT3JVbmRlZmluZWRDaGVjayhvYmplY3Qt PkdldCh2ODo6U3RyaW5nOjpOZXcoImlkIikpKSwKLSAgICAgICAgdG9XZWJDb3JlU3RyaW5nV2l0 aE51bGxPclVuZGVmaW5lZENoZWNrKG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygibmFtZSIp KSksCi0gICAgICAgIHRvV2ViQ29yZVN0cmluZ1dpdGhOdWxsT3JVbmRlZmluZWRDaGVjayhvYmpl Y3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoInNvdXJjZSIpKSksCi0gICAgICAgIG9iamVjdC0+R2V0 KHY4OjpTdHJpbmc6Ok5ldygic3RhcnRMaW5lIikpLT5Ub0ludGVnZXIoKS0+VmFsdWUoKSwKLSAg ICAgICAgb2JqZWN0LT5HZXQodjg6OlN0cmluZzo6TmV3KCJzdGFydENvbHVtbiIpKS0+VG9JbnRl Z2VyKCktPlZhbHVlKCksCi0gICAgICAgIG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygiZW5k TGluZSIpKS0+VG9JbnRlZ2VyKCktPlZhbHVlKCksCi0gICAgICAgIG9iamVjdC0+R2V0KHY4OjpT dHJpbmc6Ok5ldygiZW5kQ29sdW1uIikpLT5Ub0ludGVnZXIoKS0+VmFsdWUoKSwKLSAgICAgICAg b2JqZWN0LT5HZXQodjg6OlN0cmluZzo6TmV3KCJpc0NvbnRlbnRTY3JpcHQiKSktPlRvQm9vbGVh bigpLT5WYWx1ZSgpKTsKKyAgICBTdHJpbmcgc291cmNlSUQgPSB0b1dlYkNvcmVTdHJpbmdXaXRo TnVsbE9yVW5kZWZpbmVkQ2hlY2sob2JqZWN0LT5HZXQodjg6OlN0cmluZzo6TmV3KCJpZCIpKSk7 CisKKyAgICBTY3JpcHREZWJ1Z0xpc3RlbmVyOjpTY3JpcHQgc2NyaXB0OworICAgIHNjcmlwdC51 cmwgPSB0b1dlYkNvcmVTdHJpbmdXaXRoTnVsbE9yVW5kZWZpbmVkQ2hlY2sob2JqZWN0LT5HZXQo djg6OlN0cmluZzo6TmV3KCJuYW1lIikpKTsKKyAgICBzY3JpcHQuc291cmNlID0gdG9XZWJDb3Jl U3RyaW5nV2l0aE51bGxPclVuZGVmaW5lZENoZWNrKG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5l dygic291cmNlIikpKTsKKyAgICBzY3JpcHQuc291cmNlTWFwcGluZ1VSTCA9IHRvV2ViQ29yZVN0 cmluZ1dpdGhOdWxsT3JVbmRlZmluZWRDaGVjayhvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXco InNvdXJjZU1hcHBpbmdVUkwiKSkpOworICAgIHNjcmlwdC5zdGFydExpbmUgPSBvYmplY3QtPkdl dCh2ODo6U3RyaW5nOjpOZXcoInN0YXJ0TGluZSIpKS0+VG9JbnRlZ2VyKCktPlZhbHVlKCk7Cisg ICAgc2NyaXB0LnN0YXJ0Q29sdW1uID0gb2JqZWN0LT5HZXQodjg6OlN0cmluZzo6TmV3KCJzdGFy dENvbHVtbiIpKS0+VG9JbnRlZ2VyKCktPlZhbHVlKCk7CisgICAgc2NyaXB0LmVuZExpbmUgPSBv YmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoImVuZExpbmUiKSktPlRvSW50ZWdlcigpLT5WYWx1 ZSgpOworICAgIHNjcmlwdC5lbmRDb2x1bW4gPSBvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXco ImVuZENvbHVtbiIpKS0+VG9JbnRlZ2VyKCktPlZhbHVlKCk7CisgICAgc2NyaXB0LmlzQ29udGVu dFNjcmlwdCA9IG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygiaXNDb250ZW50U2NyaXB0Iikp LT5Ub0Jvb2xlYW4oKS0+VmFsdWUoKTsKKworICAgIGxpc3RlbmVyLT5kaWRQYXJzZVNvdXJjZShz b3VyY2VJRCwgc2NyaXB0KTsKIH0KIAogdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6ZW5zdXJlRGVi dWdnZXJTY3JpcHRDb21waWxlZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAKaW5kZXggMDBhNjY4NC4uM2U0OGY2MiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNw cApAQCAtMjkzLDcgKzI5Myw3IEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6ZWRpdFNj cmlwdFNvdXJjZShFcnJvclN0cmluZyogZXJyb3IsIGNvbnN0IFN0cmluZyYKIAogdm9pZCBJbnNw ZWN0b3JEZWJ1Z2dlckFnZW50OjpnZXRTY3JpcHRTb3VyY2UoRXJyb3JTdHJpbmcqLCBjb25zdCBT dHJpbmcmIHNvdXJjZUlELCBTdHJpbmcqIHNjcmlwdFNvdXJjZSkKIHsKLSAgICAqc2NyaXB0U291 cmNlID0gbV9zY3JpcHRzLmdldChzb3VyY2VJRCkuZGF0YTsKKyAgICAqc2NyaXB0U291cmNlID0g bV9zY3JpcHRzLmdldChzb3VyY2VJRCkuc291cmNlOwogfQogCiB2b2lkIEluc3BlY3RvckRlYnVn Z2VyQWdlbnQ6OnNjaGVkdWxlUGF1c2VPbk5leHRTdGF0ZW1lbnQoRGVidWdnZXJFdmVudFR5cGUg dHlwZSwgUGFzc1JlZlB0cjxJbnNwZWN0b3JWYWx1ZT4gZGF0YSkKQEAgLTM4MywxNCArMzgzLDE0 IEBAIFBhc3NSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmN1 cnJlbnRDYWxsRnJhbWVzKCkKIAogLy8gSmF2YVNjcmlwdERlYnVnTGlzdGVuZXIgZnVuY3Rpb25z CiAKLXZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6ZGlkUGFyc2VTb3VyY2UoY29uc3QgU3Ry aW5nJiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgaW50 IHN0YXJ0TGluZSwgaW50IHN0YXJ0Q29sdW1uLCBpbnQgZW5kTGluZSwgaW50IGVuZENvbHVtbiwg Ym9vbCBpc0NvbnRlbnRTY3JpcHQpCit2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRpZFBh cnNlU291cmNlKGNvbnN0IFN0cmluZyYgc291cmNlSUQsIGNvbnN0IFNjcmlwdCYgc2NyaXB0KQog ewogICAgIC8vIERvbid0IHNlbmQgc2NyaXB0IGNvbnRlbnQgdG8gdGhlIGZyb250IGVuZCB1bnRp bCBpdCdzIHJlYWxseSBuZWVkZWQuCi0gICAgbV9mcm9udGVuZC0+c2NyaXB0UGFyc2VkKHNvdXJj ZUlELCB1cmwsIHN0YXJ0TGluZSwgc3RhcnRDb2x1bW4sIGVuZExpbmUsIGVuZENvbHVtbiwgaXND b250ZW50U2NyaXB0KTsKKyAgICBtX2Zyb250ZW5kLT5zY3JpcHRQYXJzZWQoc291cmNlSUQsIHNj cmlwdC51cmwsIHNjcmlwdC5zdGFydExpbmUsIHNjcmlwdC5zdGFydENvbHVtbiwgc2NyaXB0LmVu ZExpbmUsIHNjcmlwdC5lbmRDb2x1bW4sIHNjcmlwdC5pc0NvbnRlbnRTY3JpcHQpOwogCi0gICAg bV9zY3JpcHRzLnNldChzb3VyY2VJRCwgU2NyaXB0KHVybCwgZGF0YSwgc3RhcnRMaW5lLCBzdGFy dENvbHVtbiwgZW5kTGluZSwgZW5kQ29sdW1uKSk7CisgICAgbV9zY3JpcHRzLnNldChzb3VyY2VJ RCwgc2NyaXB0KTsKIAotICAgIGlmICh1cmwuaXNFbXB0eSgpKQorICAgIGlmIChzY3JpcHQudXJs LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVj dD4gYnJlYWtwb2ludHNDb29raWUgPSBtX2luc3BlY3RvclN0YXRlLT5nZXRPYmplY3QoRGVidWdn ZXJBZ2VudFN0YXRlOjpqYXZhU2NyaXB0QnJlYWtwb2ludHMpOwpAQCAtMzk4LDcgKzM5OCw3IEBA IHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6ZGlkUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5n JiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nCiAgICAgICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+ IGJyZWFrcG9pbnRPYmplY3QgPSBpdC0+c2Vjb25kLT5hc09iamVjdCgpOwogICAgICAgICBTdHJp bmcgYnJlYWtwb2ludFVSTDsKICAgICAgICAgYnJlYWtwb2ludE9iamVjdC0+Z2V0U3RyaW5nKCJ1 cmwiLCAmYnJlYWtwb2ludFVSTCk7Ci0gICAgICAgIGlmIChicmVha3BvaW50VVJMICE9IHVybCkK KyAgICAgICAgaWYgKGJyZWFrcG9pbnRVUkwgIT0gc2NyaXB0LnVybCkKICAgICAgICAgICAgIGNv bnRpbnVlOwogICAgICAgICBTY3JpcHRCcmVha3BvaW50IGJyZWFrcG9pbnQ7CiAgICAgICAgIGJy ZWFrcG9pbnRPYmplY3QtPmdldE51bWJlcigibGluZU51bWJlciIsICZicmVha3BvaW50LmxpbmVO dW1iZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRl YnVnZ2VyQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dl ckFnZW50LmgKaW5kZXggMThlMDk3NC4uMDc0NjM0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oCkBAIC0xMjAsNyArMTIwLDcgQEAg cHJpdmF0ZToKIAogICAgIFBhc3NSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IGN1cnJlbnRDYWxsRnJh bWVzKCk7CiAKLSAgICB2aXJ0dWFsIHZvaWQgZGlkUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiBz b3VyY2VJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgaW50IHN0YXJ0 TGluZSwgaW50IHN0YXJ0Q29sdW1uLCBpbnQgZW5kTGluZSwgaW50IGVuZENvbHVtbiwgYm9vbCBp c0NvbnRlbnRTY3JpcHQpOworICAgIHZpcnR1YWwgdm9pZCBkaWRQYXJzZVNvdXJjZShjb25zdCBT dHJpbmcmIHNvdXJjZUlELCBjb25zdCBTY3JpcHQmKTsKICAgICB2aXJ0dWFsIHZvaWQgZmFpbGVk VG9QYXJzZVNvdXJjZShjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBkYXRhLCBpbnQg Zmlyc3RMaW5lLCBpbnQgZXJyb3JMaW5lLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSk7CiAg ICAgdmlydHVhbCB2b2lkIGRpZFBhdXNlKFNjcmlwdFN0YXRlKiwgY29uc3QgU2NyaXB0VmFsdWUm IGNhbGxGcmFtZXMsIGNvbnN0IFNjcmlwdFZhbHVlJiBleGNlcHRpb24pOwogICAgIHZpcnR1YWwg dm9pZCBkaWRDb250aW51ZSgpOwpAQCAtMTI4LDM1ICsxMjgsNiBAQCBwcml2YXRlOgogICAgIFBh c3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZXNvbHZlQnJlYWtwb2ludChjb25zdCBTdHJpbmcm IGJyZWFrcG9pbnRJZCwgY29uc3QgU3RyaW5nJiBzb3VyY2VJZCwgY29uc3QgU2NyaXB0QnJlYWtw b2ludCYpOwogICAgIHZvaWQgY2xlYXIoKTsKIAotICAgIGNsYXNzIFNjcmlwdCB7Ci0gICAgcHVi bGljOgotICAgICAgICBTY3JpcHQoKQotICAgICAgICAgICAgOiBzdGFydExpbmUoMCkKLSAgICAg ICAgICAgICwgc3RhcnRDb2x1bW4oMCkKLSAgICAgICAgICAgICwgZW5kTGluZSgwKQotICAgICAg ICAgICAgLCBlbmRDb2x1bW4oMCkKLSAgICAgICAgewotICAgICAgICB9Ci0KLSAgICAgICAgU2Ny aXB0KGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRhdGEsIGludCBzdGFydExpbmUs IGludCBzdGFydENvbHVtbiwgaW50IGVuZExpbmUsIGludCBlbmRDb2x1bW4pCi0gICAgICAgICAg ICA6IHVybCh1cmwpCi0gICAgICAgICAgICAsIGRhdGEoZGF0YSkKLSAgICAgICAgICAgICwgc3Rh cnRMaW5lKHN0YXJ0TGluZSkKLSAgICAgICAgICAgICwgc3RhcnRDb2x1bW4oc3RhcnRDb2x1bW4p Ci0gICAgICAgICAgICAsIGVuZExpbmUoZW5kTGluZSkKLSAgICAgICAgICAgICwgZW5kQ29sdW1u KGVuZENvbHVtbikKLSAgICAgICAgewotICAgICAgICB9Ci0KLSAgICAgICAgU3RyaW5nIHVybDsK LSAgICAgICAgU3RyaW5nIGRhdGE7Ci0gICAgICAgIGludCBzdGFydExpbmU7Ci0gICAgICAgIGlu dCBzdGFydENvbHVtbjsKLSAgICAgICAgaW50IGVuZExpbmU7Ci0gICAgICAgIGludCBlbmRDb2x1 bW47Ci0gICAgICAgIGludCBsaW5lc0NvdW50OwotICAgIH07Ci0KICAgICB0eXBlZGVmIEhhc2hN YXA8U3RyaW5nLCBTY3JpcHQ+IFNjcmlwdHNNYXA7CiAgICAgdHlwZWRlZiBIYXNoTWFwPFN0cmlu ZywgVmVjdG9yPFN0cmluZz4gPiBCcmVha3BvaW50SWRUb0RlYnVnU2VydmVyQnJlYWtwb2ludElk c01hcDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVn TGlzdGVuZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9TY3JpcHREZWJ1Z0xpc3RlbmVy LmgKaW5kZXggODAyZjg1YS4uNGYwNGRhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL1NjcmlwdERlYnVnTGlzdGVuZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvU2NyaXB0RGVidWdMaXN0ZW5lci5oCkBAIC0zMiw2ICszMiw3IEBACiAKICNpZiBFTkFCTEUo SkFWQVNDUklQVF9ERUJVR0dFUikKIAorI2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCiAjaW5j bHVkZSAiU2NyaXB0U3RhdGUuaCIKICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgogCkBAIC00MCw5 ICs0MSwzMSBAQCBjbGFzcyBTY3JpcHRWYWx1ZTsKIAogY2xhc3MgU2NyaXB0RGVidWdMaXN0ZW5l ciB7CiBwdWJsaWM6CisgICAgY2xhc3MgU2NyaXB0IHsKKyAgICBwdWJsaWM6CisgICAgICAgIFNj cmlwdCgpCisgICAgICAgICAgICA6IHN0YXJ0TGluZSgwKQorICAgICAgICAgICAgLCBzdGFydENv bHVtbigwKQorICAgICAgICAgICAgLCBlbmRMaW5lKDApCisgICAgICAgICAgICAsIGVuZENvbHVt bigwKQorICAgICAgICAgICAgLCBpc0NvbnRlbnRTY3JpcHQoZmFsc2UpCisgICAgICAgIHsKKyAg ICAgICAgfQorCisgICAgICAgIFN0cmluZyB1cmw7CisgICAgICAgIFN0cmluZyBzb3VyY2U7Cisg ICAgICAgIFN0cmluZyBzb3VyY2VNYXBwaW5nVVJMOworICAgICAgICBpbnQgc3RhcnRMaW5lOwor ICAgICAgICBpbnQgc3RhcnRDb2x1bW47CisgICAgICAgIGludCBlbmRMaW5lOworICAgICAgICBp bnQgZW5kQ29sdW1uOworICAgICAgICBpbnQgbGluZXNDb3VudDsKKyAgICAgICAgYm9vbCBpc0Nv bnRlbnRTY3JpcHQ7CisgICAgfTsKKwogICAgIHZpcnR1YWwgflNjcmlwdERlYnVnTGlzdGVuZXIo KSB7IH0KIAotICAgIHZpcnR1YWwgdm9pZCBkaWRQYXJzZVNvdXJjZShjb25zdCBTdHJpbmcmICBz b3VyY2VJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgIGludCBzdGFy dExpbmUsIGludCBzdGFydENvbHVtbiwgaW50IGVuZExpbmUsIGludCBlbmRDb2x1bW4sIGJvb2wg aXNDb250ZW50U2NyaXB0KSA9IDA7CisgICAgdmlydHVhbCB2b2lkIGRpZFBhcnNlU291cmNlKGNv bnN0IFN0cmluZyYgc291cmNlSUQsIGNvbnN0IFNjcmlwdCYpID0gMDsKICAgICB2aXJ0dWFsIHZv aWQgZmFpbGVkVG9QYXJzZVNvdXJjZShjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBk YXRhLCBpbnQgZmlyc3RMaW5lLCBpbnQgZXJyb3JMaW5lLCBjb25zdCBTdHJpbmcmIGVycm9yTWVz c2FnZSkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaWRQYXVzZShTY3JpcHRTdGF0ZSosIGNvbnN0 IFNjcmlwdFZhbHVlJiBjYWxsRnJhbWVzLCBjb25zdCBTY3JpcHRWYWx1ZSYgZXhjZXB0aW9uKSA9 IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpZENvbnRpbnVlKCkgPSAwOwo= 93786 2011-05-17 10:21:31 -0700 2011-05-18 02:47:03 -0700 Patch. patch text/plain 11398 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5MTlkZGYxLi4yZWVkMWNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTEtMDUtMTYgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogcmVmYWN0b3Jpbmc6IFNjcmlwdERlYnVnTGlzdGVuZXI6OmRpZFBhcnNlU291cmNl IGhhcyB0b28gbWFueSBwYXJhbWV0ZXJzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjA5MDAKKworICAgICAgICAqIGJpbmRpbmdzL2pzL1NjcmlwdERl YnVnU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdERlYnVnU2VydmVyOjpkaXNw YXRjaERpZFBhcnNlU291cmNlKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHREZWJ1Z1Nl cnZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlzcGF0Y2hE aWRQYXJzZVNvdXJjZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdl bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6Z2V0U2Ny aXB0U291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRp ZFBhcnNlU291cmNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2Vu dC5oOgorICAgICAgICAqIGluc3BlY3Rvci9TY3JpcHREZWJ1Z0xpc3RlbmVyLmg6CisgICAgICAg IChXZWJDb3JlOjpTY3JpcHREZWJ1Z0xpc3RlbmVyOjpTY3JpcHQ6OlNjcmlwdCk6CisKIDIwMTEt MDUtMTIgIEhhbnMgV2VubmJvcmcgIDxoYW5zQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBTdGV2ZSBCbG9jay4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL1NjcmlwdERlYnVnU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1Nj cmlwdERlYnVnU2VydmVyLmNwcAppbmRleCAyM2MxYzQ3Li5mMDNmYzYyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHREZWJ1Z1NlcnZlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCkBAIC0yMjEsMzEg KzIyMSwzNCBAQCB2b2lkIFNjcmlwdERlYnVnU2VydmVyOjpkaXNwYXRjaERpZENvbnRpbnVlKFNj cmlwdERlYnVnTGlzdGVuZXIqIGxpc3RlbmVyKQogdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlz cGF0Y2hEaWRQYXJzZVNvdXJjZShjb25zdCBMaXN0ZW5lclNldCYgbGlzdGVuZXJzLCBTb3VyY2VQ cm92aWRlciogc291cmNlUHJvdmlkZXIsIGJvb2wgaXNDb250ZW50U2NyaXB0KQogewogICAgIFN0 cmluZyBzb3VyY2VJRCA9IHVzdHJpbmdUb1N0cmluZyhKU0M6OlVTdHJpbmc6Om51bWJlcihzb3Vy Y2VQcm92aWRlci0+YXNJRCgpKSk7Ci0gICAgU3RyaW5nIHVybCA9IHVzdHJpbmdUb1N0cmluZyhz b3VyY2VQcm92aWRlci0+dXJsKCkpOwotICAgIFN0cmluZyBkYXRhID0gdXN0cmluZ1RvU3RyaW5n KEpTQzo6VVN0cmluZyhzb3VyY2VQcm92aWRlci0+ZGF0YSgpLCBzb3VyY2VQcm92aWRlci0+bGVu Z3RoKCkpKTsKLSAgICBpbnQgbGluZU9mZnNldCA9IHNvdXJjZVByb3ZpZGVyLT5zdGFydFBvc2l0 aW9uKCkubV9saW5lLmNvbnZlcnRBc1plcm9CYXNlZEludCgpOwotICAgIGludCBjb2x1bW5PZmZz ZXQgPSBzb3VyY2VQcm92aWRlci0+c3RhcnRQb3NpdGlvbigpLm1fY29sdW1uLmNvbnZlcnRBc1pl cm9CYXNlZEludCgpOwogCisgICAgU2NyaXB0RGVidWdMaXN0ZW5lcjo6U2NyaXB0IHNjcmlwdDsK KyAgICBzY3JpcHQudXJsID0gdXN0cmluZ1RvU3RyaW5nKHNvdXJjZVByb3ZpZGVyLT51cmwoKSk7 CisgICAgc2NyaXB0LnNvdXJjZSA9IHVzdHJpbmdUb1N0cmluZyhKU0M6OlVTdHJpbmcoc291cmNl UHJvdmlkZXItPmRhdGEoKSwgc291cmNlUHJvdmlkZXItPmxlbmd0aCgpKSk7CisgICAgc2NyaXB0 LnN0YXJ0TGluZSA9IHNvdXJjZVByb3ZpZGVyLT5zdGFydFBvc2l0aW9uKCkubV9saW5lLmNvbnZl cnRBc1plcm9CYXNlZEludCgpOworICAgIHNjcmlwdC5zdGFydENvbHVtbiA9IHNvdXJjZVByb3Zp ZGVyLT5zdGFydFBvc2l0aW9uKCkubV9jb2x1bW4uY29udmVydEFzWmVyb0Jhc2VkSW50KCk7Cisg ICAgc2NyaXB0LmlzQ29udGVudFNjcmlwdCA9IGlzQ29udGVudFNjcmlwdDsKKworICAgIGludCBz b3VyY2VMZW5ndGggPSBzY3JpcHQuc291cmNlLmxlbmd0aCgpOwogICAgIGludCBsaW5lQ291bnQg PSAxOwogICAgIGludCBsYXN0TGluZVN0YXJ0ID0gMDsKLSAgICBmb3IgKHNpemVfdCBpID0gMDsg aSA8IGRhdGEubGVuZ3RoKCkgLSAxOyArK2kpIHsKLSAgICAgICAgaWYgKGRhdGFbaV0gPT0gJ1xu JykgeworICAgIGZvciAoaW50IGkgPSAwOyBpIDwgc291cmNlTGVuZ3RoIC0gMTsgKytpKSB7Cisg ICAgICAgIGlmIChzY3JpcHQuc291cmNlW2ldID09ICdcbicpIHsKICAgICAgICAgICAgIGxpbmVD b3VudCArPSAxOwogICAgICAgICAgICAgbGFzdExpbmVTdGFydCA9IGkgKyAxOwogICAgICAgICB9 CiAgICAgfQogCi0gICAgaW50IGVuZExpbmUgPSBsaW5lT2Zmc2V0ICsgbGluZUNvdW50IC0gMTsK LSAgICBpbnQgZW5kQ29sdW1uOworICAgIHNjcmlwdC5lbmRMaW5lID0gc2NyaXB0LnN0YXJ0TGlu ZSArIGxpbmVDb3VudCAtIDE7CiAgICAgaWYgKGxpbmVDb3VudCA9PSAxKQotICAgICAgICBlbmRD b2x1bW4gPSBkYXRhLmxlbmd0aCgpICsgY29sdW1uT2Zmc2V0OworICAgICAgICBzY3JpcHQuZW5k Q29sdW1uID0gc2NyaXB0LnN0YXJ0Q29sdW1uICsgc291cmNlTGVuZ3RoOwogICAgIGVsc2UKLSAg ICAgICAgZW5kQ29sdW1uID0gZGF0YS5sZW5ndGgoKSAtIGxhc3RMaW5lU3RhcnQ7CisgICAgICAg IHNjcmlwdC5lbmRDb2x1bW4gPSBzb3VyY2VMZW5ndGggLSBsYXN0TGluZVN0YXJ0OwogCiAgICAg VmVjdG9yPFNjcmlwdERlYnVnTGlzdGVuZXIqPiBjb3B5OwogICAgIGNvcHlUb1ZlY3RvcihsaXN0 ZW5lcnMsIGNvcHkpOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY29weS5zaXplKCk7ICsr aSkKLSAgICAgICAgY29weVtpXS0+ZGlkUGFyc2VTb3VyY2Uoc291cmNlSUQsIHVybCwgZGF0YSwg bGluZU9mZnNldCwgY29sdW1uT2Zmc2V0LCBlbmRMaW5lLCBlbmRDb2x1bW4sIGlzQ29udGVudFNj cmlwdCk7CisgICAgICAgIGNvcHlbaV0tPmRpZFBhcnNlU291cmNlKHNvdXJjZUlELCBzY3JpcHQp OwogfQogCiB2b2lkIFNjcmlwdERlYnVnU2VydmVyOjpkaXNwYXRjaEZhaWxlZFRvUGFyc2VTb3Vy Y2UoY29uc3QgTGlzdGVuZXJTZXQmIGxpc3RlbmVycywgU291cmNlUHJvdmlkZXIqIHNvdXJjZVBy b3ZpZGVyLCBpbnQgZXJyb3JMaW5lLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVnU2VydmVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVnU2VydmVyLmNwcAppbmRleCA4 ZjlkMDNhLi5iOTAwOTMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9T Y3JpcHREZWJ1Z1NlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2Ny aXB0RGVidWdTZXJ2ZXIuY3BwCkBAIC0zNTIsMTUgKzM1MiwxOSBAQCB2b2lkIFNjcmlwdERlYnVn U2VydmVyOjpoYW5kbGVWOERlYnVnRXZlbnQoY29uc3Qgdjg6OkRlYnVnOjpFdmVudERldGFpbHMm IGV2ZW50RAogCiB2b2lkIFNjcmlwdERlYnVnU2VydmVyOjpkaXNwYXRjaERpZFBhcnNlU291cmNl KFNjcmlwdERlYnVnTGlzdGVuZXIqIGxpc3RlbmVyLCB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IG9i amVjdCkKIHsKLSAgICBsaXN0ZW5lci0+ZGlkUGFyc2VTb3VyY2UoCi0gICAgICAgIHRvV2ViQ29y ZVN0cmluZ1dpdGhOdWxsT3JVbmRlZmluZWRDaGVjayhvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpO ZXcoImlkIikpKSwKLSAgICAgICAgdG9XZWJDb3JlU3RyaW5nV2l0aE51bGxPclVuZGVmaW5lZENo ZWNrKG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygibmFtZSIpKSksCi0gICAgICAgIHRvV2Vi Q29yZVN0cmluZ1dpdGhOdWxsT3JVbmRlZmluZWRDaGVjayhvYmplY3QtPkdldCh2ODo6U3RyaW5n OjpOZXcoInNvdXJjZSIpKSksCi0gICAgICAgIG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygi c3RhcnRMaW5lIikpLT5Ub0ludGVnZXIoKS0+VmFsdWUoKSwKLSAgICAgICAgb2JqZWN0LT5HZXQo djg6OlN0cmluZzo6TmV3KCJzdGFydENvbHVtbiIpKS0+VG9JbnRlZ2VyKCktPlZhbHVlKCksCi0g ICAgICAgIG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygiZW5kTGluZSIpKS0+VG9JbnRlZ2Vy KCktPlZhbHVlKCksCi0gICAgICAgIG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygiZW5kQ29s dW1uIikpLT5Ub0ludGVnZXIoKS0+VmFsdWUoKSwKLSAgICAgICAgb2JqZWN0LT5HZXQodjg6OlN0 cmluZzo6TmV3KCJpc0NvbnRlbnRTY3JpcHQiKSktPlRvQm9vbGVhbigpLT5WYWx1ZSgpKTsKKyAg ICBTdHJpbmcgc291cmNlSUQgPSB0b1dlYkNvcmVTdHJpbmdXaXRoTnVsbE9yVW5kZWZpbmVkQ2hl Y2sob2JqZWN0LT5HZXQodjg6OlN0cmluZzo6TmV3KCJpZCIpKSk7CisKKyAgICBTY3JpcHREZWJ1 Z0xpc3RlbmVyOjpTY3JpcHQgc2NyaXB0OworICAgIHNjcmlwdC51cmwgPSB0b1dlYkNvcmVTdHJp bmdXaXRoTnVsbE9yVW5kZWZpbmVkQ2hlY2sob2JqZWN0LT5HZXQodjg6OlN0cmluZzo6TmV3KCJu YW1lIikpKTsKKyAgICBzY3JpcHQuc291cmNlID0gdG9XZWJDb3JlU3RyaW5nV2l0aE51bGxPclVu ZGVmaW5lZENoZWNrKG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygic291cmNlIikpKTsKKyAg ICBzY3JpcHQuc291cmNlTWFwcGluZ1VSTCA9IHRvV2ViQ29yZVN0cmluZ1dpdGhOdWxsT3JVbmRl ZmluZWRDaGVjayhvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoInNvdXJjZU1hcHBpbmdVUkwi KSkpOworICAgIHNjcmlwdC5zdGFydExpbmUgPSBvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXco InN0YXJ0TGluZSIpKS0+VG9JbnRlZ2VyKCktPlZhbHVlKCk7CisgICAgc2NyaXB0LnN0YXJ0Q29s dW1uID0gb2JqZWN0LT5HZXQodjg6OlN0cmluZzo6TmV3KCJzdGFydENvbHVtbiIpKS0+VG9JbnRl Z2VyKCktPlZhbHVlKCk7CisgICAgc2NyaXB0LmVuZExpbmUgPSBvYmplY3QtPkdldCh2ODo6U3Ry aW5nOjpOZXcoImVuZExpbmUiKSktPlRvSW50ZWdlcigpLT5WYWx1ZSgpOworICAgIHNjcmlwdC5l bmRDb2x1bW4gPSBvYmplY3QtPkdldCh2ODo6U3RyaW5nOjpOZXcoImVuZENvbHVtbiIpKS0+VG9J bnRlZ2VyKCktPlZhbHVlKCk7CisgICAgc2NyaXB0LmlzQ29udGVudFNjcmlwdCA9IG9iamVjdC0+ R2V0KHY4OjpTdHJpbmc6Ok5ldygiaXNDb250ZW50U2NyaXB0IikpLT5Ub0Jvb2xlYW4oKS0+VmFs dWUoKTsKKworICAgIGxpc3RlbmVyLT5kaWRQYXJzZVNvdXJjZShzb3VyY2VJRCwgc2NyaXB0KTsK IH0KIAogdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6ZW5zdXJlRGVidWdnZXJTY3JpcHRDb21waWxl ZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdn ZXJBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJB Z2VudC5jcHAKaW5kZXggMDBhNjY4NC4uM2U0OGY2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcApAQCAtMjkzLDcgKzI5Myw3 IEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6ZWRpdFNjcmlwdFNvdXJjZShFcnJvclN0 cmluZyogZXJyb3IsIGNvbnN0IFN0cmluZyYKIAogdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50 OjpnZXRTY3JpcHRTb3VyY2UoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlELCBT dHJpbmcqIHNjcmlwdFNvdXJjZSkKIHsKLSAgICAqc2NyaXB0U291cmNlID0gbV9zY3JpcHRzLmdl dChzb3VyY2VJRCkuZGF0YTsKKyAgICAqc2NyaXB0U291cmNlID0gbV9zY3JpcHRzLmdldChzb3Vy Y2VJRCkuc291cmNlOwogfQogCiB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnNjaGVkdWxl UGF1c2VPbk5leHRTdGF0ZW1lbnQoRGVidWdnZXJFdmVudFR5cGUgdHlwZSwgUGFzc1JlZlB0cjxJ bnNwZWN0b3JWYWx1ZT4gZGF0YSkKQEAgLTM4MywxNCArMzgzLDE0IEBAIFBhc3NSZWZQdHI8SW5z cGVjdG9yQXJyYXk+IEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmN1cnJlbnRDYWxsRnJhbWVzKCkK IAogLy8gSmF2YVNjcmlwdERlYnVnTGlzdGVuZXIgZnVuY3Rpb25zCiAKLXZvaWQgSW5zcGVjdG9y RGVidWdnZXJBZ2VudDo6ZGlkUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29u c3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgaW50IHN0YXJ0TGluZSwgaW50IHN0 YXJ0Q29sdW1uLCBpbnQgZW5kTGluZSwgaW50IGVuZENvbHVtbiwgYm9vbCBpc0NvbnRlbnRTY3Jp cHQpCit2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRpZFBhcnNlU291cmNlKGNvbnN0IFN0 cmluZyYgc291cmNlSUQsIGNvbnN0IFNjcmlwdCYgc2NyaXB0KQogewogICAgIC8vIERvbid0IHNl bmQgc2NyaXB0IGNvbnRlbnQgdG8gdGhlIGZyb250IGVuZCB1bnRpbCBpdCdzIHJlYWxseSBuZWVk ZWQuCi0gICAgbV9mcm9udGVuZC0+c2NyaXB0UGFyc2VkKHNvdXJjZUlELCB1cmwsIHN0YXJ0TGlu ZSwgc3RhcnRDb2x1bW4sIGVuZExpbmUsIGVuZENvbHVtbiwgaXNDb250ZW50U2NyaXB0KTsKKyAg ICBtX2Zyb250ZW5kLT5zY3JpcHRQYXJzZWQoc291cmNlSUQsIHNjcmlwdC51cmwsIHNjcmlwdC5z dGFydExpbmUsIHNjcmlwdC5zdGFydENvbHVtbiwgc2NyaXB0LmVuZExpbmUsIHNjcmlwdC5lbmRD b2x1bW4sIHNjcmlwdC5pc0NvbnRlbnRTY3JpcHQpOwogCi0gICAgbV9zY3JpcHRzLnNldChzb3Vy Y2VJRCwgU2NyaXB0KHVybCwgZGF0YSwgc3RhcnRMaW5lLCBzdGFydENvbHVtbiwgZW5kTGluZSwg ZW5kQ29sdW1uKSk7CisgICAgbV9zY3JpcHRzLnNldChzb3VyY2VJRCwgc2NyaXB0KTsKIAotICAg IGlmICh1cmwuaXNFbXB0eSgpKQorICAgIGlmIChzY3JpcHQudXJsLmlzRW1wdHkoKSkKICAgICAg ICAgcmV0dXJuOwogCiAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gYnJlYWtwb2ludHNDb29r aWUgPSBtX2luc3BlY3RvclN0YXRlLT5nZXRPYmplY3QoRGVidWdnZXJBZ2VudFN0YXRlOjpqYXZh U2NyaXB0QnJlYWtwb2ludHMpOwpAQCAtMzk4LDcgKzM5OCw3IEBAIHZvaWQgSW5zcGVjdG9yRGVi dWdnZXJBZ2VudDo6ZGlkUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3Qg U3RyaW5nCiAgICAgICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJyZWFrcG9pbnRPYmplY3Qg PSBpdC0+c2Vjb25kLT5hc09iamVjdCgpOwogICAgICAgICBTdHJpbmcgYnJlYWtwb2ludFVSTDsK ICAgICAgICAgYnJlYWtwb2ludE9iamVjdC0+Z2V0U3RyaW5nKCJ1cmwiLCAmYnJlYWtwb2ludFVS TCk7Ci0gICAgICAgIGlmIChicmVha3BvaW50VVJMICE9IHVybCkKKyAgICAgICAgaWYgKGJyZWFr cG9pbnRVUkwgIT0gc2NyaXB0LnVybCkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBT Y3JpcHRCcmVha3BvaW50IGJyZWFrcG9pbnQ7CiAgICAgICAgIGJyZWFrcG9pbnRPYmplY3QtPmdl dE51bWJlcigibGluZU51bWJlciIsICZicmVha3BvaW50LmxpbmVOdW1iZXIpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgKaW5kZXggMThl MDk3NC4uMDc0NjM0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckRlYnVnZ2VyQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yRGVidWdnZXJBZ2VudC5oCkBAIC0xMjAsNyArMTIwLDcgQEAgcHJpdmF0ZToKIAogICAgIFBh c3NSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IGN1cnJlbnRDYWxsRnJhbWVzKCk7CiAKLSAgICB2aXJ0 dWFsIHZvaWQgZGlkUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3QgU3Ry aW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgaW50IHN0YXJ0TGluZSwgaW50IHN0YXJ0Q29s dW1uLCBpbnQgZW5kTGluZSwgaW50IGVuZENvbHVtbiwgYm9vbCBpc0NvbnRlbnRTY3JpcHQpOwor ICAgIHZpcnR1YWwgdm9pZCBkaWRQYXJzZVNvdXJjZShjb25zdCBTdHJpbmcmIHNvdXJjZUlELCBj b25zdCBTY3JpcHQmKTsKICAgICB2aXJ0dWFsIHZvaWQgZmFpbGVkVG9QYXJzZVNvdXJjZShjb25z dCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBkYXRhLCBpbnQgZmlyc3RMaW5lLCBpbnQgZXJy b3JMaW5lLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSk7CiAgICAgdmlydHVhbCB2b2lkIGRp ZFBhdXNlKFNjcmlwdFN0YXRlKiwgY29uc3QgU2NyaXB0VmFsdWUmIGNhbGxGcmFtZXMsIGNvbnN0 IFNjcmlwdFZhbHVlJiBleGNlcHRpb24pOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDb250aW51ZSgp OwpAQCAtMTI4LDM1ICsxMjgsNiBAQCBwcml2YXRlOgogICAgIFBhc3NSZWZQdHI8SW5zcGVjdG9y T2JqZWN0PiByZXNvbHZlQnJlYWtwb2ludChjb25zdCBTdHJpbmcmIGJyZWFrcG9pbnRJZCwgY29u c3QgU3RyaW5nJiBzb3VyY2VJZCwgY29uc3QgU2NyaXB0QnJlYWtwb2ludCYpOwogICAgIHZvaWQg Y2xlYXIoKTsKIAotICAgIGNsYXNzIFNjcmlwdCB7Ci0gICAgcHVibGljOgotICAgICAgICBTY3Jp cHQoKQotICAgICAgICAgICAgOiBzdGFydExpbmUoMCkKLSAgICAgICAgICAgICwgc3RhcnRDb2x1 bW4oMCkKLSAgICAgICAgICAgICwgZW5kTGluZSgwKQotICAgICAgICAgICAgLCBlbmRDb2x1bW4o MCkKLSAgICAgICAgewotICAgICAgICB9Ci0KLSAgICAgICAgU2NyaXB0KGNvbnN0IFN0cmluZyYg dXJsLCBjb25zdCBTdHJpbmcmIGRhdGEsIGludCBzdGFydExpbmUsIGludCBzdGFydENvbHVtbiwg aW50IGVuZExpbmUsIGludCBlbmRDb2x1bW4pCi0gICAgICAgICAgICA6IHVybCh1cmwpCi0gICAg ICAgICAgICAsIGRhdGEoZGF0YSkKLSAgICAgICAgICAgICwgc3RhcnRMaW5lKHN0YXJ0TGluZSkK LSAgICAgICAgICAgICwgc3RhcnRDb2x1bW4oc3RhcnRDb2x1bW4pCi0gICAgICAgICAgICAsIGVu ZExpbmUoZW5kTGluZSkKLSAgICAgICAgICAgICwgZW5kQ29sdW1uKGVuZENvbHVtbikKLSAgICAg ICAgewotICAgICAgICB9Ci0KLSAgICAgICAgU3RyaW5nIHVybDsKLSAgICAgICAgU3RyaW5nIGRh dGE7Ci0gICAgICAgIGludCBzdGFydExpbmU7Ci0gICAgICAgIGludCBzdGFydENvbHVtbjsKLSAg ICAgICAgaW50IGVuZExpbmU7Ci0gICAgICAgIGludCBlbmRDb2x1bW47Ci0gICAgICAgIGludCBs aW5lc0NvdW50OwotICAgIH07Ci0KICAgICB0eXBlZGVmIEhhc2hNYXA8U3RyaW5nLCBTY3JpcHQ+ IFNjcmlwdHNNYXA7CiAgICAgdHlwZWRlZiBIYXNoTWFwPFN0cmluZywgVmVjdG9yPFN0cmluZz4g PiBCcmVha3BvaW50SWRUb0RlYnVnU2VydmVyQnJlYWtwb2ludElkc01hcDsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVnTGlzdGVuZXIuaCBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9TY3JpcHREZWJ1Z0xpc3RlbmVyLmgKaW5kZXggODAyZjg1YS4u MzcxNjBhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVn TGlzdGVuZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvU2NyaXB0RGVidWdMaXN0 ZW5lci5oCkBAIC0zMiw2ICszMiw3IEBACiAKICNpZiBFTkFCTEUoSkFWQVNDUklQVF9ERUJVR0dF UikKIAorI2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCiAjaW5jbHVkZSAiU2NyaXB0U3RhdGUu aCIKICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgogCkBAIC00MCw5ICs0MSwzMCBAQCBjbGFzcyBT Y3JpcHRWYWx1ZTsKIAogY2xhc3MgU2NyaXB0RGVidWdMaXN0ZW5lciB7CiBwdWJsaWM6CisgICAg Y2xhc3MgU2NyaXB0IHsKKyAgICBwdWJsaWM6CisgICAgICAgIFNjcmlwdCgpCisgICAgICAgICAg ICA6IHN0YXJ0TGluZSgwKQorICAgICAgICAgICAgLCBzdGFydENvbHVtbigwKQorICAgICAgICAg ICAgLCBlbmRMaW5lKDApCisgICAgICAgICAgICAsIGVuZENvbHVtbigwKQorICAgICAgICAgICAg LCBpc0NvbnRlbnRTY3JpcHQoZmFsc2UpCisgICAgICAgIHsKKyAgICAgICAgfQorCisgICAgICAg IFN0cmluZyB1cmw7CisgICAgICAgIFN0cmluZyBzb3VyY2U7CisgICAgICAgIFN0cmluZyBzb3Vy Y2VNYXBwaW5nVVJMOworICAgICAgICBpbnQgc3RhcnRMaW5lOworICAgICAgICBpbnQgc3RhcnRD b2x1bW47CisgICAgICAgIGludCBlbmRMaW5lOworICAgICAgICBpbnQgZW5kQ29sdW1uOworICAg ICAgICBib29sIGlzQ29udGVudFNjcmlwdDsKKyAgICB9OworCiAgICAgdmlydHVhbCB+U2NyaXB0 RGVidWdMaXN0ZW5lcigpIHsgfQogCi0gICAgdmlydHVhbCB2b2lkIGRpZFBhcnNlU291cmNlKGNv bnN0IFN0cmluZyYgIHNvdXJjZUlELCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBk YXRhLCAgaW50IHN0YXJ0TGluZSwgaW50IHN0YXJ0Q29sdW1uLCBpbnQgZW5kTGluZSwgaW50IGVu ZENvbHVtbiwgYm9vbCBpc0NvbnRlbnRTY3JpcHQpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgZGlk UGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3QgU2NyaXB0JikgPSAwOwog ICAgIHZpcnR1YWwgdm9pZCBmYWlsZWRUb1BhcnNlU291cmNlKGNvbnN0IFN0cmluZyYgdXJsLCBj b25zdCBTdHJpbmcmIGRhdGEsIGludCBmaXJzdExpbmUsIGludCBlcnJvckxpbmUsIGNvbnN0IFN0 cmluZyYgZXJyb3JNZXNzYWdlKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpZFBhdXNlKFNjcmlw dFN0YXRlKiwgY29uc3QgU2NyaXB0VmFsdWUmIGNhbGxGcmFtZXMsIGNvbnN0IFNjcmlwdFZhbHVl JiBleGNlcHRpb24pID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ29udGludWUoKSA9IDA7Cg==