aboutsummaryrefslogtreecommitdiff
path: root/dep/CascLib/src/CascFiles.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2020-11-05 20:52:53 +0100
committerShauren <shauren.trinity@gmail.com>2020-12-08 18:16:46 +0100
commit6b6d5aff0530d43875572edc9616bc788ed8a26c (patch)
tree8d0ad02913e4b625b2b2c26d3daff9b8a354360c /dep/CascLib/src/CascFiles.cpp
parent5095bcbf1cf57dae0e58e1d1251b566952352047 (diff)
Dep/CascLib: Update to ladislav-zezula/CascLib@737a8705b5b8f7ce3917f5d5ff9767b18de1285e
Diffstat (limited to 'dep/CascLib/src/CascFiles.cpp')
-rw-r--r--dep/CascLib/src/CascFiles.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/dep/CascLib/src/CascFiles.cpp b/dep/CascLib/src/CascFiles.cpp
index c1a9e648c72..596a07d3362 100644
--- a/dep/CascLib/src/CascFiles.cpp
+++ b/dep/CascLib/src/CascFiles.cpp
@@ -153,7 +153,7 @@ static const char * CaptureSingleHash(const char * szDataPtr, const char * szDat
return NULL;
// Give the values
- ConvertStringToBinary(szHashString, HashStringLength, HashValue);
+ BinaryFromString(szHashString, HashStringLength, HashValue);
return szDataPtr;
}
@@ -717,7 +717,7 @@ static DWORD ParseFile_VersionsDb(TCascStorage * hs, CASC_CSV & Csv)
{
// If we have manually given build key, override the value
if(hs->szBuildKey != NULL)
- dwErrCode = ConvertStringToBinary(hs->szBuildKey, MD5_STRING_SIZE, hs->CdnBuildKey.pbData);
+ dwErrCode = BinaryFromString(hs->szBuildKey, MD5_STRING_SIZE, hs->CdnBuildKey.pbData);
return dwErrCode;
}
@@ -1113,7 +1113,7 @@ static DWORD DownloadFile(
}
else
{
- dwErrCode = GetLastError();
+ dwErrCode = GetCascError();
}
return dwErrCode;
@@ -1489,7 +1489,7 @@ LPBYTE LoadInternalFileToMemory(TCascStorage * hs, PCASC_CKEY_ENTRY pCKeyEntry,
}
else
{
- dwErrCode = GetLastError();
+ dwErrCode = GetCascError();
}
// Handle errors
@@ -1500,7 +1500,7 @@ LPBYTE LoadInternalFileToMemory(TCascStorage * hs, PCASC_CKEY_ENTRY pCKeyEntry,
cbFileData = 0;
// Set the last error
- SetLastError(dwErrCode);
+ SetCascError(dwErrCode);
}
// Give the loaded file length
@@ -1540,13 +1540,13 @@ LPBYTE LoadFileToMemory(LPCTSTR szFileName, DWORD * pcbFileData)
}
else
{
- SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+ SetCascError(ERROR_NOT_ENOUGH_MEMORY);
cbFileData = 0;
}
}
else
{
- SetLastError(ERROR_BAD_FORMAT);
+ SetCascError(ERROR_BAD_FORMAT);
cbFileData = 0;
assert(false);
}