97889 2012-09-28 04:18:03 -0700 Port SimpleFontDataWin.cpp to WinCE 2012-11-13 11:31:51 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 1 paroga paroga webkit.review.bot oldest_to_newest 730477 0 paroga 2012-09-28 04:18:03 -0700 Port SimpleFontDataWin.cpp to WinCE 730482 1 166204 paroga 2012-09-28 04:26:50 -0700 Created attachment 166204 Patch 730484 2 166204 paroga 2012-09-28 04:28:15 -0700 Comment on attachment 166204 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=166204&action=review > Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp:255 > + GetTextExtentPoint32W(hdc, &c, 1, &fontSize); It's the code from http://trac.webkit.org/browser/trunk/Source/WebCore/platform/graphics/wince/SimpleFontDataWinCE.cpp?rev=104545#L165 730501 3 166204 buildbot 2012-09-28 04:49:43 -0700 Comment on attachment 166204 Patch Attachment 166204 did not pass win-ews (win): Output: http://queues.webkit.org/results/14066212 730521 4 166217 paroga 2012-09-28 05:08:23 -0700 Created attachment 166217 Patch 730580 5 166217 paroga 2012-09-28 06:18:25 -0700 Comment on attachment 166217 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=166217&action=review > Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp:255 > + GetTextExtentPoint32W(hdc, &c, 1, &fontSize); http://trac.webkit.org/browser/trunk/Source/WebCore/platform/graphics/wince/SimpleFontDataWinCE.cpp?rev=104545#L165 765817 6 166217 bfulgham 2012-11-13 11:00:18 -0800 Comment on attachment 166217 Patch Change looks good. Thanks! 765850 7 166217 webkit.review.bot 2012-11-13 11:31:48 -0800 Comment on attachment 166217 Patch Clearing flags on attachment: 166217 Committed r134453: <http://trac.webkit.org/changeset/134453> 765851 8 webkit.review.bot 2012-11-13 11:31:51 -0800 All reviewed patches have been landed. Closing bug. 166204 2012-09-28 04:26:50 -0700 2012-09-28 05:08:23 -0700 Patch bug-97889.patch text/plain 5153 paroga ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwYTYwNmE4Li4yYTc3NmU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTItMDktMjggIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUG9ydCBTaW1wbGVGb250RGF0YVdpbi5jcHAgdG8gV2luQ0UKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk3ODg5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkICNpZiAhT1MoV0lOQ0UpIGFy b3VuZCBzb21lIHBhcnRzIG9mIHRoZSBjb2RlLCBzbyBpdCBjYW4gYmUgdXNlZCBieSB0aGUgV2lu Q0UgcG9ydCB0b28gaW4gYSBuZXh0IHN0ZXAuCisgICAgICAgIEFsc28gY2xlYW5lZCB1cCB0aGUg aW5jbHVkZSBoZWFkZXJzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1NpbXBs ZUZvbnREYXRhV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjppbml0 R0RJRm9udCk6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1EZXN0 cm95KToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjpjb250YWluc0NoYXJhY3Rl cnMpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlRm9udERhdGE6OmJvdW5kc0ZvckdESUdseXBo KToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlRm9udERhdGE6 OndpZHRoRm9yR0RJR2x5cGgpOgorCiAyMDEyLTA5LTI3ICBZb3NoaWZ1bWkgSW5vdWUgIDx5b3Np bkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Zvcm1zXSBCYXNlTXVsdGlwbGVGaWVsZHNEYXRl QW5kVGltZUlucHV0VHlwZSBjbGFzcyBzaG91bGQgaW5oZXJpdCBEYXRlVGltZUVkaXRFbGVtZW50 OjpFZGl0Q29udHJvbE93bmVyIHJhdGhlciB0aGFuIGNvbnRhaW5pbmcKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9TaW1wbGVGb250RGF0YVdpbi5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vU2ltcGxlRm9udERhdGFXaW4u Y3BwCmluZGV4IDUzYWYwNmQuLmQ1MGI2ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3dpbi9TaW1wbGVGb250RGF0YVdpbi5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1NpbXBsZUZvbnREYXRhV2luLmNwcApAQCAtMzUs MTggKzM1LDEwIEBACiAjaW5jbHVkZSAiRm9udERlc2NyaXB0aW9uLmgiCiAjaW5jbHVkZSAiSFdu ZERDLmgiCiAjaW5jbHVkZSA8bWxhbmcuaD4KLSNpbmNsdWRlIDx3aW5zb2NrMi5oPgogI2luY2x1 ZGUgPHd0Zi9NYXRoRXh0cmFzLmg+CiAKLSNpZiBVU0UoQ0cpCi0jaW5jbHVkZSA8QXBwbGljYXRp b25TZXJ2aWNlcy9BcHBsaWNhdGlvblNlcnZpY2VzLmg+Ci0jaW5jbHVkZSA8V2ViS2l0U3lzdGVt SW50ZXJmYWNlL1dlYktpdFN5c3RlbUludGVyZmFjZS5oPgotI2VuZGlmCi0KIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAotdXNpbmcgc3RkOjptYXg7Ci0KIGNvbnN0IGZsb2F0IGNTbWFsbENhcHNGb250 U2l6ZU11bHRpcGxpZXIgPSAwLjdmOwogCiBzdGF0aWMgYm9vbCBnX3Nob3VsZEFwcGx5TWFjQXNj ZW50SGFjazsKQEAgLTEwMywxMyArOTUsMTMgQEAgdm9pZCBTaW1wbGVGb250RGF0YTo6aW5pdEdE SUZvbnQoKQogICAgICBtX2F2Z0NoYXJXaWR0aCA9IHRleHRNZXRyaWNzLnRtQXZlQ2hhcldpZHRo OwogICAgICBtX21heENoYXJXaWR0aCA9IHRleHRNZXRyaWNzLnRtTWF4Q2hhcldpZHRoOwogICAg ICBmbG9hdCB4SGVpZ2h0ID0gYXNjZW50ICogMC41NmY7IC8vIEJlc3QgZ3Vlc3MgZm9yIHhIZWln aHQgaWYgbm8geCBnbHlwaCBpcyBwcmVzZW50LgotCisjaWYgIU9TKFdJTkNFKQogICAgICBHTFlQ SE1FVFJJQ1MgZ207CiAgICAgIE1BVDIgbWF0ID0geyAxLCAwLCAwLCAxIH07CiAgICAgIERXT1JE IGxlbiA9IEdldEdseXBoT3V0bGluZShoZGMsICd4JywgR0dPX01FVFJJQ1MsICZnbSwgMCwgMCwg Jm1hdCk7CiAgICAgIGlmIChsZW4gIT0gR0RJX0VSUk9SICYmIGdtLmdtcHRHbHlwaE9yaWdpbi55 ID4gMCkKICAgICAgICAgIHhIZWlnaHQgPSBnbS5nbXB0R2x5cGhPcmlnaW4ueTsKLQorI2VuZGlm CiAgICAgIG1fZm9udE1ldHJpY3Muc2V0WEhlaWdodCh4SGVpZ2h0KTsKICAgICAgbV9mb250TWV0 cmljcy5zZXRVbml0c1BlckVtKG1ldHJpY3Mub3RtRU1TcXVhcmUpOwogCkBAIC0xMjgsOCArMTIw LDEwIEBAIHZvaWQgU2ltcGxlRm9udERhdGE6OnBsYXRmb3JtQ2hhcldpZHRoSW5pdCgpCiAKIHZv aWQgU2ltcGxlRm9udERhdGE6OnBsYXRmb3JtRGVzdHJveSgpCiB7CisjaWYgIU9TKFdJTkNFKQog ICAgIFNjcmlwdEZyZWVDYWNoZSgmbV9zY3JpcHRDYWNoZSk7CiAgICAgZGVsZXRlIG1fc2NyaXB0 Rm9udFByb3BlcnRpZXM7CisjZW5kaWYKIH0KIAogUGFzc093blB0cjxTaW1wbGVGb250RGF0YT4g U2ltcGxlRm9udERhdGE6OmNyZWF0ZVNjYWxlZEZvbnREYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlv biYgZm9udERlc2NyaXB0aW9uLCBmbG9hdCBzY2FsZUZhY3RvcikgY29uc3QKQEAgLTE3Nyw3ICsx NzEsMTEgQEAgYm9vbCBTaW1wbGVGb250RGF0YTo6Y29udGFpbnNDaGFyYWN0ZXJzKGNvbnN0IFVD aGFyKiBjaGFyYWN0ZXJzLCBpbnQgbGVuZ3RoKSBjb24KICAgICAvLyBGSVhNRTogTWljcm9zb2Z0 IGRvY3VtZW50YXRpb24gc2VlbXMgdG8gaW1wbHkgdGhhdCBjaGFyYWN0ZXJzIGNhbiBiZSBvdXRw dXQgdXNpbmcgYSBnaXZlbiBmb250IGFuZCBEQwogICAgIC8vIG1lcmVseSBieSB0ZXN0aW5nIGNv ZGUgcGFnZSBpbnRlcnNlY3Rpb24uICBUaGlzIHNlZW1zIHN1c3BlY3QgdGhvdWdoLiAgQ2FuJ3Qg YSBmb250IG9ubHkgcGFydGlhbGx5CiAgICAgLy8gY292ZXIgYSBnaXZlbiBjb2RlIHBhZ2U/Cisj aWYgZGVmaW5lZChJTUxBTkdfRk9OVF9MSU5LKSAmJiAoSU1MQU5HX0ZPTlRfTElOSyA9PSAyKQog ICAgIElNTGFuZ0ZvbnRMaW5rMiogbGFuZ0ZvbnRMaW5rID0gZm9udENhY2hlKCktPmdldEZvbnRM aW5rSW50ZXJmYWNlKCk7CisjZWxzZQorICAgIElNTGFuZ0ZvbnRMaW5rKiBsYW5nRm9udExpbmsg PSBmb250Q2FjaGUoKS0+Z2V0Rm9udExpbmtJbnRlcmZhY2UoKTsKKyNlbmRpZgogICAgIGlmICgh bGFuZ0ZvbnRMaW5rKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKQEAgLTIyNSwzNSArMjIzLDUw IEBAIHZvaWQgU2ltcGxlRm9udERhdGE6OmRldGVybWluZVBpdGNoKCkKIAogRmxvYXRSZWN0IFNp bXBsZUZvbnREYXRhOjpib3VuZHNGb3JHRElHbHlwaChHbHlwaCBnbHlwaCkgY29uc3QKIHsKKyNp ZiBPUyhXSU5DRSkKKyAgICByZXR1cm4gRmxvYXRSZWN0KCk7CisjZWxzZQogICAgIEhXbmREQyBo ZGMoMCk7CiAgICAgU2V0R3JhcGhpY3NNb2RlKGhkYywgR01fQURWQU5DRUQpOwogICAgIEhHRElP Qkogb2xkRm9udCA9IFNlbGVjdE9iamVjdChoZGMsIG1fcGxhdGZvcm1EYXRhLmhmb250KCkpOwot ICAgIAorCiAgICAgR0xZUEhNRVRSSUNTIGdkaU1ldHJpY3M7CiAgICAgc3RhdGljIGNvbnN0IE1B VDIgaWRlbnRpdHkgPSB7IDAsIDEsICAwLCAwLCAgMCwgMCwgIDAsIDEgfTsKICAgICBHZXRHbHlw aE91dGxpbmUoaGRjLCBnbHlwaCwgR0dPX01FVFJJQ1MgfCBHR09fR0xZUEhfSU5ERVgsICZnZGlN ZXRyaWNzLCAwLCAwLCAmaWRlbnRpdHkpOwotICAgIAorCiAgICAgU2VsZWN0T2JqZWN0KGhkYywg b2xkRm9udCk7Ci0gICAgCisKICAgICByZXR1cm4gRmxvYXRSZWN0KGdkaU1ldHJpY3MuZ21wdEds eXBoT3JpZ2luLngsIC1nZGlNZXRyaWNzLmdtcHRHbHlwaE9yaWdpbi55LAogICAgICAgICBnZGlN ZXRyaWNzLmdtQmxhY2tCb3hYICsgbV9zeW50aGV0aWNCb2xkT2Zmc2V0LCBnZGlNZXRyaWNzLmdt QmxhY2tCb3hZKTsgCisjZW5kaWYKIH0KLSAgICAKKwogZmxvYXQgU2ltcGxlRm9udERhdGE6Ondp ZHRoRm9yR0RJR2x5cGgoR2x5cGggZ2x5cGgpIGNvbnN0CiB7CiAgICAgSFduZERDIGhkYygwKTsK KyNpZiAhT1MoV0lOQ0UpCiAgICAgU2V0R3JhcGhpY3NNb2RlKGhkYywgR01fQURWQU5DRUQpOwor I2VuZGlmCiAgICAgSEdESU9CSiBvbGRGb250ID0gU2VsZWN0T2JqZWN0KGhkYywgbV9wbGF0Zm9y bURhdGEuaGZvbnQoKSk7CiAKKyNpZiBPUyhXSU5DRSkKKyAgICBXQ0hBUiBjID0gZ2x5cGg7Cisg ICAgU0laRSBmb250U2l6ZTsKKyAgICBHZXRUZXh0RXh0ZW50UG9pbnQzMlcoaGRjLCAmYywgMSwg JmZvbnRTaXplKTsKKyAgICBmbG9hdCByZXN1bHQgPSBmb250U2l6ZS5jeCAqIG1fcGxhdGZvcm1E YXRhLnNpemUoKSAvIDcyLmY7CisjZWxzZQogICAgIEdMWVBITUVUUklDUyBnZGlNZXRyaWNzOwog ICAgIHN0YXRpYyBjb25zdCBNQVQyIGlkZW50aXR5ID0geyAwLCAxLCAgMCwgMCwgIDAsIDAsICAw LCAxIH07CiAgICAgR2V0R2x5cGhPdXRsaW5lKGhkYywgZ2x5cGgsIEdHT19NRVRSSUNTIHwgR0dP X0dMWVBIX0lOREVYLCAmZ2RpTWV0cmljcywgMCwgMCwgJmlkZW50aXR5KTsKKyAgICBmbG9hdCBy ZXN1bHQgPSBnZGlNZXRyaWNzLmdtQ2VsbEluY1ggKyBtX3N5bnRoZXRpY0JvbGRPZmZzZXQ7Cisj ZW5kaWYKIAogICAgIFNlbGVjdE9iamVjdChoZGMsIG9sZEZvbnQpOwogCi0gICAgcmV0dXJuIGdk aU1ldHJpY3MuZ21DZWxsSW5jWCArIG1fc3ludGhldGljQm9sZE9mZnNldDsKKyAgICByZXR1cm4g cmVzdWx0OwogfQogCisjaWYgIU9TKFdJTkNFKQogU0NSSVBUX0ZPTlRQUk9QRVJUSUVTKiBTaW1w bGVGb250RGF0YTo6c2NyaXB0Rm9udFByb3BlcnRpZXMoKSBjb25zdAogewogICAgIGlmICghbV9z Y3JpcHRGb250UHJvcGVydGllcykgewpAQCAtMjcxLDUgKzI4NCw2IEBAIFNDUklQVF9GT05UUFJP UEVSVElFUyogU2ltcGxlRm9udERhdGE6OnNjcmlwdEZvbnRQcm9wZXJ0aWVzKCkgY29uc3QKICAg ICB9CiAgICAgcmV0dXJuIG1fc2NyaXB0Rm9udFByb3BlcnRpZXM7CiB9CisjZW5kaWYKIAotfQor fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo= 166217 2012-09-28 05:08:23 -0700 2012-11-13 11:31:48 -0800 Patch bug-97889.patch text/plain 4476 paroga ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwYTYwNmE4Li4yYTc3NmU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTItMDktMjggIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUG9ydCBTaW1wbGVGb250RGF0YVdpbi5jcHAgdG8gV2luQ0UKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk3ODg5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkICNpZiAhT1MoV0lOQ0UpIGFy b3VuZCBzb21lIHBhcnRzIG9mIHRoZSBjb2RlLCBzbyBpdCBjYW4gYmUgdXNlZCBieSB0aGUgV2lu Q0UgcG9ydCB0b28gaW4gYSBuZXh0IHN0ZXAuCisgICAgICAgIEFsc28gY2xlYW5lZCB1cCB0aGUg aW5jbHVkZSBoZWFkZXJzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1NpbXBs ZUZvbnREYXRhV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjppbml0 R0RJRm9udCk6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1EZXN0 cm95KToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjpib3VuZHNGb3JHRElHbHlw aCk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRh Ojp3aWR0aEZvckdESUdseXBoKToKKwogMjAxMi0wOS0yNyAgWW9zaGlmdW1pIElub3VlICA8eW9z aW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtGb3Jtc10gQmFzZU11bHRpcGxlRmllbGRzRGF0 ZUFuZFRpbWVJbnB1dFR5cGUgY2xhc3Mgc2hvdWxkIGluaGVyaXQgRGF0ZVRpbWVFZGl0RWxlbWVu dDo6RWRpdENvbnRyb2xPd25lciByYXRoZXIgdGhhbiBjb250YWluaW5nCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vU2ltcGxlRm9udERhdGFXaW4uY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1NpbXBsZUZvbnREYXRhV2lu LmNwcAppbmRleCA1M2FmMDZkLi5kNTBiNmY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy93aW4vU2ltcGxlRm9udERhdGFXaW4uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9TaW1wbGVGb250RGF0YVdpbi5jcHAKQEAgLTM1 LDE4ICszNSwxMCBAQAogI2luY2x1ZGUgIkZvbnREZXNjcmlwdGlvbi5oIgogI2luY2x1ZGUgIkhX bmREQy5oIgogI2luY2x1ZGUgPG1sYW5nLmg+Ci0jaW5jbHVkZSA8d2luc29jazIuaD4KICNpbmNs dWRlIDx3dGYvTWF0aEV4dHJhcy5oPgogCi0jaWYgVVNFKENHKQotI2luY2x1ZGUgPEFwcGxpY2F0 aW9uU2VydmljZXMvQXBwbGljYXRpb25TZXJ2aWNlcy5oPgotI2luY2x1ZGUgPFdlYktpdFN5c3Rl bUludGVyZmFjZS9XZWJLaXRTeXN0ZW1JbnRlcmZhY2UuaD4KLSNlbmRpZgotCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKLXVzaW5nIHN0ZDo6bWF4OwotCiBjb25zdCBmbG9hdCBjU21hbGxDYXBzRm9u dFNpemVNdWx0aXBsaWVyID0gMC43ZjsKIAogc3RhdGljIGJvb2wgZ19zaG91bGRBcHBseU1hY0Fz Y2VudEhhY2s7CkBAIC0xMDMsMTMgKzk1LDEzIEBAIHZvaWQgU2ltcGxlRm9udERhdGE6OmluaXRH RElGb250KCkKICAgICAgbV9hdmdDaGFyV2lkdGggPSB0ZXh0TWV0cmljcy50bUF2ZUNoYXJXaWR0 aDsKICAgICAgbV9tYXhDaGFyV2lkdGggPSB0ZXh0TWV0cmljcy50bU1heENoYXJXaWR0aDsKICAg ICAgZmxvYXQgeEhlaWdodCA9IGFzY2VudCAqIDAuNTZmOyAvLyBCZXN0IGd1ZXNzIGZvciB4SGVp Z2h0IGlmIG5vIHggZ2x5cGggaXMgcHJlc2VudC4KLQorI2lmICFPUyhXSU5DRSkKICAgICAgR0xZ UEhNRVRSSUNTIGdtOwogICAgICBNQVQyIG1hdCA9IHsgMSwgMCwgMCwgMSB9OwogICAgICBEV09S RCBsZW4gPSBHZXRHbHlwaE91dGxpbmUoaGRjLCAneCcsIEdHT19NRVRSSUNTLCAmZ20sIDAsIDAs ICZtYXQpOwogICAgICBpZiAobGVuICE9IEdESV9FUlJPUiAmJiBnbS5nbXB0R2x5cGhPcmlnaW4u eSA+IDApCiAgICAgICAgICB4SGVpZ2h0ID0gZ20uZ21wdEdseXBoT3JpZ2luLnk7Ci0KKyNlbmRp ZgogICAgICBtX2ZvbnRNZXRyaWNzLnNldFhIZWlnaHQoeEhlaWdodCk7CiAgICAgIG1fZm9udE1l dHJpY3Muc2V0VW5pdHNQZXJFbShtZXRyaWNzLm90bUVNU3F1YXJlKTsKIApAQCAtMTI4LDggKzEy MCwxMCBAQCB2b2lkIFNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybUNoYXJXaWR0aEluaXQoKQogCiB2 b2lkIFNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybURlc3Ryb3koKQogeworI2lmICFPUyhXSU5DRSkK ICAgICBTY3JpcHRGcmVlQ2FjaGUoJm1fc2NyaXB0Q2FjaGUpOwogICAgIGRlbGV0ZSBtX3Njcmlw dEZvbnRQcm9wZXJ0aWVzOworI2VuZGlmCiB9CiAKIFBhc3NPd25QdHI8U2ltcGxlRm9udERhdGE+ IFNpbXBsZUZvbnREYXRhOjpjcmVhdGVTY2FsZWRGb250RGF0YShjb25zdCBGb250RGVzY3JpcHRp b24mIGZvbnREZXNjcmlwdGlvbiwgZmxvYXQgc2NhbGVGYWN0b3IpIGNvbnN0CkBAIC0yMjUsMzUg KzIyMyw1MCBAQCB2b2lkIFNpbXBsZUZvbnREYXRhOjpkZXRlcm1pbmVQaXRjaCgpCiAKIEZsb2F0 UmVjdCBTaW1wbGVGb250RGF0YTo6Ym91bmRzRm9yR0RJR2x5cGgoR2x5cGggZ2x5cGgpIGNvbnN0 CiB7CisjaWYgT1MoV0lOQ0UpCisgICAgcmV0dXJuIEZsb2F0UmVjdCgpOworI2Vsc2UKICAgICBI V25kREMgaGRjKDApOwogICAgIFNldEdyYXBoaWNzTW9kZShoZGMsIEdNX0FEVkFOQ0VEKTsKICAg ICBIR0RJT0JKIG9sZEZvbnQgPSBTZWxlY3RPYmplY3QoaGRjLCBtX3BsYXRmb3JtRGF0YS5oZm9u dCgpKTsKLSAgICAKKwogICAgIEdMWVBITUVUUklDUyBnZGlNZXRyaWNzOwogICAgIHN0YXRpYyBj b25zdCBNQVQyIGlkZW50aXR5ID0geyAwLCAxLCAgMCwgMCwgIDAsIDAsICAwLCAxIH07CiAgICAg R2V0R2x5cGhPdXRsaW5lKGhkYywgZ2x5cGgsIEdHT19NRVRSSUNTIHwgR0dPX0dMWVBIX0lOREVY LCAmZ2RpTWV0cmljcywgMCwgMCwgJmlkZW50aXR5KTsKLSAgICAKKwogICAgIFNlbGVjdE9iamVj dChoZGMsIG9sZEZvbnQpOwotICAgIAorCiAgICAgcmV0dXJuIEZsb2F0UmVjdChnZGlNZXRyaWNz LmdtcHRHbHlwaE9yaWdpbi54LCAtZ2RpTWV0cmljcy5nbXB0R2x5cGhPcmlnaW4ueSwKICAgICAg ICAgZ2RpTWV0cmljcy5nbUJsYWNrQm94WCArIG1fc3ludGhldGljQm9sZE9mZnNldCwgZ2RpTWV0 cmljcy5nbUJsYWNrQm94WSk7IAorI2VuZGlmCiB9Ci0gICAgCisKIGZsb2F0IFNpbXBsZUZvbnRE YXRhOjp3aWR0aEZvckdESUdseXBoKEdseXBoIGdseXBoKSBjb25zdAogewogICAgIEhXbmREQyBo ZGMoMCk7CisjaWYgIU9TKFdJTkNFKQogICAgIFNldEdyYXBoaWNzTW9kZShoZGMsIEdNX0FEVkFO Q0VEKTsKKyNlbmRpZgogICAgIEhHRElPQkogb2xkRm9udCA9IFNlbGVjdE9iamVjdChoZGMsIG1f cGxhdGZvcm1EYXRhLmhmb250KCkpOwogCisjaWYgT1MoV0lOQ0UpCisgICAgV0NIQVIgYyA9IGds eXBoOworICAgIFNJWkUgZm9udFNpemU7CisgICAgR2V0VGV4dEV4dGVudFBvaW50MzJXKGhkYywg JmMsIDEsICZmb250U2l6ZSk7CisgICAgZmxvYXQgcmVzdWx0ID0gZm9udFNpemUuY3ggKiBtX3Bs YXRmb3JtRGF0YS5zaXplKCkgLyA3Mi5mOworI2Vsc2UKICAgICBHTFlQSE1FVFJJQ1MgZ2RpTWV0 cmljczsKICAgICBzdGF0aWMgY29uc3QgTUFUMiBpZGVudGl0eSA9IHsgMCwgMSwgIDAsIDAsICAw LCAwLCAgMCwgMSB9OwogICAgIEdldEdseXBoT3V0bGluZShoZGMsIGdseXBoLCBHR09fTUVUUklD UyB8IEdHT19HTFlQSF9JTkRFWCwgJmdkaU1ldHJpY3MsIDAsIDAsICZpZGVudGl0eSk7CisgICAg ZmxvYXQgcmVzdWx0ID0gZ2RpTWV0cmljcy5nbUNlbGxJbmNYICsgbV9zeW50aGV0aWNCb2xkT2Zm c2V0OworI2VuZGlmCiAKICAgICBTZWxlY3RPYmplY3QoaGRjLCBvbGRGb250KTsKIAotICAgIHJl dHVybiBnZGlNZXRyaWNzLmdtQ2VsbEluY1ggKyBtX3N5bnRoZXRpY0JvbGRPZmZzZXQ7CisgICAg cmV0dXJuIHJlc3VsdDsKIH0KIAorI2lmICFPUyhXSU5DRSkKIFNDUklQVF9GT05UUFJPUEVSVElF UyogU2ltcGxlRm9udERhdGE6OnNjcmlwdEZvbnRQcm9wZXJ0aWVzKCkgY29uc3QKIHsKICAgICBp ZiAoIW1fc2NyaXB0Rm9udFByb3BlcnRpZXMpIHsKQEAgLTI3MSw1ICsyODQsNiBAQCBTQ1JJUFRf Rk9OVFBST1BFUlRJRVMqIFNpbXBsZUZvbnREYXRhOjpzY3JpcHRGb250UHJvcGVydGllcygpIGNv bnN0CiAgICAgfQogICAgIHJldHVybiBtX3NjcmlwdEZvbnRQcm9wZXJ0aWVzOwogfQorI2VuZGlm CiAKLX0KK30gLy8gbmFtZXNwYWNlIFdlYkNvcmUK