Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-04 05:20:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] dbghelp: Use local stab_nlist declaration in macho_module.c.

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

wine commit id 061146c2ab530a54f8323331e88c5771dd7bba49 by Jacek Caban <jacek@codeweavers.com>
This commit is contained in:
winesync 2020-09-11 18:46:09 +02:00 committed by Jérôme Gardou
parent 2d57c6b88f
commit 43384a1d3c
4 changed files with 39 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -136,6 +136,15 @@ struct image_section_map
LONG_PTR sidx; LONG_PTR sidx;
}; };
struct stab_nlist
{
unsigned n_strx;
unsigned char n_type;
char n_other;
short n_desc;
unsigned n_value;
};
BOOL image_check_alternate(struct image_file_map* fmap, const struct module* module) DECLSPEC_HIDDEN; 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; 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; struct macho_debug_info* mdi = user;
const char* stabstr; const char* stabstr;
int ret = 0; int ret = 0;
size_t stabsize = (ifm->addr_size == 32) ? sizeof(struct nlist) : sizeof(struct nlist_64); size_t stabsize = (ifm->addr_size == 32) ? sizeof(struct stab_nlist) : sizeof(struct nlist_64);
const char *stab; const char *stab;
TRACE("(%p/%p, %p, %p) %u syms at 0x%08x, strings 0x%08x - 0x%08x\n", fmap, fmap->handle, lc, TRACE("(%p/%p, %p, %p) %u syms at 0x%08x, strings 0x%08x - 0x%08x\n", fmap, fmap->handle, lc,

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

@ -62,6 +62,7 @@
#endif #endif
#include "dbghelp_private.h" #include "dbghelp_private.h"
#include "image_private.h"
#ifndef DBGHELP_STATIC_LIB #ifndef DBGHELP_STATIC_LIB
#include "wine/debug.h" #include "wine/debug.h"
@ -120,15 +121,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs);
#define N_EXCL 0xc2 #define N_EXCL 0xc2
#define N_RBRAC 0xe0 #define N_RBRAC 0xe0
struct stab_nlist
{
unsigned n_strx;
unsigned char n_type;
char n_other;
short n_desc;
unsigned n_value;
};
static void stab_strcpy(char* dest, int sz, const char* source) static void stab_strcpy(char* dest, int sz, const char* source)
{ {
char* ptr = dest; char* ptr = dest;

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

@ -4,4 +4,4 @@ files:
include/dbghelp.h: sdk/include/psdk/dbghelp.h include/dbghelp.h: sdk/include/psdk/dbghelp.h
include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h
tags: tags:
wine: 47f1c5a993ed34e5f1e4783360019613d0f9682a wine: 061146c2ab530a54f8323331e88c5771dd7bba49