From 61eae2e30c71a10d71cff5463d7c6a5b9a67f64c Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Mon, 7 Oct 2013 01:00:07 +0000 Subject: Revert "Revert "Windows: Add support for unicode command lines"" This reverts commit r192070 which reverted r192069, I forgot to regenerate the configure scripts. llvm-svn: 192079 --- llvm/lib/Support/Windows/DynamicLibrary.inc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'llvm/lib/Support/Windows/DynamicLibrary.inc') diff --git a/llvm/lib/Support/Windows/DynamicLibrary.inc b/llvm/lib/Support/Windows/DynamicLibrary.inc index 2edaf74fa56..5a7b21920a9 100644 --- a/llvm/lib/Support/Windows/DynamicLibrary.inc +++ b/llvm/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 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 : "); -- cgit v1.2.3