Sonar fixes

Author: ReenigneArcher

.github/workflows/ci-linux.yml

@@ -178,7 +178,7 @@ jobs:
         run: |
           uv sync --locked \
             --python "${PYTHON_VERSION}" \
-            --no-python-downloads --no-install-project
+            --no-python-downloads --no-install-project --no-build
 
       - name: Run tests
         id: test

src/confighttp.cpp

@@ -12,6 +12,7 @@
 #include <filesystem>
 #include <format>
 #include <fstream>
+#include <new>
 #include <optional>
 #include <string_view>
 #include <vector>
@@ -20,6 +21,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/asio/ssl/context.hpp>
 #include <boost/filesystem.hpp>
+#include <lizardbyte/common/env.h>
 #include <nlohmann/json.hpp>
 #include <Simple-Web-Server/crypto.hpp>
 #include <Simple-Web-Server/server_https.hpp>
@@ -148,7 +150,7 @@ namespace confighttp {
       const auto dot = version.find('.', start);
       const auto length = dot == std::string_view::npos ? std::string_view::npos : dot - start;
       const auto part = parse_driver_version_part(version.substr(start, length));
-      if (!part) {
+      if (!part.has_value()) {
         return std::nullopt;
       }
 
@@ -305,9 +307,9 @@ namespace confighttp {
     }
 
     for (DWORD index = 0;; ++index) {
-      wchar_t subkey_name[256] = {};
-      DWORD subkey_name_size = _countof(subkey_name);
-      const auto enum_status = RegEnumKeyExW(root_key.get(), index, subkey_name, &subkey_name_size, nullptr, nullptr, nullptr, nullptr);
+      std::wstring subkey_name(256, L'\0');
+      DWORD subkey_name_size = static_cast<DWORD>(subkey_name.size());
+      const auto enum_status = RegEnumKeyExW(root_key.get(), index, subkey_name.data(), &subkey_name_size, nullptr, nullptr, nullptr, nullptr);
       if (enum_status == ERROR_NO_MORE_ITEMS) {
         break;
       }
@@ -316,7 +318,7 @@ namespace confighttp {
       }
 
       std::wstring device_key_path = L"SYSTEM\\CurrentControlSet\\Enum\\ROOT\\LIBVIRTUALHID\\";
-      device_key_path.append(subkey_name, subkey_name_size);
+      device_key_path.append(subkey_name, 0, subkey_name_size);
 
       registry_key_t device_key;
       if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, device_key_path.c_str(), 0, KEY_READ, device_key.put()) != ERROR_SUCCESS) {
@@ -1685,7 +1687,7 @@ namespace confighttp {
     auto output_tree = build_driver_status(false, version_str, LIBVIRTUALHID_MINIMUM_VERSION);
     bool requires_installed_driver = true;
     std::string backend_name;
-    std::string error;
+    std::string runtime_error_message;
 
     try {
       const auto runtime = platf::virtualhid::create_runtime();
@@ -1695,14 +1697,14 @@ namespace confighttp {
         requires_installed_driver = capabilities.requires_installed_driver;
         output_tree = build_driver_status(capabilities.supports_gamepad, version_str, LIBVIRTUALHID_MINIMUM_VERSION);
       }
-    } catch (const std::exception &e) {
-      error = e.what();
+    } catch (const std::bad_alloc &exception) {
+      runtime_error_message = exception.what();
     }
 
     output_tree["backend_name"] = backend_name;
     output_tree["requires_installed_driver"] = requires_installed_driver;
-    if (!error.empty()) {
-      output_tree["error"] = error;
+    if (!runtime_error_message.empty()) {
+      output_tree["error"] = runtime_error_message;
     }
 #else
     auto output_tree = build_driver_status(false, "", LIBVIRTUALHID_MINIMUM_VERSION);
@@ -1724,7 +1726,11 @@ namespace confighttp {
     std::string version_str;
 
     // Check if ViGEmBus driver exists
-    const std::filesystem::path driver_path = std::filesystem::path(std::getenv("SystemRoot") ? std::getenv("SystemRoot") : "C:\\Windows") / "System32" / "drivers" / "ViGEmBus.sys";
+    std::string system_root;
+    if (!lizardbyte::common::get_env("SystemRoot", system_root)) {
+      system_root = "C:\\Windows";
+    }
+    const std::filesystem::path driver_path = std::filesystem::path(system_root) / "System32" / "drivers" / "ViGEmBus.sys";
     const auto installed = std::filesystem::exists(driver_path);
     if (installed) {
       platf::getFileVersionInfo(driver_path, version_str);

src/input.cpp

@@ -188,7 +188,7 @@ namespace input {
     ~gamepad_t() {
       if (id >= 0) {
         task_pool.push([id = this->id]() {
-          free_gamepad(platf_input, id);
+          ::input::free_gamepad(platf_input, id);
         });
       }
     }
@@ -1347,7 +1347,7 @@ namespace input {
       gamepad.id = id;
     } else if (!(packet->activeGamepadMask & (1 << packet->controllerNumber)) && gamepad.id >= 0) {
       // If this is the final event for a gamepad being removed, free the gamepad and return.
-      free_gamepad(platf_input, gamepad.id);
+      ::input::free_gamepad(platf_input, gamepad.id);
       gamepad.id = -1;
       return;
     }

src/platform/common.h

@@ -838,17 +838,22 @@ namespace platf {
     virtual ~audio_control_t() = default;
   };
 
+  /**
+   * @brief Platform-specific input backend context.
+   */
+  struct input_raw_t;
+
   /**
    * @brief Release a platform input backend created by input().
    *
-   * @param p Pointer passed to the deleter or conversion helper.
+   * @param input Platform input backend to release.
    */
-  void freeInput(void *);
+  void freeInput(input_raw_t *input);
 
   /**
    * @brief Owning pointer for a platform input backend.
    */
-  using input_t = util::safe_ptr<void, freeInput>;
+  using input_t = util::safe_ptr<input_raw_t, freeInput>;
 
   std::filesystem::path appdata();
 
@@ -1174,7 +1179,7 @@ namespace platf {
    * @param utf8 UTF-8 text submitted by the client.
    * @param size Number of bytes or elements requested.
    */
-  void unicode(input_t &input, char *utf8, int size);
+  void unicode(input_t &input, const char *utf8, int size);
 
   /**
    * @brief Per-client input context allocated by a platform backend.

src/platform/linux/input/virtualhid.cpp

@@ -4,6 +4,7 @@
  */
 
 // standard includes
+#include <memory>
 #include <utility>
 
 // platform includes
@@ -17,14 +18,14 @@
 using namespace std::literals;
 
 namespace platf {
-  namespace {
+  /**
+   * @brief Global libvirtualhid devices shared by clients.
+   */
+  struct input_raw_t {
+    virtualhid::input_context_t virtualhid;  ///< libvirtualhid input context.
+  };
 
-    /**
-     * @brief Global libvirtualhid devices shared by clients.
-     */
-    struct input_raw_t {
-      virtualhid::input_context_t virtualhid;  ///< libvirtualhid input context.
-    };
+  namespace {
 
     /**
      * @brief Per-client libvirtualhid devices.
@@ -36,7 +37,7 @@ namespace platf {
        * @param input Platform input backend that receives the event.
        */
       explicit client_input_raw_t(input_t &input):
-          virtualhid {((input_raw_t *) input.get())->virtualhid} {}
+          virtualhid {input->virtualhid} {}
 
       virtualhid::client_context_t virtualhid;  ///< libvirtualhid client context.
     };
@@ -51,77 +52,16 @@ namespace platf {
     return std::make_unique<client_input_raw_t>(input);
   }
 
-  void freeInput(void *p) {
-    auto *input = (input_raw_t *) p;
-    delete input;
-  }
-
-  void move_mouse(input_t &input, int deltaX, int deltaY) {
-    virtualhid::move_mouse(((input_raw_t *) input.get())->virtualhid, deltaX, deltaY);
-  }
-
-  void abs_mouse(input_t &input, const touch_port_t &touch_port, float x, float y) {
-    virtualhid::abs_mouse(((input_raw_t *) input.get())->virtualhid, touch_port, x, y);
-  }
-
-  void button_mouse(input_t &input, int button, bool release) {
-    virtualhid::button_mouse(((input_raw_t *) input.get())->virtualhid, button, release);
-  }
-
-  void scroll(input_t &input, int high_res_distance) {
-    virtualhid::scroll(((input_raw_t *) input.get())->virtualhid, high_res_distance);
-  }
-
-  void hscroll(input_t &input, int high_res_distance) {
-    virtualhid::hscroll(((input_raw_t *) input.get())->virtualhid, high_res_distance);
-  }
-
-  /**
-   * @brief Press or release a virtual keyboard key.
-   *
-   * @param input Platform input backend that receives the event.
-   * @param modcode Modifier key code to update.
-   * @param release Whether the key or button event is a release.
-   * @param flags Bit flags that modify the requested operation; ignored by this backend.
-   */
-  void keyboard_update(input_t &input, std::uint16_t modcode, bool release, std::uint8_t flags) {
-    virtualhid::keyboard_update(((input_raw_t *) input.get())->virtualhid, modcode, release, flags);
-  }
-
-  void unicode(input_t &input, char *utf8, int size) {
-    virtualhid::unicode(((input_raw_t *) input.get())->virtualhid, utf8, size);
-  }
-
-  void touch_update(client_input_t *input, const touch_port_t &touch_port, const touch_input_t &touch) {
-    virtualhid::touch_update(((client_input_raw_t *) input)->virtualhid, touch_port, touch);
-  }
-
-  void pen_update(client_input_t *input, const touch_port_t &touch_port, const pen_input_t &pen) {
-    virtualhid::pen_update(((client_input_raw_t *) input)->virtualhid, touch_port, pen);
-  }
-
-  int alloc_gamepad(input_t &input, const gamepad_id_t &id, const gamepad_arrival_t &metadata, feedback_queue_t feedback_queue) {
-    return virtualhid::alloc_gamepad(((input_raw_t *) input.get())->virtualhid, id, metadata, std::move(feedback_queue));
-  }
-
-  void free_gamepad(input_t &input, int nr) {
-    virtualhid::free_gamepad(((input_raw_t *) input.get())->virtualhid, nr);
-  }
-
-  void gamepad_update(input_t &input, int nr, const gamepad_state_t &gamepad_state) {
-    virtualhid::gamepad_update(((input_raw_t *) input.get())->virtualhid, nr, gamepad_state);
-  }
-
-  void gamepad_touch(input_t &input, const gamepad_touch_t &touch) {
-    virtualhid::gamepad_touch(((input_raw_t *) input.get())->virtualhid, touch);
+  void freeInput(input_raw_t *input) {
+    std::default_delete<input_raw_t> {}(input);
   }
 
-  void gamepad_motion(input_t &input, const gamepad_motion_t &motion) {
-    virtualhid::gamepad_motion(((input_raw_t *) input.get())->virtualhid, motion);
+  virtualhid::input_context_t &virtualhid::get_input_context(input_t &input) {
+    return input->virtualhid;
   }
 
-  void gamepad_battery(input_t &input, const gamepad_battery_t &battery) {
-    virtualhid::gamepad_battery(((input_raw_t *) input.get())->virtualhid, battery);
+  virtualhid::client_context_t &virtualhid::get_client_context(client_input_t *input) {
+    return static_cast<client_input_raw_t *>(input)->virtualhid;
   }
 
   platform_caps::caps_t get_capabilities() {
@@ -131,8 +71,7 @@ namespace platf {
       return caps;
     }
 
-    const auto &capabilities = runtime->capabilities();
-    if (config::input.native_pen_touch && (capabilities.supports_touchscreen || capabilities.supports_pen_tablet)) {
+    if (const auto &capabilities = runtime->capabilities(); config::input.native_pen_touch && (capabilities.supports_touchscreen || capabilities.supports_pen_tablet)) {
       caps |= platform_caps::pen_touch;
     }
     if (virtualhid::configured_gamepad_supports_touchpad()) {

src/platform/macos/input.cpp

@@ -35,7 +35,7 @@ namespace platf {
      * @param input Platform input backend that receives the event.
      */
     explicit client_input_raw_t(input_t &input):
-        virtualhid {((input_raw_t *) input.get())->virtualhid} {}
+        virtualhid {input->virtualhid} {}
 
     virtualhid::client_context_t virtualhid;  ///< libvirtualhid client context.
   };
@@ -48,69 +48,16 @@ namespace platf {
     return std::make_unique<client_input_raw_t>(input);
   }
 
-  void freeInput(void *p) {
-    auto *input = (input_raw_t *) p;
-    delete input;
+  void freeInput(input_raw_t *input) {
+    std::default_delete<input_raw_t> {}(input);
   }
 
-  void move_mouse(input_t &input, int deltaX, int deltaY) {
-    virtualhid::move_mouse(((input_raw_t *) input.get())->virtualhid, deltaX, deltaY);
+  virtualhid::input_context_t &virtualhid::get_input_context(input_t &input) {
+    return input->virtualhid;
   }
 
-  void abs_mouse(input_t &input, const touch_port_t &touch_port, float x, float y) {
-    virtualhid::abs_mouse(((input_raw_t *) input.get())->virtualhid, touch_port, x, y);
-  }
-
-  void button_mouse(input_t &input, int button, bool release) {
-    virtualhid::button_mouse(((input_raw_t *) input.get())->virtualhid, button, release);
-  }
-
-  void scroll(input_t &input, int high_res_distance) {
-    virtualhid::scroll(((input_raw_t *) input.get())->virtualhid, high_res_distance);
-  }
-
-  void hscroll(input_t &input, int high_res_distance) {
-    virtualhid::hscroll(((input_raw_t *) input.get())->virtualhid, high_res_distance);
-  }
-
-  void keyboard_update(input_t &input, std::uint16_t modcode, bool release, std::uint8_t flags) {
-    virtualhid::keyboard_update(((input_raw_t *) input.get())->virtualhid, modcode, release, flags);
-  }
-
-  void unicode(input_t &input, char *utf8, int size) {
-    virtualhid::unicode(((input_raw_t *) input.get())->virtualhid, utf8, size);
-  }
-
-  void touch_update(client_input_t *input, const touch_port_t &touch_port, const touch_input_t &touch) {
-    virtualhid::touch_update(((client_input_raw_t *) input)->virtualhid, touch_port, touch);
-  }
-
-  void pen_update(client_input_t *input, const touch_port_t &touch_port, const pen_input_t &pen) {
-    virtualhid::pen_update(((client_input_raw_t *) input)->virtualhid, touch_port, pen);
-  }
-
-  int alloc_gamepad(input_t &input, const gamepad_id_t &id, const gamepad_arrival_t &metadata, feedback_queue_t feedback_queue) {
-    return virtualhid::alloc_gamepad(((input_raw_t *) input.get())->virtualhid, id, metadata, std::move(feedback_queue));
-  }
-
-  void free_gamepad(input_t &input, int nr) {
-    virtualhid::free_gamepad(((input_raw_t *) input.get())->virtualhid, nr);
-  }
-
-  void gamepad_update(input_t &input, int nr, const gamepad_state_t &gamepad_state) {
-    virtualhid::gamepad_update(((input_raw_t *) input.get())->virtualhid, nr, gamepad_state);
-  }
-
-  void gamepad_touch(input_t &input, const gamepad_touch_t &touch) {
-    virtualhid::gamepad_touch(((input_raw_t *) input.get())->virtualhid, touch);
-  }
-
-  void gamepad_motion(input_t &input, const gamepad_motion_t &motion) {
-    virtualhid::gamepad_motion(((input_raw_t *) input.get())->virtualhid, motion);
-  }
-
-  void gamepad_battery(input_t &input, const gamepad_battery_t &battery) {
-    virtualhid::gamepad_battery(((input_raw_t *) input.get())->virtualhid, battery);
+  virtualhid::client_context_t &virtualhid::get_client_context(client_input_t *input) {
+    return static_cast<client_input_raw_t *>(input)->virtualhid;
   }
 
   std::optional<util::point_t> get_mouse_loc(input_t & /*input*/) {