Various build fixes and GSL adjustments

Windower · Aug 24, 2024 · 0971b5e · 0971b5e
1 parent 7a2946a
commit 0971b5e
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 6 deletions.
diff --git a/core/src/addon/modules/packet.cpp b/core/src/addon/modules/packet.cpp
@@ -114,7 +114,7 @@ windower::packet_result windower::trigger_packet(
             lua::push(guard, result_data);
         }
         lua::push(guard, counter);
-        lua::push(guard, double(timestamp));
+        lua::push(guard, static_cast<double>(timestamp));
         lua::push(guard, blocked);
         lua::push(guard, injected_by);
         lua::call(guard, 9, 2);

diff --git a/core/src/addon/package_manager.cpp b/core/src/addon/package_manager.cpp
@@ -115,7 +115,8 @@ windower::package_version::package_version(std::u8string_view value) :
     package_version(to_string_view(value))
 {}
 
-windower::package_version::package_version(std::string_view value)
+windower::package_version::package_version(std::string_view value) :
+    minor{}, revision{}, build{}
 {
     value.remove_prefix(parse(value, major));
     if (!value.empty() && value.front() != u8'.')

diff --git a/core/src/addon/unsafe.cpp b/core/src/addon/unsafe.cpp
diff --git a/core/src/addon/unsafe.hpp b/core/src/addon/unsafe.hpp
diff --git a/core/src/binding_manager.cpp b/core/src/binding_manager.cpp
@@ -1318,7 +1318,7 @@ void windower::binding_manager::unregister_device(
     auto const device_id = it->second.id;
     auto end             = std::remove_if(
                     m_bindings.begin(), m_bindings.end(),
-                    [device_id](auto const& b) { return b.device_mask[device_id]; });
+                    [device_id](auto const& b) { return gsl::at(b.device_mask, device_id); });
     m_bindings.erase(end, m_bindings.end());
     m_descriptors.erase(it);
     std::get<1>(gsl::at(m_devices, device_id)).clear();

diff --git a/core/src/hooklib/trampoline.cpp b/core/src/hooklib/trampoline.cpp
@@ -418,7 +418,7 @@ class windower::hooklib::trampoline::block
                       : std::bit_cast<std::uint8_t*>(callback)};
             ::InterlockedExchange16(
                 std::bit_cast<short*>(m_target),
-                short(x86::hotpatch_jump_instruction));
+                gsl::narrow_cast<short>(x86::hotpatch_jump_instruction));
         }
         else
         {

diff --git a/core/src/hooks/advapi32.cpp b/core/src/hooks/advapi32.cpp
@@ -112,7 +112,7 @@ T convert(U value) noexcept
 }
 
 template<typename T>
-T convert(float value) noexcept
+constexpr T convert(float value) noexcept
 {
     return *std::bit_cast<T*>(&value);
 }

diff --git a/core/src/hooks/kernel32.cpp b/core/src/hooks/kernel32.cpp
diff --git a/core/src/ui/text_layout_options.hpp b/core/src/ui/text_layout_options.hpp
@@ -29,6 +29,7 @@
 
 #include <compare>
 #include <cstdint>
+#include <string>
 #include <string_view>
 
 namespace windower::ui

diff --git a/fenestra.ruleset b/fenestra.ruleset
@@ -28,10 +28,14 @@ SOFTWARE.
     <Rule Id="C26434" Action="None" />
     <Rule Id="C26447" Action="None" />
     <Rule Id="C26459" Action="None" />
+    <Rule Id="C26473" Action="None" />
+    <Rule Id="C26474" Action="None" />
     <Rule Id="C26486" Action="None" />
     <Rule Id="C26487" Action="None" />
     <Rule Id="C26489" Action="None" />
+    <Rule Id="C26490" Action="None" />
+    <Rule Id="C26492" Action="None" />
     <Rule Id="C26812" Action="None" />
     <Rule Id="C26821" Action="None" />
   </Rules>
-</RuleSet>
+</RuleSet>