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
52e09e82
Commit
52e09e82
authored
Apr 02, 2018
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Add support for loading IL-only dlls.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
395a94d3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
+9
-2
loader.c
dlls/ntdll/loader.c
+9
-2
No files found.
dlls/ntdll/loader.c
View file @
52e09e82
...
@@ -956,7 +956,10 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void *
...
@@ -956,7 +956,10 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void *
if
((
exports
=
RtlImageDirectoryEntryToData
(
imp
->
ldr
.
BaseAddress
,
TRUE
,
if
((
exports
=
RtlImageDirectoryEntryToData
(
imp
->
ldr
.
BaseAddress
,
TRUE
,
IMAGE_DIRECTORY_ENTRY_EXPORT
,
&
exp_size
)))
IMAGE_DIRECTORY_ENTRY_EXPORT
,
&
exp_size
)))
proc
=
find_named_export
(
imp
->
ldr
.
BaseAddress
,
exports
,
exp_size
,
"_CorExeMain"
,
-
1
,
load_path
);
{
const
char
*
name
=
(
wm
->
ldr
.
Flags
&
LDR_IMAGE_IS_DLL
)
?
"_CorDllMain"
:
"_CorExeMain"
;
proc
=
find_named_export
(
imp
->
ldr
.
BaseAddress
,
exports
,
exp_size
,
name
,
-
1
,
load_path
);
}
if
(
!
proc
)
return
STATUS_PROCEDURE_NOT_FOUND
;
if
(
!
proc
)
return
STATUS_PROCEDURE_NOT_FOUND
;
*
entry
=
proc
;
*
entry
=
proc
;
return
STATUS_SUCCESS
;
return
STATUS_SUCCESS
;
...
@@ -1929,7 +1932,11 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file,
...
@@ -1929,7 +1932,11 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file,
((
nt
->
FileHeader
.
Characteristics
&
IMAGE_FILE_DLL
)
||
((
nt
->
FileHeader
.
Characteristics
&
IMAGE_FILE_DLL
)
||
nt
->
OptionalHeader
.
Subsystem
==
IMAGE_SUBSYSTEM_NATIVE
))
nt
->
OptionalHeader
.
Subsystem
==
IMAGE_SUBSYSTEM_NATIVE
))
{
{
if
((
status
=
fixup_imports
(
wm
,
load_path
))
!=
STATUS_SUCCESS
)
if
(
wm
->
ldr
.
Flags
&
LDR_COR_ILONLY
)
status
=
fixup_imports_ilonly
(
wm
,
load_path
,
&
wm
->
ldr
.
EntryPoint
);
else
status
=
fixup_imports
(
wm
,
load_path
);
if
(
status
!=
STATUS_SUCCESS
)
{
{
/* the module has only be inserted in the load & memory order lists */
/* the module has only be inserted in the load & memory order lists */
RemoveEntryList
(
&
wm
->
ldr
.
InLoadOrderModuleList
);
RemoveEntryList
(
&
wm
->
ldr
.
InLoadOrderModuleList
);
...
...
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