gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RAWINPUT_RegisterNotifications() should return int, for consistency

Browse Source
This commit is contained in:
Sam Lantinga
2023-07-11 10:50:43 -07:00
parent fdff3b16d6
commit 1903d7b1bf
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/joystick/windows/SDL_rawinputjoystick.c
View File

@@ -2065,13 +2065,13 @@ static void RAWINPUT_JoystickClose(SDL_Joystick *joystick)
} }
} }
SDL_bool RAWINPUT_RegisterNotifications(HWND hWnd) int RAWINPUT_RegisterNotifications(HWND hWnd)
{ {
int i; int i;
RAWINPUTDEVICE rid[SDL_arraysize(subscribed_devices)]; RAWINPUTDEVICE rid[SDL_arraysize(subscribed_devices)];
if (!SDL_RAWINPUT_inited) { if (!SDL_RAWINPUT_inited) {
return SDL_TRUE; return 0;
} }
for (i = 0; i < SDL_arraysize(subscribed_devices); i++) { for (i = 0; i < SDL_arraysize(subscribed_devices); i++) {
@@ -2082,10 +2082,9 @@ SDL_bool RAWINPUT_RegisterNotifications(HWND hWnd)
} }
if (!RegisterRawInputDevices(rid, SDL_arraysize(rid), sizeof(RAWINPUTDEVICE))) { if (!RegisterRawInputDevices(rid, SDL_arraysize(rid), sizeof(RAWINPUTDEVICE))) {
SDL_SetError("Couldn't register for raw input events"); return SDL_SetError("Couldn't register for raw input events");
return SDL_FALSE;
} }
return SDL_TRUE; return 0;
} }
int RAWINPUT_UnregisterNotifications() int RAWINPUT_UnregisterNotifications()
@@ -2094,7 +2093,7 @@ int RAWINPUT_UnregisterNotifications()
RAWINPUTDEVICE rid[SDL_arraysize(subscribed_devices)]; RAWINPUTDEVICE rid[SDL_arraysize(subscribed_devices)];
if (!SDL_RAWINPUT_inited) { if (!SDL_RAWINPUT_inited) {
return SDL_TRUE; return 0;
} }
for (i = 0; i < SDL_arraysize(subscribed_devices); i++) { for (i = 0; i < SDL_arraysize(subscribed_devices); i++) {

2
src/joystick/windows/SDL_rawinputjoystick_c.h
View File

@@ -28,7 +28,7 @@ extern SDL_bool RAWINPUT_IsEnabled();
extern SDL_bool RAWINPUT_IsDevicePresent(Uint16 vendor_id, Uint16 product_id, Uint16 version, const char *name); extern SDL_bool RAWINPUT_IsDevicePresent(Uint16 vendor_id, Uint16 product_id, Uint16 version, const char *name);
/* Registers for input events */ /* Registers for input events */
extern SDL_bool RAWINPUT_RegisterNotifications(HWND hWnd); extern int RAWINPUT_RegisterNotifications(HWND hWnd);
extern int RAWINPUT_UnregisterNotifications(); extern int RAWINPUT_UnregisterNotifications();
/* Returns 0 if message was handled */ /* Returns 0 if message was handled */