Commit 110e4e133453cc4f9c466a6312f7f52d02eff516
2021-11-27T10:24:32
Use WGI instead of XInput for Windows 10 UWP apps Fixes https://github.com/libsdl-org/SDL/issues/5017
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282
diff --git a/VisualC-WinRT/SDL-UWP.vcxproj b/VisualC-WinRT/SDL-UWP.vcxproj
index 6e42281..e2dc5eb 100644
--- a/VisualC-WinRT/SDL-UWP.vcxproj
+++ b/VisualC-WinRT/SDL-UWP.vcxproj
@@ -253,6 +253,7 @@
<ClCompile Include="..\src\joystick\virtual\SDL_virtualjoystick.c" />
<ClCompile Include="..\src\joystick\windows\SDL_dinputjoystick.c" />
<ClCompile Include="..\src\joystick\windows\SDL_windowsjoystick.c" />
+ <ClCompile Include="..\src\joystick\windows\SDL_windows_gaming_input.c" />
<ClCompile Include="..\src\joystick\windows\SDL_xinputjoystick.c" />
<ClCompile Include="..\src\loadso\windows\SDL_sysloadso.c" />
<ClCompile Include="..\src\locale\SDL_locale.c" />
diff --git a/VisualC-WinRT/SDL-UWP.vcxproj.filters b/VisualC-WinRT/SDL-UWP.vcxproj.filters
index 8d73521..2742449 100644
--- a/VisualC-WinRT/SDL-UWP.vcxproj.filters
+++ b/VisualC-WinRT/SDL-UWP.vcxproj.filters
@@ -814,4 +814,9 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
-</Project>
+ <ItemGroup>
+ <ClCompile Include="..\src\joystick\windows\SDL_windows_gaming_input.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/include/SDL_config_winrt.h b/include/SDL_config_winrt.h
index 2f23baf..6f42a3b 100644
--- a/include/SDL_config_winrt.h
+++ b/include/SDL_config_winrt.h
@@ -201,8 +201,13 @@ typedef unsigned int uintptr_t;
#define SDL_HAPTIC_DISABLED 1
#else
#define SDL_JOYSTICK_VIRTUAL 1
+#if (NTDDI_VERSION >= NTDDI_WIN10)
+#define SDL_JOYSTICK_WGI 1
+#define SDL_HAPTIC_DISABLED 1
+#else
#define SDL_JOYSTICK_XINPUT 1
#define SDL_HAPTIC_XINPUT 1
+#endif /* WIN10 */
#endif
/* WinRT doesn't have HIDAPI available */
diff --git a/src/joystick/windows/SDL_windows_gaming_input.c b/src/joystick/windows/SDL_windows_gaming_input.c
index dc54299..930aed6 100644
--- a/src/joystick/windows/SDL_windows_gaming_input.c
+++ b/src/joystick/windows/SDL_windows_gaming_input.c
@@ -32,6 +32,7 @@
#define COBJMACROS
#include "windows.gaming.input.h"
#include <cfgmgr32.h>
+#include <roapi.h>
struct joystick_hwdata
@@ -94,6 +95,7 @@ extern SDL_bool SDL_DINPUT_JoystickPresent(Uint16 vendor, Uint16 product, Uint16
static SDL_bool
SDL_IsXInputDevice(Uint16 vendor, Uint16 product)
{
+#ifdef SDL_JOYSTICK_XINPUT
PRAWINPUTDEVICELIST raw_devices = NULL;
UINT i, raw_device_count = 0;
LONG vidpid = MAKELONG(vendor, product);
@@ -191,6 +193,8 @@ SDL_IsXInputDevice(Uint16 vendor, Uint16 product)
}
SDL_free(raw_devices);
+#endif /* SDL_JOYSTICK_XINPUT */
+
return SDL_FALSE;
}
@@ -229,7 +233,7 @@ static HRESULT STDMETHODCALLTYPE IEventHandler_CRawGameControllerVtbl_InvokeAdde
return S_OK;
}
- hr = IUnknown_QueryInterface((IUnknown *)e, &IID_IRawGameController, (void **)&controller);
+ hr = __x_ABI_CWindows_CGaming_CInput_CIRawGameController_QueryInterface(e, &IID_IRawGameController, (void **)&controller);
if (SUCCEEDED(hr)) {
char *name = NULL;
SDL_JoystickGUID guid;
@@ -247,26 +251,37 @@ static HRESULT STDMETHODCALLTYPE IEventHandler_CRawGameControllerVtbl_InvokeAdde
hr = __x_ABI_CWindows_CGaming_CInput_CIRawGameController_QueryInterface(controller, &IID_IRawGameController2, (void **)&controller2);
if (SUCCEEDED(hr)) {
+ typedef PCWSTR (WINAPI *WindowsGetStringRawBuffer_t)(HSTRING string, UINT32 *length);
+ typedef HRESULT (WINAPI *WindowsDeleteString_t)(HSTRING string);
+
+ WindowsGetStringRawBuffer_t WindowsGetStringRawBufferFunc = NULL;
+ WindowsDeleteString_t WindowsDeleteStringFunc = NULL;
+#ifdef __WINRT__
+ WindowsGetStringRawBufferFunc = WindowsGetStringRawBuffer;
+ WindowsDeleteStringFunc = WindowsDeleteString;
+#else
HMODULE hModule = LoadLibraryA("combase.dll");
if (hModule != NULL) {
- typedef PCWSTR (WINAPI *WindowsGetStringRawBuffer_t)(HSTRING string, UINT32 *length);
- typedef HRESULT (WINAPI *WindowsDeleteString_t)(HSTRING string);
-
- WindowsGetStringRawBuffer_t WindowsGetStringRawBufferFunc = (WindowsGetStringRawBuffer_t)GetProcAddress(hModule, "WindowsGetStringRawBuffer");
- WindowsDeleteString_t WindowsDeleteStringFunc = (WindowsDeleteString_t)GetProcAddress(hModule, "WindowsDeleteString");
- if (WindowsGetStringRawBufferFunc && WindowsDeleteStringFunc) {
- HSTRING hString;
- hr = __x_ABI_CWindows_CGaming_CInput_CIRawGameController2_get_DisplayName(controller2, &hString);
- if (SUCCEEDED(hr)) {
- PCWSTR string = WindowsGetStringRawBufferFunc(hString, NULL);
- if (string) {
- name = WIN_StringToUTF8W(string);
- }
- WindowsDeleteStringFunc(hString);
+ WindowsGetStringRawBufferFunc = (WindowsGetStringRawBuffer_t)GetProcAddress(hModule, "WindowsGetStringRawBuffer");
+ WindowsDeleteStringFunc = (WindowsDeleteString_t)GetProcAddress(hModule, "WindowsDeleteString");
+ }
+#endif /* __WINRT__ */
+ if (WindowsGetStringRawBufferFunc && WindowsDeleteStringFunc) {
+ HSTRING hString;
+ hr = __x_ABI_CWindows_CGaming_CInput_CIRawGameController2_get_DisplayName(controller2, &hString);
+ if (SUCCEEDED(hr)) {
+ PCWSTR string = WindowsGetStringRawBufferFunc(hString, NULL);
+ if (string) {
+ name = WIN_StringToUTF8W(string);
}
+ WindowsDeleteStringFunc(hString);
}
+ }
+#ifndef __WINRT__
+ if (hModule != NULL) {
FreeLibrary(hModule);
}
+#endif
__x_ABI_CWindows_CGaming_CInput_CIRawGameController2_Release(controller2);
}
if (!name) {
@@ -373,7 +388,7 @@ static HRESULT STDMETHODCALLTYPE IEventHandler_CRawGameControllerVtbl_InvokeRemo
HRESULT hr;
__x_ABI_CWindows_CGaming_CInput_CIRawGameController *controller = NULL;
- hr = IUnknown_QueryInterface((IUnknown *)e, &IID_IRawGameController, (void **)&controller);
+ hr = __x_ABI_CWindows_CGaming_CInput_CIRawGameController_QueryInterface(e, &IID_IRawGameController, (void **)&controller);
if (SUCCEEDED(hr)) {
int i;
@@ -424,78 +439,88 @@ static __FIEventHandler_1_Windows__CGaming__CInput__CRawGameController controlle
static int
WGI_JoystickInit(void)
{
- HMODULE hModule;
HRESULT hr;
if (FAILED(WIN_CoInitialize())) {
return SDL_SetError("CoInitialize() failed");
}
- hModule = LoadLibraryA("combase.dll");
- if (hModule != NULL) {
- typedef HRESULT (WINAPI *WindowsCreateStringReference_t)(PCWSTR sourceString, UINT32 length, HSTRING_HEADER *hstringHeader, HSTRING* string);
- typedef HRESULT (WINAPI *RoGetActivationFactory_t)(HSTRING activatableClassId, REFIID iid, void** factory);
+ typedef HRESULT (WINAPI *WindowsCreateStringReference_t)(PCWSTR sourceString, UINT32 length, HSTRING_HEADER *hstringHeader, HSTRING* string);
+ typedef HRESULT (WINAPI *RoGetActivationFactory_t)(HSTRING activatableClassId, REFIID iid, void** factory);
+ WindowsCreateStringReference_t WindowsCreateStringReferenceFunc = NULL;
+ RoGetActivationFactory_t RoGetActivationFactoryFunc = NULL;
+#ifdef __WINRT__
+ WindowsCreateStringReferenceFunc = WindowsCreateStringReference;
+ RoGetActivationFactoryFunc = RoGetActivationFactory;
+#else
+ HMODULE hModule = LoadLibraryA("combase.dll");
+ if (hModule != NULL) {
WindowsCreateStringReference_t WindowsCreateStringReferenceFunc = (WindowsCreateStringReference_t)GetProcAddress(hModule, "WindowsCreateStringReference");
RoGetActivationFactory_t RoGetActivationFactoryFunc = (RoGetActivationFactory_t)GetProcAddress(hModule, "RoGetActivationFactory");
- if (WindowsCreateStringReferenceFunc && RoGetActivationFactoryFunc) {
- PCWSTR pNamespace;
- HSTRING_HEADER hNamespaceStringHeader;
- HSTRING hNamespaceString;
-
- pNamespace = L"Windows.Gaming.Input.RawGameController";
- hr = WindowsCreateStringReferenceFunc(pNamespace, (UINT32)SDL_wcslen(pNamespace), &hNamespaceStringHeader, &hNamespaceString);
- if (SUCCEEDED(hr)) {
- hr = RoGetActivationFactoryFunc(hNamespaceString, &IID_IRawGameControllerStatics, (void **)&wgi.statics);
- if (!SUCCEEDED(hr)) {
- SDL_SetError("Couldn't find IRawGameControllerStatics: 0x%lx", hr);
- }
+ }
+#endif /* __WINRT__ */
+ if (WindowsCreateStringReferenceFunc && RoGetActivationFactoryFunc) {
+ PCWSTR pNamespace;
+ HSTRING_HEADER hNamespaceStringHeader;
+ HSTRING hNamespaceString;
+
+ pNamespace = L"Windows.Gaming.Input.RawGameController";
+ hr = WindowsCreateStringReferenceFunc(pNamespace, (UINT32)SDL_wcslen(pNamespace), &hNamespaceStringHeader, &hNamespaceString);
+ if (SUCCEEDED(hr)) {
+ hr = RoGetActivationFactoryFunc(hNamespaceString, &IID_IRawGameControllerStatics, (void **)&wgi.statics);
+ if (!SUCCEEDED(hr)) {
+ SDL_SetError("Couldn't find IRawGameControllerStatics: 0x%lx", hr);
}
+ }
- pNamespace = L"Windows.Gaming.Input.ArcadeStick";
- hr = WindowsCreateStringReferenceFunc(pNamespace, (UINT32)SDL_wcslen(pNamespace), &hNamespaceStringHeader, &hNamespaceString);
+ pNamespace = L"Windows.Gaming.Input.ArcadeStick";
+ hr = WindowsCreateStringReferenceFunc(pNamespace, (UINT32)SDL_wcslen(pNamespace), &hNamespaceStringHeader, &hNamespaceString);
+ if (SUCCEEDED(hr)) {
+ hr = RoGetActivationFactoryFunc(hNamespaceString, &IID_IArcadeStickStatics, (void **)&wgi.arcade_stick_statics);
if (SUCCEEDED(hr)) {
- hr = RoGetActivationFactoryFunc(hNamespaceString, &IID_IArcadeStickStatics, (void **)&wgi.arcade_stick_statics);
- if (SUCCEEDED(hr)) {
- __x_ABI_CWindows_CGaming_CInput_CIArcadeStickStatics_QueryInterface(wgi.arcade_stick_statics, &IID_IArcadeStickStatics2, (void **)&wgi.arcade_stick_statics2);
- } else {
- SDL_SetError("Couldn't find IID_IArcadeStickStatics: 0x%lx", hr);
- }
+ __x_ABI_CWindows_CGaming_CInput_CIArcadeStickStatics_QueryInterface(wgi.arcade_stick_statics, &IID_IArcadeStickStatics2, (void **)&wgi.arcade_stick_statics2);
+ } else {
+ SDL_SetError("Couldn't find IID_IArcadeStickStatics: 0x%lx", hr);
}
+ }
- pNamespace = L"Windows.Gaming.Input.FlightStick";
- hr = WindowsCreateStringReferenceFunc(pNamespace, (UINT32)SDL_wcslen(pNamespace), &hNamespaceStringHeader, &hNamespaceString);
- if (SUCCEEDED(hr)) {
- hr = RoGetActivationFactoryFunc(hNamespaceString, &IID_IFlightStickStatics, (void **)&wgi.flight_stick_statics);
- if (!SUCCEEDED(hr)) {
- SDL_SetError("Couldn't find IID_IFlightStickStatics: 0x%lx", hr);
- }
+ pNamespace = L"Windows.Gaming.Input.FlightStick";
+ hr = WindowsCreateStringReferenceFunc(pNamespace, (UINT32)SDL_wcslen(pNamespace), &hNamespaceStringHeader, &hNamespaceString);
+ if (SUCCEEDED(hr)) {
+ hr = RoGetActivationFactoryFunc(hNamespaceString, &IID_IFlightStickStatics, (void **)&wgi.flight_stick_statics);
+ if (!SUCCEEDED(hr)) {
+ SDL_SetError("Couldn't find IID_IFlightStickStatics: 0x%lx", hr);
}
+ }
- pNamespace = L"Windows.Gaming.Input.Gamepad";
- hr = WindowsCreateStringReferenceFunc(pNamespace, (UINT32)SDL_wcslen(pNamespace), &hNamespaceStringHeader, &hNamespaceString);
+ pNamespace = L"Windows.Gaming.Input.Gamepad";
+ hr = WindowsCreateStringReferenceFunc(pNamespace, (UINT32)SDL_wcslen(pNamespace), &hNamespaceStringHeader, &hNamespaceString);
+ if (SUCCEEDED(hr)) {
+ hr = RoGetActivationFactoryFunc(hNamespaceString, &IID_IGamepadStatics, (void **)&wgi.gamepad_statics);
if (SUCCEEDED(hr)) {
- hr = RoGetActivationFactoryFunc(hNamespaceString, &IID_IGamepadStatics, (void **)&wgi.gamepad_statics);
- if (SUCCEEDED(hr)) {
- __x_ABI_CWindows_CGaming_CInput_CIGamepadStatics_QueryInterface(wgi.gamepad_statics, &IID_IGamepadStatics2, (void **)&wgi.gamepad_statics2);
- } else {
- SDL_SetError("Couldn't find IGamepadStatics: 0x%lx", hr);
- }
+ __x_ABI_CWindows_CGaming_CInput_CIGamepadStatics_QueryInterface(wgi.gamepad_statics, &IID_IGamepadStatics2, (void **)&wgi.gamepad_statics2);
+ } else {
+ SDL_SetError("Couldn't find IGamepadStatics: 0x%lx", hr);
}
+ }
- pNamespace = L"Windows.Gaming.Input.RacingWheel";
- hr = WindowsCreateStringReferenceFunc(pNamespace, (UINT32)SDL_wcslen(pNamespace), &hNamespaceStringHeader, &hNamespaceString);
+ pNamespace = L"Windows.Gaming.Input.RacingWheel";
+ hr = WindowsCreateStringReferenceFunc(pNamespace, (UINT32)SDL_wcslen(pNamespace), &hNamespaceStringHeader, &hNamespaceString);
+ if (SUCCEEDED(hr)) {
+ hr = RoGetActivationFactoryFunc(hNamespaceString, &IID_IRacingWheelStatics, (void **)&wgi.racing_wheel_statics);
if (SUCCEEDED(hr)) {
- hr = RoGetActivationFactoryFunc(hNamespaceString, &IID_IRacingWheelStatics, (void **)&wgi.racing_wheel_statics);
- if (SUCCEEDED(hr)) {
- __x_ABI_CWindows_CGaming_CInput_CIRacingWheelStatics_QueryInterface(wgi.racing_wheel_statics, &IID_IRacingWheelStatics2, (void **)&wgi.racing_wheel_statics2);
- } else {
- SDL_SetError("Couldn't find IRacingWheelStatics: 0x%lx", hr);
- }
+ __x_ABI_CWindows_CGaming_CInput_CIRacingWheelStatics_QueryInterface(wgi.racing_wheel_statics, &IID_IRacingWheelStatics2, (void **)&wgi.racing_wheel_statics2);
+ } else {
+ SDL_SetError("Couldn't find IRacingWheelStatics: 0x%lx", hr);
}
}
+ }
+#ifndef __WINRT__
+ if (hModule != NULL) {
FreeLibrary(hModule);
}
+#endif
if (wgi.statics) {
hr = __x_ABI_CWindows_CGaming_CInput_CIRawGameControllerStatics_add_RawGameControllerAdded(wgi.statics, &controller_added, &wgi.controller_added_token);