Fixed raw input device GUIDs changing randomly between runs

slouken · slouken · commit 9b048e73a2e8 · 2025-03-17T13:57:58.000-07:00
On Windows 11, apparently HidD_GetManufacturerString() and HidD_GetProductString() can return TRUE without actually filling in any string data. Fixes libsdl-org#12566 (cherry picked from commit 4fc9509) (cherry picked from commit 52146cf)
diff --git a/src/joystick/windows/SDL_rawinputjoystick.c b/src/joystick/windows/SDL_rawinputjoystick.c
@@ -908,9 +908,11 @@ static void RAWINPUT_AddDevice(HANDLE hDevice)
         char *product_string = NULL;
         WCHAR string[128];
 
+        string[0] = 0;
         if (SDL_HidD_GetManufacturerString(hFile, string, sizeof(string))) {
             manufacturer_string = WIN_StringToUTF8W(string);
         }
+        string[0] = 0;
         if (SDL_HidD_GetProductString(hFile, string, sizeof(string))) {
             product_string = WIN_StringToUTF8W(string);
         }

Original file line number	Diff line number	Diff line change
`@@ -908,9 +908,11 @@ static void RAWINPUT_AddDevice(HANDLE hDevice)`
`908`	`908`	`char *product_string = NULL;`
`909`	`909`	`WCHAR string[128];`
`910`	`910`
	`911`	`+ string[0] = 0;`
`911`	`912`	`if (SDL_HidD_GetManufacturerString(hFile, string, sizeof(string))) {`
`912`	`913`	`manufacturer_string = WIN_StringToUTF8W(string);`
`913`	`914`	`}`
	`915`	`+ string[0] = 0;`
`914`	`916`	`if (SDL_HidD_GetProductString(hFile, string, sizeof(string))) {`
`915`	`917`	`product_string = WIN_StringToUTF8W(string);`
`916`	`918`	`}`