Skip to content

[pull] master from ladislav-zezula:master #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Aug 25, 2025
Merged

[pull] master from ladislav-zezula:master #66

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6e9ad2
Get nearest power of 2 for max file count before checking against cur…
Haaxor1689 Aug 25, 2025
249b1c0
Merge pull request #395 from Haaxor1689/master
ladislav-zezula Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/SFileCompactArchive.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,15 +463,17 @@ DWORD WINAPI SFileGetMaxFileCount(HANDLE hMpq)
bool WINAPI SFileSetMaxFileCount(HANDLE hMpq, DWORD dwMaxFileCount)
{
TMPQArchive * ha = (TMPQArchive *)hMpq;
DWORD dwNewHashTableSize = 0;
DWORD dwErrCode = ERROR_SUCCESS;

// Calculate the hash table size for the new file limit
DWORD dwNewHashTableSize = GetNearestPowerOfTwo(dwMaxFileCount);

// Test the valid parameters
if(!IsValidMpqHandle(hMpq))
dwErrCode = ERROR_INVALID_HANDLE;
if(ha->dwFlags & MPQ_FLAG_READ_ONLY)
dwErrCode = ERROR_ACCESS_DENIED;
if(dwMaxFileCount < ha->dwFileTableSize)
if(dwNewHashTableSize < ha->dwFileTableSize)
dwErrCode = ERROR_DISK_FULL;

// ALL file names must be known in order to be able to rebuild hash table
Expand All @@ -480,9 +482,6 @@ bool WINAPI SFileSetMaxFileCount(HANDLE hMpq, DWORD dwMaxFileCount)
dwErrCode = CheckIfAllFilesKnown(ha);
if(dwErrCode == ERROR_SUCCESS)
{
// Calculate the hash table size for the new file limit
dwNewHashTableSize = GetNearestPowerOfTwo(dwMaxFileCount);

// Rebuild both file tables
dwErrCode = RebuildFileTable(ha, dwNewHashTableSize);
}
Expand Down
Loading