Use GeneratedDllImport in System.IO.MemoryMappedFiles

src/libraries/Common/src/Interop/Unix/System.Native/Interop.FTruncate.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class Sys
     {
-        [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_FTruncate", SetLastError = true)]
-        internal static extern int FTruncate(SafeFileHandle fd, long length);
+        [GeneratedDllImport(Libraries.SystemNative, EntryPoint = "SystemNative_FTruncate", SetLastError = true)]
+        internal static partial int FTruncate(SafeFileHandle fd, long length);
     }
 }

src/libraries/Common/src/Interop/Unix/System.Native/Interop.MAdvise.cs

@@ -8,8 +8,8 @@ internal static partial class Interop
 {
     internal static partial class Sys
     {
-        [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_MAdvise", SetLastError = true)]
-        internal static extern int MAdvise(IntPtr addr, ulong length, MemoryAdvice advice);
+        [GeneratedDllImport(Libraries.SystemNative, EntryPoint = "SystemNative_MAdvise", SetLastError = true)]
+        internal static partial int MAdvise(IntPtr addr, ulong length, MemoryAdvice advice);
 
         internal enum MemoryAdvice
         {

src/libraries/Common/src/Interop/Unix/System.Native/Interop.MMap.cs

@@ -28,8 +28,8 @@ internal enum MemoryMappedFlags
         }
 
         // NOTE: Shim returns null pointer on failure, not non-null MAP_FAILED sentinel.
-        [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_MMap", SetLastError = true)]
-        internal static extern IntPtr MMap(
+        [GeneratedDllImport(Libraries.SystemNative, EntryPoint = "SystemNative_MMap", SetLastError = true)]
+        internal static partial IntPtr MMap(
             IntPtr addr, ulong len,
             MemoryMappedProtections prot, MemoryMappedFlags flags,
             SafeFileHandle fd, long offset);

src/libraries/Common/src/Interop/Unix/System.Native/Interop.MSync.cs

@@ -16,7 +16,7 @@ internal enum MemoryMappedSyncFlags
             MS_INVALIDATE = 0x10,
         }
 
-        [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_MSync", SetLastError = true)]
-        internal static extern int MSync(IntPtr addr, ulong len, MemoryMappedSyncFlags flags);
+        [GeneratedDllImport(Libraries.SystemNative, EntryPoint = "SystemNative_MSync", SetLastError = true)]
+        internal static partial int MSync(IntPtr addr, ulong len, MemoryMappedSyncFlags flags);
     }
 }

src/libraries/Common/src/Interop/Unix/System.Native/Interop.MUnmap.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class Sys
     {
-        [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_MUnmap", SetLastError = true)]
-        internal static extern int MUnmap(IntPtr addr, ulong len);
+        [GeneratedDllImport(Libraries.SystemNative, EntryPoint = "SystemNative_MUnmap", SetLastError = true)]
+        internal static partial int MUnmap(IntPtr addr, ulong len);
     }
 }

src/libraries/Common/src/Interop/Unix/System.Native/Interop.ShmOpen.cs

@@ -8,10 +8,10 @@ internal static partial class Interop
 {
     internal static partial class Sys
     {
-        [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_ShmOpen", SetLastError = true)]
-        internal static extern SafeFileHandle ShmOpen(string name, OpenFlags flags, int mode);
+        [GeneratedDllImport(Libraries.SystemNative, EntryPoint = "SystemNative_ShmOpen", SetLastError = true, CharSet = CharSet.Ansi)]
+        internal static partial SafeFileHandle ShmOpen(string name, OpenFlags flags, int mode);
 
-        [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_ShmUnlink", SetLastError = true)]
-        internal static extern int ShmUnlink(string name);
+        [GeneratedDllImport(Libraries.SystemNative, EntryPoint = "SystemNative_ShmUnlink", SetLastError = true, CharSet = CharSet.Ansi)]
+        internal static partial int ShmUnlink(string name);
     }
 }

src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateFileMapping.cs

@@ -10,17 +10,27 @@ internal static partial class Interop
 {
     internal static partial class Kernel32
     {
+#if DLLIMPORTGENERATOR_ENABLED
+        [GeneratedDllImport(Libraries.Kernel32, EntryPoint = "CreateFileMappingW", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static partial SafeMemoryMappedFileHandle CreateFileMapping(
+#else
         [DllImport(Libraries.Kernel32, EntryPoint = "CreateFileMappingW", CharSet = CharSet.Unicode, SetLastError = true)]
         internal static extern SafeMemoryMappedFileHandle CreateFileMapping(
+#endif
             SafeFileHandle hFile,
             ref SECURITY_ATTRIBUTES lpFileMappingAttributes,
             int flProtect,
             int dwMaximumSizeHigh,
             int dwMaximumSizeLow,
             string? lpName);
 
+#if DLLIMPORTGENERATOR_ENABLED
+        [GeneratedDllImport(Libraries.Kernel32, EntryPoint = "CreateFileMappingW", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static partial SafeMemoryMappedFileHandle CreateFileMapping(
+#else
         [DllImport(Libraries.Kernel32, EntryPoint = "CreateFileMappingW", CharSet = CharSet.Unicode, SetLastError = true)]
         internal static extern SafeMemoryMappedFileHandle CreateFileMapping(
+#endif
             IntPtr hFile,
             ref SECURITY_ATTRIBUTES lpFileMappingAttributes,
             int flProtect,

src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FlushViewOfFile.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class Kernel32
     {
-        [DllImport(Libraries.Kernel32, SetLastError = true)]
-        internal static extern bool FlushViewOfFile(IntPtr lpBaseAddress, UIntPtr dwNumberOfBytesToFlush);
+        [GeneratedDllImport(Libraries.Kernel32, SetLastError = true)]
+        internal static partial bool FlushViewOfFile(IntPtr lpBaseAddress, UIntPtr dwNumberOfBytesToFlush);
     }
 }

src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GlobalMemoryStatusEx.cs

@@ -8,6 +8,6 @@ internal static partial class Interop
     internal static partial class Kernel32
     {
         [DllImport(Libraries.Kernel32)]
-        internal static extern bool GlobalMemoryStatusEx(ref MEMORYSTATUSEX lpBuffer);
+        internal static unsafe extern int GlobalMemoryStatusEx(MEMORYSTATUSEX* lpBuffer);
     }
 }

src/libraries/Common/src/Interop/Windows/Kernel32/Interop.MapViewOfFile.cs

@@ -9,8 +9,13 @@ internal static partial class Interop
 {
     internal static partial class Kernel32
     {
+#if DLLIMPORTGENERATOR_ENABLED
+        [GeneratedDllImport(Libraries.Kernel32, EntryPoint = "MapViewOfFile", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static partial SafeMemoryMappedViewHandle MapViewOfFile(
+#else
         [DllImport(Libraries.Kernel32, EntryPoint = "MapViewOfFile", CharSet = CharSet.Unicode, SetLastError = true)]
         internal static extern SafeMemoryMappedViewHandle MapViewOfFile(
+#endif
             SafeMemoryMappedFileHandle hFileMappingObject,
             int dwDesiredAccess,
             int dwFileOffsetHigh,

src/libraries/Common/src/Interop/Windows/Kernel32/Interop.OpenFileMapping.cs

@@ -8,7 +8,15 @@ internal static partial class Interop
 {
     internal static partial class Kernel32
     {
+#if DLLIMPORTGENERATOR_ENABLED
+        [GeneratedDllImport(Libraries.Kernel32, EntryPoint = "OpenFileMappingW", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static partial SafeMemoryMappedFileHandle OpenFileMapping(
+#else
         [DllImport(Libraries.Kernel32, EntryPoint = "OpenFileMappingW", CharSet = CharSet.Unicode, SetLastError = true)]
-        internal static extern SafeMemoryMappedFileHandle OpenFileMapping(int dwDesiredAccess, [MarshalAs(UnmanagedType.Bool)] bool bInheritHandle, string lpName);
+        internal static extern SafeMemoryMappedFileHandle OpenFileMapping(
+#endif
+            int dwDesiredAccess,
+            [MarshalAs(UnmanagedType.Bool)] bool bInheritHandle,
+            string lpName);
     }
 }

src/libraries/Common/src/Interop/Windows/Kernel32/Interop.UnmapViewOfFile.cs

@@ -8,7 +8,12 @@ internal static partial class Interop
 {
     internal static partial class Kernel32
     {
+#if DLLIMPORTGENERATOR_ENABLED
+        [GeneratedDllImport(Libraries.Kernel32, SetLastError = true)]
+        internal static partial bool UnmapViewOfFile(IntPtr lpBaseAddress);
+#else
         [DllImport(Libraries.Kernel32, SetLastError = true)]
         internal static extern bool UnmapViewOfFile(IntPtr lpBaseAddress);
+#endif
     }
 }

src/libraries/Common/src/Interop/Windows/Kernel32/Interop.VirtualAlloc.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class Kernel32
     {
-        [DllImport(Libraries.Kernel32, SetLastError = true, ExactSpelling = true)]
-        internal static extern IntPtr VirtualAlloc(SafeHandle lpAddress, UIntPtr dwSize, int flAllocationType, int flProtect);
+        [GeneratedDllImport(Libraries.Kernel32, SetLastError = true, ExactSpelling = true)]
+        internal static partial IntPtr VirtualAlloc(SafeHandle lpAddress, UIntPtr dwSize, int flAllocationType, int flProtect);
     }
 }

src/libraries/Common/src/Interop/Windows/Kernel32/Interop.VirtualQuery.cs

@@ -8,7 +8,15 @@ internal static partial class Interop
 {
     internal static partial class Kernel32
     {
+#if DLLIMPORTGENERATOR_ENABLED
+        [GeneratedDllImport(Libraries.Kernel32, SetLastError = true, ExactSpelling = true)]
+        internal static partial UIntPtr VirtualQuery(
+#else
         [DllImport(Libraries.Kernel32, SetLastError = true, ExactSpelling = true)]
-        internal static extern UIntPtr VirtualQuery(SafeHandle lpAddress, ref MEMORY_BASIC_INFORMATION lpBuffer, UIntPtr dwLength);
+        internal static extern UIntPtr VirtualQuery(
+#endif
+            SafeHandle lpAddress,
+            ref MEMORY_BASIC_INFORMATION lpBuffer,
+            UIntPtr dwLength);
     }
 }

src/libraries/System.IO.MemoryMappedFiles/src/System/IO/MemoryMappedFiles/Interop.Windows.cs

@@ -13,7 +13,7 @@ public static unsafe void CheckForAvailableVirtualMemory(ulong nativeSize)
     {
         Interop.Kernel32.MEMORYSTATUSEX memoryStatus = default;
         memoryStatus.dwLength = (uint)sizeof(Interop.Kernel32.MEMORYSTATUSEX);
-        if (Interop.Kernel32.GlobalMemoryStatusEx(ref memoryStatus))
+        if (Interop.Kernel32.GlobalMemoryStatusEx(&memoryStatus) != 0)
         {
             ulong totalVirtual = memoryStatus.ullTotalVirtual;
             if (nativeSize >= totalVirtual)

src/libraries/System.Private.CoreLib/src/System/Runtime/MemoryFailPoint.Windows.cs

@@ -22,7 +22,7 @@ private static unsafe bool CheckForAvailableMemory(out ulong availPageFile, out
         {
             Interop.Kernel32.MEMORYSTATUSEX memoryStatus = default;
             memoryStatus.dwLength = (uint)sizeof(Interop.Kernel32.MEMORYSTATUSEX);
-            if (!Interop.Kernel32.GlobalMemoryStatusEx(ref memoryStatus))
+            if (Interop.Kernel32.GlobalMemoryStatusEx(&memoryStatus) == 0)
             {
                 availPageFile = default;
                 totalAddressSpaceFree = default;

src/libraries/System.Runtime.Caching/src/System/Runtime/Caching/MemoryMonitor.Windows.cs

@@ -16,7 +16,7 @@ static unsafe MemoryMonitor()
         {
             Interop.Kernel32.MEMORYSTATUSEX memoryStatus = default;
             memoryStatus.dwLength = (uint)sizeof(Interop.Kernel32.MEMORYSTATUSEX);
-            if (Interop.Kernel32.GlobalMemoryStatusEx(ref memoryStatus))
+            if (Interop.Kernel32.GlobalMemoryStatusEx(&memoryStatus) != 0)
             {
                 s_totalPhysical = (long)memoryStatus.ullTotalPhys;
                 s_totalVirtual = (long)memoryStatus.ullTotalVirtual;

src/libraries/System.Runtime.Caching/src/System/Runtime/Caching/PhysicalMemoryMonitor.Windows.cs

@@ -14,7 +14,7 @@ protected override unsafe int GetCurrentPressure()
         {
             Interop.Kernel32.MEMORYSTATUSEX memoryStatus = default;
             memoryStatus.dwLength = (uint)sizeof(Interop.Kernel32.MEMORYSTATUSEX);
-            if (!Interop.Kernel32.GlobalMemoryStatusEx(ref memoryStatus))
+            if (Interop.Kernel32.GlobalMemoryStatusEx(&memoryStatus) == 0)
             {
                 return 0;
             }