Dep/CascLib: Update to ladislav-zezula/CascLib@0a05c59eb8a3eab1bc5471f43934cd5f992f0aca

1 files changed, 42 insertions, 30 deletions

diff --git a/dep/CascLib/src/CascFiles.cpp b/dep/CascLib/src/CascFiles.cpp
index f47b8316693..c1a9e648c72 100644
--- a/dep/CascLib/src/CascFiles.cpp
+++ b/dep/CascLib/src/CascFiles.cpp
@@ -27,7 +27,7 @@ typedef DWORD (*PARSE_VARIABLE)(TCascStorage * hs, const char * szVariableName,
 
 struct TBuildFileInfo
 {
-    const TCHAR * szFileName;
+    LPCTSTR szFileName;
     CBLD_TYPE BuildFileType;
 };
 
@@ -45,7 +45,7 @@ static const TBuildFileInfo BuildTypes[] =
     {NULL, CascBuildNone}
 };
 
-static const TCHAR * DataDirs[] =
+static LPCTSTR DataDirs[] =
 {
     _T("data") _T(PATH_SEP_STRING) _T("casc"),      // Overwatch
     _T("data"),                                     // TACT casc (for Linux systems)
@@ -494,23 +494,17 @@ static int LoadQueryKey(const CASC_CSV_COLUMN & Column, QUERY_KEY & Key)
 
 static void SetProductCodeName(TCascStorage * hs, LPCSTR szCodeName)
 {
-    TCHAR szCodeNameT[0x40];
-
     if(hs->szCodeName == NULL && szCodeName != NULL)
     {
-        CascStrCopy(szCodeNameT, _countof(szCodeNameT), szCodeName);
-        hs->szCodeName = CascNewStr(szCodeNameT);
+        hs->szCodeName = CascNewStrA2T(szCodeName);
     }
 }
 
 static DWORD GetDefaultCdnPath(TCascStorage * hs, const CASC_CSV_COLUMN & Column)
 {
-    TCHAR szCdnPath[MAX_PATH];
-
     if(hs->szCdnPath == NULL && Column.nLength != 0)
     {
-        CascStrCopy(szCdnPath, _countof(szCdnPath), Column.szValue);
-        hs->szCdnPath = CascNewStr(szCdnPath);
+        hs->szCdnPath = CascNewStrA2T(Column.szValue);
     }
 
     return ERROR_SUCCESS;
@@ -544,8 +538,6 @@ static DWORD GetDefaultLocaleMask(TCascStorage * hs, const CASC_CSV_COLUMN & Col
 static DWORD ParseFile_CDNS(TCascStorage * hs, CASC_CSV & Csv)
 {
     const char * szWantedRegion = hs->szRegion;
-    TCHAR szCdnServers[MAX_PATH];
-    TCHAR szCdnPath[MAX_PATH];
     size_t nLineCount;
 
     // Fix the region
@@ -562,12 +554,10 @@ static DWORD ParseFile_CDNS(TCascStorage * hs, CASC_CSV & Csv)
         if(!strcmp(Csv[i]["Name!STRING:0"].szValue, szWantedRegion))
         {
             // Save the list of CDN servers
-            CascStrCopy(szCdnServers, _countof(szCdnServers), Csv[i]["Hosts!STRING:0"].szValue);
-            hs->szCdnServers = CascNewStr(szCdnServers);
+            hs->szCdnServers = CascNewStrA2T(Csv[i]["Hosts!STRING:0"].szValue);
 
             // Save the CDN subpath
-            CascStrCopy(szCdnPath, _countof(szCdnPath), Csv[i]["Path!STRING:0"].szValue);
-            hs->szCdnPath = CascNewStr(szCdnPath);
+            hs->szCdnPath = CascNewStrA2T(Csv[i]["Path!STRING:0"].szValue);
 
             // Check and return result
             return (hs->szCdnServers && hs->szCdnPath) ? ERROR_SUCCESS : ERROR_BAD_FORMAT;
@@ -698,7 +688,7 @@ static DWORD ParseFile_BuildInfo(TCascStorage * hs, CASC_CSV & Csv)
 static DWORD ParseFile_VersionsDb(TCascStorage * hs, CASC_CSV & Csv)
 {
     size_t nLineCount = Csv.GetLineCount();
-    DWORD dwErrCode;
+    DWORD dwErrCode = ERROR_SUCCESS;
 
     // Find the active config
     for (size_t i = 0; i < nLineCount; i++)
@@ -723,7 +713,15 @@ static DWORD ParseFile_VersionsDb(TCascStorage * hs, CASC_CSV & Csv)
             }
 
             // Verify all variables
-            return (hs->CdnBuildKey.pbData != NULL && hs->CdnConfigKey.pbData != NULL) ? ERROR_SUCCESS : ERROR_BAD_FORMAT;
+            if(hs->CdnBuildKey.pbData != NULL && hs->CdnConfigKey.pbData != NULL)
+            {
+                // If we have manually given build key, override the value
+                if(hs->szBuildKey != NULL)
+                    dwErrCode = ConvertStringToBinary(hs->szBuildKey, MD5_STRING_SIZE, hs->CdnBuildKey.pbData);
+                return dwErrCode;
+            }
+
+            return ERROR_BAD_FORMAT;
         }
     }
 
@@ -860,9 +858,9 @@ static DWORD ParseFile_CdnBuild(TCascStorage * hs, void * pvListFile)
     return dwErrCode;
 }
 
-static DWORD CheckDataDirectory(TCascStorage * hs, TCHAR * szDirectory)
+static DWORD CheckDataDirectory(TCascStorage * hs, LPTSTR szDirectory)
 {
-    TCHAR * szDataPath;
+    LPTSTR szDataPath;
     DWORD dwErrCode = ERROR_FILE_NOT_FOUND;
 
     // Try all known subdirectories
@@ -888,7 +886,7 @@ static DWORD CheckDataDirectory(TCascStorage * hs, TCHAR * szDirectory)
     return dwErrCode;
 }
 
-static DWORD LoadCsvFile(TCascStorage * hs, const TCHAR * szFileName, PARSECSVFILE PfnParseProc, bool bHasHeader)
+static DWORD LoadCsvFile(TCascStorage * hs, LPCTSTR szFileName, PARSECSVFILE PfnParseProc, bool bHasHeader)
 {
     CASC_CSV Csv(0x40, bHasHeader);
     DWORD dwErrCode;
@@ -899,9 +897,9 @@ static DWORD LoadCsvFile(TCascStorage * hs, const TCHAR * szFileName, PARSECSVFI
     return dwErrCode;
 }
 
-static const TCHAR * ExtractCdnServerName(TCHAR * szServerName, size_t cchServerName, const TCHAR * szCdnServers)
+static LPCTSTR ExtractCdnServerName(LPTSTR szServerName, size_t cchServerName, LPCTSTR szCdnServers)
 {
-    const TCHAR * szSeparator;
+    LPCTSTR szSeparator;
 
     if(szCdnServers[0] != 0)
     {
@@ -982,9 +980,9 @@ static void CreateRemoteAndLocalPath(TCascStorage * hs, CASC_CDN_DOWNLOAD & Cdns
     LocalPath.AppendString(CdnsInfo.szExtension, false);
 }
 
-static DWORD ForcePathExist(const TCHAR * szFileName, bool bIsFileName)
+static DWORD ForcePathExist(LPCTSTR szFileName, bool bIsFileName)
 {
-    TCHAR * szLocalPath;
+    LPTSTR szLocalPath;
     size_t nIndex;
     bool bFirstSeparator = false;
     DWORD dwErrCode = ERROR_NOT_ENOUGH_MEMORY;
@@ -1046,6 +1044,21 @@ static DWORD ForcePathExist(const TCHAR * szFileName, bool bIsFileName)
     return dwErrCode;
 }
 
+static bool FileAlreadyExists(LPCTSTR szFileName)
+{
+    TFileStream * pStream;
+    ULONGLONG FileSize = 0;
+
+    // The file open must succeed and also must be of non-zero size
+    if((pStream = FileStream_OpenFile(szFileName, 0)) != NULL)
+    {
+        FileStream_GetSize(pStream, &FileSize);
+        FileStream_Close(pStream);
+    }
+
+    return (FileSize != 0);
+}
+
 static DWORD DownloadFile(
     LPCTSTR szRemoteName,
     LPCTSTR szLocalName,
@@ -1118,7 +1131,7 @@ static DWORD DownloadFileFromCDN2(TCascStorage * hs, CASC_CDN_DOWNLOAD & CdnsInf
     CreateRemoteAndLocalPath(hs, CdnsInfo, RemotePath, LocalPath);
 
     // Check whether the local file exists
-    if((CdnsInfo.Flags & CASC_CDN_FORCE_DOWNLOAD) || (_taccess(LocalPath, 0) == -1))
+    if((CdnsInfo.Flags & CASC_CDN_FORCE_DOWNLOAD) || !FileAlreadyExists(LocalPath))
     {
         // Make sure that the path exists
         dwErrCode = ForcePathExist(LocalPath, true);
@@ -1267,10 +1280,10 @@ DWORD GetFileSpanInfo(PCASC_CKEY_ENTRY pCKeyEntry, PULONGLONG PtrContentSize, PU
 // Checks whether there is a ".build.info" or ".build.db".
 // If yes, the function sets "szDataPath" and "szIndexPath"
 // in the storage structure and returns ERROR_SUCCESS
-DWORD CheckGameDirectory(TCascStorage * hs, TCHAR * szDirectory)
+DWORD CheckGameDirectory(TCascStorage * hs, LPTSTR szDirectory)
 {
     TFileStream * pStream;
-    TCHAR * szBuildFile;
+    LPTSTR szBuildFile;
     DWORD dwErrCode = ERROR_FILE_NOT_FOUND;
 
     // Try to find any of the root files used in the history
@@ -1504,8 +1517,7 @@ LPBYTE LoadFileToMemory(LPCTSTR szFileName, DWORD * pcbFileData)
     DWORD cbFileData = 0;
 
     // Open the stream for read-only access and read the file
-    // Note that this fails when the game is running (sharing violation).
-    pStream = FileStream_OpenFile(szFileName, STREAM_FLAG_READ_ONLY | STREAM_PROVIDER_FLAT | BASE_PROVIDER_FILE);
+    pStream = FileStream_OpenFile(szFileName, STREAM_FLAG_READ_ONLY | STREAM_FLAG_WRITE_SHARE | STREAM_PROVIDER_FLAT | BASE_PROVIDER_FILE);
     if(pStream != NULL)
     {
         // Retrieve the file size