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
7c0d6e80
Commit
7c0d6e80
authored
Apr 06, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Also fallback to native if builtin is for the wrong architecture.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
8f2f59ee
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
loader.c
dlls/ntdll/unix/loader.c
+2
-1
No files found.
dlls/ntdll/unix/loader.c
View file @
7c0d6e80
...
...
@@ -1372,7 +1372,8 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename,
return
find_builtin_dll
(
&
nt_name
,
module
,
size
,
&
info
,
machine
,
FALSE
);
default:
status
=
find_builtin_dll
(
&
nt_name
,
module
,
size
,
&
info
,
machine
,
(
loadorder
==
LO_DEFAULT
)
);
if
(
status
==
STATUS_DLL_NOT_FOUND
)
return
STATUS_IMAGE_ALREADY_LOADED
;
if
(
status
==
STATUS_DLL_NOT_FOUND
||
status
==
STATUS_IMAGE_MACHINE_TYPE_MISMATCH
)
return
STATUS_IMAGE_ALREADY_LOADED
;
return
status
;
}
}
...
...
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