From 944b0ce91b0fe72dbcbbfb98010f9279ee93ef3f Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Sat, 14 Dec 2024 17:33:46 -0500
Subject: [PATCH] Redefine WIN constant to WINX86

---
 BinaryObjectScanner/BinaryObjectScanner.csproj | 2 +-
 BinaryObjectScanner/FileType/MPQ.cs            | 4 ++--
 BinaryObjectScanner/FileType/MicrosoftCAB.cs   | 4 ++--
 ExtractionTool/ExtractionTool.csproj           | 2 +-
 ExtractionTool/Program.cs                      | 4 ++--
 ProtectionScan/ProtectionScan.csproj           | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/BinaryObjectScanner/BinaryObjectScanner.csproj b/BinaryObjectScanner/BinaryObjectScanner.csproj
index 105f988b..d62d5f58 100644
--- a/BinaryObjectScanner/BinaryObjectScanner.csproj
+++ b/BinaryObjectScanner/BinaryObjectScanner.csproj
@@ -28,7 +28,7 @@
 
     <!-- Set a build flag for Windows specifically -->
     <PropertyGroup Condition="'$(RuntimeIdentifier)'=='win-x86'">
-        <DefineConstants>$(DefineConstants);WIN</DefineConstants>
+        <DefineConstants>$(DefineConstants);WINX86</DefineConstants>
     </PropertyGroup>
 
     <!-- Exclude certain parts of external modules for by default -->
diff --git a/BinaryObjectScanner/FileType/MPQ.cs b/BinaryObjectScanner/FileType/MPQ.cs
index b8ccedde..11cb78d7 100644
--- a/BinaryObjectScanner/FileType/MPQ.cs
+++ b/BinaryObjectScanner/FileType/MPQ.cs
@@ -1,6 +1,6 @@
 using System.IO;
 using BinaryObjectScanner.Interfaces;
-#if (NET452_OR_GREATER || NETCOREAPP) && WIN
+#if (NET452_OR_GREATER || NETCOREAPP) && WINX86
 using StormLibSharp;
 #endif
 
@@ -25,7 +25,7 @@ namespace BinaryObjectScanner.FileType
         /// <inheritdoc/>
         public bool Extract(Stream? stream, string file, string outDir, bool includeDebug)
         {
-#if NET20 || NET35 || !WIN
+#if NET20 || NET35 || !WINX86
             // Not supported for old .NET due to feature requirements
             // Not supported in non-Windows builds due to DLL requirements
             return false;
diff --git a/BinaryObjectScanner/FileType/MicrosoftCAB.cs b/BinaryObjectScanner/FileType/MicrosoftCAB.cs
index 5343772c..7b615d3b 100644
--- a/BinaryObjectScanner/FileType/MicrosoftCAB.cs
+++ b/BinaryObjectScanner/FileType/MicrosoftCAB.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 using BinaryObjectScanner.Interfaces;
-#if (NET40_OR_GREATER || NETCOREAPP) && WIN
+#if (NET40_OR_GREATER || NETCOREAPP) && WINX86
 using LibMSPackN;
 #else
 using SabreTools.Models.MicrosoftCabinet;
@@ -29,7 +29,7 @@ namespace BinaryObjectScanner.FileType
         /// <inheritdoc/>
         public bool Extract(Stream? stream, string file, string outDir, bool includeDebug)
         {
-#if NET20 || NET35 || !WIN
+#if NET20 || NET35 || !WINX86
             try
             {
                 // Create the wrapper
diff --git a/ExtractionTool/ExtractionTool.csproj b/ExtractionTool/ExtractionTool.csproj
index ddc45be6..3c383dcf 100644
--- a/ExtractionTool/ExtractionTool.csproj
+++ b/ExtractionTool/ExtractionTool.csproj
@@ -28,7 +28,7 @@
 
     <!-- Set a build flag for Windows specifically -->
     <PropertyGroup Condition="'$(RuntimeIdentifier)'=='win-x86'">
-        <DefineConstants>$(DefineConstants);WIN</DefineConstants>
+        <DefineConstants>$(DefineConstants);WINX86</DefineConstants>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/ExtractionTool/Program.cs b/ExtractionTool/Program.cs
index 03bf3331..51094dfa 100644
--- a/ExtractionTool/Program.cs
+++ b/ExtractionTool/Program.cs
@@ -300,7 +300,7 @@ namespace ExtractionTool
             {
                 // Build the cabinet information
                 Console.WriteLine("Extracting MS-CAB contents");
-#if NET20 || NET35 || !WIN
+#if NET20 || NET35 || !WINX86
                 Console.WriteLine("WARNING: LZX compression not supported so some files may be skipped!");
 #endif
                 Console.WriteLine();
@@ -317,7 +317,7 @@ namespace ExtractionTool
                 Console.WriteLine("Extracting MoPaQ contents");
                 Console.WriteLine();
 
-#if NET20 || NET35 || !WIN
+#if NET20 || NET35 || !WINX86
                 Console.WriteLine("Extraction is not supported for this framework!");
                 Console.WriteLine();
 #else
diff --git a/ProtectionScan/ProtectionScan.csproj b/ProtectionScan/ProtectionScan.csproj
index a8751ba2..9079b6f2 100644
--- a/ProtectionScan/ProtectionScan.csproj
+++ b/ProtectionScan/ProtectionScan.csproj
@@ -28,7 +28,7 @@
 
     <!-- Set a build flag for Windows specifically -->
     <PropertyGroup Condition="'$(RuntimeIdentifier)'=='win-x86'">
-        <DefineConstants>$(DefineConstants);WIN</DefineConstants>
+        <DefineConstants>$(DefineConstants);WINX86</DefineConstants>
     </PropertyGroup>
 
     <ItemGroup>