Consolidate NativeLibrary API to managed implementation #121058
Conversation
This file contains hidden or 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
github-actions
bot
added
the
needs-area-label
dotnet-policy-service
bot
added
the
community-contribution
huoyaoyuan
added
area-System.Runtime.InteropServices
and removed
needs-area-label
|
Tagging subscribers to this area: @dotnet/interop-contrib |
huoyaoyuan
commented
Oct 24, 2025
|
|
||
| // Disable the OS dialogs when failing to load. This matches CoreCLR. | ||
| uint prev; | ||
| bool set = Interop.Kernel32.SetThreadErrorMode(Interop.Kernel32.SEM_FAILCRITICALERRORS | Interop.Kernel32.SEM_NOOPENFILEERRORBOX, out prev); |
There was a problem hiding this comment.
According to https://devblogs.microsoft.com/oldnewthing/20170330-00/ , SEM_NOOPENFILEERRORBOX only has effect on Win16 API.
Comment on lines
+311
to
+315
| // Resolve using the AssemblyLoadContext.ResolvingUnmanagedDll event | ||
| if (ret == IntPtr.Zero) | ||
| { | ||
| ret = LoadNativeLibraryViaAssemblyLoadContextEvent(assembly, libraryName); | ||
| } |
There was a problem hiding this comment.
This change aligns the behavior that ALC.ResolveUnmanagedDll will be called for the LoadBySearch path.
3 tasks
Comment on lines
+378
to
+382
| const int loadLibrarySearchFlags = (int)DllImportSearchPath.UseDllDirectoryForDependencies | ||
| | (int)DllImportSearchPath.ApplicationDirectory | ||
| | (int)DllImportSearchPath.UserDirectories | ||
| | (int)DllImportSearchPath.System32 | ||
| | (int)DllImportSearchPath.SafeDirectories; |
There was a problem hiding this comment.
Suggested change
| const int loadLibrarySearchFlags = (int)DllImportSearchPath.UseDllDirectoryForDependencies | |
| | (int)DllImportSearchPath.ApplicationDirectory | |
| | (int)DllImportSearchPath.UserDirectories | |
| | (int)DllImportSearchPath.System32 | |
| | (int)DllImportSearchPath.SafeDirectories; | |
| const int loadLibrarySearchFlags = (int)(DllImportSearchPath.UseDllDirectoryForDependencies | |
| | DllImportSearchPath.ApplicationDirectory | |
| | DllImportSearchPath.UserDirectories | |
| | DllImportSearchPath.System32 | |
| | DllImportSearchPath.SafeDirectories); |
Comment on lines
+394
to
+416
| if (!libNameIsRelativePath) | ||
| { | ||
| // LOAD_WITH_ALTERED_SEARCH_PATH is incompatible with LOAD_LIBRARY_SEARCH flags. Remove those flags if they are set. | ||
| int flags = loadWithAlteredPathFlags | (dllImportSearchPathFlags & ~loadLibrarySearchFlags); | ||
| ret = LoadLibraryHelper(currLibNameVariation, flags, ref errorTracker); | ||
| if (ret != IntPtr.Zero) | ||
| { | ||
| return ret; | ||
| } | ||
| } | ||
| else if ((callingAssembly != null) && searchAssemblyDirectory) | ||
| { | ||
| // LOAD_WITH_ALTERED_SEARCH_PATH is incompatible with LOAD_LIBRARY_SEARCH flags. Remove those flags if they are set. | ||
| int flags = loadWithAlteredPathFlags | (dllImportSearchPathFlags & ~loadLibrarySearchFlags); | ||
|
|
||
| // Try to load the module alongside the assembly where the PInvoke was declared. | ||
| // For PInvokes where the DllImportSearchPath.AssemblyDirectory is specified, look next to the application. | ||
| ret = LoadLibraryHelper(Path.Combine(AppContext.BaseDirectory, currLibNameVariation), flags, ref errorTracker); | ||
| if (ret != IntPtr.Zero) | ||
| { | ||
| return ret; | ||
| } | ||
| } |
There was a problem hiding this comment.
The code here seems mostly duplicated?
There was a problem hiding this comment.
It's from NativeAOT and simply replicating the coreclr behavior. I aim to keep the change less.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Taking NativeAOT implementation and adapting coreclr behavior. The remaining code for P/Invoke resolver isn't changed.
Mono implementation can be update too, but I'm unsure about how the fallback registered for wasm should be handled.