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
b9f350b5
Commit
b9f350b5
authored
Aug 07, 2000
by
Peter Ganten
Committed by
Alexandre Julliard
Aug 07, 2000
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set up exe_modref before loading implicitly linked dlls.
parent
eb381292
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
7 deletions
+13
-7
pe_image.c
loader/pe_image.c
+13
-7
No files found.
loader/pe_image.c
View file @
b9f350b5
...
...
@@ -854,6 +854,18 @@ WINE_MODREF *PE_CreateModule( HMODULE hModule, LPCSTR filename, DWORD flags,
if
(
pe_export
)
dump_exports
(
hModule
);
/* The exe_modref must be in place, before implicit linked DLLs are loaded
by fixup_imports, otherwhise GetModuleFileName will not work and modules
in the executables directory can not be found */
if
(
!
(
nt
->
FileHeader
.
Characteristics
&
IMAGE_FILE_DLL
))
{
if
(
PROCESS_Current
()
->
exe_modref
)
FIXME
(
"Trying to load second .EXE file: %s
\n
"
,
filename
);
else
PROCESS_Current
()
->
exe_modref
=
wm
;
}
/* Fixup Imports */
if
(
!
(
wm
->
flags
&
WINE_MODREF_DONT_RESOLVE_REFS
)
&&
fixup_imports
(
wm
))
...
...
@@ -882,6 +894,7 @@ WINE_MODREF *PE_CreateModule( HMODULE hModule, LPCSTR filename, DWORD flags,
SNOOP_RegisterDLL
(
hModule
,
wm
->
modname
,
pe_export
->
NumberOfFunctions
);
/* Send DLL load event */
/* we don't need to send a dll event for the main exe */
if
(
nt
->
FileHeader
.
Characteristics
&
IMAGE_FILE_DLL
)
{
...
...
@@ -893,13 +906,6 @@ WINE_MODREF *PE_CreateModule( HMODULE hModule, LPCSTR filename, DWORD flags,
req
->
name
=
&
wm
->
filename
;
server_call_noerr
(
REQ_LOAD_DLL
);
}
else
/* we don't need to send a dll event for the main exe */
{
if
(
PROCESS_Current
()
->
exe_modref
)
FIXME
(
"Trying to load second .EXE file: %s
\n
"
,
filename
);
else
PROCESS_Current
()
->
exe_modref
=
wm
;
}
return
wm
;
}
...
...
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