Commit 96d6a25f authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

dinput: Make _dump_cooperativelevel_DI() and _dump_EnumDevices_dwFlags() more self-contained.

parent 745bd4f2
......@@ -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 ||
......
......@@ -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;
......
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