JoystickAImpl_Unacquire should return DI_NOEFFECT if the device is not

in an acquired state.

JoystickAImpl_Unacquire should return DI_NOEFFECT if the device is not
ab4e40cf · Hannu Valtonen · Alexandre Julliard · e40da9f1 · ab4e40cf · ab4e40cf
Commit ab4e40cf authored Oct 30, 2003 by Hannu Valtonen Committed by Alexandre Julliard Oct 30, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

linux.c dlls/dinput/joystick/linux.c +3 -1

linuxinput.c dlls/dinput/joystick/linuxinput.c +3 -1

No files found.
--- a/dlls/dinput/joystick/linux.c
+++ b/dlls/dinput/joystick/linux.c
@@ -306,8 +306,10 @@ static HRESULT WINAPI JoystickAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface)
    if (This->joyfd!=-1) {
  	close(This->joyfd);
 	This->joyfd = -1;
+	return DI_OK;
    }
-    return DI_OK;
+    else 
+    	return DI_NOEFFECT;
 }

 #define map_axis(val) ((val+32768)*(This->lMax-This->lMin)/65536+This->lMin)

--- a/dlls/dinput/joystick/linuxinput.c
+++ b/dlls/dinput/joystick/linuxinput.c
@@ -432,8 +432,10 @@ static HRESULT WINAPI JoystickAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface)
    if (This->joyfd!=-1) {
  	close(This->joyfd);
 	This->joyfd = -1;
+	return DI_OK;
    }
-    return DI_OK;
+    else 
+    	return DI_NOEFFECT;
 }

 /*