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
88c5184b
Commit
88c5184b
authored
Aug 24, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Consistently fixup the machine type for IL-only binaries.
Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=51668
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
c0198a65
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
env.c
dlls/ntdll/unix/env.c
+0
-2
loader.c
dlls/ntdll/unix/loader.c
+5
-1
No files found.
dlls/ntdll/unix/env.c
View file @
88c5184b
...
...
@@ -2148,8 +2148,6 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params( void **module )
if
(
!
status
)
{
if
(
main_image_info
.
ImageCharacteristics
&
IMAGE_FILE_DLL
)
status
=
STATUS_INVALID_IMAGE_FORMAT
;
if
(
main_image_info
.
ImageFlags
&
IMAGE_FLAGS_ComPlusNativeReady
)
main_image_info
.
Machine
=
native_machine
;
if
(
main_image_info
.
Machine
!=
current_machine
)
status
=
STATUS_INVALID_IMAGE_FORMAT
;
}
...
...
dlls/ntdll/unix/loader.c
View file @
88c5184b
...
...
@@ -1569,7 +1569,11 @@ static NTSTATUS open_main_image( WCHAR *image, void **module, SECTION_IMAGE_INFO
*
module
=
NULL
;
status
=
NtMapViewOfSection
(
mapping
,
NtCurrentProcess
(),
module
,
0
,
0
,
NULL
,
&
size
,
ViewShare
,
0
,
PAGE_EXECUTE_READ
);
if
(
!
status
)
NtQuerySection
(
mapping
,
SectionImageInformation
,
info
,
sizeof
(
*
info
),
NULL
);
if
(
!
status
)
{
NtQuerySection
(
mapping
,
SectionImageInformation
,
info
,
sizeof
(
*
info
),
NULL
);
if
(
info
->
u
.
s
.
ComPlusNativeReady
)
info
->
Machine
=
native_machine
;
}
NtClose
(
mapping
);
}
else
if
(
status
==
STATUS_INVALID_IMAGE_NOT_MZ
&&
loadorder
!=
LO_NATIVE
)
...
...
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