Mirror/StormLib
1
0
Fork 0
mirror of https://github.com/ladislav-zezula/StormLib.git synced 2026-01-20 22:57:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

+ Improved key detection for archives with large sector sizes

Browse Source
This commit is contained in:
Ladislav Zezula
2014-03-14 10:17:34 +01:00
parent ca93a8cb76
commit 568f189ea5
10 changed files with 317 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/SBaseFileTable.cpp
View File

@@ -60,12 +60,23 @@ static int CompareFilePositions(const void * p1, const void * p2)
{
TMPQBlock * pBlock1 = *(TMPQBlock **)p1;
TMPQBlock * pBlock2 = *(TMPQBlock **)p2;
DWORD dwFileEnd1;
DWORD dwFileEnd2;
// Compare file begins
if(pBlock1->dwFilePos < pBlock2->dwFilePos)
return -1;
if(pBlock1->dwFilePos > pBlock2->dwFilePos)
return +1;
// If the files begin at the same position, compare their ends
dwFileEnd1 = pBlock1->dwFilePos + pBlock1->dwCSize;
dwFileEnd2 = pBlock2->dwFilePos + pBlock2->dwCSize;
if(dwFileEnd1 < dwFileEnd2)
return -1;
if(dwFileEnd1 > dwFileEnd2)
return +1;
return 0;
}
@@ -321,54 +332,6 @@ static ULONGLONG DetermineArchiveSize_V2(
}
// This function converts the MPQ header so it always looks like version 4
/*static ULONGLONG GetArchiveSize64(TMPQHeader * pHeader)
{
ULONGLONG ArchiveSize = pHeader->dwHeaderSize;
ULONGLONG ByteOffset = pHeader->dwHeaderSize;
// If there is HET table
if(pHeader->HetTablePos64 != 0)
{
ByteOffset = pHeader->HetTablePos64 + pHeader->HetTableSize64;
if(ByteOffset > ArchiveSize)
ArchiveSize = ByteOffset;
}
// If there is BET table
if(pHeader->BetTablePos64 != 0)
{
ByteOffset = pHeader->BetTablePos64 + pHeader->BetTableSize64;
if(ByteOffset > ArchiveSize)
ArchiveSize = ByteOffset;
}
// If there is hash table
if(pHeader->dwHashTablePos || pHeader->wHashTablePosHi)
{
ByteOffset = MAKE_OFFSET64(pHeader->wHashTablePosHi, pHeader->dwHashTablePos) + pHeader->HashTableSize64;
if(ByteOffset > ArchiveSize)
ArchiveSize = ByteOffset;
}
// If there is block table
if(pHeader->dwBlockTablePos || pHeader->wBlockTablePosHi)
{
ByteOffset = MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos) + pHeader->BlockTableSize64;
if(ByteOffset > ArchiveSize)
ArchiveSize = ByteOffset;
}
// If there is hi-block table
if(pHeader->HiBlockTablePos64)
{
ByteOffset = pHeader->HiBlockTablePos64 + pHeader->HiBlockTableSize64;
if(ByteOffset > ArchiveSize)
ArchiveSize = ByteOffset;
}
return ArchiveSize;
}
*/
int ConvertMpqHeaderToFormat4(
TMPQArchive * ha,
ULONGLONG MpqOffset,
@@ -2246,7 +2209,7 @@ static void FixCompressedFileSize(
SortTable[nElements++] = pBlock;
}
// Have we found at least one compressed
// Have we found at least one block?
if(nElements > 0)
{
// Sort the table