diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/NativeLibrary.NativeAot.Windows.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/NativeLibrary.NativeAot.Windows.cs
index 6f5587fa0c33d2..bac99a01ed35df 100644
--- a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/NativeLibrary.NativeAot.Windows.cs
+++ b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/NativeLibrary.NativeAot.Windows.cs
@@ -13,26 +13,35 @@ private static IntPtr LoadLibraryHelper(string libraryName, int flags, ref LoadL
{
IntPtr hmod;
+ // 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);
if (((uint)flags & 0xFFFFFF00) != 0)
{
hmod = Interop.Kernel32.LoadLibraryEx(libraryName, IntPtr.Zero, (int)((uint)flags & 0xFFFFFF00));
if (hmod != IntPtr.Zero)
{
- return hmod;
+ goto exit;
}
- int lastError = Marshal.GetLastWin32Error();
+ int lastError = Marshal.GetLastPInvokeError();
if (lastError != Interop.Errors.ERROR_INVALID_PARAMETER)
{
errorTracker.TrackErrorCode(lastError);
- return hmod;
+ goto exit;
}
}
hmod = Interop.Kernel32.LoadLibraryEx(libraryName, IntPtr.Zero, flags & 0xFF);
if (hmod == IntPtr.Zero)
{
- errorTracker.TrackErrorCode(Marshal.GetLastWin32Error());
+ errorTracker.TrackErrorCode(Marshal.GetLastPInvokeError());
+ }
+
+ exit:
+ if (set)
+ {
+ Interop.Kernel32.SetThreadErrorMode(prev, out _);
}
return hmod;
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/NativeLibrary.NativeAot.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/NativeLibrary.NativeAot.cs
index d79088ae9b4f0a..3abe04a60385e6 100644
--- a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/NativeLibrary.NativeAot.cs
+++ b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/NativeLibrary.NativeAot.cs
@@ -97,7 +97,12 @@ internal static IntPtr LoadBySearch(Assembly callingAssembly, bool searchAssembl
else if ((callingAssembly != null) && searchAssemblyDirectory)
{
// Try to load the module alongside the assembly where the PInvoke was declared.
- // This only makes sense in dynamic scenarios (JIT/interpreter), so leaving this out for now.
+ // For PInvokes where the DllImportSearchPath.AssemblyDirectory is specified, look next to the application.
+ ret = LoadLibraryHelper(Path.Combine(AppContext.BaseDirectory, currLibNameVariation), loadWithAlteredPathFlags | dllImportSearchPathFlags, ref errorTracker);
+ if (ret != IntPtr.Zero)
+ {
+ return ret;
+ }
}
ret = LoadLibraryHelper(currLibNameVariation, dllImportSearchPathFlags, ref errorTracker);
diff --git a/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetThreadErrorMode.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetThreadErrorMode.cs
index 340b75115973f5..c27e92419943dd 100644
--- a/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetThreadErrorMode.cs
+++ b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetThreadErrorMode.cs
@@ -14,6 +14,7 @@ internal static partial bool SetThreadErrorMode(
uint dwNewMode,
out uint lpOldMode);
- internal const uint SEM_FAILCRITICALERRORS = 1;
+ internal const int SEM_FAILCRITICALERRORS = 0x00000001;
+ internal const int SEM_NOOPENFILEERRORBOX = 0x00008000;
}
}
diff --git a/src/tests/Interop/DllImportSearchPaths/DllImportSearchPathsTest.cs b/src/tests/Interop/DllImportSearchPaths/DllImportSearchPathsTest.cs
index d3837adbab4a70..644bb79ac54bb6 100644
--- a/src/tests/Interop/DllImportSearchPaths/DllImportSearchPathsTest.cs
+++ b/src/tests/Interop/DllImportSearchPaths/DllImportSearchPathsTest.cs
@@ -39,6 +39,13 @@ public static void AssemblyDirectory_Found()
Assert.Equal(3, sum);
}
+ [ConditionalFact(typeof(TestLibrary.Utilities), nameof(TestLibrary.Utilities.IsNativeAot))]
+ public static void AssemblyDirectoryAot_Found()
+ {
+ int sum = NativeLibraryPInvokeAot.Sum(1, 2);
+ Assert.Equal(3, sum);
+ }
+
[Fact]
[PlatformSpecific(TestPlatforms.Windows)]
public static void AssemblyDirectory_Fallback_Found()
@@ -70,3 +77,18 @@ public static int Sum(int a, int b)
[DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
static extern int NativeSum(int arg1, int arg2);
}
+
+public class NativeLibraryPInvokeAot
+{
+ public static int Sum(int a, int b)
+ {
+ return NativeSum(a, b);
+ }
+
+ // For NativeAOT, validate the case where the native library is next to the AOT application.
+ // The passing of DllImportSearchPath.System32 is done to ensure on Windows the runtime won't fallback
+ // and try to search the application directory by default.
+ [DllImport(NativeLibraryToLoad.Name + "-in-native")]
+ [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory | DllImportSearchPath.System32)]
+ static extern int NativeSum(int arg1, int arg2);
+}
diff --git a/src/tests/Interop/DllImportSearchPaths/DllImportSearchPathsTest.csproj b/src/tests/Interop/DllImportSearchPaths/DllImportSearchPathsTest.csproj
index e4ca9dc74471e3..02284d1ade5367 100644
--- a/src/tests/Interop/DllImportSearchPaths/DllImportSearchPathsTest.csproj
+++ b/src/tests/Interop/DllImportSearchPaths/DllImportSearchPathsTest.csproj
@@ -14,16 +14,24 @@
- <_FilesToMove Include="$(OutDir)/libNativeLibrary.*" />
- <_FilesToMove Include="$(OutDir)/NativeLibrary.*" />
+
+
-
+
- <_FilesToCopy Include="$(OutDir)/$(TargetName).dll" />
+
-
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/Interop/NativeLibrary/API/NativeLibraryTests.cs b/src/tests/Interop/NativeLibrary/API/NativeLibraryTests.cs
index 1d29a823218437..556c006d54b76b 100644
--- a/src/tests/Interop/NativeLibrary/API/NativeLibraryTests.cs
+++ b/src/tests/Interop/NativeLibrary/API/NativeLibraryTests.cs
@@ -189,6 +189,16 @@ public void LoadLibrary_AssemblyDirectory()
EXPECT(TryLoadLibrary_WithAssembly(libName, assemblyInSubdirectory, DllImportSearchPath.AssemblyDirectory));
}
+ if (TestLibrary.Utilities.IsNativeAot)
+ {
+ // For NativeAOT, validate the case where the native library is next to the AOT application.
+ // The passing of DllImportSearchPath.System32 is done to ensure on Windows the runtime won't fallback
+ // and try to search the application directory by default.
+ string libNameAot = $"{NativeLibraryToLoad.Name}-in-native";
+ EXPECT(LoadLibrary_WithAssembly(libNameAot, assembly, DllImportSearchPath.AssemblyDirectory | DllImportSearchPath.System32));
+ EXPECT(TryLoadLibrary_WithAssembly(libNameAot, assembly, DllImportSearchPath.AssemblyDirectory | DllImportSearchPath.System32));
+ }
+
if (OperatingSystem.IsWindows())
{
string currentDirectory = Environment.CurrentDirectory;
diff --git a/src/tests/Interop/NativeLibrary/API/NativeLibraryTests.csproj b/src/tests/Interop/NativeLibrary/API/NativeLibraryTests.csproj
index 16e89dfaba405a..fdc11a4e112198 100644
--- a/src/tests/Interop/NativeLibrary/API/NativeLibraryTests.csproj
+++ b/src/tests/Interop/NativeLibrary/API/NativeLibraryTests.csproj
@@ -24,10 +24,10 @@
-
-
+
+
-
+
@@ -36,4 +36,12 @@
+
+
+
+
+
+
+
+
diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index d1dc86c455bbb5..ec3bf368bd8e22 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -778,9 +778,6 @@
https://github.com/dotnet/runtimelab/issues/164
-
- https://github.com/dotnet/runtimelab/issues/165
-
https://github.com/dotnet/runtimelab/issues/165