180642 2017-12-11 02:33:22 -0800 [WinCairo] DLLLauncherMain should use SetDllDirectory 2017-12-11 18:48:32 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 fujii fujii achristensen bfulgham commit-queue ews-watchlist keith_miller lforschler mark.lam msaboff pvollan saam webkit-bug-importer oldest_to_newest 1380165 0 fujii 2017-12-11 02:33:22 -0800 [Win] DLLLauncherMain should use SetDllDirectory Windows have icuuc.dll in the system directory. WebKit should find one in WebKitLibraries directory instead of one in the system directory. Dynamic-Link Library Search Order (Windows) https://msdn.microsoft.com/library/windows/desktop/ms682586%28v=vs.85%29.aspx SetDllDirectory function (Windows) https://msdn.microsoft.com/library/windows/desktop/ms686203(v=vs.85).aspx 1380166 1 328960 fujii 2017-12-11 02:48:47 -0800 Created attachment 328960 Patch 1380224 2 328960 achristensen 2017-12-11 09:14:16 -0800 Comment on attachment 328960 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=328960&action=review > Tools/ChangeLog:12 > + * win/DLLLauncher/DLLLauncherMain.cpp: We should keep this the same as Source/JavaScriptCore/shell/DLLLauncherMain.cpp > Tools/win/DLLLauncher/DLLLauncherMain.cpp:128 > wstring pathGStreamer = copyEnvironmentVariable(L"GSTREAMER_1_0_ROOT_X86") + L"bin"; We should probably remove this. Nobody uses gstreamer with wincairo any more. > Tools/win/DLLLauncher/DLLLauncherMain.cpp:132 > wstring pathWinCairo = copyEnvironmentVariable(L"WEBKIT_LIBRARIES") + L"\\bin32"; > #endif > - prependPath(pathWinCairo); > + if (!SetDllDirectory(pathWinCairo.c_str())) > + fatalError(programName, L"Failed to SetDllDirectory"); What does this do if there is no WEBKIT_LIBRARIES environment variable? 1380506 3 328960 fujii 2017-12-11 18:16:17 -0800 Comment on attachment 328960 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=328960&action=review Thank you for the review. >> Tools/ChangeLog:12 >> + * win/DLLLauncher/DLLLauncherMain.cpp: > > We should keep this the same as Source/JavaScriptCore/shell/DLLLauncherMain.cpp Good point. I'll fix it. >> Tools/win/DLLLauncher/DLLLauncherMain.cpp:128 >> wstring pathGStreamer = copyEnvironmentVariable(L"GSTREAMER_1_0_ROOT_X86") + L"bin"; > > We should probably remove this. Nobody uses gstreamer with wincairo any more. Agreed. >> Tools/win/DLLLauncher/DLLLauncherMain.cpp:132 >> + fatalError(programName, L"Failed to SetDllDirectory"); > > What does this do if there is no WEBKIT_LIBRARIES environment variable? Good point. It should work without WEBKIT_LIBRARIES. I'll fix it. 1380508 4 329071 fujii 2017-12-11 18:22:56 -0800 Created attachment 329071 Patch 1380515 5 329071 commit-queue 2017-12-11 18:45:16 -0800 Comment on attachment 329071 Patch Clearing flags on attachment: 329071 Committed r225767: <https://trac.webkit.org/changeset/225767> 1380516 6 commit-queue 2017-12-11 18:45:18 -0800 All reviewed patches have been landed. Closing bug. 1380519 7 webkit-bug-importer 2017-12-11 18:48:32 -0800 <rdar://problem/35985025> 328960 2017-12-11 02:48:47 -0800 2017-12-11 18:22:53 -0800 Patch bug-180642-20171211194846.patch text/plain 1680 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1NzM2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjAzNzQ3MjQwYmVmNTY0MzkyOTE1NmYwNGQ4NWVkNjcz Y2I0ODg2ZC4uNDVlM2MyNzRhODc3MjAwZDY1Y2QxZDk0ZTNmOWMwMWYwZGY0ODBjNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE3LTEyLTExICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFtXaW5DYWlyb10gRExMTGF1bmNoZXJNYWluIHNob3VsZCB1c2UgU2V0RGxs RGlyZWN0b3J5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xODA2NDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBXaW5kb3dzIGhhdmUgaWN1dWMuZGxsIGluIHRoZSBzeXN0ZW0gZGlyZWN0b3J5LiBXZWJLaXQg c2hvdWxkIGZpbmQKKyAgICAgICAgb25lIGluIFdlYktpdExpYnJhcmllcyBkaXJlY3RvcnkgaW5z dGVhZCBvZiBvbmUgaW4gdGhlIHN5c3RlbQorICAgICAgICBkaXJlY3RvcnkuCisKKyAgICAgICAg KiB3aW4vRExMTGF1bmNoZXIvRExMTGF1bmNoZXJNYWluLmNwcDoKKyAgICAgICAgKG1vZGlmeVBh dGgpOiBVc2UgU2V0RGxsRGlyZWN0b3J5IGZvciBXZWJLaXRMaWJyYXJpZXMgZGlyZWN0b3J5IGlu c3RlYWQgb2YgbW9kaWZ5aW5nIHBhdGguCisKIDIwMTctMTItMTAgIEtvbnN0YW50aW4gVG9rYXJl diAgPGFubnVsZW5AeWFuZGV4LnJ1PgogCiAgICAgICAgIFtweXRob25dIE1vZGVybml6ZSAiZXhj ZXB0IiB1c2FnZSBmb3IgcHl0aG9uMyBjb21wYXRpYmlsaXR5CmRpZmYgLS1naXQgYS9Ub29scy93 aW4vRExMTGF1bmNoZXIvRExMTGF1bmNoZXJNYWluLmNwcCBiL1Rvb2xzL3dpbi9ETExMYXVuY2hl ci9ETExMYXVuY2hlck1haW4uY3BwCmluZGV4IDM5MjExOWQ1OWJkNGVmMDJmOGQxMDEzMDQ4OTI2 YmEzZDk1YjcwZDMuLjRhNGUzMzA5NGM3ODQ5YzQ4OGE5OGVjNzI5MjczZWI1YTg4ZDUzNTYgMTAw NjQ0Ci0tLSBhL1Rvb2xzL3dpbi9ETExMYXVuY2hlci9ETExMYXVuY2hlck1haW4uY3BwCisrKyBi L1Rvb2xzL3dpbi9ETExMYXVuY2hlci9ETExMYXVuY2hlck1haW4uY3BwCkBAIC0xMjgsNyArMTI4 LDggQEAgc3RhdGljIGJvb2wgbW9kaWZ5UGF0aChjb25zdCB3c3RyaW5nJiBwcm9ncmFtTmFtZSkK ICAgICB3c3RyaW5nIHBhdGhHU3RyZWFtZXIgPSBjb3B5RW52aXJvbm1lbnRWYXJpYWJsZShMIkdT VFJFQU1FUl8xXzBfUk9PVF9YODYiKSArIEwiYmluIjsKICAgICB3c3RyaW5nIHBhdGhXaW5DYWly byA9IGNvcHlFbnZpcm9ubWVudFZhcmlhYmxlKEwiV0VCS0lUX0xJQlJBUklFUyIpICsgTCJcXGJp bjMyIjsKICNlbmRpZgotICAgIHByZXBlbmRQYXRoKHBhdGhXaW5DYWlybyk7CisgICAgaWYgKCFT ZXREbGxEaXJlY3RvcnkocGF0aFdpbkNhaXJvLmNfc3RyKCkpKQorICAgICAgICBmYXRhbEVycm9y KHByb2dyYW1OYW1lLCBMIkZhaWxlZCB0byBTZXREbGxEaXJlY3RvcnkiKTsKICAgICBpZiAoZGly ZWN0b3J5RXhpc3RzKHBhdGhHU3RyZWFtZXIpKQogICAgICAgICBwcmVwZW5kUGF0aChwYXRoR1N0 cmVhbWVyKTsKICAgICByZXR1cm4gdHJ1ZTsK 329071 2017-12-11 18:22:56 -0800 2017-12-11 18:45:16 -0800 Patch bug-180642-20171212112255.patch text/plain 4119 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1NzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 OWQ5YjA0MjM4Y2M1YzkxZTdiNzQ1MGFhNDA4YjMxNjdkNDc2MjIyLi4zMmEyMTYyY2VhZTY0NzVl MThkNDBhYTM2ODhmMTRhZGIwODBmZTkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAxNy0xMi0xMSAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBz b255LmNvbT4KKworICAgICAgICBbV2luQ2Fpcm9dIERMTExhdW5jaGVyTWFpbiBzaG91bGQgdXNl IFNldERsbERpcmVjdG9yeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTgwNjQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV2luZG93cyBoYXZlIGljdXVjLmRsbCBpbiB0aGUgc3lzdGVtIGRpcmVjdG9yeS4g V2ViS2l0IHNob3VsZCBmaW5kCisgICAgICAgIG9uZSBpbiBXZWJLaXRMaWJyYXJpZXMgZGlyZWN0 b3J5LCBub3Qgb25lIGluIHRoZSBzeXN0ZW0gZGlyZWN0b3J5LgorCisgICAgICAgICogc2hlbGwv RExMTGF1bmNoZXJNYWluLmNwcDoKKyAgICAgICAgKG1vZGlmeVBhdGgpOiBVc2UgU2V0RGxsRGly ZWN0b3J5IGZvciBXZWJLaXRMaWJyYXJpZXMgZGlyZWN0b3J5IGluc3RlYWQgb2YgbW9kaWZ5aW5n IHBhdGguCisKIDIwMTctMTItMTEgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5j b20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogT3B0aW9uYWxseSBsb2cgV2ViS2l0IGxvZyBw YXJhbWV0ZXJzIGFzIEpTT04KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9zaGVs bC9ETExMYXVuY2hlck1haW4uY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3NoZWxsL0RMTExh dW5jaGVyTWFpbi5jcHAKaW5kZXggYjg4M2EzMmJiYzc3N2ViYmNiNjNiOGE5YzExZGMxNjBiN2Ix MWQ3ZS4uMTc3MGUyNTcyMTE3MDYyYWNhZTc2ODQwNDg1YTkxYWIwYjVmOWM0ZSAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3NoZWxsL0RMTExhdW5jaGVyTWFpbi5jcHAKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3NoZWxsL0RMTExhdW5jaGVyTWFpbi5jcHAKQEAgLTEyNCwx MiArMTI0LDE4IEBAIHN0YXRpYyBib29sIG1vZGlmeVBhdGgoY29uc3Qgd3N0cmluZyYgcHJvZ3Jh bU5hbWUpCiB7CiAjaWZkZWYgV0lOX0NBSVJPCiAKKyAgICB3c3RyaW5nIHBhdGhXaW5DYWlybyA9 IGNvcHlFbnZpcm9ubWVudFZhcmlhYmxlKEwiV0VCS0lUX0xJQlJBUklFUyIpOworICAgIGlmICgh ZGlyZWN0b3J5RXhpc3RzKHBhdGhXaW5DYWlybykpCisgICAgICAgIHJldHVybiB0cnVlOwogI2lm IGRlZmluZWQoX01fWDY0KQotICAgIHdzdHJpbmcgcGF0aFdpbkNhaXJvID0gY29weUVudmlyb25t ZW50VmFyaWFibGUoTCJXRUJLSVRfTElCUkFSSUVTIikgKyBMIlxcYmluNjQiOworICAgIHBhdGhX aW5DYWlybyArPSBMIlxcYmluNjQiOwogI2Vsc2UKLSAgICB3c3RyaW5nIHBhdGhXaW5DYWlybyA9 IGNvcHlFbnZpcm9ubWVudFZhcmlhYmxlKEwiV0VCS0lUX0xJQlJBUklFUyIpICsgTCJcXGJpbjMy IjsKKyAgICBwYXRoV2luQ2Fpcm8gKz0gTCJcXGJpbjMyIjsKICNlbmRpZgotICAgIHByZXBlbmRQ YXRoKHBhdGhXaW5DYWlybyk7CisgICAgaWYgKCFTZXREbGxEaXJlY3RvcnkocGF0aFdpbkNhaXJv LmNfc3RyKCkpKSB7CisgICAgICAgIGZhdGFsRXJyb3IocHJvZ3JhbU5hbWUsIEwiRmFpbGVkIHRv IFNldERsbERpcmVjdG9yeSIpOworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQogICAgIHJl dHVybiB0cnVlOwogCiAjZWxzZQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMv Q2hhbmdlTG9nCmluZGV4IGVmM2Q4NTUzY2I3ZmQwYTBhNTZhNzg5NWY3OGNhMzZjOThlMDUwMTYu LjVlNDVlOTczYzQzZmIzNjM0MjY4Yjc2MmZjZWI3ZWY0MzhhN2I2ZDUgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAx Ny0xMi0xMSAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KKworICAg ICAgICBbV2luQ2Fpcm9dIERMTExhdW5jaGVyTWFpbiBzaG91bGQgdXNlIFNldERsbERpcmVjdG9y eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgwNjQy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2luZG93 cyBoYXZlIGljdXVjLmRsbCBpbiB0aGUgc3lzdGVtIGRpcmVjdG9yeS4gV2ViS2l0IHNob3VsZCBm aW5kCisgICAgICAgIG9uZSBpbiBXZWJLaXRMaWJyYXJpZXMgZGlyZWN0b3J5LCBub3Qgb25lIGlu IHRoZSBzeXN0ZW0gZGlyZWN0b3J5LgorCisgICAgICAgICogd2luL0RMTExhdW5jaGVyL0RMTExh dW5jaGVyTWFpbi5jcHA6CisgICAgICAgIChtb2RpZnlQYXRoKTogVXNlIFNldERsbERpcmVjdG9y eSBmb3IgV2ViS2l0TGlicmFyaWVzIGRpcmVjdG9yeSBpbnN0ZWFkIG9mIG1vZGlmeWluZyBwYXRo LgorICAgICAgICBEbyBub3QgYWRkIGEgcGF0aCBmb3IgR1N0cmVhbWVyIGJlY2F1c2Ugbm9ib2R5 IGlzIHVzaW5nIG5vdy4KKwogMjAxNy0xMi0xMSAgRGF2aWQgUXVlc2FkYSAgPGRhdmlkX3F1ZXNh ZGFAYXBwbGUuY29tPgogCiAgICAgICAgIFR1cm4gb24gRU5BQkxFX0FQUExJQ0FUSU9OX01BTklG RVNUCmRpZmYgLS1naXQgYS9Ub29scy93aW4vRExMTGF1bmNoZXIvRExMTGF1bmNoZXJNYWluLmNw cCBiL1Rvb2xzL3dpbi9ETExMYXVuY2hlci9ETExMYXVuY2hlck1haW4uY3BwCmluZGV4IDM5MjEx OWQ1OWJkNGVmMDJmOGQxMDEzMDQ4OTI2YmEzZDk1YjcwZDMuLmZjZjFhODcxOWY5MjdkYTY2ZDA5 OGMzNTRmZWFiMzczNDNkZWExMzUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL3dpbi9ETExMYXVuY2hlci9E TExMYXVuY2hlck1haW4uY3BwCisrKyBiL1Rvb2xzL3dpbi9ETExMYXVuY2hlci9ETExMYXVuY2hl ck1haW4uY3BwCkBAIC0xMjEsMTYgKzEyMSwxOCBAQCBzdGF0aWMgYm9vbCBtb2RpZnlQYXRoKGNv bnN0IHdzdHJpbmcmIHByb2dyYW1OYW1lKQogewogI2lmZGVmIFdJTl9DQUlSTwogCisgICAgd3N0 cmluZyBwYXRoV2luQ2Fpcm8gPSBjb3B5RW52aXJvbm1lbnRWYXJpYWJsZShMIldFQktJVF9MSUJS QVJJRVMiKTsKKyAgICBpZiAoIWRpcmVjdG9yeUV4aXN0cyhwYXRoV2luQ2Fpcm8pKQorICAgICAg ICByZXR1cm4gdHJ1ZTsKICNpZiBkZWZpbmVkKF9NX1g2NCkKLSAgICB3c3RyaW5nIHBhdGhHU3Ry ZWFtZXIgPSBjb3B5RW52aXJvbm1lbnRWYXJpYWJsZShMIkdTVFJFQU1FUl8xXzBfUk9PVF9YODZf NjQiKSArIEwiYmluIjsKLSAgICB3c3RyaW5nIHBhdGhXaW5DYWlybyA9IGNvcHlFbnZpcm9ubWVu dFZhcmlhYmxlKEwiV0VCS0lUX0xJQlJBUklFUyIpICsgTCJcXGJpbjY0IjsKKyAgICBwYXRoV2lu Q2Fpcm8gKz0gTCJcXGJpbjY0IjsKICNlbHNlCi0gICAgd3N0cmluZyBwYXRoR1N0cmVhbWVyID0g Y29weUVudmlyb25tZW50VmFyaWFibGUoTCJHU1RSRUFNRVJfMV8wX1JPT1RfWDg2IikgKyBMImJp biI7Ci0gICAgd3N0cmluZyBwYXRoV2luQ2Fpcm8gPSBjb3B5RW52aXJvbm1lbnRWYXJpYWJsZShM IldFQktJVF9MSUJSQVJJRVMiKSArIEwiXFxiaW4zMiI7CisgICAgcGF0aFdpbkNhaXJvICs9IEwi XFxiaW4zMiI7CiAjZW5kaWYKLSAgICBwcmVwZW5kUGF0aChwYXRoV2luQ2Fpcm8pOwotICAgIGlm IChkaXJlY3RvcnlFeGlzdHMocGF0aEdTdHJlYW1lcikpCi0gICAgICAgIHByZXBlbmRQYXRoKHBh dGhHU3RyZWFtZXIpOworICAgIGlmICghU2V0RGxsRGlyZWN0b3J5KHBhdGhXaW5DYWlyby5jX3N0 cigpKSkgeworICAgICAgICBmYXRhbEVycm9yKHByb2dyYW1OYW1lLCBMIkZhaWxlZCB0byBTZXRE bGxEaXJlY3RvcnkiKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KICAgICByZXR1cm4g dHJ1ZTsKIAogI2Vsc2UK