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
7a1ed2e1
Commit
7a1ed2e1
authored
Apr 03, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Remove path from application name to open loadorder key.
Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=50914
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
2fcc1d0e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
5 deletions
+9
-5
loadorder.c
dlls/ntdll/unix/loadorder.c
+9
-5
No files found.
dlls/ntdll/unix/loadorder.c
View file @
7a1ed2e1
...
...
@@ -384,16 +384,20 @@ enum loadorder get_load_order( const UNICODE_STRING *nt_name )
enum
loadorder
ret
=
LO_INVALID
;
HANDLE
std_key
,
app_key
=
0
;
const
WCHAR
*
path
=
nt_name
->
Buffer
;
const
WCHAR
*
app_name
=
NULL
;
const
WCHAR
*
p
,
*
app_name
=
NULL
;
WCHAR
*
module
,
*
basename
;
int
len
;
if
(
!
init_done
)
init_load_order
();
std_key
=
get_standard_key
();
if
(
NtCurrentTeb
()
->
Peb
->
ImageBaseAddress
)
{
app_name
=
NtCurrentTeb
()
->
Peb
->
ProcessParameters
->
ImagePathName
.
Buffer
;
if
((
p
=
wcsrchr
(
app_name
,
'\\'
)))
app_name
=
p
+
1
;
app_key
=
get_app_key
(
app_name
);
}
if
(
!
init_done
)
init_load_order
();
std_key
=
get_standard_key
();
if
(
app_name
)
app_key
=
get_app_key
(
app_name
);
if
(
!
wcsncmp
(
path
,
prefixW
,
4
))
path
+=
4
;
TRACE
(
"looking for %s
\n
"
,
debugstr_w
(
path
));
...
...
@@ -402,7 +406,7 @@ enum loadorder get_load_order( const UNICODE_STRING *nt_name )
*/
if
(
!
wcsnicmp
(
system_dir
+
4
,
path
,
wcslen
(
system_dir
)
-
4
))
{
const
WCHAR
*
p
=
path
+
wcslen
(
system_dir
)
-
4
;
p
=
path
+
wcslen
(
system_dir
)
-
4
;
while
(
*
p
==
'\\'
||
*
p
==
'/'
)
p
++
;
if
(
!
wcschr
(
p
,
'\\'
)
&&
!
wcschr
(
p
,
'/'
))
path
=
p
;
}
...
...
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