diff options
| author | David Majnemer <david.majnemer@gmail.com> | 2013-10-07 01:00:07 +0000 |
|---|---|---|
| committer | David Majnemer <david.majnemer@gmail.com> | 2013-10-07 01:00:07 +0000 |
| commit | 6a971bb8f59f4e20c953a2cc360cab7bae8642e4 (patch) | |
| tree | f3784bd1d13b1987a65df2b1d1a06830e9eeed88 /lib/Support/Windows/DynamicLibrary.inc | |
| parent | 32e3150faba95187c76b211e27d6496a21bee360 (diff) | |
| download | llvm-6a971bb8f59f4e20c953a2cc360cab7bae8642e4.tar.gz llvm-6a971bb8f59f4e20c953a2cc360cab7bae8642e4.tar.bz2 llvm-6a971bb8f59f4e20c953a2cc360cab7bae8642e4.tar.xz | |
Revert "Revert "Windows: Add support for unicode command lines""
This reverts commit r192070 which reverted r192069, I forgot to
regenerate the configure scripts.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192079 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Support/Windows/DynamicLibrary.inc')
| -rw-r--r-- | lib/Support/Windows/DynamicLibrary.inc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/Support/Windows/DynamicLibrary.inc b/lib/Support/Windows/DynamicLibrary.inc index 2edaf74fa5..5a7b21920a 100644 --- a/lib/Support/Windows/DynamicLibrary.inc +++ b/lib/Support/Windows/DynamicLibrary.inc @@ -83,8 +83,15 @@ DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename, // This is mostly to ensure that the return value still shows up as "valid". return DynamicLibrary(&OpenedHandles); } + + SmallVector<wchar_t, MAX_PATH> filenameUnicode; + if (error_code ec = windows::UTF8ToUTF16(filename, filenameUnicode)) { + SetLastError(ec.value()); + MakeErrMsg(errMsg, std::string(filename) + ": Can't convert to UTF-16: "); + return DynamicLibrary(); + } - HMODULE a_handle = LoadLibrary(filename); + HMODULE a_handle = LoadLibraryW(filenameUnicode.data()); if (a_handle == 0) { MakeErrMsg(errMsg, std::string(filename) + ": Can't open : "); |