Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] dbghelp: Use local declaration for 64-bit macho nlist.

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

wine commit id f48f8cc39980f2d93015ecd56f28e3e9f52843fe by Jacek Caban <jacek@codeweavers.com>
This commit is contained in:
winesync 2020-09-11 18:49:27 +02:00 committed by Jérôme Gardou
parent 43384a1d3c
commit 7fa8c40ed5
4 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dll/win32/dbghelp/image_private.h
View file

@ -145,6 +145,15 @@ struct stab_nlist
unsigned n_value;
};
struct macho64_nlist
{
unsigned n_strx;
unsigned char n_type;
char n_other;
short n_desc;
UINT64 n_value;
};
BOOL image_check_alternate(struct image_file_map* fmap, const struct module* module) DECLSPEC_HIDDEN;
BOOL elf_map_handle(HANDLE handle, struct image_file_map* fmap) DECLSPEC_HIDDEN;

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

@ -932,7 +932,7 @@ static int macho_parse_symtab(struct image_file_map* ifm,
struct macho_debug_info* mdi = user;
const char* stabstr;
int ret = 0;
size_t stabsize = (ifm->addr_size == 32) ? sizeof(struct stab_nlist) : sizeof(struct nlist_64);
size_t stabsize = (ifm->addr_size == 32) ? sizeof(struct stab_nlist) : sizeof(struct macho64_nlist);
const char *stab;
TRACE("(%p/%p, %p, %p) %u syms at 0x%08x, strings 0x%08x - 0x%08x\n", fmap, fmap->handle, lc,

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

@ -34,27 +34,14 @@
#include <sys/types.h>
#include <fcntl.h>
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
#endif
#include <limits.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <stdio.h>
#include <assert.h>
#include <stdarg.h>
#ifdef HAVE_MACH_O_NLIST_H
# include <mach-o/nlist.h>
#endif
#ifndef DBGHELP_STATIC_LIB
#include "windef.h"
#include "winbase.h"
@ -1298,7 +1285,7 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset,
#ifdef __APPLE__
if (module->process->is_64bit)
stabsize = sizeof(struct nlist_64);
stabsize = sizeof(struct macho64_nlist);
#endif
nstab = stablen / stabsize;
strs_end = strs + strtablen;
@ -1322,7 +1309,7 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset,
n_value = stab_ptr->n_value;
#ifdef __APPLE__
if (module->process->is_64bit)
n_value = ((struct nlist_64 *)stab_ptr)->n_value;
n_value = ((struct macho64_nlist *)stab_ptr)->n_value;
#endif
ptr = strs + stab_ptr->n_strx;
if ((ptr > strs_end) || (ptr + strlen(ptr) > strs_end))

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: 061146c2ab530a54f8323331e88c5771dd7bba49
wine: f48f8cc39980f2d93015ecd56f28e3e9f52843fe