fix: clang-cl & msvc warnings (#295)

.github/workflows/main_ci_xmake.yml

@@ -17,9 +17,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        mode:
-          - debug
-          - release
+        toolchain:
+          - msvc
+          - clang-cl
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -30,7 +30,7 @@ jobs:
           xmake-version: "latest"
 
       - name: Configure
-        run: xmake config -y --mode=${{ matrix.mode }} --vs_toolset=14.41
+        run: xmake config -y --mode=releasedbg --toolchain=${{ matrix.toolchain }} --vs_toolset=14.41
 
       - name: Build
         run: xmake build -y -vD

include/RE/B/BSScriptUtil.h

@@ -589,7 +589,6 @@ namespace RE::BSScript
 	void PackVariable(Variable& a_var, T&& a_val)  //
 		requires(detail::array<std::remove_reference_t<T>>)
 	{
-		using value_type = detail::decay_t<typename std::remove_cvref_t<T>::value_type>;
 		using reference_type =
 			std::conditional_t<
 				std::is_lvalue_reference_v<T>,

include/RE/B/BSTSmartPointer.h

@@ -20,7 +20,7 @@ namespace RE
 	struct BSTSmartPointerAutoPtr
 	{
 	public:
-		constexpr static void Acquire(stl::not_null<T*> a_ptr) { return; }
+		constexpr static void Acquire(stl::not_null<T*>) { return; }
 		static void           Release(stl::not_null<T*> a_ptr) { delete a_ptr; }
 	};
 

include/RE/E/Events.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "RE/B/BSCoreTypes.h"
+#include "RE/B/BSFixedString.h"
 #include "RE/B/BSPointerHandle.h"
 #include "RE/B/BSTEvent.h"
 #include "RE/N/NiSmartPointer.h"
@@ -1705,6 +1706,14 @@ namespace RE
 		}
 	};
 
+	struct MenuOpenCloseEvent
+	{
+		// members
+		BSFixedString menuName;  // 00
+		bool          opening;   // 08
+	};
+	static_assert(sizeof(MenuOpenCloseEvent) == 0x10);
+
 	struct MessageBoxMenu_OnBackOut
 	{
 		[[nodiscard]] static BSTEventSource<MessageBoxMenu_OnBackOut>* GetEventSource()
@@ -2253,7 +2262,8 @@ namespace RE
 		enum class Type : std::uint32_t
 		{
 			kNone = static_cast<std::underlying_type_t<Type>>(-1),
-			kSteal,
+
+			kSteal = 0,
 			kPickpocket,
 			kTrespass,
 			kAttack,

include/RE/I/IMenu.h

@@ -119,7 +119,7 @@ namespace RE
 		virtual std::uint64_t Unk10()  // 10
 		{
 			using func_t = decltype(&IMenu::Unk10);
-			static REL::Relocation<uint64_t(IMenu*)> func(REL::ID(187241));
+			static REL::Relocation<func_t> func(REL::ID(187241));
 			return func(this);
 		};
 

include/RE/I/idLogging.h

@@ -36,7 +36,7 @@ namespace RE
 			}
 		};
 
-		[[nodiscard]] static ILogger* GetLoggerSingleton()
+		[[nodiscard]] inline ILogger* GetLoggerSingleton()
 		{
 			static REL::Relocation<ILogger**> singleton{ ID::idLogging::Singleton };
 			return *singleton;

include/RE/P/PlayerCharacter.h

@@ -5,18 +5,18 @@
 
 namespace RE
 {
-	class MenuModeChangeEvent;
-	class MenuOpenCloseEvent;
 	class OtherEventEnabledEvent;
-	class TESHitEvent;
 	class UserEventEnabledEvent;
 
 	struct AnimationGraphDependentEvent;
 	struct BGSActorCellEvent;
 	struct BGSActorDeathEvent;
+	struct MenuModeChangeEvent;
+	struct MenuOpenCloseEvent;
 	struct PickRefUpdateEvent;
 	struct PositionPlayerEvent;
 	struct TargetHitEvent;
+	struct TESHitEvent;
 	struct TESFormDeleteEvent;
 
 	struct QuestStatus

include/RE/Starfield.h

@@ -306,7 +306,6 @@
 #include "RE/M/MagicTarget.h"
 #include "RE/M/Main.h"
 #include "RE/M/MemoryManager.h"
-#include "RE/M/MenuOpenCloseEvent.h"
 #include "RE/M/MenuPaperDoll.h"
 #include "RE/M/MenuTopicManager.h"
 #include "RE/M/Misc.h"

include/RE/T/TESNPC.h

@@ -20,12 +20,13 @@ namespace RE
 	class BGSListForm;
 	class BGSOutfit;
 	class BGSRelationship;
-	class MenuOpenCloseEvent;
 	class TESClass;
 	class TESCombatStyle;
 	class TESFaction;
 	class TESFurniture;
 
+	struct MenuOpenCloseEvent;
+
 	class __declspec(novtable) TESNPC :
 		public TESActorBase,                     // 000
 		public TESRaceForm,                      // 278

include/RE/T/TESPackage.h

@@ -24,15 +24,20 @@ namespace RE
 
 	struct PackageTarget
 	{
+		// members
 		std::uint8_t type;
+		// TODO: warning C4624: 'PackageTarget': destructor was implicitly defined as deleted
+		/*
 		union
 		{
 			BSPointerHandle<TESObjectREFR> refHandle;
 			TESForm*                       object;
 		};
 		std::int32_t value;
+		*/
 	};
-	static_assert(sizeof(PackageTarget) == 0x18);
+	//static_assert(sizeof(PackageTarget) == 0x18);
+
 
 	class __declspec(novtable) TESPackage :
 		public TESForm  // 00

include/RE/U/UI.h

@@ -8,8 +8,6 @@
 namespace RE
 {
 	class IMenu;
-	class MenuOpenCloseEvent;
-	class MenuModeChangeEvent;
 
 	namespace Scaleform
 	{
@@ -21,6 +19,8 @@ namespace RE
 	struct BIUIMenuVisiblePausedEndEvent;
 	struct BSCursorRotationChange;
 	struct BSCursorTypeChange;
+	struct MenuModeChangeEvent;
+	struct MenuOpenCloseEvent;
 	struct MenuPauseChangeEvent;
 	struct MenuPauseCounterChangeEvent;
 	struct TutorialEvent;

src/RE/Starfield.cpp

@@ -0,0 +1,19 @@
+#include "RE/Starfield.h"
+
+namespace RE
+{
+	namespace detail
+	{
+		template class BSFixedString<char, false>;
+		static_assert(sizeof(BSFixedString<char, false>) == 0x8);
+
+		template class BSFixedString<char, true>;
+		static_assert(sizeof(BSFixedString<char, true>) == 0x8);
+
+		template class BSFixedString<wchar_t, false>;
+		static_assert(sizeof(BSFixedString<wchar_t, false>) == 0x8);
+
+		template class BSFixedString<wchar_t, true>;
+		static_assert(sizeof(BSFixedString<wchar_t, true>) == 0x8);
+	}
+}

xmake.lua

@@ -116,10 +116,25 @@ target("commonlibsf")
         "cl::/wd5220"  -- 'member': a non-static data member with a volatile qualified type no longer implies that compiler generated copy / move constructors and copy / move assignment operators are not trivial
     )
 
+    -- add flags (clang-cl)
+    add_cxxflags(
+        "clang_cl::-fms-compatibility",
+        "clang_cl::-fms-extensions",
+        { public = true }
+    )
+
     -- add flags (clang-cl: disable warnings)
     add_cxxflags(
         "clang_cl::-Wno-delete-non-abstract-non-virtual-dtor",
+        "clang_cl::-Wno-deprecated-volatile",
+        "clang_cl::-Wno-ignored-qualifiers",
         "clang_cl::-Wno-inconsistent-missing-override",
+        "clang_cl::-Wno-invalid-offsetof",
+        "clang_cl::-Wno-microsoft-include",
         "clang_cl::-Wno-overloaded-virtual",
-        "clang_cl::-Wno-reinterpret-base-class"
+        "clang_cl::-Wno-pragma-system-header-outside-header",
+        "clang_cl::-Wno-reinterpret-base-class",
+        "clang_cl::-Wno-switch",
+        "clang_cl::-Wno-unused-private-field",
+        { public = true }
     )