Replace many external declarations w/ CsWin32

YoshiRulz · YoshiRulz · commit 28c34acdc87f · 2025-05-21T15:23:42.000+10:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -18,6 +18,7 @@
 		<PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="8.0.4" />
 		<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
 		<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
+		<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.183" />
 		<PackageVersion Include="MSTest" Version="3.8.3" />
 		<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageVersion Include="Nullable" Version="1.3.1" />
diff --git a/src/BizHawk.Bizware.Externs/BizHawk.Bizware.Externs.csproj b/src/BizHawk.Bizware.Externs/BizHawk.Bizware.Externs.csproj
@@ -0,0 +1,8 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>netstandard2.0</TargetFramework>
+	</PropertyGroup>
+	<Import Project="../MainSlnCommon.props" />
+	<ItemGroup>
+	</ItemGroup>
+</Project>
diff --git a/src/BizHawk.Bizware.Input/KeyMouseInput/RawKeyMouseInput.cs b/src/BizHawk.Bizware.Input/KeyMouseInput/RawKeyMouseInput.cs
@@ -7,6 +7,8 @@
 using BizHawk.Common;
 using BizHawk.Common.CollectionExtensions;
 
+using Windows.Win32;
+
 using static BizHawk.Common.RawInputImports;
 using static BizHawk.Common.WmImports;
 
diff --git a/src/BizHawk.Client.DiscoHawk/Program.cs b/src/BizHawk.Client.DiscoHawk/Program.cs
@@ -8,6 +8,8 @@
 using BizHawk.Common.StringExtensions;
 using BizHawk.Emulation.DiscSystem;
 
+using Windows.Win32;
+
 namespace BizHawk.Client.DiscoHawk
 {
 	internal static class Program
@@ -83,22 +85,22 @@ private static void Main(string[] args)
 
 				if (dllDir.ContainsOrdinal(';'))
 				{
-					var dllShortPathLen = Win32Imports.GetShortPathNameW(dllDir, null, 0);
+					var dllShortPathLen = Win32Imports.GetShortPathNameW(dllDir);
 					if (dllShortPathLen == 0)
 					{
 						MessageBox.Show(SEMICOLON_IN_DIR_MSG);
 						return;
 					}
 
 					var dllShortPathBuffer = new char[dllShortPathLen];
-					dllShortPathLen = Win32Imports.GetShortPathNameW(dllDir, dllShortPathBuffer, dllShortPathLen);
+					dllShortPathLen = Win32Imports.GetShortPathNameW(dllDir, dllShortPathBuffer);
 					if (dllShortPathLen == 0)
 					{
 						MessageBox.Show(SEMICOLON_IN_DIR_MSG);
 						return;
 					}
 
-					dllDir = new string(dllShortPathBuffer, 0, dllShortPathLen);
+					dllDir = dllShortPathBuffer.AsSpan(start: 0, length: (int) dllShortPathLen).ToString();
 					if (dllDir.ContainsOrdinal(';'))
 					{
 						MessageBox.Show(SEMICOLON_IN_DIR_MSG);
diff --git a/src/BizHawk.Client.EmuHawk/CustomControls/FolderBrowserDialogEx.cs b/src/BizHawk.Client.EmuHawk/CustomControls/FolderBrowserDialogEx.cs
@@ -5,6 +5,8 @@
 
 using BizHawk.Common;
 
+using Windows.Win32;
+
 using static BizHawk.Common.Shell32Imports;
 
 namespace BizHawk.Client.EmuHawk
diff --git a/src/BizHawk.Client.EmuHawk/EmuHawkUtil.cs b/src/BizHawk.Client.EmuHawk/EmuHawkUtil.cs
@@ -4,6 +4,8 @@
 using BizHawk.Common;
 using BizHawk.Common.StringExtensions;
 
+using Windows.Win32;
+
 namespace BizHawk.Client.EmuHawk
 {
 	public static class EmuHawkUtil
diff --git a/src/BizHawk.Client.EmuHawk/Program.cs b/src/BizHawk.Client.EmuHawk/Program.cs
@@ -14,6 +14,8 @@
 using BizHawk.Client.EmuHawk.CustomControls;
 using BizHawk.Emulation.Cores;
 
+using Windows.Win32;
+
 namespace BizHawk.Client.EmuHawk
 {
 	internal static class Program
@@ -132,22 +134,22 @@ private static int SubMain(string[] args)
 
 				if (dllDir.ContainsOrdinal(';'))
 				{
-					var dllShortPathLen = Win32Imports.GetShortPathNameW(dllDir, null, 0);
+					var dllShortPathLen = Win32Imports.GetShortPathNameW(dllDir);
 					if (dllShortPathLen == 0)
 					{
 						MessageBox.Show(SEMICOLON_IN_DIR_MSG);
 						return -1;
 					}
 
 					var dllShortPathBuffer = new char[dllShortPathLen];
-					dllShortPathLen = Win32Imports.GetShortPathNameW(dllDir, dllShortPathBuffer, dllShortPathLen);
+					dllShortPathLen = Win32Imports.GetShortPathNameW(dllDir, dllShortPathBuffer);
 					if (dllShortPathLen == 0)
 					{
 						MessageBox.Show(SEMICOLON_IN_DIR_MSG);
 						return -1;
 					}
 
-					dllDir = new string(dllShortPathBuffer, 0, dllShortPathLen);
+					dllDir = dllShortPathBuffer.AsSpan(start: 0, length: (int) dllShortPathLen).ToString();
 					if (dllDir.ContainsOrdinal(';'))
 					{
 						MessageBox.Show(SEMICOLON_IN_DIR_MSG);
diff --git a/src/BizHawk.Client.EmuHawk/ScreenSaver.cs b/src/BizHawk.Client.EmuHawk/ScreenSaver.cs
@@ -1,5 +1,8 @@
 ﻿using BizHawk.Common;
 
+using Windows.Win32;
+using Windows.Win32.UI.WindowsAndMessaging;
+
 namespace BizHawk.Client.EmuHawk
 {
 	/// <remarks>Derived from http://www.codeproject.com/KB/cs/ScreenSaverControl.aspx</remarks>
@@ -19,17 +22,18 @@ public int Duration
 			{
 				get
 				{
-					const int SPI_GETSCREENSAVERTIMEOUT = 14;
-					int value = default;
-					Win32Imports.SystemParametersInfoW(SPI_GETSCREENSAVERTIMEOUT, 0, ref value, 0);
-					return value;
+					_ = Win32Imports.SystemParametersInfoW(
+						SYSTEM_PARAMETERS_INFO_ACTION.SPI_GETSCREENSAVETIMEOUT,
+						uiParam: 0,
+						out var value);
+					return unchecked((int) value);
 				}
 				set
 				{
-					const int SPI_SETSCREENSAVERTIMEOUT = 15;
-					const int SPIF_SENDWININICHANGE = 2;
-					int nullVar = default;
-					Win32Imports.SystemParametersInfoW(SPI_SETSCREENSAVERTIMEOUT, value, ref nullVar, SPIF_SENDWININICHANGE);
+					_ = Win32Imports.SystemParametersInfoW(
+						SYSTEM_PARAMETERS_INFO_ACTION.SPI_SETSCREENSAVETIMEOUT,
+						unchecked((uint) value),
+						SYSTEM_PARAMETERS_INFO_UPDATE_FLAGS.SPIF_SENDWININICHANGE);
 				}
 			}
 		}
diff --git a/src/BizHawk.Client.EmuHawk/Throttle.cs b/src/BizHawk.Client.EmuHawk/Throttle.cs
@@ -4,6 +4,8 @@
 using BizHawk.Client.Common;
 using BizHawk.Common;
 
+using Windows.Win32;
+
 //this throttle is nitsuja's fine-tuned techniques from desmume
 
 namespace BizHawk.Client.EmuHawk
diff --git a/src/BizHawk.Common/BizHawk.Common.csproj b/src/BizHawk.Common/BizHawk.Common.csproj
@@ -11,12 +11,11 @@
 		<PackageReference Include="CommunityToolkit.HighPerformance" />
 		<PackageReference Include="Microsoft.Bcl.HashCode" />
 		<PackageReference Include="Microsoft.Win32.Registry" />
+		<PackageReference Include="Microsoft.Windows.CsWin32" />
 		<PackageReference Include="PolySharp" />
 		<PackageReference Include="System.ComponentModel.Annotations" />
 		<PackageReference Include="System.Memory" />
 		<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
-	</ItemGroup>
-	<ItemGroup>
 		<Analyzer Include="$(MSBuildProjectDirectory)/../../References/BizHawk.SrcGen.VersionInfo.dll" />
 	</ItemGroup>
 	<Target Name="InstallGitHooks" AfterTargets="PreBuildEvent">
diff --git a/src/BizHawk.Common/Extensions/PathExtensions.cs b/src/BizHawk.Common/Extensions/PathExtensions.cs
@@ -2,6 +2,8 @@
 
 using BizHawk.Common.StringExtensions;
 
+using Windows.Win32;
+
 namespace BizHawk.Common.PathExtensions
 {
 	public static class PathExtensions
diff --git a/src/BizHawk.Common/GetLastError.cs b/src/BizHawk.Common/GetLastError.cs
@@ -0,0 +1,10 @@
+using System.Runtime.InteropServices;
+
+namespace Windows.Win32
+{
+	public static partial class Win32Imports
+	{
+		public static uint GetLastError()
+			=> unchecked((uint) Marshal.GetLastWin32Error());
+	}
+}
diff --git a/src/BizHawk.Common/KERNEL32.dll.cs b/src/BizHawk.Common/KERNEL32.dll.cs
@@ -0,0 +1,22 @@
+using Windows.Win32.Foundation;
+
+namespace Windows.Win32
+{
+	public static partial class Win32Imports
+	{
+		/// <inheritdoc cref="GetShortPathNameW(PCWSTR, PWSTR, uint)" />
+		public static unsafe uint GetShortPathNameW(string lpszLongPath)
+		{
+			fixed (char* lpszLongPathLocal = lpszLongPath)
+			{
+				return Win32Imports.GetShortPathNameW(lpszLongPathLocal, default, 0U);
+			}
+		}
+
+		/// <inheritdoc cref="IsWow64Process(HANDLE, BOOL*)" />
+		public static unsafe BOOL IsWow64Process(HANDLE hProcess, out BOOL Wow64Process)
+		{
+			fixed (BOOL* ptr = &Wow64Process) return IsWow64Process(hProcess, ptr);
+		}
+	}
+}
diff --git a/src/BizHawk.Common/NativeMethods.json b/src/BizHawk.Common/NativeMethods.json
@@ -0,0 +1,8 @@
+{
+	"allowMarshaling": false,
+	"className": "Win32Imports",
+	"multiTargetingFriendlyAPIs": true,
+	"public": true,
+	"wideCharOnly": false,
+	"$schema": "https://aka.ms/CsWin32.schema.json"
+}
diff --git a/src/BizHawk.Common/NativeMethods.txt b/src/BizHawk.Common/NativeMethods.txt
@@ -0,0 +1,13 @@
+CreatePopupMenu
+DeleteFileW
+DestroyMenu
+FormatMessageW
+GetCurrentProcess
+GetShortPathNameW
+IsWow64Process
+MAX_PATH
+PathRelativePathToW
+SetDllDirectoryW
+SystemParametersInfoW
+timeBeginPeriod
+TrackPopupMenuEx
diff --git a/src/BizHawk.Common/OSTailoredCode.cs b/src/BizHawk.Common/OSTailoredCode.cs
@@ -3,6 +3,9 @@
 
 using BizHawk.Common.StringExtensions;
 
+using Windows.Win32;
+using Windows.Win32.System.Diagnostics.Debug;
+
 using static BizHawk.Common.LoaderApiImports;
 
 namespace BizHawk.Common
@@ -231,10 +234,16 @@ public IntPtr LoadOrThrow(string dllToLoad)
 			public unsafe string GetErrorMessage()
 			{
 				var errCode = Win32Imports.GetLastError();
-				var buffer = stackalloc char[1024];
-				const int FORMAT_MESSAGE_FROM_SYSTEM = 0x1000;
-				var sz = Win32Imports.FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, IntPtr.Zero, errCode, 0, buffer, 1024, IntPtr.Zero);
-				return $"error code: 0x{errCode:X8}, error message: {new string(buffer, 0, sz)}";
+				Span<char> buffer = stackalloc char[1024];
+				var sz = Win32Imports.FormatMessageW(
+					FORMAT_MESSAGE_OPTIONS.FORMAT_MESSAGE_FROM_SYSTEM,
+					lpSource: default,
+					dwMessageId: errCode,
+					dwLanguageId: 0,
+					buffer,
+					nSize: 1024,
+					Arguments: default);
+				return $"error code: 0x{errCode:X8}, error message: {buffer.Slice(start: 0, length: (int) sz).ToString()}";
 			}
 		}
 
diff --git a/src/BizHawk.Common/SHLWAPI.dll.cs b/src/BizHawk.Common/SHLWAPI.dll.cs
@@ -0,0 +1,23 @@
+using System.IO;
+
+using Windows.Win32.Foundation;
+
+namespace Windows.Win32
+{
+	public static partial class Win32Imports
+	{
+		/// <inheritdoc cref="PathRelativePathToW(PWSTR, PCWSTR, uint, PCWSTR, uint)"/>
+		public static BOOL PathRelativePathToW(
+			Span<char> pszPath,
+			string pszFrom,
+			FileAttributes dwAttrFrom,
+			string pszTo,
+			FileAttributes dwAttrTo)
+				=> PathRelativePathToW(
+					pszPath: pszPath,
+					pszFrom: pszFrom,
+					dwAttrFrom: unchecked((uint) dwAttrFrom),
+					pszTo: pszTo,
+					dwAttrTo: unchecked((uint) dwAttrTo));
+	}
+}
diff --git a/src/BizHawk.Common/TPMFLAGS.cs b/src/BizHawk.Common/TPMFLAGS.cs
@@ -0,0 +1,33 @@
+namespace Windows.Win32.UI.WindowsAndMessaging
+{
+	[Flags]
+	public enum TPMFLAGS : uint
+	{
+		CENTERALIGN = 0x0004U,
+		LEFTALIGN = 0x0000U,
+		RIGHTALIGN = 0x0008U,
+
+		BOTTOMALIGN = 0x0020U,
+		TOPALIGN = 0x0000U,
+		VCENTERALIGN = 0x0010U,
+
+		NONOTIFY = 0x0080U,
+		RETURNCMD = 0x0100U,
+
+		LEFTBUTTON = 0x0000U,
+		RIGHTBUTTON = 0x0002U,
+
+		HORNEGANIMATION = 0x0800U,
+		HORPOSANIMATION = 0x0400U,
+		NOANIMATION = 0x4000U,
+		VERNEGANIMATION = 0x2000U,
+		VERPOSANIMATION = 0x1000U,
+
+		RECURSE = 0x0001U, // value missing from official docs, but confirmed by https://github.com/microsoft/windows-rs/blob/bb15076311bf185400ecd244d47596b8415450fa/crates/libs/sys/src/Windows/Win32/UI/WindowsAndMessaging/mod.rs#L3461
+
+		HORIZONTAL = 0x0000U,
+		VERTICAL = 0x0040U,
+
+		LAYOUTRTL = 0x8000U, // value also missing from official docs, but confirmed by https://github.com/microsoft/windows-rs/blob/bb15076311bf185400ecd244d47596b8415450fa/crates/libs/sys/src/Windows/Win32/UI/WindowsAndMessaging/mod.rs#L3456
+	}
+}
diff --git a/src/BizHawk.Common/TempFileManager.cs b/src/BizHawk.Common/TempFileManager.cs
@@ -5,6 +5,8 @@
 
 using BizHawk.Common.PathExtensions;
 
+using Windows.Win32;
+
 namespace BizHawk.Common
 {
 	/// <summary>
diff --git a/src/BizHawk.Common/USER32.dll.cs b/src/BizHawk.Common/USER32.dll.cs
@@ -0,0 +1,44 @@
+using System.Runtime.InteropServices;
+
+using Windows.Win32.Foundation;
+using Windows.Win32.UI.WindowsAndMessaging;
+
+using SPIValPointed = System.IntPtr; // `void*`; any 4-octet value
+
+namespace Windows.Win32
+{
+	public static partial class Win32Imports
+	{
+		/// <inheritdoc cref="TrackPopupMenuEx(HMENU, uint, int, int, HWND, TPMPARAMS*)" />
+		public static unsafe BOOL TrackPopupMenuEx(
+			HMENU hMenu,
+			TPMFLAGS uFlags,
+			int x,
+			int y,
+			HWND hwnd,
+			[Optional] TPMPARAMS* lptpm)
+				=> TrackPopupMenuEx(hMenu, uFlags: unchecked((uint) uFlags), x: x, y: y, hwnd, lptpm);
+
+		/// <summary>getter</summary>
+		/// <seealso cref="SystemParametersInfoW(SYSTEM_PARAMETERS_INFO_ACTION, uint, void*, SYSTEM_PARAMETERS_INFO_UPDATE_FLAGS)" />
+		public static unsafe BOOL SystemParametersInfoW(
+			SYSTEM_PARAMETERS_INFO_ACTION uiAction,
+			uint uiParam,
+			out SPIValPointed pvParam)
+		{
+			const SYSTEM_PARAMETERS_INFO_UPDATE_FLAGS NONE = 0;
+			fixed (void* ptr = &pvParam) return SystemParametersInfoW(uiAction, uiParam, ptr, NONE);
+		}
+
+		/// <summary>setter</summary>
+		/// <seealso cref="SystemParametersInfoW(SYSTEM_PARAMETERS_INFO_ACTION, uint, void*, SYSTEM_PARAMETERS_INFO_UPDATE_FLAGS)" />
+		public static unsafe BOOL SystemParametersInfoW(
+			SYSTEM_PARAMETERS_INFO_ACTION uiAction,
+			uint uiParam,
+			SYSTEM_PARAMETERS_INFO_UPDATE_FLAGS fWinIni)
+		{
+			SPIValPointed pvParam1 = default;
+			return SystemParametersInfoW(uiAction, uiParam, &pvParam1, fWinIni);
+		}
+	}
+}
diff --git a/src/BizHawk.Common/Win32/CWDHacks.cs b/src/BizHawk.Common/Win32/CWDHacks.cs
@@ -1,5 +1,7 @@
 using System.Runtime.InteropServices;
 
+using Windows.Win32;
+
 namespace BizHawk.Common
 {
 	/// <summary>Gets/Sets the current working directory while bypassing the security checks triggered by the public API (<see cref="Environment.CurrentDirectory"/>).</summary>
diff --git a/src/BizHawk.Common/Win32/MotWHack.cs b/src/BizHawk.Common/Win32/MotWHack.cs
@@ -1,6 +1,8 @@
+using Windows.Win32;
+
 namespace BizHawk.Common
 {
-	/// <remarks>This code (and an import for <see cref="Win32Imports.DeleteFileW"/>) is duplicated in each executable project because it needs to be used before loading assemblies.</remarks>
+	/// <remarks>This code (and an import for <c>DeleteFileW</c>) is duplicated in each executable project because it needs to be used before loading assemblies.</remarks>
 	public static class MotWHack
 	{
 		public static void RemoveMOTW(string path)
diff --git a/src/BizHawk.Common/Win32/Win32Imports.cs b/src/BizHawk.Common/Win32/Win32Imports.cs
diff --git a/src/BizHawk.Common/Win32/Win32ShellContextMenu.cs b/src/BizHawk.Common/Win32/Win32ShellContextMenu.cs

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`	`using BizHawk.Common.StringExtensions;`
`9`	`9`	`using BizHawk.Emulation.DiscSystem;`
`10`	`10`
	`11`	`+using Windows.Win32;`
	`12`	`+`
`11`	`13`	`namespace BizHawk.Client.DiscoHawk`
`12`	`14`	`{`
`13`	`15`	`internal static class Program`
`@@ -83,22 +85,22 @@ private static void Main(string[] args)`
`83`	`85`
`84`	`86`	`if (dllDir.ContainsOrdinal(';'))`
`85`	`87`	`{`
`86`		`- var dllShortPathLen = Win32Imports.GetShortPathNameW(dllDir, null, 0);`
	`88`	`+ var dllShortPathLen = Win32Imports.GetShortPathNameW(dllDir);`
`87`	`89`	`if (dllShortPathLen == 0)`
`88`	`90`	`{`
`89`	`91`	`MessageBox.Show(SEMICOLON_IN_DIR_MSG);`
`90`	`92`	`return;`
`91`	`93`	`}`
`92`	`94`
`93`	`95`	`var dllShortPathBuffer = new char[dllShortPathLen];`
`94`		`- dllShortPathLen = Win32Imports.GetShortPathNameW(dllDir, dllShortPathBuffer, dllShortPathLen);`
	`96`	`+ dllShortPathLen = Win32Imports.GetShortPathNameW(dllDir, dllShortPathBuffer);`
`95`	`97`	`if (dllShortPathLen == 0)`
`96`	`98`	`{`
`97`	`99`	`MessageBox.Show(SEMICOLON_IN_DIR_MSG);`
`98`	`100`	`return;`
`99`	`101`	`}`
`100`	`102`
`101`		`- dllDir = new string(dllShortPathBuffer, 0, dllShortPathLen);`
	`103`	`+ dllDir = dllShortPathBuffer.AsSpan(start: 0, length: (int) dllShortPathLen).ToString();`
`102`	`104`	`if (dllDir.ContainsOrdinal(';'))`
`103`	`105`	`{`
`104`	`106`	`MessageBox.Show(SEMICOLON_IN_DIR_MSG);`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`	`using BizHawk.Common;`
`5`	`5`	`using BizHawk.Common.StringExtensions;`
`6`	`6`
	`7`	`+using Windows.Win32;`
	`8`	`+`
`7`	`9`	`namespace BizHawk.Client.EmuHawk`
`8`	`10`	`{`
`9`	`11`	`public static class EmuHawkUtil`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@`
`14`	`14`	`using BizHawk.Client.EmuHawk.CustomControls;`
`15`	`15`	`using BizHawk.Emulation.Cores;`
`16`	`16`
	`17`	`+using Windows.Win32;`
	`18`	`+`
`17`	`19`	`namespace BizHawk.Client.EmuHawk`
`18`	`20`	`{`
`19`	`21`	`internal static class Program`
`@@ -132,22 +134,22 @@ private static int SubMain(string[] args)`
`132`	`134`
`133`	`135`	`if (dllDir.ContainsOrdinal(';'))`
`134`	`136`	`{`
`135`		`- var dllShortPathLen = Win32Imports.GetShortPathNameW(dllDir, null, 0);`
	`137`	`+ var dllShortPathLen = Win32Imports.GetShortPathNameW(dllDir);`
`136`	`138`	`if (dllShortPathLen == 0)`
`137`	`139`	`{`
`138`	`140`	`MessageBox.Show(SEMICOLON_IN_DIR_MSG);`
`139`	`141`	`return -1;`
`140`	`142`	`}`
`141`	`143`
`142`	`144`	`var dllShortPathBuffer = new char[dllShortPathLen];`
`143`		`- dllShortPathLen = Win32Imports.GetShortPathNameW(dllDir, dllShortPathBuffer, dllShortPathLen);`
	`145`	`+ dllShortPathLen = Win32Imports.GetShortPathNameW(dllDir, dllShortPathBuffer);`
`144`	`146`	`if (dllShortPathLen == 0)`
`145`	`147`	`{`
`146`	`148`	`MessageBox.Show(SEMICOLON_IN_DIR_MSG);`
`147`	`149`	`return -1;`
`148`	`150`	`}`
`149`	`151`
`150`		`- dllDir = new string(dllShortPathBuffer, 0, dllShortPathLen);`
	`152`	`+ dllDir = dllShortPathBuffer.AsSpan(start: 0, length: (int) dllShortPathLen).ToString();`
`151`	`153`	`if (dllDir.ContainsOrdinal(';'))`
`152`	`154`	`{`
`153`	`155`	`MessageBox.Show(SEMICOLON_IN_DIR_MSG);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`using BizHawk.Common;`
`2`	`2`
	`3`	`+using Windows.Win32;`
	`4`	`+using Windows.Win32.UI.WindowsAndMessaging;`
	`5`	`+`
`3`	`6`	`namespace BizHawk.Client.EmuHawk`
`4`	`7`	`{`
`5`	`8`	`/// <remarks>Derived from http://www.codeproject.com/KB/cs/ScreenSaverControl.aspx</remarks>`
`@@ -19,17 +22,18 @@ public int Duration`
`19`	`22`	`{`
`20`	`23`	`get`
`21`	`24`	`{`
`22`		`- const int SPI_GETSCREENSAVERTIMEOUT = 14;`
`23`		`- int value = default;`
`24`		`- Win32Imports.SystemParametersInfoW(SPI_GETSCREENSAVERTIMEOUT, 0, ref value, 0);`
`25`		`- return value;`
	`25`	`+ _ = Win32Imports.SystemParametersInfoW(`
	`26`	`+ SYSTEM_PARAMETERS_INFO_ACTION.SPI_GETSCREENSAVETIMEOUT,`
	`27`	`+ uiParam: 0,`
	`28`	`+ out var value);`
	`29`	`+ return unchecked((int) value);`
`26`	`30`	`}`
`27`	`31`	`set`
`28`	`32`	`{`
`29`		`- const int SPI_SETSCREENSAVERTIMEOUT = 15;`
`30`		`- const int SPIF_SENDWININICHANGE = 2;`
`31`		`- int nullVar = default;`
`32`		`- Win32Imports.SystemParametersInfoW(SPI_SETSCREENSAVERTIMEOUT, value, ref nullVar, SPIF_SENDWININICHANGE);`
	`33`	`+ _ = Win32Imports.SystemParametersInfoW(`
	`34`	`+ SYSTEM_PARAMETERS_INFO_ACTION.SPI_SETSCREENSAVETIMEOUT,`
	`35`	`+ unchecked((uint) value),`
	`36`	`+ SYSTEM_PARAMETERS_INFO_UPDATE_FLAGS.SPIF_SENDWININICHANGE);`
`33`	`37`	`}`
`34`	`38`	`}`
`35`	`39`	`}`