diff options
| author | Cheng Zhao <zcbenz@gmail.com> | 2014-12-31 12:38:08 -0800 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2015-01-07 23:38:28 +0100 |
| commit | 604b876147075934ecfce61fbe915648134cfdf5 (patch) | |
| tree | 473948afe6ce15c5dddde7f74c3da04a9f960c5e | |
| parent | cbf76c1f2f0e36a707e70cf9c6a8a251b6ac3f26 (diff) | |
| download | android-node-v8-604b876147075934ecfce61fbe915648134cfdf5.tar.gz android-node-v8-604b876147075934ecfce61fbe915648134cfdf5.tar.bz2 android-node-v8-604b876147075934ecfce61fbe915648134cfdf5.zip | |
src,deps: replace LoadLibrary by LoadLibraryW
On Windows, when compiling with `UNICODE` defined, `LoadLibrary` becomes
`LoadLibraryW`. When an ASCII string is passed to that function it
crashes.
PR-URL: https://github.com/iojs/io.js/pull/226
Reviewed-By: Bert Belder <bertbelder@gmail.com>
| -rw-r--r-- | deps/cares/src/ares_library_init.c | 4 | ||||
| -rw-r--r-- | src/node_win32_etw_provider.cc | 2 | ||||
| -rw-r--r-- | src/node_win32_perfctr_provider.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/deps/cares/src/ares_library_init.c b/deps/cares/src/ares_library_init.c index 770e7c2356..9114f62614 100644 --- a/deps/cares/src/ares_library_init.c +++ b/deps/cares/src/ares_library_init.c @@ -45,7 +45,7 @@ static int ares_win32_init(void) #ifdef USE_WINSOCK hnd_iphlpapi = 0; - hnd_iphlpapi = LoadLibrary("iphlpapi.dll"); + hnd_iphlpapi = LoadLibraryW(L"iphlpapi.dll"); if (!hnd_iphlpapi) return ARES_ELOADIPHLPAPI; @@ -73,7 +73,7 @@ static int ares_win32_init(void) */ hnd_advapi32 = 0; - hnd_advapi32 = LoadLibrary("advapi32.dll"); + hnd_advapi32 = LoadLibraryW(L"advapi32.dll"); if (hnd_advapi32) { ares_fpSystemFunction036 = (fpSystemFunction036_t) diff --git a/src/node_win32_etw_provider.cc b/src/node_win32_etw_provider.cc index 1941b5a566..69bf7fcb07 100644 --- a/src/node_win32_etw_provider.cc +++ b/src/node_win32_etw_provider.cc @@ -167,7 +167,7 @@ void NTAPI etw_events_enable_callback( void init_etw() { events_enabled = 0; - advapi = LoadLibrary("advapi32.dll"); + advapi = LoadLibraryW(L"advapi32.dll"); if (advapi) { event_register = (EventRegisterFunc) GetProcAddress(advapi, "EventRegister"); diff --git a/src/node_win32_perfctr_provider.cc b/src/node_win32_perfctr_provider.cc index bfe28e74f6..6c74f1247a 100644 --- a/src/node_win32_perfctr_provider.cc +++ b/src/node_win32_perfctr_provider.cc @@ -135,7 +135,7 @@ void InitPerfCountersWin32() { wcscpy_s(Inst, INST_MAX_LEN, INST_PREFIX); _itow_s(pid, Inst + INST_PREFIX_LEN, INST_MAX_LEN - INST_PREFIX_LEN, 10); - advapimod = LoadLibrary("advapi32.dll"); + advapimod = LoadLibraryW(L"advapi32.dll"); if (advapimod) { perfctr_startProvider = (PerfStartProviderExFunc) GetProcAddress(advapimod, "PerfStartProviderEx"); |