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

dinput: Allocate buffers for the effect control and update reports. 

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Rémi Bernon 2021-10-07 10:50:07 +02:00 committed by Alexandre Julliard
parent 099d649434
commit 20b55e8748
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/dinput/joystick_hid.c
View File

@ -147,6 +147,9 @@ struct hid_joystick_effect
struct list entry; struct list entry;
struct hid_joystick *joystick; struct hid_joystick *joystick;
char *effect_control_buf;
char *effect_update_buf;
}; };
static inline struct hid_joystick_effect *impl_from_IDirectInputEffect( IDirectInputEffect *iface ) static inline struct hid_joystick_effect *impl_from_IDirectInputEffect( IDirectInputEffect *iface )
@ -2048,6 +2051,8 @@ static ULONG WINAPI hid_joystick_effect_Release( IDirectInputEffect *iface )
list_remove( &impl->entry ); list_remove( &impl->entry );
LeaveCriticalSection( &impl->joystick->base.crit ); LeaveCriticalSection( &impl->joystick->base.crit );
hid_joystick_private_decref( impl->joystick ); hid_joystick_private_decref( impl->joystick );
HeapFree( GetProcessHeap(), 0, impl->effect_update_buf );
HeapFree( GetProcessHeap(), 0, impl->effect_control_buf );
HeapFree( GetProcessHeap(), 0, impl ); HeapFree( GetProcessHeap(), 0, impl );
} }
return ref; return ref;
@ -2140,6 +2145,7 @@ static IDirectInputEffectVtbl hid_joystick_effect_vtbl =
static HRESULT hid_joystick_effect_create( struct hid_joystick *joystick, IDirectInputEffect **out ) static HRESULT hid_joystick_effect_create( struct hid_joystick *joystick, IDirectInputEffect **out )
{ {
struct hid_joystick_effect *impl; struct hid_joystick_effect *impl;
ULONG report_len;
if (!(impl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*impl) ))) if (!(impl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*impl) )))
return DIERR_OUTOFMEMORY; return DIERR_OUTOFMEMORY;
@ -2152,6 +2158,14 @@ static HRESULT hid_joystick_effect_create( struct hid_joystick *joystick, IDirec
list_add_tail( &joystick->effect_list, &impl->entry ); list_add_tail( &joystick->effect_list, &impl->entry );
LeaveCriticalSection( &joystick->base.crit ); LeaveCriticalSection( &joystick->base.crit );
report_len = joystick->caps.OutputReportByteLength;
if (!(impl->effect_control_buf = HeapAlloc( GetProcessHeap(), 0, report_len ))) goto failed;
if (!(impl->effect_update_buf = HeapAlloc( GetProcessHeap(), 0, report_len ))) goto failed;
*out = &impl->IDirectInputEffect_iface; *out = &impl->IDirectInputEffect_iface;
return DI_OK; return DI_OK;
failed:
IDirectInputEffect_Release( &impl->IDirectInputEffect_iface );
return DIERR_OUTOFMEMORY;
} }