Commit f6eb03d6 authored by Alexandre Julliard's avatar Alexandre Julliard

dinput: Avoid size_t in traces.

parent a0abde33
...@@ -119,8 +119,7 @@ static void _dump_DIEFFECT_flags(DWORD dwFlags) ...@@ -119,8 +119,7 @@ static void _dump_DIEFFECT_flags(DWORD dwFlags)
static void _dump_DIENVELOPE(LPCDIENVELOPE env) static void _dump_DIENVELOPE(LPCDIENVELOPE env)
{ {
if (env->dwSize != sizeof(DIENVELOPE)) { if (env->dwSize != sizeof(DIENVELOPE)) {
WARN("Non-standard DIENVELOPE structure size (%d instead of %d).\n", WARN("Non-standard DIENVELOPE structure size %d.\n", env->dwSize);
env->dwSize, sizeof(DIENVELOPE));
} }
TRACE("Envelope has attack (level: %d time: %d), fade (level: %d time: %d)\n", TRACE("Envelope has attack (level: %d time: %d), fade (level: %d time: %d)\n",
env->dwAttackLevel, env->dwAttackTime, env->dwFadeLevel, env->dwFadeTime); env->dwAttackLevel, env->dwAttackTime, env->dwFadeLevel, env->dwFadeTime);
...@@ -175,8 +174,7 @@ static void _dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid) ...@@ -175,8 +174,7 @@ static void _dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid)
TRACE("Dumping DIEFFECT structure:\n"); TRACE("Dumping DIEFFECT structure:\n");
TRACE(" - dwSize: %d\n", eff->dwSize); TRACE(" - dwSize: %d\n", eff->dwSize);
if ((eff->dwSize != sizeof(DIEFFECT)) && (eff->dwSize != sizeof(DIEFFECT_DX5))) { if ((eff->dwSize != sizeof(DIEFFECT)) && (eff->dwSize != sizeof(DIEFFECT_DX5))) {
WARN("Non-standard DIEFFECT structure size (%d instead of %d or %d).\n", WARN("Non-standard DIEFFECT structure size %d\n", eff->dwSize);
eff->dwSize, sizeof(DIEFFECT), sizeof(DIEFFECT_DX5));
} }
TRACE(" - dwFlags: %d\n", eff->dwFlags); TRACE(" - dwFlags: %d\n", eff->dwFlags);
TRACE(" "); TRACE(" ");
......
...@@ -1026,9 +1026,7 @@ static HRESULT WINAPI JoystickAImpl_GetDeviceInfo( ...@@ -1026,9 +1026,7 @@ static HRESULT WINAPI JoystickAImpl_GetDeviceInfo(
if ((pdidi->dwSize != sizeof(DIDEVICEINSTANCE_DX3A)) && if ((pdidi->dwSize != sizeof(DIDEVICEINSTANCE_DX3A)) &&
(pdidi->dwSize != sizeof(DIDEVICEINSTANCEA))) { (pdidi->dwSize != sizeof(DIDEVICEINSTANCEA))) {
WARN("invalid parameter: pdidi->dwSize = %d != %d or %d\n", WARN("invalid parameter: pdidi->dwSize = %d\n", pdidi->dwSize);
pdidi->dwSize, sizeof(DIDEVICEINSTANCE_DX3A),
sizeof(DIDEVICEINSTANCEA));
return DIERR_INVALIDPARAM; return DIERR_INVALIDPARAM;
} }
...@@ -1061,9 +1059,7 @@ static HRESULT WINAPI JoystickWImpl_GetDeviceInfo( ...@@ -1061,9 +1059,7 @@ static HRESULT WINAPI JoystickWImpl_GetDeviceInfo(
if ((pdidi->dwSize != sizeof(DIDEVICEINSTANCE_DX3W)) && if ((pdidi->dwSize != sizeof(DIDEVICEINSTANCE_DX3W)) &&
(pdidi->dwSize != sizeof(DIDEVICEINSTANCEW))) { (pdidi->dwSize != sizeof(DIDEVICEINSTANCEW))) {
WARN("invalid parameter: pdidi->dwSize = %d != %d or %d\n", WARN("invalid parameter: pdidi->dwSize = %d\n", pdidi->dwSize);
pdidi->dwSize, sizeof(DIDEVICEINSTANCE_DX3W),
sizeof(DIDEVICEINSTANCEW));
return DIERR_INVALIDPARAM; return DIERR_INVALIDPARAM;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment