53863 2011-02-05 16:04:43 -0800 [WIN] Use WCHAR instead of TCHAR 2011-02-06 10:53:24 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 paroga paroga aroben oldest_to_newest 346210 0 paroga 2011-02-05 16:04:43 -0800 see patch 346211 1 81381 paroga 2011-02-05 16:12:06 -0800 Created attachment 81381 Patch 346315 2 81381 aroben 2011-02-06 08:59:11 -0800 Comment on attachment 81381 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=81381&action=review > Source/WebCore/platform/graphics/win/SimpleFontDataCGWin.cpp:78 > GetTextFace(dc, faceLength, faceName.data()); > m_isSystemFont = !_tcscmp(faceName.data(), _T("Lucida Grande")); How about GetTextFaceW and wcscmp? 346341 3 paroga 2011-02-06 10:53:24 -0800 Committed r77775: <http://trac.webkit.org/changeset/77775> 81381 2011-02-05 16:12:06 -0800 2011-02-06 08:59:11 -0800 Patch bug-53863.patch text/plain 15216 paroga ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5ZTJmNmE2Li40YzNkYjY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkg QEAKKzIwMTEtMDItMDUgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1dJTl0gVXNl IFdDSEFSIGluc3RlYWQgb2YgVENIQVIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTUzODYzCisKKyAgICAgICAgV2UgYWx3YXlzIHVzZSB0aGUgVU5JQ09E RSB2ZXJzaW9ucyBvZiB3aW5kb3dzIGZ1bmN0aW9ucywgc28KKyAgICAgICAgdGhlIHVzYWdlIG9m IFRDSEFSIG1ha2VzIG5vIHNlbnNlIGFuZCBtaXhpbmcgdGhlbSBpcyBiYWQgc3R5bGUuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4vSWNvbldpbi5jcHA6CisgICAgICAgIChXZWJD b3JlOjpJY29uOjpjcmVhdGVJY29uRm9yRmlsZXMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL3dpbi9RVE1vdmllLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4vUVRN b3ZpZUdXb3JsZC5jcHA6CisgICAgICAgIChRVE1vdmllR1dvcmxkOjpmdWxsc2NyZWVuV25kUHJv Yyk6CisgICAgICAgIChRVE1vdmllR1dvcmxkOjplbnRlckZ1bGxzY3JlZW4pOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9TaW1wbGVGb250RGF0YUNHV2luLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybUluaXQpOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL3dpbi9TaW1wbGVGb250RGF0YUNhaXJvV2luLmNwcDoKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy93aW4vU2ltcGxlRm9udERhdGFXaW4uY3BwOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3dpbmNlL1NpbXBsZUZvbnREYXRhV2luQ0UuY3BwOgorICAgICAgICAq IHBsYXRmb3JtL3dpbi9CU3RyaW5nLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vQ2xpcGJv YXJkV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmZpbGVzeXN0ZW1QYXRoRnJvbVVybE9yVGl0 bGUpOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlR2xvYmFsSERyb3BDb250ZW50KToKKyAgICAg ICAgKFdlYkNvcmU6OmNyZWF0ZUdsb2JhbEltYWdlRmlsZURlc2NyaXB0b3IpOgorICAgICAgICAq IHBsYXRmb3JtL3dpbi9Db250ZXh0TWVudVdpbi5jcHA6CisgICAgICAgICogcGxhdGZvcm0vd2lu L0N1cnNvcldpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsb2FkU2hhcmVkQ3Vyc29yKToKKyAg ICAgICAgKiBwbGF0Zm9ybS93aW4vRmlsZUNob29zZXJXaW4uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RmlsZUNob29zZXI6OmJhc2VuYW1lRm9yV2lkdGgpOgorICAgICAgICAqIHBsYXRmb3JtL3dp bi9Qb3B1cE1lbnVXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UG9wdXBNZW51V2luOjpwb3B1 cENsYXNzTmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpQb3B1cE1lbnVXaW46OnNob3cpOgorICAg ICAgICAqIHBsYXRmb3JtL3dpbi9Qb3B1cE1lbnVXaW4uaDoKKwogMjAxMS0wMS0yNSAgUGF0cmlj ayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkIFdp bkNFIGJ1aWxkIGZpeCBmb3Igcjc2NjE0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvd2luL0ljb25XaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3Mvd2luL0ljb25XaW4uY3BwCmluZGV4IDRkNGQyMTkuLjdlMDMzNjIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9JY29uV2luLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vSWNvbldpbi5jcHAKQEAgLTI1 LDcgKzI1LDYgQEAKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQuaCIKICNpbmNsdWRlICJMb2Nh bFdpbmRvd3NDb250ZXh0LmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1TdHJpbmcuaCIKLSNpbmNsdWRl IDx0Y2hhci5oPgogI2luY2x1ZGUgPHdpbmRvd3MuaD4KIAogI2lmIE9TKFdJTkNFKQpAQCAtNjgs MTYgKzY3LDE2IEBAIFBhc3NSZWZQdHI8SWNvbj4gSWNvbjo6Y3JlYXRlSWNvbkZvckZpbGVzKGNv bnN0IFZlY3RvcjxTdHJpbmc+JiBmaWxlbmFtZXMpCiAjaWYgT1MoV0lOQ0UpCiAgICAgcmV0dXJu IDA7CiAjZWxzZQotICAgIFRDSEFSIGJ1ZmZlcltNQVhfUEFUSF07ICAgIAotICAgIFVJTlQgbGVu Z3RoID0gOjpHZXRTeXN0ZW1EaXJlY3RvcnkoYnVmZmVyLCBXVEZfQVJSQVlfTEVOR1RIKGJ1ZmZl cikpOworICAgIFdDSEFSIGJ1ZmZlcltNQVhfUEFUSF07CisgICAgVUlOVCBsZW5ndGggPSA6Okdl dFN5c3RlbURpcmVjdG9yeVcoYnVmZmVyLCBXVEZfQVJSQVlfTEVOR1RIKGJ1ZmZlcikpOwogICAg IGlmICghbGVuZ3RoKQogICAgICAgICByZXR1cm4gMDsKLSAgICAKLSAgICBpZiAoX3Rjc2NhdF9z KGJ1ZmZlciwgVEVYVCgiXFxzaGVsbDMyLmRsbCIpKSkKKworICAgIGlmICh3Y3NjYXRfcyhidWZm ZXIsIEwiXFxzaGVsbDMyLmRsbCIpKQogICAgICAgICByZXR1cm4gMDsKIAogICAgIEhJQ09OIGhJ Y29uOwotICAgIGlmICghOjpFeHRyYWN0SWNvbkV4KGJ1ZmZlciwgc2hlbGwzMk11bHRpcGxlRmls ZUljb25JbmRleCwgMCwgJmhJY29uLCAxKSkKKyAgICBpZiAoITo6RXh0cmFjdEljb25FeFcoYnVm ZmVyLCBzaGVsbDMyTXVsdGlwbGVGaWxlSWNvbkluZGV4LCAwLCAmaEljb24sIDEpKQogICAgICAg ICByZXR1cm4gMDsKICAgICByZXR1cm4gYWRvcHRSZWYobmV3IEljb24oaEljb24pKTsKICNlbmRp ZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1FUTW92 aWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1FUTW92aWUuY3Bw CmluZGV4IGVmN2IxOTMuLmEwZTZhZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3dpbi9RVE1vdmllLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy93aW4vUVRNb3ZpZS5jcHAKQEAgLTQ3LDcgKzQ3LDYgQEAgc3RhdGljIGNvbnN0 IGxvbmcgc3ViVGl0bGVUcmFja1R5cGUgPSAnc2J0bCc7CiBzdGF0aWMgY29uc3QgbG9uZyBtcGVn NE9iamVjdERlc2NyaXB0aW9uVHJhY2tUeXBlID0gJ29kc20nOwogc3RhdGljIGNvbnN0IGxvbmcg bXBlZzRTY2VuZURlc2NyaXB0aW9uVHJhY2tUeXBlID0gJ3Nkc20nOwogc3RhdGljIGNvbnN0IGxv bmcgY2xvc2VkQ2FwdGlvbkRpc3BsYXlQcm9wZXJ0eUlEID0gJ2Rpc3AnOwotc3RhdGljIExQQ1RT VFIgZnVsbHNjcmVlblFUTW92aWVQb2ludGVyUHJvcCA9IFRFWFQoImZ1bGxzY3JlZW5RVE1vdmll UG9pbnRlciIpOwogCiAvLyBSZXNpemluZyBHV29ybGRzIGlzIHNsb3csIGdpdmUgdGhlbSBhIG1p bmltdW0gc2l6ZSBzbyBzaXplIG9mIHNtYWxsIAogLy8gdmlkZW9zIGNhbiBiZSBhbmltYXRlZCBz bW9vdGhseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2lu L1FUTW92aWVHV29ybGQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2lu L1FUTW92aWVHV29ybGQuY3BwCmluZGV4IGUxM2Y3MzIuLjRiZTFiYmIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9RVE1vdmllR1dvcmxkLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vUVRNb3ZpZUdXb3JsZC5jcHAK QEAgLTQwLDcgKzQwLDcgQEAgdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAogc3RhdGljIGNvbnN0IGxv bmcgbWluaW11bVF1aWNrVGltZVZlcnNpb24gPSAweDA3MzAwMDAwOyAvLyA3LjMKIAotc3RhdGlj IExQQ1RTVFIgZnVsbHNjcmVlblFUTW92aWVHV29ybGRQb2ludGVyUHJvcCA9IFRFWFQoImZ1bGxz Y3JlZW5RVE1vdmllR1dvcmxkUG9pbnRlciIpOworc3RhdGljIExQQ1dTVFIgZnVsbHNjcmVlblFU TW92aWVHV29ybGRQb2ludGVyUHJvcCA9IEwiZnVsbHNjcmVlblFUTW92aWVHV29ybGRQb2ludGVy IjsKIAogLy8gUmVzaXppbmcgR1dvcmxkcyBpcyBzbG93LCBnaXZlIHRoZW0gYSBtaW5pbXVtIHNp emUgc28gc2l6ZSBvZiBzbWFsbCAKIC8vIHZpZGVvcyBjYW4gYmUgYW5pbWF0ZWQgc21vb3RobHkK QEAgLTM3OCwxMCArMzc4LDEwIEBAIGJvb2wgUVRNb3ZpZUdXb3JsZDo6aXNEaXNhYmxlZCgpIGNv bnN0CiAKIExSRVNVTFQgUVRNb3ZpZUdXb3JsZDo6ZnVsbHNjcmVlblduZFByb2MoSFdORCB3bmQs IFVJTlQgbWVzc2FnZSwgV1BBUkFNIHdQYXJhbSwgTFBBUkFNIGxQYXJhbSkKIHsKLSAgICBRVE1v dmllR1dvcmxkKiBtb3ZpZSA9IHN0YXRpY19jYXN0PFFUTW92aWVHV29ybGQqPihHZXRQcm9wKHdu ZCwgZnVsbHNjcmVlblFUTW92aWVHV29ybGRQb2ludGVyUHJvcCkpOworICAgIFFUTW92aWVHV29y bGQqIG1vdmllID0gc3RhdGljX2Nhc3Q8UVRNb3ZpZUdXb3JsZCo+KEdldFByb3BXKHduZCwgZnVs bHNjcmVlblFUTW92aWVHV29ybGRQb2ludGVyUHJvcCkpOwogCiAgICAgaWYgKG1lc3NhZ2UgPT0g V01fREVTVFJPWSkKLSAgICAgICAgUmVtb3ZlUHJvcCh3bmQsIGZ1bGxzY3JlZW5RVE1vdmllR1dv cmxkUG9pbnRlclByb3ApOworICAgICAgICBSZW1vdmVQcm9wVyh3bmQsIGZ1bGxzY3JlZW5RVE1v dmllR1dvcmxkUG9pbnRlclByb3ApOwogCiAgICAgaWYgKCFtb3ZpZSkKICAgICAgICAgcmV0dXJu IERlZldpbmRvd1Byb2Mod25kLCBtZXNzYWdlLCB3UGFyYW0sIGxQYXJhbSk7CkBAIC00MjMsNyAr NDIzLDcgQEAgSFdORCBRVE1vdmllR1dvcmxkOjplbnRlckZ1bGxzY3JlZW4oUVRNb3ZpZUdXb3Js ZEZ1bGxzY3JlZW5DbGllbnQqIGNsaWVudCkKIAogICAgIC8vIFNldCB0aGUgJ3RoaXMnIHBvaW50 ZXIgb24gdGhlIEhXTkQKICAgICBIV05EIHduZCA9IHN0YXRpY19jYXN0PEhXTkQ+KEdldFBvcnRO YXRpdmVXaW5kb3cobV9wcml2YXRlLT5tX2Z1bGxzY3JlZW5XaW5kb3cpKTsKLSAgICBTZXRQcm9w KHduZCwgZnVsbHNjcmVlblFUTW92aWVHV29ybGRQb2ludGVyUHJvcCwgc3RhdGljX2Nhc3Q8SEFO RExFPih0aGlzKSk7CisgICAgU2V0UHJvcFcod25kLCBmdWxsc2NyZWVuUVRNb3ZpZUdXb3JsZFBv aW50ZXJQcm9wLCBzdGF0aWNfY2FzdDxIQU5ETEU+KHRoaXMpKTsKIAogICAgIHJldHVybiB3bmQ7 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vU2lt cGxlRm9udERhdGFDR1dpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93 aW4vU2ltcGxlRm9udERhdGFDR1dpbi5jcHAKaW5kZXggZThmMDY2Zi4uYzZhOTllYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1NpbXBsZUZvbnREYXRh Q0dXaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9TaW1w bGVGb250RGF0YUNHV2luLmNwcApAQCAtMjksMjAgKzI5LDE5IEBACiAjaW5jbHVkZSAiY29uZmln LmgiCiAjaW5jbHVkZSAiU2ltcGxlRm9udERhdGEuaCIKIAotI2luY2x1ZGUgPHdpbnNvY2syLmg+ CiAjaW5jbHVkZSAiRm9udC5oIgogI2luY2x1ZGUgIkZvbnRDYWNoZS5oIgogI2luY2x1ZGUgIkZs b2F0UmVjdC5oIgogI2luY2x1ZGUgIkZvbnREZXNjcmlwdGlvbi5oIgogI2luY2x1ZGUgIlBsYXRm b3JtU3RyaW5nLmgiCi0jaW5jbHVkZSA8d3RmL01hdGhFeHRyYXMuaD4KLSNpbmNsdWRlIDx3dGYv UmV0YWluUHRyLmg+Ci0jaW5jbHVkZSA8dW5pY29kZS91Y2hhci5oPgotI2luY2x1ZGUgPHVuaWNv ZGUvdW5vcm0uaD4KICNpbmNsdWRlIDxBcHBsaWNhdGlvblNlcnZpY2VzL0FwcGxpY2F0aW9uU2Vy dmljZXMuaD4KICNpbmNsdWRlIDxXZWJLaXRTeXN0ZW1JbnRlcmZhY2UvV2ViS2l0U3lzdGVtSW50 ZXJmYWNlLmg+CiAjaW5jbHVkZSA8bWxhbmcuaD4KLSNpbmNsdWRlIDx0Y2hhci5oPgorI2luY2x1 ZGUgPHVuaWNvZGUvdWNoYXIuaD4KKyNpbmNsdWRlIDx1bmljb2RlL3Vub3JtLmg+CisjaW5jbHVk ZSA8d2luc29jazIuaD4KKyNpbmNsdWRlIDx3dGYvTWF0aEV4dHJhcy5oPgorI2luY2x1ZGUgPHd0 Zi9SZXRhaW5QdHIuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC03NCw3ICs3Myw3IEBA IHZvaWQgU2ltcGxlRm9udERhdGE6OnBsYXRmb3JtSW5pdCgpCiAgICAgICAgIEhEQyBkYyA9IEdl dERDKDApOwogICAgICAgICBIR0RJT0JKIG9sZEZvbnQgPSBTZWxlY3RPYmplY3QoZGMsIG1fcGxh dGZvcm1EYXRhLmhmb250KCkpOwogICAgICAgICBpbnQgZmFjZUxlbmd0aCA9IEdldFRleHRGYWNl KGRjLCAwLCAwKTsKLSAgICAgICAgVmVjdG9yPFRDSEFSPiBmYWNlTmFtZShmYWNlTGVuZ3RoKTsK KyAgICAgICAgVmVjdG9yPFdDSEFSPiBmYWNlTmFtZShmYWNlTGVuZ3RoKTsKICAgICAgICAgR2V0 VGV4dEZhY2UoZGMsIGZhY2VMZW5ndGgsIGZhY2VOYW1lLmRhdGEoKSk7CiAgICAgICAgIG1faXNT eXN0ZW1Gb250ID0gIV90Y3NjbXAoZmFjZU5hbWUuZGF0YSgpLCBfVCgiTHVjaWRhIEdyYW5kZSIp KTsKICAgICAgICAgU2VsZWN0T2JqZWN0KGRjLCBvbGRGb250KTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9TaW1wbGVGb250RGF0YUNhaXJvV2luLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9TaW1wbGVGb250RGF0YUNh aXJvV2luLmNwcAppbmRleCBlZWExMGRmLi4yNzdhMTNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vU2ltcGxlRm9udERhdGFDYWlyb1dpbi5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1NpbXBsZUZvbnREYXRhQ2Fp cm9XaW4uY3BwCkBAIC0zNyw3ICszNyw2IEBACiAjaW5jbHVkZSA8Y2Fpcm8uaD4KICNpbmNsdWRl IDxjYWlyby13aW4zMi5oPgogI2luY2x1ZGUgPG1sYW5nLmg+Ci0jaW5jbHVkZSA8dGNoYXIuaD4K ICNpbmNsdWRlIDx3dGYvTWF0aEV4dHJhcy5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vU2ltcGxlRm9udERh dGFXaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1NpbXBsZUZv bnREYXRhV2luLmNwcAppbmRleCBkNDY2YzI5Li4zMjNmZjczIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vU2ltcGxlRm9udERhdGFXaW4uY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9TaW1wbGVGb250RGF0YVdpbi5j cHAKQEAgLTI5LDE2ICsyOSwxNSBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlNp bXBsZUZvbnREYXRhLmgiCiAKLSNpbmNsdWRlIDx3aW5zb2NrMi5oPgogI2luY2x1ZGUgIkZvbnQu aCIKICNpbmNsdWRlICJGb250Q2FjaGUuaCIKICNpbmNsdWRlICJGbG9hdFJlY3QuaCIKICNpbmNs dWRlICJGb250RGVzY3JpcHRpb24uaCIKLSNpbmNsdWRlIDx3dGYvTWF0aEV4dHJhcy5oPgorI2lu Y2x1ZGUgPG1sYW5nLmg+CiAjaW5jbHVkZSA8dW5pY29kZS91Y2hhci5oPgogI2luY2x1ZGUgPHVu aWNvZGUvdW5vcm0uaD4KLSNpbmNsdWRlIDxtbGFuZy5oPgotI2luY2x1ZGUgPHRjaGFyLmg+Cisj aW5jbHVkZSA8d2luc29jazIuaD4KKyNpbmNsdWRlIDx3dGYvTWF0aEV4dHJhcy5oPgogCiAjaWYg UExBVEZPUk0oQ0cpCiAjaW5jbHVkZSA8QXBwbGljYXRpb25TZXJ2aWNlcy9BcHBsaWNhdGlvblNl cnZpY2VzLmg+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93 aW5jZS9TaW1wbGVGb250RGF0YVdpbkNFLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3dpbmNlL1NpbXBsZUZvbnREYXRhV2luQ0UuY3BwCmluZGV4IGYzZTUxMWMuLjhhYmFm YmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL1Np bXBsZUZvbnREYXRhV2luQ0UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3dpbmNlL1NpbXBsZUZvbnREYXRhV2luQ0UuY3BwCkBAIC0yNyw3ICsyNyw2IEBACiAgKiBU SElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgogICovCiAKLQogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlNpbXBsZUZv bnREYXRhLmgiCiAKQEAgLTM1LDkgKzM0LDggQEAKICNpbmNsdWRlICJGb250LmgiCiAjaW5jbHVk ZSAiRm9udENhY2hlLmgiCiAjaW5jbHVkZSAiRm9udERlc2NyaXB0aW9uLmgiCi0jaW5jbHVkZSA8 d3RmL01hdGhFeHRyYXMuaD4KICNpbmNsdWRlIDxtbGFuZy5oPgotI2luY2x1ZGUgPHRjaGFyLmg+ CisjaW5jbHVkZSA8d3RmL01hdGhFeHRyYXMuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQlN0cmluZy5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQlN0cmluZy5jcHAKaW5kZXggNGQ2ZDExZS4uYzQzNTBj OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL0JTdHJpbmcuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9CU3RyaW5nLmNwcApAQCAtMjgsOSArMjgs OCBAQAogCiAjaW5jbHVkZSAiS1VSTC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCi0j aW5jbHVkZSA8d3RmL3RleHQvQXRvbWljU3RyaW5nLmg+Ci0jaW5jbHVkZSA8dGNoYXIuaD4KICNp bmNsdWRlIDx3aW5kb3dzLmg+CisjaW5jbHVkZSA8d3RmL3RleHQvQXRvbWljU3RyaW5nLmg+CiAK ICNpZiBQTEFURk9STShDRikKICNpbmNsdWRlIDxDb3JlRm91bmRhdGlvbi9Db3JlRm91bmRhdGlv bi5oPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL0NsaXBib2FyZFdp bi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ2xpcGJvYXJkV2luLmNwcAppbmRl eCA1OGNmZTQ0Li41MGNjM2ExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93 aW4vQ2xpcGJvYXJkV2luLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ2xp cGJvYXJkV2luLmNwcApAQCAtMTE1LDcgKzExNSw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBwYXRo UmVtb3ZlQmFkRlNDaGFyYWN0ZXJzKFBXU1RSIHBzeiwgc2l6ZV90IGxlbmd0aCkKIH0KICNlbmRp ZgogCi1zdGF0aWMgU3RyaW5nIGZpbGVzeXN0ZW1QYXRoRnJvbVVybE9yVGl0bGUoY29uc3QgU3Ry aW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgdGl0bGUsIFRDSEFSKiBleHRlbnNpb24sIGJvb2wgaXNM aW5rKQorc3RhdGljIFN0cmluZyBmaWxlc3lzdGVtUGF0aEZyb21VcmxPclRpdGxlKGNvbnN0IFN0 cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIHRpdGxlLCBjb25zdCBVQ2hhciogZXh0ZW5zaW9uLCBi b29sIGlzTGluaykKIHsKICNpZiBPUyhXSU5DRSkKICAgICBub3RJbXBsZW1lbnRlZCgpOwpAQCAt MTYzLDcgKzE2Myw3IEBAIHN0YXRpYyBTdHJpbmcgZmlsZXN5c3RlbVBhdGhGcm9tVXJsT3JUaXRs ZShjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiB0aXRsCiAgICAgfQogCiAgICAgU3Ry aW5nIHJlc3VsdChzdGF0aWNfY2FzdDxVQ2hhcio+KGZzUGF0aEJ1ZmZlcikpOwotICAgIHJlc3Vs dCArPSBTdHJpbmcoc3RhdGljX2Nhc3Q8VUNoYXIqPihleHRlbnNpb24pKTsKKyAgICByZXN1bHQg Kz0gU3RyaW5nKGV4dGVuc2lvbik7CiAgICAgcmV0dXJuIHJlc3VsdDsKICNlbmRpZgogfQpAQCAt MTk1LDcgKzE5NSw3IEBAIHN0YXRpYyBIR0xPQkFMIGNyZWF0ZUdsb2JhbEhEcm9wQ29udGVudChj b25zdCBLVVJMJiB1cmwsIFN0cmluZyYgZmlsZU5hbWUsIFNoYXJlCiAgICAgICAgIC8vIHdpbmRv d3MgZG9lcyBub3QgZW5qb3kgYSBsZWFkaW5nIHNsYXNoIG9uIHBhdGhzCiAgICAgICAgIGlmIChs b2NhbFBhdGhbMF0gPT0gJy8nKQogICAgICAgICAgICAgbG9jYWxQYXRoID0gbG9jYWxQYXRoLnN1 YnN0cmluZygxKTsKLSAgICAgICAgTFBDVFNUUiBsb2NhbFBhdGhTdHIgPSBsb2NhbFBhdGguY2hh cmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKTsKKyAgICAgICAgTFBDV1NUUiBsb2NhbFBhdGhT dHIgPSBsb2NhbFBhdGguY2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKTsKICAgICAgICAg aWYgKHdjc2xlbihsb2NhbFBhdGhTdHIpICsgMSA8IE1BWF9QQVRIKQogICAgICAgICAgICAgd2Nz Y3B5X3MoZmlsZVBhdGgsIE1BWF9QQVRILCBsb2NhbFBhdGhTdHIpOwogICAgICAgICBlbHNlCkBA IC0yNzcsNyArMjc3LDcgQEAgc3RhdGljIEhHTE9CQUwgY3JlYXRlR2xvYmFsSW1hZ2VGaWxlRGVz Y3JpcHRvcihjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJgogICAgICAgICByZXR1cm4g MDsKICAgICB9CiAgICAgZXh0ZW5zaW9uLmluc2VydCgiLiIsIDApOwotICAgIGZzUGF0aCA9IGZp bGVzeXN0ZW1QYXRoRnJvbVVybE9yVGl0bGUodXJsLCBwcmVmZXJyZWRUaXRsZSwgKFRDSEFSKill eHRlbnNpb24uY2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKSwgZmFsc2UpOworICAgIGZz UGF0aCA9IGZpbGVzeXN0ZW1QYXRoRnJvbVVybE9yVGl0bGUodXJsLCBwcmVmZXJyZWRUaXRsZSwg ZXh0ZW5zaW9uLmNoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9uKCksIGZhbHNlKTsKIAogICAg IGlmIChmc1BhdGgubGVuZ3RoKCkgPD0gMCkgewogICAgICAgICBHbG9iYWxVbmxvY2sobWVtT2Jq KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9Db250ZXh0TWVudVdp bi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ29udGV4dE1lbnVXaW4uY3BwCmlu ZGV4IGVkMWI4OTUuLjUzMGQ2NGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L3dpbi9Db250ZXh0TWVudVdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2lu L0NvbnRleHRNZW51V2luLmNwcApAQCAtMzEsNyArMzEsNiBAQAogI2luY2x1ZGUgIkZyYW1lVmll dy5oIgogI2luY2x1ZGUgIk5vZGUuaCIKICNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5oIgotI2lu Y2x1ZGUgPHRjaGFyLmg+CiAjaW5jbHVkZSA8d2luZG93cy5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0 b3IuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS93aW4vQ3Vyc29yV2luLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3dpbi9DdXJzb3JXaW4uY3BwCmluZGV4IDJkZDE0NTIuLjAwMzYzODggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9DdXJzb3JXaW4uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL3dpbi9DdXJzb3JXaW4uY3BwCkBAIC0xMjMsOSArMTIzLDkgQEAgc3Rh dGljIFBhc3NSZWZQdHI8U2hhcmVkQ3Vyc29yPiBjcmVhdGVTaGFyZWRDdXJzb3IoSW1hZ2UqIGlt ZywgY29uc3QgSW50UG9pbnQmIGgKICAgICByZXR1cm4gaW1wbC5yZWxlYXNlKCk7CiB9CiAKLXN0 YXRpYyBQYXNzUmVmUHRyPFNoYXJlZEN1cnNvcj4gbG9hZFNoYXJlZEN1cnNvcihISU5TVEFOQ0Ug aEluc3RhbmNlLCBMUENUU1RSIGxwQ3Vyc29yTmFtZSkKK3N0YXRpYyBQYXNzUmVmUHRyPFNoYXJl ZEN1cnNvcj4gbG9hZFNoYXJlZEN1cnNvcihISU5TVEFOQ0UgaEluc3RhbmNlLCBMUENXU1RSIGxw Q3Vyc29yTmFtZSkKIHsKLSAgICByZXR1cm4gU2hhcmVkQ3Vyc29yOjpjcmVhdGUoOjpMb2FkQ3Vy c29yKGhJbnN0YW5jZSwgbHBDdXJzb3JOYW1lKSk7CisgICAgcmV0dXJuIFNoYXJlZEN1cnNvcjo6 Y3JlYXRlKDo6TG9hZEN1cnNvclcoaEluc3RhbmNlLCBscEN1cnNvck5hbWUpKTsKIH0KIAogc3Rh dGljIFBhc3NSZWZQdHI8U2hhcmVkQ3Vyc29yPiBsb2FkQ3Vyc29yQnlOYW1lKGNoYXIqIG5hbWUs IGludCB4LCBpbnQgeSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9G aWxlQ2hvb3Nlcldpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vRmlsZUNob29z ZXJXaW4uY3BwCmluZGV4IDdkMDdiNWQuLjE5NWI4ZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL3dpbi9GaWxlQ2hvb3Nlcldpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vd2luL0ZpbGVDaG9vc2VyV2luLmNwcApAQCAtMjksNyArMjksNiBAQAogI2luY2x1 ZGUgIkxvY2FsaXplZFN0cmluZ3MuaCIKICNpbmNsdWRlICJTdHJpbmdUcnVuY2F0b3IuaCIKICNp bmNsdWRlIDxzaGx3YXBpLmg+Ci0jaW5jbHVkZSA8dGNoYXIuaD4KICNpbmNsdWRlIDx3aW5kb3dz Lmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTQ0LDcgKzQzLDcgQEAgU3RyaW5nIEZpbGVD aG9vc2VyOjpiYXNlbmFtZUZvcldpZHRoKGNvbnN0IEZvbnQmIGZvbnQsIGludCB3aWR0aCkgY29u c3QKICAgICAgICAgc3RyaW5nID0gZmlsZUJ1dHRvbk5vRmlsZVNlbGVjdGVkTGFiZWwoKTsKICAg ICBlbHNlIGlmIChtX2ZpbGVuYW1lcy5zaXplKCkgPT0gMSkgewogICAgICAgICBTdHJpbmcgdG1w RmlsZW5hbWUgPSBtX2ZpbGVuYW1lc1swXTsKLSAgICAgICAgTFBUU1RSIGJhc2VuYW1lID0gUGF0 aEZpbmRGaWxlTmFtZSh0bXBGaWxlbmFtZS5jaGFyYWN0ZXJzV2l0aE51bGxUZXJtaW5hdGlvbigp KTsKKyAgICAgICAgTFBXU1RSIGJhc2VuYW1lID0gUGF0aEZpbmRGaWxlTmFtZVcodG1wRmlsZW5h bWUuY2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKSk7CiAgICAgICAgIHN0cmluZyA9IFN0 cmluZyhiYXNlbmFtZSk7CiAgICAgfSBlbHNlCiAgICAgICAgIHJldHVybiBTdHJpbmdUcnVuY2F0 b3I6OnJpZ2h0VHJ1bmNhdGUoU3RyaW5nOjpudW1iZXIobV9maWxlbmFtZXMuc2l6ZSgpKSArICIg ZmlsZXMiLCB3aWR0aCwgZm9udCwgZmFsc2UpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vd2luL1BvcHVwTWVudVdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93 aW4vUG9wdXBNZW51V2luLmNwcAppbmRleCAzZDk2NjU4Li45OWU0ZTM3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vUG9wdXBNZW51V2luLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS93aW4vUG9wdXBNZW51V2luLmNwcApAQCAtNDIsNyArNDIsNiBAQAog I2luY2x1ZGUgIlNpbXBsZUZvbnREYXRhLmgiCiAjaW5jbHVkZSAiVGV4dFJ1bi5oIgogI2luY2x1 ZGUgIldlYkNvcmVJbnN0YW5jZUhhbmRsZS5oIgotI2luY2x1ZGUgPHRjaGFyLmg+CiAjaW5jbHVk ZSA8d2luZG93cy5oPgogI2luY2x1ZGUgPHdpbmRvd3N4Lmg+CiAjaWYgT1MoV0lOQ0UpCkBAIC02 NCw3ICs2Myw3IEBAIHN0YXRpYyBjb25zdCBpbnQgbWF4UG9wdXBIZWlnaHQgPSAzMjA7CiBjb25z dCBpbnQgb3B0aW9uU3BhY2luZ01pZGRsZSA9IDE7CiBjb25zdCBpbnQgcG9wdXBXaW5kb3dCb3Jk ZXJXaWR0aCA9IDE7CiAKLXN0YXRpYyBMUENUU1RSIGtQb3B1cFdpbmRvd0NsYXNzTmFtZSA9IF9U KCJQb3B1cFdpbmRvd0NsYXNzIik7CitzdGF0aWMgTFBDV1NUUiBrUG9wdXBXaW5kb3dDbGFzc05h bWUgPSBMIlBvcHVwV2luZG93Q2xhc3MiOwogCiAvLyBUaGlzIGlzIHVzZWQgZnJvbSB3aXRoaW4g b3VyIGN1c3RvbSBtZXNzYWdlIHB1bXAgd2hlbiB3ZSB3YW50IHRvIHNlbmQgYQogLy8gbWVzc2Fn ZSB0byB0aGUgd2ViIHZpZXcgYW5kIG5vdCBoYXZlIG91ciBtZXNzYWdlIHN0b2xlbiBhbmQgc2Vu dCB0bwpAQCAtMTIxLDcgKzEyMCw3IEBAIHZvaWQgUG9wdXBNZW51V2luOjpkaXNjb25uZWN0Q2xp ZW50KCkKICAgICBtX3BvcHVwQ2xpZW50ID0gMDsKIH0KIAotTFBDVFNUUiBQb3B1cE1lbnVXaW46 OnBvcHVwQ2xhc3NOYW1lKCkKK0xQQ1dTVFIgUG9wdXBNZW51V2luOjpwb3B1cENsYXNzTmFtZSgp CiB7CiAgICAgcmV0dXJuIGtQb3B1cFdpbmRvd0NsYXNzTmFtZTsKIH0KQEAgLTE0NSw3ICsxNDQs NyBAQCB2b2lkIFBvcHVwTWVudVdpbjo6c2hvdyhjb25zdCBJbnRSZWN0JiByLCBGcmFtZVZpZXcq IHZpZXcsIGludCBpbmRleCkKIAogICAgICAgICBEV09SRCBleFN0eWxlID0gV1NfRVhfTFRSUkVB RElORzsKIAotICAgICAgICBtX3BvcHVwID0gOjpDcmVhdGVXaW5kb3dFeChleFN0eWxlLCBrUG9w dXBXaW5kb3dDbGFzc05hbWUsIF9UKCJQb3B1cE1lbnUiKSwKKyAgICAgICAgbV9wb3B1cCA9IDo6 Q3JlYXRlV2luZG93RXhXKGV4U3R5bGUsIGtQb3B1cFdpbmRvd0NsYXNzTmFtZSwgTCJQb3B1cE1l bnUiLAogICAgICAgICAgICAgV1NfUE9QVVAgfCBXU19CT1JERVIsCiAgICAgICAgICAgICBtX3dp bmRvd1JlY3QueCgpLCBtX3dpbmRvd1JlY3QueSgpLCBtX3dpbmRvd1JlY3Qud2lkdGgoKSwgbV93 aW5kb3dSZWN0LmhlaWdodCgpLAogICAgICAgICAgICAgaG9zdFdpbmRvdywgMCwgV2ViQ29yZTo6 aW5zdGFuY2VIYW5kbGUoKSwgdGhpcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS93aW4vUG9wdXBNZW51V2luLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vUG9w dXBNZW51V2luLmgKaW5kZXggMGQ3NjMwYy4uMDVlZGIwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vd2luL1BvcHVwTWVudVdpbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL3dpbi9Qb3B1cE1lbnVXaW4uaApAQCAtNDksNyArNDksNyBAQCBwdWJsaWM6CiAgICAg dmlydHVhbCB2b2lkIHVwZGF0ZUZyb21FbGVtZW50KCk7CiAgICAgdmlydHVhbCB2b2lkIGRpc2Nv bm5lY3RDbGllbnQoKTsKIAotICAgIHN0YXRpYyBMUENUU1RSIHBvcHVwQ2xhc3NOYW1lKCk7Cisg ICAgc3RhdGljIExQQ1dTVFIgcG9wdXBDbGFzc05hbWUoKTsKIAogcHJpdmF0ZToKICAgICBQb3B1 cE1lbnVDbGllbnQqIGNsaWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fcG9wdXBDbGllbnQ7IH0K