ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dinput: Add a dumper for LPDIACTIONFORMAT. 

Also make the DINPUT_instance static.
This commit is contained in:
Marcus Meissner 2008-02-15 14:50:15 +01:00 committed by Alexandre Julliard
parent 973c29716b
commit 9ce27fc7c1
3 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/dinput/device.c
View File

@ -1339,7 +1339,7 @@ HRESULT WINAPI IDirectInputDevice8AImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A ifa
DWORD dwFlags) DWORD dwFlags)
{ {
FIXME("(%p)->(%p,%s,%08x): stub !\n", iface, lpdiaf, lpszUserName, dwFlags); FIXME("(%p)->(%p,%s,%08x): stub !\n", iface, lpdiaf, lpszUserName, dwFlags);
_dump_diactionformatA(lpdiaf);
return DI_OK; return DI_OK;
} }

31
dlls/dinput/dinput_main.c
View File

@ -82,7 +82,7 @@ static const struct dinput_device *dinput_devices[] =
}; };
#define NB_DINPUT_DEVICES (sizeof(dinput_devices)/sizeof(dinput_devices[0])) #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) BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserv)
{ {
@ -210,6 +210,35 @@ static void _dump_EnumDevices_dwFlags(DWORD dwFlags) {
TRACE("\n"); 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 * IDirectInputA_EnumDevices
*/ */

4
dlls/dinput/dinput_private.h
View File

@ -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_linux_device;
extern const struct dinput_device joystick_linuxinput_device; extern const struct dinput_device joystick_linuxinput_device;
extern HINSTANCE DINPUT_instance;
extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8A); extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8A);
typedef void (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM); typedef void (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM);
extern void _dump_diactionformatA(LPDIACTIONFORMATA);
#endif /* __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H */ #endif /* __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H */