encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed compiler warnings

This commit is contained in:
Sam Lantinga 2020-03-13 09:43:48 -07:00
parent 5722e88481
commit 80d075a01a
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/joystick/windows/SDL_dinputjoystick.c
View File

@ -244,7 +244,7 @@ static const IID CLSID_WbemLocator = { 0x4590f811, 0x1d3a, 0x11d0,{ 0x89, 0x1f,
static const IID IID_IWbemLocator = { 0xdc12a687, 0x737f, 0x11cf,{ 0x88, 0x4d, 0x00, 0xaa, 0x00, 0x4b, 0x2e, 0x24 } }; static const IID IID_IWbemLocator = { 0xdc12a687, 0x737f, 0x11cf,{ 0x88, 0x4d, 0x00, 0xaa, 0x00, 0x4b, 0x2e, 0x24 } };
static SDL_bool static SDL_bool
WIN_IsXInputDevice(LPTSTR *name, const GUID* pGuidProductFromDirectInput) WIN_IsXInputDevice(const WCHAR *name, const GUID* pGuidProductFromDirectInput)
{ {
IWbemLocator* pIWbemLocator = NULL; IWbemLocator* pIWbemLocator = NULL;
IEnumWbemClassObject* pEnumDevices = NULL; IEnumWbemClassObject* pEnumDevices = NULL;
@ -263,7 +263,7 @@ WIN_IsXInputDevice(LPTSTR *name, const GUID* pGuidProductFromDirectInput)
return SDL_FALSE; return SDL_FALSE;
} }
if (SDL_wcsstr(name, " XINPUT ") != NULL) { if (SDL_wcsstr(name, L" XINPUT ") != NULL) {
/* This is a duplicate interface for a controller that will show up with XInput, /* This is a duplicate interface for a controller that will show up with XInput,
e.g. Xbox One Elite Series 2 in Bluetooth mode. e.g. Xbox One Elite Series 2 in Bluetooth mode.
*/ */
@ -374,7 +374,7 @@ LCleanup:
#endif /* 0 */ #endif /* 0 */
static SDL_bool static SDL_bool
SDL_IsXInputDevice(LPTSTR *name, const GUID* pGuidProductFromDirectInput) SDL_IsXInputDevice(const WCHAR *name, const GUID* pGuidProductFromDirectInput)
{ {
UINT i; UINT i;
@ -382,7 +382,7 @@ SDL_IsXInputDevice(LPTSTR *name, const GUID* pGuidProductFromDirectInput)
return SDL_FALSE; return SDL_FALSE;
} }
if (SDL_wcsstr(name, " XINPUT ") != NULL) { if (SDL_wcsstr(name, L" XINPUT ") != NULL) {
/* This is a duplicate interface for a controller that will show up with XInput, /* This is a duplicate interface for a controller that will show up with XInput,
e.g. Xbox One Elite Series 2 in Bluetooth mode. e.g. Xbox One Elite Series 2 in Bluetooth mode.
*/ */

1
src/joystick/windows/SDL_xinputjoystick.c
View File

@ -220,7 +220,6 @@ AddXInputDevice(Uint8 userid, BYTE SubType, JoyStick_DeviceData **pContext)
Uint16 vendor = 0; Uint16 vendor = 0;
Uint16 product = 0; Uint16 product = 0;
Uint16 version = 0; Uint16 version = 0;
const char *name;
JoyStick_DeviceData *pPrevJoystick = NULL; JoyStick_DeviceData *pPrevJoystick = NULL;
JoyStick_DeviceData *pNewJoystick = *pContext; JoyStick_DeviceData *pNewJoystick = *pContext;