From 5e3156e27f7c49146ac6aa8af9fdab8a554a3c54 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 7 Mar 2017 17:14:16 +0100 Subject: Dep/CascLib: Update to ladislav-zezula/CascLib@2313e4aff966ef0f841c1748dad4db71c8ba6310 Closes #19237 --- dep/CascLib/src/CascFindFile.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'dep/CascLib/src/CascFindFile.cpp') diff --git a/dep/CascLib/src/CascFindFile.cpp b/dep/CascLib/src/CascFindFile.cpp index 1016dffdb45..3dc8fe574fc 100644 --- a/dep/CascLib/src/CascFindFile.cpp +++ b/dep/CascLib/src/CascFindFile.cpp @@ -108,15 +108,17 @@ static bool DoStorageSearch_RootFile(TCascSearch * pSearch, PCASC_FIND_DATA pFin QUERY_KEY IndexKey; LPBYTE pbEncodingKey; DWORD EncodingIndex = 0; - DWORD LocaleFlags = 0; - DWORD FileSize = CASC_INVALID_SIZE; DWORD ByteIndex; DWORD BitMask; for(;;) { + DWORD LocaleFlags = 0; + DWORD FileDataId = CASC_INVALID_ID; + DWORD FileSize = CASC_INVALID_SIZE; + // Attempt to find (the next) file from the root entry - pbEncodingKey = RootHandler_Search(pSearch->hs->pRootHandler, pSearch, &FileSize, &LocaleFlags); + pbEncodingKey = RootHandler_Search(pSearch->hs->pRootHandler, pSearch, &FileSize, &LocaleFlags, &FileDataId); if(pbEncodingKey == NULL) return false; @@ -150,6 +152,7 @@ static bool DoStorageSearch_RootFile(TCascSearch * pSearch, PCASC_FIND_DATA pFin memcpy(pFindData->EncodingKey, pEncodingEntry->EncodingKey, MD5_HASH_SIZE); pFindData->szPlainName = (char *)GetPlainFileName(pFindData->szFileName); pFindData->dwLocaleFlags = LocaleFlags; + pFindData->dwFileDataId = FileDataId; pFindData->dwFileSize = FileSize; return true; } -- cgit v1.2.3