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
3b09a6b1
Commit
3b09a6b1
authored
Dec 27, 2019
by
Zebediah Figura
Committed by
Alexandre Julliard
Dec 30, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll/tests: Fix some test failures with Windows 10.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
aeab1b2a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
8 deletions
+13
-8
reg.c
dlls/ntdll/tests/reg.c
+13
-8
No files found.
dlls/ntdll/tests/reg.c
View file @
3b09a6b1
...
@@ -387,7 +387,9 @@ todo_wine
...
@@ -387,7 +387,9 @@ todo_wine
/* Open is case sensitive unless OBJ_CASE_INSENSITIVE is specified. */
/* Open is case sensitive unless OBJ_CASE_INSENSITIVE is specified. */
pRtlCreateUnicodeStringFromAsciiz
(
&
str
,
"
\\
Registry
\\
Machine"
);
pRtlCreateUnicodeStringFromAsciiz
(
&
str
,
"
\\
Registry
\\
Machine"
);
status
=
pNtOpenKey
(
&
key
,
KEY_READ
,
&
attr
);
status
=
pNtOpenKey
(
&
key
,
KEY_READ
,
&
attr
);
todo_wine
ok
(
status
==
STATUS_OBJECT_PATH_NOT_FOUND
,
"NtOpenKey Failed: 0x%08x
\n
"
,
status
);
ok
(
status
==
STATUS_OBJECT_PATH_NOT_FOUND
||
status
==
STATUS_SUCCESS
/* Win10 1607+ */
,
"NtOpenKey Failed: 0x%08x
\n
"
,
status
);
if
(
!
status
)
pNtClose
(
key
);
attr
.
Attributes
=
OBJ_CASE_INSENSITIVE
;
attr
.
Attributes
=
OBJ_CASE_INSENSITIVE
;
status
=
pNtOpenKey
(
&
key
,
KEY_READ
,
&
attr
);
status
=
pNtOpenKey
(
&
key
,
KEY_READ
,
&
attr
);
...
@@ -615,8 +617,9 @@ static void test_NtCreateKey(void)
...
@@ -615,8 +617,9 @@ static void test_NtCreateKey(void)
attr
.
Attributes
=
0
;
attr
.
Attributes
=
0
;
pRtlCreateUnicodeStringFromAsciiz
(
&
str
,
"
\\
Registry
\\
Machine
\\
Software
\\
Classes"
);
pRtlCreateUnicodeStringFromAsciiz
(
&
str
,
"
\\
Registry
\\
Machine
\\
Software
\\
Classes"
);
status
=
pNtCreateKey
(
&
subkey
,
am
,
&
attr
,
0
,
0
,
0
,
0
);
status
=
pNtCreateKey
(
&
subkey
,
am
,
&
attr
,
0
,
0
,
0
,
0
);
todo_wine
ok
(
status
==
STATUS_OBJECT_PATH_NOT_FOUND
||
status
==
STATUS_SUCCESS
/* Win10 1607+ */
,
ok
(
status
==
STATUS_OBJECT_PATH_NOT_FOUND
,
"NtCreateKey failed: 0x%08x
\n
"
,
status
);
"NtCreateKey failed: 0x%08x
\n
"
,
status
);
if
(
!
status
)
pNtClose
(
subkey
);
pRtlFreeUnicodeString
(
&
str
);
pRtlFreeUnicodeString
(
&
str
);
pRtlCreateUnicodeStringFromAsciiz
(
&
str
,
"
\\
REGISTRY
\\
Machine
\\
Software
\\
Classes"
);
pRtlCreateUnicodeStringFromAsciiz
(
&
str
,
"
\\
REGISTRY
\\
Machine
\\
Software
\\
Classes"
);
...
@@ -926,14 +929,14 @@ static void test_NtQueryLicenseKey(void)
...
@@ -926,14 +929,14 @@ static void test_NtQueryLicenseKey(void)
len
=
0xbeef
;
len
=
0xbeef
;
status
=
pNtQueryLicenseValue
(
&
name
,
NULL
,
buffer
,
sizeof
(
buffer
),
&
len
);
status
=
pNtQueryLicenseValue
(
&
name
,
NULL
,
buffer
,
sizeof
(
buffer
),
&
len
);
ok
(
status
==
STATUS_OBJECT_NAME_NOT_FOUND
,
"NtQueryLicenseValue returned %08x, expected STATUS_OBJECT_NAME_NOT_FOUND
\n
"
,
status
);
ok
(
status
==
STATUS_OBJECT_NAME_NOT_FOUND
,
"NtQueryLicenseValue returned %08x, expected STATUS_OBJECT_NAME_NOT_FOUND
\n
"
,
status
);
ok
(
len
==
0xbeef
,
"expected unmodified value for len, got %u
\n
"
,
len
);
ok
(
len
==
0xbeef
||
broken
(
!
len
)
/* Win10 1607 */
,
"expected unmodified value for len, got %u
\n
"
,
len
);
type
=
0xdead
;
type
=
0xdead
;
len
=
0xbeef
;
len
=
0xbeef
;
status
=
pNtQueryLicenseValue
(
&
name
,
&
type
,
buffer
,
sizeof
(
buffer
),
&
len
);
status
=
pNtQueryLicenseValue
(
&
name
,
&
type
,
buffer
,
sizeof
(
buffer
),
&
len
);
ok
(
status
==
STATUS_OBJECT_NAME_NOT_FOUND
,
"NtQueryLicenseValue unexpected succeeded
\n
"
);
ok
(
status
==
STATUS_OBJECT_NAME_NOT_FOUND
,
"NtQueryLicenseValue unexpected succeeded
\n
"
);
ok
(
type
==
0xdead
,
"expected unmodified value for type, got %u
\n
"
,
type
);
ok
(
type
==
0xdead
,
"expected unmodified value for type, got %u
\n
"
,
type
);
ok
(
len
==
0xbeef
,
"expected unmodified value for len, got %u
\n
"
,
len
);
ok
(
len
==
0xbeef
||
broken
(
!
len
)
/* Win10 1607 */
,
"expected unmodified value for len, got %u
\n
"
,
len
);
pRtlFreeUnicodeString
(
&
name
);
pRtlFreeUnicodeString
(
&
name
);
...
@@ -1291,7 +1294,7 @@ static void test_symlinks(void)
...
@@ -1291,7 +1294,7 @@ static void test_symlinks(void)
ok
(
status
==
STATUS_SUCCESS
,
"NtSetValueKey failed: 0x%08x
\n
"
,
status
);
ok
(
status
==
STATUS_SUCCESS
,
"NtSetValueKey failed: 0x%08x
\n
"
,
status
);
attr
.
ObjectName
=
&
link_str
;
attr
.
ObjectName
=
&
link_str
;
status
=
pNtOpenKey
(
&
key
,
KEY_ALL_ACCESS
,
&
attr
);
status
=
pNtOpenKey
(
&
key
,
KEY_ALL_ACCESS
,
&
attr
);
ok
(
status
==
STATUS_
SUCCESS
||
status
==
STATUS_OBJECT_NAME_NOT_FOUND
,
ok
(
status
==
STATUS_
OBJECT_NAME_NOT_FOUND
||
status
==
STATUS_OBJECT_NAME_INVALID
/* Win10 1607+ */
,
"NtOpenKey wrong status 0x%08x
\n
"
,
status
);
"NtOpenKey wrong status 0x%08x
\n
"
,
status
);
key
=
(
HKEY
)
0xdeadbeef
;
key
=
(
HKEY
)
0xdeadbeef
;
...
@@ -1320,8 +1323,10 @@ static void test_symlinks(void)
...
@@ -1320,8 +1323,10 @@ static void test_symlinks(void)
ok
(
status
==
STATUS_SUCCESS
,
"NtSetValueKey failed: 0x%08x
\n
"
,
status
);
ok
(
status
==
STATUS_SUCCESS
,
"NtSetValueKey failed: 0x%08x
\n
"
,
status
);
status
=
pNtOpenKey
(
&
key
,
KEY_ALL_ACCESS
,
&
attr
);
status
=
pNtOpenKey
(
&
key
,
KEY_ALL_ACCESS
,
&
attr
);
ok
(
status
==
STATUS_OBJECT_NAME_NOT_FOUND
||
status
==
STATUS_NAME_TOO_LONG
,
ok
(
status
==
STATUS_OBJECT_NAME_NOT_FOUND
/* XP */
"NtOpenKey failed: 0x%08x
\n
"
,
status
);
||
status
==
STATUS_NAME_TOO_LONG
||
status
==
STATUS_INVALID_PARAMETER
/* Win10 1607+ */
,
"NtOpenKey failed: 0x%08x
\n
"
,
status
);
attr
.
Attributes
=
OBJ_OPENLINK
;
attr
.
Attributes
=
OBJ_OPENLINK
;
status
=
pNtOpenKey
(
&
key
,
KEY_ALL_ACCESS
,
&
attr
);
status
=
pNtOpenKey
(
&
key
,
KEY_ALL_ACCESS
,
&
attr
);
...
...
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