From fa6fd88d629368bf56cb8d7ee3a9d87d511ddd96 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Mon, 14 Dec 2020 06:40:06 +1000
Subject: [PATCH] Import and use OSTailoredCode in DiscoHawk program class

---
 .../BizHawk.Client.DiscoHawk.csproj           |  3 +-
 src/BizHawk.Client.DiscoHawk/DiscoHawk.cs     | 75 +++++++------------
 2 files changed, 29 insertions(+), 49 deletions(-)

diff --git a/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj b/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
index 0dad2c93f1..9ffa85c754 100755
--- a/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
+++ b/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
@@ -5,7 +5,7 @@
 	<Import Project="../MainSlnExecutable.props" />
 	<PropertyGroup>
 		<ApplicationIcon>discohawk.ico</ApplicationIcon>
-		<DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
+		<DefineConstants>$(DefineConstants);EXE_PROJECT</DefineConstants>
 	</PropertyGroup>
 <!--
 	<PropertyGroup>
@@ -62,6 +62,7 @@
 		<Reference Include="System.Web" />
 		<Reference Include="System.Windows.Forms" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj" />
+		<Compile Include="$(ProjectDir)../BizHawk.Common/OSTailoredCode.cs" />
 		<Content Include="discohawk.ico" />
 	</ItemGroup>
 	<ItemGroup>
diff --git a/src/BizHawk.Client.DiscoHawk/DiscoHawk.cs b/src/BizHawk.Client.DiscoHawk/DiscoHawk.cs
index dc52f8f3af..de67f21f1b 100644
--- a/src/BizHawk.Client.DiscoHawk/DiscoHawk.cs
+++ b/src/BizHawk.Client.DiscoHawk/DiscoHawk.cs
@@ -9,6 +9,8 @@ using System.IO;
 using BizHawk.Common;
 using BizHawk.Emulation.DiscSystem;
 
+using OSTC = EXE_PROJECT.OSTailoredCode;
+
 // cue format preferences notes
 
 // PCEjin -
@@ -22,7 +24,8 @@ namespace BizHawk.Client.DiscoHawk
 	{
 		static Program()
 		{
-#if WINDOWS
+			if (OSTC.IsUnixHost) return;
+
 			// http://www.codeproject.com/Articles/310675/AppDomain-AssemblyResolve-Event-Tips
 			// this will look in subdirectory "dll" to load pinvoked stuff
 			string dllDir = Path.Combine(GetExeDirectoryAbsolute(), "dll");
@@ -34,8 +37,15 @@ namespace BizHawk.Client.DiscoHawk
 			// but before we even try doing that, whack the MOTW from everything in that directory (that's a dll)
 			// otherwise, some people will have crashes at boot-up due to .net security disliking MOTW.
 			// some people are getting MOTW through a combination of browser used to download BizHawk, and program used to dearchive it
-			WhackAllMOTW(dllDir);
-#endif
+			static void RemoveMOTW(string path) => DeleteFileW($"{path}:Zone.Identifier");
+			var todo = new Queue<DirectoryInfo>(new[] { new DirectoryInfo(dllDir) });
+			while (todo.Count != 0)
+			{
+				var di = todo.Dequeue();
+				foreach (var diSub in di.GetDirectories()) todo.Enqueue(diSub);
+				foreach (var fi in di.GetFiles("*.dll")) RemoveMOTW(fi.FullName);
+				foreach (var fi in di.GetFiles("*.exe")) RemoveMOTW(fi.FullName);
+			}
 		}
 
 		[STAThread]
@@ -48,33 +58,24 @@ namespace BizHawk.Client.DiscoHawk
 		[DllImport("user32.dll", SetLastError = true)]
 		public static extern bool ChangeWindowMessageFilterEx(IntPtr hWnd, uint msg, ChangeWindowMessageFilterExAction action, ref CHANGEFILTERSTRUCT changeInfo);
 
-		private static class Win32
-		{
-			[DllImport("kernel32.dll")]
-			public static extern IntPtr LoadLibrary(string dllToLoad);
-			[DllImport("kernel32.dll")]
-			public static extern IntPtr GetProcAddress(IntPtr hModule, string procedureName);
-			[DllImport("kernel32.dll")]
-			public static extern bool FreeLibrary(IntPtr hModule);
-		}
-
 		private static void SubMain(string[] args)
 		{
-			// MICROSOFT BROKE DRAG AND DROP IN WINDOWS 7. IT DOESN'T WORK ANYMORE
-			// WELL, OBVIOUSLY IT DOES SOMETIMES. I DON'T REMEMBER THE DETAILS OR WHY WE HAD TO DO THIS SHIT
-#if WINDOWS
-			// BUT THE FUNCTION WE NEED DOESN'T EXIST UNTIL WINDOWS 7, CONVENIENTLY
-			// SO CHECK FOR IT
-			IntPtr lib = Win32.LoadLibrary("user32.dll");
-			IntPtr proc = Win32.GetProcAddress(lib, "ChangeWindowMessageFilterEx");
-			if (proc != IntPtr.Zero)
+			if (!OSTC.IsUnixHost)
 			{
-				ChangeWindowMessageFilter(WM_DROPFILES, ChangeWindowMessageFilterFlags.Add);
-				ChangeWindowMessageFilter(WM_COPYDATA, ChangeWindowMessageFilterFlags.Add);
-				ChangeWindowMessageFilter(0x0049, ChangeWindowMessageFilterFlags.Add);
+				// MICROSOFT BROKE DRAG AND DROP IN WINDOWS 7. IT DOESN'T WORK ANYMORE
+				// WELL, OBVIOUSLY IT DOES SOMETIMES. I DON'T REMEMBER THE DETAILS OR WHY WE HAD TO DO THIS SHIT
+				// BUT THE FUNCTION WE NEED DOESN'T EXIST UNTIL WINDOWS 7, CONVENIENTLY
+				// SO CHECK FOR IT
+				IntPtr lib = OSTC.LinkedLibManager.LoadOrThrow("user32.dll");
+				IntPtr proc = OSTC.LinkedLibManager.GetProcAddrOrZero(lib, "ChangeWindowMessageFilterEx");
+				if (proc != IntPtr.Zero)
+				{
+					ChangeWindowMessageFilter(WM_DROPFILES, ChangeWindowMessageFilterFlags.Add);
+					ChangeWindowMessageFilter(WM_COPYDATA, ChangeWindowMessageFilterFlags.Add);
+					ChangeWindowMessageFilter(0x0049, ChangeWindowMessageFilterFlags.Add);
+				}
+				OSTC.LinkedLibManager.FreeByPtr(lib);
 			}
-			Win32.FreeLibrary(lib);
-#endif
 
 			var ffmpegPath = Path.Combine(GetExeDirectoryAbsolute(), "ffmpeg.exe");
 			if (!File.Exists(ffmpegPath))
@@ -112,34 +113,12 @@ namespace BizHawk.Client.DiscoHawk
 		}
 
 		//declared here instead of a more usual place to avoid dependencies on the more usual place
-#if WINDOWS
 		[DllImport("kernel32.dll", SetLastError = true)]
 		private static extern bool SetDllDirectory(string lpPathName);
 
 		[DllImport("kernel32.dll", EntryPoint = "DeleteFileW", SetLastError = true, CharSet = CharSet.Unicode, ExactSpelling = true)]
 		private static extern bool DeleteFileW([MarshalAs(UnmanagedType.LPWStr)]string lpFileName);
 
-		private static void RemoveMOTW(string path)
-		{
-			DeleteFileW($"{path}:Zone.Identifier");
-		}
-
-		private static void WhackAllMOTW(string dllDir)
-		{
-			var todo = new Queue<DirectoryInfo>(new[] { new DirectoryInfo(dllDir) });
-			while (todo.Count > 0)
-			{
-				var di = todo.Dequeue();
-				foreach (var diSub in di.GetDirectories()) todo.Enqueue(diSub);
-				foreach (var fi in di.GetFiles("*.dll"))
-					RemoveMOTW(fi.FullName);
-				foreach (var fi in di.GetFiles("*.exe"))
-					RemoveMOTW(fi.FullName);
-			}
-
-		}
-#endif
-
 		private const uint WM_DROPFILES = 0x0233;
 		private const uint WM_COPYDATA = 0x004A;
 		[DllImport("user32")]