[0/2] dinput: Move WARN where it belongs

Vincent Pelletier plr.vincent at gmail.com
Sun Jan 18 14:05:57 CST 2009


Required for
  [1/2] dinput: Do not close device upon Unacquire
to apply properly.

While I'm at it, my patches to winejoystick.drv are to be applied in the 
following order:
  winejoystick.drv: fix file descriptor leak
  winejoystick.drv: Use JSIOCGAXMAP ioctl to correct axes mapping (with patch)
  winejoystick.drv: Implement POV support

-- 
Vincent Pelletier
-------------- next part --------------
From 9e1b82ee1e4db3083c4111e51a92046e54711e66 Mon Sep 17 00:00:00 2001
From: Vincent Pelletier <plr.vincent at gmail.com>
Date: Sat, 17 Jan 2009 22:14:10 +0100
Subject: Move WARN where it belongs.

---
 dlls/dinput/joystick_linuxinput.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c
index 6f5b362..be5dccf 100644
--- a/dlls/dinput/joystick_linuxinput.c
+++ b/dlls/dinput/joystick_linuxinput.c
@@ -657,11 +657,11 @@ static HRESULT WINAPI JoystickAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
             IDirectInputDevice2AImpl_Unacquire(iface);
             return DIERR_NOTFOUND;
         }
-    }
-    else
-    {
-        /* Couldn't open in r/w but opened in read-only. */
-        WARN("Could not open %s in read-write mode.  Force feedback will be disabled.\n", This->joydev->device);
+        else
+        {
+            /* Couldn't open in r/w but opened in read-only. */
+            WARN("Could not open %s in read-write mode.  Force feedback will be disabled.\n", This->joydev->device);
+        }
     }
 
     return DI_OK;
-- 
1.5.6.5



More information about the wine-patches mailing list