+ Fixed use-after-free in SListFileFindFirstFile

+ Replaces SFileMpqIsReadOnly with SFileMpqFlags
+ New MPQ flag: MPQ_FLAG_WAR3_MAP

2 files changed, 6 insertions, 6 deletions

diff --git a/test/StormTest.cpp b/test/StormTest.cpp
index 1234722..d0a7f83 100644
--- a/test/StormTest.cpp
+++ b/test/StormTest.cpp
@@ -4052,7 +4052,7 @@ int main(int argc, char * argv[])
     // Open a stream, paired with remote master (takes hell lot of time!)
 //  if(nError == ERROR_SUCCESS)
 //      nError = TestReadFile_MasterMirror("MPQ_2013_v4_alternate-downloaded.MPQ", "http://www.zezula.net\\mpqs\\alternate.zip", false);
-
+*/
     // Search in listfile
     if(nError == ERROR_SUCCESS)
         nError = TestSearchListFile("ListFile_Blizzard.txt");
@@ -4123,13 +4123,13 @@ int main(int argc, char * argv[])
     if(nError == ERROR_SUCCESS)
         nError = TestOpenArchive("MPQ_2015_v1_ProtectedMap_Somj2hM16.w3x");
 
-    // Open an Warcraft III map whose "(attributes)" file has (BlockTableSize-1) entries
+    // Open an Warcraft III map locked by Spazy protector
     if(nError == ERROR_SUCCESS)
-        nError = TestOpenArchive("MPQ_2014_v1_AttributesOneEntryLess.w3x");
-*/
+        nError = TestOpenArchive("MPQ_2015_v1_ProtectedMap_Spazy.w3x");
+
     // Open an Warcraft III map whose "(attributes)" file has (BlockTableSize-1) entries
     if(nError == ERROR_SUCCESS)
-        nError = TestOpenArchive("2.1.w3x");
+        nError = TestOpenArchive("MPQ_2014_v1_AttributesOneEntryLess.w3x");
 
     // Open a MPQ archive v 3.0
     if(nError == ERROR_SUCCESS)
diff --git a/test/TLogHelper.cpp b/test/TLogHelper.cpp
index 511bcc9..078de1d 100644
--- a/test/TLogHelper.cpp
+++ b/test/TLogHelper.cpp
@@ -128,7 +128,7 @@ TLogHelper::~TLogHelper()
         }
     }
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && defined(_DEBUG)
     if(_CrtDumpMemoryLeaks())
     {
         PrintMessage("Memory leak detected after %s\n.", szSaveMainTitle);