Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
74f05b86
Commit
74f05b86
authored
Apr 25, 2017
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dbghelp: Use the main module load address from the PEB.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
d3bbd03c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
1 deletion
+10
-1
elf_module.c
dlls/dbghelp/elf_module.c
+10
-1
No files found.
dlls/dbghelp/elf_module.c
View file @
74f05b86
...
...
@@ -44,6 +44,7 @@
#endif
#include "dbghelp_private.h"
#include "winternl.h"
#include "image_private.h"
...
...
@@ -1200,6 +1201,8 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename,
char
*
ptr
=
(
char
*
)
fmap
->
u
.
elf
.
sect
[
ism
.
sidx
].
shdr
.
sh_addr
;
unsigned
long
len
;
if
(
load_offset
)
ptr
+=
load_offset
-
fmap
->
u
.
elf
.
elf_start
;
do
{
if
(
!
ReadProcessMemory
(
pcs
->
handle
,
ptr
,
&
dyn
,
sizeof
(
dyn
),
&
len
)
||
...
...
@@ -1565,7 +1568,13 @@ static BOOL elf_enum_modules_internal(const struct process* pcs,
*/
static
BOOL
elf_search_loader
(
struct
process
*
pcs
,
struct
elf_info
*
elf_info
)
{
return
elf_search_and_load_file
(
pcs
,
get_wine_loader_name
(),
0
,
0
,
elf_info
);
PROCESS_BASIC_INFORMATION
pbi
;
ULONG_PTR
base
=
0
;
if
(
!
NtQueryInformationProcess
(
pcs
->
handle
,
ProcessBasicInformation
,
&
pbi
,
sizeof
(
pbi
),
NULL
))
ReadProcessMemory
(
pcs
->
handle
,
&
pbi
.
PebBaseAddress
->
Reserved
[
0
],
&
base
,
sizeof
(
base
),
NULL
);
return
elf_search_and_load_file
(
pcs
,
get_wine_loader_name
(),
base
,
0
,
elf_info
);
}
/******************************************************************
...
...
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