Updated Storm.lib test program

5 files changed, 26 insertions, 7 deletions

diff --git a/storm_dll/Storm_dll.sln b/storm_dll/Storm_dll.sln
index 4f78087..286e613 100644
--- a/storm_dll/Storm_dll.sln
+++ b/storm_dll/Storm_dll.sln
@@ -2,6 +2,8 @@ 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}") = "storm_test", "storm_test_vs08.vcproj", "{5B0E680A-EC4E-402E-AE0D-18ADD2DC6EBE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -18,6 +20,14 @@ 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.lib b/storm_dll/storm.lib
index ce5f3f4..3a68346 100644
--- a/storm_dll/storm.lib
+++ b/storm_dll/storm.lib
diff --git a/storm_dll/storm_dll.h b/storm_dll/storm_dll.h
index 8625bd0..5c31384 100644
--- a/storm_dll/storm_dll.h
+++ b/storm_dll/storm_dll.h
@@ -13,13 +13,13 @@
 /* 11.04.03  1.00  Lad  Added some functions                                 */
 /*****************************************************************************/
 
-// We need the Windows data types for the Storm prototypes
-#include <windows.h>
-
 #ifndef __STORM_H__
 #define __STORM_H__
 
-// Somethimes is necessary to change the function names so they
+// We need the Windows data types for the Storm prototypes
+#include <windows.h>
+
+// Sometimes is necessary to change the function names so they
 // will not conflict with other MPQ tools.
 #ifdef STORM_ALTERNATE_NAMES
   #define SFILE(Name) Storm##Name
@@ -58,6 +58,7 @@ BOOL  WINAPI SCOMP(Decompress)(char * pbOutBuffer, int * pdwOutLength, char * pb
 }
 #endif
 
+#pragma message("Huhu1")
 #if defined(_MSC_VER) && !defined(BUILDING_STORM_CPP)
 #pragma comment(lib, "Storm.lib")    // Force linking Storm.lib and thus Storm.dll
 #endif
diff --git a/storm_dll/storm_test.cpp b/storm_dll/storm_test.cpp
index b72d589..766750b 100644
--- a/storm_dll/storm_test.cpp
+++ b/storm_dll/storm_test.cpp
@@ -16,7 +16,7 @@
 #include <crtdbg.h>
 #endif
 
-#define STORM_ALTERNATE_NAMES
+#define STORM_ALTERNATE_NAMES               // Use Storm* prefix for functions
 #include "storm_dll.h"                      // Header file for Storm.dll
 
 //-----------------------------------------------------------------------------
@@ -24,7 +24,7 @@
 
 int main()
 {
-    LPCSTR szArchiveName = "e:\\Multimedia\\MPQs\\1995 - Test MPQs\\MPQ_2016_v1_123.w3x";
+    LPCSTR szArchiveName = "e:\\war3.mpq";
     HANDLE hMpq = NULL;
     HANDLE hFile = NULL;
     BYTE Buffer[0x100];
@@ -32,7 +32,7 @@ int main()
 
     if(StormOpenArchive(szArchiveName, 0, 0, &hMpq))
     {                             
-        if(StormOpenFileEx(hMpq, "war3map.j", 0, &hFile))
+        if(StormOpenFileEx(hMpq, "(1)TheDeathSheep.w3m", 0, &hFile))
         {
             dwBytesRead = StormGetFileSize(hFile, NULL);
             StormReadFile(hFile, Buffer, sizeof(Buffer), &dwBytesRead, NULL); 
diff --git a/storm_dll/storm_test.vcproj b/storm_dll/storm_test_vs08.vcproj
index 0af7b89..456b11e 100644
--- a/storm_dll/storm_test.vcproj
+++ b/storm_dll/storm_test_vs08.vcproj
@@ -345,6 +345,14 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			>
+			<File
+				RelativePath=".\storm_dll.h"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>