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
b6dc8399
Commit
b6dc8399
authored
Dec 30, 2021
by
Jacek Caban
Committed by
Alexandre Julliard
Dec 30, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll/tests: Remove workarounds for old Windows versions.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
32b81bfa
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
24 deletions
+14
-24
path.c
dlls/ntdll/tests/path.c
+14
-24
No files found.
dlls/ntdll/tests/path.c
View file @
b6dc8399
...
...
@@ -127,37 +127,37 @@ static void test_RtlIsDosDeviceName_U(void)
{
"c:
\\
nul:"
,
6
,
6
},
{
"c:
\\
nul
\\
"
,
0
,
0
},
{
"c:
\\
nul
\\
foo"
,
0
,
0
},
{
"c:
\\
nul::"
,
6
,
6
,
TRUE
},
/* fails on nt4 */
{
"c:
\\
nul::::::"
,
6
,
6
,
TRUE
},
/* fails on nt4 */
{
"c:
\\
nul::"
,
6
,
6
},
{
"c:
\\
nul::::::"
,
6
,
6
},
{
"c:prn "
,
4
,
6
},
{
"c:prn......."
,
4
,
6
},
{
"c:prn... ..."
,
4
,
6
},
{
"c:NUL .... "
,
4
,
6
,
TRUE
},
/* fails on nt4 */
{
"c:NUL .... "
,
4
,
6
},
{
"c: . . ."
,
0
,
0
},
{
"c:"
,
0
,
0
},
{
" . . . :"
,
0
,
0
},
{
":"
,
0
,
0
},
{
"c:nul. . . :"
,
4
,
6
},
{
"c:nul . . :"
,
4
,
6
,
TRUE
},
/* fails on nt4 */
{
"c:nul . . :"
,
4
,
6
},
{
"c:nul0"
,
0
,
0
},
{
"c:prn:aaa"
,
4
,
6
,
TRUE
},
/* fails on win9x */
{
"c:prn:aaa"
,
4
,
6
},
{
"c:PRN:.txt"
,
4
,
6
},
{
"c:aux:.txt..."
,
4
,
6
},
{
"c:prn:.txt:"
,
4
,
6
},
{
"c:nul:aaa"
,
4
,
6
,
TRUE
},
/* fails on win9x */
{
"c:nul:aaa"
,
4
,
6
},
{
"con:"
,
0
,
6
},
{
"lpt1:"
,
0
,
8
},
{
"c:com5:"
,
4
,
8
},
{
"CoM4:"
,
0
,
8
},
{
"lpt9:"
,
0
,
8
},
{
"c:
\\
lpt0.txt"
,
0
,
0
},
{
"CONIN$"
,
0
,
12
,
TRUE
},
/* fails on win
xp
*/
{
"CONOUT$"
,
0
,
14
,
TRUE
},
/* fails on win
xp
*/
{
"CONIN$"
,
0
,
12
,
TRUE
},
/* fails on win
7
*/
{
"CONOUT$"
,
0
,
14
,
TRUE
},
/* fails on win
7
*/
{
"CONERR$"
,
0
,
0
},
{
"CON"
,
0
,
6
},
{
"PIPE"
,
0
,
0
},
{
"
\\
??
\\
CONIN$"
,
8
,
12
,
TRUE
},
/* fails on win
xp
*/
{
"
\\
??
\\
CONOUT$"
,
8
,
14
,
TRUE
},
/* fails on win
xp
*/
{
"
\\
??
\\
CONIN$"
,
8
,
12
,
TRUE
},
/* fails on win
7
*/
{
"
\\
??
\\
CONOUT$"
,
8
,
14
,
TRUE
},
/* fails on win
7
*/
{
"
\\
??
\\
CONERR$"
,
0
,
0
},
{
"
\\
??
\\
CON"
,
8
,
6
},
{
"c:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
...
...
@@ -422,8 +422,6 @@ static void test_RtlGetFullPathName_U(void)
static
void
test_RtlDosPathNameToNtPathName_U
(
void
)
{
static
const
WCHAR
broken_global_prefix
[]
=
L"
\\
??
\\
C:
\\
??"
;
char
curdir
[
MAX_PATH
];
UNICODE_STRING
nameW
;
WCHAR
*
file_part
;
...
...
@@ -560,9 +558,9 @@ static void test_RtlDosPathNameToNtPathName_U(void)
{
L"
\\
??
\\
foo
\\
.."
,
L"
\\
??
\\
foo
\\
.."
,
8
},
{
L"
\\
??
\\
foo. . "
,
L"
\\
??
\\
foo. . "
,
4
},
{
L"CONIN$"
,
L"
\\
??
\\
CONIN$"
,
-
1
,
L"
\\
??
\\
C:
\\
windows
\\
CONIN$"
/* winxp
*/
},
{
L"CONOUT$"
,
L"
\\
??
\\
CONOUT$"
,
-
1
,
L"
\\
??
\\
C:
\\
windows
\\
CONOUT$"
/* winxp
*/
},
{
L"cOnOuT$"
,
L"
\\
??
\\
cOnOuT$"
,
-
1
,
L"
\\
??
\\
C:
\\
windows
\\
cOnOuT$"
/* winxp
*/
},
{
L"CONIN$"
,
L"
\\
??
\\
CONIN$"
,
-
1
,
L"
\\
??
\\
C:
\\
windows
\\
CONIN$"
/* win7
*/
},
{
L"CONOUT$"
,
L"
\\
??
\\
CONOUT$"
,
-
1
,
L"
\\
??
\\
C:
\\
windows
\\
CONOUT$"
/* win7
*/
},
{
L"cOnOuT$"
,
L"
\\
??
\\
cOnOuT$"
,
-
1
,
L"
\\
??
\\
C:
\\
windows
\\
cOnOuT$"
/* win7
*/
},
{
L"CONERR$"
,
L"
\\
??
\\
C:
\\
windows
\\
CONERR$"
,
15
},
};
static
const
WCHAR
*
error_paths
[]
=
{
...
...
@@ -582,8 +580,7 @@ static void test_RtlDosPathNameToNtPathName_U(void)
if
(
pRtlDosPathNameToNtPathName_U_WithStatus
)
{
status
=
pRtlDosPathNameToNtPathName_U_WithStatus
(
error_paths
[
i
],
&
nameW
,
&
file_part
,
NULL
);
ok
(
status
==
STATUS_OBJECT_NAME_INVALID
||
broken
(
status
==
STATUS_OBJECT_PATH_NOT_FOUND
/* 2003 */
),
"Got status %#x.
\n
"
,
status
);
ok
(
status
==
STATUS_OBJECT_NAME_INVALID
,
"Got status %#x.
\n
"
,
status
);
}
winetest_pop_context
();
...
...
@@ -606,13 +603,6 @@ static void test_RtlDosPathNameToNtPathName_U(void)
ok
(
status
==
STATUS_SUCCESS
,
"%s: Got status %#x.
\n
"
,
debugstr_w
(
tests
[
i
].
dos
),
status
);
}
if
(
!
wcsncmp
(
tests
[
i
].
dos
,
L"
\\
??
\\
"
,
4
)
&&
tests
[
i
].
dos
[
4
]
&&
broken
(
!
wcsncmp
(
nameW
.
Buffer
,
broken_global_prefix
,
wcslen
(
broken_global_prefix
))))
{
/* Windows version prior to 2003 don't interpret the \??\ prefix */
continue
;
}
ok
(
!
wcscmp
(
nameW
.
Buffer
,
tests
[
i
].
nt
)
||
(
tests
[
i
].
alt_nt
&&
broken
(
!
wcscmp
(
nameW
.
Buffer
,
tests
[
i
].
alt_nt
))),
"%s: Expected %s, got %s.
\n
"
,
debugstr_w
(
tests
[
i
].
dos
),
...
...
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