admin/SDL
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RAWINPUT_RegisterNotifications() should return int, for consistency

Browse Source 
(cherry picked from commit 1903d7b1bf)
(cherry picked from commit e8b6edd5a0)
This commit is contained in:
Sam Lantinga committed 2023-07-11 10:54:44 -07:00
1 parent 5a2d165b7b
commit cb4b41ddf7
2 files changed
+10 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/joystick/windows/SDL_rawinputjoystick.c
+8 -9
View File
@@ -2045,13 +2045,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++) {
@@ -2062,19 +2062,18 @@ 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;
} }
void RAWINPUT_UnregisterNotifications() int RAWINPUT_UnregisterNotifications()
{ {
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++) {
@@ -2085,9 +2084,9 @@ void RAWINPUT_UnregisterNotifications()
} }
if (!RegisterRawInputDevices(rid, SDL_arraysize(rid), sizeof(RAWINPUTDEVICE))) { if (!RegisterRawInputDevices(rid, SDL_arraysize(rid), sizeof(RAWINPUTDEVICE))) {
SDL_SetError("Couldn't unregister for raw input events"); return SDL_SetError("Couldn't unregister for raw input events");
return;
} }
return 0;
} }
LRESULT CALLBACK LRESULT CALLBACK
src/joystick/windows/SDL_rawinputjoystick_c.h
+2 -2
View File
@@ -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); 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 void RAWINPUT_UnregisterNotifications(); extern int RAWINPUT_UnregisterNotifications();
/* Returns 0 if message was handled */ /* Returns 0 if message was handled */
extern LRESULT CALLBACK RAWINPUT_WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); extern LRESULT CALLBACK RAWINPUT_WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);