diff options
Diffstat (limited to 'Ryujinx.Memory')
| -rw-r--r-- | Ryujinx.Memory/MemoryManagerUnixHelper.cs | 46 | ||||
| -rw-r--r-- | Ryujinx.Memory/WindowsShared/WindowsApi.cs | 55 |
2 files changed, 53 insertions, 48 deletions
diff --git a/Ryujinx.Memory/MemoryManagerUnixHelper.cs b/Ryujinx.Memory/MemoryManagerUnixHelper.cs index dd31c328..87a81a79 100644 --- a/Ryujinx.Memory/MemoryManagerUnixHelper.cs +++ b/Ryujinx.Memory/MemoryManagerUnixHelper.cs @@ -3,7 +3,7 @@ using System.Runtime.InteropServices; namespace Ryujinx.Memory { - public static class MemoryManagerUnixHelper + public static partial class MemoryManagerUnixHelper { [Flags] public enum MmapProts : uint @@ -51,38 +51,38 @@ namespace Ryujinx.Memory public const int MADV_DONTNEED = 4; public const int MADV_REMOVE = 9; - [DllImport("libc", EntryPoint = "mmap", SetLastError = true)] - private static extern IntPtr Internal_mmap(IntPtr address, ulong length, MmapProts prot, int flags, int fd, long offset); + [LibraryImport("libc", EntryPoint = "mmap", SetLastError = true)] + private static partial IntPtr Internal_mmap(IntPtr address, ulong length, MmapProts prot, int flags, int fd, long offset); - [DllImport("libc", SetLastError = true)] - public static extern int mprotect(IntPtr address, ulong length, MmapProts prot); + [LibraryImport("libc", SetLastError = true)] + public static partial int mprotect(IntPtr address, ulong length, MmapProts prot); - [DllImport("libc", SetLastError = true)] - public static extern int munmap(IntPtr address, ulong length); + [LibraryImport("libc", SetLastError = true)] + public static partial int munmap(IntPtr address, ulong length); - [DllImport("libc", SetLastError = true)] - public static extern IntPtr mremap(IntPtr old_address, ulong old_size, ulong new_size, int flags, IntPtr new_address); + [LibraryImport("libc", SetLastError = true)] + public static partial IntPtr mremap(IntPtr old_address, ulong old_size, ulong new_size, int flags, IntPtr new_address); - [DllImport("libc", SetLastError = true)] - public static extern int madvise(IntPtr address, ulong size, int advice); + [LibraryImport("libc", SetLastError = true)] + public static partial int madvise(IntPtr address, ulong size, int advice); - [DllImport("libc", SetLastError = true)] - public static extern int mkstemp(IntPtr template); + [LibraryImport("libc", SetLastError = true)] + public static partial int mkstemp(IntPtr template); - [DllImport("libc", SetLastError = true)] - public static extern int unlink(IntPtr pathname); + [LibraryImport("libc", SetLastError = true)] + public static partial int unlink(IntPtr pathname); - [DllImport("libc", SetLastError = true)] - public static extern int ftruncate(int fildes, IntPtr length); + [LibraryImport("libc", SetLastError = true)] + public static partial int ftruncate(int fildes, IntPtr length); - [DllImport("libc", SetLastError = true)] - public static extern int close(int fd); + [LibraryImport("libc", SetLastError = true)] + public static partial int close(int fd); - [DllImport("libc", SetLastError = true)] - public static extern int shm_open(IntPtr name, int oflag, uint mode); + [LibraryImport("libc", SetLastError = true)] + public static partial int shm_open(IntPtr name, int oflag, uint mode); - [DllImport("libc", SetLastError = true)] - public static extern int shm_unlink(IntPtr name); + [LibraryImport("libc", SetLastError = true)] + public static partial int shm_unlink(IntPtr name); private static int MmapFlagsToSystemFlags(MmapFlags flags) { diff --git a/Ryujinx.Memory/WindowsShared/WindowsApi.cs b/Ryujinx.Memory/WindowsShared/WindowsApi.cs index cbb7d99e..67e704ea 100644 --- a/Ryujinx.Memory/WindowsShared/WindowsApi.cs +++ b/Ryujinx.Memory/WindowsShared/WindowsApi.cs @@ -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) { |