system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 06:21:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

dinput: Fix default axes mapping generation.

Browse source
This commit is contained in:
Vitaliy Margolen 2008-04-27 23:01:55 -06:00 committed by Alexandre Julliard
parent 67a7a8a8ef
commit 736d03c8da
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
dlls/dinput/joystick_linux.c
View file

@ -271,6 +271,9 @@ static HRESULT setup_dinput_options(JoystickImpl * device)
{
char buffer[MAX_PATH+16];
HKEY hkey, appkey;
int tokens = 0;
int axis = 0;
int pov = 0;
buffer[MAX_PATH]='\0';
@ -283,18 +286,14 @@ static HRESULT setup_dinput_options(JoystickImpl * device)
TRACE("setting default deadzone to: \"%s\" %d\n", buffer, device->deadzone);
}
device->axis_map = HeapAlloc(GetProcessHeap(), 0, device->axes * sizeof(int));
if (!device->axis_map) return DIERR_OUTOFMEMORY;
if (!get_config_key( hkey, appkey, device->name, buffer, MAX_PATH )) {
int tokens = 0;
int axis = 0;
int pov = 0;
const char *delim = ",";
char * ptr;
TRACE("\"%s\" = \"%s\"\n", device->name, buffer);
device->axis_map = HeapAlloc(GetProcessHeap(), 0, device->axes * sizeof(int));
if (device->axis_map == 0)
return DIERR_OUTOFMEMORY;
if ((ptr = strtok(buffer, delim)) != NULL) {
do {
if (strcmp(ptr, "X") == 0) {
@ -355,9 +354,22 @@ static HRESULT setup_dinput_options(JoystickImpl * device)
}
}
device->devcaps.dwAxes = axis;
device->devcaps.dwPOVs = pov;
}
else
{
for (tokens = 0; tokens < device->axes; tokens++)
{
if (tokens < 8)
device->axis_map[tokens] = axis++;
else
{
device->axis_map[tokens ] = 8 + pov;
device->axis_map[tokens++] = 8 + pov++;
}
}
}
device->devcaps.dwAxes = axis;
device->devcaps.dwPOVs = pov;
if (appkey)
RegCloseKey( appkey );
@ -445,29 +457,17 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di
/* setup_dinput_options may change these */
newDevice->deadzone = 0;
newDevice->devcaps.dwButtons = newDevice->buttons;
newDevice->devcaps.dwAxes = newDevice->axes;
newDevice->devcaps.dwPOVs = 0;
/* do any user specified configuration */
hr = setup_dinput_options(newDevice);
if (hr != DI_OK)
goto FAILED1;
if (newDevice->axis_map == 0) {
newDevice->axis_map = HeapAlloc(GetProcessHeap(), 0, newDevice->axes * sizeof(int));
if (newDevice->axis_map == 0)
goto FAILED;
for (i = 0; i < newDevice->axes; i++)
newDevice->axis_map[i] = i;
}
/* Create copy of default data format */
if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIJoystick2.dwSize))) goto FAILED;
memcpy(df, &c_dfDIJoystick2, c_dfDIJoystick2.dwSize);
/* Axes include POVs */
df->dwNumObjs = newDevice->axes + newDevice->buttons;
df->dwNumObjs = newDevice->devcaps.dwAxes + newDevice->devcaps.dwPOVs + newDevice->buttons;
if (!(df->rgodf = HeapAlloc(GetProcessHeap(), 0, df->dwNumObjs * df->dwObjSize))) goto FAILED;
for (i = 0; i < newDevice->axes; i++)