From b7ad3dd76776f15080fc98014ae0a1819af80baf Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 4 May 2015 09:52:00 +0200 Subject: + Added detection of SLK extension --- src/SFileGetFileInfo.cpp | 1 + test/StormTest.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/SFileGetFileInfo.cpp b/src/SFileGetFileInfo.cpp index 21b3beb..bf6273d 100644 --- a/src/SFileGetFileInfo.cpp +++ b/src/SFileGetFileInfo.cpp @@ -897,6 +897,7 @@ static TFileHeader2Ext data2ext[] = {0x43424457, 0xFFFFFFFF, 0x00000000, 0x00000000, "dbc"}, // ??? .dbc {0x47585053, 0xFFFFFFFF, 0x00000000, 0x00000000, "bls"}, // WoW pixel shaders {0xE0FFD8FF, 0xFFFFFFFF, 0x00000000, 0x00000000, "jpg"}, // JPEG image + {0x503B4449, 0xFFFFFFFF, 0x3B4C5857, 0xFFFFFFFF, "slk"}, // SLK file (usually starts with "ID;PWXL;N;E") {0x00000000, 0x00000000, 0x00000000, 0x00000000, "xxx"}, // Default extension {0, 0, 0, 0, NULL} // Terminator }; diff --git a/test/StormTest.cpp b/test/StormTest.cpp index b4e9702..401752a 100644 --- a/test/StormTest.cpp +++ b/test/StormTest.cpp @@ -4057,11 +4057,11 @@ int main(int argc, char * argv[]) // Open a truncated archive if(nError == ERROR_SUCCESS) nError = TestOpenArchive("MPQ_2002_v1_BlockTableCut.MPQ"); - +*/ // Open an Warcraft III map locked by a protector if(nError == ERROR_SUCCESS) nError = TestOpenArchive("MPQ_2002_v1_ProtectedMap_HashTable_FakeValid.w3x"); - +/* // Open an Warcraft III map locked by a protector if(nError == ERROR_SUCCESS) nError = TestOpenArchive("MPQ_2002_v1_ProtectedMap_InvalidUserData.w3x"); @@ -4087,11 +4087,11 @@ int main(int argc, char * argv[]) // Open an Warcraft III map locked by the BOBA protector if(nError == ERROR_SUCCESS) nError = TestOpenArchive("MPQ_2002_v1_ProtectedMap_BOBA.w3m"); -*/ + // Open an Warcraft III map locked by a protector if(nError == ERROR_SUCCESS) nError = TestOpenArchive("MPQ_2015_v1_ProtectedMap_KangTooJee.w3x"); -/* + // Open an Warcraft III map locked by a protector if(nError == ERROR_SUCCESS) nError = TestOpenArchive("MPQ_2015_v1_ProtectedMap_Somj2hM16.w3x"); -- cgit v1.2.3