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
a7b5786f
Commit
a7b5786f
authored
May 06, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Fix the check for the main exe in get_load_order().
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
814f18ab
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
loadorder.c
dlls/ntdll/unix/loadorder.c
+4
-2
No files found.
dlls/ntdll/unix/loadorder.c
View file @
a7b5786f
...
@@ -58,6 +58,7 @@ static const WCHAR separatorsW[] = {',',' ','\t',0};
...
@@ -58,6 +58,7 @@ static const WCHAR separatorsW[] = {',',' ','\t',0};
static
HANDLE
std_key
;
static
HANDLE
std_key
;
static
HANDLE
app_key
;
static
HANDLE
app_key
;
static
BOOL
init_done
;
static
BOOL
init_done
;
static
BOOL
main_exe_loaded
;
/***************************************************************************
/***************************************************************************
...
@@ -365,6 +366,7 @@ void set_load_order_app_name( const WCHAR *app_name )
...
@@ -365,6 +366,7 @@ void set_load_order_app_name( const WCHAR *app_name )
if
((
p
=
wcsrchr
(
app_name
,
'\\'
)))
app_name
=
p
+
1
;
if
((
p
=
wcsrchr
(
app_name
,
'\\'
)))
app_name
=
p
+
1
;
app_key
=
open_app_key
(
app_name
);
app_key
=
open_app_key
(
app_name
);
main_exe_loaded
=
TRUE
;
}
}
...
@@ -379,7 +381,7 @@ enum loadorder get_load_order( const UNICODE_STRING *nt_name )
...
@@ -379,7 +381,7 @@ enum loadorder get_load_order( const UNICODE_STRING *nt_name )
static
const
WCHAR
prefixW
[]
=
{
'\\'
,
'?'
,
'?'
,
'\\'
};
static
const
WCHAR
prefixW
[]
=
{
'\\'
,
'?'
,
'?'
,
'\\'
};
enum
loadorder
ret
=
LO_INVALID
;
enum
loadorder
ret
=
LO_INVALID
;
const
WCHAR
*
path
=
nt_name
->
Buffer
;
const
WCHAR
*
path
=
nt_name
->
Buffer
;
const
WCHAR
*
p
,
*
app_name
=
NULL
;
const
WCHAR
*
p
;
WCHAR
*
module
,
*
basename
;
WCHAR
*
module
,
*
basename
;
int
len
;
int
len
;
...
@@ -418,7 +420,7 @@ enum loadorder get_load_order( const UNICODE_STRING *nt_name )
...
@@ -418,7 +420,7 @@ enum loadorder get_load_order( const UNICODE_STRING *nt_name )
goto
done
;
goto
done
;
/* if loading the main exe with an explicit path, try native first */
/* if loading the main exe with an explicit path, try native first */
if
(
!
app_name
&&
basename
!=
module
+
1
)
if
(
!
main_exe_loaded
&&
basename
!=
module
+
1
)
{
{
ret
=
LO_NATIVE_BUILTIN
;
ret
=
LO_NATIVE_BUILTIN
;
TRACE
(
"got main exe default %s for %s
\n
"
,
debugstr_loadorder
(
ret
),
debugstr_w
(
path
)
);
TRACE
(
"got main exe default %s for %s
\n
"
,
debugstr_loadorder
(
ret
),
debugstr_w
(
path
)
);
...
...
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