From a70863499e5e9e6560477b8f4a0a594d6e62650e Mon Sep 17 00:00:00 2001
From: Ladislav Zezula <ladislav.zezula@avg.com>
Date: Wed, 13 Nov 2013 07:56:31 +0100
Subject: + Support for SQP and MPK archives + Makefiles fixed

---
 src/SFileOpenArchive.cpp | 39 +++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)

(limited to 'src/SFileOpenArchive.cpp')

diff --git a/src/SFileOpenArchive.cpp b/src/SFileOpenArchive.cpp
index 97b2b05..a058136 100644
--- a/src/SFileOpenArchive.cpp
+++ b/src/SFileOpenArchive.cpp
@@ -182,6 +182,7 @@ bool WINAPI SFileOpenArchive(
         DWORD dwHeaderID;
 
         memset(ha, 0, sizeof(TMPQArchive));
+        ha->pfnHashString = HashString;
         ha->pStream = pStream;
         pStream = NULL;
 
@@ -238,25 +239,43 @@ bool WINAPI SFileOpenArchive(
             // There must be MPQ header signature
             if(dwHeaderID == ID_MPQ)
             {
-                // Save the position where the MPQ header has been found
-                if(ha->pUserData == NULL)
-                    ha->UserDataPos = SearchPos;
-                ha->pHeader = (TMPQHeader *)ha->HeaderData;
-                ha->MpqPos = SearchPos;
-
                 // Now convert the header to version 4
-                BSWAP_TMPQHEADER(ha->pHeader);
                 nError = ConvertMpqHeaderToFormat4(ha, FileSize, dwFlags);
                 break;
             }
 
+            // Check for MPK archives (Longwu Online - MPQ fork)
+            if(dwHeaderID == ID_MPK)
+            {
+                // Now convert the MPK header to MPQ Header version 4
+                nError = ConvertMpkHeaderToFormat4(ha, FileSize, dwFlags);
+                break;
+            }
+
+            // If searching for the MPQ header is disabled, return an error
+            if(dwFlags & MPQ_OPEN_NO_HEADER_SEARCH)
+            {
+                nError = ERROR_NOT_SUPPORTED;
+                break;
+            }
+
             // Move to the next possible offset
             SearchPos += 0x200;
         }
 
-        // If we haven't found MPQ header in the file, it's an error
-        if(ha->pHeader == NULL || ha->pHeader->wSectorSize == 0)
-            nError = ERROR_BAD_FORMAT;
+        // Did we identify one of the supported headers?
+        if(nError == ERROR_SUCCESS)
+        {
+            // Set the position of user data, header and file offset of the header
+            if(ha->pUserData == NULL)
+                ha->UserDataPos = SearchPos;
+            ha->pHeader = (TMPQHeader *)ha->HeaderData;
+            ha->MpqPos = SearchPos;
+
+            // Sector size must be nonzero.
+            if(ha->pHeader->wSectorSize == 0)
+                nError = ERROR_BAD_FORMAT;
+        }
     }
 
     // Fix table positions according to format
-- 
cgit v1.2.3