|
|
@@ -3,20 +3,20 @@ using System.Runtime.InteropServices;
|
|
|
|
|
|
namespace Ryujinx.Memory.WindowsShared
|
|
|
{
|
|
|
- static class WindowsApi
|
|
|
+ static partial class WindowsApi
|
|
|
{
|
|
|
public static readonly IntPtr InvalidHandleValue = new IntPtr(-1);
|
|
|
public static readonly IntPtr CurrentProcessHandle = new IntPtr(-1);
|
|
|
|
|
|
- [DllImport("kernel32.dll", SetLastError = true)]
|
|
|
- public static extern IntPtr VirtualAlloc(
|
|
|
+ [LibraryImport("kernel32.dll", SetLastError = true)]
|
|
|
+ public static partial IntPtr VirtualAlloc(
|
|
|
IntPtr lpAddress,
|
|
|
IntPtr dwSize,
|
|
|
AllocationType flAllocationType,
|
|
|
MemoryProtection flProtect);
|
|
|
|
|
|
- [DllImport("KernelBase.dll", SetLastError = true)]
|
|
|
- public static extern IntPtr VirtualAlloc2(
|
|
|
+ [LibraryImport("KernelBase.dll", SetLastError = true)]
|
|
|
+ public static partial IntPtr VirtualAlloc2(
|
|
|
IntPtr process,
|
|
|
IntPtr lpAddress,
|
|
|
IntPtr dwSize,
|
|
|
@@ -25,18 +25,20 @@ namespace Ryujinx.Memory.WindowsShared
|
|
|
IntPtr extendedParameters,
|
|
|
ulong parameterCount);
|
|
|
|
|
|
- [DllImport("kernel32.dll", SetLastError = true)]
|
|
|
- public static extern bool VirtualProtect(
|
|
|
+ [LibraryImport("kernel32.dll", SetLastError = true)]
|
|
|
+ [return: MarshalAs(UnmanagedType.Bool)]
|
|
|
+ public static partial bool VirtualProtect(
|
|
|
IntPtr lpAddress,
|
|
|
IntPtr dwSize,
|
|
|
MemoryProtection flNewProtect,
|
|
|
out MemoryProtection lpflOldProtect);
|
|
|
|
|
|
- [DllImport("kernel32.dll", SetLastError = true)]
|
|
|
- public static extern bool VirtualFree(IntPtr lpAddress, IntPtr dwSize, AllocationType dwFreeType);
|
|
|
+ [LibraryImport("kernel32.dll", SetLastError = true)]
|
|
|
+ [return: MarshalAs(UnmanagedType.Bool)]
|
|
|
+ public static partial bool VirtualFree(IntPtr lpAddress, IntPtr dwSize, AllocationType dwFreeType);
|
|
|
|
|
|
- [DllImport("kernel32.dll", SetLastError = true)]
|
|
|
- public static extern IntPtr CreateFileMapping(
|
|
|
+ [LibraryImport("kernel32.dll", SetLastError = true, EntryPoint = "CreateFileMappingW")]
|
|
|
+ public static partial IntPtr CreateFileMapping(
|
|
|
IntPtr hFile,
|
|
|
IntPtr lpFileMappingAttributes,
|
|
|
FileMapProtection flProtect,
|
|
|
@@ -44,19 +46,20 @@ namespace Ryujinx.Memory.WindowsShared
|
|
|
uint dwMaximumSizeLow,
|
|
|
[MarshalAs(UnmanagedType.LPWStr)] string lpName);
|
|
|
|
|
|
- [DllImport("kernel32.dll", SetLastError = true)]
|
|
|
- public static extern bool CloseHandle(IntPtr hObject);
|
|
|
+ [LibraryImport("kernel32.dll", SetLastError = true)]
|
|
|
+ [return: MarshalAs(UnmanagedType.Bool)]
|
|
|
+ public static partial bool CloseHandle(IntPtr hObject);
|
|
|
|
|
|
- [DllImport("kernel32.dll", SetLastError = true)]
|
|
|
- public static extern IntPtr MapViewOfFile(
|
|
|
+ [LibraryImport("kernel32.dll", SetLastError = true)]
|
|
|
+ public static partial IntPtr MapViewOfFile(
|
|
|
IntPtr hFileMappingObject,
|
|
|
uint dwDesiredAccess,
|
|
|
uint dwFileOffsetHigh,
|
|
|
uint dwFileOffsetLow,
|
|
|
IntPtr dwNumberOfBytesToMap);
|
|
|
|
|
|
- [DllImport("KernelBase.dll", SetLastError = true)]
|
|
|
- public static extern IntPtr MapViewOfFile3(
|
|
|
+ [LibraryImport("KernelBase.dll", SetLastError = true)]
|
|
|
+ public static partial IntPtr MapViewOfFile3(
|
|
|
IntPtr hFileMappingObject,
|
|
|
IntPtr process,
|
|
|
IntPtr baseAddress,
|
|
|
@@ -67,17 +70,19 @@ namespace Ryujinx.Memory.WindowsShared
|
|
|
IntPtr extendedParameters,
|
|
|
ulong parameterCount);
|
|
|
|
|
|
- [DllImport("kernel32.dll", SetLastError = true)]
|
|
|
- public static extern bool UnmapViewOfFile(IntPtr lpBaseAddress);
|
|
|
+ [LibraryImport("kernel32.dll", SetLastError = true)]
|
|
|
+ [return: MarshalAs(UnmanagedType.Bool)]
|
|
|
+ public static partial bool UnmapViewOfFile(IntPtr lpBaseAddress);
|
|
|
|
|
|
- [DllImport("KernelBase.dll", SetLastError = true)]
|
|
|
- public static extern bool UnmapViewOfFile2(IntPtr process, IntPtr lpBaseAddress, ulong unmapFlags);
|
|
|
+ [LibraryImport("KernelBase.dll", SetLastError = true)]
|
|
|
+ [return: MarshalAs(UnmanagedType.Bool)]
|
|
|
+ public static partial bool UnmapViewOfFile2(IntPtr process, IntPtr lpBaseAddress, ulong unmapFlags);
|
|
|
|
|
|
- [DllImport("kernel32.dll")]
|
|
|
- public static extern uint GetLastError();
|
|
|
+ [LibraryImport("kernel32.dll")]
|
|
|
+ public static partial uint GetLastError();
|
|
|
|
|
|
- [DllImport("kernel32.dll")]
|
|
|
- public static extern int GetCurrentThreadId();
|
|
|
+ [LibraryImport("kernel32.dll")]
|
|
|
+ public static partial int GetCurrentThreadId();
|
|
|
|
|
|
public static MemoryProtection GetProtection(MemoryPermission permission)
|
|
|
{
|