Skip to content
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

Try LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32 | LOAD_LIBRARY_SEARCH_USER_DIRS for DLL loading on Windows #47775

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Try LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32 | LOAD_LIBRARY_SEARCH_USER_DIRS for DLL loading on Windows #47775

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ac715f
Add LOAD_LIBRARY_SEARCH_USER_DIRS for DLL loading
mkitti Dec 2, 2022
ce74cc4
Eliminate whitespace in comment
mkitti Dec 2, 2022
eace148
Update src/dlload.c via vtjnash review
mkitti Dec 13, 2022
ec5bc96
Make code compile
mkitti Jan 5, 2023
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
26 changes: 25 additions & 1 deletion src/dlload.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
#include "julia_internal.h"
#ifdef _OS_WINDOWS_
#include <direct.h>
#define STRSAFE_NO_DEPRECATE
#include <strsafe.h>
#else
#include <unistd.h>
#include <dlfcn.h>
Expand Down Expand Up @@ -160,7 +162,29 @@ JL_DLLEXPORT void *jl_dlopen(const char *filename, unsigned flags) JL_NOTSAFEPOI
if (!len) return NULL;
WCHAR *wfilename = (WCHAR*)alloca(len * sizeof(WCHAR));
if (!MultiByteToWideChar(CP_UTF8, 0, filename, -1, wfilename, len)) return NULL;
HANDLE lib = LoadLibraryExW(wfilename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
/* Treat `AddDllDirectory` like `(DY)LD_LIBRARY_PATH` on other platforms as Julia 1.10.
In Julia on Windows, user directories can be added to the DLL search path as follows.
`library::String = pwd()`
`@ccall "kernel32".AddDllDirectory(library::Cwstring)::Ptr{Nothing}`
https://learn.microsoft.com/en-us/windows/win32/api/libloaderapi/nf-libloaderapi-adddlldirectory
dwFlags below is LOAD_LIBRARY_SEARCH_DEFAULT_DIRS with ALTERED_SEARCH_PATH
and without LOAD_LIBRARY_SEARCH_APPLICATION_DIR.
*/
const DWORD dwFlags = LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32 | LOAD_LIBRARY_SEARCH_USER_DIRS;
/* First, try searching for the file name without local prefix directory prefix.*/
HANDLE lib = LoadLibraryExW(wfilename, NULL, dwFlags);
if (!lib) {
/* Second, try searching for the file name with local prefix directory prefix.*/
size_t prepended_len = len+3;
WCHAR *prepended_wfilename = (WCHAR*) alloca(prepended_len * sizeof(WCHAR));
HRESULT status = StringCchPrintfW(prepended_wfilename, prepended_len, L"%s%s", L".\\", wfilename);
if (status != S_OK) return NULL;
lib = LoadLibraryExW(prepended_wfilename, NULL, dwFlags);
if (!lib) {
/* Third, try the old loading mechanism used before Julia 1.10. */
lib = LoadLibraryExW(wfilename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
}
}
if (lib)
needsSymRefreshModuleList = 1;
return lib;
Expand Down