Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
2534c2a2
Commit
2534c2a2
authored
Mar 31, 2020
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 31, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dbghelp: Use local NOTE_GNU_BUILD_ID declaration.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
eba6b38b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
10 deletions
+4
-10
elf_module.c
dlls/dbghelp/elf_module.c
+0
-4
image_private.h
dlls/dbghelp/image_private.h
+0
-4
module.c
dlls/dbghelp/module.c
+4
-2
No files found.
dlls/dbghelp/elf_module.c
View file @
2534c2a2
...
@@ -47,10 +47,6 @@
...
@@ -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
{
{
...
...
dlls/dbghelp/image_private.h
View file @
2534c2a2
...
@@ -54,10 +54,6 @@
...
@@ -54,10 +54,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
*/
*/
...
...
dlls/dbghelp/module.c
View file @
2534c2a2
...
@@ -34,6 +34,8 @@
...
@@ -34,6 +34,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'
};
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'
};
static
const
WCHAR
S_DotSoW
[]
=
{
'.'
,
's'
,
'o'
,
'\0'
};
static
const
WCHAR
S_DotSoW
[]
=
{
'.'
,
's'
,
'o'
,
'\0'
};
...
@@ -640,7 +642,7 @@ static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE
...
@@ -640,7 +642,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
]
==
N
T
_GNU_BUILD_ID
)
if
(
note
[
2
]
==
N
OTE
_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
))
...
@@ -686,7 +688,7 @@ BOOL image_check_alternate(struct image_file_map* fmap, const struct module* mod
...
@@ -686,7 +688,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
]
==
N
T
_GNU_BUILD_ID
)
if
(
note
[
2
]
==
N
OTE
_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
]);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment