From 419daeadd757b31e167fe577f3d0a0eca25c9766 Mon Sep 17 00:00:00 2001 From: Ladislav Zezula Date: Sat, 21 Sep 2019 18:33:49 +0200 Subject: Updated Storm.lib test program --- storm_dll/Storm_dll.sln | 10 ++ storm_dll/storm.lib | Bin 5238 -> 5238 bytes storm_dll/storm_dll.h | 9 +- storm_dll/storm_test.cpp | 6 +- storm_dll/storm_test.vcproj | 351 -------------------------------------- storm_dll/storm_test_vs08.vcproj | 359 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 377 insertions(+), 358 deletions(-) delete mode 100644 storm_dll/storm_test.vcproj create mode 100644 storm_dll/storm_test_vs08.vcproj (limited to 'storm_dll') 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 Binary files a/storm_dll/storm.lib and b/storm_dll/storm.lib differ 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 - #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 + +// 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 #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.vcproj deleted file mode 100644 index 0af7b89..0000000 --- a/storm_dll/storm_test.vcproj +++ /dev/null @@ -1,351 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/storm_dll/storm_test_vs08.vcproj b/storm_dll/storm_test_vs08.vcproj new file mode 100644 index 0000000..456b11e --- /dev/null +++ b/storm_dll/storm_test_vs08.vcproj @@ -0,0 +1,359 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3