Merge pull request #284 from ladislav-zezula/LZ_Diablo2Steam

Finalizing

Author: ladislav-zezula

src/CascFiles.cpp

@@ -542,14 +542,23 @@ static DWORD LoadBuildNumber(TCascStorage * hs, const char * /* szVariableName *
     return ERROR_BAD_FORMAT;
 }
 
-static int LoadQueryKey(const CASC_CSV_COLUMN & Column, CASC_BLOB & Key)
+static DWORD LoadQueryKey(const CASC_CSV_COLUMN & Column, CASC_BLOB & Key)
 {
-    // Check the input data
-    if(Column.szValue == NULL)
-        return ERROR_BUFFER_OVERFLOW;
-    if(Column.nLength != MD5_STRING_SIZE)
+    // Check for existence
+    if(Column.Empty())
+    {
+        Key.Free();
+        return ERROR_SUCCESS;
+    }
+
+    // Check for invalid length
+    if(Column.nLength && Column.nLength != MD5_STRING_SIZE)
+    {
+        assert(false);
         return ERROR_BAD_FORMAT;
+    }
 
+    // Convert the text value into binary blob
     return LoadHashArray(&Key, Column.szValue, Column.szValue + Column.nLength, 1);
 }
 
@@ -586,19 +595,24 @@ static DWORD GetDefaultLocaleByRegion(LPCSTR szRegion)
 
 static DWORD GetDefaultLocaleMask(const CASC_CSV_COLUMN & Column)
 {
-    LPCSTR szTagEnd = Column.szValue + Column.nLength - 4;
-    LPCSTR szTagPtr;
     DWORD dwLocaleValue;
     DWORD dwLocaleMask = 0;
 
-    // Go through the whole tag string
-    for(szTagPtr = Column.szValue; szTagPtr <= szTagEnd; szTagPtr++)
+    // Check whether the column contains some data
+    if(!Column.Empty())
     {
-        // Try to recognize the 4-char locale code
-        if((dwLocaleValue = GetLocaleValue(szTagPtr)) != CASC_LOCALE_NONE)
+        LPCSTR szTagEnd = Column.szValue + Column.nLength - 4;
+        LPCSTR szTagPtr;
+
+        // Go through the whole tag string
+        for(szTagPtr = Column.szValue; szTagPtr <= szTagEnd; szTagPtr++)
         {
-            dwLocaleMask |= dwLocaleValue;
-            szTagPtr += 3;  // Will be moved by 1 more at the end of the loop
+            // Try to recognize the 4-char locale code
+            if((dwLocaleValue = GetLocaleValue(szTagPtr)) != CASC_LOCALE_NONE)
+            {
+                dwLocaleMask |= dwLocaleValue;
+                szTagPtr += 3;  // Will be moved by 1 more at the end of the loop
+            }
         }
     }
     return dwLocaleMask;
@@ -714,13 +728,13 @@ static DWORD ParseFile_BuildInfo(TCascStorage * hs, CASC_CSV & Csv)
 
         // If we found version, extract a build number
         const CASC_CSV_COLUMN & VerColumn = Csv[nSelected]["Version!STRING:0"];
-        if(VerColumn.szValue && VerColumn.nLength)
+        if(!VerColumn.Empty())
         {
             LoadBuildNumber(hs, NULL, VerColumn.szValue, VerColumn.szValue + VerColumn.nLength, NULL);
         }
 
-        // Verify all variables
-        return (hs->CdnBuildKey.pbData != NULL && hs->CdnConfigKey.pbData != NULL) ? ERROR_SUCCESS : ERROR_BAD_FORMAT;
+        // At least the build key must be valid here
+        return hs->CdnBuildKey.Valid() ? ERROR_SUCCESS : ERROR_BAD_FORMAT;
     }
 
     return ERROR_FILE_NOT_FOUND;

src/CascOpenStorage.cpp

@@ -1166,7 +1166,7 @@ static DWORD LoadCascStorage(TCascStorage * hs, PCASC_OPEN_STORAGE_ARGS pArgs, L
     }
 
     // Proceed with loading the CDN config file
-    if(dwErrCode == ERROR_SUCCESS)
+    if(dwErrCode == ERROR_SUCCESS && hs->CdnConfigKey.Valid())
     {
         dwErrCode = LoadCdnConfigFile(hs);
         if(dwErrCode != ERROR_SUCCESS && (hs->dwFeatures & CASC_FEATURE_ONLINE) == 0)

src/common/Common.h

@@ -548,6 +548,11 @@ struct CASC_BLOB
         return pbData + cbData;
     }
 
+    bool Valid() const
+    {
+        return pbData && cbData;
+    }
+
     LPBYTE pbData;
     size_t cbData;
 };

src/common/Csv.h

@@ -39,6 +39,11 @@ struct CASC_CSV_COLUMN
         nLength = 0;
     }
 
+    bool Empty() const
+    {
+        return (szValue == NULL || nLength == 0);
+    }
+
     const char * szValue;
     size_t nLength;
 };

test/CascTest.cpp

@@ -1242,7 +1242,7 @@ int main(int argc, char * argv[])
 
 #ifdef LOAD_STORAGES_SINGLE_DEV
     {
-/*
+
         CASC_OPEN_STORAGE_ARGS OpenArgs = {sizeof(CASC_OPEN_STORAGE_ARGS)};
         ULONGLONG FileSize = 0;
         HANDLE hStorage;
@@ -1252,7 +1252,7 @@ int main(int argc, char * argv[])
         OpenArgs.PfnProgressCallback = OnlineStorage_OpenCB;
 
         // Open the online storage
-        if(CascOpenStorageEx(_T("e:\\Multimedia\\CASC\\Work\\odin*odin*eu*b166bdb29359f05a2e876423f413a89c"), &OpenArgs, true, &hStorage))
+        if(CascOpenStorageEx(_T("e:\\Ladik\\Incoming\\diablo"), &OpenArgs, true, &hStorage))
         {
             if(CascOpenFile(hStorage, "ROOT", 0, CASC_OVERCOME_ENCRYPTED | CASC_OPEN_CKEY_ONCE, &hFile))
             {
@@ -1261,7 +1261,7 @@ int main(int argc, char * argv[])
             }
             CascCloseStorage(hStorage);
         }
-*/
+
 /*
         CASC_OPEN_STORAGE_ARGS OpenArgs = {sizeof(CASC_OPEN_STORAGE_ARGS)};
         //CASC_FIND_DATA cf;