commit 4c9194663b2aa87cb184f08875a771398ac9c80c
author Ivan Zhakov <ivan@apache.org> Thu May 16 19:03:58 2019 +0000
committer Ivan Zhakov <ivan@apache.org> Thu May 16 19:03:58 2019 +0000
tree 36276c27de60f2416fc5ff12fa4028035251fd22
parent 7aaab0b3778af21d78626106943e5ab97d8e04be

win32: Use LoadLibraryW() instead of LoadLibraryA() to late load libraries.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1859405 13f79535-47bb-0310-9956-ffa450edef68

misc/win32/misc.c

diff --git a/misc/win32/misc.c b/misc/win32/misc.c
index 88d9ab3..ff9c076 100644
--- a/misc/win32/misc.c
+++ b/misc/win32/misc.c
@@ -139,24 +139,24 @@
  */
 
 typedef struct win32_late_dll_t {
-    const char *dll_name;
+    const apr_wchar_t *dll_name;
     HMODULE dll_handle;
 } win32_late_dll_t;
 
 static win32_late_dll_t late_dll[DLL_defined] = {
-    {"kernel32", NULL},
-    {"advapi32", NULL},
-    {"mswsock", NULL},
-    {"ws2_32", NULL},
-    {"shell32", NULL},
-    {"ntdll.dll", NULL},
-    {"Iphplapi", NULL}
+    {L"kernel32", NULL},
+    {L"advapi32", NULL},
+    {L"mswsock", NULL},
+    {L"ws2_32", NULL},
+    {L"shell32", NULL},
+    {L"ntdll.dll", NULL},
+    {L"Iphplapi", NULL}
 };
 
 FARPROC apr_load_dll_func(apr_dlltoken_e fnLib, char* fnName, int ordinal)
 {
     if (!late_dll[fnLib].dll_handle) {
-        late_dll[fnLib].dll_handle = LoadLibraryA(late_dll[fnLib].dll_name);
+        late_dll[fnLib].dll_handle = LoadLibraryW(late_dll[fnLib].dll_name);
         if (!late_dll[fnLib].dll_handle)
             return NULL;
     }