Merge branch 'master' of https://github.com/TrinityCore/TrinityCore

cmake/platform/win/settings.cmake

@@ -8,3 +8,8 @@ target_compile_definitions(trinity-compile-option-interface
 
 # set up output paths for executable binaries (.exe-files, and .dll-files on DLL-capable platforms)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/$<CONFIG>")
+
+# add WindowsSettings.manifest to all executables
+target_sources(trinity-core-interface
+  INTERFACE
+    $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:${CMAKE_SOURCE_DIR}/cmake/platform/win/WindowsSettings.manifest>)

sql/updates/world/master/2024_09_15_00_world.sql

@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_warl_cataclysm';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(152108, 'spell_warl_cataclysm');

sql/updates/world/master/2024_09_15_01_world.sql

@@ -0,0 +1,7 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_warl_backdraft';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(17962, 'spell_warl_backdraft');
+
+DELETE FROM `spell_proc` WHERE `SpellId` IN (117828);
+INSERT INTO `spell_proc` (`SpellId`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`SpellFamilyMask3`,`ProcFlags`,`ProcFlags2`,`SpellTypeMask`,`SpellPhaseMask`,`HitMask`,`AttributesMask`,`DisableEffectsMask`,`ProcsPerMinute`,`Chance`,`Cooldown`,`Charges`) VALUES
+(117828,0x00,5,0x00000000,0x00002040,0x00000002,0x00000000,0x0,0x0,0x1,0x2,0x0,0x18,0x0,0,0,0,0); -- Backdraft

sql/updates/world/master/2024_09_16_00_world.sql

@@ -0,0 +1,7 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_warl_pyrogenics';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(387095, 'spell_warl_pyrogenics');
+
+DELETE FROM `spell_proc` WHERE `SpellId` IN (387095);
+INSERT INTO `spell_proc` (`SpellId`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`SpellFamilyMask3`,`ProcFlags`,`ProcFlags2`,`SpellTypeMask`,`SpellPhaseMask`,`HitMask`,`AttributesMask`,`DisableEffectsMask`,`ProcsPerMinute`,`Chance`,`Cooldown`,`Charges`) VALUES
+(387095,0x00,5,0x00000000,0x00000000,0x10000000,0x00000000,0x50000,0x0,0x1,0x2,0x0,0x2,0x0,0,100,0,0); -- Pyrogenics

src/CMakeLists.txt

@@ -8,14 +8,6 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-if(WIN32 AND MSVC)
-  set(sources_windows
-    ${CMAKE_SOURCE_DIR}/src/common/Debugging/WheatyExceptionReport.cpp
-    ${CMAKE_SOURCE_DIR}/src/common/Debugging/WheatyExceptionReport.h
-    ${CMAKE_SOURCE_DIR}/src/common/WindowsSettings.manifest
-  )
-endif()
-
 add_subdirectory(genrev)
 add_subdirectory(common)
 

src/common/CMakeLists.txt

@@ -12,16 +12,22 @@ CollectSourceFiles(
   ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE_SOURCES
   # Exclude
-  ${CMAKE_CURRENT_SOURCE_DIR}/Debugging
+  ${CMAKE_CURRENT_SOURCE_DIR}/Debugging/Windows
   ${CMAKE_CURRENT_SOURCE_DIR}/Platform
   ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders)
 
-# Manually set sources for Debugging directory as we don't want to include WheatyExceptionReport in common project
-# It needs to be included both in authserver and worldserver for the static global variable to be properly initialized
-# and to handle crash logs on windows
-list(APPEND PRIVATE_SOURCES
-  ${CMAKE_CURRENT_SOURCE_DIR}/Debugging/Errors.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/Debugging/Errors.h)
+if(WIN32)
+  CollectSourceFiles(
+    ${CMAKE_CURRENT_SOURCE_DIR}/Debugging/Windows
+    WINDOWS_DEBUGGING_SOURCES)
+  list(APPEND PRIVATE_SOURCES
+    ${WINDOWS_DEBUGGING_SOURCES})
+  CollectSourceFiles(
+    ${CMAKE_CURRENT_SOURCE_DIR}/Platform/Windows
+    WINDOWS_PLATFORM_SOURCES)
+  list(APPEND PRIVATE_SOURCES
+    ${WINDOWS_PLATFORM_SOURCES})
+endif()
 
 if(USE_COREPCH)
   set(PRIVATE_PCH_HEADER PrecompiledHeaders/commonPCH.h)

src/common/Debugging/WheatyExceptionReport.cpp → src/common/Debugging/Windows/WheatyExceptionReport.cpp

@@ -67,9 +67,6 @@ std::stack<SymbolDetail> WheatyExceptionReport::symbolDetails;
 bool WheatyExceptionReport::alreadyCrashed;
 std::mutex WheatyExceptionReport::alreadyCrashedLock;
 WheatyExceptionReport::pRtlGetVersion WheatyExceptionReport::RtlGetVersion;
-
-// Declare global instance of class
-WheatyExceptionReport g_WheatyExceptionReport;
 #pragma warning(pop)
 
 //============================== Class Methods =============================

src/common/Debugging/WheatyExceptionReport.h → src/common/Debugging/Windows/WheatyExceptionReport.h

@@ -3,6 +3,7 @@
 
 #define _NO_CVCONST_H
 
+#include "Define.h"
 #include "Optional.h"
 #include <windows.h>
 #include <winnt.h>
@@ -322,7 +323,7 @@ struct SymbolDetail
     bool HasChildren;
 };
 
-class WheatyExceptionReport
+class TC_COMMON_API WheatyExceptionReport
 {
     public:
 
@@ -396,5 +397,11 @@ class WheatyExceptionReport
 
 };
 
-extern WheatyExceptionReport g_WheatyExceptionReport;       //  global instance of class
+#define INIT_CRASH_HANDLER() \
+    __pragma(warning(push)) \
+    __pragma(warning(disable:4073))  /* C4073: initializers put in library initialization area */ \
+    __pragma(init_seg(lib)) \
+    WheatyExceptionReport g_WheatyExceptionReport; \
+    __pragma(warning(pop))
+
 #endif                                                      // _WHEATYEXCEPTIONREPORT_