Marcus Meissner : dinput: Add a dumper for LPDIACTIONFORMAT.
Alexandre Julliard
julliard at winehq.org
Sat Feb 16 09:57:35 CST 2008
Module: wine
Branch: master
Commit: 9ce27fc7c104abdc6b0d5d55060c1311627ce491
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce27fc7c104abdc6b0d5d55060c1311627ce491
Author: Marcus Meissner <meissner at suse.de>
Date: Fri Feb 15 14:50:15 2008 +0100
dinput: Add a dumper for LPDIACTIONFORMAT.
Also make the DINPUT_instance static.
---
dlls/dinput/device.c | 2 +-
dlls/dinput/dinput_main.c | 31 ++++++++++++++++++++++++++++++-
dlls/dinput/dinput_private.h | 4 ++--
3 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index 43cd946..8641803 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -1339,7 +1339,7 @@ HRESULT WINAPI IDirectInputDevice8AImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A ifa
DWORD dwFlags)
{
FIXME("(%p)->(%p,%s,%08x): stub !\n", iface, lpdiaf, lpszUserName, dwFlags);
-
+ _dump_diactionformatA(lpdiaf);
return DI_OK;
}
diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index 2638710..0424f72 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -82,7 +82,7 @@ static const struct dinput_device *dinput_devices[] =
};
#define NB_DINPUT_DEVICES (sizeof(dinput_devices)/sizeof(dinput_devices[0]))
-HINSTANCE DINPUT_instance = NULL;
+static HINSTANCE DINPUT_instance = NULL;
BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserv)
{
@@ -210,6 +210,35 @@ static void _dump_EnumDevices_dwFlags(DWORD dwFlags) {
TRACE("\n");
}
+void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat) {
+ int i;
+
+ FIXME("diaf.dwSize = %d\n", lpdiActionFormat->dwSize);
+ FIXME("diaf.dwActionSize = %d\n", lpdiActionFormat->dwActionSize);
+ FIXME("diaf.dwDataSize = %d\n", lpdiActionFormat->dwDataSize);
+ FIXME("diaf.dwNumActions = %d\n", lpdiActionFormat->dwNumActions);
+ FIXME("diaf.rgoAction = %p\n", lpdiActionFormat->rgoAction);
+ for (i=0;i<lpdiActionFormat->dwNumActions;i++) {
+ FIXME("diaf.rgoAction[%d]:\n", i);
+ FIXME("\tuAppData=%lx\n", lpdiActionFormat->rgoAction[i].uAppData);
+ FIXME("\tdwSemantics=%x\n", lpdiActionFormat->rgoAction[i].dwSemantics);
+ FIXME("\tdwFlags=%x\n", lpdiActionFormat->rgoAction[i].dwFlags);
+ FIXME("\tszActionName=%s\n", debugstr_a(lpdiActionFormat->rgoAction[i].lptszActionName));
+ FIXME("\tguidInstance=%s\n", debugstr_guid(&lpdiActionFormat->rgoAction[i].guidInstance));
+ FIXME("\tdwObjID=%x\n", lpdiActionFormat->rgoAction[i].dwObjID);
+ FIXME("\tdwHow=%x\n", lpdiActionFormat->rgoAction[i].dwHow);
+ }
+ FIXME("diaf.guidActionMap = %s\n", debugstr_guid(&lpdiActionFormat->guidActionMap));
+ FIXME("diaf.dwGenre = %d\n", lpdiActionFormat->dwGenre);
+ FIXME("diaf.dwBufferSize = %d\n", lpdiActionFormat->dwBufferSize);
+ FIXME("diaf.lAxisMin = %d\n", lpdiActionFormat->lAxisMin);
+ FIXME("diaf.lAxisMax = %d\n", lpdiActionFormat->lAxisMax);
+ FIXME("diaf.hInstString = %p\n", lpdiActionFormat->hInstString);
+ FIXME("diaf.ftTimeStamp ...\n");
+ FIXME("diaf.dwCRC = %x\n", lpdiActionFormat->dwCRC);
+ FIXME("diaf.tszActionMap = %s\n", debugstr_a(lpdiActionFormat->tszActionMap));
+}
+
/******************************************************************************
* IDirectInputA_EnumDevices
*/
diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h
index a9d12de..15783e2 100644
--- a/dlls/dinput/dinput_private.h
+++ b/dlls/dinput/dinput_private.h
@@ -59,9 +59,9 @@ extern const struct dinput_device keyboard_device;
extern const struct dinput_device joystick_linux_device;
extern const struct dinput_device joystick_linuxinput_device;
-extern HINSTANCE DINPUT_instance;
-
extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8A);
typedef void (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM);
+extern void _dump_diactionformatA(LPDIACTIONFORMATA);
+
#endif /* __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H */
More information about the wine-cvs
mailing list