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

user32: Use CreateAcceleratorTableW in LoadAcceleratorsW. 

Instead of accessing accelerators object directly.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2022-03-02 15:05:58 +01:00 committed by Alexandre Julliard
parent dadace10ec
commit ec036bc605
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/user32/resource.c
View File

@ -54,8 +54,8 @@ struct accelerator
*/ */
HACCEL WINAPI LoadAcceleratorsW(HINSTANCE instance, LPCWSTR name) HACCEL WINAPI LoadAcceleratorsW(HINSTANCE instance, LPCWSTR name)
{ {
struct accelerator *accel;
const PE_ACCEL *pe_table; const PE_ACCEL *pe_table;
ACCEL *table;
unsigned int i; unsigned int i;
HRSRC rsrc; HRSRC rsrc;
HACCEL handle; HACCEL handle;
@ -65,17 +65,16 @@ HACCEL WINAPI LoadAcceleratorsW(HINSTANCE instance, LPCWSTR name)
pe_table = LoadResource( instance, rsrc ); pe_table = LoadResource( instance, rsrc );
count = SizeofResource( instance, rsrc ) / sizeof(*pe_table); count = SizeofResource( instance, rsrc ) / sizeof(*pe_table);
if (!count) return 0; if (!count) return 0;
accel = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( struct accelerator, table[count] )); table = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*table) );
if (!accel) return 0; if (!table) return 0;
accel->count = count;
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
accel->table[i].fVirt = pe_table[i].fVirt; table[i].fVirt = pe_table[i].fVirt;
accel->table[i].key = pe_table[i].key; table[i].key = pe_table[i].key;
accel->table[i].cmd = pe_table[i].cmd; table[i].cmd = pe_table[i].cmd;
} }
if (!(handle = alloc_user_handle( &accel->obj, NTUSER_OBJ_ACCEL ))) handle = CreateAcceleratorTableW( table, count );
HeapFree( GetProcessHeap(), 0, accel ); HeapFree( GetProcessHeap(), 0, table );
TRACE_(accel)("%p %s returning %p\n", instance, debugstr_w(name), handle ); TRACE_(accel)("%p %s returning %p\n", instance, debugstr_w(name), handle );
return handle; return handle;
} }