From e8b6edd5a081d0b45c2ac39ab690e584a6b95a84 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 11 Jul 2023 10:50:43 -0700 Subject: [PATCH] RAWINPUT_RegisterNotifications() should return int, for consistency (cherry picked from commit 1903d7b1bf6c73ef23e4d6934c9fec5246dd0b2e) --- src/joystick/windows/SDL_rawinputjoystick.c | 17 ++++++++--------- src/joystick/windows/SDL_rawinputjoystick_c.h | 4 ++-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/joystick/windows/SDL_rawinputjoystick.c b/src/joystick/windows/SDL_rawinputjoystick.c index b5efe9654..167a1c536 100644 --- a/src/joystick/windows/SDL_rawinputjoystick.c +++ b/src/joystick/windows/SDL_rawinputjoystick.c @@ -2045,13 +2045,13 @@ static void RAWINPUT_JoystickClose(SDL_Joystick *joystick) } } -SDL_bool RAWINPUT_RegisterNotifications(HWND hWnd) +int RAWINPUT_RegisterNotifications(HWND hWnd) { int i; RAWINPUTDEVICE rid[SDL_arraysize(subscribed_devices)]; if (!SDL_RAWINPUT_inited) { - return SDL_TRUE; + return 0; } for (i = 0; i < SDL_arraysize(subscribed_devices); i++) { @@ -2062,19 +2062,18 @@ SDL_bool RAWINPUT_RegisterNotifications(HWND hWnd) } if (!RegisterRawInputDevices(rid, SDL_arraysize(rid), sizeof(RAWINPUTDEVICE))) { - SDL_SetError("Couldn't register for raw input events"); - return SDL_FALSE; + return SDL_SetError("Couldn't register for raw input events"); } - return SDL_TRUE; + return 0; } -void RAWINPUT_UnregisterNotifications() +int RAWINPUT_UnregisterNotifications() { int i; RAWINPUTDEVICE rid[SDL_arraysize(subscribed_devices)]; if (!SDL_RAWINPUT_inited) { - return SDL_TRUE; + return 0; } for (i = 0; i < SDL_arraysize(subscribed_devices); i++) { @@ -2085,9 +2084,9 @@ void RAWINPUT_UnregisterNotifications() } if (!RegisterRawInputDevices(rid, SDL_arraysize(rid), sizeof(RAWINPUTDEVICE))) { - SDL_SetError("Couldn't unregister for raw input events"); - return; + return SDL_SetError("Couldn't unregister for raw input events"); } + return 0; } LRESULT CALLBACK diff --git a/src/joystick/windows/SDL_rawinputjoystick_c.h b/src/joystick/windows/SDL_rawinputjoystick_c.h index e6e904530..be08c33ae 100644 --- a/src/joystick/windows/SDL_rawinputjoystick_c.h +++ b/src/joystick/windows/SDL_rawinputjoystick_c.h @@ -28,8 +28,8 @@ extern SDL_bool RAWINPUT_IsEnabled(); extern SDL_bool RAWINPUT_IsDevicePresent(Uint16 vendor_id, Uint16 product_id, Uint16 version, const char *name); /* Registers for input events */ -extern SDL_bool RAWINPUT_RegisterNotifications(HWND hWnd); -extern void RAWINPUT_UnregisterNotifications(); +extern int RAWINPUT_RegisterNotifications(HWND hWnd); +extern int RAWINPUT_UnregisterNotifications(); /* Returns 0 if message was handled */ extern LRESULT CALLBACK RAWINPUT_WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);