191093 2018-10-30 16:47:02 -0700 [Win][Direct2D] Support building DumpRenderTree for Direct2D 2018-11-07 19:50:49 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 191411 1 bfulgham bfulgham achristensen bfulgham don.olmstead fujii pvollan webkit-bug-importer oldest_to_newest 1473497 0 bfulgham 2018-10-30 16:47:02 -0700 Update WebKit's DumpRenderTree project files so that we can build and run layout tests. This initial implementation does not dump pixel data (we are a ways away from pixel-perfect comparisons), but we can begin identifying areas that need work. 1473499 1 webkit-bug-importer 2018-10-30 16:48:02 -0700 <rdar://problem/45685706> 1473504 2 353437 bfulgham 2018-10-30 16:53:23 -0700 Created attachment 353437 Patch 1473510 3 353437 don.olmstead 2018-10-30 16:58:50 -0700 Comment on attachment 353437 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=353437&action=review Minor nit pick on the cmake side other than that everything looks good Informal r+ > Tools/DumpRenderTree/PlatformWin.cmake:112 > + list(APPEND DumpRenderTreeLib_LIBRARIES You could move common libraries out of the if statement 1473520 4 353442 bfulgham 2018-10-30 17:07:43 -0700 Created attachment 353442 Patch 1473560 5 353442 achristensen 2018-10-30 18:43:41 -0700 Comment on attachment 353442 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=353442&action=review r=me > Tools/DumpRenderTree/win/PixelDumpSupportDirect2D.cpp:41 > +using namespace std; Please no. > Tools/DumpRenderTree/win/PixelDumpSupportDirect2D.h:31 > +#include <vector> let's not. > Tools/DumpRenderTree/win/PixelDumpSupportDirect2D.h:52 > + std::vector<unsigned char> m_data; Vector<uint8_t> Also, this isn't used. 1473577 6 bfulgham 2018-10-30 19:29:22 -0700 Committed r237616: <https://trac.webkit.org/changeset/237616> 1473585 7 fujii 2018-10-30 19:59:47 -0700 Windows port BuildBots seem to get broken by this change. https://build.webkit.org/builders/Apple%20Win%20Release%20%28Build%29/builds/12752 > C:\cygwin\home\buildbot\slave\win-release\build\Tools\DumpRenderTree\PixelDumpSupport.cpp(41): fatal error C1083: Cannot open include file: 'PixelDumpSupportCG.h': No such file or directory [C:\cygwin\home\buildbot\slave\win-release\build\WebKitBuild\Release\Tools\DumpRenderTree\DumpRenderTreeLib.vcxproj] https://build.webkit.org/builders/WinCairo%2064-bit%20WKL%20Release%20%28Build%29/builds/4331 > FAILED: Tools/DumpRenderTree/CMakeFiles/DumpRenderTreeLib.dir/win/PixelDumpSupportWin.cpp.obj > "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.14.26428\bin\Hostx64\x64\cl.exe" (...) -c ..\..\Tools\DumpRenderTree\win\PixelDumpSupportWin.cpp > ..\..\Tools\DumpRenderTree\win\PixelDumpSupportWin.cpp(114): error C2065: 'renderTarget': undeclared identifier > ..\..\Tools\DumpRenderTree\win\PixelDumpSupportWin.cpp(114): error C2228: left of '.get' must have class/struct/union > ..\..\Tools\DumpRenderTree\win\PixelDumpSupportWin.cpp(114): note: type is 'unknown-type' > ..\..\Tools\DumpRenderTree\win\PixelDumpSupportWin.cpp(114): error C2660: 'BitmapContext::createByAdoptingBitmapAndContext': function does not take 1 arguments > C:\WebKit-BuildWorker\wincairo-wkl-release\build\Tools\DumpRenderTree\cairo\PixelDumpSupportCairo.h(50): note: see declaration 1473588 8 bfulgham 2018-10-30 20:29:08 -0700 (In reply to Fujii Hironori from comment #7) > Windows port BuildBots seem to get broken by this change. > Oh, yes. I left the Direct2D flag on. I will land a fix ASAP. 1473589 9 bfulgham 2018-10-30 20:32:12 -0700 Committed build fix: Committed r237619: <https://trac.webkit.org/changeset/237619> 1473602 10 fujii 2018-10-30 21:51:06 -0700 Committed r237622: <https://trac.webkit.org/changeset/237622> 353437 2018-10-30 16:53:23 -0700 2018-10-30 17:07:42 -0700 Patch bug-191093-20181030165319.patch text/plain 5596 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzNzYwOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDE4LTEwLTMwICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5dW0RpcmVjdDJEXSBTdXBwb3J0IGJ1aWxkaW5nIER1bXBSZW5kZXJU cmVlIGZvciBEaXJlY3QyRAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTkxMDkzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NTY4NTcwNj4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIER1bXBSZW5kZXJU cmVlL1BpeGVsRHVtcFN1cHBvcnQuY3BwOiBVcGRhdGUgZm9yIERpcmVjdDJEIHVzZS4KKyAgICAg ICAgKiBEdW1wUmVuZGVyVHJlZS9QbGF0Zm9ybVdpbi5jbWFrZTogQWRkIHN1cHBvcnQgZm9yIERp cmVjdDJEIGJ1aWxkLgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3dpbi9QaXhlbER1bXBTdXBw b3J0V2luLmNwcDoKKyAgICAgICAgKGNyZWF0ZUJpdG1hcENvbnRleHRGcm9tV2ViVmlldyk6IFVw ZGF0ZSB0byBzdXBwb3J0IERpcmVjdDJELgorICAgICAgICAqIE1pbmlCcm93c2VyL3dpbi9NaW5p QnJvd3NlclJlcGxhY2UuaDogRHJpdmUtYnkgZml4OiBUaGUgb2xkIFdlYktpdAorICAgICAgICBs b2dvIGlzIG5vIGxvbmdlciBhdmFpbGFibGUgYXQgdGhpcyBsb2NhdGlvbi4gU3dpdGNoIHRvIHRo ZSBuZXcgbG9nby4KKwogMjAxOC0xMC0zMCAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxl LmNvbT4KIAogICAgICAgICBDbGVhbiB1cCBzb21lIG9ic29sZXRlIE1BWF9BTExPV0VEIG1hY3Jv cwpJbmRleDogVG9vbHMvRHVtcFJlbmRlclRyZWUvUGl4ZWxEdW1wU3VwcG9ydC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUvUGl4ZWxEdW1wU3VwcG9ydC5jcHAJKHJldmlz aW9uIDIzNzQzMykKKysrIFRvb2xzL0R1bXBSZW5kZXJUcmVlL1BpeGVsRHVtcFN1cHBvcnQuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC00MSw2ICs0MSw4IEBACiAjaW5jbHVkZSAiUGl4ZWxEdW1wU3Vw cG9ydENHLmgiCiAjZWxpZiBVU0UoQ0FJUk8pCiAjaW5jbHVkZSAiUGl4ZWxEdW1wU3VwcG9ydENh aXJvLmgiCisjZWxpZiBVU0UoRElSRUNUMkQpCisjaW5jbHVkZSAiUGl4ZWxEdW1wU3VwcG9ydERp cmVjdDJELmgiCiAjZW5kaWYKIAogdm9pZCBkdW1wV2ViVmlld0FzUGl4ZWxzQW5kQ29tcGFyZVdp dGhFeHBlY3RlZChjb25zdCBzdGQ6OnN0cmluZyYgZXhwZWN0ZWRIYXNoKQpJbmRleDogVG9vbHMv RHVtcFJlbmRlclRyZWUvUGxhdGZvcm1XaW4uY21ha2UKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvRHVt cFJlbmRlclRyZWUvUGxhdGZvcm1XaW4uY21ha2UJKHJldmlzaW9uIDIzNzQzMykKKysrIFRvb2xz L0R1bXBSZW5kZXJUcmVlL1BsYXRmb3JtV2luLmNtYWtlCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsNSBAQAorc2V0KFVTRV9ESVJFQ1QyRCAxKQorCiBzZXQoRHVtcFJlbmRlclRyZWVMaWJfU09V UkNFUwogICAgICR7RHVtcFJlbmRlclRyZWVfU09VUkNFU30KIApAQCAtOTEsMTcgKzkzLDI4IEBA IGlmICgke1dURl9QTEFURk9STV9XSU5fQ0FJUk99KQogICAgICAgICBjYWlyby9QaXhlbER1bXBT dXBwb3J0Q2Fpcm8uY3BwCiAgICAgKQogZWxzZSAoKQotICAgIGxpc3QoQVBQRU5EIER1bXBSZW5k ZXJUcmVlX0lOQ0xVREVfRElSRUNUT1JJRVMKLSAgICAgICAgY2cKLSAgICApCi0gICAgbGlzdChB UFBFTkQgRHVtcFJlbmRlclRyZWVMaWJfU09VUkNFUwotICAgICAgICBjZy9QaXhlbER1bXBTdXBw b3J0Q0cuY3BwCi0gICAgKQotICAgIGxpc3QoQVBQRU5EIER1bXBSZW5kZXJUcmVlTGliX0xJQlJB UklFUwotICAgICAgICBDRk5ldHdvcmsKLSAgICAgICAgQ29yZUdyYXBoaWNzCi0gICAgICAgIENv cmVUZXh0Ci0gICAgKQorICAgIGlmICgke1VTRV9ESVJFQ1QyRH0pCisgICAgICAgIGxpc3QoQVBQ RU5EIER1bXBSZW5kZXJUcmVlTGliX1NPVVJDRVMKKyAgICAgICAgICAgIHdpbi9QaXhlbER1bXBT dXBwb3J0RGlyZWN0MkQuY3BwCisgICAgICAgICkKKyAgICAgICAgbGlzdChBUFBFTkQgRHVtcFJl bmRlclRyZWVMaWJfTElCUkFSSUVTCisgICAgICAgICAgICBDRk5ldHdvcmsKKyAgICAgICAgICAg IENvcmVUZXh0CisgICAgICAgICAgICBEMmQxCisgICAgICAgICkKKyAgICBlbHNlICgpCisgICAg ICAgIGxpc3QoQVBQRU5EIER1bXBSZW5kZXJUcmVlX0lOQ0xVREVfRElSRUNUT1JJRVMKKyAgICAg ICAgICAgIGNnCisgICAgICAgICkKKyAgICAgICAgbGlzdChBUFBFTkQgRHVtcFJlbmRlclRyZWVM aWJfU09VUkNFUworICAgICAgICAgICAgY2cvUGl4ZWxEdW1wU3VwcG9ydENHLmNwcAorICAgICAg ICApCisgICAgICAgIGxpc3QoQVBQRU5EIER1bXBSZW5kZXJUcmVlTGliX0xJQlJBUklFUworICAg ICAgICAgICAgQ0ZOZXR3b3JrCisgICAgICAgICAgICBDb3JlR3JhcGhpY3MKKyAgICAgICAgICAg IENvcmVUZXh0CisgICAgICAgICkKKyAgICBlbmRpZiAoKQogZW5kaWYgKCkKIAogV0VCS0lUX0FE RF9QUkVDT01QSUxFRF9IRUFERVIoIkR1bXBSZW5kZXJUcmVlUHJlZml4LmgiICJ3aW4vRHVtcFJl bmRlclRyZWVQcmVmaXguY3BwIiBEdW1wUmVuZGVyVHJlZUxpYl9TT1VSQ0VTKQpJbmRleDogVG9v bHMvRHVtcFJlbmRlclRyZWUvd2luL1BpeGVsRHVtcFN1cHBvcnRXaW4uY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9QaXhlbER1bXBTdXBwb3J0V2luLmNwcAkocmV2 aXNpb24gMjM3NDMzKQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL1BpeGVsRHVtcFN1cHBv cnRXaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiw4IEBACiAjaW5jbHVkZSAiUGl4 ZWxEdW1wU3VwcG9ydENHLmgiCiAjZWxpZiBVU0UoQ0FJUk8pCiAjaW5jbHVkZSAiUGl4ZWxEdW1w U3VwcG9ydENhaXJvLmgiCisjZWxpZiBVU0UoRElSRUNUMkQpCisjaW5jbHVkZSAiUGl4ZWxEdW1w U3VwcG9ydERpcmVjdDJELmgiCiAjZW5kaWYKIAogI2luY2x1ZGUgIkR1bXBSZW5kZXJUcmVlLmgi CkBAIC05NCw4ICs5NiwyMCBAQCBSZWZQdHI8Qml0bWFwQ29udGV4dD4gY3JlYXRlQml0bWFwQ29u dGV4CiAgICAgY2Fpcm9fc3VyZmFjZV90KiBpbWFnZSA9IGNhaXJvX2ltYWdlX3N1cmZhY2VfY3Jl YXRlX2Zvcl9kYXRhKCh1bnNpZ25lZCBjaGFyKilpbmZvLmJtQml0cywgQ0FJUk9fRk9STUFUX0FS R0IzMiwgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBpbmZvLmJtV2lkdGgsIGluZm8uYm1IZWlnaHQsIGluZm8uYm1XaWR0aEJ5dGVzKTsgCiAg ICAgY2Fpcm9fdCogY29udGV4dCA9IGNhaXJvX2NyZWF0ZShpbWFnZSk7IAotICAgIGNhaXJvX3N1 cmZhY2VfZGVzdHJveShpbWFnZSk7IAorICAgIGNhaXJvX3N1cmZhY2VfZGVzdHJveShpbWFnZSk7 CisjZWxpZiBVU0UoRElSRUNUMkQpCisgICAgYXV0byB0YXJnZXRQcm9wZXJ0aWVzID0gRDJEMTo6 UmVuZGVyVGFyZ2V0UHJvcGVydGllcygpOworICAgIHRhcmdldFByb3BlcnRpZXMucGl4ZWxGb3Jt YXQgPSBEMkQxOjpQaXhlbEZvcm1hdChEWEdJX0ZPUk1BVF9COEc4UjhBOF9VTk9STSwgRDJEMV9B TFBIQV9NT0RFX0lHTk9SRSk7CisKKyAgICBDT01QdHI8SUQyRDFEQ1JlbmRlclRhcmdldD4gcmVu ZGVyVGFyZ2V0OworICAgIEhSRVNVTFQgaHIgPSBwaXhlbER1bXBTeXN0ZW1GYWN0b3J5KCktPkNy ZWF0ZURDUmVuZGVyVGFyZ2V0KCZ0YXJnZXRQcm9wZXJ0aWVzLCAmcmVuZGVyVGFyZ2V0KTsKKyAg ICBpZiAoIVNVQ0NFRURFRChocikpCisgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgaHIg PSByZW5kZXJUYXJnZXQtPkJpbmREQyhtZW1vcnlEQy5nZXQoKSwgJmZyYW1lKTsKKyAgICBpZiAo IVNVQ0NFRURFRChocikpCisgICAgICAgIHJldHVybiBudWxscHRyOwogI2VuZGlmIAogCi0gICBy ZXR1cm4gQml0bWFwQ29udGV4dDo6Y3JlYXRlQnlBZG9wdGluZ0JpdG1hcEFuZENvbnRleHQoYml0 bWFwLCBjb250ZXh0KTsKKyAgICByZXR1cm4gQml0bWFwQ29udGV4dDo6Y3JlYXRlQnlBZG9wdGlu Z0JpdG1hcEFuZENvbnRleHQoYml0bWFwLCByZW5kZXJUYXJnZXQuZ2V0KCkpOwogfQpJbmRleDog VG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyUmVwbGFjZS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL01pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3NlclJlcGxhY2UuaAkocmV2aXNpb24gMjM3 NDMzKQorKysgVG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyUmVwbGFjZS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0yNyw3ICsyNyw3IEBACiAKIC8vIFRoaXMgZmlsZSBpcyB0byBtYWtlIGl0 IGVhc2llciBmb3IgdXNlcnMgdG8gbWFuYWdlIGNoYW5nZXMgdG8gdGhlIGludGVybmFscyBvZiBN aW5pQnJvd3NlcgogCi1zdGF0aWMgY29uc3Qgd2NoYXJfdCogZGVmYXVsdEhUTUwgPSBMIjxwIHN0 eWxlPVwiYmFja2dyb3VuZC1jb2xvcjogIzAwRkYwMFwiPlRlc3Rpbmc8L3A+PGltZyBpZD1cIndl YmtpdCBsb2dvXCIgc3JjPVwiaHR0cDovL3dlYmtpdC5vcmcvaW1hZ2VzL2ljb24tZ29sZC5wbmdc IiBhbHQ9XCJGYWNlXCI+PGRpdiBzdHlsZT1cImJvcmRlcjogc29saWQgYmx1ZTsgYmFja2dyb3Vu ZDogd2hpdGU7XCIgY29udGVudGVkaXRhYmxlPVwidHJ1ZVwiPmRpdiB3aXRoIGJsdWUgYm9yZGVy PC9kaXY+PHVsPjxsaT5mb288bGk+YmFyPGxpPmJhejwvdWw+IjsKK3N0YXRpYyBjb25zdCB3Y2hh cl90KiBkZWZhdWx0SFRNTCA9IEwiPHAgc3R5bGU9XCJiYWNrZ3JvdW5kLWNvbG9yOiAjMDBGRjAw XCI+VGVzdGluZzwvcD48aW1nIGlkPVwid2Via2l0IGxvZ29cIiBzcmM9XCJodHRwczovL3dlYmtp dC5vcmcvd3AtY29udGVudC90aGVtZXMvd2Via2l0L2ltYWdlcy93ZWJraXQuc3ZnXCIgYWx0PVwi V2ViS2l0IExvZ29cIiBoZWlnaHQ9XCI1MFwiIHdpZHRoPVwiNTBcIj48ZGl2IHN0eWxlPVwiYm9y ZGVyOiBzb2xpZCBibHVlOyBiYWNrZ3JvdW5kOiB3aGl0ZTtcIiBjb250ZW50ZWRpdGFibGU9XCJ0 cnVlXCI+ZGl2IHdpdGggYmx1ZSBib3JkZXI8L2Rpdj48dWw+PGxpPmZvbzxsaT5iYXI8bGk+YmF6 PC91bD4iOwogCiBzdGF0aWMgdm9pZCBwcm9jZXNzQ3Jhc2hSZXBvcnQoY29uc3Qgd2NoYXJfdCog ZmlsZU5hbWUpIHsgOjpNZXNzYWdlQm94KDAsIGZpbGVOYW1lLCBMIkNyYXNoIFJlcG9ydCIsIE1C X09LKTsgfQogCg== 353442 2018-10-30 17:07:43 -0700 2018-10-30 18:43:41 -0700 Patch bug-191093-20181030170738.patch text/plain 12048 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzNzYwOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI4IEBACisyMDE4LTEwLTMwICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5dW0RpcmVjdDJEXSBTdXBwb3J0IGJ1aWxkaW5nIER1bXBSZW5kZXJU cmVlIGZvciBEaXJlY3QyRAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTkxMDkzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NTY4NTcwNj4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIER1bXBSZW5kZXJU cmVlL1BpeGVsRHVtcFN1cHBvcnQuY3BwOiBVcGRhdGUgZm9yIERpcmVjdDJEIHVzZS4KKyAgICAg ICAgKiBEdW1wUmVuZGVyVHJlZS9QbGF0Zm9ybVdpbi5jbWFrZTogQWRkIHN1cHBvcnQgZm9yIERp cmVjdDJEIGJ1aWxkLgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3dpbi9QaXhlbER1bXBTdXBw b3J0RGlyZWN0MkQuY3BwOiBBZGRlZC4KKyAgICAgICAgKHBpeGVsRHVtcFN5c3RlbUZhY3Rvcnkp OiBBZGRlZC4KKyAgICAgICAgKHByaW50UE5HKTogQ3JlYXRlIHN0dWIuCisgICAgICAgIChjb21w dXRlTUQ1SGFzaFN0cmluZ0ZvckJpdG1hcENvbnRleHQpOiBEaXR0by4KKyAgICAgICAgKGR1bXBC aXRtYXApOiBEaXR0by4KKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS93aW4vUGl4ZWxEdW1wU3Vw cG9ydERpcmVjdDJELmg6IEFkZGVkLgorICAgICAgICAoQml0bWFwQ29udGV4dDo6Y3JlYXRlQnlB ZG9wdGluZ0JpdG1hcEFuZENvbnRleHQpOgorICAgICAgICAoQml0bWFwQ29udGV4dDo6fkJpdG1h cENvbnRleHQpOgorICAgICAgICAoQml0bWFwQ29udGV4dDo6cGxhdGZvcm1Db250ZXh0IGNvbnN0 KToKKyAgICAgICAgKEJpdG1hcENvbnRleHQ6OkJpdG1hcENvbnRleHQpOgorICAgICAgICAqIER1 bXBSZW5kZXJUcmVlL3dpbi9QaXhlbER1bXBTdXBwb3J0V2luLmNwcDoKKyAgICAgICAgKGNyZWF0 ZUJpdG1hcENvbnRleHRGcm9tV2ViVmlldyk6IFVwZGF0ZSB0byBzdXBwb3J0IERpcmVjdDJELgor ICAgICAgICAqIE1pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3NlclJlcGxhY2UuaDogRHJpdmUtYnkg Zml4OiBUaGUgb2xkIFdlYktpdAorICAgICAgICBsb2dvIGlzIG5vIGxvbmdlciBhdmFpbGFibGUg YXQgdGhpcyBsb2NhdGlvbi4gU3dpdGNoIHRvIHRoZSBuZXcgbG9nby4KKwogMjAxOC0xMC0zMCAg QWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBDbGVhbiB1cCBz b21lIG9ic29sZXRlIE1BWF9BTExPV0VEIG1hY3JvcwpJbmRleDogVG9vbHMvRHVtcFJlbmRlclRy ZWUvUGl4ZWxEdW1wU3VwcG9ydC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvRHVtcFJlbmRlclRy ZWUvUGl4ZWxEdW1wU3VwcG9ydC5jcHAJKHJldmlzaW9uIDIzNzQzMykKKysrIFRvb2xzL0R1bXBS ZW5kZXJUcmVlL1BpeGVsRHVtcFN1cHBvcnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MSw2ICs0 MSw4IEBACiAjaW5jbHVkZSAiUGl4ZWxEdW1wU3VwcG9ydENHLmgiCiAjZWxpZiBVU0UoQ0FJUk8p CiAjaW5jbHVkZSAiUGl4ZWxEdW1wU3VwcG9ydENhaXJvLmgiCisjZWxpZiBVU0UoRElSRUNUMkQp CisjaW5jbHVkZSAiUGl4ZWxEdW1wU3VwcG9ydERpcmVjdDJELmgiCiAjZW5kaWYKIAogdm9pZCBk dW1wV2ViVmlld0FzUGl4ZWxzQW5kQ29tcGFyZVdpdGhFeHBlY3RlZChjb25zdCBzdGQ6OnN0cmlu ZyYgZXhwZWN0ZWRIYXNoKQpJbmRleDogVG9vbHMvRHVtcFJlbmRlclRyZWUvUGxhdGZvcm1XaW4u Y21ha2UKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUvUGxhdGZvcm1XaW4uY21h a2UJKHJldmlzaW9uIDIzNzQzMykKKysrIFRvb2xzL0R1bXBSZW5kZXJUcmVlL1BsYXRmb3JtV2lu LmNtYWtlCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNSBAQAorc2V0KFVTRV9ESVJFQ1QyRCAx KQorCiBzZXQoRHVtcFJlbmRlclRyZWVMaWJfU09VUkNFUwogICAgICR7RHVtcFJlbmRlclRyZWVf U09VUkNFU30KIApAQCAtOTEsMTcgKzkzLDI4IEBAIGlmICgke1dURl9QTEFURk9STV9XSU5fQ0FJ Uk99KQogICAgICAgICBjYWlyby9QaXhlbER1bXBTdXBwb3J0Q2Fpcm8uY3BwCiAgICAgKQogZWxz ZSAoKQotICAgIGxpc3QoQVBQRU5EIER1bXBSZW5kZXJUcmVlX0lOQ0xVREVfRElSRUNUT1JJRVMK LSAgICAgICAgY2cKLSAgICApCi0gICAgbGlzdChBUFBFTkQgRHVtcFJlbmRlclRyZWVMaWJfU09V UkNFUwotICAgICAgICBjZy9QaXhlbER1bXBTdXBwb3J0Q0cuY3BwCi0gICAgKQogICAgIGxpc3Qo QVBQRU5EIER1bXBSZW5kZXJUcmVlTGliX0xJQlJBUklFUwogICAgICAgICBDRk5ldHdvcmsKLSAg ICAgICAgQ29yZUdyYXBoaWNzCiAgICAgICAgIENvcmVUZXh0CiAgICAgKQorICAgIGlmICgke1VT RV9ESVJFQ1QyRH0pCisgICAgICAgIGxpc3QoQVBQRU5EIER1bXBSZW5kZXJUcmVlTGliX1NPVVJD RVMKKyAgICAgICAgICAgIHdpbi9QaXhlbER1bXBTdXBwb3J0RGlyZWN0MkQuY3BwCisgICAgICAg ICkKKyAgICAgICAgbGlzdChBUFBFTkQgRHVtcFJlbmRlclRyZWVMaWJfTElCUkFSSUVTCisgICAg ICAgICAgICBEMmQxCisgICAgICAgICkKKyAgICBlbHNlICgpCisgICAgICAgIGxpc3QoQVBQRU5E IER1bXBSZW5kZXJUcmVlX0lOQ0xVREVfRElSRUNUT1JJRVMKKyAgICAgICAgICAgIGNnCisgICAg ICAgICkKKyAgICAgICAgbGlzdChBUFBFTkQgRHVtcFJlbmRlclRyZWVMaWJfU09VUkNFUworICAg ICAgICAgICAgY2cvUGl4ZWxEdW1wU3VwcG9ydENHLmNwcAorICAgICAgICApCisgICAgICAgIGxp c3QoQVBQRU5EIER1bXBSZW5kZXJUcmVlTGliX0xJQlJBUklFUworICAgICAgICAgICAgQ29yZUdy YXBoaWNzCisgICAgICAgICkKKyAgICBlbmRpZiAoKQogZW5kaWYgKCkKIAogV0VCS0lUX0FERF9Q UkVDT01QSUxFRF9IRUFERVIoIkR1bXBSZW5kZXJUcmVlUHJlZml4LmgiICJ3aW4vRHVtcFJlbmRl clRyZWVQcmVmaXguY3BwIiBEdW1wUmVuZGVyVHJlZUxpYl9TT1VSQ0VTKQpJbmRleDogVG9vbHMv RHVtcFJlbmRlclRyZWUvd2luL1BpeGVsRHVtcFN1cHBvcnREaXJlY3QyRC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL1BpeGVsRHVtcFN1cHBvcnREaXJlY3QyRC5j cHAJKG5vbmV4aXN0ZW50KQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL1BpeGVsRHVtcFN1 cHBvcnREaXJlY3QyRC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw4NCBAQAorLyoKKyog Q29weXJpZ2h0IChDKSAyMDE4IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyoKKyog UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv ciB3aXRob3V0CisqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucworKiBhcmUgbWV0OgorKiAxLiBSZWRpc3RyaWJ1dGlvbnMg b2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorKiAgICBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIu CisqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUg YWJvdmUgY29weXJpZ2h0CisqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyogICAgZG9jdW1lbnRhdGlvbiBhbmQv b3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyoKKyog VEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIGBgQVMgSVMnJyBBTkQgQU5Z CisqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElN SVRFRCBUTywgVEhFCisqIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5E IEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiAgSU4g Tk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUgorKiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZP UiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKKyogRVhFTVBMQVJZ LCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRP LAorKiBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9G IFVTRSwgREFUQSwgT1IKKyogUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dF VkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWQorKiBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4g Q09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyogKElOQ0xVRElORyBORUdMSUdF TkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisqIE9G IFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VD SCBEQU1BR0UuCisqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiUGl4ZWxEdW1w U3VwcG9ydERpcmVjdDJELmgiCisKKyNpbmNsdWRlICJEdW1wUmVuZGVyVHJlZS5oIgorI2luY2x1 ZGUgIk1ENS5oIgorI2luY2x1ZGUgIlBpeGVsRHVtcFN1cHBvcnQuaCIKKyNpbmNsdWRlIDxhbGdv cml0aG0+CisjaW5jbHVkZSA8Y3R5cGUuaD4KKyNpbmNsdWRlIDxkMmQxLmg+CisjaW5jbHVkZSA8 d3RmL0Fzc2VydGlvbnMuaD4KKyNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+CisjaW5jbHVkZSA8d3Rm L1JldGFpblB0ci5oPgorI2luY2x1ZGUgPHd0Zi9TdHJpbmdFeHRyYXMuaD4KKworCit1c2luZyBu YW1lc3BhY2Ugc3RkOworCitzdGF0aWMgY29uc3QgQ0ZTdHJpbmdSZWYga1VUVHlwZVBORyA9IENG U1RSKCJwdWJsaWMucG5nIik7CisKK0lEMkQxRmFjdG9yeSogcGl4ZWxEdW1wU3lzdGVtRmFjdG9y eSgpCit7CisgICAgc3RhdGljIElEMkQxRmFjdG9yeSogZGlyZWN0MkRGYWN0b3J5ID0gbnVsbHB0 cjsKKyAgICBpZiAoIWRpcmVjdDJERmFjdG9yeSkgeworI2lmbmRlZiBOREVCVUcKKyAgICAgICAg RDJEMV9GQUNUT1JZX09QVElPTlMgb3B0aW9ucyA9IHsgfTsKKyAgICAgICAgb3B0aW9ucy5kZWJ1 Z0xldmVsID0gRDJEMV9ERUJVR19MRVZFTF9JTkZPUk1BVElPTjsKKyAgICAgICAgSFJFU1VMVCBo ciA9IEQyRDFDcmVhdGVGYWN0b3J5KEQyRDFfRkFDVE9SWV9UWVBFX01VTFRJX1RIUkVBREVELCBv cHRpb25zLCAmZGlyZWN0MkRGYWN0b3J5KTsKKyNlbHNlCisgICAgICAgIEhSRVNVTFQgaHIgPSBE MkQxQ3JlYXRlRmFjdG9yeShEMkQxX0ZBQ1RPUllfVFlQRV9NVUxUSV9USFJFQURFRCwgJmRpcmVj dDJERmFjdG9yeSk7CisjZW5kaWYKKyAgICAgICAgUkVMRUFTRV9BU1NFUlQoU1VDQ0VFREVEKGhy KSk7CisgICAgfQorCisgICAgcmV0dXJuIGRpcmVjdDJERmFjdG9yeTsKK30KKworc3RhdGljIHZv aWQgcHJpbnRQTkcoSUQyRDFCaXRtYXAqIGltYWdlLCBjb25zdCBjaGFyKiBjaGVja3N1bSkKK3sK KyAgICBVTlVTRURfUEFSQU0oaW1hZ2UpOworICAgIFVOVVNFRF9QQVJBTShjaGVja3N1bSk7Cisg ICAgLy8gTm90IGltcGxlbWVudGVkLgorfQorCit2b2lkIGNvbXB1dGVNRDVIYXNoU3RyaW5nRm9y Qml0bWFwQ29udGV4dChCaXRtYXBDb250ZXh0KiBjb250ZXh0LCBjaGFyIGhhc2hTdHJpbmdbMzNd KQoreworICAgIFVOVVNFRF9QQVJBTShjb250ZXh0KTsKKyAgICBVTlVTRURfUEFSQU0oaGFzaFN0 cmluZyk7CisgICAgLy8gTm90IGltcGxlbWVudGVkLgorfQorCit2b2lkIGR1bXBCaXRtYXAoQml0 bWFwQ29udGV4dCogY29udGV4dCwgY29uc3QgY2hhciogY2hlY2tzdW0pCit7CisgICAgX2NvbV9w dHJfdDxfY29tX0lJSUQ8SUQyRDFCaXRtYXAsICZfX3V1aWRvZihJRDJEMUJpdG1hcCk+PiBpbWFn ZTsKKyAgICBIUkVTVUxUIGhyID0gY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCktPkdldEJpdG1h cCgmaW1hZ2UpOworICAgIGlmICghU1VDQ0VFREVEKGhyKSkKKyAgICAgICAgcmV0dXJuOworCisg ICAgcHJpbnRQTkcoaW1hZ2UuR2V0SW50ZXJmYWNlUHRyKCksIGNoZWNrc3VtKTsKK30KSW5kZXg6 IFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9QaXhlbER1bXBTdXBwb3J0RGlyZWN0MkQuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vUGl4ZWxEdW1wU3VwcG9ydERpcmVj dDJELmgJKG5vbmV4aXN0ZW50KQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL1BpeGVsRHVt cFN1cHBvcnREaXJlY3QyRC5oCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsNjcgQEAKKy8qCisq IENvcHlyaWdodCAoQykgMjAxOCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisqCisq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAorKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0 aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyogYXJlIG1ldDoKKyogMS4gUmVkaXN0cmlidXRpb25z IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyogICAgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy LgorKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhl IGFib3ZlIGNvcHlyaWdodAorKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisqICAgIGRvY3VtZW50YXRpb24gYW5k L29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisqCisq IFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBgYEFTIElTJycgQU5EIEFO WQorKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJ TUlURUQgVE8sIFRIRQorKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFO RCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gIElO IE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IKKyogQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBG T1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsCisqIEVYRU1QTEFS WSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBU TywKKyogUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBP RiBVU0UsIERBVEEsIE9SCisqIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9X RVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKKyogT0YgTElBQklMSVRZLCBXSEVUSEVSIElO IENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisqIChJTkNMVURJTkcgTkVHTElH RU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorKiBP RiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNV Q0ggREFNQUdFLgorKi8KKworCisjcHJhZ21hIG9uY2UKKworI2luY2x1ZGUgPGNvbWlwLmg+Cisj aW5jbHVkZSA8ZDJkMS5oPgorI2luY2x1ZGUgPHZlY3Rvcj4KKyNpbmNsdWRlIDx3dGYvUmVmQ291 bnRlZC5oPgorI2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4KKwordHlwZWRlZiBIQklUTUFQIFBs YXRmb3JtQml0bWFwQnVmZmVyOworCitjbGFzcyBCaXRtYXBDb250ZXh0IDogcHVibGljIFJlZkNv dW50ZWQ8Qml0bWFwQ29udGV4dD4geworcHVibGljOgorICAgIHN0YXRpYyBSZWY8Qml0bWFwQ29u dGV4dD4gY3JlYXRlQnlBZG9wdGluZ0JpdG1hcEFuZENvbnRleHQoUGxhdGZvcm1CaXRtYXBCdWZm ZXIgYnVmZmVyLCBJRDJEMVJlbmRlclRhcmdldCogY29udGV4dCkKKyAgICB7CisgICAgICAgIHJl dHVybiBhZG9wdFJlZigqbmV3IEJpdG1hcENvbnRleHQoYnVmZmVyLCBjb250ZXh0KSk7CisgICAg fQorCisgICAgfkJpdG1hcENvbnRleHQoKQorICAgIHsKKyAgICAgICAgaWYgKG1fYnVmZmVyKQor ICAgICAgICAgICAgRGVsZXRlT2JqZWN0KG1fYnVmZmVyKTsKKyAgICB9CisKKyAgICBJRDJEMUJp dG1hcFJlbmRlclRhcmdldCogcGxhdGZvcm1Db250ZXh0KCkgY29uc3QgeyByZXR1cm4gbV9jb250 ZXh0LkdldEludGVyZmFjZVB0cigpOyB9CisKKyAgICBzdGQ6OnZlY3Rvcjx1bnNpZ25lZCBjaGFy PiBtX2RhdGE7CisKK3ByaXZhdGU6CisgICAgQml0bWFwQ29udGV4dChQbGF0Zm9ybUJpdG1hcEJ1 ZmZlciBidWZmZXIsIElEMkQxUmVuZGVyVGFyZ2V0KiBjb250ZXh0KQorICAgICAgICA6IG1fYnVm ZmVyKGJ1ZmZlcikKKyAgICAgICAgLCBtX2NvbnRleHQoY29udGV4dCkKKyAgICB7CisgICAgfQor CisgICAgUGxhdGZvcm1CaXRtYXBCdWZmZXIgbV9idWZmZXI7CisgICAgX2NvbV9wdHJfdDxfY29t X0lJSUQ8SUQyRDFCaXRtYXAsICZfX3V1aWRvZihJRDJEMUJpdG1hcCk+PiBtX2JpdG1hcDsKKyAg ICBfY29tX3B0cl90PF9jb21fSUlJRDxJRDJEMUJpdG1hcFJlbmRlclRhcmdldCwgJl9fdXVpZG9m KElEMkQxQml0bWFwUmVuZGVyVGFyZ2V0KT4+IG1fY29udGV4dDsKK307CisKK1JlZlB0cjxCaXRt YXBDb250ZXh0PiBjcmVhdGVCaXRtYXBDb250ZXh0RnJvbVdlYlZpZXcoYm9vbCBvbnNjcmVlbiwg Ym9vbCBpbmNyZW1lbnRhbFJlcGFpbnQsIGJvb2wgc3dlZXBIb3Jpem9udGFsbHksIGJvb2wgZHJh d1NlbGVjdGlvblJlY3QpOworSUQyRDFGYWN0b3J5KiBwaXhlbER1bXBTeXN0ZW1GYWN0b3J5KCk7 CkluZGV4OiBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vUGl4ZWxEdW1wU3VwcG9ydFdpbi5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL1BpeGVsRHVtcFN1cHBvcnRX aW4uY3BwCShyZXZpc2lvbiAyMzc0MzMpCisrKyBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vUGl4 ZWxEdW1wU3VwcG9ydFdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMyLDYgKzMyLDggQEAKICNp bmNsdWRlICJQaXhlbER1bXBTdXBwb3J0Q0cuaCIKICNlbGlmIFVTRShDQUlSTykKICNpbmNsdWRl ICJQaXhlbER1bXBTdXBwb3J0Q2Fpcm8uaCIKKyNlbGlmIFVTRShESVJFQ1QyRCkKKyNpbmNsdWRl ICJQaXhlbER1bXBTdXBwb3J0RGlyZWN0MkQuaCIKICNlbmRpZgogCiAjaW5jbHVkZSAiRHVtcFJl bmRlclRyZWUuaCIKQEAgLTk0LDggKzk2LDIwIEBAIFJlZlB0cjxCaXRtYXBDb250ZXh0PiBjcmVh dGVCaXRtYXBDb250ZXgKICAgICBjYWlyb19zdXJmYWNlX3QqIGltYWdlID0gY2Fpcm9faW1hZ2Vf c3VyZmFjZV9jcmVhdGVfZm9yX2RhdGEoKHVuc2lnbmVkIGNoYXIqKWluZm8uYm1CaXRzLCBDQUlS T19GT1JNQVRfQVJHQjMyLCAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGluZm8uYm1XaWR0aCwgaW5mby5ibUhlaWdodCwgaW5mby5ibVdpZHRo Qnl0ZXMpOyAKICAgICBjYWlyb190KiBjb250ZXh0ID0gY2Fpcm9fY3JlYXRlKGltYWdlKTsgCi0g ICAgY2Fpcm9fc3VyZmFjZV9kZXN0cm95KGltYWdlKTsgCisgICAgY2Fpcm9fc3VyZmFjZV9kZXN0 cm95KGltYWdlKTsKKyNlbGlmIFVTRShESVJFQ1QyRCkKKyAgICBhdXRvIHRhcmdldFByb3BlcnRp ZXMgPSBEMkQxOjpSZW5kZXJUYXJnZXRQcm9wZXJ0aWVzKCk7CisgICAgdGFyZ2V0UHJvcGVydGll cy5waXhlbEZvcm1hdCA9IEQyRDE6OlBpeGVsRm9ybWF0KERYR0lfRk9STUFUX0I4RzhSOEE4X1VO T1JNLCBEMkQxX0FMUEhBX01PREVfSUdOT1JFKTsKKworICAgIENPTVB0cjxJRDJEMURDUmVuZGVy VGFyZ2V0PiByZW5kZXJUYXJnZXQ7CisgICAgSFJFU1VMVCBociA9IHBpeGVsRHVtcFN5c3RlbUZh Y3RvcnkoKS0+Q3JlYXRlRENSZW5kZXJUYXJnZXQoJnRhcmdldFByb3BlcnRpZXMsICZyZW5kZXJU YXJnZXQpOworICAgIGlmICghU1VDQ0VFREVEKGhyKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7 CisKKyAgICBociA9IHJlbmRlclRhcmdldC0+QmluZERDKG1lbW9yeURDLmdldCgpLCAmZnJhbWUp OworICAgIGlmICghU1VDQ0VFREVEKGhyKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAjZW5k aWYgCiAKLSAgIHJldHVybiBCaXRtYXBDb250ZXh0OjpjcmVhdGVCeUFkb3B0aW5nQml0bWFwQW5k Q29udGV4dChiaXRtYXAsIGNvbnRleHQpOworICAgIHJldHVybiBCaXRtYXBDb250ZXh0OjpjcmVh dGVCeUFkb3B0aW5nQml0bWFwQW5kQ29udGV4dChiaXRtYXAsIHJlbmRlclRhcmdldC5nZXQoKSk7 CiB9CkluZGV4OiBUb29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJSZXBsYWNlLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyUmVwbGFjZS5oCShy ZXZpc2lvbiAyMzc0MzMpCisrKyBUb29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJSZXBs YWNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI3LDcgKzI3LDcgQEAKIAogLy8gVGhpcyBmaWxlIGlz IHRvIG1ha2UgaXQgZWFzaWVyIGZvciB1c2VycyB0byBtYW5hZ2UgY2hhbmdlcyB0byB0aGUgaW50 ZXJuYWxzIG9mIE1pbmlCcm93c2VyCiAKLXN0YXRpYyBjb25zdCB3Y2hhcl90KiBkZWZhdWx0SFRN TCA9IEwiPHAgc3R5bGU9XCJiYWNrZ3JvdW5kLWNvbG9yOiAjMDBGRjAwXCI+VGVzdGluZzwvcD48 aW1nIGlkPVwid2Via2l0IGxvZ29cIiBzcmM9XCJodHRwOi8vd2Via2l0Lm9yZy9pbWFnZXMvaWNv bi1nb2xkLnBuZ1wiIGFsdD1cIkZhY2VcIj48ZGl2IHN0eWxlPVwiYm9yZGVyOiBzb2xpZCBibHVl OyBiYWNrZ3JvdW5kOiB3aGl0ZTtcIiBjb250ZW50ZWRpdGFibGU9XCJ0cnVlXCI+ZGl2IHdpdGgg Ymx1ZSBib3JkZXI8L2Rpdj48dWw+PGxpPmZvbzxsaT5iYXI8bGk+YmF6PC91bD4iOworc3RhdGlj IGNvbnN0IHdjaGFyX3QqIGRlZmF1bHRIVE1MID0gTCI8cCBzdHlsZT1cImJhY2tncm91bmQtY29s b3I6ICMwMEZGMDBcIj5UZXN0aW5nPC9wPjxpbWcgaWQ9XCJ3ZWJraXQgbG9nb1wiIHNyYz1cImh0 dHBzOi8vd2Via2l0Lm9yZy93cC1jb250ZW50L3RoZW1lcy93ZWJraXQvaW1hZ2VzL3dlYmtpdC5z dmdcIiBhbHQ9XCJXZWJLaXQgTG9nb1wiIGhlaWdodD1cIjUwXCIgd2lkdGg9XCI1MFwiPjxkaXYg c3R5bGU9XCJib3JkZXI6IHNvbGlkIGJsdWU7IGJhY2tncm91bmQ6IHdoaXRlO1wiIGNvbnRlbnRl ZGl0YWJsZT1cInRydWVcIj5kaXYgd2l0aCBibHVlIGJvcmRlcjwvZGl2Pjx1bD48bGk+Zm9vPGxp PmJhcjxsaT5iYXo8L3VsPiI7CiAKIHN0YXRpYyB2b2lkIHByb2Nlc3NDcmFzaFJlcG9ydChjb25z dCB3Y2hhcl90KiBmaWxlTmFtZSkgeyA6Ok1lc3NhZ2VCb3goMCwgZmlsZU5hbWUsIEwiQ3Jhc2gg UmVwb3J0IiwgTUJfT0spOyB9CiAK