Alexandre Julliard : dinput: Avoid size_t in traces.

Alexandre Julliard julliard at winehq.org
Thu Jan 8 08:31:03 CST 2009


Module: wine
Branch: master
Commit: f6eb03d6c6f0816cfa9c38b84477638682f1269c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f6eb03d6c6f0816cfa9c38b84477638682f1269c

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jan  8 13:12:08 2009 +0100

dinput: Avoid size_t in traces.

---

 dlls/dinput/effect_linuxinput.c |    6 ++----
 dlls/dinput/joystick_linux.c    |    8 ++------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c
index 3395a37..eb6a2b5 100644
--- a/dlls/dinput/effect_linuxinput.c
+++ b/dlls/dinput/effect_linuxinput.c
@@ -119,8 +119,7 @@ static void _dump_DIEFFECT_flags(DWORD dwFlags)
 static void _dump_DIENVELOPE(LPCDIENVELOPE env)
 {
     if (env->dwSize != sizeof(DIENVELOPE)) {
-        WARN("Non-standard DIENVELOPE structure size (%d instead of %d).\n",
-	     env->dwSize, sizeof(DIENVELOPE));
+        WARN("Non-standard DIENVELOPE structure size %d.\n", env->dwSize);
     }
     TRACE("Envelope has attack (level: %d time: %d), fade (level: %d time: %d)\n",
 	  env->dwAttackLevel, env->dwAttackTime, env->dwFadeLevel, env->dwFadeTime);
@@ -175,8 +174,7 @@ static void _dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid)
     TRACE("Dumping DIEFFECT structure:\n");
     TRACE("  - dwSize: %d\n", eff->dwSize);
     if ((eff->dwSize != sizeof(DIEFFECT)) && (eff->dwSize != sizeof(DIEFFECT_DX5))) {
-        WARN("Non-standard DIEFFECT structure size (%d instead of %d or %d).\n",
-	     eff->dwSize, sizeof(DIEFFECT), sizeof(DIEFFECT_DX5));
+        WARN("Non-standard DIEFFECT structure size %d\n", eff->dwSize);
     }
     TRACE("  - dwFlags: %d\n", eff->dwFlags);
     TRACE("    ");
diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c
index faef24f..e9b6916 100644
--- a/dlls/dinput/joystick_linux.c
+++ b/dlls/dinput/joystick_linux.c
@@ -1026,9 +1026,7 @@ static HRESULT WINAPI JoystickAImpl_GetDeviceInfo(
 
     if ((pdidi->dwSize != sizeof(DIDEVICEINSTANCE_DX3A)) &&
         (pdidi->dwSize != sizeof(DIDEVICEINSTANCEA))) {
-        WARN("invalid parameter: pdidi->dwSize = %d != %d or %d\n",
-             pdidi->dwSize, sizeof(DIDEVICEINSTANCE_DX3A),
-             sizeof(DIDEVICEINSTANCEA));
+        WARN("invalid parameter: pdidi->dwSize = %d\n", pdidi->dwSize);
         return DIERR_INVALIDPARAM;
     }
 
@@ -1061,9 +1059,7 @@ static HRESULT WINAPI JoystickWImpl_GetDeviceInfo(
 
     if ((pdidi->dwSize != sizeof(DIDEVICEINSTANCE_DX3W)) &&
         (pdidi->dwSize != sizeof(DIDEVICEINSTANCEW))) {
-        WARN("invalid parameter: pdidi->dwSize = %d != %d or %d\n",
-             pdidi->dwSize, sizeof(DIDEVICEINSTANCE_DX3W),
-             sizeof(DIDEVICEINSTANCEW));
+        WARN("invalid parameter: pdidi->dwSize = %d\n", pdidi->dwSize);
         return DIERR_INVALIDPARAM;
     }
 




More information about the wine-cvs mailing list