Skip to content

Feature/update cares to 2bae2d56d7866defcee18455c1f2ecfef6c7663d #5090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
indutny wants to merge 4 commits into from
Closed

Feature/update cares to 2bae2d56d7866defcee18455c1f2ecfef6c7663d #5090

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67c2257
deps: sync with upstream bagder/c-ares@2bae2d5
indutny Feb 4, 2016
86c1afa
src,deps: replace LoadLibrary by LoadLibraryW
zcbenz Dec 31, 2014
f4cc5cd
fix
indutny Feb 6, 2016
fc1d66c
deps: reapply c-ares floating patch
bnoordhuis May 15, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
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: #226
Reviewed-By: Bert Belder <bertbelder@gmail.com>
  • Loading branch information
@zcbenz @indutny
zcbenz authored and indutny committed Feb 4, 2016
commit 86c1afa7f2a01217ebfdd0198581634c29b241eb
4 changes: 2 additions & 2 deletions deps/cares/src/ares_library_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,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;

Expand Down Expand Up @@ -78,7 +78,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)
Expand Down