[PATCH 1/1] mingw: load system libraries the recommended way
- From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Oct 23, 2018, 10:51 UTC
- Message-ID
- <89887345376ccf8813603f10ac51d39527397aee.1540291906.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.55.git.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
When we access IPv6-related functions, we load the corresponding system library using the `LoadLibrary()` function, which is not the recommended way to load system libraries.
In practice, it does not make a difference: the `ws2_32.dll` library containing the IPv6 functions is already loaded into memory, so LoadLibrary() simply reuses the already-loaded library.
Still, recommended way is recommended way, so let's use that instead.
While at it, also adjust the code in contrib/ that loads system libraries.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- compat/mingw.c | 3 ++- contrib/credential/wincred/git-credential-wincred.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/compat/mingw.c b/compat/mingw.c index 18caf2196..9fd7db571 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -1577,7 +1577,8 @@ static void ensure_socket_initialization(void) WSAGetLastError()); for (name = libraries; *name; name++) { - ipv6_dll = LoadLibrary(*name); + ipv6_dll = LoadLibraryExA(*name, NULL, + LOAD_LIBRARY_SEARCH_SYSTEM32); if (!ipv6_dll) continue; diff --git a/contrib/credential/wincred/git-credential-wincred.c b/contrib/credential/wincred/git-credential-wincred.c index 86518cd93..5bdad41de 100644 --- a/contrib/credential/wincred/git-credential-wincred.c +++ b/contrib/credential/wincred/git-credential-wincred.c @@ -75,7 +75,8 @@ static CredDeleteWT CredDeleteW; static void load_cred_funcs(void) { /* load DLLs */ - advapi = LoadLibrary("advapi32.dll"); + advapi = LoadLibraryExA("advapi32.dll", NULL, + LOAD_LIBRARY_SEARCH_SYSTEM32); if (!advapi) die("failed to load advapi32.dll");
-- gitgitgadget