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
e24b1624
Commit
e24b1624
authored
Feb 08, 2019
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Pass an NT filename to get_load_order().
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
3099b04a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
loader.c
dlls/ntdll/loader.c
+1
-1
loadorder.c
dlls/ntdll/loadorder.c
+4
-1
ntdll_misc.h
dlls/ntdll/ntdll_misc.h
+1
-1
No files found.
dlls/ntdll/loader.c
View file @
e24b1624
...
...
@@ -2546,7 +2546,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
filename
=
nt_name
.
Buffer
+
4
;
/* \??\ prefix */
main_exe
=
get_modref
(
NtCurrentTeb
()
->
Peb
->
ImageBaseAddress
);
loadorder
=
get_load_order
(
main_exe
?
main_exe
->
ldr
.
BaseDllName
.
Buffer
:
NULL
,
file
name
);
loadorder
=
get_load_order
(
main_exe
?
main_exe
->
ldr
.
BaseDllName
.
Buffer
:
NULL
,
&
nt_
name
);
if
(
handle
&&
is_fake_dll
(
handle
))
{
...
...
dlls/ntdll/loadorder.c
View file @
e24b1624
...
...
@@ -429,16 +429,19 @@ static enum loadorder get_load_order_value( HANDLE std_key, HANDLE app_key, cons
* Return the loadorder of a module.
* The system directory and '.dll' extension is stripped from the path.
*/
enum
loadorder
get_load_order
(
const
WCHAR
*
app_name
,
const
WCHAR
*
path
)
enum
loadorder
get_load_order
(
const
WCHAR
*
app_name
,
const
UNICODE_STRING
*
nt_name
)
{
static
const
WCHAR
nt_prefixW
[]
=
{
'\\'
,
'?'
,
'?'
,
'\\'
,
0
};
enum
loadorder
ret
=
LO_INVALID
;
HANDLE
std_key
,
app_key
=
0
;
const
WCHAR
*
path
=
nt_name
->
Buffer
;
WCHAR
*
module
,
*
basename
;
int
len
;
if
(
!
init_done
)
init_load_order
();
std_key
=
get_standard_key
();
if
(
app_name
)
app_key
=
get_app_key
(
app_name
);
if
(
!
strncmpW
(
path
,
nt_prefixW
,
4
))
path
+=
4
;
TRACE
(
"looking for %s
\n
"
,
debugstr_w
(
path
));
...
...
dlls/ntdll/ntdll_misc.h
View file @
e24b1624
...
...
@@ -216,7 +216,7 @@ enum loadorder
LO_DEFAULT
/* nothing specified, use default strategy */
};
extern
enum
loadorder
get_load_order
(
const
WCHAR
*
app_name
,
const
WCHAR
*
path
)
DECLSPEC_HIDDEN
;
extern
enum
loadorder
get_load_order
(
const
WCHAR
*
app_name
,
const
UNICODE_STRING
*
nt_name
)
DECLSPEC_HIDDEN
;
struct
debug_info
{
...
...
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