Updated CascLib

Disabled Jolt Dummy Trace Asserting
Fixed ItemDisplayInfo geosetGroupIndex range
Updated Submodule Engine

Author: NixAJ

Dependencies/casc/Casc/CascCommon.h

@@ -23,7 +23,7 @@
 
 #if defined(_DEBUG) && !defined(CASCLIB_NODEBUG)
 #define CASCLIB_DEBUG
-#define CASCLIB_WRITE_VERIFIED_FILENAMES            // If defined, TRootHandler_WoW will save all files whose hashes are confirmed
+//#define CASCLIB_WRITE_VERIFIED_FILENAMES            // If defined, TRootHandler_WoW will save all files whose hashes are confirmed
 #endif
 
 #include "CascPort.h"
@@ -110,14 +110,13 @@ typedef struct _CASC_BUILD_FILE
 } CASC_BUILD_FILE, *PCASC_BUILD_FILE;
 
 // Information about index file
-struct CASC_INDEX
+typedef struct _CASC_INDEX
 {
     CASC_BLOB FileData;
     LPTSTR szFileName;                              // Full name of the index file
     DWORD NewSubIndex;                              // New subindex
     DWORD OldSubIndex;                              // Old subindex
-};
-typedef CASC_INDEX * PCASC_INDEX;
+} CASC_INDEX, *PCASC_INDEX;
 
 // Normalized header of the index files.
 // Both version 1 and version 2 are converted to this structure
@@ -534,4 +533,4 @@ void CascDumpFile(HANDLE hFile, const char * szDumpFile = NULL);
 void CascDumpStorage(HANDLE hStorage, const char * szDumpFile = NULL);
 #endif
 
-#endif // __CASCCOMMON_H__
+#endif // __CASCCOMMON_H__

Dependencies/casc/Casc/CascFiles.cpp

@@ -1883,3 +1883,4 @@ void WINAPI CascCdnFree(void * buffer)
 {
     CASC_FREE(buffer);
 }
+

Dependencies/casc/Casc/CascIndexFiles.cpp

@@ -833,4 +833,4 @@ void FreeIndexFiles(TCascStorage * hs)
         // Free the file name
         CASC_FREE(IndexFile.szFileName);
     }
-}
+}

Dependencies/casc/Casc/CascLib.h

@@ -436,4 +436,4 @@ DWORD GetCascError();
 }   // extern "C"
 #endif
 
-#endif  // __CASCLIB_H__
+#endif  // __CASCLIB_H__

Dependencies/casc/Casc/CascOpenStorage.cpp

@@ -1563,4 +1563,4 @@ bool WINAPI CascCloseStorage(HANDLE hStorage)
     // Only free the storage if the reference count reaches 0
     hs->Release();
     return true;
-}
+}

Dependencies/casc/Casc/CascRootFile_OW.cpp

@@ -34,7 +34,7 @@ typedef struct _APM_HEADER_V3
     // Followed by the array of APM_ENTRY (count is in "EntryCount")
     // Followed by the array of APM_PACKAGE (count is in "PackageCount")
 
-} APM_HEADER_V3, * PAPM_HEADER_V3;
+} APM_HEADER_V3, *PAPM_HEADER_V3;
 
 typedef struct _APM_HEADER_V2
 {
@@ -48,7 +48,7 @@ typedef struct _APM_HEADER_V2
     // Followed by the array of APM_ENTRY (count is in "EntryCount")
     // Followed by the array of APM_PACKAGE (count is in "PackageCount")
 
-} APM_HEADER_V2, * PAPM_HEADER_V2;
+} APM_HEADER_V2, *PAPM_HEADER_V2;
 
 typedef struct _APM_HEADER_V1
 {
@@ -61,15 +61,15 @@ typedef struct _APM_HEADER_V1
     // Followed by the array of APM_ENTRY (count is in "EntryCount")
     // Followed by the array of APM_PACKAGE (count is in "PackageCount")
 
-} APM_HEADER_V1, * PAPM_HEADER_V1;
+} APM_HEADER_V1, *PAPM_HEADER_V1;
 
 // On-disk format, size = 0x0C
 typedef struct _APM_ENTRY_V1
 {
     DWORD     Index;
     DWORD     HashA_Lo;                     // Must split the hashes in order to make this structure properly aligned
     DWORD     HashA_Hi;
-} APM_ENTRY_V1, * PAPM_ENTRY_V1;
+} APM_ENTRY_V1, *PAPM_ENTRY_V1;
 
 // On-disk format, size = 0x14
 typedef struct _APM_ENTRY_V2
@@ -91,7 +91,7 @@ typedef struct _APM_PACKAGE_ENTRY_V1
     ULONGLONG PackageGUID;                  // 077 file
     ULONGLONG Unknown1;
     DWORD Unknown2;
-} APM_PACKAGE_ENTRY_V1, * PAPM_PACKAGE_ENTRY_V1;
+} APM_PACKAGE_ENTRY_V1, *PAPM_PACKAGE_ENTRY_V1;
 
 // On-disk format
 typedef struct _APM_PACKAGE_ENTRY_V2

Dependencies/casc/Casc/CascRootFile_WoW.cpp

@@ -35,6 +35,19 @@ typedef enum _ROOT_FORMAT
     RootFormatWoW_v2,                           // Since build 30080 (WoW 8.2.0)
 } ROOT_FORMAT, *PROOT_FORMAT;
 
+// The last byte of the structure causes wrong alignment with default compiler options
+#pragma pack(push, 1)
+typedef struct _FILE_ROOT_GROUP_HEADER_58221    // Since build 58221 (11.1.0.58221)
+{
+    DWORD NumberOfFiles;                        // Number of entries
+    DWORD LocaleFlags;                          // File locale mask (CASC_LOCALE_XXX)
+    DWORD ContentFlags1;
+    DWORD ContentFlags2;
+    BYTE ContentFlags3;
+
+} FILE_ROOT_GROUPHEADER_58221, *PFILE_ROOT_GROUPHEADER_58221;
+#pragma pack(pop)
+
 // ROOT file header since build 50893 (10.1.7)
 typedef struct _FILE_ROOT_HEADER_50893
 {
@@ -43,7 +56,7 @@ typedef struct _FILE_ROOT_HEADER_50893
     DWORD Version;                              // Must be 1
     DWORD TotalFiles;
     DWORD FilesWithNameHash;
-} FILE_ROOT_HEADER_50893, * PFILE_ROOT_HEADER_50893;
+} FILE_ROOT_HEADER_50893, *PFILE_ROOT_HEADER_50893;
 
 // ROOT file header since build 30080 (8.2.0)
 typedef struct _FILE_ROOT_HEADER_30080
@@ -97,7 +110,7 @@ struct TRootHandler_WoW : public TFileTreeRoot
 {
     public:
 
-    typedef LPBYTE (*CAPTURE_ROOT_HEADER)(LPBYTE pbRootPtr, LPBYTE pbRootEnd, PROOT_FORMAT RootFormat, PDWORD FileCounterHashless);
+    typedef LPBYTE (*CAPTURE_ROOT_HEADER)(LPBYTE pbRootPtr, LPBYTE pbRootEnd, PROOT_FORMAT RootFormat, PDWORD FileCounterHashless, PDWORD Version);
 
     TRootHandler_WoW(ROOT_FORMAT aRootFormat, DWORD aFileCounterHashless, LPCTSTR szDumpFile = NULL) : TFileTreeRoot(FTREE_FLAGS_WOW)
     {
@@ -155,7 +168,7 @@ struct TRootHandler_WoW : public TFileTreeRoot
 #endif
 
     // Check for the new format (World of Warcraft 10.1.7, build 50893)
-    static LPBYTE CaptureRootHeader_50893(LPBYTE pbRootPtr, LPBYTE pbRootEnd, PROOT_FORMAT RootFormat, PDWORD FileCounterHashless)
+    static LPBYTE CaptureRootHeader_50893(LPBYTE pbRootPtr, LPBYTE pbRootEnd, PROOT_FORMAT RootFormat, PDWORD FileCounterHashless, PDWORD Version)
     {
         FILE_ROOT_HEADER_50893 RootHeader;
 
@@ -167,7 +180,7 @@ struct TRootHandler_WoW : public TFileTreeRoot
         // Verify the root file header
         if(RootHeader.Signature != CASC_WOW_ROOT_SIGNATURE)
             return NULL;
-        if(RootHeader.Version != 1)
+        if(RootHeader.Version != 1 && RootHeader.Version != 2)
             return NULL;
         if(RootHeader.FilesWithNameHash > RootHeader.TotalFiles)
             return NULL;
@@ -177,11 +190,12 @@ struct TRootHandler_WoW : public TFileTreeRoot
 
         *RootFormat = RootFormatWoW_v2;
         *FileCounterHashless = RootHeader.TotalFiles - RootHeader.FilesWithNameHash;
+        *Version = RootHeader.Version;
         return pbRootPtr + RootHeader.SizeOfHeader;
     }
 
     // Check for the root format for build 30080+ (WoW 8.2.0)
-    static LPBYTE CaptureRootHeader_30080(LPBYTE pbRootPtr, LPBYTE pbRootEnd, PROOT_FORMAT RootFormat, PDWORD FileCounterHashless)
+    static LPBYTE CaptureRootHeader_30080(LPBYTE pbRootPtr, LPBYTE pbRootEnd, PROOT_FORMAT RootFormat, PDWORD FileCounterHashless, PDWORD Version)
     {
         FILE_ROOT_HEADER_30080 RootHeader;
 
@@ -198,11 +212,12 @@ struct TRootHandler_WoW : public TFileTreeRoot
 
         *RootFormat = RootFormatWoW_v2;
         *FileCounterHashless = RootHeader.TotalFiles - RootHeader.FilesWithNameHash;
+        *Version = 0;
         return pbRootPtr + sizeof(FILE_ROOT_HEADER_30080);
     }
 
     // Check for the root format for build 18125+ (WoW 6.0.1)
-    static LPBYTE CaptureRootHeader_18125(LPBYTE pbRootPtr, LPBYTE pbRootEnd, PROOT_FORMAT RootFormat, PDWORD FileCounterHashless)
+    static LPBYTE CaptureRootHeader_18125(LPBYTE pbRootPtr, LPBYTE pbRootEnd, PROOT_FORMAT RootFormat, PDWORD FileCounterHashless, PDWORD Version)
     {
         size_t DataLength;
 
@@ -218,10 +233,11 @@ struct TRootHandler_WoW : public TFileTreeRoot
 
         *RootFormat = RootFormatWoW_v1;
         *FileCounterHashless = 0;
+        *Version = 0;
         return pbRootPtr;
     }
 
-    static LPBYTE CaptureRootHeader(LPBYTE pbRootPtr, LPBYTE pbRootEnd, PROOT_FORMAT RootFormat, PDWORD FileCounterHashless)
+    static LPBYTE CaptureRootHeader(LPBYTE pbRootPtr, LPBYTE pbRootEnd, PROOT_FORMAT RootFormat, PDWORD FileCounterHashless, PDWORD Version)
     {
         CAPTURE_ROOT_HEADER PfnCaptureRootHeader[] =
         {
@@ -234,24 +250,42 @@ struct TRootHandler_WoW : public TFileTreeRoot
         {
             LPBYTE pbCapturedPtr;
 
-            if((pbCapturedPtr = PfnCaptureRootHeader[i](pbRootPtr, pbRootEnd, RootFormat, FileCounterHashless)) != NULL)
+            if((pbCapturedPtr = PfnCaptureRootHeader[i](pbRootPtr, pbRootEnd, RootFormat, FileCounterHashless, Version)) != NULL)
             {
                 return pbCapturedPtr;
             }
         }
         return NULL;
     }
 
-    LPBYTE CaptureRootGroup(FILE_ROOT_GROUP & RootGroup, LPBYTE pbRootPtr, LPBYTE pbRootEnd)
+    LPBYTE CaptureRootGroup(FILE_ROOT_GROUP & RootGroup, LPBYTE pbRootPtr, LPBYTE pbRootEnd, DWORD dwRootVersion)
     {
         // Reset the entire root group structure
         memset(&RootGroup, 0, sizeof(FILE_ROOT_GROUP));
 
-        // Validate the locale block header
-        if((pbRootPtr + sizeof(FILE_ROOT_GROUP_HEADER)) >= pbRootEnd)
-            return NULL;
-        memcpy(&RootGroup.Header, pbRootPtr, sizeof(FILE_ROOT_GROUP_HEADER));
-        pbRootPtr = pbRootPtr + sizeof(FILE_ROOT_GROUP_HEADER);
+        if(dwRootVersion == 0 || dwRootVersion == 1)
+        {
+            // Validate the locale block header
+            if((pbRootPtr + sizeof(FILE_ROOT_GROUP_HEADER)) >= pbRootEnd)
+                return NULL;
+            memcpy(&RootGroup.Header, pbRootPtr, sizeof(FILE_ROOT_GROUP_HEADER));
+            pbRootPtr = pbRootPtr + sizeof(FILE_ROOT_GROUP_HEADER);
+        }
+        else if(dwRootVersion == 2)
+        {
+            PFILE_ROOT_GROUPHEADER_58221 pRootGroupHeader;
+            
+            // Get pointer to the root group header
+            if((pbRootPtr + sizeof(FILE_ROOT_GROUPHEADER_58221)) >= pbRootEnd)
+                return NULL;
+            pRootGroupHeader = (PFILE_ROOT_GROUPHEADER_58221)pbRootPtr;
+            pbRootPtr = pbRootPtr + sizeof(FILE_ROOT_GROUPHEADER_58221);
+
+            // Convert to old ContentFlags for now...
+            RootGroup.Header.NumberOfFiles = pRootGroupHeader->NumberOfFiles;
+            RootGroup.Header.ContentFlags = pRootGroupHeader->ContentFlags1 | pRootGroupHeader->ContentFlags2 | (DWORD)(pRootGroupHeader->ContentFlags3 << 17);
+            RootGroup.Header.LocaleFlags = pRootGroupHeader->LocaleFlags;
+        }
 
         // Validate the array of file data IDs
         if((pbRootPtr + (sizeof(DWORD) * RootGroup.Header.NumberOfFiles)) >= pbRootEnd)
@@ -380,7 +414,8 @@ struct TRootHandler_WoW : public TFileTreeRoot
         LPBYTE pbRootEnd,
         DWORD dwLocaleMask,
         BYTE bOverrideLowViolence,
-        BYTE bAudioLocale)
+        BYTE bAudioLocale,
+        DWORD dwRootVersion)
     {
         FILE_ROOT_GROUP RootBlock;
 
@@ -395,7 +430,7 @@ struct TRootHandler_WoW : public TFileTreeRoot
             //OutputDebugStringA(szMessage);
 
             // Validate the file locale block
-            pbRootPtr = CaptureRootGroup(RootBlock, pbRootPtr, pbRootEnd);
+            pbRootPtr = CaptureRootGroup(RootBlock, pbRootPtr, pbRootEnd, dwRootVersion);
             if(pbRootPtr == NULL)
                 return ERROR_BAD_FORMAT;
 
@@ -481,33 +516,34 @@ struct TRootHandler_WoW : public TFileTreeRoot
         LPBYTE pbRootPtr,
         LPBYTE pbRootEnd,
         DWORD dwLocaleMask,
-        BYTE bAudioLocale)
+        BYTE bAudioLocale,
+        DWORD dwRootVersion)
     {
         DWORD dwErrCode;
 
         // Load the locale as-is
-        dwErrCode = ParseWowRootFile_Level2(hs, pbRootPtr, pbRootEnd, dwLocaleMask, false, bAudioLocale);
+        dwErrCode = ParseWowRootFile_Level2(hs, pbRootPtr, pbRootEnd, dwLocaleMask, false, bAudioLocale, dwRootVersion);
         if(dwErrCode != ERROR_SUCCESS)
             return dwErrCode;
 
         // If we wanted enGB, we also load enUS for the missing files
         if(dwLocaleMask == CASC_LOCALE_ENGB)
-            ParseWowRootFile_Level2(hs, pbRootPtr, pbRootEnd, CASC_LOCALE_ENUS, false, bAudioLocale);
+            ParseWowRootFile_Level2(hs, pbRootPtr, pbRootEnd, CASC_LOCALE_ENUS, false, bAudioLocale, dwRootVersion);
 
         if(dwLocaleMask == CASC_LOCALE_PTPT)
-            ParseWowRootFile_Level2(hs, pbRootPtr, pbRootEnd, CASC_LOCALE_PTBR, false, bAudioLocale);
+            ParseWowRootFile_Level2(hs, pbRootPtr, pbRootEnd, CASC_LOCALE_PTBR, false, bAudioLocale, dwRootVersion);
 
         return ERROR_SUCCESS;
     }
 
     // WoW.exe: 004146C7 (BuildManifest::Load)
-    DWORD Load(TCascStorage * hs, LPBYTE pbRootPtr, LPBYTE pbRootEnd, DWORD dwLocaleMask)
+    DWORD Load(TCascStorage * hs, LPBYTE pbRootPtr, LPBYTE pbRootEnd, DWORD dwLocaleMask, DWORD dwRootVersion)
     {
         DWORD dwErrCode;
 
-        dwErrCode = ParseWowRootFile_Level1(hs, pbRootPtr, pbRootEnd, dwLocaleMask, 0);
+        dwErrCode = ParseWowRootFile_Level1(hs, pbRootPtr, pbRootEnd, dwLocaleMask, 0, dwRootVersion);
         if(dwErrCode == ERROR_SUCCESS)
-            dwErrCode = ParseWowRootFile_Level1(hs, pbRootPtr, pbRootEnd, dwLocaleMask, 1);
+            dwErrCode = ParseWowRootFile_Level1(hs, pbRootPtr, pbRootEnd, dwLocaleMask, 1, dwRootVersion);
 
 #ifdef CASCLIB_DEBUG
         // Dump the array of the file data IDs
@@ -618,10 +654,11 @@ DWORD RootHandler_CreateWoW(TCascStorage * hs, CASC_BLOB & RootFile, DWORD dwLoc
     LPBYTE pbRootEnd = RootFile.End();
     LPBYTE pbRootPtr;
     DWORD FileCounterHashless = 0;
+    DWORD RootVersion = 0;
     DWORD dwErrCode = ERROR_BAD_FORMAT;
 
     // Verify the root header
-    if((pbRootPtr = TRootHandler_WoW::CaptureRootHeader(pbRootFile, pbRootEnd, &RootFormat, &FileCounterHashless)) == NULL)
+    if((pbRootPtr = TRootHandler_WoW::CaptureRootHeader(pbRootFile, pbRootEnd, &RootFormat, &FileCounterHashless, &RootVersion)) == NULL)
         return ERROR_BAD_FORMAT;
 
 #ifdef CASCLIB_WRITE_VERIFIED_FILENAMES
@@ -639,7 +676,7 @@ DWORD RootHandler_CreateWoW(TCascStorage * hs, CASC_BLOB & RootFile, DWORD dwLoc
         //fp = fopen("E:\\file-data-ids2.txt", "wt");
 
         // Load the root directory. If load failed, we free the object
-        dwErrCode = pRootHandler->Load(hs, pbRootPtr, pbRootEnd, dwLocaleMask);
+        dwErrCode = pRootHandler->Load(hs, pbRootPtr, pbRootEnd, dwLocaleMask, RootVersion);
         if(dwErrCode != ERROR_SUCCESS)
         {
             delete pRootHandler;

Dependencies/casc/Casc/DllMain.def

@@ -31,6 +31,8 @@ EXPORTS
 
     CascAddEncryptionKey
     CascAddStringEncryptionKey
+    CascImportKeysFromString
+    CascImportKeysFromFile
     CascFindEncryptionKey
     CascGetNotFoundEncryptionKey
 

Dependencies/jolt/Jolt/Core/IssueReporting.cpp

@@ -12,7 +12,7 @@ JPH_NAMESPACE_BEGIN
 
 static void DummyTrace([[maybe_unused]] const char *inFMT, ...)
 {
-	JPH_ASSERT(false);
+	//JPH_ASSERT(false);
 };
 
 TraceFunction Trace = DummyTrace;

Source/AssetConverter-App/AssetConverter-App/Extractors/ClientDBExtractor.cpp

@@ -16,7 +16,7 @@
 #include <FileFormat/Novus/ClientDB/ClientDB.h>
 #include <FileFormat/Novus/Model/ComplexModel.h>
 
-#include <Meta/Generated/ClientDB.h>
+#include <Meta/Generated/Shared/ClientDB.h>
 
 #include <filesystem>
 namespace fs = std::filesystem;
@@ -1021,7 +1021,7 @@ bool ClientDBExtractor::ExtractItemDisplayInfo(const std::string& name)
 
         // goesetGroup
         const u32* goesetGroups = db2Parser.GetFieldPtr<u32>(layout, sectionID, recordID, recordData, 13);
-        for (u32 geosetGroupIndex = 0; geosetGroupIndex < 6; geosetGroupIndex++)
+        for (u32 geosetGroupIndex = 0; geosetGroupIndex < 4; geosetGroupIndex++)
         {
             itemDisplayInfo.modelGeosetGroups[geosetGroupIndex] = static_cast<u8>(goesetGroups[geosetGroupIndex]);
         }