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

offsets array is the size of the wine data format so there is no need

Browse Source 
to reallocate it when the format changes.
This commit is contained in:
Robert Reif 2004-09-09 19:17:46 +00:00 committed by Alexandre Julliard
parent 92acc58af6
commit 3872fc39c3
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/dinput/joystick_linux.c
View File

@ -685,7 +685,6 @@ static HRESULT WINAPI JoystickAImpl_SetDataFormat(
LPDIDATAFORMAT new_df = 0; LPDIDATAFORMAT new_df = 0;
LPDIOBJECTDATAFORMAT new_rgodf = 0; LPDIOBJECTDATAFORMAT new_rgodf = 0;
ObjProps * new_props = 0; ObjProps * new_props = 0;
int * new_offsets = 0;
TRACE("(%p,%p)\n",This,df); TRACE("(%p,%p)\n",This,df);
@ -710,14 +709,9 @@ static HRESULT WINAPI JoystickAImpl_SetDataFormat(
if (new_props == 0) if (new_props == 0)
goto FAILED; goto FAILED;
new_offsets = HeapAlloc(GetProcessHeap(),0,df->dwNumObjs*sizeof(int));
if (new_offsets == 0)
goto FAILED;
HeapFree(GetProcessHeap(),0,This->user_df); HeapFree(GetProcessHeap(),0,This->user_df);
HeapFree(GetProcessHeap(),0,This->user_df->rgodf); HeapFree(GetProcessHeap(),0,This->user_df->rgodf);
HeapFree(GetProcessHeap(),0,This->props); HeapFree(GetProcessHeap(),0,This->props);
HeapFree(GetProcessHeap(),0,This->offsets);
release_DataFormat(This->transform); release_DataFormat(This->transform);
This->user_df = new_df; This->user_df = new_df;
@ -731,7 +725,6 @@ static HRESULT WINAPI JoystickAImpl_SetDataFormat(
This->props[i].lDeadZone = 1000; This->props[i].lDeadZone = 1000;
This->props[i].lSaturation = 0; This->props[i].lSaturation = 0;
} }
This->offsets = new_offsets;
This->transform = create_DataFormat(&c_dfDIJoystick2, This->user_df, This->offsets); This->transform = create_DataFormat(&c_dfDIJoystick2, This->user_df, This->offsets);
calculate_ids(This); calculate_ids(This);
@ -740,8 +733,6 @@ static HRESULT WINAPI JoystickAImpl_SetDataFormat(
FAILED: FAILED:
WARN("out of memory\n"); WARN("out of memory\n");
if (new_offsets)
HeapFree(GetProcessHeap(),0,new_offsets);
if (new_props) if (new_props)
HeapFree(GetProcessHeap(),0,new_props); HeapFree(GetProcessHeap(),0,new_props);
if (new_rgodf) if (new_rgodf)