From 8a370dd9336540b8be585272182de0f74aac9241 Mon Sep 17 00:00:00 2001
From: Ladislav Zezula <ladislav.zezula@avg.com>
Date: Fri, 15 Jul 2016 14:57:46 +0200
Subject: + Fixed workspace for storm_dll + Updated storm.dll from Warcraft
 1.27

---
 storm_dll/Storm_dll.sln     |  12 +--------
 storm_dll/Storm_dll.vcproj  |  60 ++++++++++++++++++++++----------------------
 storm_dll/storm.dll         | Bin 327680 -> 334312 bytes
 storm_dll/storm.lib         | Bin 5238 -> 5238 bytes
 storm_dll/storm_test.cpp    |  12 ++++++---
 storm_dll/storm_test.vcproj |  18 ++++++-------
 6 files changed, 49 insertions(+), 53 deletions(-)

(limited to 'storm_dll')

diff --git a/storm_dll/Storm_dll.sln b/storm_dll/Storm_dll.sln
index 2641f65..4f78087 100644
--- a/storm_dll/Storm_dll.sln
+++ b/storm_dll/Storm_dll.sln
@@ -1,8 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Storm_dll", "Storm_dll.vcproj", "{BD600973-C6FA-4CE3-8821-67F6418B7F9C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PhotoSort", "Storm_test.vcproj", "{5B0E680A-EC4E-402E-AE0D-18ADD2DC6EBE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "storm_dll", "storm_dll.vcproj", "{BD600973-C6FA-4CE3-8821-67F6418B7F9C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -20,14 +18,6 @@ Global
 		{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.Release|Win32.Build.0 = Release|Win32
 		{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.Release|x64.ActiveCfg = Release|x64
 		{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.Release|x64.Build.0 = Release|x64
-		{5B0E680A-EC4E-402E-AE0D-18ADD2DC6EBE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5B0E680A-EC4E-402E-AE0D-18ADD2DC6EBE}.Debug|Win32.Build.0 = Debug|Win32
-		{5B0E680A-EC4E-402E-AE0D-18ADD2DC6EBE}.Debug|x64.ActiveCfg = Debug|x64
-		{5B0E680A-EC4E-402E-AE0D-18ADD2DC6EBE}.Debug|x64.Build.0 = Debug|x64
-		{5B0E680A-EC4E-402E-AE0D-18ADD2DC6EBE}.Release|Win32.ActiveCfg = Release|Win32
-		{5B0E680A-EC4E-402E-AE0D-18ADD2DC6EBE}.Release|Win32.Build.0 = Release|Win32
-		{5B0E680A-EC4E-402E-AE0D-18ADD2DC6EBE}.Release|x64.ActiveCfg = Release|x64
-		{5B0E680A-EC4E-402E-AE0D-18ADD2DC6EBE}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/storm_dll/Storm_dll.vcproj b/storm_dll/Storm_dll.vcproj
index 394d367..da9a11d 100644
--- a/storm_dll/Storm_dll.vcproj
+++ b/storm_dll/Storm_dll.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="Storm_dll"
+	Name="storm_dll"
 	ProjectGUID="{BD600973-C6FA-4CE3-8821-67F6418B7F9C}"
-	RootNamespace="Storm_dll"
+	RootNamespace="storm_dll"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
@@ -44,10 +44,10 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Storm_dll_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;storm_dll_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
@@ -66,7 +66,7 @@
 				OutputFile="$(OutDir)\storm.dll"
 				LinkIncremental="2"
 				GenerateManifest="false"
-				ModuleDefinitionFile=".\Storm_dll.def"
+				ModuleDefinitionFile=".\storm_dll.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				BaseAddress="0x15000000"
@@ -94,16 +94,15 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="Storm_dll.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine=""
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Debug|x64"
 			OutputDirectory=".\bin\$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory=".\bin\$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -119,11 +118,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Storm_dll_EXPORTS"
-				RuntimeLibrary="2"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;storm_dll_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -140,17 +143,15 @@
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\storm.dll"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				GenerateManifest="false"
-				ModuleDefinitionFile=".\Storm_dll.def"
+				ModuleDefinitionFile=".\storm_dll.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
 				BaseAddress="0x15000000"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -172,15 +173,16 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="Storm_dll.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="storm_dll.bat $(PlatformName) $(ConfigurationName)"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Release|Win32"
 			OutputDirectory=".\bin\$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory=".\bin\$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="1"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -196,15 +198,11 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Storm_dll_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;storm_dll_EXPORTS"
+				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -221,15 +219,17 @@
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\storm.dll"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				GenerateManifest="false"
-				ModuleDefinitionFile=".\Storm_dll.def"
+				ModuleDefinitionFile=".\storm_dll.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 				BaseAddress="0x15000000"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -251,7 +251,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="Storm_dll.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine=""
 			/>
 		</Configuration>
 		<Configuration
@@ -280,7 +280,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Storm_dll_EXPORTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;storm_dll_EXPORTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -300,7 +300,7 @@
 				OutputFile="$(OutDir)\storm.dll"
 				LinkIncremental="1"
 				GenerateManifest="false"
-				ModuleDefinitionFile=".\Storm_dll.def"
+				ModuleDefinitionFile=".\storm_dll.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -330,7 +330,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="Storm_dll.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="storm_dll.bat $(PlatformName) $(ConfigurationName)"
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/storm_dll/storm.dll b/storm_dll/storm.dll
index d4daca0..e35fc12 100644
Binary files a/storm_dll/storm.dll and b/storm_dll/storm.dll differ
diff --git a/storm_dll/storm.lib b/storm_dll/storm.lib
index 299a6d4..64d3561 100644
Binary files a/storm_dll/storm.lib and b/storm_dll/storm.lib differ
diff --git a/storm_dll/storm_test.cpp b/storm_dll/storm_test.cpp
index 4c69443..5e498b3 100644
--- a/storm_dll/storm_test.cpp
+++ b/storm_dll/storm_test.cpp
@@ -22,15 +22,21 @@
 //-----------------------------------------------------------------------------
 // Main
 
+unsigned char szKoreanFileName[] = {0x77, 0x61, 0x72, 0x33, 0x6D, 0x61, 0x70, 0x49, 0x6D, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, 0x5C, 0xBF, 0xD5, 0xB1, 0xB9, 0x2E, 0x6D, 0x70, 0x33, 0x00};
+
 int main()
 {
+    LPCSTR szArchiveName = "e:\\MPQ_2016_v1_KoreanFile.w3m";
     HANDLE hMpq = NULL;
     HANDLE hFile = NULL;
+    char szFileName[MAX_PATH];
+
+    _asm int 3;
 
-    if(StormOpenArchive("e:\\Multimedia\\MPQs\\1995 - Test MPQs\\MPQ_2015_v1_MessListFile.mpq", 0, 0, &hMpq))
+    if(StormOpenArchive(szArchiveName, 0, 0, &hMpq))
     {                             
-        _asm int 3;
-        if(StormOpenFileEx(hMpq, "\\\\\\*¹BTNGoblinPyrotechnician.blp", 0, &hFile))
+        memcpy(szFileName, szKoreanFileName, _countof(szKoreanFileName));
+        if(StormOpenFileEx(hMpq, szFileName, 0, &hFile))
         {
             StormCloseFile(hFile);
         }
diff --git a/storm_dll/storm_test.vcproj b/storm_dll/storm_test.vcproj
index 571ad8e..0af7b89 100644
--- a/storm_dll/storm_test.vcproj
+++ b/storm_dll/storm_test.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="Storm_test"
+	Name="storm_test"
 	ProjectGUID="{5B0E680A-EC4E-402E-AE0D-18ADD2DC6EBE}"
-	RootNamespace="Storm_test"
+	RootNamespace="storm_test"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
@@ -65,11 +65,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/Storm_test.exe"
+				OutputFile="$(OutDir)/storm_test.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="../aaa/lib32"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/Storm_test.pdb"
+				ProgramDatabaseFile="$(OutDir)/storm_test.pdb"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -144,11 +144,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/Storm_test.exe"
+				OutputFile="$(OutDir)/storm_test.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="../aaa/lib64"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/Storm_test.pdb"
+				ProgramDatabaseFile="$(OutDir)/storm_test.pdb"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -219,7 +219,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/Storm_test.exe"
+				OutputFile="$(OutDir)/storm_test.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="../aaa/lib32"
 				GenerateDebugInformation="true"
@@ -297,7 +297,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/Storm_test.exe"
+				OutputFile="$(OutDir)/storm_test.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="../aaa/lib64"
 				GenerateDebugInformation="true"
@@ -341,7 +341,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\Storm_test.cpp"
+				RelativePath=".\storm_test.cpp"
 				>
 			</File>
 		</Filter>
-- 
cgit v1.2.3