Merge pull request #576 from yyjdelete/patch-1

Fix broken defines

Author: AArnott

src/Kernel32/PublicAPI.Unshipped.txt

@@ -272,13 +272,13 @@ static extern PInvoke.Kernel32.CreateThread(PInvoke.Kernel32.SECURITY_ATTRIBUTES
 static extern PInvoke.Kernel32.DosDateTimeToFileTime(ushort wFatDate, ushort wFatTime, PInvoke.Kernel32.FILETIME* lpFileTime) -> bool
 static extern PInvoke.Kernel32.FlushInstructionCache(PInvoke.Kernel32.SafeObjectHandle hProcess, void* lpcBaseAddress, System.UIntPtr dwSize) -> bool
 static extern PInvoke.Kernel32.FlushProcessWriteBuffers() -> void
-static extern PInvoke.Kernel32.GetCurrentProcessToken() -> PInvoke.Kernel32.SafeObjectHandle
+static PInvoke.Kernel32.GetCurrentProcessToken() -> PInvoke.Kernel32.SafeObjectHandle
 static extern PInvoke.Kernel32.GetCurrentProcessorNumber() -> uint
 static extern PInvoke.Kernel32.GetCurrentProcessorNumberEx(PInvoke.Kernel32.PROCESSOR_NUMBER* ProcNumber) -> void
 static extern PInvoke.Kernel32.GetCurrentThread() -> PInvoke.Kernel32.SafeObjectHandle
-static extern PInvoke.Kernel32.GetCurrentThreadEffectiveToken() -> PInvoke.Kernel32.SafeObjectHandle
+static PInvoke.Kernel32.GetCurrentThreadEffectiveToken() -> PInvoke.Kernel32.SafeObjectHandle
 static extern PInvoke.Kernel32.GetCurrentThreadStackLimits(out System.UIntPtr LowLimit, out System.UIntPtr HighLimit) -> void
-static extern PInvoke.Kernel32.GetCurrentThreadToken() -> PInvoke.Kernel32.SafeObjectHandle
+static PInvoke.Kernel32.GetCurrentThreadToken() -> PInvoke.Kernel32.SafeObjectHandle
 static extern PInvoke.Kernel32.GetNativeSystemInfo(PInvoke.Kernel32.SYSTEM_INFO* lpSystemInfo) -> void
 static extern PInvoke.Kernel32.GetPriorityClass(PInvoke.Kernel32.SafeObjectHandle hProcess) -> PInvoke.Kernel32.ProcessPriorityClass
 static extern PInvoke.Kernel32.GetProcessHandleCount(PInvoke.Kernel32.SafeObjectHandle hProcess, out uint pdwHandleCount) -> bool
@@ -293,4 +293,4 @@ static extern PInvoke.Kernel32.SetFilePointerEx(PInvoke.Kernel32.SafeObjectHandl
 static extern PInvoke.Kernel32.SetProcessInformation(PInvoke.Kernel32.SafeObjectHandle hProcess, PInvoke.Kernel32.PROCESS_INFORMATION_CLASS ProcessInformationClass, void* ProcessInformation, uint ProcessInformationSize) -> bool
 static readonly PInvoke.Kernel32.PROCESS_MEMORY_EXHAUSTION_INFO.PME_FAILFAST_ON_COMMIT_FAIL_DISABLE -> System.UIntPtr
 static readonly PInvoke.Kernel32.PROCESS_MEMORY_EXHAUSTION_INFO.PME_FAILFAST_ON_COMMIT_FAIL_ENABLE -> System.UIntPtr
-static readonly PInvoke.Kernel32.SafePseudoConsoleHandle.Invalid -> PInvoke.Kernel32.SafePseudoConsoleHandle
+static readonly PInvoke.Kernel32.SafePseudoConsoleHandle.Invalid -> PInvoke.Kernel32.SafePseudoConsoleHandle

src/Kernel32/storebanned/Kernel32.cs

@@ -3237,8 +3237,10 @@ public static unsafe extern bool DosDateTimeToFileTime(
         /// You do not need to close the pseudo-handle when you no longer need it.If you call the <see cref="CloseHandle(IntPtr)"/> function with a
         /// pseudo-handle, the function has no effect.
         /// </remarks>
-        [DllImport(nameof(Kernel32))]
-        public static extern SafeObjectHandle GetCurrentProcessToken();
+        public static SafeObjectHandle GetCurrentProcessToken()
+        {
+            return new SafeObjectHandle(new IntPtr(-4), false);
+        }
 
         /// <summary>
         /// Retrieves a pseudo-handle that you can use as a shorthand way to refer to the token that is currently in effect for the thread,
@@ -3258,8 +3260,10 @@ public static unsafe extern bool DosDateTimeToFileTime(
         /// You do not need to close the pseudo-handle when you no longer need it.If you call the <see cref="CloseHandle(IntPtr)"/> function with a
         /// pseudo-handle, the function has no effect.
         /// </remarks>
-        [DllImport(nameof(Kernel32))]
-        public static extern SafeObjectHandle GetCurrentThreadEffectiveToken();
+        public static SafeObjectHandle GetCurrentThreadEffectiveToken()
+        {
+            return new SafeObjectHandle(new IntPtr(-6), false);
+        }
 
         /// <summary>
         /// Retrieves a pseudo-handle that you can use as a shorthand way to refer to the impersonation token that was assigned to the current thread.
@@ -3277,8 +3281,10 @@ public static unsafe extern bool DosDateTimeToFileTime(
         /// You do not need to close the pseudo-handle when you no longer need it.If you call the CloseHandle function with a pseudo-handle, the function
         /// has no effect.
         /// </remarks>
-        [DllImport(nameof(Kernel32))]
-        public static extern SafeObjectHandle GetCurrentThreadToken();
+        public static SafeObjectHandle GetCurrentThreadToken()
+        {
+            return new SafeObjectHandle(new IntPtr(-5), false);
+        }
 
         /// <summary>
         /// Retrieves the number of open handles that belong to the specified process.

src/User32/User32.cs

@@ -1321,7 +1321,7 @@ public static extern unsafe bool GetMenuInfo(
         /// <param name="hMenu">A handle to the menu that contains the item whose identifier is to be retrieved.</param>
         /// <param name="nPos">The zero-based relative position of the menu item whose identifier is to be retrieved.</param>
         /// <returns>The return value is the identifier of the specified menu item. If the menu item identifier is NULL or if the specified item opens a submenu, the return value is -1.</returns>
-        [DllImport(nameof(User32))]
+        [DllImport(nameof(User32), EntryPoint = "GetMenuItemID")]
         public static extern uint GetMenuItemId(IntPtr hMenu, int nPos);
 
 #pragma warning disable SA1629 // Documentation text should end with a period

src/UxTheme/UxTheme.cs

@@ -55,7 +55,7 @@ public static extern SafeThemeHandle OpenThemeData(
         /// UxTheme API's seamlessly</item>
         /// </list>
         /// </remarks>
-        [DllImport(nameof(User32), CharSet = CharSet.Unicode)]
+        [DllImport(nameof(UxTheme), CharSet = CharSet.Unicode)]
         public static extern SafeThemeHandle OpenThemeDataForDpi(
             IntPtr hwnd,
             [MarshalAs(UnmanagedType.LPWStr)] string pszClassIdList,