Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Johnny Cai
wine
Commits
9c40e91b
Commit
9c40e91b
authored
21 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
Make the test pass on NT4 too.
parent
4c39042a
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/kernel/tests/path.c
+17
-11
17 additions, 11 deletions
dlls/kernel/tests/path.c
with
17 additions
and
11 deletions
dlls/kernel/tests/path.c
+
17
−
11
View file @
9c40e91b
...
...
@@ -243,14 +243,14 @@ static void test_FunnyChars(CHAR *curdir,CHAR *filename,
if
(
todo
)
{
todo_wine
{
ok
((
passfail
.
shortlen
==
0
&&
(
passfail
.
shorterror
==
ERROR_FILE_NOT_FOUND
||
passfail
.
shorterror
==
ERROR_PATH_NOT_FOUND
))
||
(
passfail
.
shorterror
==
ERROR_FILE_NOT_FOUND
||
passfail
.
shorterror
==
ERROR_PATH_NOT_FOUND
||
!
passfail
.
shorterror
))
||
(
passfail
.
shortlen
==
strlen
(
tmpstr1
)
&&
lstrcmpiA
(
tmpstr
,
tmpstr1
)
==
0
),
"%s: GetShortPathNameA error: len=%ld error=%ld tmpstr=[%s]"
,
errstr
,
passfail
.
shortlen
,
passfail
.
shorterror
,
tmpstr
);
}
}
else
{
ok
((
passfail
.
shortlen
==
0
&&
(
passfail
.
shorterror
==
ERROR_FILE_NOT_FOUND
||
passfail
.
shorterror
==
ERROR_PATH_NOT_FOUND
))
||
(
passfail
.
shorterror
==
ERROR_FILE_NOT_FOUND
||
passfail
.
shorterror
==
ERROR_PATH_NOT_FOUND
||
!
passfail
.
shorterror
))
||
(
passfail
.
shortlen
==
strlen
(
tmpstr1
)
&&
lstrcmpiA
(
tmpstr
,
tmpstr1
)
==
0
),
"%s: GetShortPathNameA error: len=%ld error=%ld tmpstr=[%s]"
,
errstr
,
passfail
.
shortlen
,
passfail
.
shorterror
,
tmpstr
);
...
...
@@ -258,15 +258,15 @@ static void test_FunnyChars(CHAR *curdir,CHAR *filename,
}
else
{
if
(
todo
)
{
todo_wine
{
/* Win2k returns ERROR_INVALID_NAME, Win98, wine return ERROR_FILE_NOT_FOUND */
/* Win2k returns ERROR_INVALID_NAME, Win98, wine return ERROR_FILE_NOT_FOUND
, NT4 doesn't set last error
*/
ok
(
passfail
.
shortlen
==
0
&&
(
passfail
.
shorterror
==
ERROR_INVALID_NAME
||
passfail
.
shorterror
==
ERROR_FILE_NOT_FOUND
),
(
passfail
.
shorterror
==
ERROR_INVALID_NAME
||
passfail
.
shorterror
==
ERROR_FILE_NOT_FOUND
||
!
passfail
.
shorterror
),
"%s: GetShortPathA should have failed len=%ld, error=%ld"
,
errstr
,
passfail
.
shortlen
,
passfail
.
shorterror
);
}
}
else
{
ok
(
passfail
.
shortlen
==
0
&&
(
passfail
.
shorterror
==
ERROR_INVALID_NAME
||
passfail
.
shorterror
==
ERROR_FILE_NOT_FOUND
),
(
passfail
.
shorterror
==
ERROR_INVALID_NAME
||
passfail
.
shorterror
==
ERROR_FILE_NOT_FOUND
||
!
passfail
.
shorterror
),
"%s: GetShortPathA should have failed len=%ld, error=%ld"
,
errstr
,
passfail
.
shortlen
,
passfail
.
shorterror
);
}
...
...
@@ -562,7 +562,8 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive)
test_ValidPathA
(
curdir
,
SHORTDIR
,
NONFILE_LONG
,
tmpstr
,
&
passfail
,
"test6"
);
ok
(
passfail
.
shortlen
==
0
,
"GetShortPathNameA passed when it shouldn't have"
);
ok
(
passfail
.
shorterror
==
ERROR_PATH_NOT_FOUND
||
passfail
.
shorterror
==
ERROR_FILE_NOT_FOUND
,
passfail
.
shorterror
==
ERROR_FILE_NOT_FOUND
||
!
passfail
.
shorterror
,
"GetShortPathA should have returned 'ERROR_FILE_NOT_FOUND'"
);
if
(
pGetLongPathNameA
)
{
ok
(
passfail
.
longlen
==
0
,
"GetLongPathNameA passed when it shouldn't have"
);
...
...
@@ -589,7 +590,8 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive)
test_ValidPathA
(
curdir
,
LONGDIR
,
NONFILE_LONG
,
tmpstr
,
&
passfail
,
"test8"
);
ok
(
passfail
.
shortlen
==
0
,
"GetShortPathNameA passed when it shouldn't have"
);
ok
(
passfail
.
shorterror
==
ERROR_PATH_NOT_FOUND
||
passfail
.
shorterror
==
ERROR_FILE_NOT_FOUND
,
passfail
.
shorterror
==
ERROR_FILE_NOT_FOUND
||
!
passfail
.
shorterror
,
"GetShortPathA should have returned 'ERROR_FILE_NOT_FOUND'"
);
if
(
pGetLongPathNameA
)
{
ok
(
passfail
.
longlen
==
0
,
"GetLongPathNameA passed when it shouldn't have"
);
...
...
@@ -617,7 +619,8 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive)
test_ValidPathA
(
curdir
,
NONDIR_SHORT
,
LONGFILE
,
tmpstr
,
&
passfail
,
"test10"
);
ok
(
passfail
.
shortlen
==
0
,
"GetShortPathNameA passed when it shouldn't have"
);
ok
(
passfail
.
shorterror
==
ERROR_PATH_NOT_FOUND
||
passfail
.
shorterror
==
ERROR_FILE_NOT_FOUND
,
passfail
.
shorterror
==
ERROR_FILE_NOT_FOUND
||
!
passfail
.
shorterror
,
"GetShortPathA returned %ld and not 'ERROR_PATH_NOT_FOUND'"
,
passfail
.
shorterror
);
if
(
pGetLongPathNameA
)
{
...
...
@@ -631,7 +634,8 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive)
test_ValidPathA
(
curdir
,
NONDIR_LONG
,
SHORTFILE
,
tmpstr
,
&
passfail
,
"test11"
);
ok
(
passfail
.
shortlen
==
0
,
"GetShortPathNameA passed when it shouldn't have"
);
ok
(
passfail
.
shorterror
==
ERROR_PATH_NOT_FOUND
||
passfail
.
shorterror
==
ERROR_FILE_NOT_FOUND
,
passfail
.
shorterror
==
ERROR_FILE_NOT_FOUND
||
!
passfail
.
shorterror
,
"GetShortPathA returned %ld and not 'ERROR_PATH_NOT_FOUND'"
,
passfail
.
shorterror
);
if
(
pGetLongPathNameA
)
{
...
...
@@ -645,7 +649,8 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive)
test_ValidPathA
(
curdir
,
NONDIR_LONG
,
LONGFILE
,
tmpstr
,
&
passfail
,
"test12"
);
ok
(
passfail
.
shortlen
==
0
,
"GetShortPathNameA passed when it shouldn't have"
);
ok
(
passfail
.
shorterror
==
ERROR_PATH_NOT_FOUND
||
passfail
.
shorterror
==
ERROR_FILE_NOT_FOUND
,
passfail
.
shorterror
==
ERROR_FILE_NOT_FOUND
||
!
passfail
.
shorterror
,
"GetShortPathA returned %ld and not 'ERROR_PATH_NOT_FOUND'"
,
passfail
.
shorterror
);
if
(
pGetLongPathNameA
)
{
...
...
@@ -681,7 +686,8 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive)
test_ValidPathA
(
curdir
,
""
,
tmpstr
,
tmpstr1
,
&
passfail
,
"test16"
);
ok
(
passfail
.
shortlen
==
0
,
"GetShortPathNameA passed when it shouldn't have"
);
ok
(
passfail
.
shorterror
==
ERROR_PATH_NOT_FOUND
||
passfail
.
shorterror
==
ERROR_FILE_NOT_FOUND
,
passfail
.
shorterror
==
ERROR_FILE_NOT_FOUND
||
!
passfail
.
shorterror
,
"GetShortPathA returned %ld and not 'ERROR_FILE_NOT_FOUND'"
,
passfail
.
shorterror
);
if
(
pGetLongPathNameA
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment