Set up P/Invoke source code generation via CsWin32 and update Microsoft.Dism

Author: Fs00

src/NativeMethods.json

@@ -0,0 +1,4 @@
+{
+  "$schema": "https://aka.ms/CsWin32.schema.json",
+  "className": "WinAPI"
+}

src/NativeMethods.txt

@@ -0,0 +1,7 @@
+AdjustTokenPrivileges
+GetCurrentProcess
+OpenProcessToken
+LookupPrivilegeValue
+FindWindow
+PostMessage
+WIN32_ERROR

src/Utils/OS.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics;
 using System.IO;
-using System.Runtime.InteropServices;
 using System.Threading;
+using Windows.Win32;
 using Microsoft.Win32;
 using Win10BloatRemover.UI;
 
@@ -50,10 +50,10 @@ public static void CloseExplorer()
     {
         // This is the same as doing Ctrl+Shift+Right click on the system tray -> Exit Explorer
         // Solution found at https://stackoverflow.com/a/5705965
-        IntPtr trayWindow = FindWindow("Shell_TrayWnd", null);
+        var trayWindow = WinAPI.FindWindow("Shell_TrayWnd");
         if (trayWindow != IntPtr.Zero)
         {
-            PostMessage(trayWindow, 0x5B4, IntPtr.Zero, IntPtr.Zero);
+            WinAPI.PostMessage(trayWindow, 0x5B4, 0, 0);
             Thread.Sleep(TimeSpan.FromSeconds(2)); // wait for the process to gracefully exit
         }
         // If the Explorer option "Launch folder windows in a separate process" is enabled, that separate process
@@ -152,12 +152,4 @@ public static bool IsWindows10()
         var windowsVersion = Environment.OSVersion.Version;
         return windowsVersion.Major == 10 && windowsVersion.Build < 21996;
     }
-
-    [DllImport("user32.dll", SetLastError = true)]
-    [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
-    private static extern IntPtr FindWindow(string? className, string? windowName);
-
-    [DllImport("user32.dll", SetLastError = true)]
-    [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
-    private static extern bool PostMessage(IntPtr windowHandle, uint message, IntPtr wParam, IntPtr lParam);
 }

src/Utils/TokenPrivilege.cs

@@ -1,5 +1,8 @@
 using System.Runtime.InteropServices;
 using System.Security;
+using Windows.Win32;
+using Windows.Win32.Foundation;
+using Windows.Win32.Security;
 
 namespace Win10BloatRemover.Utils;
 
@@ -8,91 +11,46 @@ namespace Win10BloatRemover.Utils;
  */
 class TokenPrivilege : IDisposable
 {
-    private enum PrivilegeAction : uint
-    {
-        Disable = 0x0,
-        Enable = 0x2
-    }
-
     public static TokenPrivilege TakeOwnership => new TokenPrivilege("SeTakeOwnershipPrivilege");
 
     private readonly string privilegeName;
 
     private TokenPrivilege(string privilegeName)
     {
         this.privilegeName = privilegeName;
-        Apply(PrivilegeAction.Enable);
-    }
-
-    private void Apply(PrivilegeAction action)
-    {
-        OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, out IntPtr tokenHandle);
-        LookupPrivilegeValue(null, privilegeName, out Luid luid);
-        var tokenPrivilege = new TokenPrivileges(luid, (uint) action);
-        UpdateTokenPrivileges(tokenHandle, tokenPrivilege);
-    }
-
-    private void UpdateTokenPrivileges(IntPtr tokenHandle, TokenPrivileges privilegeInfo)
-    {
-        bool successful = AdjustTokenPrivileges(tokenHandle, false, ref privilegeInfo, 0, IntPtr.Zero, IntPtr.Zero);
-        if (!successful || Marshal.GetLastWin32Error() == ERROR_NOT_ALL_ASSIGNED)
-            throw new SecurityException($"Can't adjust token privilege {privilegeName}");
+        TogglePrivilege(Action.Enable);
     }
-
+    
     public void Dispose()
     {
-        Apply(PrivilegeAction.Disable);
+        TogglePrivilege(Action.Disable);
     }
-
-    #region P/Invoke structs and methods
-    private const int ERROR_NOT_ALL_ASSIGNED = 1300;
-
-    [StructLayout(LayoutKind.Sequential)]
-    private struct TokenPrivileges(Luid luid, uint attributes)
+    
+    private enum Action : uint
     {
-        // We can use this struct only with one privilege since CLR doesn't support marshalling dynamic-sized arrays
-        private uint Count = 1;
-
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1)]
-        private LuidAndAttributes[] Privileges = [new LuidAndAttributes(luid, attributes)];
+        Disable = 0x0,
+        Enable = 0x2
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    private readonly struct LuidAndAttributes(Luid luid, uint attributes)
+    private void TogglePrivilege(Action privilegeAction)
     {
-        private readonly Luid Luid = luid;
-        private readonly uint Attributes = attributes;
+        using var currentProcessHandle = WinAPI.GetCurrentProcess_SafeHandle();
+        WinAPI.OpenProcessToken(currentProcessHandle,
+            TOKEN_ACCESS_MASK.TOKEN_ADJUST_PRIVILEGES | TOKEN_ACCESS_MASK.TOKEN_QUERY, out var tokenHandle);
+        WinAPI.LookupPrivilegeValue(null, privilegeName, out var privilegeLuid);
+        UpdateTokenPrivileges(tokenHandle, privilegeLuid, privilegeAction);
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    private readonly struct Luid
+    private unsafe void UpdateTokenPrivileges(SafeHandle tokenHandle, LUID privilegeLuid, Action privilegeAction)
     {
-        private readonly uint LowPart;
-        private readonly int HighPart;
+        var updatedPrivileges = new TOKEN_PRIVILEGES {
+            PrivilegeCount = 1,
+            Privileges = new VariableLengthInlineArray<LUID_AND_ATTRIBUTES> {
+                [0] = new LUID_AND_ATTRIBUTES { Luid = privilegeLuid, Attributes = (TOKEN_PRIVILEGES_ATTRIBUTES) privilegeAction }
+            }
+        };
+        bool successful = WinAPI.AdjustTokenPrivileges(tokenHandle, false, &updatedPrivileges, null);
+        if (!successful || Marshal.GetLastWin32Error() == (int) WIN32_ERROR.ERROR_NOT_ALL_ASSIGNED)
+            throw new SecurityException($"Can't adjust token privilege {privilegeName}");
     }
-
-    private const int TOKEN_QUERY = 0x8;
-    private const int TOKEN_ADJUST_PRIVILEGES = 0x20;
-
-    [DllImport("advapi32.dll", SetLastError = true)]
-    [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
-    private static extern bool AdjustTokenPrivileges(IntPtr tokenHandle,
-                                                     bool disableAllPrivileges,
-                                                     ref TokenPrivileges newState,
-                                                     int bufferLength,
-                                                     IntPtr previousState,
-                                                     IntPtr returnLength);
-
-    [DllImport("kernel32.dll")]
-    [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
-    private static extern IntPtr GetCurrentProcess();
-
-    [DllImport("advapi32.dll", SetLastError = true)]
-    [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
-    private static extern bool OpenProcessToken(IntPtr processHandle, int desiredAccess, out IntPtr tokenHandle);
-
-    [DllImport("advapi32.dll", SetLastError = true)]
-    [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
-    private static extern bool LookupPrivilegeValue(string? systemName, string privilegeName, out Luid privilegeLuid);
-    #endregion
 }

src/Win10BloatRemover.csproj

@@ -21,9 +21,12 @@
     <Using Include="System.Linq" />	
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Dism" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Dism" Version="4.0.7" />
+    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.264" />
   </ItemGroup>
   <PropertyGroup>
+    <CsWin32RunAsBuildTask>true</CsWin32RunAsBuildTask>
+    <DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
 	<InvariantGlobalization>true</InvariantGlobalization>
 	<EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
 	<EventSourceSupport>false</EventSourceSupport>