Skip to content

Load the library (and its dependencies) from its path rather than potentially the applications #4

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

Open
ramon-juicelabs wants to merge 1 commit into
base: master-juice
Choose a base branch
from
Open

Load the library (and its dependencies) from its path rather than potentially the applications #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 14 additions & 5 deletions loader/vk_loader_platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,12 +536,21 @@ static inline loader_platform_dl_handle loader_platform_open_library(const char
if (MultiByteToWideChar(CP_UTF8, 0, lib_path, -1, lib_path_utf16, lib_path_utf16_size) != lib_path_utf16_size) {
return NULL;
}
// Try loading the library the original way first.
loader_platform_dl_handle lib_handle = LoadLibraryW(lib_path_utf16);
if (lib_handle == NULL && GetLastError() == ERROR_MOD_NOT_FOUND) {
// If that failed, then try loading it with broader search folders.
lib_handle = LoadLibraryExW(lib_path_utf16, NULL, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR);

loader_platform_dl_handle lib_handle = NULL;
if (loader_platform_is_path_absolute(lib_path)) {
// When absolute skip application dir favouring the dir of the loaded module to satisfy dependencies
lib_handle = LoadLibraryExW(lib_path_utf16, NULL,
LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32 | LOAD_LIBRARY_SEARCH_USER_DIRS);
} else {
// Try loading the library the original way first.
lib_handle = LoadLibraryW(lib_path_utf16);
if (lib_handle == NULL && GetLastError() == ERROR_MOD_NOT_FOUND) {
// If that failed, then try loading it with broader search folders.
lib_handle = LoadLibraryExW(lib_path_utf16, NULL, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR);
}
}

return lib_handle;
}
static inline const char *loader_platform_open_library_error(const char *libPath) {
Expand Down