Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 08:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] dbghelp: Use local NOTE_GNU_BUILD_ID declaration.

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

wine commit id 2534c2a2d22d3c610ffdfbb6b33e0b5176509aa1 by Jacek Caban <jacek@codeweavers.com>
This commit is contained in:
winesync 2020-09-11 18:52:54 +02:00 committed by Jérôme Gardou
parent aa015b65dc
commit eed384bb16
4 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,10 +47,6 @@
#define ELF_INFO_MODULE 0x0002 #define ELF_INFO_MODULE 0x0002
#define ELF_INFO_NAME 0x0004 #define ELF_INFO_NAME 0x0004
#ifndef NT_GNU_BUILD_ID
#define NT_GNU_BUILD_ID 3
#endif
#ifndef HAVE_STRUCT_R_DEBUG #ifndef HAVE_STRUCT_R_DEBUG
struct r_debug struct r_debug
{ {

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

@ -56,10 +56,6 @@
#endif #endif
#endif #endif
#ifndef NT_GNU_BUILD_ID
#define NT_GNU_BUILD_ID 3
#endif
/* structure holding information while handling an ELF image /* structure holding information while handling an ELF image
* allows one by one section mapping for memory savings * allows one by one section mapping for memory savings
*/ */

6
dll/win32/dbghelp/module.c
View file

@ -36,6 +36,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
#define NOTE_GNU_BUILD_ID 3
const WCHAR S_ElfW[] = {'<','e','l','f','>','\0'}; const WCHAR S_ElfW[] = {'<','e','l','f','>','\0'};
#ifndef __REACTOS__ #ifndef __REACTOS__
const WCHAR S_WineLoaderW[] = {'<','w','i','n','e','-','l','o','a','d','e','r','>','\0'}; const WCHAR S_WineLoaderW[] = {'<','w','i','n','e','-','l','o','a','d','e','r','>','\0'};
@ -663,7 +665,7 @@ static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE
if (note != IMAGE_NO_MAP) if (note != IMAGE_NO_MAP)
{ {
/* the usual ELF note structure: name-size desc-size type <name> <desc> */ /* the usual ELF note structure: name-size desc-size type <name> <desc> */
if (note[2] == NT_GNU_BUILD_ID) if (note[2] == NOTE_GNU_BUILD_ID)
{ {
if (note[1] == idlen && if (note[1] == idlen &&
!memcmp(note + 3 + ((note[0] + 3) >> 2), idend - idlen, idlen)) !memcmp(note + 3 + ((note[0] + 3) >> 2), idend - idlen, idlen))
@ -709,7 +711,7 @@ BOOL image_check_alternate(struct image_file_map* fmap, const struct module* mod
if (note != IMAGE_NO_MAP) if (note != IMAGE_NO_MAP)
{ {
/* the usual ELF note structure: name-size desc-size type <name> <desc> */ /* the usual ELF note structure: name-size desc-size type <name> <desc> */
if (note[2] == NT_GNU_BUILD_ID) if (note[2] == NOTE_GNU_BUILD_ID)
{ {
ret = image_locate_build_id_target(fmap, (const BYTE*)(note + 3 + ((note[0] + 3) >> 2)), note[1]); ret = image_locate_build_id_target(fmap, (const BYTE*)(note + 3 + ((note[0] + 3) >> 2)), note[1]);
} }

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: 94ad6bd2e66f589303fe9102b9a81b1f3e8ea9c6 wine: 2534c2a2d22d3c610ffdfbb6b33e0b5176509aa1