Migrated to VS 2019

13 files changed, 92 insertions, 80 deletions

diff --git a/StormLib_vs08.vcproj b/StormLib_vs08.vcproj
index 3945360..0c02e13 100644
--- a/StormLib_vs08.vcproj
+++ b/StormLib_vs08.vcproj
@@ -80,7 +80,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -145,7 +145,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -209,7 +209,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -274,7 +274,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -336,7 +336,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -399,7 +399,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -461,7 +461,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -524,7 +524,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -588,7 +588,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -653,7 +653,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -717,7 +717,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -782,7 +782,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -844,7 +844,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -907,7 +907,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -969,7 +969,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -1032,7 +1032,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/StormLib_vs08_dll.vcproj b/StormLib_vs08_dll.vcproj
index 0b8d247..8658887 100644
--- a/StormLib_vs08_dll.vcproj
+++ b/StormLib_vs08_dll.vcproj
@@ -65,7 +65,7 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\StormLib.dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile=".\StormLib_dll\StormLib.def"
+				ModuleDefinitionFile=".\src\DllMain.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -92,6 +92,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName)"
 			/>
 		</Configuration>
 		<Configuration
@@ -141,7 +142,7 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\StormLib.dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile=".\StormLib_dll\StormLib.def"
+				ModuleDefinitionFile=".\src\DllMain.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -168,6 +169,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName)"
 			/>
 		</Configuration>
 		<Configuration
@@ -214,7 +216,7 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\StormLib.dll"
 				LinkIncremental="1"
-				ModuleDefinitionFile=".\StormLib_dll\StormLib.def"
+				ModuleDefinitionFile=".\src\DllMain.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -243,6 +245,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName)"
 			/>
 		</Configuration>
 		<Configuration
@@ -290,7 +293,7 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\StormLib.dll"
 				LinkIncremental="1"
-				ModuleDefinitionFile=".\StormLib_dll\StormLib.def"
+				ModuleDefinitionFile=".\src\DllMain.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -319,6 +322,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName)"
 			/>
 		</Configuration>
 	</Configurations>
@@ -361,7 +365,7 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath=".\stormlib_dll\DllMain.c"
+				RelativePath=".\src\DllMain.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -397,6 +401,10 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath=".\src\DllMain.rc"
+				>
+			</File>
+			<File
 				RelativePath=".\src\FileStream.cpp"
 				>
 				<FileConfiguration
@@ -1660,10 +1668,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath=".\stormlib_dll\StormLib.def"
-				>
-			</File>
 			<Filter
 				Name="adpcm"
 				>
@@ -2649,6 +2653,10 @@
 				</File>
 			</Filter>
 		</Filter>
+		<File
+			RelativePath=".\src\resource.h"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/StormLib_vs17.bat b/StormLib_vs19.bat
index ec14a90..6052b52 100644
--- a/StormLib_vs17.bat
+++ b/StormLib_vs19.bat
@@ -16,26 +16,26 @@ if exist "%PROGRAM_FILES_DIR%\Microsoft Visual Studio\2017\Enterprise\VC\Auxilia
 
 :BUILD_32BIT
 call "%VCVARS_BAT%" x86
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "DebugAD|Win32"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "DebugAS|Win32"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "DebugUD|Win32"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "DebugUS|Win32"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "ReleaseAD|Win32"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "ReleaseAS|Win32"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "ReleaseUD|Win32"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "ReleaseUS|Win32"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "DebugAD|Win32"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "DebugAS|Win32"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "DebugUD|Win32"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "DebugUS|Win32"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "ReleaseAD|Win32"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "ReleaseAS|Win32"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "ReleaseUD|Win32"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "ReleaseUS|Win32"
 call :RestoreEnvVars
 
 :BUILD_64BIT
 call "%VCVARS_BAT%" x64
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "DebugAD|x64"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "DebugAS|x64"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "DebugUD|x64"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "DebugUS|x64"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "ReleaseAD|x64"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "ReleaseAS|x64"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "ReleaseUD|x64"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "ReleaseUS|x64"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "DebugAD|x64"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "DebugAS|x64"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "DebugUD|x64"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "DebugUS|x64"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "ReleaseAD|x64"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "ReleaseAS|x64"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "ReleaseUD|x64"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "ReleaseUS|x64"
 call :RestoreEnvVars
 
 :RestoreEnvVars
diff --git a/StormLib_vs17.sln b/StormLib_vs19.sln
index b5f7f03..586dd6b 100644
--- a/StormLib_vs17.sln
+++ b/StormLib_vs19.sln
@@ -2,11 +2,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28010.2050
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib", "StormLib_vs17.vcxproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib", "StormLib_vs19.vcxproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib_dll", "StormLib_vs17_dll.vcxproj", "{CB385198-50B1-4CF4-883B-11F042DED6AA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib_dll", "StormLib_vs19_dll.vcxproj", "{CB385198-50B1-4CF4-883B-11F042DED6AA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib_test", "StormLib_vs17_test.vcxproj", "{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib_test", "StormLib_vs19_test.vcxproj", "{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/StormLib_vs17.vcxproj b/StormLib_vs19.vcxproj
index c8086cc..273668a 100644
--- a/StormLib_vs17.vcxproj
+++ b/StormLib_vs19.vcxproj
@@ -73,7 +73,7 @@
     <XPDeprecationWarning>false</XPDeprecationWarning>
     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -274,7 +274,7 @@
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
     </Lib>
     <PostBuildEvent>
-      <Command>PostBuild.bat $(Platform) $(Configuration)</Command>
+      <Command>PostBuild.bat $(ProjectName) $(Platform) $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">
@@ -294,7 +294,7 @@
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
     </Lib>
     <PostBuildEvent>
-      <Command>PostBuild.bat $(Platform) $(Configuration)</Command>
+      <Command>PostBuild.bat $(ProjectName) $(Platform) $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">
@@ -311,7 +311,7 @@
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
     </Lib>
     <PostBuildEvent>
-      <Command>PostBuild.bat $(Platform) $(Configuration)</Command>
+      <Command>PostBuild.bat $(ProjectName) $(Platform) $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">
@@ -331,7 +331,7 @@
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
     </Lib>
     <PostBuildEvent>
-      <Command>PostBuild.bat $(Platform) $(Configuration)</Command>
+      <Command>PostBuild.bat $(ProjectName) $(Platform) $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">
@@ -347,7 +347,7 @@
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
     </Lib>
     <PostBuildEvent>
-      <Command>PostBuild.bat $(Platform) $(Configuration)</Command>
+      <Command>PostBuild.bat $(ProjectName) $(Platform) $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">
@@ -366,7 +366,7 @@
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
     </Lib>
     <PostBuildEvent>
-      <Command>PostBuild.bat $(Platform) $(Configuration)</Command>
+      <Command>PostBuild.bat $(ProjectName) $(Platform) $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">
@@ -382,7 +382,7 @@
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
     </Lib>
     <PostBuildEvent>
-      <Command>PostBuild.bat $(Platform) $(Configuration)</Command>
+      <Command>PostBuild.bat $(ProjectName) $(Platform) $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">
@@ -401,7 +401,7 @@
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
     </Lib>
     <PostBuildEvent>
-      <Command>PostBuild.bat $(Platform) $(Configuration)</Command>
+      <Command>PostBuild.bat $(ProjectName) $(Platform) $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugUD|Win32'">
@@ -418,7 +418,7 @@
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
     </Lib>
     <PostBuildEvent>
-      <Command>PostBuild.bat $(Platform) $(Configuration)</Command>
+      <Command>PostBuild.bat $(ProjectName) $(Platform) $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugUD|x64'">
@@ -438,7 +438,7 @@
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
     </Lib>
     <PostBuildEvent>
-      <Command>PostBuild.bat $(Platform) $(Configuration)</Command>
+      <Command>PostBuild.bat $(ProjectName) $(Platform) $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugUS|Win32'">
@@ -455,7 +455,7 @@
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
     </Lib>
     <PostBuildEvent>
-      <Command>PostBuild.bat $(Platform) $(Configuration)</Command>
+      <Command>PostBuild.bat $(ProjectName) $(Platform) $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugUS|x64'">
@@ -475,7 +475,7 @@
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
     </Lib>
     <PostBuildEvent>
-      <Command>PostBuild.bat $(Platform) $(Configuration)</Command>
+      <Command>PostBuild.bat $(ProjectName) $(Platform) $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseUD|Win32'">
@@ -491,7 +491,7 @@
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
     </Lib>
     <PostBuildEvent>
-      <Command>PostBuild.bat $(Platform) $(Configuration)</Command>
+      <Command>PostBuild.bat $(ProjectName) $(Platform) $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseUD|x64'">
@@ -510,7 +510,7 @@
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
     </Lib>
     <PostBuildEvent>
-      <Command>PostBuild.bat $(Platform) $(Configuration)</Command>
+      <Command>PostBuild.bat $(ProjectName) $(Platform) $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseUS|Win32'">
@@ -526,7 +526,7 @@
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
     </Lib>
     <PostBuildEvent>
-      <Command>PostBuild.bat $(Platform) $(Configuration)</Command>
+      <Command>PostBuild.bat $(ProjectName) $(Platform) $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseUS|x64'">
@@ -545,7 +545,7 @@
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
     </Lib>
     <PostBuildEvent>
-      <Command>PostBuild.bat $(Platform) $(Configuration)</Command>
+      <Command>PostBuild.bat $(ProjectName) $(Platform) $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/StormLib_vs17.vcxproj.filters b/StormLib_vs19.vcxproj.filters
index 37915d2..37915d2 100644
--- a/StormLib_vs17.vcxproj.filters
+++ b/StormLib_vs19.vcxproj.filters
diff --git a/StormLib_vs17_dll.vcxproj b/StormLib_vs19_dll.vcxproj
index b1823d2..941a605 100644
--- a/StormLib_vs17_dll.vcxproj
+++ b/StormLib_vs19_dll.vcxproj
@@ -28,24 +28,24 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -71,21 +71,25 @@
     <OutDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
     <IntDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>StormLib</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
     <IntDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>StormLib</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
     <IntDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>StormLib</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
     <IntDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>StormLib</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -99,7 +103,7 @@
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)StormLib.dll</OutputFile>
-      <ModuleDefinitionFile>.\StormLib_dll\StormLib.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>.\src\DllMain.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -122,7 +126,7 @@
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)StormLib.dll</OutputFile>
-      <ModuleDefinitionFile>.\StormLib_dll\StormLib.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>.\src\DllMain.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -140,7 +144,7 @@
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)StormLib.dll</OutputFile>
-      <ModuleDefinitionFile>.\StormLib_dll\StormLib.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>.\src\DllMain.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -163,7 +167,7 @@
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)StormLib.dll</OutputFile>
-      <ModuleDefinitionFile>.\StormLib_dll\StormLib.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>.\src\DllMain.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -517,7 +521,7 @@
     <ClCompile Include="src\zlib\inftrees.c" />
     <ClCompile Include="src\zlib\trees.c" />
     <ClCompile Include="src\zlib\zutil.c" />
-    <ClCompile Include="stormlib_dll\DllMain.c">
+    <ClCompile Include="src\DllMain.c">
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
@@ -525,7 +529,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="stormlib_dll\StormLib.def" />
+    <ResourceCompile Include="src\DllMain.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/StormLib_vs17_dll.vcxproj.filters b/StormLib_vs19_dll.vcxproj.filters
index 669438d..644488f 100644
--- a/StormLib_vs17_dll.vcxproj.filters
+++ b/StormLib_vs19_dll.vcxproj.filters
@@ -103,9 +103,6 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="stormlib_dll\DllMain.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\FileStream.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -829,10 +826,13 @@
     <ClCompile Include="src\jenkins\lookup3.c">
       <Filter>Source Files\jenkins</Filter>
     </ClCompile>
+    <ClCompile Include="src\DllMain.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="stormlib_dll\StormLib.def">
+    <ResourceCompile Include="src\DllMain.rc">
       <Filter>Source Files</Filter>
-    </None>
+    </ResourceCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/StormLib_vs17_test.vcxproj b/StormLib_vs19_test.vcxproj
index 8bba34f..96d1546 100644
--- a/StormLib_vs17_test.vcxproj
+++ b/StormLib_vs19_test.vcxproj
@@ -28,24 +28,24 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/StormLib_vs17_test.vcxproj.filters b/StormLib_vs19_test.vcxproj.filters
index 18f619a..18f619a 100644
--- a/StormLib_vs17_test.vcxproj.filters
+++ b/StormLib_vs19_test.vcxproj.filters
diff --git a/stormlib_dll/DllMain.c b/src/DllMain.c
index 98eb003..98eb003 100644
--- a/stormlib_dll/DllMain.c
+++ b/src/DllMain.c
diff --git a/stormlib_dll/StormLib.def b/src/DllMain.def
index 440b3e0..440b3e0 100644
--- a/stormlib_dll/StormLib.def
+++ b/src/DllMain.def
diff --git a/stormlib_dll/StormLib.exp b/src/StormLib.exp
index bf370aa..bf370aa 100644
--- a/stormlib_dll/StormLib.exp
+++ b/src/StormLib.exp