192688 2018-12-13 18:58:41 -0800 [WinCairo][Clang] DLLLauncherMain.cpp: warning: unused function 'prependPath' and 'appleApplicationSupportDirectory' 2018-12-13 23:56:02 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 171618 1 fujii fujii achristensen bfulgham don.olmstead ews-watchlist keith_miller mark.lam msaboff pvollan ross.kirsling saam webkit-bug-importer oldest_to_newest 1487806 0 fujii 2018-12-13 18:58:41 -0800 clang-cl reports the following warnings: > [1514/6308] Building CXX object Source\JavaScriptCore\shell\CMakeFiles\testRegExp.dir\DLLLauncherMain.cpp.obj > ..\..\Source\JavaScriptCore\shell\DLLLauncherMain.cpp(83,21): warning: unused function 'appleApplicationSupportDirectory' [-Wunused-function] > static std::wstring appleApplicationSupportDirectory() > ^ > ..\..\Source\JavaScriptCore\shell\DLLLauncherMain.cpp(99,13): warning: unused function 'prependPath' [-Wunused-function] > static bool prependPath(const std::wstring& directoryToPrepend) > ^ > 2 warnings generated. > [4750/6308] Building CXX object Tools\ImageDiff\CMakeFiles\ImageDiff.dir\__\win\DLLLauncher\DLLLauncherMain.cpp.obj > ..\..\Tools\win\DLLLauncher\DLLLauncherMain.cpp(82,16): warning: unused function 'appleApplicationSupportDirectory' [-Wunused-function] > static wstring appleApplicationSupportDirectory() > ^ > ..\..\Tools\win\DLLLauncher\DLLLauncherMain.cpp(98,13): warning: unused function 'prependPath' [-Wunused-function] > static bool prependPath(const wstring& directoryToPrepend) > ^ > 2 warnings generated. 1487824 1 357291 fujii 2018-12-13 20:05:06 -0800 Created attachment 357291 Patch 1487843 2 357291 ross.kirsling 2018-12-13 21:08:58 -0800 Comment on attachment 357291 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=357291&action=review > Source/JavaScriptCore/shell/DLLLauncherMain.cpp:102 > +#if !defined(WIN_CAIRO) > static bool prependPath(const std::wstring& directoryToPrepend) Might be nice to rearrange so that we don't need to add two #if blocks, but it's your call. 1487852 3 357301 fujii 2018-12-13 21:53:13 -0800 Created attachment 357301 Patch for landing 1487864 4 357301 fujii 2018-12-13 23:55:56 -0800 Comment on attachment 357301 Patch for landing Clearing flags on attachment: 357301 Committed r239200: <https://trac.webkit.org/changeset/239200> 1487865 5 fujii 2018-12-13 23:55:59 -0800 All reviewed patches have been landed. Closing bug. 357291 2018-12-13 20:05:06 -0800 2018-12-13 21:52:38 -0800 Patch bug-192688-20181214130505.patch text/plain 4613 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5MTkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm ZDEyMDRmYzllMmY2N2YwYzZmYzhlYzEyMTkxM2NmYmVkNjg1M2M2Li45YjA3Mzc5M2VmY2I1ZTJm MGFjZTk5OGIyNTI3MDI0OGUyNGU0MTRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxOC0xMi0xMyAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBz b255LmNvbT4KKworICAgICAgICBbV2luQ2Fpcm9dW0NsYW5nXSBETExMYXVuY2hlck1haW4uY3Bw OiB3YXJuaW5nOiB1bnVzZWQgZnVuY3Rpb24gJ3ByZXBlbmRQYXRoJyBhbmQgJ2FwcGxlQXBwbGlj YXRpb25TdXBwb3J0RGlyZWN0b3J5JworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTkyNjg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhlc2UgZnVuY3Rpb25zIGFyZSB1c2VkIG9ubHkgaW4gQXBwbGVXaW4g cG9ydC4KKworICAgICAgICAqIHNoZWxsL0RMTExhdW5jaGVyTWFpbi5jcHA6CisgICAgICAgIChn ZXRTdHJpbmdWYWx1ZSk6IEVuY2xvc2VkIHdpdGggI2lmICFkZWZpbmVkKFdJTl9DQUlSTykuCisg ICAgICAgIChhcHBsZVBhdGhGcm9tUmVnaXN0cnkpOiBEaXR0by4KKyAgICAgICAgKGFwcGxlQXBw bGljYXRpb25TdXBwb3J0RGlyZWN0b3J5KTogRGl0dG8uCisgICAgICAgIChwcmVwZW5kUGF0aCk6 IERpdHRvLgorCiAyMDE4LTEyLTEzICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAog ICAgICAgICBFbnN1cmUgdGhhdCBTdHJ1Y3R1cmVGbGFncyBpbml0aWFsaXphdGlvbiBhbHdheXMg c3RhcnRzIHdpdGggQmFzZTo6U3RydWN0dXJlRmxhZ3MuCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvc2hlbGwvRExMTGF1bmNoZXJNYWluLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9zaGVsbC9ETExMYXVuY2hlck1haW4uY3BwCmluZGV4IDMzNjMzYzMxMTAwNzBkNTE2Y2U1 NDJlY2Y1Y2JhNWIxOTRhZDkyNTcuLjE5NThkOTJmMjFmZjgwZWFmZmQ5NjNkMTQ2ZmJlNDJlZjRi NDEyOTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9zaGVsbC9ETExMYXVuY2hl ck1haW4uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9zaGVsbC9ETExMYXVuY2hlck1h aW4uY3BwCkBAIC01Niw2ICs1Niw3IEBAIHN0YXRpYyB2b2lkIGVuYWJsZVRlcm1pbmF0aW9uT25I ZWFwQ29ycnVwdGlvbigpCiAgICAgSGVhcFNldEluZm9ybWF0aW9uKDAsIGhlYXBFbmFibGVUZXJt aW5hdGlvbk9uQ29ycnVwdGlvbiwgMCwgMCk7CiB9CiAKKyNpZiAhZGVmaW5lZChXSU5fQ0FJUk8p CiBzdGF0aWMgc3RkOjp3c3RyaW5nIGdldFN0cmluZ1ZhbHVlKEhLRVkga2V5LCBjb25zdCBzdGQ6 OndzdHJpbmcmIHZhbHVlTmFtZSkKIHsKICAgICBEV09SRCB0eXBlID0gMDsKQEAgLTg0LDYgKzg1 LDcgQEAgc3RhdGljIHN0ZDo6d3N0cmluZyBhcHBsZUFwcGxpY2F0aW9uU3VwcG9ydERpcmVjdG9y eSgpCiB7CiAgICAgcmV0dXJuIGFwcGxlUGF0aEZyb21SZWdpc3RyeShMIlNPRlRXQVJFXFxBcHBs ZSBJbmMuXFxBcHBsZSBBcHBsaWNhdGlvbiBTdXBwb3J0IiwgTCJJbnN0YWxsRGlyIik7CiB9Cisj ZW5kaWYKIAogc3RhdGljIHN0ZDo6d3N0cmluZyBjb3B5RW52aXJvbm1lbnRWYXJpYWJsZShjb25z dCBzdGQ6OndzdHJpbmcmIHZhcmlhYmxlKQogewpAQCAtOTYsNiArOTgsNyBAQCBzdGF0aWMgc3Rk Ojp3c3RyaW5nIGNvcHlFbnZpcm9ubWVudFZhcmlhYmxlKGNvbnN0IHN0ZDo6d3N0cmluZyYgdmFy aWFibGUpCiAgICAgcmV0dXJuICZidWZmZXJbMF07CiB9CiAKKyNpZiAhZGVmaW5lZChXSU5fQ0FJ Uk8pCiBzdGF0aWMgYm9vbCBwcmVwZW5kUGF0aChjb25zdCBzdGQ6OndzdHJpbmcmIGRpcmVjdG9y eVRvUHJlcGVuZCkKIHsKICAgICBzdGQ6OndzdHJpbmcgcGF0aFZhcmlhYmxlID0gTCJQQVRIIjsK QEAgLTEwMyw2ICsxMDYsNyBAQCBzdGF0aWMgYm9vbCBwcmVwZW5kUGF0aChjb25zdCBzdGQ6Ondz dHJpbmcmIGRpcmVjdG9yeVRvUHJlcGVuZCkKICAgICBzdGQ6OndzdHJpbmcgbmV3UGF0aCA9IGRp cmVjdG9yeVRvUHJlcGVuZCArIEwnOycgKyBvbGRQYXRoOwogICAgIHJldHVybiA6OlNldEVudmly b25tZW50VmFyaWFibGVXKHBhdGhWYXJpYWJsZS5jX3N0cigpLCBuZXdQYXRoLmNfc3RyKCkpOwog fQorI2VuZGlmCiAKIHN0YXRpYyBpbnQgZmF0YWxFcnJvcihjb25zdCBzdGQ6OndzdHJpbmcmIHBy b2dyYW1OYW1lLCBjb25zdCBzdGQ6OndzdHJpbmcmIG1lc3NhZ2UpCiB7CmRpZmYgLS1naXQgYS9U b29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTA3OGVhMTVlNTcxODg2OTVm ODVlYjQ0NmY0OGM3OWMxYWRmZGEwOS4uN2QzODQyMzE5YjQyYmNkZTE0OTdkNDFhM2EzMjcyNDUx YjI0NjVkYiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE2IEBACisyMDE4LTEyLTEzICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3Jp LkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5DYWlyb11bQ2xhbmddIERMTExhdW5jaGVy TWFpbi5jcHA6IHdhcm5pbmc6IHVudXNlZCBmdW5jdGlvbiAncHJlcGVuZFBhdGgnIGFuZCAnYXBw bGVBcHBsaWNhdGlvblN1cHBvcnREaXJlY3RvcnknCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTI2ODgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIHdpbi9ETExMYXVuY2hlci9ETExMYXVuY2hlck1haW4u Y3BwOgorICAgICAgICAoZ2V0U3RyaW5nVmFsdWUpOiBFbmNsb3NlZCB3aXRoICNpZiAhZGVmaW5l ZChXSU5fQ0FJUk8pLgorICAgICAgICAoYXBwbGVQYXRoRnJvbVJlZ2lzdHJ5KTogRGl0dG8uCisg ICAgICAgIChhcHBsZUFwcGxpY2F0aW9uU3VwcG9ydERpcmVjdG9yeSk6IERpdHRvLgorICAgICAg ICAocHJlcGVuZFBhdGgpOiBEaXR0by4KKwogMjAxOC0xMi0xMyAgRG9uIE9sbXN0ZWFkICA8ZG9u Lm9sbXN0ZWFkQHNvbnkuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIENoYW5nZWQgbXkgc3Rh dHVzIHRvIGEgcmV2aWV3ZXIuCmRpZmYgLS1naXQgYS9Ub29scy93aW4vRExMTGF1bmNoZXIvRExM TGF1bmNoZXJNYWluLmNwcCBiL1Rvb2xzL3dpbi9ETExMYXVuY2hlci9ETExMYXVuY2hlck1haW4u Y3BwCmluZGV4IDFkMjJkYWE0ZGUwNDA0M2NlY2UxM2YxNDAxNjY4MjUwYWJmYTc5MzIuLmZhNTVi YzRjYjcxYTJiMTUyM2M1ODg0N2Q4YzM5YWFmNjMzNmM3MzQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL3dp bi9ETExMYXVuY2hlci9ETExMYXVuY2hlck1haW4uY3BwCisrKyBiL1Rvb2xzL3dpbi9ETExMYXVu Y2hlci9ETExMYXVuY2hlck1haW4uY3BwCkBAIC01NSw2ICs1NSw3IEBAIHN0YXRpYyB2b2lkIGVu YWJsZVRlcm1pbmF0aW9uT25IZWFwQ29ycnVwdGlvbigpCiAgICAgSGVhcFNldEluZm9ybWF0aW9u KDAsIGhlYXBFbmFibGVUZXJtaW5hdGlvbk9uQ29ycnVwdGlvbiwgMCwgMCk7CiB9CiAKKyNpZiAh ZGVmaW5lZChXSU5fQ0FJUk8pCiBzdGF0aWMgd3N0cmluZyBnZXRTdHJpbmdWYWx1ZShIS0VZIGtl eSwgY29uc3Qgd3N0cmluZyYgdmFsdWVOYW1lKQogewogICAgIERXT1JEIHR5cGUgPSAwOwpAQCAt ODMsNiArODQsNyBAQCBzdGF0aWMgd3N0cmluZyBhcHBsZUFwcGxpY2F0aW9uU3VwcG9ydERpcmVj dG9yeSgpCiB7CiAgICAgcmV0dXJuIGFwcGxlUGF0aEZyb21SZWdpc3RyeShMIlNPRlRXQVJFXFxB cHBsZSBJbmMuXFxBcHBsZSBBcHBsaWNhdGlvbiBTdXBwb3J0IiwgTCJJbnN0YWxsRGlyIik7CiB9 CisjZW5kaWYKIAogc3RhdGljIHdzdHJpbmcgY29weUVudmlyb25tZW50VmFyaWFibGUoY29uc3Qg d3N0cmluZyYgdmFyaWFibGUpCiB7CkBAIC05NSw2ICs5Nyw3IEBAIHN0YXRpYyB3c3RyaW5nIGNv cHlFbnZpcm9ubWVudFZhcmlhYmxlKGNvbnN0IHdzdHJpbmcmIHZhcmlhYmxlKQogICAgIHJldHVy biAmYnVmZmVyWzBdOwogfQogCisjaWYgIWRlZmluZWQoV0lOX0NBSVJPKQogc3RhdGljIGJvb2wg cHJlcGVuZFBhdGgoY29uc3Qgd3N0cmluZyYgZGlyZWN0b3J5VG9QcmVwZW5kKQogewogICAgIHdz dHJpbmcgcGF0aFZhcmlhYmxlID0gTCJQQVRIIjsKQEAgLTEwMiw2ICsxMDUsNyBAQCBzdGF0aWMg Ym9vbCBwcmVwZW5kUGF0aChjb25zdCB3c3RyaW5nJiBkaXJlY3RvcnlUb1ByZXBlbmQpCiAgICAg d3N0cmluZyBuZXdQYXRoID0gZGlyZWN0b3J5VG9QcmVwZW5kICsgTCc7JyArIG9sZFBhdGg7CiAg ICAgcmV0dXJuIDo6U2V0RW52aXJvbm1lbnRWYXJpYWJsZVcocGF0aFZhcmlhYmxlLmNfc3RyKCks IG5ld1BhdGguY19zdHIoKSk7CiB9CisjZW5kaWYKIAogc3RhdGljIGludCBmYXRhbEVycm9yKGNv bnN0IHdzdHJpbmcmIHByb2dyYW1OYW1lLCBjb25zdCB3c3RyaW5nJiBtZXNzYWdlKQogewo= 357301 2018-12-13 21:53:13 -0800 2018-12-13 21:53:52 -0800 Patch for landing bug-192688-20181214145312.patch text/plain 5781 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5MTkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm ZDEyMDRmYzllMmY2N2YwYzZmYzhlYzEyMTkxM2NmYmVkNjg1M2M2Li45YzQyMzA4NzBiYzhmOGI4 ZDE0MDNhNWNlNThiN2E0Nzc1OTZmYTI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxOC0xMi0xMyAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBz b255LmNvbT4KKworICAgICAgICBbV2luQ2Fpcm9dW0NsYW5nXSBETExMYXVuY2hlck1haW4uY3Bw OiB3YXJuaW5nOiB1bnVzZWQgZnVuY3Rpb24gJ3ByZXBlbmRQYXRoJyBhbmQgJ2FwcGxlQXBwbGlj YXRpb25TdXBwb3J0RGlyZWN0b3J5JworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTkyNjg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUm9zcyBLaXJzbGlu Zy4KKworICAgICAgICBUaGVzZSBmdW5jdGlvbnMgYXJlIHVzZWQgb25seSBpbiBBcHBsZVdpbiBw b3J0LgorCisgICAgICAgICogc2hlbGwvRExMTGF1bmNoZXJNYWluLmNwcDoKKyAgICAgICAgKGNv cHlFbnZpcm9ubWVudFZhcmlhYmxlKTogTW92ZWQuCisgICAgICAgIChnZXRTdHJpbmdWYWx1ZSk6 IEVuY2xvc2VkIHdpdGggI2lmICFkZWZpbmVkKFdJTl9DQUlSTykuCisgICAgICAgIChhcHBsZVBh dGhGcm9tUmVnaXN0cnkpOiBEaXR0by4KKyAgICAgICAgKGFwcGxlQXBwbGljYXRpb25TdXBwb3J0 RGlyZWN0b3J5KTogRGl0dG8uCisgICAgICAgIChwcmVwZW5kUGF0aCk6IERpdHRvLgorCiAyMDE4 LTEyLTEzICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBFbnN1cmUg dGhhdCBTdHJ1Y3R1cmVGbGFncyBpbml0aWFsaXphdGlvbiBhbHdheXMgc3RhcnRzIHdpdGggQmFz ZTo6U3RydWN0dXJlRmxhZ3MuCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvc2hl bGwvRExMTGF1bmNoZXJNYWluLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9zaGVsbC9ETExM YXVuY2hlck1haW4uY3BwCmluZGV4IDMzNjMzYzMxMTAwNzBkNTE2Y2U1NDJlY2Y1Y2JhNWIxOTRh ZDkyNTcuLmI5YTVkMDEwYjA4MzJiNGMxMmZkZjFjZmU0OTRhMzE3NTY4YmNlMzggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9zaGVsbC9ETExMYXVuY2hlck1haW4uY3BwCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9zaGVsbC9ETExMYXVuY2hlck1haW4uY3BwCkBAIC01Niw2 ICs1NiwxOCBAQCBzdGF0aWMgdm9pZCBlbmFibGVUZXJtaW5hdGlvbk9uSGVhcENvcnJ1cHRpb24o KQogICAgIEhlYXBTZXRJbmZvcm1hdGlvbigwLCBoZWFwRW5hYmxlVGVybWluYXRpb25PbkNvcnJ1 cHRpb24sIDAsIDApOwogfQogCitzdGF0aWMgc3RkOjp3c3RyaW5nIGNvcHlFbnZpcm9ubWVudFZh cmlhYmxlKGNvbnN0IHN0ZDo6d3N0cmluZyYgdmFyaWFibGUpCit7CisgICAgRFdPUkQgbGVuZ3Ro ID0gOjpHZXRFbnZpcm9ubWVudFZhcmlhYmxlVyh2YXJpYWJsZS5jX3N0cigpLCAwLCAwKTsKKyAg ICBpZiAoIWxlbmd0aCkKKyAgICAgICAgcmV0dXJuIHN0ZDo6d3N0cmluZygpOworICAgIHN0ZDo6 dmVjdG9yPHdjaGFyX3Q+IGJ1ZmZlcihsZW5ndGgpOworICAgIGlmICghR2V0RW52aXJvbm1lbnRW YXJpYWJsZSh2YXJpYWJsZS5jX3N0cigpLCAmYnVmZmVyWzBdLCBidWZmZXIuc2l6ZSgpKSB8fCAh YnVmZmVyWzBdKQorICAgICAgICByZXR1cm4gc3RkOjp3c3RyaW5nKCk7CisgICAgcmV0dXJuICZi dWZmZXJbMF07Cit9CisKKyNpZiAhZGVmaW5lZChXSU5fQ0FJUk8pCiBzdGF0aWMgc3RkOjp3c3Ry aW5nIGdldFN0cmluZ1ZhbHVlKEhLRVkga2V5LCBjb25zdCBzdGQ6OndzdHJpbmcmIHZhbHVlTmFt ZSkKIHsKICAgICBEV09SRCB0eXBlID0gMDsKQEAgLTg1LDE3ICs5Nyw2IEBAIHN0YXRpYyBzdGQ6 OndzdHJpbmcgYXBwbGVBcHBsaWNhdGlvblN1cHBvcnREaXJlY3RvcnkoKQogICAgIHJldHVybiBh cHBsZVBhdGhGcm9tUmVnaXN0cnkoTCJTT0ZUV0FSRVxcQXBwbGUgSW5jLlxcQXBwbGUgQXBwbGlj YXRpb24gU3VwcG9ydCIsIEwiSW5zdGFsbERpciIpOwogfQogCi1zdGF0aWMgc3RkOjp3c3RyaW5n IGNvcHlFbnZpcm9ubWVudFZhcmlhYmxlKGNvbnN0IHN0ZDo6d3N0cmluZyYgdmFyaWFibGUpCi17 Ci0gICAgRFdPUkQgbGVuZ3RoID0gOjpHZXRFbnZpcm9ubWVudFZhcmlhYmxlVyh2YXJpYWJsZS5j X3N0cigpLCAwLCAwKTsKLSAgICBpZiAoIWxlbmd0aCkKLSAgICAgICAgcmV0dXJuIHN0ZDo6d3N0 cmluZygpOwotICAgIHN0ZDo6dmVjdG9yPHdjaGFyX3Q+IGJ1ZmZlcihsZW5ndGgpOwotICAgIGlm ICghR2V0RW52aXJvbm1lbnRWYXJpYWJsZSh2YXJpYWJsZS5jX3N0cigpLCAmYnVmZmVyWzBdLCBi dWZmZXIuc2l6ZSgpKSB8fCAhYnVmZmVyWzBdKQotICAgICAgICByZXR1cm4gc3RkOjp3c3RyaW5n KCk7Ci0gICAgcmV0dXJuICZidWZmZXJbMF07Ci19Ci0KIHN0YXRpYyBib29sIHByZXBlbmRQYXRo KGNvbnN0IHN0ZDo6d3N0cmluZyYgZGlyZWN0b3J5VG9QcmVwZW5kKQogewogICAgIHN0ZDo6d3N0 cmluZyBwYXRoVmFyaWFibGUgPSBMIlBBVEgiOwpAQCAtMTAzLDYgKzEwNCw3IEBAIHN0YXRpYyBi b29sIHByZXBlbmRQYXRoKGNvbnN0IHN0ZDo6d3N0cmluZyYgZGlyZWN0b3J5VG9QcmVwZW5kKQog ICAgIHN0ZDo6d3N0cmluZyBuZXdQYXRoID0gZGlyZWN0b3J5VG9QcmVwZW5kICsgTCc7JyArIG9s ZFBhdGg7CiAgICAgcmV0dXJuIDo6U2V0RW52aXJvbm1lbnRWYXJpYWJsZVcocGF0aFZhcmlhYmxl LmNfc3RyKCksIG5ld1BhdGguY19zdHIoKSk7CiB9CisjZW5kaWYKIAogc3RhdGljIGludCBmYXRh bEVycm9yKGNvbnN0IHN0ZDo6d3N0cmluZyYgcHJvZ3JhbU5hbWUsIGNvbnN0IHN0ZDo6d3N0cmlu ZyYgbWVzc2FnZSkKIHsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5n ZUxvZwppbmRleCA5MDc4ZWExNWU1NzE4ODY5NWY4NWViNDQ2ZjQ4Yzc5YzFhZGZkYTA5Li41MzU2 N2NkZGI2MDFiNDQ4Y2VjZTBjZmJlYWVkOTZlOGQ0NTA0YTY1IDEwMDY0NAotLS0gYS9Ub29scy9D aGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTgtMTIt MTMgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAg W1dpbkNhaXJvXVtDbGFuZ10gRExMTGF1bmNoZXJNYWluLmNwcDogd2FybmluZzogdW51c2VkIGZ1 bmN0aW9uICdwcmVwZW5kUGF0aCcgYW5kICdhcHBsZUFwcGxpY2F0aW9uU3VwcG9ydERpcmVjdG9y eScKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MjY4 OAorCisgICAgICAgIFJldmlld2VkIGJ5IFJvc3MgS2lyc2xpbmcuCisKKyAgICAgICAgKiB3aW4v RExMTGF1bmNoZXIvRExMTGF1bmNoZXJNYWluLmNwcDoKKyAgICAgICAgKGNvcHlFbnZpcm9ubWVu dFZhcmlhYmxlKTogTW92ZWQuCisgICAgICAgIChnZXRTdHJpbmdWYWx1ZSk6IEVuY2xvc2VkIHdp dGggI2lmICFkZWZpbmVkKFdJTl9DQUlSTykuCisgICAgICAgIChhcHBsZVBhdGhGcm9tUmVnaXN0 cnkpOiBEaXR0by4KKyAgICAgICAgKGFwcGxlQXBwbGljYXRpb25TdXBwb3J0RGlyZWN0b3J5KTog RGl0dG8uCisgICAgICAgIChwcmVwZW5kUGF0aCk6IERpdHRvLgorCiAyMDE4LTEyLTEzICBEb24g T2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4g Q2hhbmdlZCBteSBzdGF0dXMgdG8gYSByZXZpZXdlci4KZGlmZiAtLWdpdCBhL1Rvb2xzL3dpbi9E TExMYXVuY2hlci9ETExMYXVuY2hlck1haW4uY3BwIGIvVG9vbHMvd2luL0RMTExhdW5jaGVyL0RM TExhdW5jaGVyTWFpbi5jcHAKaW5kZXggMWQyMmRhYTRkZTA0MDQzY2VjZTEzZjE0MDE2NjgyNTBh YmZhNzkzMi4uMTRlNmIyM2Q0MGZiZTg0MDA0NDU2NWIxN2FlZjQ4YTBkZjczNGZmMiAxMDA2NDQK LS0tIGEvVG9vbHMvd2luL0RMTExhdW5jaGVyL0RMTExhdW5jaGVyTWFpbi5jcHAKKysrIGIvVG9v bHMvd2luL0RMTExhdW5jaGVyL0RMTExhdW5jaGVyTWFpbi5jcHAKQEAgLTU1LDYgKzU1LDE4IEBA IHN0YXRpYyB2b2lkIGVuYWJsZVRlcm1pbmF0aW9uT25IZWFwQ29ycnVwdGlvbigpCiAgICAgSGVh cFNldEluZm9ybWF0aW9uKDAsIGhlYXBFbmFibGVUZXJtaW5hdGlvbk9uQ29ycnVwdGlvbiwgMCwg MCk7CiB9CiAKK3N0YXRpYyB3c3RyaW5nIGNvcHlFbnZpcm9ubWVudFZhcmlhYmxlKGNvbnN0IHdz dHJpbmcmIHZhcmlhYmxlKQoreworICAgIERXT1JEIGxlbmd0aCA9IDo6R2V0RW52aXJvbm1lbnRW YXJpYWJsZVcodmFyaWFibGUuY19zdHIoKSwgMCwgMCk7CisgICAgaWYgKCFsZW5ndGgpCisgICAg ICAgIHJldHVybiB3c3RyaW5nKCk7CisgICAgdmVjdG9yPHdjaGFyX3Q+IGJ1ZmZlcihsZW5ndGgp OworICAgIGlmICghR2V0RW52aXJvbm1lbnRWYXJpYWJsZSh2YXJpYWJsZS5jX3N0cigpLCAmYnVm ZmVyWzBdLCBidWZmZXIuc2l6ZSgpKSB8fCAhYnVmZmVyWzBdKQorICAgICAgICByZXR1cm4gd3N0 cmluZygpOworICAgIHJldHVybiAmYnVmZmVyWzBdOworfQorCisjaWYgIWRlZmluZWQoV0lOX0NB SVJPKQogc3RhdGljIHdzdHJpbmcgZ2V0U3RyaW5nVmFsdWUoSEtFWSBrZXksIGNvbnN0IHdzdHJp bmcmIHZhbHVlTmFtZSkKIHsKICAgICBEV09SRCB0eXBlID0gMDsKQEAgLTg0LDE3ICs5Niw2IEBA IHN0YXRpYyB3c3RyaW5nIGFwcGxlQXBwbGljYXRpb25TdXBwb3J0RGlyZWN0b3J5KCkKICAgICBy ZXR1cm4gYXBwbGVQYXRoRnJvbVJlZ2lzdHJ5KEwiU09GVFdBUkVcXEFwcGxlIEluYy5cXEFwcGxl IEFwcGxpY2F0aW9uIFN1cHBvcnQiLCBMIkluc3RhbGxEaXIiKTsKIH0KIAotc3RhdGljIHdzdHJp bmcgY29weUVudmlyb25tZW50VmFyaWFibGUoY29uc3Qgd3N0cmluZyYgdmFyaWFibGUpCi17Ci0g ICAgRFdPUkQgbGVuZ3RoID0gOjpHZXRFbnZpcm9ubWVudFZhcmlhYmxlVyh2YXJpYWJsZS5jX3N0 cigpLCAwLCAwKTsKLSAgICBpZiAoIWxlbmd0aCkKLSAgICAgICAgcmV0dXJuIHdzdHJpbmcoKTsK LSAgICB2ZWN0b3I8d2NoYXJfdD4gYnVmZmVyKGxlbmd0aCk7Ci0gICAgaWYgKCFHZXRFbnZpcm9u bWVudFZhcmlhYmxlKHZhcmlhYmxlLmNfc3RyKCksICZidWZmZXJbMF0sIGJ1ZmZlci5zaXplKCkp IHx8ICFidWZmZXJbMF0pCi0gICAgICAgIHJldHVybiB3c3RyaW5nKCk7Ci0gICAgcmV0dXJuICZi dWZmZXJbMF07Ci19Ci0KIHN0YXRpYyBib29sIHByZXBlbmRQYXRoKGNvbnN0IHdzdHJpbmcmIGRp cmVjdG9yeVRvUHJlcGVuZCkKIHsKICAgICB3c3RyaW5nIHBhdGhWYXJpYWJsZSA9IEwiUEFUSCI7 CkBAIC0xMDIsNiArMTAzLDcgQEAgc3RhdGljIGJvb2wgcHJlcGVuZFBhdGgoY29uc3Qgd3N0cmlu ZyYgZGlyZWN0b3J5VG9QcmVwZW5kKQogICAgIHdzdHJpbmcgbmV3UGF0aCA9IGRpcmVjdG9yeVRv UHJlcGVuZCArIEwnOycgKyBvbGRQYXRoOwogICAgIHJldHVybiA6OlNldEVudmlyb25tZW50VmFy aWFibGVXKHBhdGhWYXJpYWJsZS5jX3N0cigpLCBuZXdQYXRoLmNfc3RyKCkpOwogfQorI2VuZGlm CiAKIHN0YXRpYyBpbnQgZmF0YWxFcnJvcihjb25zdCB3c3RyaW5nJiBwcm9ncmFtTmFtZSwgY29u c3Qgd3N0cmluZyYgbWVzc2FnZSkKIHsK