45466 2010-09-09 10:04:49 -0700 [WINCE] Replace codePage instead of TextEncoding 2010-09-14 18:23:47 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 45468 0 paroga webkit-unassigned aroben commit-queue webkit.review.bot oldest_to_newest 276540 0 paroga 2010-09-09 10:04:49 -0700 see patch 276553 1 67052 paroga 2010-09-09 10:29:30 -0700 Created attachment 67052 Patch 276557 2 webkit.review.bot 2010-09-09 10:32:06 -0700 Attachment 67052 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebCore/platform/text/wince/TextCodecWinCE.h:36: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 278933 3 67052 aroben 2010-09-14 08:42:57 -0700 Comment on attachment 67052 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=67052&action=prettypatch > WebCore/ChangeLog:8 > + Use codePage as member variable to aviod repeated lookup. Typo: aviod > WebCore/platform/text/wince/TextCodecWinCE.cpp:136 > - return new TextCodecWinCE(encoding); > + return new TextCodecWinCE(getCodePage(encoding.name())); Another option would have been to put the call to getCodePage inside the TextCodecWinCE constructor. It isn't clear to me whether that approach would be better. 278940 4 67558 paroga 2010-09-14 08:53:12 -0700 Created attachment 67558 Patch (In reply to comment #3) > > WebCore/platform/text/wince/TextCodecWinCE.cpp:136 > > - return new TextCodecWinCE(encoding); > > + return new TextCodecWinCE(getCodePage(encoding.name())); > Another option would have been to put the call to getCodePage inside the TextCodecWinCE constructor. It isn't clear to me whether that approach would be better. IMHO there is no difference. 278957 5 67558 aroben 2010-09-14 09:18:59 -0700 Comment on attachment 67558 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=67558&action=prettypatch r=me 279298 6 67558 commit-queue 2010-09-14 18:23:42 -0700 Comment on attachment 67558 Patch Clearing flags on attachment: 67558 Committed r67523: <http://trac.webkit.org/changeset/67523> 279299 7 commit-queue 2010-09-14 18:23:47 -0700 All reviewed patches have been landed. Closing bug. 67052 2010-09-09 10:29:30 -0700 2010-09-14 08:53:12 -0700 Patch 0001-CodePage.patch text/plain 5582 paroga ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg M2QxZmNhYi4uZmVlNjIzNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0wOS0wOSAgUGF0cmljayBHYW5z dGVyZXIgIDxwYXJvZ2FAcGFyb2dhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbV0lOQ0VdIFVzZSBjb2RlUGFnZSBpbnN0ZWFkIG9mIFRleHRF bmNvZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDU0NjYKKworICAgICAgICBVc2UgY29kZVBhZ2UgYXMgbWVtYmVyIHZhcmlhYmxlIHRvIGF2aW9k IHJlcGVhdGVkIGxvb2t1cC4KKworICAgICAgICAqIHBsYXRmb3JtL3RleHQvd2luY2UvVGV4dENv ZGVjV2luQ0UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bmV3VGV4dENvZGVjV2luQ0UpOgorICAg ICAgICAoV2ViQ29yZTo6VGV4dENvZGVjV2luQ0U6OlRleHRDb2RlY1dpbkNFKToKKyAgICAgICAg KFdlYkNvcmU6OmRlY29kZSk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0Q29kZWNXaW5DRTo6ZGVj b2RlKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHRDb2RlY1dpbkNFOjplbmNvZGUpOgorICAgICAg ICAqIHBsYXRmb3JtL3RleHQvd2luY2UvVGV4dENvZGVjV2luQ0UuaDoKKwogMjAxMC0wOS0wOSAg UGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgTWFydGluIFJvYmluc29uLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0 L3dpbmNlL1RleHRDb2RlY1dpbkNFLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC93aW5jZS9U ZXh0Q29kZWNXaW5DRS5jcHAKaW5kZXggMjc4OTE0OC4uOGU1NzExZCAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9wbGF0Zm9ybS90ZXh0L3dpbmNlL1RleHRDb2RlY1dpbkNFLmNwcAorKysgYi9XZWJDb3Jl L3BsYXRmb3JtL3RleHQvd2luY2UvVGV4dENvZGVjV2luQ0UuY3BwCkBAIC0xLDUgKzEsNiBAQAog LyoKICAqIENvcHlyaWdodCAoQykgMjAwNy0yMDA5IFRvcmNoIE1vYmlsZSwgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEwIFBhdHJpY2sgR2Fuc3RlcmVyIDxw YXJvZ2FAcGFyb2dhLmNvbT4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMTMy LDExICsxMzMsMTEgQEAgc3RhdGljIFVJTlQgZ2V0Q29kZVBhZ2UoY29uc3QgY2hhciogbmFtZSkK IAogc3RhdGljIFBhc3NPd25QdHI8VGV4dENvZGVjPiBuZXdUZXh0Q29kZWNXaW5DRShjb25zdCBU ZXh0RW5jb2RpbmcmIGVuY29kaW5nLCBjb25zdCB2b2lkKikKIHsKLSAgICByZXR1cm4gbmV3IFRl eHRDb2RlY1dpbkNFKGVuY29kaW5nKTsKKyAgICByZXR1cm4gbmV3IFRleHRDb2RlY1dpbkNFKGdl dENvZGVQYWdlKGVuY29kaW5nLm5hbWUoKSkpOwogfQogCi1UZXh0Q29kZWNXaW5DRTo6VGV4dENv ZGVjV2luQ0UoY29uc3QgVGV4dEVuY29kaW5nJiBlbmNvZGluZykKLSAgICA6IG1fZW5jb2Rpbmco ZW5jb2RpbmcpCitUZXh0Q29kZWNXaW5DRTo6VGV4dENvZGVjV2luQ0UoVUlOVCBjb2RlUGFnZSkK KyAgICA6IG1fY29kZVBhZ2UoY29kZVBhZ2UpCiB7CiB9CiAKQEAgLTIxMSwyMiArMjEyLDEyIEBA IHN0YXRpYyBpbmxpbmUgY29uc3QgY2hhciogZmluZEZpcnN0Tm9uQXNjaWlDaGFyYWN0ZXIoY29u c3QgY2hhciogYnl0ZXMsIHNpemVfdCBsCiAgICAgcmV0dXJuIGJ5dGVzOwogfQogCi1zdGF0aWMg dm9pZCBkZWNvZGUoVmVjdG9yPFVDaGFyLCA4MTkyPiYgcmVzdWx0LCBjb25zdCBjaGFyKiBlbmNv ZGluZ05hbWUsIGNvbnN0IGNoYXIqIGJ5dGVzLCBzaXplX3QgbGVuZ3RoLCBzaXplX3QqIGxlZnQs IGJvb2wgY2FuQmVGaXJzdFRpbWUsIGJvb2wmIHNhd0ludmFsaWRDaGFyKQorc3RhdGljIHZvaWQg ZGVjb2RlKFZlY3RvcjxVQ2hhciwgODE5Mj4mIHJlc3VsdCwgVUlOVCBjb2RlUGFnZSwgY29uc3Qg Y2hhciogYnl0ZXMsIHNpemVfdCBsZW5ndGgsIHNpemVfdCogbGVmdCwgYm9vbCBjYW5CZUZpcnN0 VGltZSwgYm9vbCYgc2F3SW52YWxpZENoYXIpCiB7CiAgICAgKmxlZnQgPSBsZW5ndGg7CiAgICAg aWYgKCFieXRlcyB8fCAhbGVuZ3RoKQogICAgICAgICByZXR1cm47CiAKLSAgICBVSU5UIGNvZGVQ YWdlOwotCi0gICAgSGFzaE1hcDxTdHJpbmcsIENoYXJzZXRJbmZvPjo6aXRlcmF0b3IgaSA9IGtu b3duQ2hhcnNldHMoKS5maW5kKGVuY29kaW5nTmFtZSk7Ci0gICAgaWYgKGkgPT0ga25vd25DaGFy c2V0cygpLmVuZCgpKSB7Ci0gICAgICAgIGlmICghc3RyY21wKGVuY29kaW5nTmFtZSwgIlVURi04 IikpCi0gICAgICAgICAgICBjb2RlUGFnZSA9IENQX1VURjg7Ci0gICAgICAgIGVsc2UKLSAgICAg ICAgICAgIGNvZGVQYWdlID0gQ1BfQUNQOwotICAgIH0KLQogICAgIERXT1JEIGZsYWdzID0gZ2V0 Q29kZVBhZ2VGbGFncyhjb2RlUGFnZSk7CiAKICAgICBpZiAoY29kZVBhZ2UgPT0gQ1BfVVRGOCkg ewpAQCAtMzMxLDcgKzMyMiw3IEBAIFN0cmluZyBUZXh0Q29kZWNXaW5DRTo6ZGVjb2RlKGNvbnN0 IGNoYXIqIGJ5dGVzLCBzaXplX3QgbGVuZ3RoLCBib29sIGZsdXNoLCBib29sCiAgICAgVmVjdG9y PFVDaGFyLCA4MTkyPiByZXN1bHQ7CiAgICAgZm9yICg7OykgewogICAgICAgICBib29sIHNhd0lu dmFsaWRDaGFyID0gZmFsc2U7Ci0gICAgICAgIFdlYkNvcmU6OmRlY29kZShyZXN1bHQsIG1fZW5j b2RpbmcubmFtZSgpLCBieXRlcywgbGVuZ3RoLCAmbGVmdCwgbV9kZWNvZGVCdWZmZXIuaXNFbXB0 eSgpLCBzYXdJbnZhbGlkQ2hhcik7CisgICAgICAgIFdlYkNvcmU6OmRlY29kZShyZXN1bHQsIG1f Y29kZVBhZ2UsIGJ5dGVzLCBsZW5ndGgsICZsZWZ0LCBtX2RlY29kZUJ1ZmZlci5pc0VtcHR5KCks IHNhd0ludmFsaWRDaGFyKTsKICAgICAgICAgaWYgKCFsZWZ0KQogICAgICAgICAgICAgYnJlYWs7 CiAKQEAgLTM2NywxMCArMzU4LDkgQEAgQ1N0cmluZyBUZXh0Q29kZWNXaW5DRTo6ZW5jb2RlKGNv bnN0IFVDaGFyKiBjaGFyYWN0ZXJzLCBzaXplX3QgbGVuZ3RoLCBVbmVuY29kYWIKICAgICBpZiAo IWNoYXJhY3RlcnMgfHwgIWxlbmd0aCkKICAgICAgICAgcmV0dXJuIENTdHJpbmcoKTsKIAotICAg IFVJTlQgY29kZVBhZ2UgPSBnZXRDb2RlUGFnZShtX2VuY29kaW5nLm5hbWUoKSk7Ci0gICAgRFdP UkQgZmxhZ3MgPSBjb2RlUGFnZSA9PSBDUF9VVEY4ID8gMCA6IFdDX0NPTVBPU0lURUNIRUNLOwor ICAgIERXT1JEIGZsYWdzID0gbV9jb2RlUGFnZSA9PSBDUF9VVEY4ID8gMCA6IFdDX0NPTVBPU0lU RUNIRUNLOwogCi0gICAgaW50IHJlc3VsdExlbmd0aCA9IFdpZGVDaGFyVG9NdWx0aUJ5dGUoY29k ZVBhZ2UsIGZsYWdzLCBjaGFyYWN0ZXJzLCBsZW5ndGgsIDAsIDAsIDAsIDApOworICAgIGludCBy ZXN1bHRMZW5ndGggPSBXaWRlQ2hhclRvTXVsdGlCeXRlKG1fY29kZVBhZ2UsIGZsYWdzLCBjaGFy YWN0ZXJzLCBsZW5ndGgsIDAsIDAsIDAsIDApOwogCiAgICAgLy8gRklYTUU6IFdlIG5lZWQgdG8g aW1wbGVtZW50IFVuZW5jb2RhYmxlSGFuZGxpbmc6IFF1ZXN0aW9uTWFya3NGb3JVbmVuY29kYWJs ZXMsIEVudGl0aWVzRm9yVW5lbmNvZGFibGVzLCBhbmQgVVJMRW5jb2RlZEVudGl0aWVzRm9yVW5l bmNvZGFibGVzLgogCkBAIC0zNzksNyArMzY5LDcgQEAgQ1N0cmluZyBUZXh0Q29kZWNXaW5DRTo6 ZW5jb2RlKGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzLCBzaXplX3QgbGVuZ3RoLCBVbmVuY29kYWIK IAogICAgIFZlY3RvcjxjaGFyPiByZXN1bHQocmVzdWx0TGVuZ3RoKTsKIAotICAgIFdpZGVDaGFy VG9NdWx0aUJ5dGUoY29kZVBhZ2UsIGZsYWdzLCBjaGFyYWN0ZXJzLCBsZW5ndGgsIHJlc3VsdC5k YXRhKCksIHJlc3VsdExlbmd0aCwgMCwgMCk7CisgICAgV2lkZUNoYXJUb011bHRpQnl0ZShtX2Nv ZGVQYWdlLCBmbGFncywgY2hhcmFjdGVycywgbGVuZ3RoLCByZXN1bHQuZGF0YSgpLCByZXN1bHRM ZW5ndGgsIDAsIDApOwogCiAgICAgcmV0dXJuIENTdHJpbmcocmVzdWx0LmRhdGEoKSwgcmVzdWx0 LnNpemUoKSk7CiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvd2luY2UvVGV4 dENvZGVjV2luQ0UuaCBiL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC93aW5jZS9UZXh0Q29kZWNXaW5D RS5oCmluZGV4IGE4NzBkM2UuLjhkMzMyYTYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0v dGV4dC93aW5jZS9UZXh0Q29kZWNXaW5DRS5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC93 aW5jZS9UZXh0Q29kZWNXaW5DRS5oCkBAIC0yLDYgKzIsNyBAQAogICogQ29weXJpZ2h0IChDKSAy MDA0LCAyMDA2LCAyMDA3IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHly aWdodCAoQykgMjAwNiBBbGV4ZXkgUHJvc2t1cnlha292IDxhcEBueXBvcC5jb20+CiAgKiBDb3B5 cmlnaHQgKEMpIDIwMDctMjAwOSBUb3JjaCBNb2JpbGUsIEluYy4KKyAqIENvcHlyaWdodCAoQykg MjAxMCBQYXRyaWNrIEdhbnN0ZXJlciA8cGFyb2dhQHBhcm9nYS5jb20+CiAgKgogICogUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMKQEAgLTMyLDYgKzMzLDcgQEAKICNpbmNsdWRlICJUZXh0Q29kZWMu aCIKICNpbmNsdWRlICJUZXh0RW5jb2RpbmcuaCIKICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+Cisj aW5jbHVkZSA8d2luZG93cy5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTQzLDcgKzQ1 LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyB2b2lkIHJlZ2lzdGVyRXh0ZW5kZWRFbmNvZGluZ05h bWVzKEVuY29kaW5nTmFtZVJlZ2lzdHJhcik7CiAgICAgc3RhdGljIHZvaWQgcmVnaXN0ZXJFeHRl bmRlZENvZGVjcyhUZXh0Q29kZWNSZWdpc3RyYXIpOwogCi0gICAgVGV4dENvZGVjV2luQ0UoY29u c3QgVGV4dEVuY29kaW5nJik7CisgICAgVGV4dENvZGVjV2luQ0UoVUlOVCBjb2RlUGFnZSk7CiAg ICAgdmlydHVhbCB+VGV4dENvZGVjV2luQ0UoKTsKIAogICAgIHZpcnR1YWwgU3RyaW5nIGRlY29k ZShjb25zdCBjaGFyKiwgc2l6ZV90IGxlbmd0aCwgYm9vbCBmbHVzaCwgYm9vbCBzdG9wT25FcnJv ciwgYm9vbCYgc2F3RXJyb3IpOwpAQCAtNjIsNyArNjQsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGlj IHZvaWQgZW51bWVyYXRlU3VwcG9ydGVkRW5jb2RpbmdzKEVuY29kaW5nUmVjZWl2ZXImIHJlY2Vp dmVyKTsKIAogcHJpdmF0ZToKLSAgICBUZXh0RW5jb2RpbmcgbV9lbmNvZGluZzsKKyAgICBVSU5U IG1fY29kZVBhZ2U7CiAgICAgVmVjdG9yPGNoYXI+IG1fZGVjb2RlQnVmZmVyOwogfTsKIAo= 67558 2010-09-14 08:53:12 -0700 2010-09-14 18:23:42 -0700 Patch 0001-CodePage.patch text/plain 5578 paroga ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg M2QxZmNhYi4uZmVlNjIzNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0wOS0wOSAgUGF0cmljayBHYW5z dGVyZXIgIDxwYXJvZ2FAcGFyb2dhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBBZGFtIFJv YmVuLgorCisgICAgICAgIFtXSU5DRV0gVXNlIGNvZGVQYWdlIGluc3RlYWQgb2YgVGV4dEVuY29k aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTQ2 NgorCisgICAgICAgIFVzZSBjb2RlUGFnZSBhcyBtZW1iZXIgdmFyaWFibGUgdG8gYXZvaWQgcmVw ZWF0ZWQgbG9va3VwLgorCisgICAgICAgICogcGxhdGZvcm0vdGV4dC93aW5jZS9UZXh0Q29kZWNX aW5DRS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpuZXdUZXh0Q29kZWNXaW5DRSk6CisgICAgICAg IChXZWJDb3JlOjpUZXh0Q29kZWNXaW5DRTo6VGV4dENvZGVjV2luQ0UpOgorICAgICAgICAoV2Vi Q29yZTo6ZGVjb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHRDb2RlY1dpbkNFOjpkZWNvZGUp OgorICAgICAgICAoV2ViQ29yZTo6VGV4dENvZGVjV2luQ0U6OmVuY29kZSk6CisgICAgICAgICog cGxhdGZvcm0vdGV4dC93aW5jZS9UZXh0Q29kZWNXaW5DRS5oOgorCiAyMDEwLTA5LTA5ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBNYXJ0aW4gUm9iaW5zb24uCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvd2lu Y2UvVGV4dENvZGVjV2luQ0UuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L3dpbmNlL1RleHRD b2RlY1dpbkNFLmNwcAppbmRleCAyNzg5MTQ4Li44ZTU3MTFkIDEwMDY0NAotLS0gYS9XZWJDb3Jl L3BsYXRmb3JtL3RleHQvd2luY2UvVGV4dENvZGVjV2luQ0UuY3BwCisrKyBiL1dlYkNvcmUvcGxh dGZvcm0vdGV4dC93aW5jZS9UZXh0Q29kZWNXaW5DRS5jcHAKQEAgLTEsNSArMSw2IEBACiAvKgog ICogQ29weXJpZ2h0IChDKSAyMDA3LTIwMDkgVG9yY2ggTW9iaWxlLCBJbmMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTAgUGF0cmljayBHYW5zdGVyZXIgPHBhcm9n YUBwYXJvZ2EuY29tPgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0xMzIsMTEg KzEzMywxMSBAQCBzdGF0aWMgVUlOVCBnZXRDb2RlUGFnZShjb25zdCBjaGFyKiBuYW1lKQogCiBz dGF0aWMgUGFzc093blB0cjxUZXh0Q29kZWM+IG5ld1RleHRDb2RlY1dpbkNFKGNvbnN0IFRleHRF bmNvZGluZyYgZW5jb2RpbmcsIGNvbnN0IHZvaWQqKQogewotICAgIHJldHVybiBuZXcgVGV4dENv ZGVjV2luQ0UoZW5jb2RpbmcpOworICAgIHJldHVybiBuZXcgVGV4dENvZGVjV2luQ0UoZ2V0Q29k ZVBhZ2UoZW5jb2RpbmcubmFtZSgpKSk7CiB9CiAKLVRleHRDb2RlY1dpbkNFOjpUZXh0Q29kZWNX aW5DRShjb25zdCBUZXh0RW5jb2RpbmcmIGVuY29kaW5nKQotICAgIDogbV9lbmNvZGluZyhlbmNv ZGluZykKK1RleHRDb2RlY1dpbkNFOjpUZXh0Q29kZWNXaW5DRShVSU5UIGNvZGVQYWdlKQorICAg IDogbV9jb2RlUGFnZShjb2RlUGFnZSkKIHsKIH0KIApAQCAtMjExLDIyICsyMTIsMTIgQEAgc3Rh dGljIGlubGluZSBjb25zdCBjaGFyKiBmaW5kRmlyc3ROb25Bc2NpaUNoYXJhY3Rlcihjb25zdCBj aGFyKiBieXRlcywgc2l6ZV90IGwKICAgICByZXR1cm4gYnl0ZXM7CiB9CiAKLXN0YXRpYyB2b2lk IGRlY29kZShWZWN0b3I8VUNoYXIsIDgxOTI+JiByZXN1bHQsIGNvbnN0IGNoYXIqIGVuY29kaW5n TmFtZSwgY29uc3QgY2hhciogYnl0ZXMsIHNpemVfdCBsZW5ndGgsIHNpemVfdCogbGVmdCwgYm9v bCBjYW5CZUZpcnN0VGltZSwgYm9vbCYgc2F3SW52YWxpZENoYXIpCitzdGF0aWMgdm9pZCBkZWNv ZGUoVmVjdG9yPFVDaGFyLCA4MTkyPiYgcmVzdWx0LCBVSU5UIGNvZGVQYWdlLCBjb25zdCBjaGFy KiBieXRlcywgc2l6ZV90IGxlbmd0aCwgc2l6ZV90KiBsZWZ0LCBib29sIGNhbkJlRmlyc3RUaW1l LCBib29sJiBzYXdJbnZhbGlkQ2hhcikKIHsKICAgICAqbGVmdCA9IGxlbmd0aDsKICAgICBpZiAo IWJ5dGVzIHx8ICFsZW5ndGgpCiAgICAgICAgIHJldHVybjsKIAotICAgIFVJTlQgY29kZVBhZ2U7 Ci0KLSAgICBIYXNoTWFwPFN0cmluZywgQ2hhcnNldEluZm8+OjppdGVyYXRvciBpID0ga25vd25D aGFyc2V0cygpLmZpbmQoZW5jb2RpbmdOYW1lKTsKLSAgICBpZiAoaSA9PSBrbm93bkNoYXJzZXRz KCkuZW5kKCkpIHsKLSAgICAgICAgaWYgKCFzdHJjbXAoZW5jb2RpbmdOYW1lLCAiVVRGLTgiKSkK LSAgICAgICAgICAgIGNvZGVQYWdlID0gQ1BfVVRGODsKLSAgICAgICAgZWxzZQotICAgICAgICAg ICAgY29kZVBhZ2UgPSBDUF9BQ1A7Ci0gICAgfQotCiAgICAgRFdPUkQgZmxhZ3MgPSBnZXRDb2Rl UGFnZUZsYWdzKGNvZGVQYWdlKTsKIAogICAgIGlmIChjb2RlUGFnZSA9PSBDUF9VVEY4KSB7CkBA IC0zMzEsNyArMzIyLDcgQEAgU3RyaW5nIFRleHRDb2RlY1dpbkNFOjpkZWNvZGUoY29uc3QgY2hh ciogYnl0ZXMsIHNpemVfdCBsZW5ndGgsIGJvb2wgZmx1c2gsIGJvb2wKICAgICBWZWN0b3I8VUNo YXIsIDgxOTI+IHJlc3VsdDsKICAgICBmb3IgKDs7KSB7CiAgICAgICAgIGJvb2wgc2F3SW52YWxp ZENoYXIgPSBmYWxzZTsKLSAgICAgICAgV2ViQ29yZTo6ZGVjb2RlKHJlc3VsdCwgbV9lbmNvZGlu Zy5uYW1lKCksIGJ5dGVzLCBsZW5ndGgsICZsZWZ0LCBtX2RlY29kZUJ1ZmZlci5pc0VtcHR5KCks IHNhd0ludmFsaWRDaGFyKTsKKyAgICAgICAgV2ViQ29yZTo6ZGVjb2RlKHJlc3VsdCwgbV9jb2Rl UGFnZSwgYnl0ZXMsIGxlbmd0aCwgJmxlZnQsIG1fZGVjb2RlQnVmZmVyLmlzRW1wdHkoKSwgc2F3 SW52YWxpZENoYXIpOwogICAgICAgICBpZiAoIWxlZnQpCiAgICAgICAgICAgICBicmVhazsKIApA QCAtMzY3LDEwICszNTgsOSBAQCBDU3RyaW5nIFRleHRDb2RlY1dpbkNFOjplbmNvZGUoY29uc3Qg VUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBsZW5ndGgsIFVuZW5jb2RhYgogICAgIGlmICghY2hh cmFjdGVycyB8fCAhbGVuZ3RoKQogICAgICAgICByZXR1cm4gQ1N0cmluZygpOwogCi0gICAgVUlO VCBjb2RlUGFnZSA9IGdldENvZGVQYWdlKG1fZW5jb2RpbmcubmFtZSgpKTsKLSAgICBEV09SRCBm bGFncyA9IGNvZGVQYWdlID09IENQX1VURjggPyAwIDogV0NfQ09NUE9TSVRFQ0hFQ0s7CisgICAg RFdPUkQgZmxhZ3MgPSBtX2NvZGVQYWdlID09IENQX1VURjggPyAwIDogV0NfQ09NUE9TSVRFQ0hF Q0s7CiAKLSAgICBpbnQgcmVzdWx0TGVuZ3RoID0gV2lkZUNoYXJUb011bHRpQnl0ZShjb2RlUGFn ZSwgZmxhZ3MsIGNoYXJhY3RlcnMsIGxlbmd0aCwgMCwgMCwgMCwgMCk7CisgICAgaW50IHJlc3Vs dExlbmd0aCA9IFdpZGVDaGFyVG9NdWx0aUJ5dGUobV9jb2RlUGFnZSwgZmxhZ3MsIGNoYXJhY3Rl cnMsIGxlbmd0aCwgMCwgMCwgMCwgMCk7CiAKICAgICAvLyBGSVhNRTogV2UgbmVlZCB0byBpbXBs ZW1lbnQgVW5lbmNvZGFibGVIYW5kbGluZzogUXVlc3Rpb25NYXJrc0ZvclVuZW5jb2RhYmxlcywg RW50aXRpZXNGb3JVbmVuY29kYWJsZXMsIGFuZCBVUkxFbmNvZGVkRW50aXRpZXNGb3JVbmVuY29k YWJsZXMuCiAKQEAgLTM3OSw3ICszNjksNyBAQCBDU3RyaW5nIFRleHRDb2RlY1dpbkNFOjplbmNv ZGUoY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBsZW5ndGgsIFVuZW5jb2RhYgogCiAg ICAgVmVjdG9yPGNoYXI+IHJlc3VsdChyZXN1bHRMZW5ndGgpOwogCi0gICAgV2lkZUNoYXJUb011 bHRpQnl0ZShjb2RlUGFnZSwgZmxhZ3MsIGNoYXJhY3RlcnMsIGxlbmd0aCwgcmVzdWx0LmRhdGEo KSwgcmVzdWx0TGVuZ3RoLCAwLCAwKTsKKyAgICBXaWRlQ2hhclRvTXVsdGlCeXRlKG1fY29kZVBh Z2UsIGZsYWdzLCBjaGFyYWN0ZXJzLCBsZW5ndGgsIHJlc3VsdC5kYXRhKCksIHJlc3VsdExlbmd0 aCwgMCwgMCk7CiAKICAgICByZXR1cm4gQ1N0cmluZyhyZXN1bHQuZGF0YSgpLCByZXN1bHQuc2l6 ZSgpKTsKIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC93aW5jZS9UZXh0Q29k ZWNXaW5DRS5oIGIvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L3dpbmNlL1RleHRDb2RlY1dpbkNFLmgK aW5kZXggYTg3MGQzZS4uOGQzMzJhNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0 L3dpbmNlL1RleHRDb2RlY1dpbkNFLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L3dpbmNl L1RleHRDb2RlY1dpbkNFLmgKQEAgLTIsNiArMiw3IEBACiAgKiBDb3B5cmlnaHQgKEMpIDIwMDQs IDIwMDYsIDIwMDcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0 IChDKSAyMDA2IEFsZXhleSBQcm9za3VyeWFrb3YgPGFwQG55cG9wLmNvbT4KICAqIENvcHlyaWdo dCAoQykgMjAwNy0yMDA5IFRvcmNoIE1vYmlsZSwgSW5jLgorICogQ29weXJpZ2h0IChDKSAyMDEw IFBhdHJpY2sgR2Fuc3RlcmVyIDxwYXJvZ2FAcGFyb2dhLmNvbT4KICAqCiAgKiBSZWRpc3RyaWJ1 dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQK ICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dp bmcgY29uZGl0aW9ucwpAQCAtMzIsNiArMzMsNyBAQAogI2luY2x1ZGUgIlRleHRDb2RlYy5oIgog I2luY2x1ZGUgIlRleHRFbmNvZGluZy5oIgogI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KKyNpbmNs dWRlIDx3aW5kb3dzLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtNDMsNyArNDUsNyBA QCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgcmVnaXN0ZXJFeHRlbmRlZEVuY29kaW5nTmFtZXMo RW5jb2RpbmdOYW1lUmVnaXN0cmFyKTsKICAgICBzdGF0aWMgdm9pZCByZWdpc3RlckV4dGVuZGVk Q29kZWNzKFRleHRDb2RlY1JlZ2lzdHJhcik7CiAKLSAgICBUZXh0Q29kZWNXaW5DRShjb25zdCBU ZXh0RW5jb2RpbmcmKTsKKyAgICBUZXh0Q29kZWNXaW5DRShVSU5UIGNvZGVQYWdlKTsKICAgICB2 aXJ0dWFsIH5UZXh0Q29kZWNXaW5DRSgpOwogCiAgICAgdmlydHVhbCBTdHJpbmcgZGVjb2RlKGNv bnN0IGNoYXIqLCBzaXplX3QgbGVuZ3RoLCBib29sIGZsdXNoLCBib29sIHN0b3BPbkVycm9yLCBi b29sJiBzYXdFcnJvcik7CkBAIC02Miw3ICs2NCw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgdm9p ZCBlbnVtZXJhdGVTdXBwb3J0ZWRFbmNvZGluZ3MoRW5jb2RpbmdSZWNlaXZlciYgcmVjZWl2ZXIp OwogCiBwcml2YXRlOgotICAgIFRleHRFbmNvZGluZyBtX2VuY29kaW5nOworICAgIFVJTlQgbV9j b2RlUGFnZTsKICAgICBWZWN0b3I8Y2hhcj4gbV9kZWNvZGVCdWZmZXI7CiB9OwogCg==