Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
5e6b46f3
Commit
5e6b46f3
authored
Mar 24, 2021
by
Zebediah Figura
Committed by
Alexandre Julliard
Mar 24, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntoskrnl/tests: Fix a test failure on Windows 10.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
7543a173
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
2 deletions
+21
-2
ntoskrnl.exe.spec
dlls/ntoskrnl.exe/ntoskrnl.exe.spec
+1
-1
driver.c
dlls/ntoskrnl.exe/tests/driver.c
+20
-1
No files found.
dlls/ntoskrnl.exe/ntoskrnl.exe.spec
View file @
5e6b46f3
...
...
@@ -1466,7 +1466,7 @@
@ stdcall -private ZwQueryInstallUILanguage(ptr) NtQueryInstallUILanguage
@ stdcall -private ZwQueryKey(long long ptr long ptr) NtQueryKey
@ stdcall -private ZwQueryLicenseValue(ptr ptr ptr long ptr) NtQueryLicenseValue
@ stdcall
-private
ZwQueryObject(long long ptr long ptr) NtQueryObject
@ stdcall ZwQueryObject(long long ptr long ptr) NtQueryObject
@ stdcall -private ZwQuerySection(long long ptr long ptr) NtQuerySection
@ stdcall -private ZwQuerySecurityObject(long long ptr long ptr) NtQuerySecurityObject
@ stdcall -private ZwQuerySymbolicLinkObject(long ptr ptr) NtQuerySymbolicLinkObject
...
...
dlls/ntoskrnl.exe/tests/driver.c
View file @
5e6b46f3
...
...
@@ -197,10 +197,15 @@ static void WINAPI test_load_image_notify_routine(UNICODE_STRING *image_name, HA
static
void
test_load_driver
(
void
)
{
char
full_name_buffer
[
300
];
OBJECT_NAME_INFORMATION
*
full_name
=
(
OBJECT_NAME_INFORMATION
*
)
full_name_buffer
;
static
WCHAR
image_path_key_name
[]
=
L"ImagePath"
;
RTL_QUERY_REGISTRY_TABLE
query_table
[
2
];
UNICODE_STRING
name
,
image_path
;
OBJECT_ATTRIBUTES
attr
;
IO_STATUS_BLOCK
io
;
NTSTATUS
ret
;
HANDLE
file
;
ret
=
PsSetLoadImageNotifyRoutine
(
test_load_image_notify_routine
);
ok
(
ret
==
STATUS_SUCCESS
,
"Got unexpected status %#x.
\n
"
,
ret
);
...
...
@@ -221,6 +226,18 @@ static void test_load_driver(void)
ok
(
ret
==
STATUS_SUCCESS
,
"Got unexpected status %#x.
\n
"
,
ret
);
ok
(
!!
image_path
.
Buffer
,
"image_path.Buffer is NULL.
\n
"
);
/* The image path name in the registry may contain NT symlinks (e.g. DOS
* drives), which are resolved before the callback is called on Windows 10. */
InitializeObjectAttributes
(
&
attr
,
&
image_path
,
OBJ_KERNEL_HANDLE
,
NULL
,
NULL
);
ret
=
ZwOpenFile
(
&
file
,
SYNCHRONIZE
,
&
attr
,
&
io
,
0
,
FILE_SYNCHRONOUS_IO_NONALERT
);
todo_wine
ok
(
!
ret
,
"Got unexpected status %#x.
\n
"
,
ret
);
if
(
!
ret
)
{
ret
=
ZwQueryObject
(
file
,
ObjectNameInformation
,
full_name_buffer
,
sizeof
(
full_name_buffer
),
NULL
);
ok
(
!
ret
,
"Got unexpected status %#x.
\n
"
,
ret
);
ZwClose
(
file
);
}
RtlInitUnicodeString
(
&
name
,
driver2_path
);
ret
=
ZwLoadDriver
(
&
name
);
...
...
@@ -232,7 +249,9 @@ static void test_load_driver(void)
"Got unexpected ImageAddressingMode %#x.
\n
"
,
test_image_info
.
ImageAddressingMode
);
ok
(
test_image_info
.
SystemModeImage
,
"Got unexpected SystemModeImage %#x.
\n
"
,
test_image_info
.
SystemModeImage
);
ok
(
!
wcscmp
(
test_load_image_name
,
image_path
.
Buffer
),
"Image path names do not match.
\n
"
);
ok
(
!
wcscmp
(
test_load_image_name
,
image_path
.
Buffer
)
/* Win < 10 */
||
!
wcscmp
(
test_load_image_name
,
full_name
->
Name
.
Buffer
),
"Expected image path name %ls, got %ls.
\n
"
,
full_name
->
Name
.
Buffer
,
test_load_image_name
);
test_load_image_notify_count
=
-
1
;
...
...
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