35273 2010-02-22 16:45:38 -0800 fast/forms/text-control-intrinsic-widths.html fails on Mac if Word/Office fonts are installed 2015-03-18 23:09:55 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=142720 P2 Normal --- 1 eric simon.fraser mitz ojan simon.fraser oldest_to_newest 192695 0 eric 2010-02-22 16:45:38 -0800 fast/forms/text-control-intrinsic-widths.html fails on Mac if Word/Office fonts are installed Several metrics will be off, including Arial. The fix is to remove /Library/Fonts/Microsoft/ I think you have to restart the ATSServer to get any application to notice. (I used sudo killall ATSServer) 474401 1 simon.fraser 2011-09-27 17:36:06 -0700 *** Bug 68919 has been marked as a duplicate of this bug. *** 474430 2 108948 simon.fraser 2011-09-27 18:52:55 -0700 Created attachment 108948 Non-working patch Attaching some hacking here, but this doesn't work. Apparently there is no way to disable fonts for just one process on Mac. 474432 3 simon.fraser 2011-09-27 18:53:18 -0700 Maybe the scripts should just tell users to disable the fonts themselves? 474435 4 mitz 2011-09-27 19:01:37 -0700 WebKit learns of available fonts only through NSFontManager and through AppKit’s and Core Text’s default fallback lists. I think that the latter would never include user-installed fonts, so for the purposes of this bug, I believe that DumpRenderTree can swizzle a handful of NSFontManager methods to filter out undesirable families and fonts. 476226 5 109321 simon.fraser 2011-09-30 12:06:09 -0700 Created attachment 109321 Patch 476243 6 109321 mitz 2011-09-30 12:21:23 -0700 Comment on attachment 109321 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109321&action=review > Tools/DumpRenderTree/mac/DumpRenderTree.mm:224 > +static NSSet* allowedFontFamilySet() The space should go before the star. > Tools/DumpRenderTree/mac/DumpRenderTree.mm:226 > + static NSSet* fontFamiliySet = [[NSSet setWithObjects: Ditto. > Tools/DumpRenderTree/mac/DumpRenderTree.mm:347 > + One blank line is enough. > Tools/DumpRenderTree/mac/DumpRenderTree.mm:372 > + NSArray* fontsForFamily = [[NSFontManager sharedFontManager] availableMembersOfFontFamily:fontFamily]; The space should go before the start. > Tools/DumpRenderTree/mac/DumpRenderTree.mm:373 > + for (NSArray* fontInfo in fontsForFamily) { The space should go before the star. > Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:34 > +static NSSet* allowedFontFamilySet() The space should go before the star. > Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:36 > + static NSSet* fontFamiliySet = [[NSSet setWithObjects: Ditto. > Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:157 > + One blank line is enough. > Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:182 > + NSArray* fontsForFamily = [[NSFontManager sharedFontManager] availableMembersOfFontFamily:fontFamily]; The space should go before the star. > Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:183 > + for (NSArray* fontInfo in fontsForFamily) { Ditto. 476361 7 simon.fraser 2011-09-30 15:56:43 -0700 http://trac.webkit.org/changeset/96434 1078465 8 ap 2015-03-18 23:09:55 -0700 This wasn't effective at fixing fast/forms/text-control-intrinsic-widths.html as of OS X Yosemite - fonts in /Library/Fonts/Microsoft took precedence over ones in /Library/Fonts. Additionally, fallback did include /Library/Fonts/Microsoft fonts. I re-fixed the first issue in bug 142720. 108948 2011-09-27 18:52:55 -0700 2011-09-30 12:06:06 -0700 Non-working patch disable-fonts-broken.txt text/plain 5382 simon.fraser ZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbSBi L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQppbmRleCAyMDdiNDIx Li5kZGM0ODVkIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRl clRyZWUubW0KKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1t CkBAIC0yMjEsNDEgKzIyMSw4IEBAIHN0YXRpYyBib29sIHNob3VsZElnbm9yZVdlYkNvcmVOb2Rl TGVha3MoY29uc3Qgc3RyaW5nJiBVUkxTdHJpbmcpCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1z dGF0aWMgdm9pZCBhY3RpdmF0ZUZvbnRzKCkKK3N0YXRpYyB2b2lkIGFjdGl2YXRlVGVzdGluZ0Zv bnRzKCkKIHsKLSNpZmRlZiBCVUlMRElOR19PTl9MRU9QQVJECi0gICAgc3RhdGljIGNvbnN0IGNo YXIqIGZvbnRTZWN0aW9uTmFtZXNbXSA9IHsKLSAgICAgICAgIkFoZW0iLAotICAgICAgICAiV2Vp Z2h0V2F0Y2hlcjEwMCIsCi0gICAgICAgICJXZWlnaHRXYXRjaGVyMjAwIiwKLSAgICAgICAgIldl aWdodFdhdGNoZXIzMDAiLAotICAgICAgICAiV2VpZ2h0V2F0Y2hlcjQwMCIsCi0gICAgICAgICJX ZWlnaHRXYXRjaGVyNTAwIiwKLSAgICAgICAgIldlaWdodFdhdGNoZXI2MDAiLAotICAgICAgICAi V2VpZ2h0V2F0Y2hlcjcwMCIsCi0gICAgICAgICJXZWlnaHRXYXRjaGVyODAwIiwKLSAgICAgICAg IldlaWdodFdhdGNoZXI5MDAiLAotICAgICAgICAwCi0gICAgfTsKLQotICAgIGZvciAodW5zaWdu ZWQgaSA9IDA7IGZvbnRTZWN0aW9uTmFtZXNbaV07ICsraSkgewotICAgICAgICB1bnNpZ25lZCBs b25nIGZvbnREYXRhTGVuZ3RoOwotICAgICAgICBjaGFyKiBmb250RGF0YSA9IGdldHNlY3RkYXRh KCJfX0RBVEEiLCBmb250U2VjdGlvbk5hbWVzW2ldLCAmZm9udERhdGFMZW5ndGgpOwotICAgICAg ICBpZiAoIWZvbnREYXRhKSB7Ci0gICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIkZhaWxlZCB0 byBsb2NhdGUgdGhlICVzIGZvbnQuXG4iLCBmb250U2VjdGlvbk5hbWVzW2ldKTsKLSAgICAgICAg ICAgIGV4aXQoMSk7Ci0gICAgICAgIH0KLQotICAgICAgICBBVFNGb250Q29udGFpbmVyUmVmIGZv bnRDb250YWluZXI7Ci0gICAgICAgIE9TU3RhdHVzIHN0YXR1cyA9IEFUU0ZvbnRBY3RpdmF0ZUZy b21NZW1vcnkoZm9udERhdGEsIGZvbnREYXRhTGVuZ3RoLCBrQVRTRm9udENvbnRleHRMb2NhbCwg a0FUU0ZvbnRGb3JtYXRVbnNwZWNpZmllZCwgTlVMTCwga0FUU09wdGlvbkZsYWdzRGVmYXVsdCwg JmZvbnRDb250YWluZXIpOwotCi0gICAgICAgIGlmIChzdGF0dXMgIT0gbm9FcnIpIHsKLSAgICAg ICAgICAgIGZwcmludGYoc3RkZXJyLCAiRmFpbGVkIHRvIGFjdGl2YXRlIHRoZSAlcyBmb250Llxu IiwgZm9udFNlY3Rpb25OYW1lc1tpXSk7Ci0gICAgICAgICAgICBleGl0KDEpOwotICAgICAgICB9 Ci0gICAgfQotI2Vsc2UKLQogICAgIC8vIFdvcmsgYXJvdW5kIDxyZGFyOi8vcHJvYmxlbS82Njk4 MDIzPiBieSBhY3RpdmF0aW5nIGZvbnRzIGZyb20gZGlzawogICAgIC8vIEZJWE1FOiBUaGlzIGNv ZGUgY2FuIGJlIHJlbW92ZWQgb25jZSA8cmRhcjovL3Byb2JsZW0vNjY5ODAyMz4gaXMgYWRkcmVz c2VkLgogCkBAIC0yODcsNyArMjU0LDcwIEBAIHN0YXRpYyB2b2lkIGFjdGl2YXRlRm9udHMoKQog ICAgICAgICBDRlJlbGVhc2UoZXJyb3JzKTsKICAgICAgICAgZXhpdCgxKTsKICAgICB9Ci0jZW5k aWYKK30KKworc3RhdGljIHZvaWQgYWRqdXN0Rm9udHMoKQoreworICAgIHN0YXRpYyBjb25zdCB2 b2lkKiBhbGxvd2VkRm9udEZpbGVOYW1lc1tdID0geworICAgICAgICBDRlNUUigiQXBwbGUgQ2hh bmNlcnkiKSwKKyAgICAgICAgQ0ZTVFIoIkNvdXJpZXIgQm9sZCIpLAorICAgICAgICBDRlNUUigi Q291cmllciIpLAorICAgICAgICBDRlNUUigiSGVsdmV0aWNhIEJvbGQgT2JsaXF1ZSIpLAorICAg ICAgICBDRlNUUigiSGVsdmV0aWNhIEJvbGQiKSwKKyAgICAgICAgQ0ZTVFIoIkhlbHZldGljYSBO ZXVlIEJvbGQgSXRhbGljIiksCisgICAgICAgIENGU1RSKCJIZWx2ZXRpY2EgTmV1ZSBCb2xkIiks CisgICAgICAgIENGU1RSKCJIZWx2ZXRpY2EgTmV1ZSBDb25kZW5zZWQgQmxhY2siKSwKKyAgICAg ICAgQ0ZTVFIoIkhlbHZldGljYSBOZXVlIENvbmRlbnNlZCBCb2xkIiksCisgICAgICAgIENGU1RS KCJIZWx2ZXRpY2EgTmV1ZSBJdGFsaWMiKSwKKyAgICAgICAgQ0ZTVFIoIkhlbHZldGljYSBOZXVl IExpZ2h0IEl0YWxpYyIpLAorICAgICAgICBDRlNUUigiSGVsdmV0aWNhIE5ldWUgTGlnaHQiKSwK KyAgICAgICAgQ0ZTVFIoIkhlbHZldGljYSBOZXVlIFVsdHJhTGlnaHQgSXRhbGljIiksCisgICAg ICAgIENGU1RSKCJIZWx2ZXRpY2EgTmV1ZSBVbHRyYUxpZ2h0IiksCisgICAgICAgIENGU1RSKCJI ZWx2ZXRpY2EgTmV1ZSIpLAorICAgICAgICBDRlNUUigiSGVsdmV0aWNhIE9ibGlxdWUiKSwKKyAg ICAgICAgQ0ZTVFIoIkhlbHZldGljYSIpLAorICAgICAgICBDRlNUUigiTHVjaWRhIEdyYW5kZSBC b2xkIiksCisgICAgICAgIENGU1RSKCJMdWNpZGEgR3JhbmRlIiksCisgICAgICAgIENGU1RSKCJN b25hY28iKSwKKyAgICAgICAgQ0ZTVFIoIlBhcHlydXMiKSwKKyAgICAgICAgQ0ZTVFIoIlRpbWVz IEJvbGQgSXRhbGljIiksCisgICAgICAgIENGU1RSKCJUaW1lcyBCb2xkIiksCisgICAgICAgIENG U1RSKCJUaW1lcyBJdGFsaWMiKSwKKyAgICAgICAgQ0ZTVFIoIlRpbWVzIFJvbWFuIikKKyAgICB9 OworCisgICAgUmV0YWluUHRyPENGU2V0UmVmPiBhbGxvd2VkRm9udEZhbWlsaWVzKEFkb3B0Q0Ys IENGU2V0Q3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1bHQsIChjb25zdCB2b2lkKiopJmFsbG93ZWRG b250RmlsZU5hbWVzLCBzaXplb2YoYWxsb3dlZEZvbnRGaWxlTmFtZXMpIC8gc2l6ZW9mKENGU3Ry aW5nUmVmKSwgJmtDRlR5cGVTZXRDYWxsQmFja3MpKTsKKworICAgIFJldGFpblB0cjxDRkFycmF5 UmVmPiBhdmFpbGFibGVGb250VVJMcyhBZG9wdENGLCBDVEZvbnRNYW5hZ2VyQ29weUF2YWlsYWJs ZUZvbnRVUkxzKCkpOworCisgICAgY29uc3QgQ0ZJbmRleCBudW1Gb250VVJMcyA9IENGQXJyYXlH ZXRDb3VudChhdmFpbGFibGVGb250VVJMcy5nZXQoKSk7CisgICAgCisgICAgUmV0YWluUHRyPENG TXV0YWJsZUFycmF5UmVmPiBmb250VVJMc1RvRGlzYWJsZShBZG9wdENGLCBDRkFycmF5Q3JlYXRl TXV0YWJsZShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCAwLCAma0NGVHlwZUFycmF5Q2FsbEJhY2tzKSk7 CisgICAgCisgICAgZm9yIChDRkluZGV4IGkgPSAwOyBpIDwgbnVtRm9udFVSTHM7ICsraSkgewor ICAgICAgICBDRlVSTFJlZiBjdXJyRm9udFVSTCA9IChDRlVSTFJlZilDRkFycmF5R2V0VmFsdWVB dEluZGV4KGF2YWlsYWJsZUZvbnRVUkxzLmdldCgpLCBpKTsKKyAgICAgICAgCisgICAgICAgIFJl dGFpblB0cjxDRkFycmF5UmVmPiBmb250RGVzY3JpcHRvcnMoQWRvcHRDRiwgQ1RGb250TWFuYWdl ckNyZWF0ZUZvbnREZXNjcmlwdG9yc0Zyb21VUkwoY3VyckZvbnRVUkwpKTsKKworICAgICAgICBm b3IgKENGSW5kZXggaiA9IDA7IGogPCBDRkFycmF5R2V0Q291bnQoZm9udERlc2NyaXB0b3JzLmdl dCgpKTsgKytqKSB7CisgICAgICAgICAgICBDVEZvbnREZXNjcmlwdG9yUmVmIGN1cnJEZXNjcmlw dG9yID0gKENURm9udERlc2NyaXB0b3JSZWYpQ0ZBcnJheUdldFZhbHVlQXRJbmRleChmb250RGVz Y3JpcHRvcnMuZ2V0KCksIGopOworICAgICAgICAgICAgICAgICAgICAgICAgCisgICAgICAgICAg ICBDRlR5cGVSZWYgZmFtaWx5TmFtZSA9IENURm9udERlc2NyaXB0b3JDb3B5QXR0cmlidXRlKGN1 cnJEZXNjcmlwdG9yLCBrQ1RGb250RmFtaWx5TmFtZUF0dHJpYnV0ZSk7CisgICAgICAgICAgICBp ZiAoQ0ZHZXRUeXBlSUQoZmFtaWx5TmFtZSkgIT0gQ0ZTdHJpbmdHZXRUeXBlSUQoKSkKKyAgICAg ICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICAgICAgaWYgKCFDRlNldENvbnRhaW5zVmFs dWUoYWxsb3dlZEZvbnRGYW1pbGllcy5nZXQoKSwgZmFtaWx5TmFtZSkpCisgICAgICAgICAgICAg ICAgQ0ZBcnJheUFwcGVuZFZhbHVlKGZvbnRVUkxzVG9EaXNhYmxlLmdldCgpLCBjdXJyRm9udFVS TCk7CisgICAgICAgIH0KKyAgICB9CisgICAgCisgICAgQ0ZTaG93KENGU1RSKCJEaXNhYmxpbmcg Zm9udHMiKSk7CisgICAgQ0ZTaG93KGZvbnRVUkxzVG9EaXNhYmxlLmdldCgpKTsKKyAgICAKKyAg ICBpZiAoIUNURm9udE1hbmFnZXJVbnJlZ2lzdGVyRm9udHNGb3JVUkxzKGZvbnRVUkxzVG9EaXNh YmxlLmdldCgpLCBrQ1RGb250TWFuYWdlclNjb3BlUHJvY2VzcywgMCkpCisgICAgICAgIE5TTG9n KEAiRGlzYWJsaW5nIGZvbnRzIGZhaWxlZCIpOworCisgICAgYWN0aXZhdGVUZXN0aW5nRm9udHMo KTsKIH0KIAogV2ViVmlldyAqY3JlYXRlV2ViVmlld0FuZE9mZnNjcmVlbldpbmRvdygpCkBAIC0z MTcsMTAgKzM0Nyw3IEBAIFdlYlZpZXcgKmNyZWF0ZVdlYlZpZXdBbmRPZmZzY3JlZW5XaW5kb3co KQogICAgIE5TUmVjdCB3aW5kb3dSZWN0ID0gTlNPZmZzZXRSZWN0KHJlY3QsIC0xMDAwMCwgWyhO U1NjcmVlbiAqKVtbTlNTY3JlZW4gc2NyZWVuc10gb2JqZWN0QXRJbmRleDowXSBmcmFtZV0uc2l6 ZS5oZWlnaHQgLSByZWN0LnNpemUuaGVpZ2h0ICsgMTAwMDApOwogICAgIER1bXBSZW5kZXJUcmVl V2luZG93ICp3aW5kb3cgPSBbW0R1bXBSZW5kZXJUcmVlV2luZG93IGFsbG9jXSBpbml0V2l0aENv bnRlbnRSZWN0OndpbmRvd1JlY3Qgc3R5bGVNYXNrOk5TQm9yZGVybGVzc1dpbmRvd01hc2sgYmFj a2luZzpOU0JhY2tpbmdTdG9yZUJ1ZmZlcmVkIGRlZmVyOllFU107CiAKLSNpZm5kZWYgQlVJTERJ TkdfT05fTEVPUEFSRAogICAgIFt3aW5kb3cgc2V0Q29sb3JTcGFjZTpbW05TU2NyZWVuIG1haW5T Y3JlZW5dIGNvbG9yU3BhY2VdXTsKLSNlbmRpZgotCiAgICAgW1t3aW5kb3cgY29udGVudFZpZXdd IGFkZFN1YnZpZXc6d2ViVmlld107CiAgICAgW3dpbmRvdyBvcmRlckJhY2s6bmlsXTsKICAgICBb d2luZG93IHNldEF1dG9kaXNwbGF5Ok5PXTsKQEAgLTYwMSw3ICs2MjgsNyBAQCBzdGF0aWMgdm9p ZCBwcmVwYXJlQ29uc2lzdGVudFRlc3RpbmdFbnZpcm9ubWVudCgpCiAgICAgcG9zZUFzQ2xhc3Mo IkR1bXBSZW5kZXJUcmVlRXZlbnQiLCAiTlNFdmVudCIpOwogCiAgICAgc2V0RGVmYXVsdHNUb0Nv bnNpc3RlbnRWYWx1ZXNGb3JUZXN0aW5nKCk7Ci0gICAgYWN0aXZhdGVGb250cygpOworICAgIGFk anVzdEZvbnRzKCk7CiAgICAgCiAgICAgaWYgKGR1bXBQaXhlbHMpCiAgICAgICAgIHNldHVwTWFp bkRpc3BsYXlDb2xvclByb2ZpbGUoKTsK 109321 2011-09-30 12:06:09 -0700 2011-09-30 12:21:23 -0700 Patch bug-35273-20110930120608.patch text/plain 16451 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogOTYxMzgKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4Mjc1YTE3ZTNiMTAwZjUwZGY0ZDc1MjQxZjJhMjc1Y2E1 MTkwMDEzLi5kZDlmY2RiZmJkZGUzMDc4MzM0NThkYzk1ZTZkOWM2ZWIxMWJkNzY5IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkg QEAKKzIwMTEtMDktMzAgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisK KyAgICAgICAgZmFzdC9mb3Jtcy90ZXh0LWNvbnRyb2wtaW50cmluc2ljLXdpZHRocy5odG1sIGZh aWxzIG9uIE1hYyBpZiBXb3JkL09mZmljZSBmb250cyBhcmUgaW5zdGFsbGVkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTI3MworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGhlcmUgYXJlIHR3 byB0eXBlcyBvZiBmb250IGlzc3VlIHRoYXQgY2FuIGNhdXNlIGxheW91dCB0ZXN0IGZhaWx1cmUu CisgICAgICAgIEZpcnN0LCB0aGUgdXNlciBtYXkgaGF2ZSBub24tc3RhbmRhcmQgZm9udHMgaW5z dGFsbGVkIHRoYXQgYWZmZWN0IHRoZSBsYXlvdXQKKyAgICAgICAgb2Ygc29tZSB0ZXN0cy4gRm9y IGV4YW1wbGUsIHNvbWUgdGVzdHMgdXNlIHRoZSBNUyBHb3RoaWMgZm9udCBpZiBpbnN0YWxsZWQu CisgICAgICAgIAorICAgICAgICBTZWNvbmRseSwgdGhlIHVzZXIgbWF5IGhhdmUgZHVwbGljYXRl IGZvbnRzIGluc3RhbGxlZCBpbiB+L0xpYnJhcnkvRm9udHMsCisgICAgICAgIHdoaWNoIG92ZXJy aWRlIHRoZSBzeXN0ZW0gZm9udHMgKGUuZy4gYSBjb3B5IG9mIEFyaWFsIGZyb20gTVMgT2ZmaWNl KS4gRm9yCisgICAgICAgIHNvbWUgdGVzdHMsIHRoaXMgY2FuIGFmZmVjdCBmb250IG1ldHJpY3Mg b3IgZmFsbGJhY2sgYmVoYXZpb3IuCisgICAgICAgIAorICAgICAgICBUaGlzIGNoYW5nZSBhZGRy ZXNzZXMgdGhlIGZpcnN0IHByb2JsZW0gb25seS4gSXQgbGltaXRzIHRoZSBzZXQgb2YgZm9udHMK KyAgICAgICAgYXZhaWxhYmxlIHRocm91Z2ggTlNGb250TWFuYWdlciwgYnkgc3dpenpsaW5nIHNv bWUgbWV0aG9kcyB0byByZXR1cm4KKyAgICAgICAgYSBsaXN0IG9mIGZvbnRzIG9yIGZvbnQgZmFt aWxpZXMgd2hpY2ggb25seSBpbmNsdWRlIGZvbnRzIGZyb20gYSBoYXJkY29kZWQKKyAgICAgICAg d2hpdGVsaXN0LgorICAgICAgICAKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJl bmRlclRyZWUubW06CisgICAgICAgIChhbGxvd2VkRm9udEZhbWlseVNldCk6CisgICAgICAgIChk cnRfTlNGb250TWFuYWdlcl9hdmFpbGFibGVGb250RmFtaWxpZXMpOgorICAgICAgICAoZHJ0X05T Rm9udE1hbmFnZXJfYXZhaWxhYmxlRm9udHMpOgorICAgICAgICAoc3dpenpsZU5TRm9udE1hbmFn ZXJNZXRob2RzKToKKyAgICAgICAgKGFjdGl2YXRlVGVzdGluZ0ZvbnRzKToKKyAgICAgICAgKGFk anVzdEZvbnRzKToKKyAgICAgICAgKGNyZWF0ZVdlYlZpZXdBbmRPZmZzY3JlZW5XaW5kb3cpOgor ICAgICAgICAocHJlcGFyZUNvbnNpc3RlbnRUZXN0aW5nRW52aXJvbm1lbnQpOgorICAgICAgICAq IFdlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvbWFjL0luamVjdGVkQnVuZGxlTWFjLm1t OgorICAgICAgICAoV1RSOjphbGxvd2VkRm9udEZhbWlseVNldCk6CisgICAgICAgIChXVFI6OmRy dF9OU0ZvbnRNYW5hZ2VyX2F2YWlsYWJsZUZvbnRGYW1pbGllcyk6CisgICAgICAgIChXVFI6OmRy dF9OU0ZvbnRNYW5hZ2VyX2F2YWlsYWJsZUZvbnRzKToKKyAgICAgICAgKFdUUjo6c3dpenpsZU5T Rm9udE1hbmFnZXJNZXRob2RzKToKKyAgICAgICAgKFdUUjo6SW5qZWN0ZWRCdW5kbGU6OnBsYXRm b3JtSW5pdGlhbGl6ZSk6CisKIDIwMTEtMDktMjcgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0 Lm9yZz4KIAogICAgICAgICBnYXJkZW4tby1tYXRpYyByZXN1bHRzIHZpZXcgc2hvdWxkIHNvcnQg dGVzdCBhbmQgYnVpbGRlciBuYW1lcwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUv bWFjL0R1bXBSZW5kZXJUcmVlLm1tIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5k ZXJUcmVlLm1tCmluZGV4IDIwN2I0MjFiMmRiNWFjNmY1MDMzYTI2OGMyNzZkNjFjNjUwODE2Mjcu LjgzMDY1ZmJlOGE3OWE4ZDNiZjQ1NTM4Zjk4ZTM2YmIyODE5YjkwZTAgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQorKysgYi9Ub29scy9EdW1w UmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0KQEAgLTIyMSw0MSArMjIxLDE4OCBAQCBz dGF0aWMgYm9vbCBzaG91bGRJZ25vcmVXZWJDb3JlTm9kZUxlYWtzKGNvbnN0IHN0cmluZyYgVVJM U3RyaW5nKQogICAgIHJldHVybiBmYWxzZTsKIH0KIAotc3RhdGljIHZvaWQgYWN0aXZhdGVGb250 cygpCitzdGF0aWMgTlNTZXQqIGFsbG93ZWRGb250RmFtaWx5U2V0KCkKIHsKLSNpZmRlZiBCVUlM RElOR19PTl9MRU9QQVJECi0gICAgc3RhdGljIGNvbnN0IGNoYXIqIGZvbnRTZWN0aW9uTmFtZXNb XSA9IHsKLSAgICAgICAgIkFoZW0iLAotICAgICAgICAiV2VpZ2h0V2F0Y2hlcjEwMCIsCi0gICAg ICAgICJXZWlnaHRXYXRjaGVyMjAwIiwKLSAgICAgICAgIldlaWdodFdhdGNoZXIzMDAiLAotICAg ICAgICAiV2VpZ2h0V2F0Y2hlcjQwMCIsCi0gICAgICAgICJXZWlnaHRXYXRjaGVyNTAwIiwKLSAg ICAgICAgIldlaWdodFdhdGNoZXI2MDAiLAotICAgICAgICAiV2VpZ2h0V2F0Y2hlcjcwMCIsCi0g ICAgICAgICJXZWlnaHRXYXRjaGVyODAwIiwKLSAgICAgICAgIldlaWdodFdhdGNoZXI5MDAiLAot ICAgICAgICAwCi0gICAgfTsKKyAgICBzdGF0aWMgTlNTZXQqIGZvbnRGYW1pbGl5U2V0ID0gW1tO U1NldCBzZXRXaXRoT2JqZWN0czoKKyAgICAgICAgQCJBaGVtIiwKKyAgICAgICAgQCJBbCBCYXlh biIsCisgICAgICAgIEAiQW1lcmljYW4gVHlwZXdyaXRlciIsCisgICAgICAgIEAiQW5kYWxlIE1v bm8iLAorICAgICAgICBAIkFwcGxlIEJyYWlsbGUiLAorICAgICAgICBAIkFwcGxlIENvbG9yIEVt b2ppIiwKKyAgICAgICAgQCJBcHBsZSBDaGFuY2VyeSIsCisgICAgICAgIEAiQXBwbGUgR2FyYW1v bmQgQlQiLAorICAgICAgICBAIkFwcGxlIExpR290aGljIiwKKyAgICAgICAgQCJBcHBsZSBMaVN1 bmciLAorICAgICAgICBAIkFwcGxlIFN5bWJvbHMiLAorICAgICAgICBAIkFwcGxlR290aGljIiwK KyAgICAgICAgQCJBcHBsZU15dW5nam8iLAorICAgICAgICBAIkFyaWFsIEJsYWNrIiwKKyAgICAg ICAgQCJBcmlhbCBIZWJyZXciLAorICAgICAgICBAIkFyaWFsIE5hcnJvdyIsCisgICAgICAgIEAi QXJpYWwgUm91bmRlZCBNVCBCb2xkIiwKKyAgICAgICAgQCJBcmlhbCBVbmljb2RlIE1TIiwKKyAg ICAgICAgQCJBcmlhbCIsCisgICAgICAgIEAiQXl1dGhheWEiLAorICAgICAgICBAIkJhZ2hkYWQi LAorICAgICAgICBAIkJhc2tlcnZpbGxlIiwKKyAgICAgICAgQCJCaWF1S2FpIiwKKyAgICAgICAg QCJCaWcgQ2FzbG9uIiwKKyAgICAgICAgQCJCcnVzaCBTY3JpcHQgTVQiLAorICAgICAgICBAIkNo YWxrYm9hcmQiLAorICAgICAgICBAIkNoYWxrZHVzdGVyIiwKKyAgICAgICAgQCJDaGFyY29hbCBD WSIsCisgICAgICAgIEAiQ29jaGluIiwKKyAgICAgICAgQCJDb2xvckJpdHMiLAorICAgICAgICBA IkNvbWljIFNhbnMgTVMiLAorICAgICAgICBAIkNvcHBlcnBsYXRlIiwKKyAgICAgICAgQCJDb3Jz aXZhIEhlYnJldyIsCisgICAgICAgIEAiQ291cmllciBOZXciLAorICAgICAgICBAIkNvdXJpZXIi LAorICAgICAgICBAIkRlY29UeXBlIE5hc2toIiwKKyAgICAgICAgQCJEZXZhbmFnYXJpIE1UIiwK KyAgICAgICAgQCJEaWRvdCIsCisgICAgICAgIEAiRXVwaGVtaWEgVUNBUyIsCisgICAgICAgIEAi RnV0dXJhIiwKKyAgICAgICAgQCJHQjE4MDMwIEJpdG1hcCIsCisgICAgICAgIEAiR2VlemEgUHJv IiwKKyAgICAgICAgQCJHZW5ldmEgQ1kiLAorICAgICAgICBAIkdlbmV2YSIsCisgICAgICAgIEAi R2VvcmdpYSIsCisgICAgICAgIEAiR2lsbCBTYW5zIiwKKyAgICAgICAgQCJHdWphcmF0aSBNVCIs CisgICAgICAgIEAiR3VuZ1NlbyIsCisgICAgICAgIEAiR3VybXVraGkgTVQiLAorICAgICAgICBA IkhlYWRMaW5lQSIsCisgICAgICAgIEAiSGVpIiwKKyAgICAgICAgQCJIZWl0aSBTQyIsCisgICAg ICAgIEAiSGVpdGkgVEMiLAorICAgICAgICBAIkhlbHZldGljYSBDWSIsCisgICAgICAgIEAiSGVs dmV0aWNhIE5ldWUiLAorICAgICAgICBAIkhlbHZldGljYSIsCisgICAgICAgIEAiSGVyY3VsYW51 bSIsCisgICAgICAgIEAiSGlyYWdpbm8gS2FrdSBHb3RoaWMgUHJvIiwKKyAgICAgICAgQCJIaXJh Z2lubyBLYWt1IEdvdGhpYyBQcm9OIiwKKyAgICAgICAgQCJIaXJhZ2lubyBLYWt1IEdvdGhpYyBT dGQiLAorICAgICAgICBAIkhpcmFnaW5vIEtha3UgR290aGljIFN0ZE4iLAorICAgICAgICBAIkhp cmFnaW5vIE1hcnUgR290aGljIFBybyIsCisgICAgICAgIEAiSGlyYWdpbm8gTWFydSBHb3RoaWMg UHJvTiIsCisgICAgICAgIEAiSGlyYWdpbm8gTWluY2hvIFBybyIsCisgICAgICAgIEAiSGlyYWdp bm8gTWluY2hvIFByb04iLAorICAgICAgICBAIkhpcmFnaW5vIFNhbnMgR0IiLAorICAgICAgICBA IkhvZWZsZXIgVGV4dCIsCisgICAgICAgIEAiSW1wYWN0IiwKKyAgICAgICAgQCJJbmFpTWF0aGki LAorICAgICAgICBAIkthaSIsCisgICAgICAgIEAiS2FpbGFzYSIsCisgICAgICAgIEAiS29rb25v ciIsCisgICAgICAgIEAiS3J1bmd0aGVwIiwKKyAgICAgICAgQCJLdWZpU3RhbmRhcmRHSyIsCisg ICAgICAgIEAiTGlIZWkgUHJvIiwKKyAgICAgICAgQCJMaVNvbmcgUHJvIiwKKyAgICAgICAgQCJM dWNpZGEgR3JhbmRlIiwKKyAgICAgICAgQCJNYXJrZXIgRmVsdCIsCisgICAgICAgIEAiTWVubG8i LAorICAgICAgICBAIk1pY3Jvc29mdCBTYW5zIFNlcmlmIiwKKyAgICAgICAgQCJNb25hY28iLAor ICAgICAgICBAIk1zaHRha2FuIiwKKyAgICAgICAgQCJOYWRlZW0iLAorICAgICAgICBAIk5ldyBQ ZW5pbmltIE1UIiwKKyAgICAgICAgQCJPcHRpbWEiLAorICAgICAgICBAIk9zYWthIiwKKyAgICAg ICAgQCJQYXB5cnVzIiwKKyAgICAgICAgQCJQQ015dW5nam8iLAorICAgICAgICBAIlBpbEdpIiwK KyAgICAgICAgQCJQbGFudGFnZW5ldCBDaGVyb2tlZSIsCisgICAgICAgIEAiUmFhbmFuYSIsCisg ICAgICAgIEAiU2F0aHUiLAorICAgICAgICBAIlNpbG9tIiwKKyAgICAgICAgQCJTa2lhIiwKKyAg ICAgICAgQCJTVEZhbmdzb25nIiwKKyAgICAgICAgQCJTVEhlaXRpIiwKKyAgICAgICAgQCJTVEth aXRpIiwKKyAgICAgICAgQCJTVFNvbmciLAorICAgICAgICBAIlN5bWJvbCIsCisgICAgICAgIEAi VGFob21hIiwKKyAgICAgICAgQCJUaG9uYnVyaSIsCisgICAgICAgIEAiVGltZXMgTmV3IFJvbWFu IiwKKyAgICAgICAgQCJUaW1lcyIsCisgICAgICAgIEAiVHJlYnVjaGV0IE1TIiwKKyAgICAgICAg QCJWZXJkYW5hIiwKKyAgICAgICAgQCJXZWJkaW5ncyIsCisgICAgICAgIEAiV2ViS2l0IFdlaWdo dFdhdGNoZXIiLAorICAgICAgICBAIldpbmdkaW5ncyAyIiwKKyAgICAgICAgQCJXaW5nZGluZ3Mg MyIsCisgICAgICAgIEAiV2luZ2RpbmdzIiwKKyAgICAgICAgQCJaYXBmIERpbmdiYXRzIiwKKyAg ICAgICAgQCJaYXBmaW5vIiwKKyAgICAgICAgbmlsXSByZXRhaW5dOworICAgIAorICAgIHJldHVy biBmb250RmFtaWxpeVNldDsKK30KIAotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGZvbnRTZWN0 aW9uTmFtZXNbaV07ICsraSkgewotICAgICAgICB1bnNpZ25lZCBsb25nIGZvbnREYXRhTGVuZ3Ro OwotICAgICAgICBjaGFyKiBmb250RGF0YSA9IGdldHNlY3RkYXRhKCJfX0RBVEEiLCBmb250U2Vj dGlvbk5hbWVzW2ldLCAmZm9udERhdGFMZW5ndGgpOwotICAgICAgICBpZiAoIWZvbnREYXRhKSB7 Ci0gICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIkZhaWxlZCB0byBsb2NhdGUgdGhlICVzIGZv bnQuXG4iLCBmb250U2VjdGlvbk5hbWVzW2ldKTsKLSAgICAgICAgICAgIGV4aXQoMSk7Ci0gICAg ICAgIH0KK3N0YXRpYyBJTVAgYXBwS2l0QXZhaWxhYmxlRm9udEZhbWlsaWVzSU1QOworc3RhdGlj IElNUCBhcHBLaXRBdmFpbGFibGVGb250c0lNUDsKKworCitzdGF0aWMgTlNBcnJheSAqZHJ0X05T Rm9udE1hbmFnZXJfYXZhaWxhYmxlRm9udEZhbWlsaWVzKGlkIHNlbGYsIFNFTCBfY21kKQorewor ICAgIHN0YXRpYyBOU0FycmF5ICphdmFpbGFibGVGb250RmFtaWxpZXM7CisgICAgaWYgKGF2YWls YWJsZUZvbnRGYW1pbGllcykKKyAgICAgICAgcmV0dXJuIGF2YWlsYWJsZUZvbnRGYW1pbGllczsK KyAgICAKKyAgICBOU0FycmF5ICphdmFpbGFibGVGYW1pbGllcyA9IGFwcEtpdEF2YWlsYWJsZUZv bnRGYW1pbGllc0lNUChzZWxmLCBfY21kKTsKIAotICAgICAgICBBVFNGb250Q29udGFpbmVyUmVm IGZvbnRDb250YWluZXI7Ci0gICAgICAgIE9TU3RhdHVzIHN0YXR1cyA9IEFUU0ZvbnRBY3RpdmF0 ZUZyb21NZW1vcnkoZm9udERhdGEsIGZvbnREYXRhTGVuZ3RoLCBrQVRTRm9udENvbnRleHRMb2Nh bCwga0FUU0ZvbnRGb3JtYXRVbnNwZWNpZmllZCwgTlVMTCwga0FUU09wdGlvbkZsYWdzRGVmYXVs dCwgJmZvbnRDb250YWluZXIpOworICAgIE5TTXV0YWJsZVNldCAqcHJ1bmVkRmFtaWxpZXNTZXQg PSBbTlNNdXRhYmxlU2V0IHNldFdpdGhBcnJheTphdmFpbGFibGVGYW1pbGllc107CisgICAgW3By dW5lZEZhbWlsaWVzU2V0IGludGVyc2VjdFNldDphbGxvd2VkRm9udEZhbWlseVNldCgpXTsKIAot ICAgICAgICBpZiAoc3RhdHVzICE9IG5vRXJyKSB7Ci0gICAgICAgICAgICBmcHJpbnRmKHN0ZGVy ciwgIkZhaWxlZCB0byBhY3RpdmF0ZSB0aGUgJXMgZm9udC5cbiIsIGZvbnRTZWN0aW9uTmFtZXNb aV0pOwotICAgICAgICAgICAgZXhpdCgxKTsKKyAgICBhdmFpbGFibGVGb250RmFtaWxpZXMgPSBb W3BydW5lZEZhbWlsaWVzU2V0IGFsbE9iamVjdHNdIHJldGFpbl07CisgICAgcmV0dXJuIGF2YWls YWJsZUZvbnRGYW1pbGllczsKK30KKworc3RhdGljIE5TQXJyYXkgKmRydF9OU0ZvbnRNYW5hZ2Vy X2F2YWlsYWJsZUZvbnRzKGlkIHNlbGYsIFNFTCBfY21kKQoreworICAgIHN0YXRpYyBOU0FycmF5 ICphdmFpbGFibGVGb250czsKKyAgICBpZiAoYXZhaWxhYmxlRm9udHMpCisgICAgICAgIHJldHVy biBhdmFpbGFibGVGb250czsKKyAgICAKKyAgICBOU1NldCAqYWxsb3dlZEZhbWlsaWVzID0gYWxs b3dlZEZvbnRGYW1pbHlTZXQoKTsKKyAgICBOU011dGFibGVBcnJheSAqYXZhaWxhYmxlRm9udExp c3QgPSBbW05TTXV0YWJsZUFycmF5IGFsbG9jXSBpbml0V2l0aENhcGFjaXR5OlthbGxvd2VkRmFt aWxpZXMgY291bnRdICogMl07CisgICAgZm9yIChOU1N0cmluZyAqZm9udEZhbWlseSBpbiBhbGxv d2VkRm9udEZhbWlseVNldCgpKSB7CisgICAgICAgIE5TQXJyYXkqIGZvbnRzRm9yRmFtaWx5ID0g W1tOU0ZvbnRNYW5hZ2VyIHNoYXJlZEZvbnRNYW5hZ2VyXSBhdmFpbGFibGVNZW1iZXJzT2ZGb250 RmFtaWx5OmZvbnRGYW1pbHldOworICAgICAgICBmb3IgKE5TQXJyYXkqIGZvbnRJbmZvIGluIGZv bnRzRm9yRmFtaWx5KSB7CisgICAgICAgICAgICAvLyBGb250IG5hbWUgaXMgdGhlIGZpcnN0IGVu dHJ5IGluIHRoZSBhcnJheS4KKyAgICAgICAgICAgIFthdmFpbGFibGVGb250TGlzdCBhZGRPYmpl Y3Q6W2ZvbnRJbmZvIG9iamVjdEF0SW5kZXg6MF1dOwogICAgICAgICB9CiAgICAgfQotI2Vsc2UK KyAgICAKKyAgICBhdmFpbGFibGVGb250cyA9IGF2YWlsYWJsZUZvbnRMaXN0OworICAgIHJldHVy biBhdmFpbGFibGVGb250czsKK30KIAorc3RhdGljIHZvaWQgc3dpenpsZU5TRm9udE1hbmFnZXJN ZXRob2RzKCkKK3sKKyAgICBNZXRob2QgYXZhaWxhYmxlRm9udEZhbWlsaWVzTWV0aG9kID0gY2xh c3NfZ2V0SW5zdGFuY2VNZXRob2Qob2JqY19nZXRDbGFzcygiTlNGb250TWFuYWdlciIpLCBAc2Vs ZWN0b3IoYXZhaWxhYmxlRm9udEZhbWlsaWVzKSk7CisgICAgQVNTRVJUKGF2YWlsYWJsZUZvbnRG YW1pbGllc01ldGhvZCk7CisgICAgaWYgKCFhdmFpbGFibGVGb250RmFtaWxpZXNNZXRob2QpIHsK KyAgICAgICAgTlNMb2coQCJGYWlsZWQgdG8gc3dpenpsZSB0aGUgXCJhdmFpbGFibGVGb250RmFt aWxpZXNcIiBtZXRob2Qgb24gTlNGb250TWFuYWdlciIpOworICAgICAgICByZXR1cm47CisgICAg fQorICAgIAorICAgIGFwcEtpdEF2YWlsYWJsZUZvbnRGYW1pbGllc0lNUCA9IG1ldGhvZF9zZXRJ bXBsZW1lbnRhdGlvbihhdmFpbGFibGVGb250RmFtaWxpZXNNZXRob2QsIChJTVApZHJ0X05TRm9u dE1hbmFnZXJfYXZhaWxhYmxlRm9udEZhbWlsaWVzKTsKKworICAgIE1ldGhvZCBhdmFpbGFibGVG b250c01ldGhvZCA9IGNsYXNzX2dldEluc3RhbmNlTWV0aG9kKG9iamNfZ2V0Q2xhc3MoIk5TRm9u dE1hbmFnZXIiKSwgQHNlbGVjdG9yKGF2YWlsYWJsZUZvbnRzKSk7CisgICAgQVNTRVJUKGF2YWls YWJsZUZvbnRzTWV0aG9kKTsKKyAgICBpZiAoIWF2YWlsYWJsZUZvbnRzTWV0aG9kKSB7CisgICAg ICAgIE5TTG9nKEAiRmFpbGVkIHRvIHN3aXp6bGUgdGhlIFwiYXZhaWxhYmxlRm9udHNcIiBtZXRo b2Qgb24gTlNGb250TWFuYWdlciIpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIAorICAg IGFwcEtpdEF2YWlsYWJsZUZvbnRzSU1QID0gbWV0aG9kX3NldEltcGxlbWVudGF0aW9uKGF2YWls YWJsZUZvbnRzTWV0aG9kLCAoSU1QKWRydF9OU0ZvbnRNYW5hZ2VyX2F2YWlsYWJsZUZvbnRzKTsK K30KKworc3RhdGljIHZvaWQgYWN0aXZhdGVUZXN0aW5nRm9udHMoKQorewogICAgIC8vIFdvcmsg YXJvdW5kIDxyZGFyOi8vcHJvYmxlbS82Njk4MDIzPiBieSBhY3RpdmF0aW5nIGZvbnRzIGZyb20g ZGlzawogICAgIC8vIEZJWE1FOiBUaGlzIGNvZGUgY2FuIGJlIHJlbW92ZWQgb25jZSA8cmRhcjov L3Byb2JsZW0vNjY5ODAyMz4gaXMgYWRkcmVzc2VkLgogCkBAIC0yODcsNyArNDM0LDEyIEBAIHN0 YXRpYyB2b2lkIGFjdGl2YXRlRm9udHMoKQogICAgICAgICBDRlJlbGVhc2UoZXJyb3JzKTsKICAg ICAgICAgZXhpdCgxKTsKICAgICB9Ci0jZW5kaWYKK30KKworc3RhdGljIHZvaWQgYWRqdXN0Rm9u dHMoKQoreworICAgIHN3aXp6bGVOU0ZvbnRNYW5hZ2VyTWV0aG9kcygpOworICAgIGFjdGl2YXRl VGVzdGluZ0ZvbnRzKCk7CiB9CiAKIFdlYlZpZXcgKmNyZWF0ZVdlYlZpZXdBbmRPZmZzY3JlZW5X aW5kb3coKQpAQCAtMzE3LDEwICs0NjksNyBAQCBXZWJWaWV3ICpjcmVhdGVXZWJWaWV3QW5kT2Zm c2NyZWVuV2luZG93KCkKICAgICBOU1JlY3Qgd2luZG93UmVjdCA9IE5TT2Zmc2V0UmVjdChyZWN0 LCAtMTAwMDAsIFsoTlNTY3JlZW4gKilbW05TU2NyZWVuIHNjcmVlbnNdIG9iamVjdEF0SW5kZXg6 MF0gZnJhbWVdLnNpemUuaGVpZ2h0IC0gcmVjdC5zaXplLmhlaWdodCArIDEwMDAwKTsKICAgICBE dW1wUmVuZGVyVHJlZVdpbmRvdyAqd2luZG93ID0gW1tEdW1wUmVuZGVyVHJlZVdpbmRvdyBhbGxv Y10gaW5pdFdpdGhDb250ZW50UmVjdDp3aW5kb3dSZWN0IHN0eWxlTWFzazpOU0JvcmRlcmxlc3NX aW5kb3dNYXNrIGJhY2tpbmc6TlNCYWNraW5nU3RvcmVCdWZmZXJlZCBkZWZlcjpZRVNdOwogCi0j aWZuZGVmIEJVSUxESU5HX09OX0xFT1BBUkQKICAgICBbd2luZG93IHNldENvbG9yU3BhY2U6W1tO U1NjcmVlbiBtYWluU2NyZWVuXSBjb2xvclNwYWNlXV07Ci0jZW5kaWYKLQogICAgIFtbd2luZG93 IGNvbnRlbnRWaWV3XSBhZGRTdWJ2aWV3OndlYlZpZXddOwogICAgIFt3aW5kb3cgb3JkZXJCYWNr Om5pbF07CiAgICAgW3dpbmRvdyBzZXRBdXRvZGlzcGxheTpOT107CkBAIC02MDEsNyArNzUwLDcg QEAgc3RhdGljIHZvaWQgcHJlcGFyZUNvbnNpc3RlbnRUZXN0aW5nRW52aXJvbm1lbnQoKQogICAg IHBvc2VBc0NsYXNzKCJEdW1wUmVuZGVyVHJlZUV2ZW50IiwgIk5TRXZlbnQiKTsKIAogICAgIHNl dERlZmF1bHRzVG9Db25zaXN0ZW50VmFsdWVzRm9yVGVzdGluZygpOwotICAgIGFjdGl2YXRlRm9u dHMoKTsKKyAgICBhZGp1c3RGb250cygpOwogICAgIAogICAgIGlmIChkdW1wUGl4ZWxzKQogICAg ICAgICBzZXR1cE1haW5EaXNwbGF5Q29sb3JQcm9maWxlKCk7CmRpZmYgLS1naXQgYS9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL21hYy9JbmplY3RlZEJ1bmRsZU1hYy5tbSBi L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvbWFjL0luamVjdGVkQnVuZGxl TWFjLm1tCmluZGV4IDE1ZjgyYTExOTVjMTViYzZlMGE2ZjRkYWU5MjczNWIyOWRiNTIyODguLjc2 YWQ5N2MzYzdmNjNmODhkNmFiZTc0OThiMDgyMmJmMTk4NDNlNDIgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvbWFjL0luamVjdGVkQnVuZGxlTWFjLm1t CisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvbWFjL0luamVjdGVk QnVuZGxlTWFjLm1tCkBAIC0yNSwxMCArMjUsMTkzIEBACiAKICNpbXBvcnQgIkluamVjdGVkQnVu ZGxlLmgiCiAKKyNpbXBvcnQgPEFwcEtpdC9BcHBLaXQuaD4KICNpbXBvcnQgPEZvdW5kYXRpb24v Rm91bmRhdGlvbi5oPgorI2ltcG9ydCA8b2JqYy9vYmpjLXJ1bnRpbWUuaD4KIAogbmFtZXNwYWNl IFdUUiB7CiAKK3N0YXRpYyBOU1NldCogYWxsb3dlZEZvbnRGYW1pbHlTZXQoKQoreworICAgIHN0 YXRpYyBOU1NldCogZm9udEZhbWlsaXlTZXQgPSBbW05TU2V0IHNldFdpdGhPYmplY3RzOgorICAg ICAgICBAIkFoZW0iLAorICAgICAgICBAIkFsIEJheWFuIiwKKyAgICAgICAgQCJBbWVyaWNhbiBU eXBld3JpdGVyIiwKKyAgICAgICAgQCJBbmRhbGUgTW9ubyIsCisgICAgICAgIEAiQXBwbGUgQnJh aWxsZSIsCisgICAgICAgIEAiQXBwbGUgQ29sb3IgRW1vamkiLAorICAgICAgICBAIkFwcGxlIENo YW5jZXJ5IiwKKyAgICAgICAgQCJBcHBsZSBHYXJhbW9uZCBCVCIsCisgICAgICAgIEAiQXBwbGUg TGlHb3RoaWMiLAorICAgICAgICBAIkFwcGxlIExpU3VuZyIsCisgICAgICAgIEAiQXBwbGUgU3lt Ym9scyIsCisgICAgICAgIEAiQXBwbGVHb3RoaWMiLAorICAgICAgICBAIkFwcGxlTXl1bmdqbyIs CisgICAgICAgIEAiQXJpYWwgQmxhY2siLAorICAgICAgICBAIkFyaWFsIEhlYnJldyIsCisgICAg ICAgIEAiQXJpYWwgTmFycm93IiwKKyAgICAgICAgQCJBcmlhbCBSb3VuZGVkIE1UIEJvbGQiLAor ICAgICAgICBAIkFyaWFsIFVuaWNvZGUgTVMiLAorICAgICAgICBAIkFyaWFsIiwKKyAgICAgICAg QCJBeXV0aGF5YSIsCisgICAgICAgIEAiQmFnaGRhZCIsCisgICAgICAgIEAiQmFza2VydmlsbGUi LAorICAgICAgICBAIkJpYXVLYWkiLAorICAgICAgICBAIkJpZyBDYXNsb24iLAorICAgICAgICBA IkJydXNoIFNjcmlwdCBNVCIsCisgICAgICAgIEAiQ2hhbGtib2FyZCIsCisgICAgICAgIEAiQ2hh bGtkdXN0ZXIiLAorICAgICAgICBAIkNoYXJjb2FsIENZIiwKKyAgICAgICAgQCJDb2NoaW4iLAor ICAgICAgICBAIkNvbG9yQml0cyIsCisgICAgICAgIEAiQ29taWMgU2FucyBNUyIsCisgICAgICAg IEAiQ29wcGVycGxhdGUiLAorICAgICAgICBAIkNvcnNpdmEgSGVicmV3IiwKKyAgICAgICAgQCJD b3VyaWVyIE5ldyIsCisgICAgICAgIEAiQ291cmllciIsCisgICAgICAgIEAiRGVjb1R5cGUgTmFz a2giLAorICAgICAgICBAIkRldmFuYWdhcmkgTVQiLAorICAgICAgICBAIkRpZG90IiwKKyAgICAg ICAgQCJFdXBoZW1pYSBVQ0FTIiwKKyAgICAgICAgQCJGdXR1cmEiLAorICAgICAgICBAIkdCMTgw MzAgQml0bWFwIiwKKyAgICAgICAgQCJHZWV6YSBQcm8iLAorICAgICAgICBAIkdlbmV2YSBDWSIs CisgICAgICAgIEAiR2VuZXZhIiwKKyAgICAgICAgQCJHZW9yZ2lhIiwKKyAgICAgICAgQCJHaWxs IFNhbnMiLAorICAgICAgICBAIkd1amFyYXRpIE1UIiwKKyAgICAgICAgQCJHdW5nU2VvIiwKKyAg ICAgICAgQCJHdXJtdWtoaSBNVCIsCisgICAgICAgIEAiSGVhZExpbmVBIiwKKyAgICAgICAgQCJI ZWkiLAorICAgICAgICBAIkhlaXRpIFNDIiwKKyAgICAgICAgQCJIZWl0aSBUQyIsCisgICAgICAg IEAiSGVsdmV0aWNhIENZIiwKKyAgICAgICAgQCJIZWx2ZXRpY2EgTmV1ZSIsCisgICAgICAgIEAi SGVsdmV0aWNhIiwKKyAgICAgICAgQCJIZXJjdWxhbnVtIiwKKyAgICAgICAgQCJIaXJhZ2lubyBL YWt1IEdvdGhpYyBQcm8iLAorICAgICAgICBAIkhpcmFnaW5vIEtha3UgR290aGljIFByb04iLAor ICAgICAgICBAIkhpcmFnaW5vIEtha3UgR290aGljIFN0ZCIsCisgICAgICAgIEAiSGlyYWdpbm8g S2FrdSBHb3RoaWMgU3RkTiIsCisgICAgICAgIEAiSGlyYWdpbm8gTWFydSBHb3RoaWMgUHJvIiwK KyAgICAgICAgQCJIaXJhZ2lubyBNYXJ1IEdvdGhpYyBQcm9OIiwKKyAgICAgICAgQCJIaXJhZ2lu byBNaW5jaG8gUHJvIiwKKyAgICAgICAgQCJIaXJhZ2lubyBNaW5jaG8gUHJvTiIsCisgICAgICAg IEAiSGlyYWdpbm8gU2FucyBHQiIsCisgICAgICAgIEAiSG9lZmxlciBUZXh0IiwKKyAgICAgICAg QCJJbXBhY3QiLAorICAgICAgICBAIkluYWlNYXRoaSIsCisgICAgICAgIEAiS2FpIiwKKyAgICAg ICAgQCJLYWlsYXNhIiwKKyAgICAgICAgQCJLb2tvbm9yIiwKKyAgICAgICAgQCJLcnVuZ3RoZXAi LAorICAgICAgICBAIkt1ZmlTdGFuZGFyZEdLIiwKKyAgICAgICAgQCJMaUhlaSBQcm8iLAorICAg ICAgICBAIkxpU29uZyBQcm8iLAorICAgICAgICBAIkx1Y2lkYSBHcmFuZGUiLAorICAgICAgICBA Ik1hcmtlciBGZWx0IiwKKyAgICAgICAgQCJNZW5sbyIsCisgICAgICAgIEAiTWljcm9zb2Z0IFNh bnMgU2VyaWYiLAorICAgICAgICBAIk1vbmFjbyIsCisgICAgICAgIEAiTXNodGFrYW4iLAorICAg ICAgICBAIk5hZGVlbSIsCisgICAgICAgIEAiTmV3IFBlbmluaW0gTVQiLAorICAgICAgICBAIk9w dGltYSIsCisgICAgICAgIEAiT3Nha2EiLAorICAgICAgICBAIlBhcHlydXMiLAorICAgICAgICBA IlBDTXl1bmdqbyIsCisgICAgICAgIEAiUGlsR2kiLAorICAgICAgICBAIlBsYW50YWdlbmV0IENo ZXJva2VlIiwKKyAgICAgICAgQCJSYWFuYW5hIiwKKyAgICAgICAgQCJTYXRodSIsCisgICAgICAg IEAiU2lsb20iLAorICAgICAgICBAIlNraWEiLAorICAgICAgICBAIlNURmFuZ3NvbmciLAorICAg ICAgICBAIlNUSGVpdGkiLAorICAgICAgICBAIlNUS2FpdGkiLAorICAgICAgICBAIlNUU29uZyIs CisgICAgICAgIEAiU3ltYm9sIiwKKyAgICAgICAgQCJUYWhvbWEiLAorICAgICAgICBAIlRob25i dXJpIiwKKyAgICAgICAgQCJUaW1lcyBOZXcgUm9tYW4iLAorICAgICAgICBAIlRpbWVzIiwKKyAg ICAgICAgQCJUcmVidWNoZXQgTVMiLAorICAgICAgICBAIlZlcmRhbmEiLAorICAgICAgICBAIldl YmRpbmdzIiwKKyAgICAgICAgQCJXZWJLaXQgV2VpZ2h0V2F0Y2hlciIsCisgICAgICAgIEAiV2lu Z2RpbmdzIDIiLAorICAgICAgICBAIldpbmdkaW5ncyAzIiwKKyAgICAgICAgQCJXaW5nZGluZ3Mi LAorICAgICAgICBAIlphcGYgRGluZ2JhdHMiLAorICAgICAgICBAIlphcGZpbm8iLAorICAgICAg ICBuaWxdIHJldGFpbl07CisgICAgCisgICAgcmV0dXJuIGZvbnRGYW1pbGl5U2V0OworfQorCitz dGF0aWMgSU1QIGFwcEtpdEF2YWlsYWJsZUZvbnRGYW1pbGllc0lNUDsKK3N0YXRpYyBJTVAgYXBw S2l0QXZhaWxhYmxlRm9udHNJTVA7CisKKworc3RhdGljIE5TQXJyYXkgKmRydF9OU0ZvbnRNYW5h Z2VyX2F2YWlsYWJsZUZvbnRGYW1pbGllcyhpZCBzZWxmLCBTRUwgX2NtZCkKK3sKKyAgICBzdGF0 aWMgTlNBcnJheSAqYXZhaWxhYmxlRm9udEZhbWlsaWVzOworICAgIGlmIChhdmFpbGFibGVGb250 RmFtaWxpZXMpCisgICAgICAgIHJldHVybiBhdmFpbGFibGVGb250RmFtaWxpZXM7CisgICAgCisg ICAgTlNBcnJheSAqYXZhaWxhYmxlRmFtaWxpZXMgPSBhcHBLaXRBdmFpbGFibGVGb250RmFtaWxp ZXNJTVAoc2VsZiwgX2NtZCk7CisKKyAgICBOU011dGFibGVTZXQgKnBydW5lZEZhbWlsaWVzU2V0 ID0gW05TTXV0YWJsZVNldCBzZXRXaXRoQXJyYXk6YXZhaWxhYmxlRmFtaWxpZXNdOworICAgIFtw cnVuZWRGYW1pbGllc1NldCBpbnRlcnNlY3RTZXQ6YWxsb3dlZEZvbnRGYW1pbHlTZXQoKV07CisK KyAgICBhdmFpbGFibGVGb250RmFtaWxpZXMgPSBbW3BydW5lZEZhbWlsaWVzU2V0IGFsbE9iamVj dHNdIHJldGFpbl07CisgICAgcmV0dXJuIGF2YWlsYWJsZUZvbnRGYW1pbGllczsKK30KKworc3Rh dGljIE5TQXJyYXkgKmRydF9OU0ZvbnRNYW5hZ2VyX2F2YWlsYWJsZUZvbnRzKGlkIHNlbGYsIFNF TCBfY21kKQoreworICAgIHN0YXRpYyBOU0FycmF5ICphdmFpbGFibGVGb250czsKKyAgICBpZiAo YXZhaWxhYmxlRm9udHMpCisgICAgICAgIHJldHVybiBhdmFpbGFibGVGb250czsKKyAgICAKKyAg ICBOU1NldCAqYWxsb3dlZEZhbWlsaWVzID0gYWxsb3dlZEZvbnRGYW1pbHlTZXQoKTsKKyAgICBO U011dGFibGVBcnJheSAqYXZhaWxhYmxlRm9udExpc3QgPSBbW05TTXV0YWJsZUFycmF5IGFsbG9j XSBpbml0V2l0aENhcGFjaXR5OlthbGxvd2VkRmFtaWxpZXMgY291bnRdICogMl07CisgICAgZm9y IChOU1N0cmluZyAqZm9udEZhbWlseSBpbiBhbGxvd2VkRm9udEZhbWlseVNldCgpKSB7CisgICAg ICAgIE5TQXJyYXkqIGZvbnRzRm9yRmFtaWx5ID0gW1tOU0ZvbnRNYW5hZ2VyIHNoYXJlZEZvbnRN YW5hZ2VyXSBhdmFpbGFibGVNZW1iZXJzT2ZGb250RmFtaWx5OmZvbnRGYW1pbHldOworICAgICAg ICBmb3IgKE5TQXJyYXkqIGZvbnRJbmZvIGluIGZvbnRzRm9yRmFtaWx5KSB7CisgICAgICAgICAg ICAvLyBGb250IG5hbWUgaXMgdGhlIGZpcnN0IGVudHJ5IGluIHRoZSBhcnJheS4KKyAgICAgICAg ICAgIFthdmFpbGFibGVGb250TGlzdCBhZGRPYmplY3Q6W2ZvbnRJbmZvIG9iamVjdEF0SW5kZXg6 MF1dOworICAgICAgICB9CisgICAgfQorICAgIAorICAgIGF2YWlsYWJsZUZvbnRzID0gYXZhaWxh YmxlRm9udExpc3Q7CisgICAgcmV0dXJuIGF2YWlsYWJsZUZvbnRzOworfQorCitzdGF0aWMgdm9p ZCBzd2l6emxlTlNGb250TWFuYWdlck1ldGhvZHMoKQoreworICAgIE1ldGhvZCBhdmFpbGFibGVG b250RmFtaWxpZXNNZXRob2QgPSBjbGFzc19nZXRJbnN0YW5jZU1ldGhvZChvYmpjX2dldENsYXNz KCJOU0ZvbnRNYW5hZ2VyIiksIEBzZWxlY3RvcihhdmFpbGFibGVGb250RmFtaWxpZXMpKTsKKyAg ICBBU1NFUlQoYXZhaWxhYmxlRm9udEZhbWlsaWVzTWV0aG9kKTsKKyAgICBpZiAoIWF2YWlsYWJs ZUZvbnRGYW1pbGllc01ldGhvZCkgeworICAgICAgICBOU0xvZyhAIkZhaWxlZCB0byBzd2l6emxl IHRoZSBcImF2YWlsYWJsZUZvbnRGYW1pbGllc1wiIG1ldGhvZCBvbiBOU0ZvbnRNYW5hZ2VyIik7 CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgCisgICAgYXBwS2l0QXZhaWxhYmxlRm9udEZh bWlsaWVzSU1QID0gbWV0aG9kX3NldEltcGxlbWVudGF0aW9uKGF2YWlsYWJsZUZvbnRGYW1pbGll c01ldGhvZCwgKElNUClkcnRfTlNGb250TWFuYWdlcl9hdmFpbGFibGVGb250RmFtaWxpZXMpOwor CisgICAgTWV0aG9kIGF2YWlsYWJsZUZvbnRzTWV0aG9kID0gY2xhc3NfZ2V0SW5zdGFuY2VNZXRo b2Qob2JqY19nZXRDbGFzcygiTlNGb250TWFuYWdlciIpLCBAc2VsZWN0b3IoYXZhaWxhYmxlRm9u dHMpKTsKKyAgICBBU1NFUlQoYXZhaWxhYmxlRm9udHNNZXRob2QpOworICAgIGlmICghYXZhaWxh YmxlRm9udHNNZXRob2QpIHsKKyAgICAgICAgTlNMb2coQCJGYWlsZWQgdG8gc3dpenpsZSB0aGUg XCJhdmFpbGFibGVGb250c1wiIG1ldGhvZCBvbiBOU0ZvbnRNYW5hZ2VyIik7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisgICAgCisgICAgYXBwS2l0QXZhaWxhYmxlRm9udHNJTVAgPSBtZXRob2Rf c2V0SW1wbGVtZW50YXRpb24oYXZhaWxhYmxlRm9udHNNZXRob2QsIChJTVApZHJ0X05TRm9udE1h bmFnZXJfYXZhaWxhYmxlRm9udHMpOworfQorCisKIHZvaWQgSW5qZWN0ZWRCdW5kbGU6OnBsYXRm b3JtSW5pdGlhbGl6ZShXS1R5cGVSZWYpCiB7CiAgICAgTlNEaWN0aW9uYXJ5ICpkaWN0ID0gW05T RGljdGlvbmFyeSBkaWN0aW9uYXJ5V2l0aE9iamVjdHNBbmRLZXlzOgpAQCAtNDAsNiArMjIzLDgg QEAgdm9pZCBJbmplY3RlZEJ1bmRsZTo6cGxhdGZvcm1Jbml0aWFsaXplKFdLVHlwZVJlZikKICAg ICAgICAgbmlsXTsKIAogICAgIFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNd IHJlZ2lzdGVyRGVmYXVsdHM6ZGljdF07CisgICAgCisgICAgc3dpenpsZU5TRm9udE1hbmFnZXJN ZXRob2RzKCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdUUgo=