luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

win: include filename in dlopen error message

Browse Source 
Should make the dreaded "%1 is not a valid Win32 application" error
message a thing of the past.

PR-URL: https://github.com/libuv/libuv/pull/1116
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
This commit is contained in:
Ben Noordhuis 2016-10-31 10:58:54 +01:00
parent 8807fd371d
commit 1e6f1159cf
2 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/win/dl.c
View File

@ -22,7 +22,7 @@
#include "uv.h" #include "uv.h"
#include "internal.h" #include "internal.h"
static int uv__dlerror(uv_lib_t* lib, int errorno); static int uv__dlerror(uv_lib_t* lib, const char* filename, DWORD errorno);
int uv_dlopen(const char* filename, uv_lib_t* lib) { int uv_dlopen(const char* filename, uv_lib_t* lib) {
@ -37,12 +37,12 @@ int uv_dlopen(const char* filename, uv_lib_t* lib) {
-1, -1,
filename_w, filename_w,
ARRAY_SIZE(filename_w))) { ARRAY_SIZE(filename_w))) {
return uv__dlerror(lib, GetLastError()); return uv__dlerror(lib, filename, GetLastError());
} }
lib->handle = LoadLibraryExW(filename_w, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); lib->handle = LoadLibraryExW(filename_w, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
if (lib->handle == NULL) { if (lib->handle == NULL) {
return uv__dlerror(lib, GetLastError()); return uv__dlerror(lib, filename, GetLastError());
} }
return 0; return 0;
@ -65,7 +65,7 @@ void uv_dlclose(uv_lib_t* lib) {
int uv_dlsym(uv_lib_t* lib, const char* name, void** ptr) { int uv_dlsym(uv_lib_t* lib, const char* name, void** ptr) {
*ptr = (void*) GetProcAddress(lib->handle, name); *ptr = (void*) GetProcAddress(lib->handle, name);
return uv__dlerror(lib, *ptr ? 0 : GetLastError()); return uv__dlerror(lib, "", *ptr ? 0 : GetLastError());
} }
@ -88,31 +88,46 @@ static void uv__format_fallback_error(uv_lib_t* lib, int errorno){
static int uv__dlerror(uv_lib_t* lib, int errorno) { static int uv__dlerror(uv_lib_t* lib, const char* filename, DWORD errorno) {
static const char not_win32_app_msg[] = "%1 is not a valid Win32 application";
DWORD_PTR arg;
DWORD res; DWORD res;
if (lib->errmsg) { if (lib->errmsg) {
LocalFree((void*)lib->errmsg); LocalFree(lib->errmsg);
lib->errmsg = NULL; lib->errmsg = NULL;
} }
if (errorno) { if (errorno == 0)
return 0;
res = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errorno,
MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
(LPSTR) &lib->errmsg, 0, NULL);
if (!res && GetLastError() == ERROR_MUI_FILE_NOT_FOUND) {
res = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | res = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errorno, FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errorno,
MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), 0, (LPSTR) &lib->errmsg, 0, NULL);
(LPSTR) &lib->errmsg, 0, NULL);
if (!res && GetLastError() == ERROR_MUI_FILE_NOT_FOUND) {
res = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errorno,
0, (LPSTR) &lib->errmsg, 0, NULL);
}
if (!res) {
uv__format_fallback_error(lib, errorno);
}
} }
return errorno ? -1 : 0; /* Inexpert hack to get the filename into the error message. */
if (res && strstr(lib->errmsg, not_win32_app_msg)) {
LocalFree(lib->errmsg);
lib->errmsg = NULL;
arg = (DWORD_PTR) filename;
res = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_ARGUMENT_ARRAY |
FORMAT_MESSAGE_FROM_STRING,
not_win32_app_msg,
0, 0, (LPSTR) &lib->errmsg, 0, (va_list*) &arg);
}
if (!res)
uv__format_fallback_error(lib, errorno);
return -1;
} }

2
test/test-dlerror.c
View File

@ -42,11 +42,13 @@ TEST_IMPL(dlerror) {
msg = uv_dlerror(&lib); msg = uv_dlerror(&lib);
ASSERT(msg != NULL); ASSERT(msg != NULL);
ASSERT(strstr(msg, path) != NULL);
ASSERT(strstr(msg, dlerror_no_error) == NULL); ASSERT(strstr(msg, dlerror_no_error) == NULL);
/* Should return the same error twice in a row. */ /* Should return the same error twice in a row. */
msg = uv_dlerror(&lib); msg = uv_dlerror(&lib);
ASSERT(msg != NULL); ASSERT(msg != NULL);
ASSERT(strstr(msg, path) != NULL);
ASSERT(strstr(msg, dlerror_no_error) == NULL); ASSERT(strstr(msg, dlerror_no_error) == NULL);
uv_dlclose(&lib); uv_dlclose(&lib);