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

ntdll: Keep unwind table entry count instead of a size. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2019-01-23 08:23:49 +03:00 committed by Alexandre Julliard
parent 6f7731819c
commit 0cd5a68ca4
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/ntdll/signal_x86_64.c
View File

@ -342,7 +342,7 @@ struct dynamic_unwind_entry
/* lookup table */ /* lookup table */
RUNTIME_FUNCTION *table; RUNTIME_FUNCTION *table;
DWORD table_size; DWORD count;
/* user defined callback */ /* user defined callback */
PGET_RUNTIME_FUNCTION_CALLBACK callback; PGET_RUNTIME_FUNCTION_CALLBACK callback;
@ -2516,7 +2516,7 @@ static RUNTIME_FUNCTION *find_function_info( ULONG64 pc, HMODULE module,
RUNTIME_FUNCTION *func, ULONG size ) RUNTIME_FUNCTION *func, ULONG size )
{ {
int min = 0; int min = 0;
int max = size/sizeof(*func) - 1; int max = size - 1;
while (min <= max) while (min <= max)
{ {
@ -2551,7 +2551,7 @@ static RUNTIME_FUNCTION *lookup_function_info( ULONG64 pc, ULONG64 *base, LDR_MO
IMAGE_DIRECTORY_ENTRY_EXCEPTION, &size ))) IMAGE_DIRECTORY_ENTRY_EXCEPTION, &size )))
{ {
/* lookup in function table */ /* lookup in function table */
func = find_function_info( pc, (*module)->BaseAddress, func, size ); func = find_function_info( pc, (*module)->BaseAddress, func, size/sizeof(*func) );
} }
} }
else else
@ -2569,7 +2569,7 @@ static RUNTIME_FUNCTION *lookup_function_info( ULONG64 pc, ULONG64 *base, LDR_MO
if (entry->callback) if (entry->callback)
func = entry->callback( pc, entry->context ); func = entry->callback( pc, entry->context );
else else
func = find_function_info( pc, (HMODULE)entry->base, entry->table, entry->table_size ); func = find_function_info( pc, (HMODULE)entry->base, entry->table, entry->count );
break; break;
} }
} }
@ -3456,12 +3456,12 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD64
if (!entry) if (!entry)
return FALSE; return FALSE;
entry->base = addr; entry->base = addr;
entry->end = addr + table[count - 1].EndAddress; entry->end = addr + table[count - 1].EndAddress;
entry->table = table; entry->table = table;
entry->table_size = count * sizeof(RUNTIME_FUNCTION); entry->count = count;
entry->callback = NULL; entry->callback = NULL;
entry->context = NULL; entry->context = NULL;
RtlEnterCriticalSection( &dynamic_unwind_section ); RtlEnterCriticalSection( &dynamic_unwind_section );
list_add_tail( &dynamic_unwind_list, &entry->entry ); list_add_tail( &dynamic_unwind_list, &entry->entry );
@ -3491,12 +3491,12 @@ BOOLEAN CDECL RtlInstallFunctionTableCallback( DWORD64 table, DWORD64 base, DWOR
if (!entry) if (!entry)
return FALSE; return FALSE;
entry->base = base; entry->base = base;
entry->end = base + length; entry->end = base + length;
entry->table = (RUNTIME_FUNCTION *)table; entry->table = (RUNTIME_FUNCTION *)table;
entry->table_size = 0; entry->count = 0;
entry->callback = callback; entry->callback = callback;
entry->context = context; entry->context = context;
RtlEnterCriticalSection( &dynamic_unwind_section ); RtlEnterCriticalSection( &dynamic_unwind_section );
list_add_tail( &dynamic_unwind_list, &entry->entry ); list_add_tail( &dynamic_unwind_list, &entry->entry );