Commit 1c865c460b348e9085d84a48d5f4aca9fdfe5b71
2020-11-27T18:57:36
Load the raw input device list at init time so it's available when DirectInput is doing device detection
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
diff --git a/src/joystick/windows/SDL_rawinputjoystick.c b/src/joystick/windows/SDL_rawinputjoystick.c
index b9d63b7..b85c9ca 100644
--- a/src/joystick/windows/SDL_rawinputjoystick.c
+++ b/src/joystick/windows/SDL_rawinputjoystick.c
@@ -68,6 +68,7 @@ typedef struct WindowsGamingInputGamepadState WindowsGamingInputGamepadState;
#endif
/*#define DEBUG_RAWINPUT*/
+#define DEBUG_RAWINPUT
#ifndef RIDEV_EXINPUTSINK
#define RIDEV_EXINPUTSINK 0x00001000
@@ -624,31 +625,6 @@ RAWINPUT_QuitWindowsGamingInput(RAWINPUT_DeviceContext *ctx)
#endif /* SDL_JOYSTICK_RAWINPUT_WGI */
-static int
-RAWINPUT_JoystickInit(void)
-{
- SDL_assert(!SDL_RAWINPUT_inited);
-
- if (!SDL_GetHintBoolean(SDL_HINT_JOYSTICK_RAWINPUT, SDL_TRUE)) {
- return -1;
- }
-
- if (WIN_LoadHIDDLL() < 0) {
- return -1;
- }
-
- SDL_RAWINPUT_mutex = SDL_CreateMutex();
- SDL_RAWINPUT_inited = SDL_TRUE;
-
- return 0;
-}
-
-static int
-RAWINPUT_JoystickGetCount(void)
-{
- return SDL_RAWINPUT_numjoysticks;
-}
-
static SDL_RAWINPUT_Device *
RAWINPUT_AcquireDevice(SDL_RAWINPUT_Device *device)
{
@@ -826,6 +802,91 @@ RAWINPUT_DelDevice(SDL_RAWINPUT_Device *device, SDL_bool send_event)
}
}
+static int
+RAWINPUT_JoystickInit(void)
+{
+ UINT device_count = 0;
+
+ SDL_assert(!SDL_RAWINPUT_inited);
+
+ if (!SDL_GetHintBoolean(SDL_HINT_JOYSTICK_RAWINPUT, SDL_TRUE)) {
+ return -1;
+ }
+
+ if (WIN_LoadHIDDLL() < 0) {
+ return -1;
+ }
+
+ SDL_RAWINPUT_mutex = SDL_CreateMutex();
+ SDL_RAWINPUT_inited = SDL_TRUE;
+
+ if ((GetRawInputDeviceList(NULL, &device_count, sizeof(RAWINPUTDEVICELIST)) != -1) && device_count > 0) {
+ PRAWINPUTDEVICELIST devices = NULL;
+ UINT i;
+
+ devices = (PRAWINPUTDEVICELIST)SDL_malloc(sizeof(RAWINPUTDEVICELIST) * device_count);
+ if (devices) {
+ if (GetRawInputDeviceList(devices, &device_count, sizeof(RAWINPUTDEVICELIST)) != -1) {
+ for (i = 0; i < device_count; ++i) {
+ RAWINPUT_AddDevice(devices[i].hDevice);
+ }
+ }
+ SDL_free(devices);
+ }
+ }
+
+ return 0;
+}
+
+static int
+RAWINPUT_JoystickGetCount(void)
+{
+ return SDL_RAWINPUT_numjoysticks;
+}
+
+SDL_bool
+RAWINPUT_IsEnabled()
+{
+ return SDL_RAWINPUT_inited;
+}
+
+SDL_bool
+RAWINPUT_IsDevicePresent(Uint16 vendor_id, Uint16 product_id, Uint16 version, const char *name)
+{
+ SDL_RAWINPUT_Device *device;
+
+ /* If we're being asked about a device, that means another API just detected one, so rescan */
+#ifdef SDL_JOYSTICK_RAWINPUT_XINPUT
+ xinput_device_change = SDL_TRUE;
+#endif
+#ifdef SDL_JOYSTICK_RAWINPUT_WGI
+ wgi_state.need_device_list_update = SDL_TRUE;
+#endif
+
+ device = SDL_RAWINPUT_devices;
+ while (device) {
+ if (vendor_id == device->vendor_id && product_id == device->product_id ) {
+ return SDL_TRUE;
+ }
+
+ /* The Xbox 360 wireless controller shows up as product 0 in WGI */
+ if (vendor_id == device->vendor_id && product_id == 0 &&
+ name && SDL_strstr(device->name, name) != NULL) {
+ return SDL_TRUE;
+ }
+
+ /* The Xbox One controller shows up as a hardcoded raw input VID/PID */
+ if (name && SDL_strcmp(name, "Xbox One Game Controller") == 0 &&
+ device->vendor_id == USB_VENDOR_MICROSOFT &&
+ device->product_id == USB_PRODUCT_XBOX_ONE_RAW_INPUT_CONTROLLER) {
+ return SDL_TRUE;
+ }
+
+ device = device->next;
+ }
+ return SDL_FALSE;
+}
+
static void
RAWINPUT_PostUpdate(void)
{
@@ -885,49 +946,6 @@ RAWINPUT_PostUpdate(void)
#endif /* SDL_JOYSTICK_RAWINPUT_MATCHING */
}
-SDL_bool
-RAWINPUT_IsEnabled()
-{
- return SDL_RAWINPUT_inited;
-}
-
-SDL_bool
-RAWINPUT_IsDevicePresent(Uint16 vendor_id, Uint16 product_id, Uint16 version, const char *name)
-{
- SDL_RAWINPUT_Device *device;
-
- /* If we're being asked about a device, that means another API just detected one, so rescan */
-#ifdef SDL_JOYSTICK_RAWINPUT_XINPUT
- xinput_device_change = SDL_TRUE;
-#endif
-#ifdef SDL_JOYSTICK_RAWINPUT_WGI
- wgi_state.need_device_list_update = SDL_TRUE;
-#endif
-
- device = SDL_RAWINPUT_devices;
- while (device) {
- if (vendor_id == device->vendor_id && product_id == device->product_id ) {
- return SDL_TRUE;
- }
-
- /* The Xbox 360 wireless controller shows up as product 0 in WGI */
- if (vendor_id == device->vendor_id && product_id == 0 &&
- name && SDL_strstr(device->name, name) != NULL) {
- return SDL_TRUE;
- }
-
- /* The Xbox One controller shows up as a hardcoded raw input VID/PID */
- if (name && SDL_strcmp(name, "Xbox One Game Controller") == 0 &&
- device->vendor_id == USB_VENDOR_MICROSOFT &&
- device->product_id == USB_PRODUCT_XBOX_ONE_RAW_INPUT_CONTROLLER) {
- return SDL_TRUE;
- }
-
- device = device->next;
- }
- return SDL_FALSE;
-}
-
static void
RAWINPUT_JoystickDetect(void)
{
@@ -1842,7 +1860,6 @@ RAWINPUT_JoystickQuit(void)
SDL_UnlockMutex(SDL_RAWINPUT_mutex);
SDL_DestroyMutex(SDL_RAWINPUT_mutex);
SDL_RAWINPUT_mutex = NULL;
-
}
static SDL_bool