Commit c916f388d421c6f5c287d21b48f4f6b446384831
2014-03-01T09:59:06
Fixed bug 2368 - Security Software is blocking RegisterRawInputDevices() Yamagi A customer of mine had the strange problem, that SDL_SetRelativeMouseMode() was failing for him on Windows 7. Luckily he was willing to provide some debug informations. We could track this problem down to RegisterRawInputDevices() failing due to security software running on his system (Norton Internet Security to be precise, but there are reports of similar problems with other products. For example [1]). Working around this issue with SDL_WarpMouseInWindow() is easy, and while I don't think that SDL2 can provide an internal workaround it would be really nice and helpfull if this could be documentated somewhere. 1: http://forums.codeguru.com/showthread.php?498374-How-to-run-a-very-long-SQL-statement
diff --git a/src/events/SDL_mouse.c b/src/events/SDL_mouse.c
index 5e33cd5..236b8c5 100644
--- a/src/events/SDL_mouse.c
+++ b/src/events/SDL_mouse.c
@@ -538,7 +538,10 @@ SDL_SetRelativeMouseMode(SDL_bool enabled)
} else if (enabled && ShouldUseRelativeModeWarp(mouse)) {
mouse->relative_mode_warp = SDL_TRUE;
} else if (mouse->SetRelativeMouseMode(enabled) < 0) {
- return -1;
+ if (enabled) {
+ // Fall back to warp mode if native relative mode failed
+ mouse->relative_mode_warp = SDL_TRUE;
+ }
}
mouse->relative_mode = enabled;
diff --git a/src/video/windows/SDL_windowsmouse.c b/src/video/windows/SDL_windowsmouse.c
index 183e71c..b49249d 100644
--- a/src/video/windows/SDL_windowsmouse.c
+++ b/src/video/windows/SDL_windowsmouse.c
@@ -210,8 +210,8 @@ WIN_SetRelativeMouseMode(SDL_bool enabled)
/* (Un)register raw input for mice */
if (RegisterRawInputDevices(&rawMouse, 1, sizeof(RAWINPUTDEVICE)) == FALSE) {
- /* Only return an error when registering. If we unregister and fail, then
- it's probably that we unregistered twice. That's OK. */
+ /* Only return an error when registering. If we unregister and fail,
+ then it's probably that we unregistered twice. That's OK. */
if (enabled) {
return SDL_Unsupported();
}