Fixes to allow build x86

Author: arBmind

qbs/modules/hlsl/hlsl.qbs

@@ -6,8 +6,6 @@ import qbs.ModUtils
 import qbs.Utilities
 
 Module {
-    id: module
-
     property string hlslName: "fxc.exe"
     property string hlslPath: hlslName
     property string outputDir: "hlsl"

src/MainApplication.cpp

@@ -138,7 +138,7 @@ void MainApplication::updateScreenRect(Rect rect) {
 
 void MainApplication::captureScreen(int screen) {
     if (config().operationMode != OperationMode::PresentMirror) return; // not used in this mode
-    if (m_state.config.captureMonitor != screen && m_state.monitors.size() > screen) {
+    if (m_state.config.captureMonitor != screen && static_cast<int>(m_state.monitors.size()) > screen) {
         m_state.config.captureMonitor = screen;
         if (m_state.duplicationStatus == DuplicationStatus::Live && m_duplicationController)
             m_duplicationController->restart();
@@ -273,7 +273,7 @@ void MainApplication::toggleOutputMaximize() {
 void MainApplication::refreshMonitors() {
     resetMonitors();
     if (m_state.config.operationMode == OperationMode::PresentMirror) {
-        if (m_state.config.captureMonitor >= m_state.monitors.size()) {
+        if (m_state.config.captureMonitor >= static_cast<int>(m_state.monitors.size())) {
             captureScreen(0);
         }
         else {

src/meta/callback_adapter.h

@@ -1,15 +1,16 @@
 #pragma once
 #include <bit>
 #include <memory>
+#include <winnt.h>
 
-template<class Parameter = void*>
+template<class Parameter = void *>
 class UniqueCallbackAdapter final {
-    static_assert(sizeof(Parameter) >= sizeof(void*));
-    static_assert(alignof(Parameter) >= alignof(void*));
-    using ParameterFunction = void(Parameter);
-    using Deleter = ParameterFunction*;
-    using Invoker = ParameterFunction*;
-    static void noopParameterFunction(Parameter){}
+    static_assert(sizeof(Parameter) >= sizeof(void *));
+    static_assert(alignof(Parameter) >= alignof(void *));
+    using ParameterFunction = void NTAPI(Parameter);
+    using Deleter = ParameterFunction *;
+    using Invoker = ParameterFunction *;
+    static void NTAPI noopParameterFunction(Parameter) {}
 
     Parameter m_param = nullptr;
     Deleter m_deleter = &UniqueCallbackAdapter::noopParameterFunction;
@@ -19,31 +20,32 @@ class UniqueCallbackAdapter final {
     struct Helper {
         static constexpr auto is_small = (sizeof(Functor) <= sizeof(Parameter));
 
-        static auto param(Functor&& functor) -> Parameter {
+        static auto param(Functor &&functor) -> Parameter {
             if constexpr (is_small) {
                 auto result = Parameter{};
                 new (&result) Functor(std::forward<Functor>(functor));
                 return result;
             }
-            else return std::bit_cast<Parameter>(std::make_unique<Functor>(std::forward<Functor>(functor)).release());
+            else
+                return std::bit_cast<Parameter>(std::make_unique<Functor>(std::forward<Functor>(functor)).release());
         }
-        static void deleter(Parameter param) {
+        static void NTAPI deleter(Parameter param) {
             if constexpr (is_small) {
-                auto& functor = *std::launder(std::bit_cast<Functor*>(&param));
+                auto &functor = *std::launder(std::bit_cast<Functor *>(&param));
                 functor.~Functor();
             }
             else {
-                std::unique_ptr<Functor>(std::bit_cast<Functor*>(param));
+                std::unique_ptr<Functor>(std::bit_cast<Functor *>(param));
             }
         }
-        static void invoker(Parameter param) {
+        static void NTAPI invoker(Parameter param) {
             if constexpr (is_small) {
-                auto& functor = *std::launder(std::bit_cast<Functor*>(&param));
+                auto &functor = *std::launder(std::bit_cast<Functor *>(&param));
                 functor();
                 functor.~Functor();
             }
             else {
-                auto functor_ptr = std::unique_ptr<Functor>(std::bit_cast<Functor*>(param));
+                auto functor_ptr = std::unique_ptr<Functor>(std::bit_cast<Functor *>(param));
                 (*functor_ptr)();
             }
         }
@@ -52,14 +54,14 @@ class UniqueCallbackAdapter final {
 public:
     UniqueCallbackAdapter() = default;
     template<class Functor>
-    explicit UniqueCallbackAdapter(Functor&& functor)
+    explicit UniqueCallbackAdapter(Functor &&functor)
         : m_param{Helper<Functor>::param(std::forward<Functor>(functor))}
         , m_deleter{&Helper<Functor>::deleter}
         , m_invoker{&Helper<Functor>::invoker} {}
-    UniqueCallbackAdapter(const UniqueCallbackAdapter&) = delete;
-    UniqueCallbackAdapter& operator=(const UniqueCallbackAdapter&) = delete;
-    UniqueCallbackAdapter(UniqueCallbackAdapter&&) = delete;
-    UniqueCallbackAdapter& operator=(UniqueCallbackAdapter&&) = delete;
+    UniqueCallbackAdapter(const UniqueCallbackAdapter &) = delete;
+    UniqueCallbackAdapter &operator=(const UniqueCallbackAdapter &) = delete;
+    UniqueCallbackAdapter(UniqueCallbackAdapter &&) = delete;
+    UniqueCallbackAdapter &operator=(UniqueCallbackAdapter &&) = delete;
     ~UniqueCallbackAdapter() { m_deleter(m_param); }
 
     auto c_parameter() const -> Parameter { return m_param; }