Francois Gouget : dinput: Make _dump_cooperativelevel_DI() and _dump_EnumDevices_dwFlags() more self-contained.
Alexandre Julliard
julliard at winehq.org
Tue Dec 18 07:34:49 CST 2007
Module: wine
Branch: master
Commit: 96d6a25fa1120e2dc3670c3c8cbf15aade83df7a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=96d6a25fa1120e2dc3670c3c8cbf15aade83df7a
Author: Francois Gouget <fgouget at free.fr>
Date: Tue Dec 18 10:01:51 2007 +0100
dinput: Make _dump_cooperativelevel_DI() and _dump_EnumDevices_dwFlags() more self-contained.
---
dlls/dinput/device.c | 2 +-
dlls/dinput/dinput_main.c | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index d1e6ac8..43cd946 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -59,6 +59,7 @@ void _dump_cooperativelevel_DI(DWORD dwFlags) {
FE(DISCL_NOWINKEY)
#undef FE
};
+ TRACE(" cooperative level : ");
for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++)
if (flags[i].mask & dwFlags)
TRACE("%s ",flags[i].name);
@@ -675,7 +676,6 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetCooperativeLevel(
IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface;
TRACE("(%p) %p,0x%08x\n", This, hwnd, dwflags);
- TRACE(" cooperative level : ");
_dump_cooperativelevel_DI(dwflags);
if ((dwflags & (DISCL_EXCLUSIVE | DISCL_NONEXCLUSIVE)) == 0 ||
diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index c3d41fd..fc3c90a 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -198,6 +198,7 @@ static void _dump_EnumDevices_dwFlags(DWORD dwFlags) {
FE(DIEDFL_INCLUDEPHANTOMS)
#undef FE
};
+ TRACE(" flags: ");
if (dwFlags == 0) {
TRACE("DIEDFL_ALLDEVICES");
return;
@@ -206,6 +207,7 @@ static void _dump_EnumDevices_dwFlags(DWORD dwFlags) {
if (flags[i].mask & dwFlags)
TRACE("%s ",flags[i].name);
}
+ TRACE("\n");
}
/******************************************************************************
@@ -222,7 +224,7 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices(
TRACE("(this=%p,0x%04x '%s',%p,%p,%04x)\n",
This, dwDevType, _dump_DIDEVTYPE_value(dwDevType),
lpCallback, pvRef, dwFlags);
- TRACE(" flags: "); _dump_EnumDevices_dwFlags(dwFlags); TRACE("\n");
+ _dump_EnumDevices_dwFlags(dwFlags);
for (i = 0; i < NB_DINPUT_DEVICES; i++) {
if (!dinput_devices[i]->enum_deviceA) continue;
@@ -252,7 +254,7 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices(
TRACE("(this=%p,0x%04x '%s',%p,%p,%04x)\n",
This, dwDevType, _dump_DIDEVTYPE_value(dwDevType),
lpCallback, pvRef, dwFlags);
- TRACE(" flags: "); _dump_EnumDevices_dwFlags(dwFlags); TRACE("\n");
+ _dump_EnumDevices_dwFlags(dwFlags);
for (i = 0; i < NB_DINPUT_DEVICES; i++) {
if (!dinput_devices[i]->enum_deviceW) continue;
More information about the wine-cvs
mailing list