Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dep/CascLib: Update to ladislav-zezula/CascLib@4c04c6c2bf

Browse Source
This commit is contained in:
joschiwald
2017-05-20 11:04:03 +02:00
parent 6a405f8162
commit d7d4cadd9c
7 changed files with 114 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dep/CascLib/src/CascFindFile.cpp
View File

@@ -188,7 +188,7 @@ static bool DoStorageSearch_EncodingKey(TCascSearch * pSearch, PCASC_FIND_DATA p
// Fill-in the found file
memcpy(pFindData->EncodingKey, pEncodingEntry->EncodingKey, MD5_HASH_SIZE);
pFindData->szFileName[0] = 0;
pFindData->szPlainName = NULL;
pFindData->szPlainName = pFindData->szFileName;
pFindData->dwLocaleFlags = CASC_LOCALE_NONE;
pFindData->dwFileSize = ConvertBytesToInteger_4(pEncodingEntry->FileSizeBE);
@@ -233,7 +233,7 @@ static bool DoStorageSearch(TCascSearch * pSearch, PCASC_FIND_DATA pFindData)
}
// State 2: Searching the remaining entries
if(pSearch->dwState == 2)
if(pSearch->dwState == 2 && (pSearch->szMask == NULL || !strcmp(pSearch->szMask, "*")))
{
if(DoStorageSearch_EncodingKey(pSearch, pFindData))
return true;
@@ -287,7 +287,7 @@ HANDLE WINAPI CascFindFirstFile(
{
if(pSearch != NULL)
FreeSearchHandle(pSearch);
pSearch = NULL;
pSearch = (TCascSearch *)INVALID_HANDLE_VALUE;
}
return (HANDLE)pSearch;