diff options
Diffstat (limited to '')
-rw-r--r-- | src/lj_clib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lj_clib.c b/src/lj_clib.c index 74b4b001..1e927ebe 100644 --- a/src/lj_clib.c +++ b/src/lj_clib.c | |||
@@ -176,7 +176,7 @@ LJ_NORET LJ_NOINLINE static void clib_error(lua_State *L, const char *fmt, | |||
176 | wchar_t wbuf[128]; | 176 | wchar_t wbuf[128]; |
177 | char buf[128*2]; | 177 | char buf[128*2]; |
178 | if (!FormatMessageW(FORMAT_MESSAGE_IGNORE_INSERTS|FORMAT_MESSAGE_FROM_SYSTEM, | 178 | if (!FormatMessageW(FORMAT_MESSAGE_IGNORE_INSERTS|FORMAT_MESSAGE_FROM_SYSTEM, |
179 | NULL, err, 0, buf, sizeof(wbuf)/sizeof(wchar_t), NULL) || | 179 | NULL, err, 0, wbuf, sizeof(wbuf)/sizeof(wchar_t), NULL) || |
180 | !WideCharToMultiByte(CP_ACP, 0, wbuf, 128, buf, 128*2, NULL, NULL)) | 180 | !WideCharToMultiByte(CP_ACP, 0, wbuf, 128, buf, 128*2, NULL, NULL)) |
181 | #else | 181 | #else |
182 | char buf[128]; | 182 | char buf[128]; |
@@ -208,7 +208,7 @@ static const char *clib_extname(lua_State *L, const char *name) | |||
208 | static void *clib_loadlib(lua_State *L, const char *name, int global) | 208 | static void *clib_loadlib(lua_State *L, const char *name, int global) |
209 | { | 209 | { |
210 | DWORD oldwerr = GetLastError(); | 210 | DWORD oldwerr = GetLastError(); |
211 | void *h = (void *)LoadLibraryA(clib_extname(L, name)); | 211 | void *h = (void *)LoadLibraryExA(clib_extname(L, name), NULL, 0); |
212 | if (!h) clib_error(L, "cannot load module " LUA_QS ": %s", name); | 212 | if (!h) clib_error(L, "cannot load module " LUA_QS ": %s", name); |
213 | SetLastError(oldwerr); | 213 | SetLastError(oldwerr); |
214 | UNUSED(global); | 214 | UNUSED(global); |
@@ -249,9 +249,9 @@ static void *clib_getsym(CLibrary *cl, const char *name) | |||
249 | GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS|GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, | 249 | GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS|GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, |
250 | (const char *)&_fmode, &h); | 250 | (const char *)&_fmode, &h); |
251 | break; | 251 | break; |
252 | case CLIB_HANDLE_KERNEL32: h = LoadLibraryA("kernel32.dll"); break; | 252 | case CLIB_HANDLE_KERNEL32: h = LoadLibraryExA("kernel32.dll", NULL, 0); break; |
253 | case CLIB_HANDLE_USER32: h = LoadLibraryA("user32.dll"); break; | 253 | case CLIB_HANDLE_USER32: h = LoadLibraryExA("user32.dll", NULL, 0); break; |
254 | case CLIB_HANDLE_GDI32: h = LoadLibraryA("gdi32.dll"); break; | 254 | case CLIB_HANDLE_GDI32: h = LoadLibraryExA("gdi32.dll", NULL, 0); break; |
255 | } | 255 | } |
256 | if (!h) continue; | 256 | if (!h) continue; |
257 | clib_def_handle[i] = (void *)h; | 257 | clib_def_handle[i] = (void *)h; |