From b1f4a0ffa45850e2892c7e352fd9b0df73cae85e Mon Sep 17 00:00:00 2001 From: mlopezsegura <90263997+mlopezsegura@users.noreply.github.com> Date: Sat, 14 Nov 2026 14:03:54 +0100 Subject: [PATCH 1/3] OsmsPad: own virtual gamepad driver on VHF A UMDF filter above Windows' Virtual HID Framework that creates Xbox Series controllers on demand through a private IOCTL interface. Windows attaches its inbox xinputhid filter, so games see them through XInput, GameInput and DirectInput, without ViGEmBus. Each controller belongs to the handle that created it and goes away when that handle closes, and its instance ID carries the Windows session it was created for (OSMS_S_P), so the service can isolate it without guessing. Rumble comes back to the client. Signed like RemoteIdd with a one-use test certificate; being user-mode only, it loads without test signing. Includes OsmsPadSetup (root device), package, install and uninstall scripts, a unit test of the report encoding and an end-to-end test that checks the controller through XInput. Adapted from ideas in libvirtualgamepad (MIT, see THIRD_PARTY_NOTICES.md). Co-Authored-By: Claude Opus 5.5 --- .gitignore | 2 + Native/OsmsPad/Driver.cpp | 465 +++++++++++++++++++++++++ Native/OsmsPad/OsmsPad.inf | 122 +++++++ Native/OsmsPad/OsmsPadIoctl.h | 105 ++++++ Native/OsmsPad/XboxSeries.cpp | 240 +++++++++++++ Native/OsmsPad/XboxSeries.h | 58 +++ Native/OsmsPad/build.cmd | 67 ++++ Native/OsmsPad/install.ps1 | 29 ++ Native/OsmsPad/package.ps1 | 50 +++ Native/OsmsPad/setup/OsmsPadSetup.cpp | 111 ++++++ Native/OsmsPad/test/OsmsPadTest.cpp | 147 ++++++++ Native/OsmsPad/test/XboxSeriesTest.cpp | 60 ++++ Native/OsmsPad/uninstall.ps1 | 24 ++ THIRD_PARTY_NOTICES.md | 28 ++ 14 files changed, 1508 insertions(+) create mode 100644 Native/OsmsPad/Driver.cpp create mode 100644 Native/OsmsPad/OsmsPad.inf create mode 100644 Native/OsmsPad/OsmsPadIoctl.h create mode 100644 Native/OsmsPad/XboxSeries.cpp create mode 100644 Native/OsmsPad/XboxSeries.h create mode 100644 Native/OsmsPad/build.cmd create mode 100644 Native/OsmsPad/install.ps1 create mode 100644 Native/OsmsPad/package.ps1 create mode 100644 Native/OsmsPad/setup/OsmsPadSetup.cpp create mode 100644 Native/OsmsPad/test/OsmsPadTest.cpp create mode 100644 Native/OsmsPad/test/XboxSeriesTest.cpp create mode 100644 Native/OsmsPad/uninstall.ps1 diff --git a/.gitignore b/.gitignore index f98ccb9..6da3b03 100644 --- a/.gitignore +++ b/.gitignore @@ -375,3 +375,5 @@ Core/Installer/publish/ # Runtime de Sunshine: credenciales, logs y estado de cada instancia Sunshine/config/ Sunshine/*.bak-* + +Native/OsmsPad/pkg/ diff --git a/Native/OsmsPad/Driver.cpp b/Native/OsmsPad/Driver.cpp new file mode 100644 index 0000000..f834fde --- /dev/null +++ b/Native/OsmsPad/Driver.cpp @@ -0,0 +1,465 @@ +// Driver.cpp — OsmsPad: mandos virtuales de OpenStreamMS con VHF (Virtual HID Framework). +// +// Un único dispositivo raíz (ROOT\OSMSPAD). Este driver UMDF es un filtro encima de la +// función de VHF (vhf.sys, de Windows) y expone una interfaz privada (OsmsPadIoctl.h): cada +// IOCTL_OSMSPAD_CREATE crea un hijo HID con VhfCreate, que Windows enumera como un mando más. +// No hay driver de kernel propio, y por eso basta firmarlo como RemoteIdd (certificado de un +// solo uso en Root y TrustedPublisher), sin testsigning. +// +// Ideas tomadas de libvirtualgamepad (Copyright (c) 2026 Chase Payne, MIT), adaptadas: +// - filtro sobre VHF con un destino de E/S local abierto al arrancar (PrepareHardware); +// - cada mando es de quien lo creó: cerrar el handle borra sus mandos, así un Sunshine que +// se cae no deja mandos huérfanos; +// - el ID de hardware HID\VID_045E&PID_0B12&IG_00 hace que Windows le ponga xinputhid. +// Propio de OpenStreamMS: la sesión de Windows del mando va en su ID de instancia +// (OSMS_S_P), para que el servicio lo aísle en esa sesión sin adivinar nada. +// +// Concurrencia, sin más estados que los imprescindibles: +// - opLock (wait lock) ordena crear, alimentar, borrar, cerrar handles y apagar; +// - fbLock (spin lock) protege solo la vibración: los callbacks de VHF toman fbLock y nunca +// opLock, así VhfDelete(Wait=TRUE) bajo opLock no se puede bloquear contra ellos. +#include +#include +#include +#include +#include +#include + +#include "OsmsPadIoctl.h" +#include "XboxSeries.h" + +namespace { + +struct Device; + +struct Pad { + Device* Parent; + UINT32 Index; + bool Used; + VHFHANDLE Vhf; + WDFFILEOBJECT Owner; + UINT32 Session; + wchar_t InstanceId[48]; + // Bajo fbLock: + OsmsPadFeedback Feedback; + bool FeedbackPending; +}; + +struct Device { + WDFDEVICE Handle; + WDFWAITLOCK OpLock; + WDFSPINLOCK FbLock; + WDFQUEUE FeedbackQueue; + WDFIOTARGET VhfTarget; + HANDLE VhfFile; + bool Started; + Pad Pads[OSMSPAD_MAX_PADS]; +}; +WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(Device, GetDevice) + +// Base del ContainerID de cada mando: los dos últimos bytes son la sesión y el número, para que +// Windows no agrupe varios mandos como si fueran un solo aparato. +constexpr GUID kContainerBase = { 0x3f6d2a91, 0x5c4e, 0x4b8a, { 0x9e, 0x17, 0x62, 0xd0, 0xa4, 0x3b, 0x00, 0x00 } }; + +void Log(const wchar_t* format, ...) +{ + wchar_t text[256]; + va_list args; + va_start(args, format); + _vsnwprintf_s(text, _TRUNCATE, format, args); + va_end(args); + OutputDebugStringW(text); +} + +// ── VHF ────────────────────────────────────────────────────────────────────── + +NTSTATUS EnsureVhfTarget(Device* dev) +{ + if (dev->VhfFile) return STATUS_SUCCESS; + if (!dev->Started || !dev->VhfTarget) return STATUS_DEVICE_NOT_READY; + // Abrir por fichero sin nombre: el destino es la parte de modo kernel de esta misma pila, + // es decir vhf.sys. VHF en UMDF exige ese handle en VHF_CONFIG.FileHandle. + WDF_IO_TARGET_OPEN_PARAMS params; + WDF_IO_TARGET_OPEN_PARAMS_INIT_OPEN_BY_FILE(¶ms, nullptr); + NTSTATUS st = WdfIoTargetOpen(dev->VhfTarget, ¶ms); + if (!NT_SUCCESS(st)) return st; + dev->VhfFile = WdfIoTargetWdmGetTargetFileHandle(dev->VhfTarget); + if (!dev->VhfFile) + { + WdfIoTargetClose(dev->VhfTarget); + return STATUS_DEVICE_NOT_READY; + } + return STATUS_SUCCESS; +} + +// El juego pide vibración: informe de salida 3. Se guarda y, si el dueño tiene una petición +// IOCTL_OSMSPAD_FEEDBACK esperando, se completa con ella. +VOID EvtVhfWriteReport(PVOID ctx, VHFOPERATIONHANDLE op, PVOID, PHID_XFER_PACKET packet) +{ + auto* pad = static_cast(ctx); + Device* dev = pad->Parent; + OsmsPadFeedback fb{}; + NTSTATUS st = STATUS_INVALID_PARAMETER; + if (packet && osmspad::DecodeXboxRumble(packet->reportBuffer, packet->reportBufferLen, &fb)) + { + fb.Pad = pad->Index; + st = STATUS_SUCCESS; + WDFREQUEST request = nullptr; + WdfSpinLockAcquire(dev->FbLock); + pad->Feedback = fb; + pad->FeedbackPending = true; + if (pad->Owner && + NT_SUCCESS(WdfIoQueueRetrieveRequestByFileObject(dev->FeedbackQueue, pad->Owner, &request))) + pad->FeedbackPending = false; + WdfSpinLockRelease(dev->FbLock); + if (request) + { + void* out = nullptr; + NTSTATUS rs = WdfRequestRetrieveOutputBuffer(request, sizeof(OsmsPadFeedback), &out, nullptr); + if (NT_SUCCESS(rs)) memcpy(out, &fb, sizeof fb); + WdfRequestCompleteWithInformation(request, rs, NT_SUCCESS(rs) ? sizeof fb : 0); + } + } + VhfAsyncOperationComplete(op, st); +} + +// Borra el hijo HID. Con opLock tomado; VhfDelete(TRUE) espera a los callbacks en curso. +void DestroyPad(Pad& pad) +{ + if (!pad.Used) return; + if (pad.Vhf) VhfDelete(pad.Vhf, TRUE); + Device* dev = pad.Parent; + WdfSpinLockAcquire(dev->FbLock); + pad.Vhf = nullptr; + pad.Owner = nullptr; + pad.FeedbackPending = false; + WdfSpinLockRelease(dev->FbLock); + pad.Used = false; + Log(L"OsmsPad: mando %u (%s) borrado\n", pad.Index, pad.InstanceId); +} + +void DestroyAll(Device* dev, WDFFILEOBJECT owner) +{ + for (auto& pad : dev->Pads) + if (pad.Used && (!owner || pad.Owner == owner)) DestroyPad(pad); +} + +// ── Sesión de quien llama ──────────────────────────────────────────────────── + +struct SessionQuery { DWORD Session; bool Ok; }; + +VOID EvtImpersonate(WDFREQUEST, PVOID ctx) +{ + auto* q = static_cast(ctx); + HANDLE token = nullptr; + if (OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, TRUE, &token)) + { + DWORD size = 0; + q->Ok = GetTokenInformation(token, TokenSessionId, &q->Session, sizeof q->Session, &size) != FALSE; + CloseHandle(token); + } +} + +// ── IOCTL ──────────────────────────────────────────────────────────────────── + +NTSTATUS CreatePad(Device* dev, WDFREQUEST request, WDFFILEOBJECT owner, size_t* info) +{ + OsmsPadCreateIn* in = nullptr; + OsmsPadCreateOut* out = nullptr; + NTSTATUS st = WdfRequestRetrieveInputBuffer(request, sizeof *in, reinterpret_cast(&in), nullptr); + if (!NT_SUCCESS(st)) return st; + if (in->Version != OSMSPAD_PROTOCOL_VERSION) return STATUS_REVISION_MISMATCH; + if (in->Profile != OSMSPAD_PROFILE_XBOX_SERIES) return STATUS_NOT_SUPPORTED; + const OsmsPadCreateIn req = *in; // METHOD_BUFFERED: la salida pisa la entrada + + UINT32 session = req.TargetSession; + if (session == OSMSPAD_SESSION_CALLER) + { + SessionQuery q{}; + st = WdfRequestImpersonate(request, SecurityImpersonation, EvtImpersonate, &q); + if (!NT_SUCCESS(st) || !q.Ok) return NT_SUCCESS(st) ? STATUS_ACCESS_DENIED : st; + session = q.Session; + } + + st = WdfRequestRetrieveOutputBuffer(request, sizeof *out, reinterpret_cast(&out), nullptr); + if (!NT_SUCCESS(st)) return st; + + st = EnsureVhfTarget(dev); + if (!NT_SUCCESS(st)) return st; + + Pad* pad = nullptr; + for (auto& p : dev->Pads) + if (!p.Used) { pad = &p; break; } + if (!pad) return STATUS_INSUFFICIENT_RESOURCES; + + swprintf_s(pad->InstanceId, L"OSMS_S%u_P%u", session, pad->Index); + size_t descriptorSize = 0, idsBytes = 0; + const UINT8* descriptor = osmspad::XboxSeriesDescriptor(&descriptorSize); + const wchar_t* ids = osmspad::XboxSeriesHardwareIds(&idsBytes); + + VHF_CONFIG cfg; + VHF_CONFIG_INIT(&cfg, dev->VhfFile, static_cast(descriptorSize), const_cast(descriptor)); + cfg.VhfClientContext = pad; + cfg.EvtVhfAsyncOperationWriteReport = EvtVhfWriteReport; + cfg.VendorID = osmspad::kXboxVendorId; + cfg.ProductID = osmspad::kXboxSeriesProductId; + cfg.VersionNumber = osmspad::kXboxSeriesVersion; + cfg.ContainerID = kContainerBase; + cfg.ContainerID.Data4[6] = static_cast(session); + cfg.ContainerID.Data4[7] = static_cast(pad->Index); + cfg.InstanceID = pad->InstanceId; + cfg.InstanceIDLength = static_cast((wcslen(pad->InstanceId) + 1) * sizeof(wchar_t)); + cfg.HardwareIDs = const_cast(ids); + cfg.HardwareIDsLength = static_cast(idsBytes); + + // Todo listo antes de VhfStart: VHF puede llamar a EvtVhfWriteReport antes de que vuelva. + WdfSpinLockAcquire(dev->FbLock); + pad->Owner = owner; + pad->FeedbackPending = false; + WdfSpinLockRelease(dev->FbLock); + pad->Session = session; + pad->Used = true; + + VHFHANDLE vhf = nullptr; + st = VhfCreate(&cfg, &vhf); + if (NT_SUCCESS(st)) + { + pad->Vhf = vhf; + st = VhfStart(vhf); + } + if (!NT_SUCCESS(st)) + { + Log(L"OsmsPad: no se pudo crear el mando %s (0x%08X)\n", pad->InstanceId, st); + DestroyPad(*pad); + return st; + } + + // Estado inicial (todo suelto, sticks al centro): sin él, XInput tarda en ver el mando. + OsmsPadInput idle{}; + idle.Pad = pad->Index; + osmspad::XboxInputReport report = osmspad::EncodeXboxInput(idle); + HID_XFER_PACKET packet{ reinterpret_cast(&report), sizeof report, osmspad::kXboxInputReportId }; + (void)VhfReadReportSubmit(pad->Vhf, &packet); + + memset(out, 0, sizeof *out); + out->Pad = pad->Index; + out->Session = session; + wcscpy_s(out->InstanceId, pad->InstanceId); + *info = sizeof *out; + Log(L"OsmsPad: mando %u creado (%s)\n", pad->Index, pad->InstanceId); + return STATUS_SUCCESS; +} + +Pad* OwnedPad(Device* dev, UINT32 index, WDFFILEOBJECT owner) +{ + if (index >= OSMSPAD_MAX_PADS) return nullptr; + Pad& pad = dev->Pads[index]; + return pad.Used && pad.Owner == owner ? &pad : nullptr; +} + +NTSTATUS SubmitInput(Device* dev, WDFREQUEST request, WDFFILEOBJECT owner) +{ + OsmsPadInput* in = nullptr; + NTSTATUS st = WdfRequestRetrieveInputBuffer(request, sizeof *in, reinterpret_cast(&in), nullptr); + if (!NT_SUCCESS(st)) return st; + Pad* pad = OwnedPad(dev, in->Pad, owner); + if (!pad || !pad->Vhf) return STATUS_INVALID_HANDLE; + osmspad::XboxInputReport report = osmspad::EncodeXboxInput(*in); + HID_XFER_PACKET packet{ reinterpret_cast(&report), sizeof report, osmspad::kXboxInputReportId }; + // Sin EvtVhfReadyForNextReadReport, VHF copia el informe y lo encola. Si su cola está llena + // (nadie lee el mando) se pierde, y da igual: el siguiente lleva el estado completo. + (void)VhfReadReportSubmit(pad->Vhf, &packet); + return STATUS_SUCCESS; +} + +NTSTATUS DestroyOne(Device* dev, WDFREQUEST request, WDFFILEOBJECT owner) +{ + OsmsPadDestroyIn* in = nullptr; + NTSTATUS st = WdfRequestRetrieveInputBuffer(request, sizeof *in, reinterpret_cast(&in), nullptr); + if (!NT_SUCCESS(st)) return st; + Pad* pad = OwnedPad(dev, in->Pad, owner); + if (!pad) return STATUS_INVALID_HANDLE; + DestroyPad(*pad); + return STATUS_SUCCESS; +} + +// Vibración: si ya hay una pendiente para alguno de sus mandos sale enseguida; si no, la +// petición espera en FeedbackQueue (el cliente la manda overlapped y la repone al volver). +// Devuelve true si la petición se completó aquí o se quedó en la cola. +bool QueueFeedback(Device* dev, WDFREQUEST request, WDFFILEOBJECT owner) +{ + void* out = nullptr; + NTSTATUS st = WdfRequestRetrieveOutputBuffer(request, sizeof(OsmsPadFeedback), &out, nullptr); + if (!NT_SUCCESS(st)) + { + WdfRequestComplete(request, st); + return true; + } + OsmsPadFeedback fb{}; + bool ready = false; + WdfSpinLockAcquire(dev->FbLock); + for (auto& pad : dev->Pads) + if (pad.Used && pad.Owner == owner && pad.FeedbackPending) + { + fb = pad.Feedback; + pad.FeedbackPending = false; + ready = true; + break; + } + if (!ready) st = WdfRequestForwardToIoQueue(request, dev->FeedbackQueue); + WdfSpinLockRelease(dev->FbLock); + if (ready) + { + memcpy(out, &fb, sizeof fb); + WdfRequestCompleteWithInformation(request, STATUS_SUCCESS, sizeof fb); + } + else if (!NT_SUCCESS(st)) + WdfRequestComplete(request, st); + return true; +} + +VOID EvtIoDeviceControl(WDFQUEUE queue, WDFREQUEST request, size_t, size_t, ULONG code) +{ + Device* dev = GetDevice(WdfIoQueueGetDevice(queue)); + WDFFILEOBJECT owner = WdfRequestGetFileObject(request); + if (!owner) + { + WdfRequestComplete(request, STATUS_INVALID_HANDLE); + return; + } + if (code == IOCTL_OSMSPAD_FEEDBACK) + { + QueueFeedback(dev, request, owner); + return; + } + + NTSTATUS st = STATUS_INVALID_DEVICE_REQUEST; + size_t info = 0; + WdfWaitLockAcquire(dev->OpLock, nullptr); + switch (code) + { + case IOCTL_OSMSPAD_CREATE: st = CreatePad(dev, request, owner, &info); break; + case IOCTL_OSMSPAD_INPUT: st = SubmitInput(dev, request, owner); break; + case IOCTL_OSMSPAD_DESTROY: st = DestroyOne(dev, request, owner); break; + default: break; + } + WdfWaitLockRelease(dev->OpLock); + WdfRequestCompleteWithInformation(request, st, info); +} + +// ── Ficheros, PnP y energía ───────────────────────────────────────────────── + +VOID EvtFileCreate(WDFDEVICE, WDFREQUEST request, WDFFILEOBJECT) +{ + WdfRequestComplete(request, STATUS_SUCCESS); +} + +// Cerrar el handle (o que el proceso muera) borra sus mandos. Las peticiones de vibración que +// esperaban en la cola manual las cancela WDF. +VOID EvtFileCleanup(WDFFILEOBJECT file) +{ + if (!file) return; + Device* dev = GetDevice(WdfFileObjectGetDevice(file)); + WdfWaitLockAcquire(dev->OpLock, nullptr); + DestroyAll(dev, file); + WdfWaitLockRelease(dev->OpLock); +} + +// El destino local solo se puede abrir con el dispositivo arrancado (en DeviceAdd daría +// STATUS_DEVICE_NOT_READY). Si falla aquí, se reintenta al crear el primer mando. +NTSTATUS EvtPrepareHardware(WDFDEVICE device, WDFCMRESLIST, WDFCMRESLIST) +{ + Device* dev = GetDevice(device); + WdfWaitLockAcquire(dev->OpLock, nullptr); + dev->Started = true; + (void)EnsureVhfTarget(dev); + WdfWaitLockRelease(dev->OpLock); + return STATUS_SUCCESS; +} + +NTSTATUS EvtReleaseHardware(WDFDEVICE device, WDFCMRESLIST) +{ + Device* dev = GetDevice(device); + WdfWaitLockAcquire(dev->OpLock, nullptr); + DestroyAll(dev, nullptr); + dev->Started = false; + if (dev->VhfFile) + { + WdfIoTargetClose(dev->VhfTarget); + dev->VhfFile = nullptr; + } + WdfWaitLockRelease(dev->OpLock); + return STATUS_SUCCESS; +} + +// Suspensión, hibernación, apagado o deshabilitar: fuera mandos. Sunshine los vuelve a crear +// cuando el cliente se reconecta. +NTSTATUS EvtD0Exit(WDFDEVICE device, WDF_POWER_DEVICE_STATE) +{ + Device* dev = GetDevice(device); + WdfWaitLockAcquire(dev->OpLock, nullptr); + DestroyAll(dev, nullptr); + WdfWaitLockRelease(dev->OpLock); + return STATUS_SUCCESS; +} + +NTSTATUS EvtDeviceAdd(WDFDRIVER, PWDFDEVICE_INIT init) +{ + // Filtro encima de vhf.sys: VHF sigue siendo el dueño de la energía de la pila. + WdfFdoInitSetFilter(init); + + WDF_FILEOBJECT_CONFIG fileConfig; + WDF_FILEOBJECT_CONFIG_INIT(&fileConfig, EvtFileCreate, WDF_NO_EVENT_CALLBACK, EvtFileCleanup); + fileConfig.AutoForwardCleanupClose = WdfFalse; // los handles son nuestros; VHF no los ve + WdfDeviceInitSetFileObjectConfig(init, &fileConfig, WDF_NO_OBJECT_ATTRIBUTES); + + WDF_PNPPOWER_EVENT_CALLBACKS pnp; + WDF_PNPPOWER_EVENT_CALLBACKS_INIT(&pnp); + pnp.EvtDevicePrepareHardware = EvtPrepareHardware; + pnp.EvtDeviceReleaseHardware = EvtReleaseHardware; + pnp.EvtDeviceD0Exit = EvtD0Exit; + WdfDeviceInitSetPnpPowerEventCallbacks(init, &pnp); + + WDF_OBJECT_ATTRIBUTES attrs; + WDF_OBJECT_ATTRIBUTES_INIT_CONTEXT_TYPE(&attrs, Device); + WDFDEVICE device = nullptr; + NTSTATUS st = WdfDeviceCreate(&init, &attrs, &device); + if (!NT_SUCCESS(st)) return st; + + Device* dev = GetDevice(device); + memset(dev, 0, sizeof *dev); + dev->Handle = device; + for (UINT32 i = 0; i < OSMSPAD_MAX_PADS; ++i) + { + dev->Pads[i].Parent = dev; + dev->Pads[i].Index = i; + } + + WDF_OBJECT_ATTRIBUTES child; + WDF_OBJECT_ATTRIBUTES_INIT(&child); + child.ParentObject = device; + if (!NT_SUCCESS(st = WdfWaitLockCreate(&child, &dev->OpLock))) return st; + if (!NT_SUCCESS(st = WdfSpinLockCreate(&child, &dev->FbLock))) return st; + if (!NT_SUCCESS(st = WdfIoTargetCreate(device, &child, &dev->VhfTarget))) return st; + if (!NT_SUCCESS(st = WdfDeviceCreateDeviceInterface(device, &GUID_DEVINTERFACE_OSMSPAD, nullptr))) return st; + + // Colas sin gestión de energía: por encima del dueño de la energía (vhf.sys) WDF lo exige. + WDF_IO_QUEUE_CONFIG queueConfig; + WDF_IO_QUEUE_CONFIG_INIT_DEFAULT_QUEUE(&queueConfig, WdfIoQueueDispatchParallel); + queueConfig.PowerManaged = WdfFalse; + queueConfig.EvtIoDeviceControl = EvtIoDeviceControl; + if (!NT_SUCCESS(st = WdfIoQueueCreate(device, &queueConfig, WDF_NO_OBJECT_ATTRIBUTES, nullptr))) return st; + + WDF_IO_QUEUE_CONFIG_INIT(&queueConfig, WdfIoQueueDispatchManual); + queueConfig.PowerManaged = WdfFalse; + return WdfIoQueueCreate(device, &queueConfig, WDF_NO_OBJECT_ATTRIBUTES, &dev->FeedbackQueue); +} + +} // namespace + +extern "C" NTSTATUS DriverEntry(PDRIVER_OBJECT driverObject, PUNICODE_STRING registryPath) +{ + WDF_DRIVER_CONFIG config; + WDF_DRIVER_CONFIG_INIT(&config, EvtDeviceAdd); + return WdfDriverCreate(driverObject, registryPath, WDF_NO_OBJECT_ATTRIBUTES, &config, WDF_NO_HANDLE); +} diff --git a/Native/OsmsPad/OsmsPad.inf b/Native/OsmsPad/OsmsPad.inf new file mode 100644 index 0000000..2bd4934 --- /dev/null +++ b/Native/OsmsPad/OsmsPad.inf @@ -0,0 +1,122 @@ +; OsmsPad.inf — mandos virtuales de OpenStreamMS (UMDF2 sobre VHF, el Virtual HID Framework de +; Windows). Un dispositivo raíz, ROOT\OSMSPAD: este driver va como filtro encima de vhf.sys y +; crea un hijo HID por mando (ver Driver.cpp). Sin driver de kernel propio. +; +; Basado en el INF de libvirtualgamepad (Copyright (c) 2026 Chase Payne, MIT). Windows 10 2004 +; como mínimo: es lo que tiene probado esa referencia con VHF desde UMDF. +; +; Se quita del todo con: devcon remove ROOT\OSMSPAD (o pnputil /remove-device) y +; pnputil /delete-driver oemNN.inf /uninstall + +[Version] +Signature = "$WINDOWS NT$" +Class = System +ClassGuid = {4d36e97d-e325-11ce-bfc1-08002be10318} +Provider = %ManufacturerName% +CatalogFile = OsmsPad.cat +DriverVer = 11/14/2026,0.1.0.0 ; stampinf la sobrescribe al compilar +PnpLockdown = 1 + +[Manufacturer] +%ManufacturerName% = Standard,NT$ARCH$.10.0...19041,NT$ARCH$.10.0...22000 + +[Standard.NT$ARCH$.10.0...19041] +%DeviceName% = OsmsPad_Win10, ROOT\OSMSPAD + +[Standard.NT$ARCH$.10.0...22000] +%DeviceName% = OsmsPad_Win11, ROOT\OSMSPAD + +[SourceDisksFiles] +OsmsPad.dll = 1 + +[SourceDisksNames] +1 = %DiskName% + +[DestinationDirs] +OsmsPad.CopyFiles = 13 ; Driver Store: nada se copia a System32 + +[OsmsPad.CopyFiles] +OsmsPad.dll + +; ---- Windows 10: WUDFRD.inf aún no trae las secciones de filtro, se añade a mano ---- + +[OsmsPad_Win10.NT] +Include = hidvhf.inf +Needs = vhfservice.NT +CopyFiles = OsmsPad.CopyFiles + +[OsmsPad_Win10.NT.HW] +Include = hidvhf.inf +Needs = vhfservice.NT.HW +AddReg = OsmsPad.Security + +[OsmsPad_Win10.NT.Services] +Include = hidvhf.inf +Needs = vhfservice.NT.Services +AddService = WUDFRd,0x000001f8,WUDFRd_ServiceInstall + +[OsmsPad_Win10.NT.Filters] +AddFilter = WUDFRd,,WUDFRd_UpperFilterPosition + +[OsmsPad_Win10.NT.Wdf] +UmdfService = OsmsPad,OsmsPad_Wdf +UmdfServiceOrder = OsmsPad +UmdfImpersonationLevel = Impersonation +UmdfKernelModeClientPolicy = AllowKernelModeClients +UmdfFileObjectPolicy = AllowNullAndUnknownFileObjects +UmdfFsContextUsePolicy = CannotUseFsContexts + +[WUDFRd_UpperFilterPosition] +FilterPosition = Upper + +[WUDFRd_ServiceInstall] +DisplayName = %WUDFRdServiceName% +ServiceType = 1 +StartType = 3 +ErrorControl = 1 +ServiceBinary = %12%\WUDFRd.sys + +; ---- Windows 11 ---- + +[OsmsPad_Win11.NT] +Include = WUDFRD.inf,hidvhf.inf +Needs = WUDFRD_UpperFilter.NT,vhfservice.NT +CopyFiles = OsmsPad.CopyFiles + +[OsmsPad_Win11.NT.HW] +Include = WUDFRD.inf,hidvhf.inf +Needs = WUDFRD_UpperFilter.NT.HW,vhfservice.NT.HW +AddReg = OsmsPad.Security + +[OsmsPad_Win11.NT.Services] +Include = WUDFRD.inf,hidvhf.inf +Needs = WUDFRD_UpperFilter.NT.Services,vhfservice.NT.Services + +[OsmsPad_Win11.NT.Filters] +Include = WUDFRD.inf +Needs = WUDFRD_UpperFilter.NT.Filters + +[OsmsPad_Win11.NT.Wdf] +UmdfService = OsmsPad,OsmsPad_Wdf +UmdfServiceOrder = OsmsPad +UmdfImpersonationLevel = Impersonation +UmdfKernelModeClientPolicy = AllowKernelModeClients +UmdfFileObjectPolicy = AllowNullAndUnknownFileObjects +UmdfFsContextUsePolicy = CannotUseFsContexts + +; ---- Común ---- + +; Solo SYSTEM (Sunshine lo lanza el servicio como SYSTEM en la sesión) y administradores pueden +; crear mandos. UD es el SID del host UMDF, que abre el destino local hacia VHF. +[OsmsPad.Security] +HKR,,Security,,"D:P(A;;GA;;;SY)(A;;GA;;;BA)(A;;GA;;;UD)" + +[OsmsPad_Wdf] +UmdfLibraryVersion = $UMDFVERSION$ +ServiceBinary = %13%\OsmsPad.dll + +[Strings] +ManufacturerName = "OpenStreamMS" +DeviceName = "OpenStreamMS Virtual Gamepad" +DiskName = "OpenStreamMS Virtual Gamepad Driver" +WUDFRdServiceName = "Windows Driver Foundation - User-mode Driver Framework Reflector" diff --git a/Native/OsmsPad/OsmsPadIoctl.h b/Native/OsmsPad/OsmsPadIoctl.h new file mode 100644 index 0000000..085bbd4 --- /dev/null +++ b/Native/OsmsPad/OsmsPadIoctl.h @@ -0,0 +1,105 @@ +// OsmsPadIoctl.h — contrato entre el driver OsmsPad y sus clientes (Sunshine, pruebas). +// +// 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/Native/OsmsPad/XboxSeries.cpp b/Native/OsmsPad/XboxSeries.cpp new file mode 100644 index 0000000..b69af2d --- /dev/null +++ b/Native/OsmsPad/XboxSeries.cpp @@ -0,0 +1,240 @@ +// XboxSeries.cpp — ver XboxSeries.h. El descriptor y la forma de los informes vienen del +// perfil Xbox Series de libvirtualgamepad (Copyright (c) 2026 Chase Payne, MIT). +#include "XboxSeries.h" + +#include + +namespace osmspad { +namespace { + +constexpr uint8_t kDescriptor[] = { + 0x05, 0x01, // Usage Page (Generic Desktop) + 0x09, 0x05, // Usage (Game Pad) + 0xA1, 0x01, // Collection (Application) + 0x85, 0x01, // Report ID (1) + 0x09, 0x01, // Usage (Pointer) + 0xA1, 0x00, // Collection (Physical) + 0x09, 0x30, // Usage (X) + 0x09, 0x31, // Usage (Y) + 0x15, 0x00, // Logical Minimum (0) + 0x27, 0xFF, 0xFF, 0x00, 0x00, // Logical Maximum (65535) + 0x95, 0x02, // Report Count (2) + 0x75, 0x10, // Report Size (16) + 0x81, 0x02, // Input (Data, Variable, Absolute) + 0xC0, // End Collection + 0x09, 0x01, // Usage (Pointer) + 0xA1, 0x00, // Collection (Physical) + 0x09, 0x32, // Usage (Z) + 0x09, 0x35, // Usage (Rz) + 0x15, 0x00, // Logical Minimum (0) + 0x27, 0xFF, 0xFF, 0x00, 0x00, // Logical Maximum (65535) + 0x95, 0x02, // Report Count (2) + 0x75, 0x10, // Report Size (16) + 0x81, 0x02, // Input (Data, Variable, Absolute) + 0xC0, // End Collection + 0x05, 0x02, // Usage Page (Simulation Controls) + 0x09, 0xC5, // Usage (Brake) + 0x15, 0x00, // Logical Minimum (0) + 0x26, 0xFF, 0x03, // Logical Maximum (1023) + 0x95, 0x01, // Report Count (1) + 0x75, 0x0A, // Report Size (10) + 0x81, 0x02, // Input (Data, Variable, Absolute) + 0x15, 0x00, // Logical Minimum (0) + 0x25, 0x00, // Logical Maximum (0) + 0x75, 0x06, // Report Size (6) + 0x95, 0x01, // Report Count (1) + 0x81, 0x03, // Input (Constant, Variable, Absolute) + 0x05, 0x02, // Usage Page (Simulation Controls) + 0x09, 0xC4, // Usage (Accelerator) + 0x15, 0x00, // Logical Minimum (0) + 0x26, 0xFF, 0x03, // Logical Maximum (1023) + 0x95, 0x01, // Report Count (1) + 0x75, 0x0A, // Report Size (10) + 0x81, 0x02, // Input (Data, Variable, Absolute) + 0x15, 0x00, // Logical Minimum (0) + 0x25, 0x00, // Logical Maximum (0) + 0x75, 0x06, // Report Size (6) + 0x95, 0x01, // Report Count (1) + 0x81, 0x03, // Input (Constant, Variable, Absolute) + 0x05, 0x01, // Usage Page (Generic Desktop) + 0x09, 0x39, // Usage (Hat switch) + 0x15, 0x01, // Logical Minimum (1) + 0x25, 0x08, // Logical Maximum (8) + 0x35, 0x00, // Physical Minimum (0) + 0x46, 0x3B, 0x01, // Physical Maximum (315) + 0x66, 0x14, 0x00, // Unit (English Rotation: Degrees) + 0x75, 0x04, // Report Size (4) + 0x95, 0x01, // Report Count (1) + 0x81, 0x42, // Input (Data, Variable, Absolute, Null state) + 0x75, 0x04, // Report Size (4) + 0x95, 0x01, // Report Count (1) + 0x15, 0x00, // Logical Minimum (0) + 0x25, 0x00, // Logical Maximum (0) + 0x35, 0x00, // Physical Minimum (0) + 0x45, 0x00, // Physical Maximum (0) + 0x65, 0x00, // Unit (None) + 0x81, 0x03, // Input (Constant, Variable, Absolute) + 0x05, 0x09, // Usage Page (Button) + 0x19, 0x01, // Usage Minimum (1) + 0x29, 0x0F, // Usage Maximum (15) + 0x15, 0x00, // Logical Minimum (0) + 0x25, 0x01, // Logical Maximum (1) + 0x75, 0x01, // Report Size (1) + 0x95, 0x0F, // Report Count (15) + 0x81, 0x02, // Input (Data, Variable, Absolute) + 0x15, 0x00, // Logical Minimum (0) + 0x25, 0x00, // Logical Maximum (0) + 0x75, 0x01, // Report Size (1) + 0x95, 0x01, // Report Count (1) + 0x81, 0x03, // Input (Constant, Variable, Absolute) + 0x05, 0x0C, // Usage Page (Consumer) + 0x0A, 0xB2, 0x00, // Usage (Record) + 0x15, 0x00, // Logical Minimum (0) + 0x25, 0x01, // Logical Maximum (1) + 0x95, 0x01, // Report Count (1) + 0x75, 0x01, // Report Size (1) + 0x81, 0x02, // Input (Data, Variable, Absolute) + 0x15, 0x00, // Logical Minimum (0) + 0x25, 0x00, // Logical Maximum (0) + 0x75, 0x07, // Report Size (7) + 0x95, 0x01, // Report Count (1) + 0x81, 0x03, // Input (Constant, Variable, Absolute) + // Vibración: Physical Interface Device, máscara de actuadores y cuatro magnitudes. + 0x05, 0x0F, // Usage Page (Physical Interface Device) + 0x09, 0x21, // Usage (Set Effect Report) + 0x85, 0x03, // Report ID (3) + 0xA1, 0x02, // Collection (Logical) + 0x09, 0x97, // Usage (DC Enable Actuators) + 0x15, 0x00, // Logical Minimum (0) + 0x25, 0x01, // Logical Maximum (1) + 0x75, 0x04, // Report Size (4) + 0x95, 0x01, // Report Count (1) + 0x91, 0x02, // Output (Data, Variable, Absolute) + 0x15, 0x00, // Logical Minimum (0) + 0x25, 0x00, // Logical Maximum (0) + 0x75, 0x04, // Report Size (4) + 0x95, 0x01, // Report Count (1) + 0x91, 0x03, // Output (Constant, Variable, Absolute) + 0x09, 0x70, // Usage (Magnitude) + 0x15, 0x00, // Logical Minimum (0) + 0x25, 0x64, // Logical Maximum (100) + 0x75, 0x08, // Report Size (8) + 0x95, 0x04, // Report Count (4) + 0x91, 0x02, // Output (Data, Variable, Absolute) + 0x09, 0x50, // Usage (Duration) + 0x66, 0x01, 0x10, // Unit (SI Linear: Seconds) + 0x55, 0x0E, // Unit Exponent (-2) + 0x15, 0x00, // Logical Minimum (0) + 0x26, 0xFF, 0x00, // Logical Maximum (255) + 0x75, 0x08, // Report Size (8) + 0x95, 0x01, // Report Count (1) + 0x91, 0x02, // Output (Data, Variable, Absolute) + 0x09, 0xA7, // Usage (Start Delay) + 0x15, 0x00, // Logical Minimum (0) + 0x26, 0xFF, 0x00, // Logical Maximum (255) + 0x75, 0x08, // Report Size (8) + 0x95, 0x01, // Report Count (1) + 0x91, 0x02, // Output (Data, Variable, Absolute) + 0x65, 0x00, // Unit (None) + 0x55, 0x00, // Unit Exponent (0) + 0x09, 0x7C, // Usage (Loop Count) + 0x15, 0x00, // Logical Minimum (0) + 0x26, 0xFF, 0x00, // Logical Maximum (255) + 0x75, 0x08, // Report Size (8) + 0x95, 0x01, // Report Count (1) + 0x91, 0x02, // Output (Data, Variable, Absolute) + 0xC0, // End Collection + 0xC0, // End Collection +}; + +// Primero el ID concreto del Series; detrás, el ID genérico de software GIP que también +// casa con xinputhid.inf, por si Microsoft retira el primero. +constexpr wchar_t kHardwareIds[] = + L"HID\\VID_045E&PID_0B12&IG_00\0" + L"HID\\VID_045E&PID_02FF&IG_00\0" + L"\0"; + +// Bits del campo de botones del mando real (botones HID 1..15, con huecos en 3, 6, 9 y 10). +enum : uint16_t { + kA = 1u << 0, kB = 1u << 1, kX = 1u << 3, kY = 1u << 4, + kLB = 1u << 6, kRB = 1u << 7, kView = 1u << 10, kMenu = 1u << 11, + kGuide = 1u << 12, kLS = 1u << 13, kRS = 1u << 14, +}; + +uint8_t EncodeHat(uint16_t b) noexcept { + const bool up = b & OSMSPAD_DPAD_UP, down = b & OSMSPAD_DPAD_DOWN; + const bool left = b & OSMSPAD_DPAD_LEFT, right = b & OSMSPAD_DPAD_RIGHT; + if ((up && down) || (left && right)) return 0; + if (up) return right ? 2 : (left ? 8 : 1); + if (down) return right ? 4 : (left ? 6 : 5); + return right ? 3 : (left ? 7 : 0); +} + +uint16_t MapButtons(uint16_t b) noexcept { + uint16_t m = 0; + if (b & OSMSPAD_A) m |= kA; + if (b & OSMSPAD_B) m |= kB; + if (b & OSMSPAD_X) m |= kX; + if (b & OSMSPAD_Y) m |= kY; + if (b & OSMSPAD_LEFT_SHOULDER) m |= kLB; + if (b & OSMSPAD_RIGHT_SHOULDER) m |= kRB; + if (b & OSMSPAD_BACK) m |= kView; + if (b & OSMSPAD_START) m |= kMenu; + if (b & OSMSPAD_GUIDE) m |= kGuide; + if (b & OSMSPAD_LEFT_THUMB) m |= kLS; + if (b & OSMSPAD_RIGHT_THUMB) m |= kRS; + return m; +} + +// XInput: con signo y positivo hacia arriba. El mando: sin signo y, en vertical, hacia abajo. +uint16_t Horizontal(int16_t v) noexcept { return static_cast(static_cast(v) + 32768); } +uint16_t Vertical(int16_t v) noexcept { return static_cast(32767 - static_cast(v)); } +uint16_t Trigger(uint8_t v) noexcept { return static_cast((v * uint32_t{kXboxTriggerMax}) / 255u); } + +uint16_t FromPercent(uint8_t v) noexcept { + const uint32_t c = v > kXboxRumbleMax ? kXboxRumbleMax : v; + return static_cast((c * 65535u) / kXboxRumbleMax); +} + +} // namespace + +const uint8_t* XboxSeriesDescriptor(size_t* size) noexcept { + if (size) *size = sizeof(kDescriptor); + return kDescriptor; +} + +const wchar_t* XboxSeriesHardwareIds(size_t* bytes) noexcept { + if (bytes) *bytes = sizeof(kHardwareIds); + return kHardwareIds; +} + +XboxInputReport EncodeXboxInput(const OsmsPadInput& in) noexcept { + XboxInputReport r{}; + r.ReportId = kXboxInputReportId; + r.LeftX = Horizontal(in.ThumbLX); + r.LeftY = Vertical(in.ThumbLY); + r.RightX = Horizontal(in.ThumbRX); + r.RightY = Vertical(in.ThumbRY); + r.LeftTrigger = Trigger(in.LeftTrigger); + r.RightTrigger = Trigger(in.RightTrigger); + r.Hat = EncodeHat(in.Buttons); + r.Buttons = MapButtons(in.Buttons); + r.Share = (in.Buttons & OSMSPAD_SHARE) ? 1 : 0; + return r; +} + +bool DecodeXboxRumble(const uint8_t* data, size_t size, OsmsPadFeedback* out) noexcept { + if (!data || !out || size < sizeof(XboxOutputReport)) return false; + XboxOutputReport o; + memcpy(&o, data, sizeof o); + if (o.ReportId != kXboxOutputReportId) return false; + // Un actuador sin su bit de la máscara conserva su estado en el mando real; aquí cuenta + // como parado: mejor silencio que repetir una magnitud vieja. + out->LargeMotor = (o.EnableMask & 0x08) ? FromPercent(o.LeftMotor) : 0; + out->SmallMotor = (o.EnableMask & 0x04) ? FromPercent(o.RightMotor) : 0; + out->LeftTrigger = (o.EnableMask & 0x02) ? FromPercent(o.LeftTriggerMotor) : 0; + out->RightTrigger = (o.EnableMask & 0x01) ? FromPercent(o.RightTriggerMotor) : 0; + return true; +} + +} // namespace osmspad diff --git a/Native/OsmsPad/XboxSeries.h b/Native/OsmsPad/XboxSeries.h new file mode 100644 index 0000000..96e2385 --- /dev/null +++ b/Native/OsmsPad/XboxSeries.h @@ -0,0 +1,58 @@ +// XboxSeries.h — forma HID de un mando Xbox Series: descriptor, IDs y conversión de informes. +// +// Basado en el perfil Xbox Series de libvirtualgamepad (Copyright (c) 2026 Chase Payne, MIT; +// ver THIRD-PARTY.md): el descriptor reproduce el de un mando real por HID y el ID de +// hardware HID\VID_045E&PID_0B12&IG_00 es el que hace que Windows le ponga su filtro +// xinputhid.sys, que es lo que lo convierte en un mando XInput. Sin cabeceras del WDK: +// lo compilan el driver y la prueba unitaria. +#pragma once + +#include +#include + +#include "OsmsPadIoctl.h" + +namespace osmspad { + +constexpr uint16_t kXboxVendorId = 0x045E; +constexpr uint16_t kXboxSeriesProductId = 0x0B12; +constexpr uint16_t kXboxSeriesVersion = 0x0509; +constexpr uint8_t kXboxInputReportId = 1; +constexpr uint8_t kXboxOutputReportId = 3; +constexpr uint16_t kXboxTriggerMax = 1023; // gatillos de 10 bits +constexpr uint8_t kXboxRumbleMax = 100; // la vibración va en porcentaje + +#pragma pack(push, 1) + +struct XboxInputReport { + uint8_t ReportId; + uint16_t LeftX, LeftY, RightX, RightY; // sin signo; los verticales, positivo hacia abajo + uint16_t LeftTrigger, RightTrigger; // 10 bits útiles + uint8_t Hat; // 0 = centro, 1..8 en sentido horario desde arriba + uint16_t Buttons; // 15 bits con los huecos del mando real + uint8_t Share; // Consumer "Record" +}; + +struct XboxOutputReport { + uint8_t ReportId; + uint8_t EnableMask; // 1 gatillo dcho, 2 gatillo izq, 4 motor dcho, 8 motor izq + uint8_t LeftTriggerMotor, RightTriggerMotor, LeftMotor, RightMotor; // 0..100 + uint8_t Duration, StartDelay, LoopCount; +}; + +#pragma pack(pop) + +static_assert(sizeof(XboxInputReport) == 17, "XboxInputReport"); +static_assert(sizeof(XboxOutputReport) == 9, "XboxOutputReport"); + +const uint8_t* XboxSeriesDescriptor(size_t* size) noexcept; + +// REG_MULTI_SZ para VHF_CONFIG.HardwareIDs; bytes incluye los dos terminadores. +const wchar_t* XboxSeriesHardwareIds(size_t* bytes) noexcept; + +XboxInputReport EncodeXboxInput(const OsmsPadInput& in) noexcept; + +// false si el informe no es una orden de vibración de este perfil. +bool DecodeXboxRumble(const uint8_t* data, size_t size, OsmsPadFeedback* out) noexcept; + +} // namespace osmspad diff --git a/Native/OsmsPad/build.cmd b/Native/OsmsPad/build.cmd new file mode 100644 index 0000000..789acc9 --- /dev/null +++ b/Native/OsmsPad/build.cmd @@ -0,0 +1,67 @@ +@echo off +:: Compila OsmsPad sin instalar el WDK: usa el mismo paquete NuGet de Microsoft.Windows.WDK.x64 +:: que RemoteIdd (Native\RemoteIdd\build.cmd lo descarga la primera vez). +:: Uso: build.cmd [carpeta de salida] +:: 1) compila y ejecuta test\XboxSeriesTest.exe (si falla, para) +:: 2) compila OsmsPad.dll (UMDF 2.15 + VHF) y test\OsmsPadTest.exe +:: 3) sella y valida OsmsPad.inf +:: No firma ni instala nada. +setlocal +set OUT=%~1 +if "%OUT%"=="" set OUT=%~dp0bin +if not exist "%OUT%" mkdir "%OUT%" + +set WDKVER=10.0.26100.6584 +set W=%LOCALAPPDATA%\OpenStreamMS\wdk-nuget\%WDKVER%\c +set WINC=%W%\Include\10.0.26100.0 +set UMDF=2.15 +set WLIB=%W%\Lib\10.0.26100.0\um\x64 + +set VSWHERE=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe +set VSDIR= +for /f "usebackq delims=" %%i in (`call "%VSWHERE%" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do set VSDIR=%%i +if not defined VSDIR ( + echo ERROR: no se encontro MSVC ^(Build Tools con C++^). + exit /b 1 +) +call "%VSDIR%\VC\Auxiliary\Build\vcvars64.bat" >nul || exit /b 1 + +set OBJ=%TEMP%\osms-osmspad-obj +if not exist "%OBJ%" mkdir "%OBJ%" + +:: ---- 1) prueba del perfil (sin WDK) ---- +cl /nologo /utf-8 /O2 /W4 /WX /EHsc /std:c++17 /Fo"%OBJ%\\" ^ + "%~dp0test\XboxSeriesTest.cpp" "%~dp0XboxSeries.cpp" /Fe"%OBJ%\XboxSeriesTest.exe" || exit /b 1 +"%OBJ%\XboxSeriesTest.exe" || exit /b 1 + +:: ---- 2) herramienta de prueba con el driver instalado ---- +cl /nologo /utf-8 /O2 /W4 /WX /EHsc /std:c++17 /DUNICODE /D_UNICODE /Fo"%OBJ%\\" ^ + "%~dp0test\OsmsPadTest.cpp" /Fe"%OUT%\OsmsPadTest.exe" /link cfgmgr32.lib xinput.lib || exit /b 1 +cl /nologo /utf-8 /O2 /W4 /WX /EHsc /std:c++17 /MT /DUNICODE /D_UNICODE /Fo"%OBJ%\\" ^ + "%~dp0setup\OsmsPadSetup.cpp" /Fe"%OUT%\OsmsPadSetup.exe" /link setupapi.lib newdev.lib advapi32.lib || exit /b 1 + +:: ---- 3) driver ---- +if not exist "%W%\Include\wdf\umdf\%UMDF%\wdf.h" ( + echo ERROR: falta el WDK NuGet en %W%: ejecuta antes Native\RemoteIdd\build.cmd. + exit /b 1 +) +:: C4324 sale de las cabeceras de WDF (wdfrequest.h), no del código del driver. +cl /nologo /utf-8 /c /O2 /W4 /WX /wd4324 /EHsc /std:c++17 /MT /GS /guard:cf /Zi /Fo"%OBJ%\\" /Fd"%OBJ%\\" ^ + /DUNICODE /D_UNICODE /D_WINDLL /DWIN32_LEAN_AND_MEAN ^ + /DUMDF_VERSION_MAJOR=2 /DUMDF_VERSION_MINOR=15 /DUMDF_USING_NTSTATUS ^ + /I"%W%\Include\wdf\umdf\%UMDF%" /I"%WINC%\um" /I"%WINC%\shared" ^ + "%~dp0Driver.cpp" "%~dp0XboxSeries.cpp" || exit /b 1 +link /nologo /DLL /OUT:"%OUT%\OsmsPad.dll" /PDB:"%OUT%\OsmsPad.pdb" /DEBUG /INCREMENTAL:NO /GUARD:CF ^ + /NODEFAULTLIB:kernel32.lib "%OBJ%\Driver.obj" "%OBJ%\XboxSeries.obj" ^ + "%W%\Lib\wdf\umdf\x64\%UMDF%\WdfDriverStubUm.lib" "%WLIB%\VhfUm.lib" OneCoreUAP.lib ntdll.lib || exit /b 1 +del /q "%OUT%\OsmsPad.lib" "%OUT%\OsmsPad.exp" 2>nul + +:: ---- 4) INF sellado y validado ---- +copy /y "%~dp0OsmsPad.inf" "%OUT%\OsmsPad.inf" >nul +:: Fecha UTC (Inf2Cat compara con UTC; ver Native\RemoteIdd\build.cmd). +for /f %%d in ('powershell -NoProfile -Command "(Get-Date).ToUniversalTime().ToString('MM/dd/yyyy', [Globalization.CultureInfo]::InvariantCulture)"') do set DRIVER_DATE=%%d +"%W%\bin\10.0.26100.0\x64\stampinf.exe" -f "%OUT%\OsmsPad.inf" -a amd64 -u %UMDF%.0 -d %DRIVER_DATE% -v 0.1.0.0 >nul || exit /b 1 +"%W%\tools\10.0.26100.0\x64\infverif.exe" /w "%OUT%\OsmsPad.inf" || exit /b 1 + +echo OsmsPad compilado en %OUT% (sin firmar, sin instalar). +exit /b 0 diff --git a/Native/OsmsPad/install.ps1 b/Native/OsmsPad/install.ps1 new file mode 100644 index 0000000..f06a5f9 --- /dev/null +++ b/Native/OsmsPad/install.ps1 @@ -0,0 +1,29 @@ +# install.ps1 — instala OsmsPad desde el paquete de package.ps1 (como administrador). +# 1) quita una instalación anterior (dispositivo, paquete y su certificado); +# 2) importa OsmsPad.cer en Root y TrustedPublisher del equipo; +# 3) crea ROOT\OSMSPAD y le instala el driver (OsmsPadSetup.exe). +# Log en %ProgramData%\OpenStreamMS\osmspad-setup.log. Se deshace con uninstall.ps1. +$ErrorActionPreference = 'Stop' +$pkg = $PSScriptRoot +$log = Join-Path $env:ProgramData 'OpenStreamMS\osmspad-setup.log' +New-Item -ItemType Directory -Force (Split-Path $log) | Out-Null +function Log($text) { "$(Get-Date -Format s) $text" | Tee-Object -FilePath $log -Append | Write-Host } + +if (-not ([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole( + [Security.Principal.WindowsBuiltInRole]::Administrator)) { throw 'Hace falta ejecutarlo como administrador.' } +if ([Environment]::OSVersion.Version.Build -lt 19041) { throw 'OsmsPad necesita Windows 10 2004 (19041) o posterior.' } + +& (Join-Path $pkg 'uninstall.ps1') -KeepLog + +$cer = Join-Path $pkg 'OsmsPad.cer' +foreach ($store in 'Root', 'TrustedPublisher') { + Import-Certificate -FilePath $cer -CertStoreLocation "Cert:\LocalMachine\$store" | Out-Null +} +Log "Certificado de OsmsPad importado en Root y TrustedPublisher." + +$output = & (Join-Path $pkg 'OsmsPadSetup.exe') install (Join-Path $pkg 'driver\OsmsPad.inf') 2>&1 +$code = $LASTEXITCODE +$output | ForEach-Object { Log $_ } +if ($code -ne 0 -and $code -ne 3010) { throw "OsmsPadSetup install falló ($code)." } +Log "OsmsPad instalado$(if ($code -eq 3010) { ' (hace falta reiniciar)' })." +exit $code diff --git a/Native/OsmsPad/package.ps1 b/Native/OsmsPad/package.ps1 new file mode 100644 index 0000000..0ad74d2 --- /dev/null +++ b/Native/OsmsPad/package.ps1 @@ -0,0 +1,50 @@ +# package.ps1 — paquete de OsmsPad ya firmado, como Core\Installer\package-remoteidd.ps1. +# +# Firma de PRUEBA con un certificado autofirmado de un solo uso: se crea en cada compilación y +# su clave privada se borra en cuanto se ha firmado, así que nadie puede firmar nada más con él. +# Al paquete solo va la parte pública (OsmsPad.cer), que install.ps1 mete en Root y +# TrustedPublisher. Es un driver UMDF (sin código de kernel propio): carga sin testsigning. +# +# Uso: package.ps1 -Bin -OutDir +param( + [Parameter(Mandatory)] [string] $Bin, + [Parameter(Mandatory)] [string] $OutDir +) +$ErrorActionPreference = 'Stop' +$wdk = Join-Path $env:LOCALAPPDATA 'OpenStreamMS\wdk-nuget\10.0.26100.6584\c' +$inf2cat = "$wdk\bin\10.0.26100.0\x86\Inf2Cat.exe" +$signtool = Get-ChildItem "${env:ProgramFiles(x86)}\Windows Kits\10\bin\*\x64\signtool.exe" -ErrorAction SilentlyContinue | + Sort-Object { [version]$_.Directory.Parent.Name } -Descending | Select-Object -First 1 -ExpandProperty FullName + +foreach ($f in 'OsmsPad.dll', 'OsmsPad.inf', 'OsmsPadSetup.exe', 'OsmsPadTest.exe') { + if (-not (Test-Path (Join-Path $Bin $f))) { throw "Falta $f en $Bin (ejecuta Native\OsmsPad\build.cmd)." } +} +if (-not $signtool) { throw 'No se encuentra signtool.exe (hace falta el SDK de Windows).' } +if (-not (Test-Path $inf2cat)) { throw "No se encuentra $inf2cat (lo descarga Native\RemoteIdd\build.cmd)." } + +$cert = New-SelfSignedCertificate -Type CodeSigningCert -Subject 'CN=OpenStreamMS OsmsPad Test' ` + -CertStoreLocation Cert:\CurrentUser\My -NotAfter (Get-Date).AddYears(3) +function Sign($file) { + & $signtool sign /fd sha256 /s My /sha1 $cert.Thumbprint $file | Out-Null + if ($LASTEXITCODE) { throw "signtool falló al firmar $file." } +} +try { + Remove-Item -Recurse -Force $OutDir -ErrorAction SilentlyContinue + New-Item -ItemType Directory -Force $OutDir | Out-Null + $drv = Join-Path $OutDir 'driver' + New-Item -ItemType Directory $drv | Out-Null + Copy-Item (Join-Path $Bin 'OsmsPad.dll'), (Join-Path $Bin 'OsmsPad.inf') $drv + Copy-Item (Join-Path $Bin 'OsmsPadSetup.exe'), (Join-Path $Bin 'OsmsPadTest.exe') $OutDir + Sign (Join-Path $drv 'OsmsPad.dll') + Sign (Join-Path $OutDir 'OsmsPadSetup.exe') + Sign (Join-Path $OutDir 'OsmsPadTest.exe') + & $inf2cat /driver:$drv /os:10_X64 | Out-Null + if ($LASTEXITCODE) { throw 'Inf2Cat falló (¿DriverVer con fecha futura?).' } + Sign (Join-Path $drv 'OsmsPad.cat') + Export-Certificate -Cert $cert -FilePath (Join-Path $OutDir 'OsmsPad.cer') | Out-Null +} +finally { + Remove-Item "Cert:\CurrentUser\My\$($cert.Thumbprint)" -DeleteKey -ErrorAction SilentlyContinue +} +Copy-Item (Join-Path $PSScriptRoot 'install.ps1'), (Join-Path $PSScriptRoot 'uninstall.ps1') $OutDir +Write-Host "Paquete OsmsPad listo en $OutDir (certificado de un solo uso $($cert.Thumbprint), clave borrada)." diff --git a/Native/OsmsPad/setup/OsmsPadSetup.cpp b/Native/OsmsPad/setup/OsmsPadSetup.cpp new file mode 100644 index 0000000..1fd1ba8 --- /dev/null +++ b/Native/OsmsPad/setup/OsmsPadSetup.cpp @@ -0,0 +1,111 @@ +// OsmsPadSetup.cpp — crea o quita el dispositivo raíz ROOT\OSMSPAD (lo que haría devcon). +// OsmsPadSetup.exe install crea el nodo si no existe y le instala el driver +// OsmsPadSetup.exe remove quita los nodos ROOT\OSMSPAD y el paquete del driver +// Códigos de salida: 0 bien, 3010 bien pero hay que reiniciar, otro = error de Windows. +#include +#include +#include +#include +#include +#include +#include + +#ifndef MAX_CLASS_NAME_LEN +#define MAX_CLASS_NAME_LEN 32 +#endif + +static const wchar_t kHardwareId[] = L"ROOT\\OSMSPAD"; + +static bool HasHardwareId(HDEVINFO set, SP_DEVINFO_DATA& info) +{ + wchar_t ids[512]{}; + if (!SetupDiGetDeviceRegistryPropertyW(set, &info, SPDRP_HARDWAREID, nullptr, + reinterpret_cast(ids), sizeof ids - 2 * sizeof(wchar_t), nullptr)) + return false; + for (const wchar_t* p = ids; *p; p += wcslen(p) + 1) + if (_wcsicmp(p, kHardwareId) == 0) return true; + return false; +} + +// Recorre los nodos de la clase System con nuestro ID (presentes o no). +template static void ForEachOsmsPad(F f) +{ + HDEVINFO set = SetupDiGetClassDevsW(&GUID_DEVCLASS_SYSTEM, L"ROOT", nullptr, 0); + if (set == INVALID_HANDLE_VALUE) return; + SP_DEVINFO_DATA info{ sizeof info }; + for (DWORD i = 0; SetupDiEnumDeviceInfo(set, i, &info); ++i) + if (HasHardwareId(set, info)) f(set, info); + SetupDiDestroyDeviceInfoList(set); +} + +static int Install(const wchar_t* inf) +{ + wchar_t full[MAX_PATH]; + if (!GetFullPathNameW(inf, MAX_PATH, full, nullptr)) return static_cast(GetLastError()); + + bool exists = false; + ForEachOsmsPad([&](HDEVINFO, SP_DEVINFO_DATA&) { exists = true; }); + if (!exists) + { + GUID cls; + wchar_t className[MAX_CLASS_NAME_LEN]; + if (!SetupDiGetINFClassW(full, &cls, className, MAX_CLASS_NAME_LEN, nullptr)) + return static_cast(GetLastError()); + HDEVINFO set = SetupDiCreateDeviceInfoList(&cls, nullptr); + if (set == INVALID_HANDLE_VALUE) return static_cast(GetLastError()); + SP_DEVINFO_DATA info{ sizeof info }; + wchar_t ids[] = L"ROOT\\OSMSPAD\0"; + bool ok = SetupDiCreateDeviceInfoW(set, className, &cls, nullptr, nullptr, DICD_GENERATE_ID, &info) && + SetupDiSetDeviceRegistryPropertyW(set, &info, SPDRP_HARDWAREID, reinterpret_cast(ids), sizeof ids) && + SetupDiCallClassInstaller(DIF_REGISTERDEVICE, set, &info); + DWORD err = ok ? 0 : GetLastError(); + SetupDiDestroyDeviceInfoList(set); + if (!ok) { wprintf(L"No se pudo crear ROOT\\OSMSPAD: %lu\n", err); return static_cast(err); } + wprintf(L"Creado el dispositivo ROOT\\OSMSPAD\n"); + } + + BOOL reboot = FALSE; + if (!UpdateDriverForPlugAndPlayDevicesW(nullptr, kHardwareId, full, INSTALLFLAG_FORCE, &reboot)) + { + DWORD err = GetLastError(); + wprintf(L"No se pudo instalar el driver (%lu)%s\n", err, + err == ERROR_AUTHENTICODE_TRUST_NOT_ESTABLISHED || err == static_cast(TRUST_E_NOSIGNATURE) + ? L": firma no aceptada (¿certificado en Root y TrustedPublisher?)" : L""); + return static_cast(err); + } + wprintf(L"Driver instalado%s\n", reboot ? L" (hace falta reiniciar)" : L""); + return reboot ? 3010 : 0; +} + +static int Remove() +{ + std::vector infs; + int removed = 0; + ForEachOsmsPad([&](HDEVINFO set, SP_DEVINFO_DATA& info) { + // INF instalado (oemNN.inf) para quitar luego el paquete del Driver Store. + HKEY key = SetupDiOpenDevRegKey(set, &info, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_READ); + if (key != INVALID_HANDLE_VALUE) + { + wchar_t inf[MAX_PATH]{}; + DWORD size = sizeof inf - sizeof(wchar_t); + if (RegQueryValueExW(key, L"InfPath", nullptr, nullptr, reinterpret_cast(inf), &size) == ERROR_SUCCESS) + infs.emplace_back(inf); + RegCloseKey(key); + } + BOOL reboot = FALSE; + if (DiUninstallDevice(nullptr, set, &info, 0, &reboot)) ++removed; + }); + for (const auto& inf : infs) + if (SetupUninstallOEMInfW(inf.c_str(), SUOI_FORCEDELETE, nullptr)) + wprintf(L"Quitado el paquete %ls\n", inf.c_str()); + wprintf(L"%d dispositivo(s) ROOT\\OSMSPAD quitado(s)\n", removed); + return 0; +} + +int wmain(int argc, wchar_t** argv) +{ + if (argc == 3 && _wcsicmp(argv[1], L"install") == 0) return Install(argv[2]); + if (argc == 2 && _wcsicmp(argv[1], L"remove") == 0) return Remove(); + wprintf(L"Uso: OsmsPadSetup.exe install | remove\n"); + return ERROR_INVALID_PARAMETER; +} diff --git a/Native/OsmsPad/test/OsmsPadTest.cpp b/Native/OsmsPad/test/OsmsPadTest.cpp new file mode 100644 index 0000000..65dc400 --- /dev/null +++ b/Native/OsmsPad/test/OsmsPadTest.cpp @@ -0,0 +1,147 @@ +// OsmsPadTest.cpp — prueba de punta a punta con el driver instalado (como administrador): +// 1) abre la interfaz de OsmsPad y crea un mando Xbox Series; +// 2) espera a que XInput lo vea y comprueba botones, sticks y gatillos; +// 3) pide vibración con XInputSetState y comprueba que llega por IOCTL_OSMSPAD_FEEDBACK; +// 4) cierra el handle y comprueba que el mando desaparece. +// Uso: OsmsPadTest.exe [--keep N] (--keep: deja el mando N segundos para probar un juego) +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../OsmsPadIoctl.h" + +static int g_failures = 0; +static void Check(bool ok, const char* what) +{ + printf("%s %s\n", ok ? "OK " : "FALLO", what); + if (!ok) ++g_failures; +} + +static HANDLE OpenOsmsPad() +{ + ULONG len = 0; + if (CM_Get_Device_Interface_List_SizeW(&len, const_cast(&GUID_DEVINTERFACE_OSMSPAD), nullptr, + CM_GET_DEVICE_INTERFACE_LIST_PRESENT) != CR_SUCCESS || len <= 1) + return INVALID_HANDLE_VALUE; + std::vector list(len); + if (CM_Get_Device_Interface_ListW(const_cast(&GUID_DEVINTERFACE_OSMSPAD), nullptr, list.data(), len, + CM_GET_DEVICE_INTERFACE_LIST_PRESENT) != CR_SUCCESS) + return INVALID_HANDLE_VALUE; + return CreateFileW(list.data(), GENERIC_READ | GENERIC_WRITE, 0, nullptr, OPEN_EXISTING, + FILE_FLAG_OVERLAPPED, nullptr); +} + +static bool Ioctl(HANDLE h, DWORD code, const void* in, DWORD inLen, void* out, DWORD outLen, DWORD* got = nullptr) +{ + OVERLAPPED ov{}; + ov.hEvent = CreateEventW(nullptr, TRUE, FALSE, nullptr); + DWORD n = 0; + BOOL ok = DeviceIoControl(h, code, const_cast(in), inLen, out, outLen, &n, &ov); + if (!ok && GetLastError() == ERROR_IO_PENDING) ok = GetOverlappedResult(h, &ov, &n, TRUE); + CloseHandle(ov.hEvent); + if (got) *got = n; + return ok != FALSE; +} + +// XInput: índice cuyo estado coincide con lo que mandamos (puede haber mandos reales). +static int FindPad(WORD buttons, SHORT lx, DWORD timeoutMs) +{ + for (DWORD waited = 0; waited <= timeoutMs; waited += 50) + { + for (DWORD i = 0; i < XUSER_MAX_COUNT; ++i) + { + XINPUT_STATE s{}; + if (XInputGetState(i, &s) == ERROR_SUCCESS && + (s.Gamepad.wButtons & buttons) == buttons && abs(s.Gamepad.sThumbLX - lx) < 512) + return static_cast(i); + } + Sleep(50); + } + return -1; +} + +int main(int argc, char** argv) +{ + DWORD keepSeconds = 0; + if (argc == 3 && strcmp(argv[1], "--keep") == 0) keepSeconds = static_cast(atoi(argv[2])); + + HANDLE h = OpenOsmsPad(); + Check(h != INVALID_HANDLE_VALUE, "abrir la interfaz de OsmsPad (¿driver instalado? ¿administrador?)"); + if (h == INVALID_HANDLE_VALUE) return 1; + + OsmsPadCreateIn create{ OSMSPAD_PROTOCOL_VERSION, OSMSPAD_PROFILE_XBOX_SERIES, OSMSPAD_SESSION_CALLER }; + OsmsPadCreateOut created{}; + DWORD sessionId = 0; + ProcessIdToSessionId(GetCurrentProcessId(), &sessionId); + bool ok = Ioctl(h, IOCTL_OSMSPAD_CREATE, &create, sizeof create, &created, sizeof created); + Check(ok, "crear mando"); + if (!ok) { printf(" error %lu\n", GetLastError()); return 1; } + printf(" mando %u, %ls\n", created.Pad, created.InstanceId); + Check(created.Session == sessionId, "la sesión del ID de instancia es la de quien lo crea"); + + OsmsPadInput in{}; + in.Pad = created.Pad; + in.Buttons = OSMSPAD_A | OSMSPAD_LEFT_SHOULDER; + in.ThumbLX = 20000; + in.RightTrigger = 200; + int index = -1; + for (int tries = 0; tries < 60 && index < 0; ++tries) // hasta ~6 s: Windows tarda en montar el HID + { + Ioctl(h, IOCTL_OSMSPAD_INPUT, &in, sizeof in, nullptr, 0); + index = FindPad(in.Buttons, in.ThumbLX, 100); + } + Check(index >= 0, "XInput ve el mando con A + LB y el stick izquierdo a la derecha"); + if (index >= 0) + { + XINPUT_STATE s{}; + XInputGetState(static_cast(index), &s); + printf(" XInput %d: botones 0x%04X, LX %d, RT %u\n", index, s.Gamepad.wButtons, s.Gamepad.sThumbLX, + s.Gamepad.bRightTrigger); + Check(s.Gamepad.bRightTrigger > 150 && s.Gamepad.bRightTrigger < 250, "gatillo derecho ~200"); + + // Vibración: la petición de feedback queda pendiente hasta que el "juego" la pida. + OsmsPadFeedback fb{}; + OVERLAPPED ov{}; + ov.hEvent = CreateEventW(nullptr, TRUE, FALSE, nullptr); + DWORD n = 0; + BOOL pending = DeviceIoControl(h, IOCTL_OSMSPAD_FEEDBACK, nullptr, 0, &fb, sizeof fb, &n, &ov); + if (!pending && GetLastError() != ERROR_IO_PENDING) printf(" feedback: error %lu\n", GetLastError()); + XINPUT_VIBRATION vib{ 65535, 32768 }; + XInputSetState(static_cast(index), &vib); + bool got = WaitForSingleObject(ov.hEvent, 2000) == WAIT_OBJECT_0 && GetOverlappedResult(h, &ov, &n, FALSE); + Check(got && fb.Pad == created.Pad && fb.LargeMotor > 60000 && fb.SmallMotor > 25000 && fb.SmallMotor < 40000, + "la vibración que pide XInput llega al cliente"); + printf(" vibración: grande %u, pequeño %u\n", fb.LargeMotor, fb.SmallMotor); + if (!got) CancelIoEx(h, &ov); + CloseHandle(ov.hEvent); + XINPUT_VIBRATION off{}; + XInputSetState(static_cast(index), &off); + } + + if (keepSeconds) + { + printf(" mando creado durante %lu s: abre un juego o joy.cpl para probarlo\n", keepSeconds); + Sleep(keepSeconds * 1000); + } + + CloseHandle(h); + if (index >= 0) + { + bool gone = false; + for (int i = 0; i < 60 && !gone; ++i) + { + XINPUT_STATE s{}; + gone = XInputGetState(static_cast(index), &s) == ERROR_DEVICE_NOT_CONNECTED; + if (!gone) Sleep(100); + } + Check(gone, "al cerrar el handle el mando desaparece"); + } + + printf(g_failures ? "\n%d fallos\n" : "\nTodo bien\n", g_failures); + return g_failures ? 1 : 0; +} diff --git a/Native/OsmsPad/test/XboxSeriesTest.cpp b/Native/OsmsPad/test/XboxSeriesTest.cpp new file mode 100644 index 0000000..55dff66 --- /dev/null +++ b/Native/OsmsPad/test/XboxSeriesTest.cpp @@ -0,0 +1,60 @@ +// XboxSeriesTest.cpp — prueba de XboxSeries.cpp (conversión de informes), sin driver ni WDK. +#include +#include + +#include "../XboxSeries.h" + +static int g_failures = 0; +static void Check(bool ok, const char* what) +{ + printf("%s %s\n", ok ? "OK " : "FALLO", what); + if (!ok) ++g_failures; +} + +int main() +{ + using namespace osmspad; + + size_t size = 0; + const uint8_t* d = XboxSeriesDescriptor(&size); + Check(d && size > 100 && d[0] == 0x05 && d[size - 1] == 0xC0, "descriptor empieza y acaba bien"); + + size_t bytes = 0; + const wchar_t* ids = XboxSeriesHardwareIds(&bytes); + Check(wcscmp(ids, L"HID\\VID_045E&PID_0B12&IG_00") == 0, "primer ID: el que casa con xinputhid.inf"); + Check(bytes % sizeof(wchar_t) == 0 && ids[bytes / sizeof(wchar_t) - 1] == 0 && ids[bytes / sizeof(wchar_t) - 2] == 0, + "IDs en REG_MULTI_SZ con doble terminador"); + + OsmsPadInput idle{}; + XboxInputReport r = EncodeXboxInput(idle); + Check(r.ReportId == 1 && r.LeftX == 32768 && r.LeftY == 32767 && r.Hat == 0 && r.Buttons == 0, + "en reposo: sticks al centro, cruceta centrada, sin botones"); + + OsmsPadInput in{}; + in.ThumbLX = 32767; in.ThumbLY = 32767; // derecha y arriba + in.ThumbRX = -32768; in.ThumbRY = -32768; // izquierda y abajo + in.LeftTrigger = 255; in.RightTrigger = 0; + in.Buttons = OSMSPAD_A | OSMSPAD_Y | OSMSPAD_GUIDE | OSMSPAD_DPAD_UP | OSMSPAD_DPAD_RIGHT | OSMSPAD_SHARE; + r = EncodeXboxInput(in); + Check(r.LeftX == 65535 && r.LeftY == 0, "stick izquierdo arriba-derecha (vertical invertido)"); + Check(r.RightX == 0 && r.RightY == 65535, "stick derecho abajo-izquierda"); + Check(r.LeftTrigger == 1023 && r.RightTrigger == 0, "gatillos a 10 bits"); + Check(r.Hat == 2, "cruceta arriba+derecha = 2"); + Check(r.Buttons == ((1u << 0) | (1u << 4) | (1u << 12)), "A, Y y Guía en sus bits del mando real"); + Check(r.Share == 1, "Compartir"); + + in = {}; in.Buttons = OSMSPAD_DPAD_UP | OSMSPAD_DPAD_DOWN; + Check(EncodeXboxInput(in).Hat == 0, "arriba+abajo a la vez = centro"); + + uint8_t rumble[9] = { 3, 0x0C, 0, 0, 100, 50, 0, 0, 0 }; + OsmsPadFeedback fb{}; + Check(DecodeXboxRumble(rumble, sizeof rumble, &fb), "vibración: informe 3 reconocido"); + Check(fb.LargeMotor == 65535 && fb.SmallMotor == 32767 && fb.LeftTrigger == 0 && fb.RightTrigger == 0, + "vibración: motores al 100 % y 50 %, gatillos sin su bit = 0"); + rumble[0] = 2; + Check(!DecodeXboxRumble(rumble, sizeof rumble, &fb), "otro informe: se ignora"); + Check(!DecodeXboxRumble(rumble, 4, &fb), "informe corto: se ignora"); + + printf(g_failures ? "\n%d fallos\n" : "\nTodo bien\n", g_failures); + return g_failures ? 1 : 0; +} diff --git a/Native/OsmsPad/uninstall.ps1 b/Native/OsmsPad/uninstall.ps1 new file mode 100644 index 0000000..0bcd3df --- /dev/null +++ b/Native/OsmsPad/uninstall.ps1 @@ -0,0 +1,24 @@ +# uninstall.ps1 — quita OsmsPad: el dispositivo ROOT\OSMSPAD, el paquete del Driver Store y +# todos los certificados de prueba de OsmsPad (de cualquier compilación) de Root y TrustedPublisher. +param([switch] $KeepLog) +$ErrorActionPreference = 'Stop' +$log = Join-Path $env:ProgramData 'OpenStreamMS\osmspad-setup.log' +New-Item -ItemType Directory -Force (Split-Path $log) | Out-Null +function Log($text) { "$(Get-Date -Format s) $text" | Tee-Object -FilePath $log -Append | Write-Host } + +$setup = Join-Path $PSScriptRoot 'OsmsPadSetup.exe' +if (Test-Path $setup) { + & $setup remove 2>&1 | ForEach-Object { Log $_ } +} +# Paquetes que se hubieran quedado sin dispositivo. +$drivers = Get-WindowsDriver -Online -ErrorAction SilentlyContinue | Where-Object { $_.OriginalFileName -like '*\osmspad.inf' } +foreach ($d in $drivers) { + pnputil.exe /delete-driver $d.Driver /uninstall /force | Out-Null + Log "Quitado el paquete $($d.Driver)." +} +foreach ($store in 'Root', 'TrustedPublisher') { + Get-ChildItem "Cert:\LocalMachine\$store" | Where-Object Subject -eq 'CN=OpenStreamMS OsmsPad Test' | ForEach-Object { + Remove-Item $_.PSPath + Log "Quitado el certificado $($_.Thumbprint) de $store." + } +} diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index d1f7484..dc78149 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -23,6 +23,34 @@ The corresponding source code for the Sunshine binaries is available at the comm linked above. If that link ever becomes unavailable, open an issue in this repository and the maintainer will provide the corresponding source for the distributed version. +## libvirtualgamepad (OsmsPad) + +The OsmsPad virtual gamepad driver (`Native/OsmsPad`) is an independent, reduced +adaptation of ideas from [libvirtualgamepad](https://github.com/Nonary/libvirtualgamepad): +a UMDF filter above Windows' Virtual HID Framework, controllers owned by the handle +that created them, and the Xbox Series HID report descriptor and hardware IDs that +put the device on the XInput path (`XboxSeries.cpp`, `OsmsPad.inf`). Those parts +are used under the MIT License: + +> Copyright (c) 2026 Chase Payne +> +> Permission is hereby granted, free of charge, to any person obtaining a copy of this +> software and associated documentation files (the "Software"), to deal in the Software +> without restriction, including without limitation the rights to use, copy, modify, +> merge, publish, distribute, sublicense, and/or sell copies of the Software, and to +> permit persons to whom the Software is furnished to do so, subject to the following +> conditions: +> +> The above copyright notice and this permission notice shall be included in all copies +> or substantial portions of the Software. +> +> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +> INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +> PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +> HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF +> CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE +> OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + ## Inno Setup language resources The installer uses official Inno Setup language files and additional unmodified From 2deb24dcdc4d80e76c2b9d78afd46614cedd58c1 Mon Sep 17 00:00:00 2001 From: mlopezsegura <90263997+mlopezsegura@users.noreply.github.com> Date: Sat, 14 Nov 2026 14:13:56 +0100 Subject: [PATCH 2/3] Gamepads: isolate OsmsPad controllers by their instance ID OsmsPad's root device is treated like a ViGEm bus: its children are the controllers. Their instance ID ends in OSMS_S_P, so the session comes straight from the driver instead of from Sunshine's log; the log only gives the pad's number in that Sunshine ("OsmsPad controller P created for gamepad N") for the mosaic. A controller from a Windows session with no OpenStreamMS session (e.g. OsmsPadTest) is still confined to that session. Sunshine is configured with gamepad_driver = osmspad when the driver is installed; it falls back to ViGEmBus by itself if the driver goes missing. Co-Authored-By: Claude Opus 5.5 --- Services/Gamepad/GamepadSessionIsolation.cs | 66 ++++++++++++++++++- Services/Gamepad/OsmsPad.cs | 37 +++++++++++ Services/Sunshine/SunshineConfigurator.cs | 7 ++ .../OsmsPadInstanceTests.cs | 26 ++++++++ 4 files changed, 133 insertions(+), 3 deletions(-) create mode 100644 Services/Gamepad/OsmsPad.cs create mode 100644 tests/OpenStreamMS.Tests/OsmsPadInstanceTests.cs diff --git a/Services/Gamepad/GamepadSessionIsolation.cs b/Services/Gamepad/GamepadSessionIsolation.cs index 74785d1..c44ffd1 100644 --- a/Services/Gamepad/GamepadSessionIsolation.cs +++ b/Services/Gamepad/GamepadSessionIsolation.cs @@ -31,8 +31,11 @@ namespace OpenStreamMS.Services.Gamepad; /// (ya arrancado), se reinicia ese nodo HID para cerrar los handles ya abiertos. /// /// -/// Qué Sunshine creó cada mando se deduce del log: Sunshine escribe -/// "Gamepad N will be ..." justo antes de enchufarlo en ViGEmBus. +/// Qué Sunshine creó cada mando de ViGEmBus se deduce del log: Sunshine escribe +/// "Gamepad N will be ..." justo antes de enchufarlo en ViGEmBus. Los de OsmsPad (driver +/// propio, Native/OsmsPad) no hace falta adivinarlos: el driver pone en su ID de instancia la +/// sesión de Windows de quien lo creó (...OSMS_S<sesión>_P<n>). Del log solo +/// se saca su número en ese Sunshine, para el mosaico. /// /// /// Mosaico (): el mando N que crea el Sunshine de la @@ -43,6 +46,8 @@ namespace OpenStreamMS.Services.Gamepad; public sealed partial class GamepadSessionIsolation : BackgroundService { private const string ViGEmBusHardwareId = @"Nefarius\ViGEmBus\Gen1"; + /// Dispositivo raíz de OsmsPad: sus hijos directos son los mandos, como en un bus ViGEm. + private const string OsmsPadHardwareId = @"ROOT\OSMSPAD"; private static readonly TimeSpan Fallback = TimeSpan.FromSeconds(1); private static readonly TimeSpan BusRescan = TimeSpan.FromSeconds(30); private static readonly TimeSpan MatchBefore = TimeSpan.FromSeconds(20); @@ -54,6 +59,14 @@ public sealed partial class GamepadSessionIsolation : BackgroundService [GeneratedRegex(@"^\[(\d{4}-\d\d-\d\d \d\d:\d\d:\d\d\.\d{3})\]: \w+: Gamepad (\d+) will be", RegexOptions.Multiline)] private static partial Regex GamepadCreatedRegex(); + /// "OsmsPad controller P created for gamepad N": mando P del driver = mando N de ese Sunshine. + [GeneratedRegex(@"OsmsPad controller (\d+) created for gamepad (\d+)")] + private static partial Regex OsmsPadCreatedRegex(); + + /// Sesión de Windows y número de mando en el ID de instancia de un mando OsmsPad. + [GeneratedRegex(@"OSMS_S(\d+)_P(\d+)$", RegexOptions.IgnoreCase)] + internal static partial Regex OsmsPadInstanceRegex(); + private readonly StreamSessionService _sessions; private readonly Seats.SeatManager _seats; private readonly Mosaic.MosaicService _mosaic; @@ -79,6 +92,7 @@ private sealed class LogCursor public long Offset; public byte[] Head = []; public readonly List<(DateTime At, int Index)> Pending = []; // creaciones aún sin mando asignado + public readonly Dictionary OsmsPadIndex = []; // mando del driver → mando de este Sunshine } private readonly Dictionary _pads = new(StringComparer.OrdinalIgnoreCase); @@ -297,6 +311,14 @@ private Pad Track(string padId, private void TryAssign(Pad pad, IReadOnlyList<(Guid Id, string Name, uint RdpSessionId, string SunshineLog)> running, DateTime now) { + if (OsmsPadInstanceRegex().Match(pad.InstanceId) is { Success: true } osms) + { + AssignOsmsPad(pad, running, now, + uint.Parse(osms.Groups[1].ValueSpan, CultureInfo.InvariantCulture), + int.Parse(osms.Groups[2].ValueSpan, CultureInfo.InvariantCulture)); + return; + } + Guid? owner = null; (DateTime At, int Index) best = (DateTime.MaxValue, -1); foreach (var (sessionId, cursor) in _cursors) @@ -326,6 +348,39 @@ private void TryAssign(Pad pad, var session = running.FirstOrDefault(s => s.Id == owner); if (session.Id == Guid.Empty) return; // la sesión del log ya no está en marcha + AssignTo(pad, session); + } + + /// + /// Mando de OsmsPad: la sesión de Windows viene en su ID. Si es la de una sesión de + /// OpenStreamMS en marcha, se trata como un mando de su Sunshine (mosaico incluido); si no + /// (p. ej. OsmsPadTest), se aísla igualmente en esa sesión de Windows. + /// + private void AssignOsmsPad(Pad pad, + IReadOnlyList<(Guid Id, string Name, uint RdpSessionId, string SunshineLog)> running, + DateTime now, uint windowsSession, int driverPad) + { + var session = running.FirstOrDefault(s => s.RdpSessionId == windowsSession); + if (session.Id == Guid.Empty) + { + pad.Session = Guid.Empty; + pad.SessionName = $"Windows {windowsSession}"; + pad.WindowsSession = windowsSession; + Logger.Log($"[Gamepad] Mando OsmsPad {pad.InstanceId} → sesión de Windows {windowsSession} (no es de ninguna sesión de OpenStreamMS)"); + return; + } + // El número del mando en su Sunshine solo hace falta para el mosaico: se espera un poco + // a que salga en el log y, si no, el mando se queda en la sesión que lo creó. + if (_cursors.TryGetValue(session.Id, out var cursor) && cursor.OsmsPadIndex.TryGetValue(driverPad, out int index)) + pad.Index = index; + else if (now - pad.FirstSeen < MatchAfter) + return; + AssignTo(pad, session); + } + + private void AssignTo(Pad pad, (Guid Id, string Name, uint RdpSessionId, string SunshineLog) session) + { + Guid owner = session.Id; pad.Creator = owner; // Mosaico: el mando N de la anfitriona es de la sesión N. @@ -386,6 +441,9 @@ private void ReadGamepadEvents(Guid sessionId, string logPath) cur.Head = head; var cutoff = DateTime.Now - MatchBefore - AssignTimeout; + foreach (Match m in OsmsPadCreatedRegex().Matches(chunk)) + cur.OsmsPadIndex[int.Parse(m.Groups[1].ValueSpan, CultureInfo.InvariantCulture)] = + int.Parse(m.Groups[2].ValueSpan, CultureInfo.InvariantCulture); foreach (Match m in GamepadCreatedRegex().Matches(chunk)) { if (DateTime.TryParseExact(m.Groups[1].Value, "yyyy-MM-dd HH:mm:ss.fff", @@ -586,9 +644,11 @@ private bool UpdateJails(IEnumerable add, IEnumerable remove) } } + /// Buses de ViGEm y dispositivos raíz de OsmsPad: sus hijos directos son mandos. private static List FindViGEmBuses() => Cm.DeviceIds(@"ROOT\SYSTEM") - .Where(id => Cm.HardwareIds(id).Any(h => h.Equals(ViGEmBusHardwareId, StringComparison.OrdinalIgnoreCase))) + .Where(id => Cm.HardwareIds(id).Any(h => h.Equals(ViGEmBusHardwareId, StringComparison.OrdinalIgnoreCase) || + h.Equals(OsmsPadHardwareId, StringComparison.OrdinalIgnoreCase))) .ToList(); // ── Interop ────────────────────────────────────────────────────────────── diff --git a/Services/Gamepad/OsmsPad.cs b/Services/Gamepad/OsmsPad.cs new file mode 100644 index 0000000..bea8325 --- /dev/null +++ b/Services/Gamepad/OsmsPad.cs @@ -0,0 +1,37 @@ +using System.Runtime.InteropServices; + +namespace OpenStreamMS.Services.Gamepad; + +/// +/// Driver de mandos propio de OpenStreamMS (Native/OsmsPad): mandos Xbox Series sobre VHF, que +/// Windows pone en XInput con su filtro xinputhid. Con él instalado, Sunshine crea los mandos +/// con gamepad_driver = osmspad en vez de con ViGEmBus, y cada mando lleva en su ID de +/// instancia la sesión de Windows que lo creó (). +/// +internal static class OsmsPad +{ + /// Interfaz del driver (GUID_DEVINTERFACE_OSMSPAD de OsmsPadIoctl.h). + private static readonly Guid InterfaceGuid = new("6b1a3c52-8e0f-4c7b-9d2a-5f3e1b7c9a40"); + + private const int CM_GET_DEVICE_INTERFACE_LIST_PRESENT = 0; + private const int CR_SUCCESS = 0; + + [DllImport("cfgmgr32.dll", CharSet = CharSet.Unicode)] + private static extern int CM_Get_Device_Interface_List_SizeW(out int length, ref Guid interfaceClass, + string? deviceId, int flags); + + /// True si el driver está instalado y arrancado (su interfaz está presente). + public static bool IsInstalled() + { + try + { + var guid = InterfaceGuid; + return CM_Get_Device_Interface_List_SizeW(out int length, ref guid, null, CM_GET_DEVICE_INTERFACE_LIST_PRESENT) == CR_SUCCESS + && length > 1; + } + catch (DllNotFoundException) + { + return false; + } + } +} diff --git a/Services/Sunshine/SunshineConfigurator.cs b/Services/Sunshine/SunshineConfigurator.cs index 2a26b3c..78e5a5a 100644 --- a/Services/Sunshine/SunshineConfigurator.cs +++ b/Services/Sunshine/SunshineConfigurator.cs @@ -428,6 +428,13 @@ static string AbsFor(string configDir, string relative) => ["amd_quality"] = "speed", }; + // Con el driver propio de mandos (OsmsPad) instalado, Sunshine crea con él mandos Xbox + // Series: HID como los DS4, así que GamepadSessionIsolation los aísla igual, y sin + // ViGEmBus. Se fuerza (no es un valor por defecto) para que las instalaciones que ya + // tenían "vigembus" pasen a OsmsPad; si el driver falta, Sunshine vuelve a ViGEmBus. + if (Gamepad.OsmsPad.IsInstalled()) + overrides["gamepad_driver"] = "osmspad"; + // Puertos WebRTC: los gestiona OpenStreamMS (firewall y choques entre sesiones). if (cfg.WebRtcPort > 0) overrides["webrtc_port"] = cfg.WebRtcPort.ToString(); diff --git a/tests/OpenStreamMS.Tests/OsmsPadInstanceTests.cs b/tests/OpenStreamMS.Tests/OsmsPadInstanceTests.cs new file mode 100644 index 0000000..9f7ebab --- /dev/null +++ b/tests/OpenStreamMS.Tests/OsmsPadInstanceTests.cs @@ -0,0 +1,26 @@ +using OpenStreamMS.Services.Gamepad; +using Xunit; + +namespace OpenStreamMS.Tests; + +public class OsmsPadInstanceTests +{ + [Theory] + // ID real de un mando creado en la sesión 1 (Windows 11, 2026-11-14) + [InlineData(@"HID\VID_045E&PID_0B12&IG_00\1&36444BD7&0&OSMS_S1_P0", 1u, 0)] + [InlineData(@"HID\VID_045E&PID_0B12&IG_00\1&abc&0&osms_s12_p15", 12u, 15)] + public void ReadsSessionAndPad(string instanceId, uint session, int pad) + { + var m = GamepadSessionIsolation.OsmsPadInstanceRegex().Match(instanceId); + Assert.True(m.Success); + Assert.Equal(session, uint.Parse(m.Groups[1].Value)); + Assert.Equal(pad, int.Parse(m.Groups[2].Value)); + } + + [Theory] + [InlineData(@"HID\VID_045E&PID_0B12&IG_00\2&26D203C3&0&0000")] // colección HID hija + [InlineData(@"USB\VID_045E&PID_028E\OSMS_S1_P0_X")] // no acaba en el patrón + [InlineData(@"ROOT\SYSTEM\0005")] + public void IgnoresOtherNodes(string instanceId) => + Assert.False(GamepadSessionIsolation.OsmsPadInstanceRegex().IsMatch(instanceId)); +} From 2b6988243ef76051d7b3bd6353f231971d6fdbc3 Mon Sep 17 00:00:00 2001 From: mlopezsegura <90263997+mlopezsegura@users.noreply.github.com> Date: Sat, 14 Nov 2026 14:15:03 +0100 Subject: [PATCH 3/3] Installer: build, sign and install OsmsPad build-installer compiles and signs OsmsPad like RemoteIdd (one-use test certificate) into osmspad-pkg; setup installs it on Windows 10 2004 or later, before the service starts so Sunshine picks gamepad_driver = osmspad, and the uninstaller removes the device, the driver package and its certificate. Co-Authored-By: Claude Opus 5.5 --- Core/Installer/build-installer.bat | 14 ++++++++++++++ Core/Installer/messages.generated.iss | 22 ++++++++++++++++++++++ Core/Installer/messages/bg.json | 3 ++- Core/Installer/messages/cs.json | 3 ++- Core/Installer/messages/de.json | 3 ++- Core/Installer/messages/en.json | 3 ++- Core/Installer/messages/en_GB.json | 3 ++- Core/Installer/messages/en_US.json | 3 ++- Core/Installer/messages/es.json | 3 ++- Core/Installer/messages/fr.json | 3 ++- Core/Installer/messages/hu.json | 3 ++- Core/Installer/messages/it.json | 3 ++- Core/Installer/messages/ja.json | 3 ++- Core/Installer/messages/ko.json | 3 ++- Core/Installer/messages/pl.json | 3 ++- Core/Installer/messages/pt.json | 3 ++- Core/Installer/messages/pt_BR.json | 3 ++- Core/Installer/messages/ru.json | 3 ++- Core/Installer/messages/sv.json | 3 ++- Core/Installer/messages/tr.json | 3 ++- Core/Installer/messages/uk.json | 3 ++- Core/Installer/messages/vi.json | 3 ++- Core/Installer/messages/zh.json | 3 ++- Core/Installer/messages/zh_TW.json | 3 ++- Core/Installer/setup.iss | 16 ++++++++++++++++ 25 files changed, 96 insertions(+), 22 deletions(-) diff --git a/Core/Installer/build-installer.bat b/Core/Installer/build-installer.bat index 5a5b583..7daefee 100644 --- a/Core/Installer/build-installer.bat +++ b/Core/Installer/build-installer.bat @@ -72,6 +72,20 @@ if errorlevel 1 ( exit /b 1 ) +:: Driver de mandos (OsmsPad): igual que RemoteIdd, compilado, probado y firmado aquí con un +:: certificado de un solo uso. Usa el WDK NuGet que acaba de descargar RemoteIdd. +echo [2e/3] Compilando y firmando OsmsPad... +call "%~dp0..\..\Native\OsmsPad\build.cmd" +if errorlevel 1 ( + echo ERROR: no se pudo compilar Native\OsmsPad. + exit /b 1 +) +powershell -NoProfile -ExecutionPolicy Bypass -File "%~dp0..\..\Native\OsmsPad\package.ps1" -Bin "%~dp0..\..\Native\OsmsPad\bin" -OutDir "%PUBLISH_DIR%\osmspad-pkg" +if errorlevel 1 ( + echo ERROR: no se pudo preparar el paquete de OsmsPad. + exit /b 1 +) + echo [3/3] Compilando instalador con Inno Setup... if not exist %ISCC% ( echo ERROR: No se encontro Inno Setup en %ISCC% diff --git a/Core/Installer/messages.generated.iss b/Core/Installer/messages.generated.iss index 3ef8176..1e7bcd9 100644 --- a/Core/Installer/messages.generated.iss +++ b/Core/Installer/messages.generated.iss @@ -8,6 +8,7 @@ bulgarian.StatusInstallRemoteIdd=Инсталиране на драйвера н bulgarian.StatusStartService=Стартиране на услугата... bulgarian.AskPurgeData=Също така да изтриете всички OpenStreamMS данни?%n%nСесии, локални работни станции и настройки; osms- потребителите на изолирани сесии и техните профили (включително игри и настройки, записани в тях); поточни профили, ProgramData\OpenStreamMS и временни файлове.%n%nАко отговорите с Не, сесиите и настройките се запазват за повторно инсталиране. bulgarian.AskRemoveDeps=Също така деинсталирайте TermWrap, ViGEmBus и HidHide?%n%nОтговор Не, ако други приложения ги използват. +bulgarian.StatusInstallOsmsPad=Инсталиране на драйвера за геймпади (OsmsPad)... czech.GroupService=Servis: czech.TaskStartService=Spusťte službu ihned po instalaci czech.IconComment=OpenStreamMS ovládací panel @@ -17,6 +18,7 @@ czech.StatusInstallRemoteIdd=Instalace ovladače zobrazení pracovní stanice (R czech.StatusStartService=Spouštění služby... czech.AskPurgeData=Smazat také všechna data OpenStreamMS?%n%nSRelace, místní pracovní stanice a nastavení; uživatelé osms- izolovaných relací a jejich profily (včetně her a nastavení v nich uložených); profily streamu, ProgramData\OpenStreamMS a dočasné soubory.%n%nPokud odpovíte Ne, relace a nastavení budou zachovány pro přeinstalaci. czech.AskRemoveDeps=Odinstalujte také TermWrap, ViGEmBus a HidHide?%n%nAOdpověď Ne, pokud je používají jiné aplikace. +czech.StatusInstallOsmsPad=Instalace ovladače herních ovladačů (OsmsPad)... german.GroupService=Service: german.TaskStartService=Starten Sie den Dienst direkt nach der Installation german.IconComment=OpenStreamMS Bedienfeld @@ -26,6 +28,7 @@ german.StatusInstallRemoteIdd=Installieren des Workstation-Anzeigetreibers (Remo german.StatusStartService=Dienst starten... german.AskPurgeData=Außerdem alle OpenStreamMS-Daten löschen?%n%nSitzungen, lokale Workstations und Einstellungen; die osms--Benutzer isolierter Sitzungen und ihre Profile (einschließlich der darin gespeicherten Spiele und Einstellungen); Stream-Profile, ProgramData\OpenStreamMS und temporäre Dateien.%n%nWenn Sie mit „Nein“ antworten, bleiben Sitzungen und Einstellungen für eine Neuinstallation erhalten. german.AskRemoveDeps=Deinstallieren Sie auch TermWrap, ViGEmBus und HidHide?%n%nAnswer Nein, wenn andere Anwendungen sie verwenden. +german.StatusInstallOsmsPad=Gamepad-Treiber wird installiert (OsmsPad)... english.GroupService=Service: english.TaskStartService=Start the service right after installing english.IconComment=OpenStreamMS control panel @@ -35,6 +38,7 @@ english.StatusInstallRemoteIdd=Installing the seat display driver (RemoteIdd)... english.StatusStartService=Starting the service... english.AskPurgeData=Also delete all OpenStreamMS data?%n%nSessions, seats and settings; the osms- users of isolated sessions and their profiles (including games and settings saved in them); stream profiles, ProgramData\OpenStreamMS and temporary files.%n%nIf you answer No, sessions and settings are kept for a reinstall. english.AskRemoveDeps=Also uninstall TermWrap, ViGEmBus and HidHide?%n%nAnswer No if other applications use them. +english.StatusInstallOsmsPad=Installing the gamepad driver (OsmsPad)... britishenglish.GroupService=Service: britishenglish.TaskStartService=Start the service right after installing britishenglish.IconComment=OpenStreamMS control panel @@ -44,6 +48,7 @@ britishenglish.StatusInstallRemoteIdd=Installing the seat display driver (Remote britishenglish.StatusStartService=Starting the service... britishenglish.AskPurgeData=Also delete all OpenStreamMS data?%n%nSessions, seats and settings; the osms- users of isolated sessions and their profiles (including games and settings saved in them); stream profiles, ProgramData\OpenStreamMS and temporary files.%n%nIf you answer No, sessions and settings are kept for a reinstall. britishenglish.AskRemoveDeps=Also uninstall TermWrap, ViGEmBus and HidHide?%n%nAnswer No if other applications use them. +britishenglish.StatusInstallOsmsPad=Installing the gamepad driver (OsmsPad)... americanenglish.GroupService=Service: americanenglish.TaskStartService=Start the service right after installing americanenglish.IconComment=OpenStreamMS control panel @@ -53,6 +58,7 @@ americanenglish.StatusInstallRemoteIdd=Installing the seat display driver (Remot americanenglish.StatusStartService=Starting the service... americanenglish.AskPurgeData=Also delete all OpenStreamMS data?%n%nSessions, seats and settings; the osms- users of isolated sessions and their profiles (including games and settings saved in them); stream profiles, ProgramData\OpenStreamMS and temporary files.%n%nIf you answer No, sessions and settings are kept for a reinstall. americanenglish.AskRemoveDeps=Also uninstall TermWrap, ViGEmBus and HidHide?%n%nAnswer No if other applications use them. +americanenglish.StatusInstallOsmsPad=Installing the gamepad driver (OsmsPad)... spanish.GroupService=Servicio: spanish.TaskStartService=Iniciar el servicio ahora tras la instalación spanish.IconComment=Panel de control de OpenStreamMS @@ -62,6 +68,7 @@ spanish.StatusInstallRemoteIdd=Instalando el driver de pantalla de los puestos ( spanish.StatusStartService=Iniciando servicio... spanish.AskPurgeData=¿Borrar también todos los datos de OpenStreamMS?%n%nSesiones, puestos y configuración; los usuarios osms- de las sesiones aisladas y sus perfiles (incluidos juegos y ajustes guardados en ellos); perfiles de stream, ProgramData\OpenStreamMS y ficheros temporales.%n%nSi respondes No, se conservan las sesiones y la configuración para una reinstalación. spanish.AskRemoveDeps=¿Desinstalar también TermWrap, ViGEmBus y HidHide?%n%nResponde No si otras aplicaciones los usan. +spanish.StatusInstallOsmsPad=Instalando el driver de mandos (OsmsPad)... french.GroupService=Service : french.TaskStartService=Démarrer le service juste après l'installation french.IconComment=Panneau de contrôle OpenStreamMS @@ -71,6 +78,7 @@ french.StatusInstallRemoteIdd=Installation du pilote d'affichage des postes (Rem french.StatusStartService=Démarrage du service... french.AskPurgeData=Supprimer aussi toutes les données d'OpenStreamMS ?%n%nSessions, postes et paramètres ; les utilisateurs osms- des sessions isolées et leurs profils (y compris les jeux et réglages qui y sont enregistrés) ; les profils de stream, ProgramData\OpenStreamMS et les fichiers temporaires.%n%nSi vous répondez Non, les sessions et les paramètres sont conservés pour une réinstallation. french.AskRemoveDeps=Désinstaller aussi TermWrap, ViGEmBus et HidHide ?%n%nRépondez Non si d'autres applications les utilisent. +french.StatusInstallOsmsPad=Installation du pilote de manettes (OsmsPad)... hungarian.GroupService=Szolgáltatás: hungarian.TaskStartService=Indítsa el a szolgáltatást közvetlenül a telepítés után hungarian.IconComment=OpenStreamMS kezelőpanel @@ -80,6 +88,7 @@ hungarian.StatusInstallRemoteIdd=A munkaállomás kijelző-illesztőprogramjána hungarian.StatusStartService=A szolgáltatás indítása... hungarian.AskPurgeData=Töröl továbbá minden OpenStreamMS adatot?%n%nSessions, helyi munkaállomások és beállítások; az elszigetelt munkamenetek osms- felhasználói és profiljaik (beleértve a bennük elmentett játékokat és beállításokat); streamprofilok, ProgramData\OpenStreamMS és ideiglenes fájlok.%n%nHa nemmel válaszol, a munkamenetek és a beállítások megmaradnak az újratelepítéshez. hungarian.AskRemoveDeps=Távolítsa el a TermWrap, ViGEmBus és HidHide?%n%nA elemeket is. Nem, ha más alkalmazások használják őket. +hungarian.StatusInstallOsmsPad=A játékvezérlő-illesztőprogram telepítése (OsmsPad)... italian.GroupService=Servizio: italian.TaskStartService=Avvia il servizio subito dopo l'installazione italian.IconComment=OpenStreamMS pannello di controllo @@ -89,6 +98,7 @@ italian.StatusInstallRemoteIdd=Installazione del driver del display della workst italian.StatusStartService=Avvio del servizio... italian.AskPurgeData=Elimina anche tutti i dati OpenStreamMS?%n%nSessioni, workstation locali e impostazioni; gli utenti osms- di sessioni isolate e i loro profili (compresi i giochi e le impostazioni in essi salvati); profili di streaming, ProgramData\OpenStreamMS e file temporanei.%n%nIe rispondi No, le sessioni e le impostazioni vengono conservate per una reinstallazione. italian.AskRemoveDeps=Disinstalla anche TermWrap, ViGEmBus e HidHide?%n%nRispondi No se altre applicazioni li utilizzano. +italian.StatusInstallOsmsPad=Installazione del driver dei controller (OsmsPad)... japanese.GroupService=サービス: japanese.TaskStartService=インストール直後にサービスを開始する japanese.IconComment=OpenStreamMS コントロールパネル @@ -98,6 +108,7 @@ japanese.StatusInstallRemoteIdd=ワークステーション ディスプレイ japanese.StatusStartService=サービスを開始しています... japanese.AskPurgeData=OpenStreamMS のすべてのデータも削除しますか?%n%nセッション、ワークステーション、設定、分離セッションの osms- ユーザーとそのプロファイル(保存されたゲームと設定を含む)、ストリーミングプロファイル、ProgramData\OpenStreamMS、一時ファイルが対象です。%n%n「いいえ」を選ぶと、再インストールに備えてセッションと設定を保持します。 japanese.AskRemoveDeps=TermWrap、ViGEmBus、HidHide もアンインストールしますか?%n%nほかのアプリケーションが使用している場合は「いいえ」を選んでください。 +japanese.StatusInstallOsmsPad=ゲームパッド ドライバーをインストールしています (OsmsPad)... korean.GroupService=서비스: korean.TaskStartService=설치 후 바로 서비스 시작 korean.IconComment=OpenStreamMS 제어판 @@ -107,6 +118,7 @@ korean.StatusInstallRemoteIdd=워크스테이션 디스플레이 드라이버(Re korean.StatusStartService=서비스를 시작하는 중... korean.AskPurgeData=또한 모든 OpenStreamMS 데이터를 삭제하시겠습니까?%n%nSessions, 로컬 워크스테이션 및 설정; 격리된 세션의 osms- 사용자 및 해당 프로필(여기에 저장된 게임 및 설정 포함) 스트림 프로필, ProgramData\OpenStreamMS 및 임시 파일.%n%n아니요로 대답하면 재설치를 위해 세션과 설정이 유지됩니다. korean.AskRemoveDeps=TermWrap, ViGEmBus 및 HidHide도 제거하시겠습니까? %n%nAnswer 다른 응용 프로그램에서 사용하는 경우 아니요입니다. +korean.StatusInstallOsmsPad=게임패드 드라이버 설치 중 (OsmsPad)... polish.GroupService=Serwis: polish.TaskStartService=Uruchom usługę zaraz po instalacji polish.IconComment=OpenStreamMS @@ -116,6 +128,7 @@ polish.StatusInstallRemoteIdd=Instalowanie sterownika ekranu stacji roboczej (Re polish.StatusStartService=Uruchamianie usługi... polish.AskPurgeData=Usunąć także wszystkie dane OpenStreamMS?%n%nSesje, lokalne stacje robocze i ustawienia; użytkownicy osms- izolowanych sesji i ich profile (w tym gry i zapisane w nich ustawienia); profile strumieniowe, ProgramData\OpenStreamMS i pliki tymczasowe.%n%nJeśli odpowiesz Nie, sesje i ustawienia zostaną zachowane na potrzeby ponownej instalacji. polish.AskRemoveDeps=Odinstaluj także TermWrap, ViGEmBus i HidHide?%n%nAOdpowiedź Nie, jeśli używają ich inne aplikacje. +polish.StatusInstallOsmsPad=Instalowanie sterownika kontrolerów (OsmsPad)... portuguese.GroupService=Serviço: portuguese.TaskStartService=Iniciar o serviço logo após a instalação portuguese.IconComment=Painel de controlo do OpenStreamMS @@ -125,6 +138,7 @@ portuguese.StatusInstallRemoteIdd=A instalar o controlador de ecrã dos postos ( portuguese.StatusStartService=A iniciar o serviço... portuguese.AskPurgeData=Eliminar também todos os dados do OpenStreamMS?%n%nSessões, postos e definições; os utilizadores osms- das sessões isoladas e os respetivos perfis (incluindo jogos e definições guardados neles); perfis de stream, ProgramData\OpenStreamMS e ficheiros temporários.%n%nSe responder Não, as sessões e as definições são mantidas para uma reinstalação. portuguese.AskRemoveDeps=Desinstalar também o TermWrap, o ViGEmBus e o HidHide?%n%nResponda Não se outras aplicações os utilizarem. +portuguese.StatusInstallOsmsPad=A instalar o controlador de comandos (OsmsPad)... brazilianportuguese.GroupService=: brazilianportuguese.TaskStartService=Inicie o serviço logo após a instalação Estações de trabalho locais brazilianportuguese.IconComment=OpenStreamMS @@ -134,6 +148,7 @@ brazilianportuguese.StatusInstallRemoteIdd=Instalando o driver de vídeo da esta brazilianportuguese.StatusStartService=Iniciando o serviço... brazilianportuguese.AskPurgeData=Exclua também todos os dados OpenStreamMS?%n%nSessões, estações de trabalho locais e configurações; os usuários osms- de sessões isoladas e seus perfis (incluindo jogos e configurações neles salvos); perfis de fluxo, ProgramData\OpenStreamMS e arquivos temporários.%n%nSe você responder Não, as sessões e configurações serão mantidas para uma reinstalação. brazilianportuguese.AskRemoveDeps=Desinstale também TermWrap, ViGEmBus e HidHide?%n%nResponda Não se outros aplicativos os usarem. +brazilianportuguese.StatusInstallOsmsPad=Instalando o driver de controles (OsmsPad)... russian.GroupService=Служба: russian.TaskStartService=Запустить службу сразу после установки russian.IconComment=Панель управления OpenStreamMS @@ -143,6 +158,7 @@ russian.StatusInstallRemoteIdd=Установка драйвера диспле russian.StatusStartService=Запуск службы... russian.AskPurgeData=Удалить также все данные OpenStreamMS?%n%nСеансы, рабочие места и настройки; пользователей osms- изолированных сеансов и их профили (включая сохранённые в них игры и настройки); профили трансляций, ProgramData\OpenStreamMS и временные файлы.%n%nЕсли ответить «Нет», сеансы и настройки будут сохранены для повторной установки. russian.AskRemoveDeps=Удалить также TermWrap, ViGEmBus и HidHide?%n%nОтветьте «Нет», если они используются другими приложениями. +russian.StatusInstallOsmsPad=Установка драйвера геймпадов (OsmsPad)... swedish.GroupService=Service: swedish.TaskStartService=Starta tjänsten direkt efter installationen swedish.IconComment=OpenStreamMS kontrollpanel @@ -152,6 +168,7 @@ swedish.StatusInstallRemoteIdd=Installera arbetsstationens bildskärmsdrivrutin swedish.StatusStartService=Startar tjänsten... swedish.AskPurgeData=Radera också alla OpenStreamMS-data?%n%nSessioner, lokala arbetsstationer och inställningar; osms--användarna av isolerade sessioner och deras profiler (inklusive spel och inställningar som sparats i dem); stream-profiler, ProgramData\OpenStreamMS och temporära filer.%n%nOm du svarar Nej, sparas sessioner och inställningar för en ominstallation. swedish.AskRemoveDeps=Avinstallera även TermWrap, ViGEmBus och HidHide?%n%nAsvara Nej om andra program använder dem. +swedish.StatusInstallOsmsPad=Installerar drivrutinen för handkontroller (OsmsPad)... turkish.GroupService=Hizmeti: turkish.TaskStartService=Hizmeti kurulumdan hemen sonra başlatın turkish.IconComment=OpenStreamMS kontrol paneli @@ -161,6 +178,7 @@ turkish.StatusInstallRemoteIdd=İş istasyonu ekran sürücüsünü yükleme (Re turkish.StatusStartService=Hizmet başlatılıyor... turkish.AskPurgeData=Ayrıca tüm OpenStreamMS verileri silinsin mi?%n%nOturumlar, yerel iş istasyonları ve ayarlar; izole oturumların osms- kullanıcıları ve profilleri (bunlara kaydedilen oyunlar ve ayarlar dahil); akış profilleri, ProgramData\OpenStreamMS ve geçici dosyalar.%n%nHayır yanıtını verirseniz, oturumlar ve ayarlar yeniden yükleme için saklanır. turkish.AskRemoveDeps=Ayrıca TermWrap, ViGEmBus ve HidHide'yi de kaldırın?%n%nABaşka uygulamalar bunları kullanıyorsa Yanıt Hayır. +turkish.StatusInstallOsmsPad=Oyun kumandası sürücüsü yükleniyor (OsmsPad)... ukrainian.GroupService=Сервіс: ukrainian.TaskStartService=Запустіть службу відразу після встановлення ukrainian.IconComment=OpenStreamMS панель керування @@ -170,6 +188,7 @@ ukrainian.StatusInstallRemoteIdd=Встановлення драйвера ди ukrainian.StatusStartService=Запуск послуги... ukrainian.AskPurgeData=Також видалити всі дані OpenStreamMS?%n%nСесії, локальні робочі станції та налаштування; користувачі ізольованих сесій osms- та їхні профілі (включаючи збережені в них ігри та налаштування); профілі потоку, ProgramData\OpenStreamMS і тимчасові файли.%n%nЯкщо ви відповісте Ні, сеанси та налаштування зберігаються для повторного встановлення. ukrainian.AskRemoveDeps=Також видаліть TermWrap, ViGEmBus і HidHide?%n%nAВідповідь Ні, якщо їх використовують інші програми. +ukrainian.StatusInstallOsmsPad=Встановлення драйвера геймпадів (OsmsPad)... vietnamese.GroupService=: vietnamese.TaskStartService=Khởi động dịch vụ ngay sau khi cài đặt vietnamese.IconComment=OpenStreamMS @@ -179,6 +198,7 @@ vietnamese.StatusInstallRemoteIdd=Đang cài đặt trình điều khiển hiể vietnamese.StatusStartService=Bắt đầu dịch vụ... vietnamese.AskPurgeData=Đồng thời xóa tất cả dữ liệu OpenStreamMS?%n%nPhiên, máy trạm cục bộ và cài đặt; người dùng osms- của các phiên bị cô lập và hồ sơ của họ (bao gồm các trò chơi và cài đặt được lưu trong đó); cấu hình luồng, ProgramData\OpenStreamMS và các tệp tạm thời.%n%nNếu bạn trả lời Không, các phiên và cài đặt sẽ được giữ lại để cài đặt lại. vietnamese.AskRemoveDeps=Đồng thời gỡ cài đặt TermWrap, ViGEmBus và HidHide?%n%nanswer Không nếu các ứng dụng khác sử dụng chúng. +vietnamese.StatusInstallOsmsPad=Đang cài trình điều khiển tay cầm (OsmsPad)... chinesesimplified.GroupService=服务: chinesesimplified.TaskStartService=安装后立即启动服务 chinesesimplified.IconComment=OpenStreamMS 控制面板 @@ -188,6 +208,7 @@ chinesesimplified.StatusInstallRemoteIdd=正在安装工作站显示驱动程序 chinesesimplified.StatusStartService=正在启动服务... chinesesimplified.AskPurgeData=还删除所有 OpenStreamMS 数据?%n%n 会话、本地工作站和设置;隔离会话的 osms- 用户及其个人资料(包括其中保存的游戏和设置);流配置文件、ProgramData\OpenStreamMS 和临时文件。%n%n 如果您回答“否”,会话和设置将保留以供重新安装。 chinesesimplified.AskRemoveDeps=还要卸载 TermWrap、ViGEmBus 和 HidHide?%n%n 回答否,如果其他应用程序使用它们。 +chinesesimplified.StatusInstallOsmsPad=正在安装手柄驱动程序 (OsmsPad)... chinesetraditional.GroupService=服務: chinesetraditional.TaskStartService=安裝後立即啟動服務 chinesetraditional.IconComment=OpenStreamMS 控制面板 @@ -197,3 +218,4 @@ chinesetraditional.StatusInstallRemoteIdd=正在安裝工作站顯示驅動程 chinesetraditional.StatusStartService=正在啟動服務... chinesetraditional.AskPurgeData=還刪除所有 OpenStreamMS 資料? %n%n 會話、本機工作站和設定;隔離會話的 osms- 使用者及其個人資料(包括其中保存的遊戲和設定);串流設定檔、ProgramData\OpenStreamMS 和臨時檔案。 %n%n 如果您回答“否”,會話和設定將保留以供重新安裝。 chinesetraditional.AskRemoveDeps=還要卸載 TermWrap、ViGEmBus 和 HidHide? %n%n 回答否,如果其他應用程式使用它們。 +chinesetraditional.StatusInstallOsmsPad=正在安裝控制器驅動程式 (OsmsPad)... diff --git a/Core/Installer/messages/bg.json b/Core/Installer/messages/bg.json index 2505f2c..7980f25 100644 --- a/Core/Installer/messages/bg.json +++ b/Core/Installer/messages/bg.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "Инсталиране на драйвера на дисплея на работната станция (RemoteIdd)...", "StatusStartService": "Стартиране на услугата...", "AskPurgeData": "Също така да изтриете всички OpenStreamMS данни?%n%nСесии, локални работни станции и настройки; osms- потребителите на изолирани сесии и техните профили (включително игри и настройки, записани в тях); поточни профили, ProgramData\\OpenStreamMS и временни файлове.%n%nАко отговорите с Не, сесиите и настройките се запазват за повторно инсталиране.", - "AskRemoveDeps": "Също така деинсталирайте TermWrap, ViGEmBus и HidHide?%n%nОтговор Не, ако други приложения ги използват." + "AskRemoveDeps": "Също така деинсталирайте TermWrap, ViGEmBus и HidHide?%n%nОтговор Не, ако други приложения ги използват.", + "StatusInstallOsmsPad": "Инсталиране на драйвера за геймпади (OsmsPad)..." } diff --git a/Core/Installer/messages/cs.json b/Core/Installer/messages/cs.json index bde8521..c60c668 100644 --- a/Core/Installer/messages/cs.json +++ b/Core/Installer/messages/cs.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "Instalace ovladače zobrazení pracovní stanice (RemoteIdd)...", "StatusStartService": "Spouštění služby...", "AskPurgeData": "Smazat také všechna data OpenStreamMS?%n%nSRelace, místní pracovní stanice a nastavení; uživatelé osms- izolovaných relací a jejich profily (včetně her a nastavení v nich uložených); profily streamu, ProgramData\\OpenStreamMS a dočasné soubory.%n%nPokud odpovíte Ne, relace a nastavení budou zachovány pro přeinstalaci.", - "AskRemoveDeps": "Odinstalujte také TermWrap, ViGEmBus a HidHide?%n%nAOdpověď Ne, pokud je používají jiné aplikace." + "AskRemoveDeps": "Odinstalujte také TermWrap, ViGEmBus a HidHide?%n%nAOdpověď Ne, pokud je používají jiné aplikace.", + "StatusInstallOsmsPad": "Instalace ovladače herních ovladačů (OsmsPad)..." } diff --git a/Core/Installer/messages/de.json b/Core/Installer/messages/de.json index 8aa5ee0..54f5be6 100644 --- a/Core/Installer/messages/de.json +++ b/Core/Installer/messages/de.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "Installieren des Workstation-Anzeigetreibers (RemoteIdd)...", "StatusStartService": "Dienst starten...", "AskPurgeData": "Außerdem alle OpenStreamMS-Daten löschen?%n%nSitzungen, lokale Workstations und Einstellungen; die osms--Benutzer isolierter Sitzungen und ihre Profile (einschließlich der darin gespeicherten Spiele und Einstellungen); Stream-Profile, ProgramData\\OpenStreamMS und temporäre Dateien.%n%nWenn Sie mit „Nein“ antworten, bleiben Sitzungen und Einstellungen für eine Neuinstallation erhalten.", - "AskRemoveDeps": "Deinstallieren Sie auch TermWrap, ViGEmBus und HidHide?%n%nAnswer Nein, wenn andere Anwendungen sie verwenden." + "AskRemoveDeps": "Deinstallieren Sie auch TermWrap, ViGEmBus und HidHide?%n%nAnswer Nein, wenn andere Anwendungen sie verwenden.", + "StatusInstallOsmsPad": "Gamepad-Treiber wird installiert (OsmsPad)..." } diff --git a/Core/Installer/messages/en.json b/Core/Installer/messages/en.json index 805ec20..c96b9ba 100644 --- a/Core/Installer/messages/en.json +++ b/Core/Installer/messages/en.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "Installing the seat display driver (RemoteIdd)...", "StatusStartService": "Starting the service...", "AskPurgeData": "Also delete all OpenStreamMS data?%n%nSessions, seats and settings; the osms- users of isolated sessions and their profiles (including games and settings saved in them); stream profiles, ProgramData\\OpenStreamMS and temporary files.%n%nIf you answer No, sessions and settings are kept for a reinstall.", - "AskRemoveDeps": "Also uninstall TermWrap, ViGEmBus and HidHide?%n%nAnswer No if other applications use them." + "AskRemoveDeps": "Also uninstall TermWrap, ViGEmBus and HidHide?%n%nAnswer No if other applications use them.", + "StatusInstallOsmsPad": "Installing the gamepad driver (OsmsPad)..." } diff --git a/Core/Installer/messages/en_GB.json b/Core/Installer/messages/en_GB.json index 805ec20..c96b9ba 100644 --- a/Core/Installer/messages/en_GB.json +++ b/Core/Installer/messages/en_GB.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "Installing the seat display driver (RemoteIdd)...", "StatusStartService": "Starting the service...", "AskPurgeData": "Also delete all OpenStreamMS data?%n%nSessions, seats and settings; the osms- users of isolated sessions and their profiles (including games and settings saved in them); stream profiles, ProgramData\\OpenStreamMS and temporary files.%n%nIf you answer No, sessions and settings are kept for a reinstall.", - "AskRemoveDeps": "Also uninstall TermWrap, ViGEmBus and HidHide?%n%nAnswer No if other applications use them." + "AskRemoveDeps": "Also uninstall TermWrap, ViGEmBus and HidHide?%n%nAnswer No if other applications use them.", + "StatusInstallOsmsPad": "Installing the gamepad driver (OsmsPad)..." } diff --git a/Core/Installer/messages/en_US.json b/Core/Installer/messages/en_US.json index 805ec20..c96b9ba 100644 --- a/Core/Installer/messages/en_US.json +++ b/Core/Installer/messages/en_US.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "Installing the seat display driver (RemoteIdd)...", "StatusStartService": "Starting the service...", "AskPurgeData": "Also delete all OpenStreamMS data?%n%nSessions, seats and settings; the osms- users of isolated sessions and their profiles (including games and settings saved in them); stream profiles, ProgramData\\OpenStreamMS and temporary files.%n%nIf you answer No, sessions and settings are kept for a reinstall.", - "AskRemoveDeps": "Also uninstall TermWrap, ViGEmBus and HidHide?%n%nAnswer No if other applications use them." + "AskRemoveDeps": "Also uninstall TermWrap, ViGEmBus and HidHide?%n%nAnswer No if other applications use them.", + "StatusInstallOsmsPad": "Installing the gamepad driver (OsmsPad)..." } diff --git a/Core/Installer/messages/es.json b/Core/Installer/messages/es.json index 8dd53c2..56e4955 100644 --- a/Core/Installer/messages/es.json +++ b/Core/Installer/messages/es.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "Instalando el driver de pantalla de los puestos (RemoteIdd)...", "StatusStartService": "Iniciando servicio...", "AskPurgeData": "¿Borrar también todos los datos de OpenStreamMS?%n%nSesiones, puestos y configuración; los usuarios osms- de las sesiones aisladas y sus perfiles (incluidos juegos y ajustes guardados en ellos); perfiles de stream, ProgramData\\OpenStreamMS y ficheros temporales.%n%nSi respondes No, se conservan las sesiones y la configuración para una reinstalación.", - "AskRemoveDeps": "¿Desinstalar también TermWrap, ViGEmBus y HidHide?%n%nResponde No si otras aplicaciones los usan." + "AskRemoveDeps": "¿Desinstalar también TermWrap, ViGEmBus y HidHide?%n%nResponde No si otras aplicaciones los usan.", + "StatusInstallOsmsPad": "Instalando el driver de mandos (OsmsPad)..." } diff --git a/Core/Installer/messages/fr.json b/Core/Installer/messages/fr.json index 3ef4aea..3588e2d 100644 --- a/Core/Installer/messages/fr.json +++ b/Core/Installer/messages/fr.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "Installation du pilote d'affichage des postes (RemoteIdd)...", "StatusStartService": "Démarrage du service...", "AskPurgeData": "Supprimer aussi toutes les données d'OpenStreamMS ?%n%nSessions, postes et paramètres ; les utilisateurs osms- des sessions isolées et leurs profils (y compris les jeux et réglages qui y sont enregistrés) ; les profils de stream, ProgramData\\OpenStreamMS et les fichiers temporaires.%n%nSi vous répondez Non, les sessions et les paramètres sont conservés pour une réinstallation.", - "AskRemoveDeps": "Désinstaller aussi TermWrap, ViGEmBus et HidHide ?%n%nRépondez Non si d'autres applications les utilisent." + "AskRemoveDeps": "Désinstaller aussi TermWrap, ViGEmBus et HidHide ?%n%nRépondez Non si d'autres applications les utilisent.", + "StatusInstallOsmsPad": "Installation du pilote de manettes (OsmsPad)..." } diff --git a/Core/Installer/messages/hu.json b/Core/Installer/messages/hu.json index f64f91e..e0a5a85 100644 --- a/Core/Installer/messages/hu.json +++ b/Core/Installer/messages/hu.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "A munkaállomás kijelző-illesztőprogramjának telepítése (RemoteIdd)...", "StatusStartService": "A szolgáltatás indítása...", "AskPurgeData": "Töröl továbbá minden OpenStreamMS adatot?%n%nSessions, helyi munkaállomások és beállítások; az elszigetelt munkamenetek osms- felhasználói és profiljaik (beleértve a bennük elmentett játékokat és beállításokat); streamprofilok, ProgramData\\OpenStreamMS és ideiglenes fájlok.%n%nHa nemmel válaszol, a munkamenetek és a beállítások megmaradnak az újratelepítéshez.", - "AskRemoveDeps": "Távolítsa el a TermWrap, ViGEmBus és HidHide?%n%nA elemeket is. Nem, ha más alkalmazások használják őket." + "AskRemoveDeps": "Távolítsa el a TermWrap, ViGEmBus és HidHide?%n%nA elemeket is. Nem, ha más alkalmazások használják őket.", + "StatusInstallOsmsPad": "A játékvezérlő-illesztőprogram telepítése (OsmsPad)..." } diff --git a/Core/Installer/messages/it.json b/Core/Installer/messages/it.json index 199a3fc..4b18812 100644 --- a/Core/Installer/messages/it.json +++ b/Core/Installer/messages/it.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "Installazione del driver del display della workstation (RemoteIdd)...", "StatusStartService": "Avvio del servizio...", "AskPurgeData": "Elimina anche tutti i dati OpenStreamMS?%n%nSessioni, workstation locali e impostazioni; gli utenti osms- di sessioni isolate e i loro profili (compresi i giochi e le impostazioni in essi salvati); profili di streaming, ProgramData\\OpenStreamMS e file temporanei.%n%nIe rispondi No, le sessioni e le impostazioni vengono conservate per una reinstallazione.", - "AskRemoveDeps": "Disinstalla anche TermWrap, ViGEmBus e HidHide?%n%nRispondi No se altre applicazioni li utilizzano." + "AskRemoveDeps": "Disinstalla anche TermWrap, ViGEmBus e HidHide?%n%nRispondi No se altre applicazioni li utilizzano.", + "StatusInstallOsmsPad": "Installazione del driver dei controller (OsmsPad)..." } diff --git a/Core/Installer/messages/ja.json b/Core/Installer/messages/ja.json index 0e41971..637a506 100644 --- a/Core/Installer/messages/ja.json +++ b/Core/Installer/messages/ja.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "ワークステーション ディスプレイ ドライバー (RemoteIdd) をインストールしています...", "StatusStartService": "サービスを開始しています...", "AskPurgeData": "OpenStreamMS のすべてのデータも削除しますか?%n%nセッション、ワークステーション、設定、分離セッションの osms- ユーザーとそのプロファイル(保存されたゲームと設定を含む)、ストリーミングプロファイル、ProgramData\\OpenStreamMS、一時ファイルが対象です。%n%n「いいえ」を選ぶと、再インストールに備えてセッションと設定を保持します。", - "AskRemoveDeps": "TermWrap、ViGEmBus、HidHide もアンインストールしますか?%n%nほかのアプリケーションが使用している場合は「いいえ」を選んでください。" + "AskRemoveDeps": "TermWrap、ViGEmBus、HidHide もアンインストールしますか?%n%nほかのアプリケーションが使用している場合は「いいえ」を選んでください。", + "StatusInstallOsmsPad": "ゲームパッド ドライバーをインストールしています (OsmsPad)..." } diff --git a/Core/Installer/messages/ko.json b/Core/Installer/messages/ko.json index 1b1f4df..efbf9e3 100644 --- a/Core/Installer/messages/ko.json +++ b/Core/Installer/messages/ko.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "워크스테이션 디스플레이 드라이버(RemoteIdd) 설치 중...", "StatusStartService": "서비스를 시작하는 중...", "AskPurgeData": "또한 모든 OpenStreamMS 데이터를 삭제하시겠습니까?%n%nSessions, 로컬 워크스테이션 및 설정; 격리된 세션의 osms- 사용자 및 해당 프로필(여기에 저장된 게임 및 설정 포함) 스트림 프로필, ProgramData\\OpenStreamMS 및 임시 파일.%n%n아니요로 대답하면 재설치를 위해 세션과 설정이 유지됩니다.", - "AskRemoveDeps": "TermWrap, ViGEmBus 및 HidHide도 제거하시겠습니까? %n%nAnswer 다른 응용 프로그램에서 사용하는 경우 아니요입니다." + "AskRemoveDeps": "TermWrap, ViGEmBus 및 HidHide도 제거하시겠습니까? %n%nAnswer 다른 응용 프로그램에서 사용하는 경우 아니요입니다.", + "StatusInstallOsmsPad": "게임패드 드라이버 설치 중 (OsmsPad)..." } diff --git a/Core/Installer/messages/pl.json b/Core/Installer/messages/pl.json index 96e418a..3283ce0 100644 --- a/Core/Installer/messages/pl.json +++ b/Core/Installer/messages/pl.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "Instalowanie sterownika ekranu stacji roboczej (RemoteIdd)...", "StatusStartService": "Uruchamianie usługi...", "AskPurgeData": "Usunąć także wszystkie dane OpenStreamMS?%n%nSesje, lokalne stacje robocze i ustawienia; użytkownicy osms- izolowanych sesji i ich profile (w tym gry i zapisane w nich ustawienia); profile strumieniowe, ProgramData\\OpenStreamMS i pliki tymczasowe.%n%nJeśli odpowiesz Nie, sesje i ustawienia zostaną zachowane na potrzeby ponownej instalacji.", - "AskRemoveDeps": "Odinstaluj także TermWrap, ViGEmBus i HidHide?%n%nAOdpowiedź Nie, jeśli używają ich inne aplikacje." + "AskRemoveDeps": "Odinstaluj także TermWrap, ViGEmBus i HidHide?%n%nAOdpowiedź Nie, jeśli używają ich inne aplikacje.", + "StatusInstallOsmsPad": "Instalowanie sterownika kontrolerów (OsmsPad)..." } diff --git a/Core/Installer/messages/pt.json b/Core/Installer/messages/pt.json index 29f67f0..3a6fd40 100644 --- a/Core/Installer/messages/pt.json +++ b/Core/Installer/messages/pt.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "A instalar o controlador de ecrã dos postos (RemoteIdd)...", "StatusStartService": "A iniciar o serviço...", "AskPurgeData": "Eliminar também todos os dados do OpenStreamMS?%n%nSessões, postos e definições; os utilizadores osms- das sessões isoladas e os respetivos perfis (incluindo jogos e definições guardados neles); perfis de stream, ProgramData\\OpenStreamMS e ficheiros temporários.%n%nSe responder Não, as sessões e as definições são mantidas para uma reinstalação.", - "AskRemoveDeps": "Desinstalar também o TermWrap, o ViGEmBus e o HidHide?%n%nResponda Não se outras aplicações os utilizarem." + "AskRemoveDeps": "Desinstalar também o TermWrap, o ViGEmBus e o HidHide?%n%nResponda Não se outras aplicações os utilizarem.", + "StatusInstallOsmsPad": "A instalar o controlador de comandos (OsmsPad)..." } diff --git a/Core/Installer/messages/pt_BR.json b/Core/Installer/messages/pt_BR.json index a829a10..bd27142 100644 --- a/Core/Installer/messages/pt_BR.json +++ b/Core/Installer/messages/pt_BR.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "Instalando o driver de vídeo da estação de trabalho (RemoteIdd)...", "StatusStartService": "Iniciando o serviço...", "AskPurgeData": "Exclua também todos os dados OpenStreamMS?%n%nSessões, estações de trabalho locais e configurações; os usuários osms- de sessões isoladas e seus perfis (incluindo jogos e configurações neles salvos); perfis de fluxo, ProgramData\\OpenStreamMS e arquivos temporários.%n%nSe você responder Não, as sessões e configurações serão mantidas para uma reinstalação.", - "AskRemoveDeps": "Desinstale também TermWrap, ViGEmBus e HidHide?%n%nResponda Não se outros aplicativos os usarem." + "AskRemoveDeps": "Desinstale também TermWrap, ViGEmBus e HidHide?%n%nResponda Não se outros aplicativos os usarem.", + "StatusInstallOsmsPad": "Instalando o driver de controles (OsmsPad)..." } diff --git a/Core/Installer/messages/ru.json b/Core/Installer/messages/ru.json index 93dc324..1bbad18 100644 --- a/Core/Installer/messages/ru.json +++ b/Core/Installer/messages/ru.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "Установка драйвера дисплея рабочих мест (RemoteIdd)...", "StatusStartService": "Запуск службы...", "AskPurgeData": "Удалить также все данные OpenStreamMS?%n%nСеансы, рабочие места и настройки; пользователей osms- изолированных сеансов и их профили (включая сохранённые в них игры и настройки); профили трансляций, ProgramData\\OpenStreamMS и временные файлы.%n%nЕсли ответить «Нет», сеансы и настройки будут сохранены для повторной установки.", - "AskRemoveDeps": "Удалить также TermWrap, ViGEmBus и HidHide?%n%nОтветьте «Нет», если они используются другими приложениями." + "AskRemoveDeps": "Удалить также TermWrap, ViGEmBus и HidHide?%n%nОтветьте «Нет», если они используются другими приложениями.", + "StatusInstallOsmsPad": "Установка драйвера геймпадов (OsmsPad)..." } diff --git a/Core/Installer/messages/sv.json b/Core/Installer/messages/sv.json index 0f41a84..4dc8953 100644 --- a/Core/Installer/messages/sv.json +++ b/Core/Installer/messages/sv.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "Installera arbetsstationens bildskärmsdrivrutin (RemoteIdd)...", "StatusStartService": "Startar tjänsten...", "AskPurgeData": "Radera också alla OpenStreamMS-data?%n%nSessioner, lokala arbetsstationer och inställningar; osms--användarna av isolerade sessioner och deras profiler (inklusive spel och inställningar som sparats i dem); stream-profiler, ProgramData\\OpenStreamMS och temporära filer.%n%nOm du svarar Nej, sparas sessioner och inställningar för en ominstallation.", - "AskRemoveDeps": "Avinstallera även TermWrap, ViGEmBus och HidHide?%n%nAsvara Nej om andra program använder dem." + "AskRemoveDeps": "Avinstallera även TermWrap, ViGEmBus och HidHide?%n%nAsvara Nej om andra program använder dem.", + "StatusInstallOsmsPad": "Installerar drivrutinen för handkontroller (OsmsPad)..." } diff --git a/Core/Installer/messages/tr.json b/Core/Installer/messages/tr.json index 38acca4..599c5b1 100644 --- a/Core/Installer/messages/tr.json +++ b/Core/Installer/messages/tr.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "İş istasyonu ekran sürücüsünü yükleme (RemoteIdd)...", "StatusStartService": "Hizmet başlatılıyor...", "AskPurgeData": "Ayrıca tüm OpenStreamMS verileri silinsin mi?%n%nOturumlar, yerel iş istasyonları ve ayarlar; izole oturumların osms- kullanıcıları ve profilleri (bunlara kaydedilen oyunlar ve ayarlar dahil); akış profilleri, ProgramData\\OpenStreamMS ve geçici dosyalar.%n%nHayır yanıtını verirseniz, oturumlar ve ayarlar yeniden yükleme için saklanır.", - "AskRemoveDeps": "Ayrıca TermWrap, ViGEmBus ve HidHide'yi de kaldırın?%n%nABaşka uygulamalar bunları kullanıyorsa Yanıt Hayır." + "AskRemoveDeps": "Ayrıca TermWrap, ViGEmBus ve HidHide'yi de kaldırın?%n%nABaşka uygulamalar bunları kullanıyorsa Yanıt Hayır.", + "StatusInstallOsmsPad": "Oyun kumandası sürücüsü yükleniyor (OsmsPad)..." } diff --git a/Core/Installer/messages/uk.json b/Core/Installer/messages/uk.json index e24f6dc..7ba5a7c 100644 --- a/Core/Installer/messages/uk.json +++ b/Core/Installer/messages/uk.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "Встановлення драйвера дисплея робочої станції (RemoteIdd)...", "StatusStartService": "Запуск послуги...", "AskPurgeData": "Також видалити всі дані OpenStreamMS?%n%nСесії, локальні робочі станції та налаштування; користувачі ізольованих сесій osms- та їхні профілі (включаючи збережені в них ігри та налаштування); профілі потоку, ProgramData\\OpenStreamMS і тимчасові файли.%n%nЯкщо ви відповісте Ні, сеанси та налаштування зберігаються для повторного встановлення.", - "AskRemoveDeps": "Також видаліть TermWrap, ViGEmBus і HidHide?%n%nAВідповідь Ні, якщо їх використовують інші програми." + "AskRemoveDeps": "Також видаліть TermWrap, ViGEmBus і HidHide?%n%nAВідповідь Ні, якщо їх використовують інші програми.", + "StatusInstallOsmsPad": "Встановлення драйвера геймпадів (OsmsPad)..." } diff --git a/Core/Installer/messages/vi.json b/Core/Installer/messages/vi.json index 0624c91..ffb8953 100644 --- a/Core/Installer/messages/vi.json +++ b/Core/Installer/messages/vi.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "Đang cài đặt trình điều khiển hiển thị máy trạm (RemoteIdd)...", "StatusStartService": "Bắt đầu dịch vụ...", "AskPurgeData": "Đồng thời xóa tất cả dữ liệu OpenStreamMS?%n%nPhiên, máy trạm cục bộ và cài đặt; người dùng osms- của các phiên bị cô lập và hồ sơ của họ (bao gồm các trò chơi và cài đặt được lưu trong đó); cấu hình luồng, ProgramData\\OpenStreamMS và các tệp tạm thời.%n%nNếu bạn trả lời Không, các phiên và cài đặt sẽ được giữ lại để cài đặt lại.", - "AskRemoveDeps": "Đồng thời gỡ cài đặt TermWrap, ViGEmBus và HidHide?%n%nanswer Không nếu các ứng dụng khác sử dụng chúng." + "AskRemoveDeps": "Đồng thời gỡ cài đặt TermWrap, ViGEmBus và HidHide?%n%nanswer Không nếu các ứng dụng khác sử dụng chúng.", + "StatusInstallOsmsPad": "Đang cài trình điều khiển tay cầm (OsmsPad)..." } diff --git a/Core/Installer/messages/zh.json b/Core/Installer/messages/zh.json index b5f2009..b488580 100644 --- a/Core/Installer/messages/zh.json +++ b/Core/Installer/messages/zh.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "正在安装工作站显示驱动程序 (RemoteIdd)...", "StatusStartService": "正在启动服务...", "AskPurgeData": "还删除所有 OpenStreamMS 数据?%n%n 会话、本地工作站和设置;隔离会话的 osms- 用户及其个人资料(包括其中保存的游戏和设置);流配置文件、ProgramData\\OpenStreamMS 和临时文件。%n%n 如果您回答“否”,会话和设置将保留以供重新安装。", - "AskRemoveDeps": "还要卸载 TermWrap、ViGEmBus 和 HidHide?%n%n 回答否,如果其他应用程序使用它们。" + "AskRemoveDeps": "还要卸载 TermWrap、ViGEmBus 和 HidHide?%n%n 回答否,如果其他应用程序使用它们。", + "StatusInstallOsmsPad": "正在安装手柄驱动程序 (OsmsPad)..." } diff --git a/Core/Installer/messages/zh_TW.json b/Core/Installer/messages/zh_TW.json index f0697f0..0ded7ab 100644 --- a/Core/Installer/messages/zh_TW.json +++ b/Core/Installer/messages/zh_TW.json @@ -7,5 +7,6 @@ "StatusInstallRemoteIdd": "正在安裝工作站顯示驅動程式 (RemoteIdd)...", "StatusStartService": "正在啟動服務...", "AskPurgeData": "還刪除所有 OpenStreamMS 資料? %n%n 會話、本機工作站和設定;隔離會話的 osms- 使用者及其個人資料(包括其中保存的遊戲和設定);串流設定檔、ProgramData\\OpenStreamMS 和臨時檔案。 %n%n 如果您回答“否”,會話和設定將保留以供重新安裝。", - "AskRemoveDeps": "還要卸載 TermWrap、ViGEmBus 和 HidHide? %n%n 回答否,如果其他應用程式使用它們。" + "AskRemoveDeps": "還要卸載 TermWrap、ViGEmBus 和 HidHide? %n%n 回答否,如果其他應用程式使用它們。", + "StatusInstallOsmsPad": "正在安裝控制器驅動程式 (OsmsPad)..." } diff --git a/Core/Installer/setup.iss b/Core/Installer/setup.iss index bf1b732..fe8b66d 100644 --- a/Core/Installer/setup.iss +++ b/Core/Installer/setup.iss @@ -102,6 +102,16 @@ Filename: "powershell.exe"; \ Flags: runhidden waituntilterminated; \ StatusMsg: "{cm:StatusInstallRemoteIdd}" +; 1c. Driver de mandos propio (OsmsPad, ver Native\OsmsPad): Sunshine lo usa en lugar de +; ViGEmBus (gamepad_driver = osmspad). Firma de prueba como RemoteIdd; install.ps1 quita +; antes la instalación anterior. Necesita Windows 10 2004: en uno anterior se sigue con +; ViGEmBus. Log en %ProgramData%\OpenStreamMS\osmspad-setup.log. +Filename: "powershell.exe"; \ + Parameters: "-NoProfile -ExecutionPolicy Bypass -File ""{app}\osmspad-pkg\install.ps1"""; \ + Flags: runhidden waituntilterminated; \ + MinVersion: 10.0.19041; \ + StatusMsg: "{cm:StatusInstallOsmsPad}" + ; 2. Iniciar el servicio (solo si el usuario marcó la tarea) Filename: "net.exe"; Parameters: "start ""{#AppService}"""; \ Flags: runhidden waituntilterminated; \ @@ -121,6 +131,12 @@ Filename: "powershell.exe"; \ Flags: runhidden waituntilterminated; \ RunOnceId: "UninstallRemoteIdd" +; Driver de mandos: dispositivo ROOT\OSMSPAD, su paquete y su certificado de prueba. +Filename: "powershell.exe"; \ + Parameters: "-NoProfile -ExecutionPolicy Bypass -File ""{app}\osmspad-pkg\uninstall.ps1"""; \ + Flags: runhidden waituntilterminated; \ + RunOnceId: "UninstallOsmsPad" + ; Detener y eliminar el servicio antes de borrar archivos Filename: "{app}\{#AppExeName}"; Parameters: "--uninstall --silent"; \ Flags: runhidden waituntilterminated; \