Merge branch 'master' into dh_retaliation

Author: Shauren

.circleci/config.yml

@@ -91,7 +91,7 @@ jobs:
             docker build --file Dockerfile --force-rm --tag $image_prefix:$CIRCLE_SHA1 --tag $image_prefix:$(echo $CIRCLE_BRANCH | tr '/' '-' | tr '[:upper:]' '[:lower:]') .
             docker save $image_prefix | gzip > ../../docker.tar.gz
             if [ "$DOCKERHUB_PUSH_IMAGES" == "TRUE" ]; then
-              if [ "$CIRCLE_BRANCH" == "3.3.5" ] || [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "wotlk_classic" ]; then
+              if [ "$CIRCLE_BRANCH" == "3.3.5" ] || [ "$CIRCLE_BRANCH" == "master" ]; then
                 docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
                 echo "Pushing docker image to dockerhub"
                 docker push --all-tags $image_prefix
@@ -135,7 +135,7 @@ jobs:
             ccache -s
             git config user.email "[email protected]" && git config user.name "Circle CI"
             $CXX --version
-            cmake -S . -B ./bin -DWITH_WARNINGS=1 -DWITH_WARNINGS_AS_ERRORS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=0 -DUSE_SCRIPTPCH=0 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=0 -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=bin/check_install
+            cmake -S . -B ./bin -DWITH_WARNINGS=1 -DWITH_WARNINGS_AS_ERRORS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=0 -DUSE_SCRIPTPCH=0 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=0 -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG -g0" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG -g0" -DCMAKE_INSTALL_PREFIX=bin/check_install
       - run:
           name: Build
           command: |
@@ -155,4 +155,3 @@ workflows:
     jobs:
       - codestyle_and_sql
       - pch
-      - nopch

.github/workflows/gcc-build.yml

@@ -0,0 +1,78 @@
+name: Ubuntu x64
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - cc: gcc-13
+            cxx: g++-13
+            pch: 1
+            launcher: 
+          - cc: clang-17
+            cxx: clang++-17
+            pch: 1
+            launcher: 
+          - cc: clang-17
+            cxx: clang++-17
+            pch: 0
+            launcher: ccache
+    steps:
+    - uses: actions/checkout@v5
+    - name: Set reusable strings
+      id: strings
+      shell: bash
+      run: |
+        echo "build-start=$EPOCHSECONDS" >> "$GITHUB_OUTPUT"
+        echo "build-output-dir=${{ github.workspace }}/bin" >> "$GITHUB_OUTPUT"
+        echo "ccache-key-prefix=ubuntu-${{ matrix.cc }}-${{ github.base_ref || github.ref_name }}" >> "$GITHUB_OUTPUT"
+    - name: Dependencies
+      run: |
+        sudo apt-get update && sudo apt-get install -yq ccache libboost-dev libboost-filesystem-dev libboost-locale-dev libboost-program-options-dev libboost-regex-dev libboost-thread-dev libssl-dev libreadline-dev zlib1g-dev libbz2-dev
+    - name: Restore nopch cache
+      id: ccache-restore
+      if: ${{ matrix.pch == '0' }}
+      uses: actions/cache@v4
+      with:
+        path: ${{ github.workspace }}/.ccache
+        key: ${{ steps.strings.outputs.ccache-key-prefix }}-${{ github.ref_name }}-${{ github.sha }}
+        restore-keys: |
+          ${{ steps.strings.outputs.ccache-key-prefix }}-${{ github.ref_name }}-
+          ${{ steps.strings.outputs.ccache-key-prefix }}-
+    - name: Setup
+      env:
+        CMAKE_BUILD_TYPE: Debug
+        CMAKE_C_COMPILER_LAUNCHER: ${{ matrix.launcher }}
+        CMAKE_CXX_COMPILER_LAUNCHER: ${{ matrix.launcher }}
+        CC: /usr/bin/${{ matrix.cc }}
+        CXX: /usr/bin/${{ matrix.cxx }}
+      run: >
+        cmake -GNinja -S ${{ github.workspace }} -B ${{ steps.strings.outputs.build-output-dir }}
+        -DWITH_WARNINGS=1 -DWITH_WARNINGS_AS_ERRORS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=${{ matrix.pch }} -DUSE_SCRIPTPCH=${{ matrix.pch }} -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=0
+        -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG -g0" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG -g0"
+        -DCMAKE_INSTALL_PREFIX=check_install -DBUILD_TESTING=1
+    - name: Build
+      env:
+        CCACHE_BASEDIR: ${{ github.workspace }}
+        CCACHE_DIR: ${{ github.workspace }}/.ccache
+        CCACHE_CPP2: 1
+      run: |
+        ccache -z
+        cmake --build ${{ steps.strings.outputs.build-output-dir }}
+        ccache -s
+        ccache --evict-older-than $(($EPOCHSECONDS - ${{ steps.strings.outputs.build-start }}))s
+    - name: Unit tests
+      run: |
+        cmake --build ${{ steps.strings.outputs.build-output-dir }} --target test
+    - name: Check executables
+      run: |
+        cmake --install ${{ steps.strings.outputs.build-output-dir }}
+        cd ${{ github.workspace }}/check_install/bin
+        ./bnetserver --version
+        ./worldserver --version

.github/workflows/linux-build.yml

@@ -113,10 +113,10 @@ typedef struct _TVFS_PATH_TABLE_ENTRY
 
 typedef struct _TVFS_WOW_ENTRY
 {
-    DWORD  LocaleFlags;
-    USHORT ContentFlags;
-    DWORD  FileDataId;
-    BYTE   ContentKey[MD5_HASH_SIZE];
+    DWORD LocaleFlags;
+    DWORD ContentFlags;
+    DWORD FileDataId;
+    BYTE  ContentKey[MD5_HASH_SIZE];
 } TVFS_WOW_ENTRY, *PTVFS_WOW_ENTRY;
 
 //-----------------------------------------------------------------------------
@@ -733,36 +733,45 @@ struct TRootHandler_TVFS : public TFileTreeRoot
     DWORD CheckWoWGenericName(const CASC_PATH<char> & PathBuffer, TVFS_WOW_ENTRY & WowEntry)
     {
         size_t nPathLength = PathBuffer.Length();
-        BYTE BinaryBuffer[4+2+4+16];
 
         //
         // WoW Build 45779: 000000020000:000C472F02BA924C604A670B253AA02DBCD9441  (Bug: Missing last digit of the CKey)
         // WoW Build 46144: 000000020000:000C472F02BA924C604A670B253AA02DBCD9441C
         //                  LLLLLLLLCCCC IIIIIIIIKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
+        // 
+        // WoW Build 63728: 0000000200000000:005096B78ECBF6630B7A282B01358857C6DDF2B2
+        //                  LLLLLLLLCCCCCCCC IIIIIIIIKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
         //
         //                  L = Locale flags, C = Content flags, I = File Data ID, K = CKey
         //
 
-        if(nPathLength == 52 || nPathLength == 53)
+        if(nPathLength == 52 || nPathLength == 53 || nPathLength == 57)
         {
-            if(PathBuffer[12] == ':')
+            const char * pColonPosition = strchr(PathBuffer, ':');
+            const char * szFileName = PathBuffer;
+            size_t nColonPos = pColonPosition - szFileName;
+            BYTE NamePart1[4 + 4];          // Content flags, locale flags
+            BYTE NamePart2[4 + 16];         // File data ID, CKey
+
+            // Is there colon (':') at position 12 or 16?
+            if(nColonPos == 12 || nColonPos == 16)
             {
-                // Check the first part of the TVFS name
-                if(BinaryFromString(&PathBuffer[00], 12, (LPBYTE)(&BinaryBuffer[0])) != ERROR_SUCCESS)
+                // Check the locale flags and content flags
+                if(BinaryFromString(szFileName, nColonPos, NamePart1) != ERROR_SUCCESS)
                     return ERROR_REPARSE_ROOT;
 
-                // Check the second part of the file name
-                if(BinaryFromString(&PathBuffer[13], 40, (LPBYTE)(&BinaryBuffer[6])) != ERROR_SUCCESS)
+                // Check the file data ID from the TVFS name
+                if(BinaryFromString(pColonPosition + 1, 40, NamePart2) != ERROR_SUCCESS)
                     return ERROR_REPARSE_ROOT;
 
 #ifdef TVFS_PARSE_WOW_ROOT
-                // We accept strings with length 53 chars
-                if(nPathLength == 53)
+                // We accept strings with length 53 or 57 chars
+                if(nPathLength == 53 || nPathLength == 57)
                 {
-                    WowEntry.LocaleFlags  = ConvertBytesToInteger_4(BinaryBuffer + 0x00);
-                    WowEntry.ContentFlags = ConvertBytesToInteger_2(BinaryBuffer + 0x04);
-                    WowEntry.FileDataId   = ConvertBytesToInteger_4(BinaryBuffer + 0x06);
-                    memcpy(WowEntry.ContentKey, BinaryBuffer + 0x0A, MD5_HASH_SIZE);
+                    WowEntry.LocaleFlags  = ConvertBytesToInteger_4(&NamePart1[0]);
+                    WowEntry.ContentFlags = ConvertBytesToInteger_X(&NamePart1[4], (nColonPos - 8) / 2);
+                    WowEntry.FileDataId   = ConvertBytesToInteger_4(&NamePart2[0]);
+                    memcpy(WowEntry.ContentKey, &NamePart2[4], MD5_HASH_SIZE);
                     return ERROR_SUCCESS;
                 }
 #endif  // TVFS_PARSE_WOW_ROOT

dep/CascLib/src/CascRootFile_TVFS.cpp

@@ -59,7 +59,7 @@ catch2
 
 CascLib (An open-source implementation of library for reading CASC storage from Blizzard games since 2014)
   https://github.com/ladislav-zezula/CascLib
-  Version: 09dd46e59614ee468c290b9002850454990bf15d
+  Version: 5dafc4c5a53faecfe269e525d37cf977cfa818b1
 
 rapidjson (A fast JSON parser/generator for C++ with both SAX/DOM style API http://rapidjson.org/)
   https://github.com/Tencent/rapidjson

dep/PackageList.txt

@@ -22,7 +22,10 @@ if(WIN32)
     string(SUBSTRING "${MSVC_TOOLSET_VERSION}" ${_BOOST_MSVC_TOOLSET_VERSION_LENGTH} -1 _BOOST_MSVC_TOOLSET_VERSION_MINOR)
 
     file(TO_CMAKE_PATH "${BOOST_ROOT}" BOOST_ROOT)
-    set(BOOST_SEARCH_HINTS "${BOOST_ROOT}/lib${PLATFORM}-msvc-${_BOOST_MSVC_TOOLSET_VERSION_MAJOR}.${_BOOST_MSVC_TOOLSET_VERSION_MINOR}/cmake")
+    while(_BOOST_MSVC_TOOLSET_VERSION_MINOR GREATER_EQUAL 0)
+      list(APPEND BOOST_SEARCH_HINTS "${BOOST_ROOT}/lib${PLATFORM}-msvc-${_BOOST_MSVC_TOOLSET_VERSION_MAJOR}.${_BOOST_MSVC_TOOLSET_VERSION_MINOR}/cmake")
+      math(EXPR _BOOST_MSVC_TOOLSET_VERSION_MINOR "${_BOOST_MSVC_TOOLSET_VERSION_MINOR} - 1" OUTPUT_FORMAT DECIMAL)
+    endwhile()
 
     unset(_BOOST_MSVC_TOOLSET_VERSION_LENGTH)
     unset(_BOOST_MSVC_TOOLSET_VERSION_MAJOR)

dep/boost/CMakeLists.txt

@@ -17,6 +17,4 @@
 #
 
 add_subdirectory(Detour)
-if(TOOLS)
-  add_subdirectory(Recast)
-endif()
+add_subdirectory(Recast)

dep/recastnavigation/CMakeLists.txt

@@ -1355,7 +1355,21 @@ INSERT INTO `build_auth_key` VALUES
 (64502,'Mac','x64','WoWC',0x6DCE3BA9C0ACF638AE599680200483AE),
 (64502,'Win','A64','WoW',0x51DF09ABE30D38142EB5942ED774301B),
 (64502,'Win','x64','WoW',0x54D307CF2BC84E50E94C2D3A95CD6D7B),
-(64502,'Win','x64','WoWC',0xA968CFA8B0558F433B3E483E844FBFC3);
+(64502,'Win','x64','WoWC',0xA968CFA8B0558F433B3E483E844FBFC3),
+(64877,'Mac','A64','WoW',0xB903471C43EBDC5BABF6FB604A3A5E69),
+(64877,'Mac','A64','WoWC',0x3DFEDC25E9BDF2C8C30E0E3F0F6EB6D4),
+(64877,'Mac','x64','WoW',0x98464DDFFC9A5786DA1F053EA520BA32),
+(64877,'Mac','x64','WoWC',0x01003F46907A168B2BDF036575802098),
+(64877,'Win','A64','WoW',0x026ED07009997B857BB37DCBB5B11477),
+(64877,'Win','x64','WoW',0x6AB7C89863A9D6CDA9C0FAE710FEB126),
+(64877,'Win','x64','WoWC',0xBD52F0D3F7C92642185E963CEA424BD3),
+(64978,'Mac','A64','WoW',0x2D3D9A591D1750ACBFA38450225218E0),
+(64978,'Mac','A64','WoWC',0x0FA46AA62D9E1DEC723F01B16CE26442),
+(64978,'Mac','x64','WoW',0x8C4D1BA36574C6E68716DB455C3B73FD),
+(64978,'Mac','x64','WoWC',0xD1EE6F8E00507CC771F4AAD86B91F7AA),
+(64978,'Win','A64','WoW',0x04FB74A28B1A31D7A2A3126DD2B71AB7),
+(64978,'Win','x64','WoW',0x706BA57AEDD9816B5A58209FA6A3B728),
+(64978,'Win','x64','WoWC',0x96B417D4D1F12CF8B0C855A23C674C2C);
 /*!40000 ALTER TABLE `build_auth_key` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1772,7 +1786,9 @@ INSERT INTO `build_info` VALUES
 (64270,11,2,5,NULL),
 (64395,11,2,5,NULL),
 (64484,11,2,5,NULL),
-(64502,11,2,5,NULL);
+(64502,11,2,5,NULL),
+(64877,11,2,7,NULL),
+(64978,11,2,7,NULL);
 /*!40000 ALTER TABLE `build_info` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3385,7 +3401,7 @@ CREATE TABLE `realmlist` (
   `timezone` tinyint unsigned NOT NULL DEFAULT '0',
   `allowedSecurityLevel` tinyint unsigned NOT NULL DEFAULT '0',
   `population` float NOT NULL DEFAULT '0',
-  `gamebuild` int unsigned NOT NULL DEFAULT '64502',
+  `gamebuild` int unsigned NOT NULL DEFAULT '64978',
   `Region` tinyint unsigned NOT NULL DEFAULT '1',
   `Battlegroup` tinyint unsigned NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
@@ -3400,7 +3416,7 @@ CREATE TABLE `realmlist` (
 LOCK TABLES `realmlist` WRITE;
 /*!40000 ALTER TABLE `realmlist` DISABLE KEYS */;
 INSERT INTO `realmlist` VALUES
-(1,'Trinity','127.0.0.1','127.0.0.1',NULL,NULL,'255.255.255.0',8085,0,0,1,0,0,64502,1,1);
+(1,'Trinity','127.0.0.1','127.0.0.1',NULL,NULL,'255.255.255.0',8085,0,0,1,0,0,64978,1,1);
 /*!40000 ALTER TABLE `realmlist` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3930,7 +3946,9 @@ INSERT INTO `updates` VALUES
 ('2025_11_07_00_auth.sql','496BAF87666950FDBA459CC72472AAB4CBD71D40','RELEASED','2025-11-07 09:46:17',0),
 ('2025_11_15_00_auth.sql','744E145E7EFBADDAF0BAC00F6FC84A1FE79EDFCA','RELEASED','2025-11-15 12:09:00',0),
 ('2025_11_18_00_auth.sql','AAE3FEB4363A16253C7ADF8CF5973E3694C5BC52','RELEASED','2025-11-18 20:09:47',0),
-('2025_11_19_00_auth.sql','2E89C66714539C9713B9ADD3F7697730A426C795','RELEASED','2025-11-19 08:20:00',0);
+('2025_11_19_00_auth.sql','2E89C66714539C9713B9ADD3F7697730A426C795','RELEASED','2025-11-19 08:20:00',0),
+('2025_12_15_00_auth.sql','CA8ADF39030282B3D2627C15E751CC1D81618BAE','RELEASED','2025-12-15 15:39:58',0),
+('2025_12_19_00_auth.sql','4011518915C83A60C50009949D687080019FA999','RELEASED','2025-12-19 00:48:17',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 

sql/base/auth_database.sql

@@ -3827,7 +3827,8 @@ INSERT INTO `updates` VALUES
 ('2025_08_19_00_characters.sql','EC197D88883CDA2B885675FE096DD56CCB143608','ARCHIVED','2025-08-19 01:03:26',0),
 ('2025_09_09_00_characters.sql','CF3F0738623248620204175B049AAF0833262222','ARCHIVED','2025-09-09 14:11:21',0),
 ('2025_10_10_00_characters.sql','F1EF875805AF1E87A413387F5449FE37D5205E94','ARCHIVED','2025-10-09 23:58:44',0),
-('2025_10_29_00_characters.sql','DC6A5D66E866352AC243869B627D282EE6A8B4F2','ARCHIVED','2025-10-29 06:57:00',0);
+('2025_10_29_00_characters.sql','DC6A5D66E866352AC243869B627D282EE6A8B4F2','ARCHIVED','2025-10-29 06:57:00',0),
+('2025_11_25_00_characters.sql','A0C04B2404B1832421402F78436DDC4AA18EBAD8','RELEASED','2025-11-25 22:28:32',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3863,29 +3864,6 @@ INSERT INTO `updates_include` VALUES
 /*!40000 ALTER TABLE `updates_include` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `warden_action`
---
-
-DROP TABLE IF EXISTS `warden_action`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `warden_action` (
-  `wardenId` smallint unsigned NOT NULL,
-  `action` tinyint unsigned DEFAULT NULL,
-  PRIMARY KEY (`wardenId`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `warden_action`
---
-
-LOCK TABLES `warden_action` WRITE;
-/*!40000 ALTER TABLE `warden_action` DISABLE KEYS */;
-/*!40000 ALTER TABLE `warden_action` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `world_state_value`
 --

sql/base/characters_database.sql

@@ -0,0 +1,23 @@
+DELETE FROM `build_info` WHERE `build` IN (64877);
+INSERT INTO `build_info` (`build`,`majorVersion`,`minorVersion`,`bugfixVersion`,`hotfixVersion`) VALUES
+(64877,11,2,7,NULL);
+
+DELETE FROM `build_auth_key` WHERE `build`=64877 AND `platform`='Mac' AND `arch`='A64' AND `type`='WoW';
+DELETE FROM `build_auth_key` WHERE `build`=64877 AND `platform`='Mac' AND `arch`='A64' AND `type`='WoWC';
+DELETE FROM `build_auth_key` WHERE `build`=64877 AND `platform`='Mac' AND `arch`='x64' AND `type`='WoW';
+DELETE FROM `build_auth_key` WHERE `build`=64877 AND `platform`='Mac' AND `arch`='x64' AND `type`='WoWC';
+DELETE FROM `build_auth_key` WHERE `build`=64877 AND `platform`='Win' AND `arch`='A64' AND `type`='WoW';
+DELETE FROM `build_auth_key` WHERE `build`=64877 AND `platform`='Win' AND `arch`='x64' AND `type`='WoW';
+DELETE FROM `build_auth_key` WHERE `build`=64877 AND `platform`='Win' AND `arch`='x64' AND `type`='WoWC';
+INSERT INTO `build_auth_key` (`build`,`platform`,`arch`,`type`,`key`) VALUES
+(64877,'Mac','A64','WoW',0xB903471C43EBDC5BABF6FB604A3A5E69),
+(64877,'Mac','A64','WoWC',0x3DFEDC25E9BDF2C8C30E0E3F0F6EB6D4),
+(64877,'Mac','x64','WoW',0x98464DDFFC9A5786DA1F053EA520BA32),
+(64877,'Mac','x64','WoWC',0x01003F46907A168B2BDF036575802098),
+(64877,'Win','A64','WoW',0x026ED07009997B857BB37DCBB5B11477),
+(64877,'Win','x64','WoW',0x6AB7C89863A9D6CDA9C0FAE710FEB126),
+(64877,'Win','x64','WoWC',0xBD52F0D3F7C92642185E963CEA424BD3);
+
+UPDATE `realmlist` SET `gamebuild`=64877 WHERE `gamebuild`=64502;
+
+ALTER TABLE `realmlist` CHANGE `gamebuild` `gamebuild` int unsigned NOT NULL DEFAULT '64877';