diff options
| -rw-r--r-- | src/SCompression.cpp | 2 | ||||
| -rw-r--r-- | src/SFileListFile.cpp | 114 | ||||
| -rw-r--r-- | src/SFileOpenFileEx.cpp | 38 | ||||
| -rw-r--r-- | test/Test.cpp | 39 |
4 files changed, 100 insertions, 93 deletions
diff --git a/src/SCompression.cpp b/src/SCompression.cpp index e3b99e0..dc09be7 100644 --- a/src/SCompression.cpp +++ b/src/SCompression.cpp @@ -1042,7 +1042,7 @@ int WINAPI SCompDecompress2(void * pvOutBuffer, int * pcbOutBuffer, void * pvInB } // Apply the first decompression method - nResult = pfnDecompress1(pbWorkBuffer, &cbWorkBuffer, pvInBuffer, cbInBuffer); + nResult = pfnDecompress1(pbWorkBuffer, &cbWorkBuffer, pbInBuffer, cbInBuffer); // Apply the second decompression method, if any if(pfnDecompress2 != NULL && nResult != 0) diff --git a/src/SFileListFile.cpp b/src/SFileListFile.cpp index 2293403..38a9601 100644 --- a/src/SFileListFile.cpp +++ b/src/SFileListFile.cpp @@ -21,14 +21,15 @@ struct TListFileCache { HANDLE hFile; // Stormlib file handle - char * szMask; // File mask + char * szMask; // Self-relative pointer to file mask DWORD dwFileSize; // Total size of the cached file DWORD dwFilePos; // Position of the cache in the file BYTE * pBegin; // The begin of the listfile cache BYTE * pPos; BYTE * pEnd; // The last character in the file cache - BYTE Buffer[CACHE_BUFFER_SIZE]; // Listfile cache itself + BYTE Buffer[CACHE_BUFFER_SIZE]; +// char MaskBuff[1] // Followed by the name mask (if any) }; //----------------------------------------------------------------------------- @@ -40,9 +41,12 @@ static bool FreeListFileCache(TListFileCache * pCache) if(pCache == NULL) return false; + // + // Note: don't close the pCache->hFile handle. + // This has to be done by the creator of the listfile cache + // + // Free all allocated buffers - if(pCache->hFile != NULL) - SFileCloseFile(pCache->hFile); if(pCache->szMask != NULL) STORM_FREE(pCache->szMask); STORM_FREE(pCache); @@ -52,54 +56,48 @@ static bool FreeListFileCache(TListFileCache * pCache) static TListFileCache * CreateListFileCache(HANDLE hListFile, const char * szMask) { TListFileCache * pCache = NULL; + size_t nMaskLength = 0; DWORD dwBytesRead = 0; - int nError = ERROR_SUCCESS; + DWORD dwFileSize; - // Allocate cache for one file block - pCache = (TListFileCache *)STORM_ALLOC(TListFileCache, 1); - if(pCache == NULL) - nError = ERROR_NOT_ENOUGH_MEMORY; + // Get the amount of bytes that need to be allocated + dwFileSize = SFileGetFileSize(hListFile, NULL); + if(dwFileSize == 0) + return NULL; - // Clear the entire structure - if(nError == ERROR_SUCCESS) + // Append buffer for name mask, if any + if(szMask != NULL) + nMaskLength = strlen(szMask) + 1; + + // Allocate cache for one file block + pCache = (TListFileCache *)STORM_ALLOC(BYTE, sizeof(TListFileCache)); + if(pCache != NULL) { - memset(pCache, 0, sizeof(TListFileCache)); - pCache->hFile = hListFile; + // Clear the entire structure + memset(pCache, 0, sizeof(TListFileCache) + nMaskLength); - // Shall we allocate a mask? + // Shall we copy the mask? if(szMask != NULL) { - pCache->szMask = STORM_ALLOC(char, strlen(szMask) + 1); - if(pCache->szMask != NULL) - strcpy(pCache->szMask, szMask); - else - nError = ERROR_NOT_ENOUGH_MEMORY; + pCache->szMask = (char *)(pCache + 1); + memcpy(pCache->szMask, szMask, nMaskLength); } - } - - // Initialize the file cache - if(nError == ERROR_SUCCESS) - { - pCache->dwFileSize = SFileGetFileSize(pCache->hFile, NULL); - // Fill the cache - SFileReadFile(pCache->hFile, pCache->Buffer, CACHE_BUFFER_SIZE, &dwBytesRead, NULL); - if(dwBytesRead == 0) - nError = GetLastError(); - } - - // Allocate pointers - if(nError == ERROR_SUCCESS) - { - pCache->pBegin = - pCache->pPos = &pCache->Buffer[0]; - pCache->pEnd = pCache->pBegin + dwBytesRead; - } - else - { - FreeListFileCache(pCache); - SetLastError(nError); - pCache = NULL; + // Load the file cache from the file + SFileReadFile(hListFile, pCache->Buffer, CACHE_BUFFER_SIZE, &dwBytesRead, NULL); + if(dwBytesRead != 0) + { + // Allocate pointers + pCache->pBegin = pCache->pPos = &pCache->Buffer[0]; + pCache->pEnd = pCache->pBegin + dwBytesRead; + pCache->dwFileSize = dwFileSize; + pCache->hFile = hListFile; + } + else + { + FreeListFileCache(pCache); + pCache = NULL; + } } // Return the cache @@ -116,8 +114,6 @@ static DWORD ReloadListFileCache(TListFileCache * pCache) // Only do something if the cache is empty if(pCache->pPos >= pCache->pEnd) { -// __TryReadBlock: - // Move the file position forward pCache->dwFilePos += CACHE_BUFFER_SIZE; if(pCache->dwFilePos >= pCache->dwFileSize) @@ -415,25 +411,20 @@ static int SFileAddArbitraryListFile( TListFileCache * pCache = NULL; size_t nLength; char szFileName[MAX_PATH]; - int nError = ERROR_SUCCESS; // Create the listfile cache for that file pCache = CreateListFileCache(hListFile, NULL); - if(pCache == NULL) - nError = GetLastError(); - - // Load the node list. Add the node for every locale in the archive - if(nError == ERROR_SUCCESS) + if(pCache != NULL) { + // Load the node list. Add the node for every locale in the archive while((nLength = ReadListFileLine(pCache, szFileName, sizeof(szFileName))) > 0) SListFileCreateNodeForAllLocales(ha, szFileName); - pCache->hFile = NULL; - } - // Delete the cache - if(pCache != NULL) + // Delete the cache FreeListFileCache(pCache); - return nError; + } + + return (pCache != NULL) ? ERROR_SUCCESS : ERROR_FILE_CORRUPT; } static int SFileAddExternalListFile( @@ -540,7 +531,7 @@ int WINAPI SFileAddListFile(HANDLE hMpq, const char * szListFile) HANDLE WINAPI SListFileFindFirstFile(HANDLE hMpq, const char * szListFile, const char * szMask, SFILE_FIND_DATA * lpFindFileData) { TListFileCache * pCache = NULL; - HANDLE hListFile; + HANDLE hListFile = NULL; size_t nLength = 0; DWORD dwSearchScope = SFILE_OPEN_LOCAL_FILE; int nError = ERROR_SUCCESS; @@ -566,7 +557,7 @@ HANDLE WINAPI SListFileFindFirstFile(HANDLE hMpq, const char * szListFile, const { pCache = CreateListFileCache(hListFile, szMask); if(pCache == NULL) - nError = GetLastError(); + nError = ERROR_FILE_CORRUPT; } // Perform file search @@ -592,10 +583,13 @@ HANDLE WINAPI SListFileFindFirstFile(HANDLE hMpq, const char * szListFile, const if(nError != ERROR_SUCCESS) { memset(lpFindFileData, 0, sizeof(SFILE_FIND_DATA)); - FreeListFileCache(pCache); SetLastError(nError); - pCache = NULL; } + + if(pCache != NULL) + FreeListFileCache(pCache); + if(hListFile != NULL) + SFileCloseFile(hListFile); return (HANDLE)pCache; } diff --git a/src/SFileOpenFileEx.cpp b/src/SFileOpenFileEx.cpp index 9fe77a7..4c26699 100644 --- a/src/SFileOpenFileEx.cpp +++ b/src/SFileOpenFileEx.cpp @@ -16,6 +16,18 @@ /* Local functions */ /*****************************************************************************/ +static const char * GetPrefixedName(TMPQArchive * ha, const char * szFileName, char * szBuffer) +{ + if(ha->cchPatchPrefix != 0) + { + memcpy(szBuffer, ha->szPatchPrefix, ha->cchPatchPrefix); + strcpy(szBuffer + ha->cchPatchPrefix, szFileName); + szFileName = szBuffer; + } + + return szFileName; +} + static bool OpenLocalFile(const char * szFileName, HANDLE * phFile) { TFileStream * pStream; @@ -63,7 +75,7 @@ bool OpenPatchedFile(HANDLE hMpq, const char * szFileName, DWORD dwReserved, HAN TMPQFile * hfLast = NULL; // The highest file in the chain that is not patch file TMPQFile * hf = NULL; HANDLE hPatchFile; - char szPatchFileName[MAX_PATH]; + char szPrefixBuffer[MAX_PATH]; // Keep this flag here for future updates dwReserved = dwReserved; @@ -71,10 +83,8 @@ bool OpenPatchedFile(HANDLE hMpq, const char * szFileName, DWORD dwReserved, HAN // First of all, try to open the original version of the file in any of the patch chain while(ha != NULL) { - // Construct the name of the patch file - strcpy(szPatchFileName, ha->szPatchPrefix); - strcpy(&szPatchFileName[ha->cchPatchPrefix], szFileName); - if(SFileOpenFileEx((HANDLE)ha, szPatchFileName, SFILE_OPEN_BASE_FILE, (HANDLE *)&hfBase)) + // Prepare the file name with a correct prefix + if(SFileOpenFileEx((HANDLE)ha, GetPrefixedName(ha, szFileName, szPrefixBuffer), SFILE_OPEN_BASE_FILE, (HANDLE *)&hfBase)) { // The file must be a base file, i.e. without MPQ_FILE_PATCH_FILE if((hfBase->pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE) == 0) @@ -100,10 +110,8 @@ bool OpenPatchedFile(HANDLE hMpq, const char * szFileName, DWORD dwReserved, HAN // Now keep going in the patch chain and open every patch file that is there for(ha = ha->haPatch; ha != NULL; ha = ha->haPatch) { - // Construct patch file name - strcpy(szPatchFileName, ha->szPatchPrefix); - strcpy(&szPatchFileName[ha->cchPatchPrefix], szFileName); - if(SFileOpenFileEx((HANDLE)ha, szPatchFileName, SFILE_OPEN_BASE_FILE, &hPatchFile)) + // Prepare the file name with a correct prefix + if(SFileOpenFileEx((HANDLE)ha, GetPrefixedName(ha, szFileName, szPrefixBuffer), SFILE_OPEN_BASE_FILE, &hPatchFile)) { // Remember the new version hfPatch = (TMPQFile *)hPatchFile; @@ -232,7 +240,7 @@ bool WINAPI SFileHasFile(HANDLE hMpq, const char * szFileName) TFileEntry * pFileEntry; DWORD dwFlagsToCheck = MPQ_FILE_EXISTS; DWORD dwFileIndex = 0; - char szPatchFileName[MAX_PATH]; + char szPrefixBuffer[MAX_PATH]; bool bIsPseudoName; int nError = ERROR_SUCCESS; @@ -251,7 +259,7 @@ bool WINAPI SFileHasFile(HANDLE hMpq, const char * szFileName) while(ha != NULL) { // Verify presence of the file - pFileEntry = (bIsPseudoName == false) ? GetFileEntryLocale(ha, szFileName, lcFileLocale) + pFileEntry = (bIsPseudoName == false) ? GetFileEntryLocale(ha, GetPrefixedName(ha, szFileName, szPrefixBuffer), lcFileLocale) : GetFileEntryByIndex(ha, dwFileIndex); // Verify the file flags if(pFileEntry != NULL && (pFileEntry->dwFlags & dwFlagsToCheck) == MPQ_FILE_EXISTS) @@ -260,14 +268,6 @@ bool WINAPI SFileHasFile(HANDLE hMpq, const char * szFileName) // If this is patched archive, go to the patch dwFlagsToCheck = MPQ_FILE_EXISTS | MPQ_FILE_PATCH_FILE; ha = ha->haPatch; - - // Prepare the patched file name - if(ha != NULL) - { - strcpy(szPatchFileName, ha->szPatchPrefix); - strcat(szPatchFileName, szFileName); - szFileName = szPatchFileName; - } } // Not found, sorry diff --git a/test/Test.cpp b/test/Test.cpp index 3edde98..9561d2d 100644 --- a/test/Test.cpp +++ b/test/Test.cpp @@ -1806,7 +1806,7 @@ static int TestOpenPatchedArchive(const TCHAR * szMpqName, ...) HANDLE hFile = NULL; HANDLE hMpq = NULL; va_list argList; - const char * szFileName = "Interface/Cinematics/MOP_BR.mp3"; + const char * szFileName = "Creature\\ALLIANCELIONMOUNT\\AllianceLion.M2"; TCHAR szLocFileName[MAX_PATH]; LPBYTE pbFullFile = NULL; DWORD dwFileSize; @@ -2170,11 +2170,11 @@ int main(void) // if(nError == ERROR_SUCCESS) // nError = TestPartFileRead(MAKE_PATH("2009 - PartialMPQs/patch.MPQ.part")); - if(nError == ERROR_SUCCESS) - { - CompareHuffmanCompressions7(); - nError = CompareHuffmanCompressions0(); - } +// if(nError == ERROR_SUCCESS) +// { +// CompareHuffmanCompressions7(); +// nError = CompareHuffmanCompressions0(); +// } // if(nError == ERROR_SUCCESS) // nError = ComparePklibCompressions(); @@ -2189,7 +2189,7 @@ int main(void) // Test the archive open and close // if(nError == ERROR_SUCCESS) -// nError = TestArchiveOpenAndClose(MAKE_PATH("BrooDat.mpq")); +// nError = TestArchiveOpenAndClose(MAKE_PATH("OldWorld-enGB.MPQ")); // if(nError == ERROR_SUCCESS) // nError = TestFindFiles(MAKE_PATH("2002 - Warcraft III/HumanEd.mpq")); @@ -2241,12 +2241,25 @@ int main(void) // nError = TestCreateArchiveCopy(MAKE_PATH("PartialMPQs/interface.MPQ.part"), MAKE_PATH("PartialMPQs/interface-copy.MPQ.part"), NULL); -// if(nError == ERROR_SUCCESS) -// { -// nError = TestOpenPatchedArchive(MAKE_PATH("2012 - WoW\\16057\\enUS\\locale-enUS.MPQ"), -// MAKE_PATH("2012 - WoW\\16057\\enUS\\wow-update-enUS-16016.MPQ"), -// NULL); -// } + if(nError == ERROR_SUCCESS) + { + nError = TestOpenPatchedArchive(MAKE_PATH("2013 - WoW\\12911\\world.MPQ"), + MAKE_PATH("2013 - WoW\\12911\\wow-update-13164.MPQ"), + MAKE_PATH("2013 - WoW\\12911\\wow-update-13205.MPQ"), + MAKE_PATH("2013 - WoW\\12911\\wow-update-13287.MPQ"), + MAKE_PATH("2013 - WoW\\12911\\wow-update-13329.MPQ"), + MAKE_PATH("2013 - WoW\\12911\\wow-update-13596.MPQ"), + MAKE_PATH("2013 - WoW\\12911\\wow-update-13623.MPQ"), + MAKE_PATH("2013 - WoW\\12911\\wow-update-base-13914.MPQ"), + MAKE_PATH("2013 - WoW\\12911\\wow-update-base-14007.MPQ"), + MAKE_PATH("2013 - WoW\\12911\\wow-update-base-14333.MPQ"), + MAKE_PATH("2013 - WoW\\12911\\wow-update-base-14480.MPQ"), + MAKE_PATH("2013 - WoW\\12911\\wow-update-base-14545.MPQ"), + MAKE_PATH("2013 - WoW\\12911\\wow-update-base-14946.MPQ"), + MAKE_PATH("2013 - WoW\\12911\\wow-update-base-15005.MPQ"), + MAKE_PATH("2013 - WoW\\12911\\wow-update-base-15050.MPQ"), + NULL); + } // if(nError == ERROR_SUCCESS) // { |