1 files changed, 39 insertions, 6 deletions

diff --git a/storm_dll/storm_test.cpp b/storm_dll/storm_test.cpp
index 92ff061..397c4dd 100644
--- a/storm_dll/storm_test.cpp
+++ b/storm_dll/storm_test.cpp
@@ -17,30 +17,63 @@
 #endif
 
 #define STORM_ALTERNATE_NAMES               // Use Storm* prefix for functions
-#include "storm_dll.h"                      // Header file for Storm.dll
+#include "storm.h"                          // Header file for Storm.dll
 
 //-----------------------------------------------------------------------------
 // Main
 
-int main()
+int main(int argc, char * argv[])
 {
-    LPCSTR szArchiveName = "e:\\war3.mpq";
+    LPCSTR szArchiveName;
+    LPCSTR szFileName;
+    LPCSTR szFormat;
     HANDLE hMpq = NULL;
     HANDLE hFile = NULL;
     BYTE Buffer[0x100];
     DWORD dwBytesRead = 0;
+    DWORD dwFileSize = 0;
+    BOOL bResult;
 
+    // Check parameters
+    if(argc != 3)
+    {
+        printf("Error: Missing MPQ or file name\n");
+        return 3;
+    }
+
+    // Get both arguments
+    SetLastError(ERROR_SUCCESS);
+    szArchiveName = argv[1];
+    szFileName = argv[2];
+
+    // Put Storm.dll to the current folder before running this
+    printf("[*] Opening archive '%s' ...\n", szArchiveName);
     if(StormOpenArchive(szArchiveName, 0, 0, &hMpq))
     {
-        if(StormOpenFileEx(hMpq, "(1)TheDeathSheep.w3m", 0, &hFile))
+        printf("[*] Opening file '%s' ...\n", szFileName);
+        if(StormOpenFileEx(hMpq, "staredit\\scenario.chk", 0, &hFile))
         {
-            dwBytesRead = StormGetFileSize(hFile, NULL);
-            StormReadFile(hFile, Buffer, sizeof(Buffer), &dwBytesRead, NULL);
+            printf("[*] Retrieving file size ... ");
+            dwFileSize = StormGetFileSize(hFile, NULL);
+            szFormat = (dwFileSize == INVALID_FILE_SIZE) ? ("(invalid)\n") : ("(%u bytes)\n");
+            printf(szFormat, dwFileSize);
+
+            printf("[*] Moving to begin of the file ...\n");
+            StormSetFilePointer(hFile, 0, NULL, FILE_BEGIN);
+            
+            printf("[*] Reading file ... ");
+            bResult = StormReadFile(hFile, Buffer, sizeof(Buffer), &dwBytesRead, NULL);
+            szFormat = (bResult == FALSE) ? ("(error %u)\n") : ("(OK)\n");
+            printf(szFormat, GetLastError());
+            
+            printf("[*] Closing file ...\n");
             StormCloseFile(hFile);
         }
 
+        printf("[*] Closing archive ...\n");
         StormCloseArchive(hMpq);
     }
 
+    printf("Done.\n\n");
     return 0;
 }