Dep/CascLib: Update to ladislav-zezula/CascLib@2313e4aff966ef0f841c1748dad4db71c8ba6310

Closes #19237

13 files changed, 117 insertions, 20 deletions

diff --git a/dep/CascLib/src/CascDecrypt.cpp b/dep/CascLib/src/CascDecrypt.cpp
index 9fdcf1789b7..e006c4cc5aa 100644
--- a/dep/CascLib/src/CascDecrypt.cpp
+++ b/dep/CascLib/src/CascDecrypt.cpp
@@ -67,7 +67,14 @@ static CASC_ENCRYPTION_KEY CascKeys[] =
     {0x11131FFDA0D18D30ULL, {0xC3, 0x2A, 0xD1, 0xB8, 0x25, 0x28, 0xE0, 0xA4, 0x56, 0x89, 0x7B, 0x3C, 0xE1, 0xC2, 0xD2, 0x7E}},   // 1.5.0.1.32795 (Sombra)
     {0xCAC6B95B2724144AULL, {0x73, 0xE4, 0xBE, 0xA1, 0x45, 0xDF, 0x2B, 0x89, 0xB6, 0x5A, 0xEF, 0x02, 0xF8, 0x3F, 0xA2, 0x60}},   // 1.5.0.1.32795 (Ecopoint: Antarctica)
     {0xB7DBC693758A5C36ULL, {0xBC, 0x3A, 0x92, 0xBF, 0xE3, 0x02, 0x51, 0x8D, 0x91, 0xCC, 0x30, 0x79, 0x06, 0x71, 0xBF, 0x10}},   // 1.5.0.1.32795 (Genji Oni skin)
-                            
+    {0x90CA73B2CDE3164BULL, {0x5C, 0xBF, 0xF1, 0x1F, 0x22, 0x72, 0x0B, 0xAC, 0xC2, 0xAE, 0x6A, 0xAD, 0x8F, 0xE5, 0x33, 0x17}},
+    {0x6DD3212FB942714AULL, {0xE0, 0x2C, 0x16, 0x43, 0x60, 0x2E, 0xC1, 0x6C, 0x3A, 0xE2, 0xA4, 0xD2, 0x54, 0xA0, 0x8F, 0xD9}},
+    {0x11DDB470ABCBA130ULL, {0x66, 0x19, 0x87, 0x66, 0xB1, 0xC4, 0xAF, 0x75, 0x89, 0xEF, 0xD1, 0x3A, 0xD4, 0xDD, 0x66, 0x7A}},
+    {0x5BEF27EEE95E0B4BULL, {0x36, 0xBC, 0xD2, 0xB5, 0x51, 0xFF, 0x1C, 0x84, 0xAA, 0x3A, 0x39, 0x94, 0xCC, 0xEB, 0x03, 0x3E}},
+    {0x9359B46E49D2DA42ULL, {0x17, 0x3D, 0x65, 0xE7, 0xFC, 0xAE, 0x29, 0x8A, 0x93, 0x63, 0xBD, 0x6A, 0xA1, 0x89, 0xF2, 0x00}},
+    {0x1A46302EF8896F34ULL, {0x80, 0x29, 0xAD, 0x54, 0x51, 0xD4, 0xBC, 0x18, 0xE9, 0xD0, 0xF5, 0xAC, 0x44, 0x9D, 0xC0, 0x55}},
+
+    // Streamed WoW keys
     {0xFA505078126ACB3EULL, {0xBD, 0xC5, 0x18, 0x62, 0xAB, 0xED, 0x79, 0xB2, 0xDE, 0x48, 0xC8, 0xE7, 0xE6, 0x6C, 0x62, 0x00}},   // 15  WOW-20740patch7.0.1_Beta
     {0xFF813F7D062AC0BCULL, {0xAA, 0x0B, 0x5C, 0x77, 0xF0, 0x88, 0xCC, 0xC2, 0xD3, 0x90, 0x49, 0xBD, 0x26, 0x7F, 0x06, 0x6D}},   // 25  WOW-20740patch7.0.1_Beta (streamed from server)
     {0xD1E9B5EDF9283668ULL, {0x8E, 0x4A, 0x25, 0x79, 0x89, 0x4E, 0x38, 0xB4, 0xAB, 0x90, 0x58, 0xBA, 0x5C, 0x73, 0x28, 0xEE}},   // 39  WOW-20740patch7.0.1_Beta (streamed from server)
@@ -97,8 +104,9 @@ static CASC_ENCRYPTION_KEY CascKeys[] =
     {0x69549CB975E87C4FULL, {0x7B, 0x6F, 0xA3, 0x82, 0xE1, 0xFA, 0xD1, 0x46, 0x5C, 0x85, 0x1E, 0x3F, 0x47, 0x34, 0xA1, 0xB3}},   // 73  WOW-21846patch7.0.3_Beta  legion_iq_id cinematic
     {0x460C92C372B2A166ULL, {0x94, 0x6D, 0x56, 0x59, 0xF2, 0xFA, 0xF3, 0x27, 0xC0, 0xB7, 0xEC, 0x82, 0x8B, 0x74, 0x8A, 0xDB}},   // 74  WOW-21952patch7.0.3_Beta  Stormheim Alliance cinematic (legion_g_a_sth)
     {0x8165D801CCA11962ULL, {0xCD, 0x0C, 0x0F, 0xFA, 0xAD, 0x93, 0x63, 0xEC, 0x14, 0xDD, 0x25, 0xEC, 0xDD, 0x2A, 0x5B, 0x62}},   // 75  WOW-21952patch7.0.3_Beta  Stormheim Horde cinematic (legion_g_h_sth)
-//  {0xA3F1C999090ADAC9ULL, {0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??}},   // 81  WOW-22578patch7.1.0_PTR   Firecat Mount
+    {0xA3F1C999090ADAC9ULL, {0xB7, 0x2F, 0xEF, 0x4A, 0x01, 0x48, 0x8A, 0x88, 0xFF, 0x02, 0x28, 0x0A, 0xA0, 0x7A, 0x92, 0xBB}},   // 81  WOW-22578patch7.1.0_PTR   Firecat Mount
 //  {0x18AFDF5191923610ULL, {0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??}},   // 82  WOW-22578patch7.1.0_PTR
+//  {0x3C258426058FBD93ULL, {0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??, 0x??}},   // 91
 
     {0, {0}}
 };
diff --git a/dep/CascLib/src/CascFiles.cpp b/dep/CascLib/src/CascFiles.cpp
index bb207c8f858..d17d1bc0204 100644
--- a/dep/CascLib/src/CascFiles.cpp
+++ b/dep/CascLib/src/CascFiles.cpp
@@ -861,15 +861,14 @@ int LoadBuildInfo(TCascStorage * hs)
     // proceed with loading the CDN config file and CDN build file
     if(nError == ERROR_SUCCESS)
     {
-        // Load the configuration file
+        // Load the configuration file. Note that we don't
+        // need it for anything, really, so we don't care if it fails
         pvListFile = FetchAndVerifyConfigFile(hs, &hs->CdnConfigKey);
         if(pvListFile != NULL)
         {
             nError = LoadCdnConfigFile(hs, pvListFile);
             ListFile_Free(pvListFile);
         }
-        else
-            nError = ERROR_FILE_NOT_FOUND;
     }
 
     // Load the build file
@@ -902,9 +901,9 @@ int LoadBuildInfo(TCascStorage * hs)
     return nError;
 }
 
-// Checks whether there is a ".agent.db". If yes, the function
-// sets "szRootPath" and "szDataPath" in the storage structure
-// and returns ERROR_SUCCESS
+// Checks whether there is a ".build.info" or ".build.db".
+// If yes, the function sets "szRootPath" and "szDataPath"
+// in the storage structure and returns ERROR_SUCCESS
 int CheckGameDirectory(TCascStorage * hs, TCHAR * szDirectory)
 {
     TFileStream * pStream;
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;
         }
diff --git a/dep/CascLib/src/CascLib.h b/dep/CascLib/src/CascLib.h
index 93decc29755..a297e3cd458 100644
--- a/dep/CascLib/src/CascLib.h
+++ b/dep/CascLib/src/CascLib.h
@@ -94,6 +94,7 @@ extern "C" {
 // Return value for CascGetFileSize and CascSetFilePointer
 #define CASC_INVALID_SIZE           0xFFFFFFFF
 #define CASC_INVALID_POS            0xFFFFFFFF
+#define CASC_INVALID_ID             0xFFFFFFFF
 
 // Flags for CascGetStorageInfo
 #define CASC_FEATURE_LISTFILE       0x00000001  // The storage supports listfile
@@ -125,6 +126,7 @@ typedef struct _CASC_FIND_DATA
     char * szPlainName;                         // Plain name of the found file
     BYTE   EncodingKey[MD5_HASH_SIZE];          // Encoding key
     DWORD  dwLocaleFlags;                       // Locale flags (WoW only)
+    DWORD  dwFileDataId;                        // File data ID (WoW only) 
     DWORD  dwFileSize;                          // Size of the file
 
 } CASC_FIND_DATA, *PCASC_FIND_DATA;
@@ -151,6 +153,7 @@ bool  WINAPI CascOpenFileByIndexKey(HANDLE hStorage, PQUERY_KEY pIndexKey, DWORD
 bool  WINAPI CascOpenFileByEncodingKey(HANDLE hStorage, PQUERY_KEY pEncodingKey, DWORD dwFlags, HANDLE * phFile);
 bool  WINAPI CascOpenFile(HANDLE hStorage, const char * szFileName, DWORD dwLocale, DWORD dwFlags, HANDLE * phFile);
 DWORD WINAPI CascGetFileSize(HANDLE hFile, PDWORD pdwFileSizeHigh);
+DWORD WINAPI CascGetFileId(HANDLE hStorage, const char * szFileName);
 DWORD WINAPI CascSetFilePointer(HANDLE hFile, LONG lFilePos, LONG * plFilePosHigh, DWORD dwMoveMethod);
 bool  WINAPI CascReadFile(HANDLE hFile, void * lpBuffer, DWORD dwToRead, PDWORD pdwRead);
 bool  WINAPI CascCloseFile(HANDLE hFile);
diff --git a/dep/CascLib/src/CascOpenFile.cpp b/dep/CascLib/src/CascOpenFile.cpp
index f590155144d..9db3691af48 100644
--- a/dep/CascLib/src/CascOpenFile.cpp
+++ b/dep/CascLib/src/CascOpenFile.cpp
@@ -270,6 +270,28 @@ bool WINAPI CascOpenFile(HANDLE hStorage, const char * szFileName, DWORD dwLocal
     return (nError == ERROR_SUCCESS);
 }
 
+DWORD WINAPI CascGetFileId(HANDLE hStorage, const char * szFileName)
+{
+    TCascStorage * hs;
+
+    // Validate the storage handle
+    hs = IsValidStorageHandle(hStorage);
+    if (hs == NULL)
+    {
+        SetLastError(ERROR_INVALID_HANDLE);
+        return false;
+    }
+
+    // Validate the other parameters
+    if (szFileName == NULL || szFileName[0] == 0)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return false;
+    }
+
+    return RootHandler_GetFileId(hs->pRootHandler, szFileName);
+}
+
 bool WINAPI CascCloseFile(HANDLE hFile)
 {
     TCascFile * hf;
diff --git a/dep/CascLib/src/CascPort.h b/dep/CascLib/src/CascPort.h
index 6a9aee2edce..85b97969e59 100644
--- a/dep/CascLib/src/CascPort.h
+++ b/dep/CascLib/src/CascPort.h
@@ -28,6 +28,9 @@
   #define _CRT_SECURE_NO_DEPRECATE
   #define _CRT_NON_CONFORMING_SWPRINTFS
   #endif
+  #ifndef WIN32_LEAN_AND_MEAN
+  #define WIN32_LEAN_AND_MEAN
+  #endif
 
   #include <tchar.h>
   #include <assert.h>
diff --git a/dep/CascLib/src/CascRootFile_Diablo3.cpp b/dep/CascLib/src/CascRootFile_Diablo3.cpp
index 6fa8309a2fe..8ffb9fbfa45 100644
--- a/dep/CascLib/src/CascRootFile_Diablo3.cpp
+++ b/dep/CascLib/src/CascRootFile_Diablo3.cpp
@@ -946,7 +946,7 @@ static int D3Handler_Insert(TRootHandler_Diablo3 * pRootHandler, const char * sz
     return (dwFileIndex != INVALID_FILE_INDEX) ? ERROR_SUCCESS : ERROR_NOT_ENOUGH_MEMORY;
 }
 
-static LPBYTE D3Handler_Search(TRootHandler_Diablo3 * pRootHandler, TCascSearch * pSearch, PDWORD /* PtrFileSize */, PDWORD /* PtrLocaleFlags */)
+static LPBYTE D3Handler_Search(TRootHandler_Diablo3 * pRootHandler, TCascSearch * pSearch, PDWORD /* PtrFileSize */, PDWORD /* PtrLocaleFlags */, PDWORD /* PtrFileDataId */)
 {
     PCASC_FILE_ENTRY pFileEntry;
     const char * szSrcName = NULL;
@@ -992,6 +992,12 @@ static LPBYTE D3Handler_GetKey(TRootHandler_Diablo3 * pRootHandler, const char *
     return (pFileEntry != NULL) ? pFileEntry->EncodingKey.Value : NULL;
 }
 
+static DWORD D3Handler_GetFileId(TRootHandler_Diablo3 * /* pRootHandler */, const char * /* szFileName */)
+{
+  // Not implemented for D3
+  return 0;
+}
+
 static void D3Handler_Close(TRootHandler_Diablo3 * pRootHandler)
 {
     if(pRootHandler != NULL)
@@ -1098,6 +1104,7 @@ int RootHandler_CreateDiablo3(TCascStorage * hs, LPBYTE pbRootFile, DWORD cbRoot
     pRootHandler->EndSearch   = (ROOT_ENDSEARCH)D3Handler_EndSearch;
     pRootHandler->GetKey      = (ROOT_GETKEY)D3Handler_GetKey;
     pRootHandler->Close       = (ROOT_CLOSE)D3Handler_Close;
+    pRootHandler->GetFileId   = (ROOT_GETFILEID)D3Handler_GetFileId;
 
     // Fill-in the flags
     pRootHandler->dwRootFlags |= ROOT_FLAG_HAS_NAMES;
diff --git a/dep/CascLib/src/CascRootFile_Mndx.cpp b/dep/CascLib/src/CascRootFile_Mndx.cpp
index 0f7e3c42c64..4a70c1c10f3 100644
--- a/dep/CascLib/src/CascRootFile_Mndx.cpp
+++ b/dep/CascLib/src/CascRootFile_Mndx.cpp
@@ -3045,7 +3045,7 @@ static int MndxHandler_Insert(TRootHandler_MNDX *, const char *, LPBYTE)
     return ERROR_NOT_SUPPORTED;
 }
 
-static LPBYTE MndxHandler_Search(TRootHandler_MNDX * pRootHandler, TCascSearch * pSearch, PDWORD PtrFileSize, PDWORD /* PtrLocaleFlags */)
+static LPBYTE MndxHandler_Search(TRootHandler_MNDX * pRootHandler, TCascSearch * pSearch, PDWORD PtrFileSize, PDWORD /* PtrLocaleFlags */, PDWORD /* PtrFileDataId */)
 {
     TMndxFindResult * pStruct1C = NULL;
     PCASC_MNDX_INFO pMndxInfo = &pRootHandler->MndxInfo;
@@ -3085,6 +3085,12 @@ static void MndxHandler_EndSearch(TRootHandler_MNDX * /* pRootHandler */, TCascS
     pSearch->pRootContext = NULL;
 }
 
+static DWORD MndxHandler_GetFileId(TRootHandler_MNDX * /* pRootHandler */, const char * /* szFileName */)
+{
+  // Not implemented for HOTS
+  return 0;
+}
+
 static LPBYTE MndxHandler_GetKey(TRootHandler_MNDX * pRootHandler, const char * szFileName)
 {
     PCASC_ROOT_ENTRY_MNDX pRootEntry = NULL;
@@ -3164,7 +3170,9 @@ int RootHandler_CreateMNDX(TCascStorage * hs, LPBYTE pbRootFile, DWORD cbRootFil
     pRootHandler->Search      = (ROOT_SEARCH)MndxHandler_Search;
     pRootHandler->EndSearch   = (ROOT_ENDSEARCH)MndxHandler_EndSearch;
     pRootHandler->GetKey      = (ROOT_GETKEY)MndxHandler_GetKey;
-    pRootHandler->Close       = (ROOT_CLOSE) MndxHandler_Close;
+    pRootHandler->Close       = (ROOT_CLOSE)MndxHandler_Close;
+    pRootHandler->GetFileId   = (ROOT_GETFILEID)MndxHandler_GetFileId;
+
     pMndxInfo = &pRootHandler->MndxInfo;
 
     // Fill-in the flags
diff --git a/dep/CascLib/src/CascRootFile_Ovr.cpp b/dep/CascLib/src/CascRootFile_Ovr.cpp
index dbb7620b769..01ad13dca8a 100644
--- a/dep/CascLib/src/CascRootFile_Ovr.cpp
+++ b/dep/CascLib/src/CascRootFile_Ovr.cpp
@@ -77,7 +77,7 @@ static int OvrHandler_Insert(
     return InsertFileEntry(pRootHandler, szFileName, pbEncodingKey);
 }
 
-static LPBYTE OvrHandler_Search(TRootHandler_Ovr * pRootHandler, TCascSearch * pSearch, PDWORD /* PtrFileSize */, PDWORD /* PtrLocaleFlags */)
+static LPBYTE OvrHandler_Search(TRootHandler_Ovr * pRootHandler, TCascSearch * pSearch, PDWORD /* PtrFileSize */, PDWORD /* PtrLocaleFlags */, PDWORD /* PtrFileDataId */)
 {
     PCASC_FILE_ENTRY pFileEntry;
 
@@ -109,6 +109,12 @@ static LPBYTE OvrHandler_GetKey(TRootHandler_Ovr * pRootHandler, const char * sz
     return (LPBYTE)Map_FindObject(pRootHandler->pRootMap, &FileNameHash, NULL);
 }
 
+static DWORD OvrHandler_GetFileId(TRootHandler_Ovr * /* pRootHandler */, const char * /* szFileName */)
+{
+  // Not implemented for Overwatch
+  return 0;
+}
+
 static void OvrHandler_Close(TRootHandler_Ovr * pRootHandler)
 {
     if(pRootHandler != NULL)
@@ -155,6 +161,7 @@ int RootHandler_CreateOverwatch(TCascStorage * hs, LPBYTE pbRootFile, DWORD cbRo
     pRootHandler->EndSearch   = (ROOT_ENDSEARCH)OvrHandler_EndSearch;
     pRootHandler->GetKey      = (ROOT_GETKEY)OvrHandler_GetKey;
     pRootHandler->Close       = (ROOT_CLOSE)OvrHandler_Close;
+    pRootHandler->GetFileId   = (ROOT_GETFILEID)OvrHandler_GetFileId;
 
     // Fill-in the flags
     pRootHandler->dwRootFlags |= ROOT_FLAG_HAS_NAMES;
diff --git a/dep/CascLib/src/CascRootFile_WoW6.cpp b/dep/CascLib/src/CascRootFile_WoW6.cpp
index 4f4a1e31db2..737fc0af6db 100644
--- a/dep/CascLib/src/CascRootFile_WoW6.cpp
+++ b/dep/CascLib/src/CascRootFile_WoW6.cpp
@@ -386,7 +386,12 @@ static int WowHandler_Insert(
     return ERROR_SUCCESS;
 }
 
-static LPBYTE WowHandler_Search(TRootHandler_WoW6 * pRootHandler, TCascSearch * pSearch, PDWORD /* PtrFileSize */, PDWORD PtrLocaleFlags)
+static LPBYTE WowHandler_Search(
+    TRootHandler_WoW6 * pRootHandler,
+    TCascSearch * pSearch,
+    PDWORD /* PtrFileSize */,
+    PDWORD PtrLocaleFlags,
+    PDWORD PtrFileDataId)
 {
     PCASC_FILE_ENTRY pFileEntry;
 
@@ -403,6 +408,8 @@ static LPBYTE WowHandler_Search(TRootHandler_WoW6 * pRootHandler, TCascSearch *
                 // Give the caller the locale mask
                 if(PtrLocaleFlags != NULL)
                     PtrLocaleFlags[0] = pFileEntry->Locales;
+                if(PtrFileDataId != NULL)
+                    PtrFileDataId[0] = pFileEntry->FileDataId;
                 return pFileEntry->EncodingKey.Value;
             }
         }
@@ -444,6 +451,15 @@ static void WowHandler_EndSearch(TRootHandler_WoW6 * /* pRootHandler */, TCascSe
     pSearch->pRootContext = NULL;
 }
 
+static DWORD WowHandler_GetFileId(TRootHandler_WoW6 * pRootHandler, const char * szFileName)
+{
+    PCASC_FILE_ENTRY pFileEntry;
+
+    // Find by the file name hash
+    pFileEntry = FindRootEntry(pRootHandler->pRootMap, szFileName, NULL);
+    return (pFileEntry != NULL) ? pFileEntry->FileDataId : NULL;
+}
+
 static void WowHandler_Close(TRootHandler_WoW6 * pRootHandler)
 {
     if(pRootHandler != NULL)
@@ -545,6 +561,7 @@ int RootHandler_CreateWoW6(TCascStorage * hs, LPBYTE pbRootFile, DWORD cbRootFil
     pRootHandler->EndSearch   = (ROOT_ENDSEARCH)WowHandler_EndSearch;
     pRootHandler->GetKey      = (ROOT_GETKEY)WowHandler_GetKey;
     pRootHandler->Close       = (ROOT_CLOSE)WowHandler_Close;
+    pRootHandler->GetFileId   = (ROOT_GETFILEID)WowHandler_GetFileId;
 
 #ifdef _DEBUG
     pRootHandler->Dump = TRootHandlerWoW6_Dump;    // Support for ROOT file dump
diff --git a/dep/CascLib/src/common/FileStream.cpp b/dep/CascLib/src/common/FileStream.cpp
index 7e0dd3cd484..22d7fceb4c2 100644
--- a/dep/CascLib/src/common/FileStream.cpp
+++ b/dep/CascLib/src/common/FileStream.cpp
@@ -74,6 +74,7 @@ static bool BaseFile_Create(TFileStream * pStream)
         handle = open(pStream->szFileName, O_RDWR | O_CREAT | O_TRUNC | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
         if(handle == -1)
         {
+            pStream->Base.File.hFile = INVALID_HANDLE_VALUE;
             SetLastError(errno);
             return false;
         }
@@ -123,6 +124,7 @@ static bool BaseFile_Open(TFileStream * pStream, const TCHAR * szFileName, DWORD
         intptr_t handle;
 
         // Open the file
+        pStream->Base.File.hFile = INVALID_HANDLE_VALUE;
         handle = open(szFileName, oflag | O_LARGEFILE);
         if(handle == -1)
         {
diff --git a/dep/CascLib/src/common/RootHandler.cpp b/dep/CascLib/src/common/RootHandler.cpp
index 0ecbee981fb..2940e3f0cae 100644
--- a/dep/CascLib/src/common/RootHandler.cpp
+++ b/dep/CascLib/src/common/RootHandler.cpp
@@ -23,13 +23,13 @@ int RootHandler_Insert(TRootHandler * pRootHandler, const char * szFileName, LPB
     return pRootHandler->Insert(pRootHandler, szFileName, pbEncodingKey);
 }
 
-LPBYTE RootHandler_Search(TRootHandler * pRootHandler, struct _TCascSearch * pSearch, PDWORD PtrFileSize, PDWORD PtrLocaleFlags)
+LPBYTE RootHandler_Search(TRootHandler * pRootHandler, struct _TCascSearch * pSearch, PDWORD PtrFileSize, PDWORD PtrLocaleFlags, PDWORD PtrFileDataId)
 {
     // Check if the root structure is valid at all
     if(pRootHandler == NULL)
         return NULL;
 
-    return pRootHandler->Search(pRootHandler, pSearch, PtrFileSize, PtrLocaleFlags);
+    return pRootHandler->Search(pRootHandler, pSearch, PtrFileSize, PtrLocaleFlags, PtrFileDataId);
 }
 
 void RootHandler_EndSearch(TRootHandler * pRootHandler, struct _TCascSearch * pSearch)
@@ -76,3 +76,13 @@ void RootHandler_Close(TRootHandler * pRootHandler)
         pRootHandler->Close(pRootHandler);
     }
 }
+
+DWORD RootHandler_GetFileId(TRootHandler * pRootHandler, const char * szFileName)
+{
+    // Check if the root structure is valid at all
+    if(pRootHandler == NULL)
+        return NULL;
+
+    return pRootHandler->GetFileId(pRootHandler, szFileName);
+}
+
diff --git a/dep/CascLib/src/common/RootHandler.h b/dep/CascLib/src/common/RootHandler.h
index e1869e351cc..d1b66e501d8 100644
--- a/dep/CascLib/src/common/RootHandler.h
+++ b/dep/CascLib/src/common/RootHandler.h
@@ -37,7 +37,8 @@ typedef LPBYTE (*ROOT_SEARCH)(
     struct TRootHandler * pRootHandler,             // Pointer to an initialized root handler
     struct _TCascSearch * pSearch,                  // Pointer to the initialized search structure
     PDWORD PtrFileSize,                             // Pointer to receive file size (optional)
-    PDWORD PtrLocaleFlags                           // Pointer to receive locale flags (optional)
+    PDWORD PtrLocaleFlags,                          // Pointer to receive locale flags (optional)
+    PDWORD PtrFileDataId                            // Pointer to FileDataID (optional)
     );
 
 typedef void (*ROOT_ENDSEARCH)(
@@ -63,6 +64,11 @@ typedef void (*ROOT_CLOSE)(
     struct TRootHandler * pRootHandler              // Pointer to an initialized root handler
     );
 
+typedef DWORD(*ROOT_GETFILEID)(
+struct TRootHandler * pRootHandler,             // Pointer to an initialized root handler
+  const char * szFileName                         // Pointer to the name of a file
+  );
+
 struct TRootHandler
 {
     ROOT_INSERT    Insert;                          // Inserts an existing file name
@@ -71,6 +77,7 @@ struct TRootHandler
     ROOT_GETKEY    GetKey;                          // Retrieves encoding key for a file name
     ROOT_DUMP      Dump;
     ROOT_CLOSE     Close;                           // Closing the root file
+    ROOT_GETFILEID GetFileId;                       // Returns File Id for a given Filename
 
     DWORD dwRootFlags;                              // Root flags - see the ROOT_FLAG_XXX
 };
@@ -79,10 +86,11 @@ struct TRootHandler
 // Public functions
 
 int    RootHandler_Insert(TRootHandler * pRootHandler, const char * szFileName, LPBYTE pbEncodingKey);
-LPBYTE RootHandler_Search(TRootHandler * pRootHandler, struct _TCascSearch * pSearch, PDWORD PtrFileSize, PDWORD PtrLocaleFlags);
+LPBYTE RootHandler_Search(TRootHandler * pRootHandler, struct _TCascSearch * pSearch, PDWORD PtrFileSize, PDWORD PtrLocaleFlags, PDWORD PtrFileDataId);
 void   RootHandler_EndSearch(TRootHandler * pRootHandler, struct _TCascSearch * pSearch);
 LPBYTE RootHandler_GetKey(TRootHandler * pRootHandler, const char * szFileName);
 void   RootHandler_Dump(struct _TCascStorage * hs, LPBYTE pbRootHandler, DWORD cbRootHandler, const TCHAR * szNameFormat, const TCHAR * szListFile, int nDumpLevel);
 void   RootHandler_Close(TRootHandler * pRootHandler);
+DWORD  RootHandler_GetFileId(TRootHandler * pRootHandler, const char * szFileName);
 
 #endif  // __ROOT_HANDLER_H__