From 01e940f998e64ceb60d39a30d0e40c33be430744 Mon Sep 17 00:00:00 2001 From: Ladislav Zezula Date: Tue, 7 Feb 2023 07:31:47 +0100 Subject: Fixed regression for W3 maps --- test/StormTest.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'test') diff --git a/test/StormTest.cpp b/test/StormTest.cpp index 916eed0..2f45e96 100644 --- a/test/StormTest.cpp +++ b/test/StormTest.cpp @@ -4183,7 +4183,6 @@ int _tmain(int argc, TCHAR * argv[]) // Initialize storage and mix the random number generator printf("==== Test Suite for StormLib version %s ====\n", STORMLIB_VERSION_STRING); dwErrCode = InitializeMpqDirectory(argv, argc); - /* // Check creation of the MPQ with LZMA compression LPCTSTR szArchiveName = _T("E:\\new-mpq.mpq"); @@ -4193,12 +4192,12 @@ int _tmain(int argc, TCHAR * argv[]) DeleteFile(szArchiveName); if(SFileCreateArchive(szArchiveName, MPQ_CREATE_ARCHIVE_V2 | MPQ_CREATE_LISTFILE | MPQ_CREATE_ATTRIBUTES, 0x1000, &hMpq)) { - SFileAddFileEx(hMpq, _T("e:\\DlgSetFileAssoc.cpp"), "DlgSetFileAssoc.cpp", MPQ_FILE_SINGLE_UNIT | MPQ_FILE_COMPRESS, MPQ_COMPRESSION_LZMA, MPQ_COMPRESSION_NEXT_SAME); + SFileAddFileEx(hMpq, _T("e:\\DlgSearchFile.cpp"), "DlgSearchFile.cpp", MPQ_FILE_SINGLE_UNIT | MPQ_FILE_COMPRESS, MPQ_COMPRESSION_LZMA, MPQ_COMPRESSION_NEXT_SAME); SFileCloseArchive(hMpq); if(SFileOpenArchive(szArchiveName, 0, 0, &hMpq)) { - if(SFileOpenFileEx(hMpq, "DlgSetFileAssoc.cpp", 0, &hFile)) + if(SFileOpenFileEx(hMpq, "DlgSearchFile.cpp", 0, &hFile)) { DWORD dwBytesRead = 0; BYTE Buffer[0x100]; @@ -4210,7 +4209,6 @@ int _tmain(int argc, TCHAR * argv[]) } } */ - #ifdef TEST_COMMAND_LINE // Test-open MPQs from the command line. They must be plain name // and must be placed in the Test-MPQs folder @@ -4260,8 +4258,7 @@ int _tmain(int argc, TCHAR * argv[]) for(size_t i = 0; i < _countof(Test_OpenMpqs); i++) { dwErrCode = TestOpenArchive(Test_OpenMpqs[i]); - //if(dwErrCode != ERROR_SUCCESS) - // break; + dwErrCode = ERROR_SUCCESS; } } #endif // TEST_OPEN_MPQ @@ -4275,8 +4272,7 @@ int _tmain(int argc, TCHAR * argv[]) dwErrCode = TestReopenArchive(Test_ReopenMpqs[i].szName1, Test_ReopenMpqs[i].szDataHash, Test_ReopenMpqs[i].dwFlags); - //if(dwErrCode != ERROR_SUCCESS) - // break; + dwErrCode = ERROR_SUCCESS; } } #endif -- cgit v1.2.3