Always set DIOBJECTDATAFORMAT.pguid to GUID_Button for joystick buttons

Vitaliy Margolen wine-devel at kievinfo.com
Thu Sep 20 19:51:40 CDT 2007


Antonio Cuni wrote:
> At least one game (Pro Evolution Soccer 6) rely on the pguid field of 
> the DIOBJECTDATAFORMAT struct to respond to joystick button's events. 
> Setting pguid to GUID_Button solves the problem.
> 
> 2007-09-20  Antonio Cuni <anto.cuni at gmail.com>
> 
>     * dlls/dinput/joystick_linux.c,
>           dlls/dinput/joystick_linuxinput.c
>     Always set DIOBJECTDATAFORMAT.pguid to GUID_Button for
>         joystick buttons
> 

Thank you for the patch. I have few comments about it:

> -- /tmp/wine-0.9.45/dlls/dinput/joystick_linux.c	2007-09-14 19:30:55.000000000 +0200
> +++ ./joystick_linux.c	2007-09-20 17:02:15.000000000 +0200
You should diff from the top of the tree (above line should say dlls/dinput/joystick_linux.c).

> +        df->rgodf[idx].pguid = &GUID_Button; // some games require the GUID to be GUID_Button
C++ comments are not allowed in Wine. Please put comments above the code. 

> 	newDevice->buttons[i] = 0x80 | newDevice->numButtons;
> +	df->rgodf[idx].pguid = &GUID_Button; // some games require the GUID to be GUID_Button
>          df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(newDevice->numButtons++) | DIDFT_PSHBUTTON;
Please don't use tabs. Use spaces to keep formating.

Vitaliy.



More information about the wine-devel mailing list