+ Fixed issue "Internal Files Creation Settings #96"

1 files changed, 8 insertions, 6 deletions

diff --git a/test/StormTest.cpp b/test/StormTest.cpp
index 5dae52a..afc0a9f 100644
--- a/test/StormTest.cpp
+++ b/test/StormTest.cpp
@@ -1793,9 +1793,11 @@ static int CreateNewArchive_V2(TLogHelper * pLogger, const char * szPlainName, D
     CreateInfo.cbSize         = sizeof(SFILE_CREATE_MPQ);

     CreateInfo.dwMpqVersion   = (dwCreateFlags & MPQ_CREATE_ARCHIVE_VMASK) >> FLAGS_TO_FORMAT_SHIFT;

     CreateInfo.dwStreamFlags  = STREAM_PROVIDER_FLAT | BASE_PROVIDER_FILE;

-    CreateInfo.dwFileFlags1   = (dwCreateFlags & MPQ_CREATE_LISTFILE)   ? MPQ_FILE_EXISTS : 0;

-    CreateInfo.dwFileFlags2   = (dwCreateFlags & MPQ_CREATE_ATTRIBUTES) ? MPQ_FILE_EXISTS : 0;

-    CreateInfo.dwFileFlags3   = (dwCreateFlags & MPQ_CREATE_SIGNATURE)  ? MPQ_FILE_EXISTS : 0;

+//  CreateInfo.dwFileFlags1   = (dwCreateFlags & MPQ_CREATE_LISTFILE)   ? MPQ_FILE_EXISTS : 0;

+//  CreateInfo.dwFileFlags2   = (dwCreateFlags & MPQ_CREATE_ATTRIBUTES) ? MPQ_FILE_EXISTS : 0;

+    CreateInfo.dwFileFlags1   = (dwCreateFlags & MPQ_CREATE_LISTFILE)   ? MPQ_FILE_DEFAULT_INTERNAL : 0;

+    CreateInfo.dwFileFlags2   = (dwCreateFlags & MPQ_CREATE_ATTRIBUTES) ? MPQ_FILE_DEFAULT_INTERNAL : 0;

+    CreateInfo.dwFileFlags3   = (dwCreateFlags & MPQ_CREATE_SIGNATURE)  ? MPQ_FILE_DEFAULT_INTERNAL : 0;

     CreateInfo.dwAttrFlags    = (dwCreateFlags & MPQ_CREATE_ATTRIBUTES) ? (MPQ_ATTRIBUTE_CRC32 | MPQ_ATTRIBUTE_FILETIME | MPQ_ATTRIBUTE_MD5) : 0;

     CreateInfo.dwSectorSize   = (CreateInfo.dwMpqVersion >= MPQ_FORMAT_VERSION_3) ? 0x4000 : 0x1000;

     CreateInfo.dwRawChunkSize = (CreateInfo.dwMpqVersion >= MPQ_FORMAT_VERSION_4) ? 0x4000 : 0;

@@ -4720,15 +4722,15 @@ int main(int argc, char * argv[])
     // Create an empty archive v4

     if(nError == ERROR_SUCCESS)

         nError = TestCreateArchive_EmptyMpq("StormLibTest_EmptyMpq_v4.mpq", MPQ_CREATE_ARCHIVE_V4 | MPQ_CREATE_LISTFILE | MPQ_CREATE_ATTRIBUTES);

-

+*/

     // Test creating of an archive the same way like MPQ Editor does

     if(nError == ERROR_SUCCESS)

         nError = TestCreateArchive_TestGaps("StormLibTest_GapsTest.mpq");

-*/

+/*

     // Test creating of an archive with non standard file names

     if(nError == ERROR_SUCCESS)

         nError = TestCreateArchive_NonStdNames("StormLibTest_NonStdNames.mpq");

-/*

+

     // Sign an existing non-signed archive

     if(nError == ERROR_SUCCESS)

         nError = TestOpenArchive_SignExisting("MPQ_1998_v1_StarDat.mpq");