Change the way we load level zero DLL on windows. #636
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -55,7 +55,8 @@ class DynamicLibHelper final | |||
| #ifdef __linux__ | |||
| _handle = dlopen(libName, flag); | |||
| #elif defined(_WIN32) || defined(_WIN64) | |||
| _handle = LoadLibraryA(libName); | |||
| _handle = | |||
| LoadLibraryExA(libName, nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32); | |||
There was a problem hiding this comment.
Should Windows include "libloaderapi.h" instead of "windows.h" ?
https://docs.microsoft.com/en-us/windows/win32/api/libloaderapi/nf-libloaderapi-loadlibraryexa
|
Can you rebase your changes on top of the current master, rather than release/0.10 ? |
diptorupd
force-pushed
the
fix/dll_load
branch
2 times, most recently
from
53f0042 to
f9e2935
Compare
diptorupd
force-pushed
the
fix/dll_load
branch
from
f9e2935 to
d43b799
Compare
oleksandr-pavlyk
approved these changes
Oct 25, 2021
This was referenced Oct 26, 2021
|
Merging after testing locally. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use
LoadLibraryExAinstead ofLoadLibraryAto mitigate a possible DLL injection issue when we load the Level zero DLL on windows.