diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/SBaseSubTypes.cpp | 52 | ||||
| -rw-r--r-- | src/SFileReadFile.cpp | 2 |
2 files changed, 37 insertions, 17 deletions
diff --git a/src/SBaseSubTypes.cpp b/src/SBaseSubTypes.cpp index ff6c459..1ae9aae 100644 --- a/src/SBaseSubTypes.cpp +++ b/src/SBaseSubTypes.cpp @@ -490,6 +490,37 @@ TMPQHash * FindFreeHashEntry(TMPQHash * pHashTable, DWORD dwHashTableSize, DWORD return NULL; } +DWORD GetMpkBlockTableItemLength(void * pvMpkBlockTable, size_t cbMpkBlockTable) +{ + TMPKBlock1 * pBlockItem1 = (TMPKBlock1 *)(pvMpkBlockTable); + TMPKBlock2 * pBlockItem2 = (TMPKBlock2 *)(pvMpkBlockTable); + + // + // We have no information as to what's the type of the table item + // So we just compare the magic numbers of all supported item sizes + // + + if(cbMpkBlockTable >= sizeof(TMPKBlock1) * 2) + { + if(pBlockItem1[0].dwMagic == pBlockItem1[1].dwMagic) + { + return sizeof(TMPKBlock1); + } + } + + if(cbMpkBlockTable >= sizeof(TMPKBlock2) * 2) + { + if(pBlockItem2[0].dwMagic == pBlockItem2[1].dwMagic) + { + return sizeof(TMPKBlock2); + } + } + + // Unknown item size + assert(false); + return 0; +} + void DecryptMpkTable(void * pvMpkTable, size_t cbSize) { LPBYTE pbMpkTable = (LPBYTE)pvMpkTable; @@ -579,12 +610,6 @@ TMPQHash * LoadMpkHashTable(TMPQArchive * ha) return pHashTable; } -static DWORD GetMpkBlockID(void * pMpkBlockTable) -{ - DWORD * TableItems = (DWORD *)(pMpkBlockTable); - return TableItems[4]; -} - static DWORD ConvertMpkFlagsToMpqFlags(DWORD dwMpkFlags) { DWORD dwMpqFlags = MPQ_FILE_EXISTS; @@ -621,7 +646,7 @@ static TMPQBlock * LoadMpkBlockTable(TMPQArchive * ha, void * pMpkBlockTable, DW { while(pbMpkBlockPtr < pbMpkBlockEnd) { - TMPKBlock2 * pMpkBlock = (TMPKBlock2 *)(pbMpkBlockPtr); + TMPKBlock1 * pMpkBlock = (TMPKBlock1 *)(pbMpkBlockPtr); // Translate the MPK block table entry to MPQ block table entry pMpqBlock->dwFilePos = pMpkBlock->dwFilePos; @@ -643,21 +668,16 @@ TMPQBlock * LoadMpkBlockTable(TMPQArchive * ha) TMPQHeader * pHeader = ha->pHeader; TMPQBlock * pBlockTable = NULL; void * pMpkBlockTable; + DWORD nItemLength; // Load the MPK block table. At this moment, we don't know the version of the blobk table pMpkBlockTable = LoadMpkTable(ha, pHeader->dwBlockTablePos, pHeader->dwBlockTableSize); if(pMpkBlockTable != NULL) { - switch(GetMpkBlockID(pMpkBlockTable)) + // Based on the item length, load the table and convert it to the MPQ table + if((nItemLength = GetMpkBlockTableItemLength(pMpkBlockTable, pHeader->dwBlockTableSize)) != 0) { - case MPK_BLOCK_TABLE_WOTGV: - pBlockTable = LoadMpkBlockTable(ha, pMpkBlockTable, sizeof(TMPKBlock2)); - break; - - case MPK_BLOCK_TABLE_LONGWU: - default: - pBlockTable = LoadMpkBlockTable(ha, pMpkBlockTable, sizeof(TMPKBlock1)); - break; + pBlockTable = LoadMpkBlockTable(ha, pMpkBlockTable, nItemLength); } // Free the MPK block table diff --git a/src/SFileReadFile.cpp b/src/SFileReadFile.cpp index 8031ba7..39f794e 100644 --- a/src/SFileReadFile.cpp +++ b/src/SFileReadFile.cpp @@ -411,7 +411,7 @@ static DWORD ReadMpkFileSingleUnit(TMPQFile * hf, void * pvBuffer, DWORD dwFileP DecryptMpkTable(pbRawData, pFileEntry->dwCmpSize); } - // If the file is compressed, we have to decompress it now + // If the file is compressed, we have to decompress it now on if(pFileEntry->dwFlags & MPQ_FILE_COMPRESS_MASK) { int cbOutBuffer = (int)hf->dwDataSize; |