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
c1295953
Commit
c1295953
authored
Feb 07, 2024
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Use the correct machine when loading ntdll on ARM64EC.
parent
0d37cc1d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
loader.c
dlls/ntdll/unix/loader.c
+4
-1
No files found.
dlls/ntdll/unix/loader.c
View file @
c1295953
...
...
@@ -1641,6 +1641,7 @@ static void load_ntdll(void)
static
WCHAR
path
[]
=
{
'\\'
,
'?'
,
'?'
,
'\\'
,
'C'
,
':'
,
'\\'
,
'w'
,
'i'
,
'n'
,
'd'
,
'o'
,
'w'
,
's'
,
'\\'
,
's'
,
'y'
,
's'
,
't'
,
'e'
,
'm'
,
'3'
,
'2'
,
'\\'
,
'n'
,
't'
,
'd'
,
'l'
,
'l'
,
'.'
,
'd'
,
'l'
,
'l'
,
0
};
const
char
*
pe_dir
=
get_pe_dir
(
current_machine
);
USHORT
machine
=
current_machine
;
unsigned
int
status
;
SECTION_IMAGE_INFORMATION
info
;
OBJECT_ATTRIBUTES
attr
;
...
...
@@ -1654,7 +1655,9 @@ static void load_ntdll(void)
if
(
build_dir
)
asprintf
(
&
name
,
"%s%s/ntdll.dll"
,
ntdll_dir
,
pe_dir
);
else
asprintf
(
&
name
,
"%s%s/ntdll.dll"
,
dll_dir
,
pe_dir
);
status
=
open_builtin_pe_file
(
name
,
&
attr
,
&
module
,
&
size
,
&
info
,
0
,
0
,
current_machine
,
FALSE
);
if
(
is_arm64ec
())
machine
=
main_image_info
.
Machine
;
status
=
open_builtin_pe_file
(
name
,
&
attr
,
&
module
,
&
size
,
&
info
,
0
,
0
,
machine
,
FALSE
);
if
(
status
==
STATUS_DLL_NOT_FOUND
)
{
free
(
name
);
...
...
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