From 8134ca66744218391208b1910f58ff8fff0cd0f4 Mon Sep 17 00:00:00 2001 From: mlopezsegura <90263997+mlopezsegura@users.noreply.github.com> Date: Sat, 14 Nov 2026 14:09:41 +0100 Subject: [PATCH] feat(windows): OsmsPad virtual gamepad backend New gamepad_driver value "osmspad" for OpenStreamMS's OsmsPad driver (UMDF on the Virtual HID Framework): every controller is an Xbox Series pad that Windows puts on the XInput path through its inbox xinputhid filter, with rumble (motors and triggers) returned to the client. Controllers belong to Sunshine's handle, so the driver removes them if Sunshine exits. When the driver is not installed, allocation falls back to ViGEmBus with the usual type selection. Virtual HID Driver is not used under this policy. Co-Authored-By: Claude Opus 5.5 --- cmake/compile_definitions/windows.cmake | 4 + src/config.cpp | 1 + src/config.h | 1 + src/platform/virtualhid_input.cpp | 3 +- src/platform/windows/input.cpp | 45 ++++ src/platform/windows/osmspad.cpp | 243 ++++++++++++++++++ src/platform/windows/osmspad.h | 106 ++++++++ src/platform/windows/osmspad_ioctl.h | 106 ++++++++ .../common/assets/web/configs/tabs/Inputs.vue | 1 + .../assets/web/public/assets/locale/bg.json | 1 + .../assets/web/public/assets/locale/cs.json | 1 + .../assets/web/public/assets/locale/de.json | 1 + .../assets/web/public/assets/locale/en.json | 1 + .../web/public/assets/locale/en_GB.json | 1 + .../web/public/assets/locale/en_US.json | 1 + .../assets/web/public/assets/locale/es.json | 1 + .../assets/web/public/assets/locale/fr.json | 1 + .../assets/web/public/assets/locale/hu.json | 1 + .../assets/web/public/assets/locale/it.json | 1 + .../assets/web/public/assets/locale/ja.json | 1 + .../assets/web/public/assets/locale/ko.json | 1 + .../assets/web/public/assets/locale/pl.json | 1 + .../assets/web/public/assets/locale/pt.json | 1 + .../web/public/assets/locale/pt_BR.json | 1 + .../assets/web/public/assets/locale/ru.json | 1 + .../assets/web/public/assets/locale/sv.json | 1 + .../assets/web/public/assets/locale/tr.json | 1 + .../assets/web/public/assets/locale/uk.json | 1 + .../assets/web/public/assets/locale/vi.json | 1 + .../assets/web/public/assets/locale/zh.json | 1 + .../web/public/assets/locale/zh_TW.json | 1 + tests/unit/platform/test_virtualhid_input.cpp | 1 + 32 files changed, 532 insertions(+), 1 deletion(-) create mode 100644 src/platform/windows/osmspad.cpp create mode 100644 src/platform/windows/osmspad.h create mode 100644 src/platform/windows/osmspad_ioctl.h diff --git a/cmake/compile_definitions/windows.cmake b/cmake/compile_definitions/windows.cmake index 996b3b24f88..b0c5680a55f 100644 --- a/cmake/compile_definitions/windows.cmake +++ b/cmake/compile_definitions/windows.cmake @@ -67,6 +67,9 @@ set(PLATFORM_TARGET_FILES "${CMAKE_SOURCE_DIR}/src/platform/windows/misc.h" "${CMAKE_SOURCE_DIR}/src/platform/windows/misc.cpp" "${CMAKE_SOURCE_DIR}/src/platform/windows/input.cpp" + "${CMAKE_SOURCE_DIR}/src/platform/windows/osmspad.h" + "${CMAKE_SOURCE_DIR}/src/platform/windows/osmspad.cpp" + "${CMAKE_SOURCE_DIR}/src/platform/windows/osmspad_ioctl.h" "${CMAKE_SOURCE_DIR}/src/platform/windows/session_input.h" "${CMAKE_SOURCE_DIR}/src/platform/windows/session_input.cpp" "${CMAKE_SOURCE_DIR}/src/platform/windows/display.h" @@ -95,6 +98,7 @@ set(OPENSSL_LIBRARIES list(PREPEND PLATFORM_LIBRARIES ${CURL_STATIC_LIBRARIES} avrt + cfgmgr32 d3d11 D3DCompiler dwmapi diff --git a/src/config.cpp b/src/config.cpp index f324906c0ca..9952c1719bc 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -1905,6 +1905,7 @@ namespace config { GAMEPAD_DRIVER_ALL, GAMEPAD_DRIVER_VIRTUALHID, GAMEPAD_DRIVER_VIGEMBUS, + GAMEPAD_DRIVER_OSMSPAD, GAMEPAD_DRIVER_NONE, }); string_restricted_f(vars, "gamepad"s, input.gamepad, get_supported_gamepad_options()); diff --git a/src/config.h b/src/config.h index a67f8be41bc..0f2ac52f173 100644 --- a/src/config.h +++ b/src/config.h @@ -42,6 +42,7 @@ namespace config { inline constexpr std::string_view GAMEPAD_DRIVER_ALL = "all"; ///< Allow every available Windows virtual gamepad driver. inline constexpr std::string_view GAMEPAD_DRIVER_VIRTUALHID = "virtualhid"; ///< Use Virtual HID Broker for gamepads on Windows or macOS. inline constexpr std::string_view GAMEPAD_DRIVER_VIGEMBUS = "vigembus"; ///< Allow only ViGEmBus for Windows gamepads. + inline constexpr std::string_view GAMEPAD_DRIVER_OSMSPAD = "osmspad"; ///< OpenStreamMS OsmsPad driver (Xbox Series pads), ViGEmBus if it is missing. inline constexpr std::string_view GAMEPAD_DRIVER_NONE = "none"; ///< Disable virtual gamepads on Windows and macOS. // track modified config options diff --git a/src/platform/virtualhid_input.cpp b/src/platform/virtualhid_input.cpp index dc6e592b65c..c9a50f91477 100644 --- a/src/platform/virtualhid_input.cpp +++ b/src/platform/virtualhid_input.cpp @@ -672,7 +672,8 @@ namespace platf::virtualhid { const std::string_view gamepad_driver, const bool virtualhid_licensed ) { - return gamepad_driver != config::GAMEPAD_DRIVER_VIGEMBUS && gamepad_driver != config::GAMEPAD_DRIVER_NONE && capabilities.supports_gamepad && + return gamepad_driver != config::GAMEPAD_DRIVER_VIGEMBUS && gamepad_driver != config::GAMEPAD_DRIVER_OSMSPAD && + gamepad_driver != config::GAMEPAD_DRIVER_NONE && capabilities.supports_gamepad && (!capabilities.requires_installed_driver || virtualhid_licensed); } diff --git a/src/platform/windows/input.cpp b/src/platform/windows/input.cpp index 73f2acf0383..cb684068be4 100644 --- a/src/platform/windows/input.cpp +++ b/src/platform/windows/input.cpp @@ -29,6 +29,7 @@ // local includes #include "input.h" #include "misc.h" +#include "osmspad.h" #include "src/config.h" #include "src/globals.h" #include "src/logging.h" @@ -522,8 +523,27 @@ namespace platf { struct input_raw_t { virtualhid::input_context_t virtualhid; ///< libvirtualhid input context. std::unique_ptr vigem; ///< ViGEm fallback context. + std::unique_ptr osmspad; ///< OsmsPad driver context, when gamepad_driver = osmspad. }; + /** + * @brief Open the OsmsPad driver if it is not already open. + * + * @param raw Platform input context. + * @return True when OsmsPad can create controllers. + */ + bool ensure_osmspad(input_raw_t *raw) { + if (raw->osmspad) { + return true; + } + auto osmspad = std::make_unique(); + if (!osmspad->init()) { + return false; + } + raw->osmspad = std::move(osmspad); + return true; + } + /** * @brief Check whether the libvirtualhid runtime should receive gamepad allocations. * @@ -671,6 +691,18 @@ namespace platf { return 0; } + // OsmsPad (OpenStreamMS): every controller is an Xbox Series pad on the XInput path. If the + // driver is not installed, fall back to ViGEmBus with the usual type selection. + if (config::input.gamepad_driver == config::GAMEPAD_DRIVER_OSMSPAD) { + if (ensure_osmspad(raw)) { + BOOST_LOG(info) << "Gamepad " << id.globalIndex << " will be Xbox Series controller (OsmsPad)"sv; + if (raw->osmspad->alloc(id, feedback_queue) == 0) { + return 0; + } + } + BOOST_LOG(warning) << "OsmsPad is unavailable; using ViGEmBus for gamepad "sv << id.globalIndex; + } + if (!should_allocate_vigembus_gamepad(use_virtualhid)) { return -1; } @@ -729,6 +761,10 @@ namespace platf { int rebind_gamepad(input_t &input, const gamepad_id_t &id, feedback_queue_t feedback_queue) { auto raw = (input_raw_t *) input.get(); + if (raw->osmspad && raw->osmspad->has(id.globalIndex)) { + return raw->osmspad->rebind(id, std::move(feedback_queue)); + } + if (virtualhid::has_gamepad(raw->virtualhid, id.globalIndex)) { return virtualhid::rebind_gamepad(raw->virtualhid, id, std::move(feedback_queue)); } @@ -743,6 +779,11 @@ namespace platf { void free_gamepad(input_t &input, int nr) { auto raw = (input_raw_t *) input.get(); + if (raw->osmspad && raw->osmspad->has(nr)) { + raw->osmspad->free(nr); + return; + } + if (virtualhid::has_gamepad(raw->virtualhid, nr)) { virtualhid::free_gamepad(raw->virtualhid, nr); return; @@ -1006,6 +1047,10 @@ namespace platf { */ void gamepad_update(input_t &input, int nr, const gamepad_state_t &gamepad_state) { auto raw = (input_raw_t *) input.get(); + if (raw->osmspad && raw->osmspad->has(nr)) { + raw->osmspad->update(nr, gamepad_state); + return; + } if (virtualhid::has_gamepad(raw->virtualhid, nr)) { virtualhid::gamepad_update(raw->virtualhid, nr, gamepad_state); return; diff --git a/src/platform/windows/osmspad.cpp b/src/platform/windows/osmspad.cpp new file mode 100644 index 00000000000..b945c8f7024 --- /dev/null +++ b/src/platform/windows/osmspad.cpp @@ -0,0 +1,243 @@ +/** + * @file src/platform/windows/osmspad.cpp + * @brief Virtual Xbox Series gamepads through OpenStreamMS's OsmsPad driver. + */ +// platform includes +#include +#include +#include + +// standard includes +#include + +// local includes +#include "osmspad.h" +#include "osmspad_ioctl.h" +#include "src/logging.h" + +using namespace std::literals; + +namespace platf { + namespace { + /** + * @brief Device path of the first present OsmsPad interface. + * @return Path, or an empty string when the driver is not installed or not started. + */ + std::wstring interface_path() { + ULONG length = 0; + auto guid = GUID_DEVINTERFACE_OSMSPAD; + if (CM_Get_Device_Interface_List_SizeW(&length, &guid, nullptr, CM_GET_DEVICE_INTERFACE_LIST_PRESENT) != CR_SUCCESS || length <= 1) { + return {}; + } + std::vector list(length); + if (CM_Get_Device_Interface_ListW(&guid, nullptr, list.data(), length, CM_GET_DEVICE_INTERFACE_LIST_PRESENT) != CR_SUCCESS) { + return {}; + } + return list.data(); + } + + /** + * @brief Moonlight button mask to the XInput-style bits OsmsPad takes. + * + * The low 16 Moonlight bits already use the XInput layout. The miscellaneous and touchpad + * buttons become the Xbox Series Share button. + */ + std::uint16_t to_osmspad_buttons(const std::uint32_t flags) { + auto buttons = static_cast(flags & 0xF7FF); + if (flags & (MISC_BUTTON | TOUCHPAD_BUTTON)) { + buttons |= OSMSPAD_SHARE; + } + return buttons; + } + } // namespace + + bool osmspad_t::available() { + return !interface_path().empty(); + } + + osmspad_t::~osmspad_t() { + if (stop_event_) { + SetEvent(stop_event_); + } + if (device_ != INVALID_HANDLE_VALUE) { + CancelIoEx(device_, nullptr); + } + if (feedback_thread_.joinable()) { + feedback_thread_.join(); + } + // Closing the handle removes every controller this instance created. + if (device_ != INVALID_HANDLE_VALUE) { + CloseHandle(device_); + } + if (stop_event_) { + CloseHandle(stop_event_); + } + } + + bool osmspad_t::init() { + const auto path = interface_path(); + if (path.empty()) { + return false; + } + device_ = CreateFileW(path.c_str(), GENERIC_READ | GENERIC_WRITE, 0, nullptr, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, nullptr); + if (device_ == INVALID_HANDLE_VALUE) { + BOOST_LOG(warning) << "Couldn't open the OsmsPad driver ["sv << GetLastError() << ']'; + return false; + } + stop_event_ = CreateEventW(nullptr, TRUE, FALSE, nullptr); + feedback_thread_ = std::thread {&osmspad_t::feedback_loop, this}; + BOOST_LOG(info) << "OsmsPad virtual gamepad driver is available"sv; + return true; + } + + bool osmspad_t::ioctl(DWORD code, const void *in, DWORD in_size, void *out, DWORD out_size, DWORD *returned) { + OVERLAPPED overlapped {}; + overlapped.hEvent = CreateEventW(nullptr, TRUE, FALSE, nullptr); + DWORD bytes = 0; + BOOL ok = DeviceIoControl(device_, code, const_cast(in), in_size, out, out_size, &bytes, &overlapped); + if (!ok && GetLastError() == ERROR_IO_PENDING) { + ok = GetOverlappedResult(device_, &overlapped, &bytes, TRUE); + } + const auto error = GetLastError(); + CloseHandle(overlapped.hEvent); + if (returned) { + *returned = bytes; + } + SetLastError(error); + return ok != FALSE; + } + + int osmspad_t::alloc(const gamepad_id_t &id, feedback_queue_t feedback_queue) { + if (id.globalIndex < 0 || id.globalIndex >= MAX_GAMEPADS) { + return -1; + } + free(id.globalIndex); + + OsmsPadCreateIn request {OSMSPAD_PROTOCOL_VERSION, OSMSPAD_PROFILE_XBOX_SERIES, OSMSPAD_SESSION_CALLER}; + OsmsPadCreateOut created {}; + if (!ioctl(IOCTL_OSMSPAD_CREATE, &request, sizeof request, &created, sizeof created)) { + BOOST_LOG(error) << "Couldn't create an OsmsPad controller ["sv << GetLastError() << ']'; + return -1; + } + + std::lock_guard lock {mutex_}; + auto &slot = slots_[id.globalIndex]; + slot = {}; + slot.used = true; + slot.pad = created.Pad; + slot.client_relative_index = id.clientRelativeIndex; + slot.feedback_queue = std::move(feedback_queue); + BOOST_LOG(info) << "OsmsPad controller "sv << created.Pad << " created for gamepad "sv << id.globalIndex; + return 0; + } + + int osmspad_t::rebind(const gamepad_id_t &id, feedback_queue_t feedback_queue) { + std::lock_guard lock {mutex_}; + if (id.globalIndex < 0 || id.globalIndex >= MAX_GAMEPADS || !slots_[id.globalIndex].used) { + return -1; + } + auto &slot = slots_[id.globalIndex]; + slot.client_relative_index = id.clientRelativeIndex; + slot.feedback_queue = std::move(feedback_queue); + slot.last_low = slot.last_high = slot.last_left = slot.last_right = 0; + return 0; + } + + void osmspad_t::free(int nr) { + std::uint32_t pad; + { + std::lock_guard lock {mutex_}; + if (nr < 0 || nr >= MAX_GAMEPADS || !slots_[nr].used) { + return; + } + pad = slots_[nr].pad; + slots_[nr] = {}; + } + OsmsPadDestroyIn request {pad}; + if (!ioctl(IOCTL_OSMSPAD_DESTROY, &request, sizeof request, nullptr, 0)) { + BOOST_LOG(warning) << "Couldn't remove OsmsPad controller "sv << pad << " ["sv << GetLastError() << ']'; + } + } + + bool osmspad_t::has(int nr) const { + std::lock_guard lock {mutex_}; + return nr >= 0 && nr < MAX_GAMEPADS && slots_[nr].used; + } + + void osmspad_t::update(int nr, const gamepad_state_t &state) { + OsmsPadInput input {}; + { + std::lock_guard lock {mutex_}; + if (nr < 0 || nr >= MAX_GAMEPADS || !slots_[nr].used) { + return; + } + input.Pad = slots_[nr].pad; + } + input.Buttons = to_osmspad_buttons(state.buttonFlags); + input.LeftTrigger = state.lt; + input.RightTrigger = state.rt; + input.ThumbLX = state.lsX; + input.ThumbLY = state.lsY; + input.ThumbRX = state.rsX; + input.ThumbRY = state.rsY; + if (!ioctl(IOCTL_OSMSPAD_INPUT, &input, sizeof input, nullptr, 0)) { + BOOST_LOG(warning) << "Couldn't send gamepad input to OsmsPad ["sv << GetLastError() << ']'; + } + } + + // One pending feedback request at a time: the driver completes it when a game asks one of + // our controllers to rumble, and the loop posts it to that controller's client. + void osmspad_t::feedback_loop() { + OVERLAPPED overlapped {}; + overlapped.hEvent = CreateEventW(nullptr, TRUE, FALSE, nullptr); + const HANDLE waits[] {stop_event_, overlapped.hEvent}; + + while (true) { + OsmsPadFeedback feedback {}; + DWORD bytes = 0; + ResetEvent(overlapped.hEvent); + BOOL ok = DeviceIoControl(device_, IOCTL_OSMSPAD_FEEDBACK, nullptr, 0, &feedback, sizeof feedback, &bytes, &overlapped); + if (!ok && GetLastError() == ERROR_IO_PENDING) { + if (WaitForMultipleObjects(2, waits, FALSE, INFINITE) != WAIT_OBJECT_0 + 1) { + CancelIoEx(device_, &overlapped); + GetOverlappedResult(device_, &overlapped, &bytes, TRUE); + break; + } + ok = GetOverlappedResult(device_, &overlapped, &bytes, FALSE); + } + if (!ok) { + if (WaitForSingleObject(stop_event_, 0) == WAIT_OBJECT_0) { + break; + } + BOOST_LOG(warning) << "OsmsPad feedback request failed ["sv << GetLastError() << ']'; + if (WaitForSingleObject(stop_event_, 1000) == WAIT_OBJECT_0) { + break; + } + continue; + } + if (bytes < sizeof feedback) { + continue; + } + + std::lock_guard lock {mutex_}; + for (auto &slot : slots_) { + if (!slot.used || slot.pad != feedback.Pad || !slot.feedback_queue) { + continue; + } + if (feedback.LargeMotor != slot.last_low || feedback.SmallMotor != slot.last_high) { + slot.feedback_queue->raise(gamepad_feedback_msg_t::make_rumble(slot.client_relative_index, feedback.LargeMotor, feedback.SmallMotor)); + slot.last_low = feedback.LargeMotor; + slot.last_high = feedback.SmallMotor; + } + if (feedback.LeftTrigger != slot.last_left || feedback.RightTrigger != slot.last_right) { + slot.feedback_queue->raise(gamepad_feedback_msg_t::make_rumble_triggers(slot.client_relative_index, feedback.LeftTrigger, feedback.RightTrigger)); + slot.last_left = feedback.LeftTrigger; + slot.last_right = feedback.RightTrigger; + } + break; + } + } + CloseHandle(overlapped.hEvent); + } + +} // namespace platf diff --git a/src/platform/windows/osmspad.h b/src/platform/windows/osmspad.h new file mode 100644 index 00000000000..d51ee740898 --- /dev/null +++ b/src/platform/windows/osmspad.h @@ -0,0 +1,106 @@ +/** + * @file src/platform/windows/osmspad.h + * @brief Virtual Xbox Series gamepads through OpenStreamMS's OsmsPad driver (UMDF + VHF). + * + * OsmsPad creates HID gamepads that Windows puts on the XInput path through its inbox + * xinputhid filter, without ViGEmBus. Each controller belongs to the handle that created it: + * if Sunshine exits or crashes, the driver removes its controllers. The driver records the + * caller's Windows session in each controller's instance ID (OSMS_S_P), which + * OpenStreamMS uses to show the controller only in that session. + */ +#pragma once + +// standard includes +#include +#include +#include +#include +#include +#include + +// platform includes +#include + +// local includes +#include "src/platform/common.h" + +namespace platf { + + /** + * @brief Client of the OsmsPad driver for every gamepad of one Sunshine instance. + */ + class osmspad_t { + public: + osmspad_t() = default; + ~osmspad_t(); + osmspad_t(const osmspad_t &) = delete; + osmspad_t &operator=(const osmspad_t &) = delete; + + /** + * @brief Check whether the OsmsPad driver interface is present on this machine. + * @return True when the driver is installed and started. + */ + static bool available(); + + /** + * @brief Open the driver and start the rumble thread. + * @return True on success. + */ + bool init(); + + /** + * @brief Create an Xbox Series controller for a Sunshine gamepad slot. + * @param id Global and client-relative gamepad indexes. + * @param feedback_queue Queue that returns rumble to the client. + * @return 0 on success, -1 on failure. + */ + int alloc(const gamepad_id_t &id, feedback_queue_t feedback_queue); + + /** + * @brief Point an existing controller's feedback at a resumed client. + * @param id Global and client-relative gamepad indexes. + * @param feedback_queue Queue that returns rumble to the new client. + * @return 0 on success, -1 when the slot has no controller. + */ + int rebind(const gamepad_id_t &id, feedback_queue_t feedback_queue); + + /** + * @brief Remove the controller of a gamepad slot. + * @param nr Global gamepad index. + */ + void free(int nr); + + /** + * @brief Whether a gamepad slot is served by OsmsPad. + * @param nr Global gamepad index. + * @return True when the slot has an OsmsPad controller. + */ + bool has(int nr) const; + + /** + * @brief Send the full controller state. + * @param nr Global gamepad index. + * @param state Buttons, triggers and sticks from the client. + */ + void update(int nr, const gamepad_state_t &state); + + private: + struct slot_t { + bool used = false; + std::uint32_t pad = 0; ///< Driver controller number. + std::uint8_t client_relative_index = 0; + feedback_queue_t feedback_queue; + std::uint16_t last_low = 0, last_high = 0, last_left = 0, last_right = 0; + }; + + void feedback_loop(); + bool ioctl(DWORD code, const void *in, DWORD in_size, void *out, DWORD out_size, DWORD *returned = nullptr); + + HANDLE device_ = INVALID_HANDLE_VALUE; + HANDLE stop_event_ = nullptr; + std::thread feedback_thread_; + mutable std::mutex mutex_; + std::array slots_ {}; + }; + +} // namespace platf diff --git a/src/platform/windows/osmspad_ioctl.h b/src/platform/windows/osmspad_ioctl.h new file mode 100644 index 00000000000..a9ed8e2bf8e --- /dev/null +++ b/src/platform/windows/osmspad_ioctl.h @@ -0,0 +1,106 @@ +// osmspad_ioctl.h — copia de Native/OsmsPad/OsmsPadIoctl.h de OpenStreamMS (MIT): contrato con el driver OsmsPad. +// Mantener idéntica: cualquier cambio de los structs sube OSMSPAD_PROTOCOL_VERSION en los dos repos. +// +// Solo tipos de tamaño fijo y METHOD_BUFFERED: el mismo fichero lo incluyen el driver UMDF +// y los clientes de modo usuario, sin cabeceras del WDK. Cambiar un struct exige subir +// OSMSPAD_PROTOCOL_VERSION; el driver rechaza versiones que no conoce. +// +// Flujo de un cliente: +// 1) abrir la interfaz GUID_DEVINTERFACE_OSMSPAD (CM_Get_Device_Interface_List + CreateFile); +// 2) IOCTL_OSMSPAD_CREATE -> número de mando (pad); +// 3) IOCTL_OSMSPAD_INPUT con el estado completo del mando cada vez que cambie; +// 4) IOCTL_OSMSPAD_FEEDBACK pendiente (overlapped): se completa con la vibración que pide el juego; +// 5) IOCTL_OSMSPAD_DESTROY o cerrar el handle: cerrar el handle borra todos sus mandos. +#pragma once + +#include + +#ifndef CTL_CODE +#include +#include +#endif + +// {6B1A3C52-8E0F-4C7B-9D2A-5F3E1B7C9A40} +#ifdef DEFINE_GUID +DEFINE_GUID(GUID_DEVINTERFACE_OSMSPAD, + 0x6b1a3c52, 0x8e0f, 0x4c7b, 0x9d, 0x2a, 0x5f, 0x3e, 0x1b, 0x7c, 0x9a, 0x40); +#endif + +#define OSMSPAD_PROTOCOL_VERSION 1u +#define OSMSPAD_MAX_PADS 16u +#define OSMSPAD_SESSION_CALLER 0xFFFFFFFFu // sesión de Windows de quien crea el mando + +#define OSMSPAD_DEVICE_TYPE 0x8A5Bu +#define IOCTL_OSMSPAD_CREATE CTL_CODE(OSMSPAD_DEVICE_TYPE, 0x801, METHOD_BUFFERED, FILE_READ_DATA | FILE_WRITE_DATA) +#define IOCTL_OSMSPAD_INPUT CTL_CODE(OSMSPAD_DEVICE_TYPE, 0x802, METHOD_BUFFERED, FILE_WRITE_DATA) +#define IOCTL_OSMSPAD_DESTROY CTL_CODE(OSMSPAD_DEVICE_TYPE, 0x803, METHOD_BUFFERED, FILE_WRITE_DATA) +#define IOCTL_OSMSPAD_FEEDBACK CTL_CODE(OSMSPAD_DEVICE_TYPE, 0x804, METHOD_BUFFERED, FILE_READ_DATA) + +enum OsmsPadProfile : uint32_t { + OSMSPAD_PROFILE_XBOX_SERIES = 1, // HID + xinputhid: lo ven XInput, GameInput, DirectInput y Steam +}; + +// Botones con los mismos bits que XINPUT_GAMEPAD / XUSB_REPORT (lo que ya usa Sunshine con ViGEm). +enum OsmsPadButton : uint16_t { + OSMSPAD_DPAD_UP = 0x0001, + OSMSPAD_DPAD_DOWN = 0x0002, + OSMSPAD_DPAD_LEFT = 0x0004, + OSMSPAD_DPAD_RIGHT = 0x0008, + OSMSPAD_START = 0x0010, + OSMSPAD_BACK = 0x0020, + OSMSPAD_LEFT_THUMB = 0x0040, + OSMSPAD_RIGHT_THUMB = 0x0080, + OSMSPAD_LEFT_SHOULDER = 0x0100, + OSMSPAD_RIGHT_SHOULDER = 0x0200, + OSMSPAD_GUIDE = 0x0400, + OSMSPAD_SHARE = 0x0800, // no existe en XUSB; aquí es el botón Compartir del mando Series + OSMSPAD_A = 0x1000, + OSMSPAD_B = 0x2000, + OSMSPAD_X = 0x4000, + OSMSPAD_Y = 0x8000, +}; + +#pragma pack(push, 1) + +struct OsmsPadCreateIn { + uint32_t Version; // OSMSPAD_PROTOCOL_VERSION + uint32_t Profile; // OsmsPadProfile + uint32_t TargetSession; // sesión de Windows del mando, u OSMSPAD_SESSION_CALLER +}; + +struct OsmsPadCreateOut { + uint32_t Pad; // 0..OSMSPAD_MAX_PADS-1 + uint32_t Session; // sesión que quedó en el ID de instancia + wchar_t InstanceId[48]; // ID de instancia del nodo VHF (OSMS_S_P) +}; + +struct OsmsPadInput { + uint32_t Pad; + uint16_t Buttons; // OsmsPadButton + uint8_t LeftTrigger; // 0..255 + uint8_t RightTrigger; + int16_t ThumbLX; // como XInput: -32768..32767, positivo = derecha / arriba + int16_t ThumbLY; + int16_t ThumbRX; + int16_t ThumbRY; +}; + +struct OsmsPadDestroyIn { + uint32_t Pad; +}; + +// Vibración que pidió el juego, 0..65535 por motor (como XINPUT_VIBRATION + gatillos). +struct OsmsPadFeedback { + uint32_t Pad; + uint16_t LargeMotor; // izquierdo, baja frecuencia + uint16_t SmallMotor; // derecho, alta frecuencia + uint16_t LeftTrigger; + uint16_t RightTrigger; +}; + +#pragma pack(pop) + +static_assert(sizeof(OsmsPadCreateIn) == 12, "OsmsPadCreateIn"); +static_assert(sizeof(OsmsPadCreateOut) == 104, "OsmsPadCreateOut"); +static_assert(sizeof(OsmsPadInput) == 16, "OsmsPadInput"); +static_assert(sizeof(OsmsPadFeedback) == 12, "OsmsPadFeedback"); diff --git a/src_assets/common/assets/web/configs/tabs/Inputs.vue b/src_assets/common/assets/web/configs/tabs/Inputs.vue index 0bf664555ff..d2b29de5b93 100644 --- a/src_assets/common/assets/web/configs/tabs/Inputs.vue +++ b/src_assets/common/assets/web/configs/tabs/Inputs.vue @@ -131,6 +131,7 @@ watch( +
{{ $t(platform === 'macos' ? 'config.gamepad_driver_macos_desc' : 'config.gamepad_driver_desc') }}
diff --git a/src_assets/common/assets/web/public/assets/locale/bg.json b/src_assets/common/assets/web/public/assets/locale/bg.json index c59fef690fb..c540389e380 100644 --- a/src_assets/common/assets/web/public/assets/locale/bg.json +++ b/src_assets/common/assets/web/public/assets/locale/bg.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "Нищо (изключване на контролерите)", "gamepad_driver_select": "Избор на драйвер…", "gamepad_driver_vigembus": "ViGEmBus", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "Virtual HID Broker", "gamepad_ds4": "DS4 (PS4)", "gamepad_ds4_manual": "Настройки за контролери от типа на PlayStation", diff --git a/src_assets/common/assets/web/public/assets/locale/cs.json b/src_assets/common/assets/web/public/assets/locale/cs.json index 2f8f56b3967..c652ac677fa 100644 --- a/src_assets/common/assets/web/public/assets/locale/cs.json +++ b/src_assets/common/assets/web/public/assets/locale/cs.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "Žádný (zakázat gamepady)", "gamepad_driver_select": "Vyberte si backend...", "gamepad_driver_vigembus": "ViGEmbus", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "Virtuální HID Broker", "gamepad_ds4": "DS4 (PS4)", "gamepad_ds4_manual": "Možnosti herních ovladačů ve stylu PlayStation", diff --git a/src_assets/common/assets/web/public/assets/locale/de.json b/src_assets/common/assets/web/public/assets/locale/de.json index a854222bdea..e941861d35d 100644 --- a/src_assets/common/assets/web/public/assets/locale/de.json +++ b/src_assets/common/assets/web/public/assets/locale/de.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "Keine (Gamepads deaktivieren)", "gamepad_driver_select": "Wähle einen Treiber...", "gamepad_driver_vigembus": "ViGEmBus", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "Virtueller HID-Treiber", "gamepad_ds4": "DS4 (PS4)", "gamepad_ds4_manual": "DS4 Auswahloptionen", diff --git a/src_assets/common/assets/web/public/assets/locale/en.json b/src_assets/common/assets/web/public/assets/locale/en.json index 8514647eebd..a48af5920a9 100644 --- a/src_assets/common/assets/web/public/assets/locale/en.json +++ b/src_assets/common/assets/web/public/assets/locale/en.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "None (disable gamepads)", "gamepad_driver_select": "Choose a backend...", "gamepad_driver_vigembus": "ViGEmBus", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "Virtual HID Broker", "gamepad_ds4": "DS4 (PS4)", "gamepad_ds4_manual": "PlayStation-style gamepad options", diff --git a/src_assets/common/assets/web/public/assets/locale/en_GB.json b/src_assets/common/assets/web/public/assets/locale/en_GB.json index cafaddda4bf..c8938ad67fc 100644 --- a/src_assets/common/assets/web/public/assets/locale/en_GB.json +++ b/src_assets/common/assets/web/public/assets/locale/en_GB.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "None (disable gamepads)", "gamepad_driver_select": "Choose a driver...", "gamepad_driver_vigembus": "ViGEmBus", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "Virtual HID Driver", "gamepad_ds4": "DS4 (PS4)", "gamepad_ds4_manual": "DS4 selection options", diff --git a/src_assets/common/assets/web/public/assets/locale/en_US.json b/src_assets/common/assets/web/public/assets/locale/en_US.json index 416b274d9ff..dfef4a853ff 100644 --- a/src_assets/common/assets/web/public/assets/locale/en_US.json +++ b/src_assets/common/assets/web/public/assets/locale/en_US.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "None (disable gamepads)", "gamepad_driver_select": "Choose a backend...", "gamepad_driver_vigembus": "ViGEmBus", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "Virtual HID Broker", "gamepad_ds4": "DS4 (PS4)", "gamepad_ds4_manual": "PlayStation-style gamepad options", diff --git a/src_assets/common/assets/web/public/assets/locale/es.json b/src_assets/common/assets/web/public/assets/locale/es.json index ccb6af37540..c280b9aa877 100644 --- a/src_assets/common/assets/web/public/assets/locale/es.json +++ b/src_assets/common/assets/web/public/assets/locale/es.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "Ninguno (desactivar gamepads)", "gamepad_driver_select": "Elegir un driver...", "gamepad_driver_vigembus": "ViGEmBus", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "Controlador de HID virtual", "gamepad_ds4": "DS4 (PS4)", "gamepad_ds4_manual": "Opciones de selección DS4", diff --git a/src_assets/common/assets/web/public/assets/locale/fr.json b/src_assets/common/assets/web/public/assets/locale/fr.json index 675d2dfad48..e246f406239 100644 --- a/src_assets/common/assets/web/public/assets/locale/fr.json +++ b/src_assets/common/assets/web/public/assets/locale/fr.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "Aucun (désactiver les manettes)", "gamepad_driver_select": "Choisir un backend…", "gamepad_driver_vigembus": "ViGEmBus", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "Pilote HID virtuel", "gamepad_ds4": "DS4 (PS4)", "gamepad_ds4_manual": "Options de sélection DS4", diff --git a/src_assets/common/assets/web/public/assets/locale/hu.json b/src_assets/common/assets/web/public/assets/locale/hu.json index abd1205bcbb..03718f02e05 100644 --- a/src_assets/common/assets/web/public/assets/locale/hu.json +++ b/src_assets/common/assets/web/public/assets/locale/hu.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "Nincs (a játékvezérlők letiltása)", "gamepad_driver_select": "Válasszon meghajtót...", "gamepad_driver_vigembus": "ViGEmBus", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "Virtuális HID-illesztőprogram", "gamepad_ds4": "DS4 (PS4)", "gamepad_ds4_manual": "DS4 választási beállítások", diff --git a/src_assets/common/assets/web/public/assets/locale/it.json b/src_assets/common/assets/web/public/assets/locale/it.json index 2df5381124c..1a660764032 100644 --- a/src_assets/common/assets/web/public/assets/locale/it.json +++ b/src_assets/common/assets/web/public/assets/locale/it.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "Nessuno (disabilita gamepads)", "gamepad_driver_select": "Scegli un autista...", "gamepad_driver_vigembus": "ViGEmBus", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "Driver Hid Virtuale", "gamepad_ds4": "DS4 (PS4)", "gamepad_ds4_manual": "Opzioni del DS4", diff --git a/src_assets/common/assets/web/public/assets/locale/ja.json b/src_assets/common/assets/web/public/assets/locale/ja.json index 4207e83d30a..36bf69804e7 100644 --- a/src_assets/common/assets/web/public/assets/locale/ja.json +++ b/src_assets/common/assets/web/public/assets/locale/ja.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "なし (ゲームパッドを無効にする)", "gamepad_driver_select": "ドライバを選択してください...", "gamepad_driver_vigembus": "ViGEmBus", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "バーチャルHIDドライバ", "gamepad_ds4": "DS4 (PS4)", "gamepad_ds4_manual": "DS4選択オプション", diff --git a/src_assets/common/assets/web/public/assets/locale/ko.json b/src_assets/common/assets/web/public/assets/locale/ko.json index d4caa66f3f9..d461e0e17fd 100644 --- a/src_assets/common/assets/web/public/assets/locale/ko.json +++ b/src_assets/common/assets/web/public/assets/locale/ko.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "없음 (게임패드 비활성화)", "gamepad_driver_select": "드라이버를 선택하세요...", "gamepad_driver_vigembus": "ViGEmBus", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "가상 HID 드라이버", "gamepad_ds4": "DS4 (PS4)", "gamepad_ds4_manual": "DS4 선택 옵션", diff --git a/src_assets/common/assets/web/public/assets/locale/pl.json b/src_assets/common/assets/web/public/assets/locale/pl.json index 0279c7c3c48..52d4a1aca34 100644 --- a/src_assets/common/assets/web/public/assets/locale/pl.json +++ b/src_assets/common/assets/web/public/assets/locale/pl.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "Brak (wyłącz gamepad)", "gamepad_driver_select": "Wybierz kierowcę...", "gamepad_driver_vigembus": "ViGEmBus", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "Wirtualny sterownik HID", "gamepad_ds4": "DS4 (PS4)", "gamepad_ds4_manual": "Opcje wyboru DS4", diff --git a/src_assets/common/assets/web/public/assets/locale/pt.json b/src_assets/common/assets/web/public/assets/locale/pt.json index b0d8092c1df..bb61c631ed1 100644 --- a/src_assets/common/assets/web/public/assets/locale/pt.json +++ b/src_assets/common/assets/web/public/assets/locale/pt.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "Nenhum (desativar jogos)", "gamepad_driver_select": "Escolha um driver...", "gamepad_driver_vigembus": "ViGEmbrus", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "Driver HID Virtual", "gamepad_ds4": "DS4 (PS4)", "gamepad_ds4_manual": "Opções de seleção DS4", diff --git a/src_assets/common/assets/web/public/assets/locale/pt_BR.json b/src_assets/common/assets/web/public/assets/locale/pt_BR.json index 3143ad29686..468515e1551 100644 --- a/src_assets/common/assets/web/public/assets/locale/pt_BR.json +++ b/src_assets/common/assets/web/public/assets/locale/pt_BR.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "Nenhum (desativar jogos)", "gamepad_driver_select": "Escolha um driver...", "gamepad_driver_vigembus": "ViGEmbrus", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "Driver HID Virtual", "gamepad_ds4": "DS4 (PS4)", "gamepad_ds4_manual": "Opções de seleção DS4", diff --git a/src_assets/common/assets/web/public/assets/locale/ru.json b/src_assets/common/assets/web/public/assets/locale/ru.json index cdd753454dc..28ae9b8bcef 100644 --- a/src_assets/common/assets/web/public/assets/locale/ru.json +++ b/src_assets/common/assets/web/public/assets/locale/ru.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "Нет (отключить геймпад)", "gamepad_driver_select": "Выберите драйвер...", "gamepad_driver_vigembus": "ViGEmBus", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "Виртуальный HID драйвер", "gamepad_ds4": "DS4 (PS4)", "gamepad_ds4_manual": "Параметры выбора DS4", diff --git a/src_assets/common/assets/web/public/assets/locale/sv.json b/src_assets/common/assets/web/public/assets/locale/sv.json index 43340743dda..9b09caedca4 100644 --- a/src_assets/common/assets/web/public/assets/locale/sv.json +++ b/src_assets/common/assets/web/public/assets/locale/sv.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "Ingen (inaktivera gamepads)", "gamepad_driver_select": "Välj en drivrutin...", "gamepad_driver_vigembus": "ViGEmBus", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "Virtuell HID drivrutin", "gamepad_ds4": "DS4 (PS4)", "gamepad_ds4_manual": "DS4 val alternativ", diff --git a/src_assets/common/assets/web/public/assets/locale/tr.json b/src_assets/common/assets/web/public/assets/locale/tr.json index 6285ccfb97a..fdfe77c00ab 100644 --- a/src_assets/common/assets/web/public/assets/locale/tr.json +++ b/src_assets/common/assets/web/public/assets/locale/tr.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "Yok (oyun kumandalarını devre dışı bırak)", "gamepad_driver_select": "Bir sürücü seçin...", "gamepad_driver_vigembus": "ViGEmBus", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "Sanal HID Sürücüsü", "gamepad_ds4": "DS4 (PS4)", "gamepad_ds4_manual": "DS4 seçim seçenekleri", diff --git a/src_assets/common/assets/web/public/assets/locale/uk.json b/src_assets/common/assets/web/public/assets/locale/uk.json index 2008ba12915..18e83bacb51 100644 --- a/src_assets/common/assets/web/public/assets/locale/uk.json +++ b/src_assets/common/assets/web/public/assets/locale/uk.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "Нічого (вимкнути геймпеди)", "gamepad_driver_select": "Виберіть драйвер...", "gamepad_driver_vigembus": "Вігембус", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "Віртуальний HID драйвер", "gamepad_ds4": "DS4 (PS4)", "gamepad_ds4_manual": "Опції DS4", diff --git a/src_assets/common/assets/web/public/assets/locale/vi.json b/src_assets/common/assets/web/public/assets/locale/vi.json index 54f784a9bee..1c90875319e 100644 --- a/src_assets/common/assets/web/public/assets/locale/vi.json +++ b/src_assets/common/assets/web/public/assets/locale/vi.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "Không có (tắt bộ điều khiển trò chơi)", "gamepad_driver_select": "Chọn một trình điều khiển...", "gamepad_driver_vigembus": "ViGEmBus", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "Trình điều khiển HID ảo", "gamepad_ds4": "DS4 (PlayStation 4)", "gamepad_ds4_manual": "Các tùy chọn lựa chọn cho DS4", diff --git a/src_assets/common/assets/web/public/assets/locale/zh.json b/src_assets/common/assets/web/public/assets/locale/zh.json index f5925acc425..7d029392e2a 100644 --- a/src_assets/common/assets/web/public/assets/locale/zh.json +++ b/src_assets/common/assets/web/public/assets/locale/zh.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "无(禁用游戏手柄)", "gamepad_driver_select": "选择一个驱动程序...", "gamepad_driver_vigembus": "ViGEmBus", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "Virtual HID Driver", "gamepad_ds4": "DS4 (PS4)", "gamepad_ds4_manual": "DS4选择选项", diff --git a/src_assets/common/assets/web/public/assets/locale/zh_TW.json b/src_assets/common/assets/web/public/assets/locale/zh_TW.json index 00d65f8033f..1ca773370d0 100644 --- a/src_assets/common/assets/web/public/assets/locale/zh_TW.json +++ b/src_assets/common/assets/web/public/assets/locale/zh_TW.json @@ -270,6 +270,7 @@ "gamepad_driver_none": "無(停用遊戲手把)", "gamepad_driver_select": "選擇一個驅動程式...", "gamepad_driver_vigembus": "ViGEmBus", + "gamepad_driver_osmspad": "OsmsPad (OpenStreamMS)", "gamepad_driver_virtualhid": "虛擬 HID 驅動程式", "gamepad_ds4": "DS4 (PS4)", "gamepad_ds4_manual": "DS4 選擇選項", diff --git a/tests/unit/platform/test_virtualhid_input.cpp b/tests/unit/platform/test_virtualhid_input.cpp index d143a7e926e..03c307089f8 100644 --- a/tests/unit/platform/test_virtualhid_input.cpp +++ b/tests/unit/platform/test_virtualhid_input.cpp @@ -241,6 +241,7 @@ TEST_F(VirtualHidDeviceTest, SelectsVirtualHidGamepadRuntimeByBackendLicenseAndP EXPECT_TRUE(platf::virtualhid::should_use_gamepad_runtime(capabilities, config::GAMEPAD_DRIVER_ALL, true)); EXPECT_TRUE(platf::virtualhid::should_use_gamepad_runtime(capabilities, config::GAMEPAD_DRIVER_VIRTUALHID, true)); EXPECT_FALSE(platf::virtualhid::should_use_gamepad_runtime(capabilities, config::GAMEPAD_DRIVER_VIGEMBUS, true)); + EXPECT_FALSE(platf::virtualhid::should_use_gamepad_runtime(capabilities, config::GAMEPAD_DRIVER_OSMSPAD, true)); EXPECT_FALSE(platf::virtualhid::should_use_gamepad_runtime(capabilities, config::GAMEPAD_DRIVER_NONE, true)); capabilities.supports_gamepad = false;