Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-06 18:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] dbghelp: Call GetSystemInfo in DllMain.

Browse source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 7544b9f6fb0bf39c714452968e20e478efaa104a by Jacek Caban <jacek@codeweavers.com>
This commit is contained in:
winesync 2020-09-11 17:10:39 +02:00 committed by Jérôme Gardou
parent 6a54330242
commit e2e4ea2f5f
5 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dll/win32/dbghelp/dbghelp.c
View file

@ -73,9 +73,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
unsigned dbghelp_options = SYMOPT_UNDNAME;
BOOL dbghelp_opt_native = FALSE;
#ifndef __REACTOS__
SYSTEM_INFO sysinfo;
#endif
static struct process* process_first /* = NULL */;
#ifndef __REACTOS__
BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
{
switch (reason)
{
case DLL_PROCESS_ATTACH:
GetSystemInfo(&sysinfo);
DisableThreadLibraryCalls(instance);
break;
}
return TRUE;
}
#endif
/******************************************************************
* process_find_by_handle
*

3
dll/win32/dbghelp/dbghelp_private.h
View file

@ -128,6 +128,9 @@ void* hash_table_iter_up(struct hash_table_iter* hti) DECLSPEC_HIDDEN;
extern unsigned dbghelp_options DECLSPEC_HIDDEN;
extern BOOL dbghelp_opt_native DECLSPEC_HIDDEN;
#ifndef __REACTOS__
extern SYSTEM_INFO sysinfo DECLSPEC_HIDDEN;
#endif
enum location_kind {loc_error, /* reg is the error code */
loc_unavailable, /* location is not available */

2
dll/win32/dbghelp/elf_module.c
View file

@ -137,7 +137,6 @@ struct elf_module_info
static const char* elf_map_section(struct image_section_map* ism)
{
struct elf_file_map* fmap = &ism->fmap->u.elf;
SYSTEM_INFO sysinfo;
SIZE_T ofst, size;
HANDLE mapping;
@ -152,7 +151,6 @@ static const char* elf_map_section(struct image_section_map* ism)
}
/* align required information on allocation granularity */
GetSystemInfo(&sysinfo);
ofst = fmap->sect[ism->sidx].shdr.sh_offset & ~(sysinfo.dwAllocationGranularity - 1);
size = fmap->sect[ism->sidx].shdr.sh_offset + fmap->sect[ism->sidx].shdr.sh_size - ofst;
if (!(mapping = CreateFileMappingW(fmap->handle, NULL, PAGE_READONLY, 0, ofst + size, NULL)))

2
dll/win32/dbghelp/macho_module.c
View file

@ -164,11 +164,9 @@ static void macho_calc_range(const struct macho_file_map* fmap, unsigned long of
unsigned long len, unsigned long* out_aligned_offset,
unsigned long* out_aligned_end, unsigned long* out_misalign)
{
SYSTEM_INFO sysinfo;
unsigned long pagemask;
unsigned long file_offset, misalign;
GetSystemInfo(&sysinfo);
pagemask = sysinfo.dwAllocationGranularity - 1;
file_offset = fmap->arch_offset + offset;
misalign = file_offset & pagemask;

2
sdk/tools/winesync/dbghelp.cfg
View file

@ -4,4 +4,4 @@ files:
include/dbghelp.h: sdk/include/psdk/dbghelp.h
include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h
tags:
wine: ebf57f01f4890b726a0af702ab7751258f5ab03d
wine: 7544b9f6fb0bf39c714452968e20e478efaa104a