Skip to content

W
wine-winehq
Commit 9c40e91b authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Make the test pass on NT4 too.

parent 4c39042a
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 11 deletions
dlls/kernel/tests/path.c
View file @ 9c40e91b
...@@ -243,14 +243,14 @@ static void test_FunnyChars(CHAR *curdir,CHAR *filename, ...@@ -243,14 +243,14 @@ static void test_FunnyChars(CHAR *curdir,CHAR *filename,
if(todo) { if(todo) {
todo_wine { todo_wine {
ok((passfail.shortlen==0 && 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), (passfail.shortlen==strlen(tmpstr1) && lstrcmpiA(tmpstr,tmpstr1)==0),
"%s: GetShortPathNameA error: len=%ld error=%ld tmpstr=[%s]", "%s: GetShortPathNameA error: len=%ld error=%ld tmpstr=[%s]",
errstr,passfail.shortlen,passfail.shorterror,tmpstr); errstr,passfail.shortlen,passfail.shorterror,tmpstr);
} }
} else { } else {
ok((passfail.shortlen==0 && 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), (passfail.shortlen==strlen(tmpstr1) && lstrcmpiA(tmpstr,tmpstr1)==0),
"%s: GetShortPathNameA error: len=%ld error=%ld tmpstr=[%s]", "%s: GetShortPathNameA error: len=%ld error=%ld tmpstr=[%s]",
errstr,passfail.shortlen,passfail.shorterror,tmpstr); errstr,passfail.shortlen,passfail.shorterror,tmpstr);
...@@ -258,15 +258,15 @@ static void test_FunnyChars(CHAR *curdir,CHAR *filename, ...@@ -258,15 +258,15 @@ static void test_FunnyChars(CHAR *curdir,CHAR *filename,
} else { } else {
if(todo) { if(todo) {
todo_wine { 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 && 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", "%s: GetShortPathA should have failed len=%ld, error=%ld",
errstr,passfail.shortlen,passfail.shorterror); errstr,passfail.shortlen,passfail.shorterror);
} }
} else { } else {
ok(passfail.shortlen==0 && 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", "%s: GetShortPathA should have failed len=%ld, error=%ld",
errstr,passfail.shortlen,passfail.shorterror); errstr,passfail.shortlen,passfail.shorterror);
} }
...@@ -562,7 +562,8 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) ...@@ -562,7 +562,8 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive)
test_ValidPathA(curdir,SHORTDIR,NONFILE_LONG,tmpstr,&passfail,"test6"); test_ValidPathA(curdir,SHORTDIR,NONFILE_LONG,tmpstr,&passfail,"test6");
ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have"); ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have");
ok(passfail.shorterror==ERROR_PATH_NOT_FOUND || 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'"); "GetShortPathA should have returned 'ERROR_FILE_NOT_FOUND'");
if(pGetLongPathNameA) { if(pGetLongPathNameA) {
ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have"); 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) ...@@ -589,7 +590,8 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive)
test_ValidPathA(curdir,LONGDIR,NONFILE_LONG,tmpstr,&passfail,"test8"); test_ValidPathA(curdir,LONGDIR,NONFILE_LONG,tmpstr,&passfail,"test8");
ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have"); ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have");
ok(passfail.shorterror==ERROR_PATH_NOT_FOUND || 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'"); "GetShortPathA should have returned 'ERROR_FILE_NOT_FOUND'");
if(pGetLongPathNameA) { if(pGetLongPathNameA) {
ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have"); 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) ...@@ -617,7 +619,8 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive)
test_ValidPathA(curdir,NONDIR_SHORT,LONGFILE,tmpstr,&passfail,"test10"); test_ValidPathA(curdir,NONDIR_SHORT,LONGFILE,tmpstr,&passfail,"test10");
ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have"); ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have");
ok(passfail.shorterror==ERROR_PATH_NOT_FOUND || 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'", "GetShortPathA returned %ld and not 'ERROR_PATH_NOT_FOUND'",
passfail.shorterror); passfail.shorterror);
if(pGetLongPathNameA) { if(pGetLongPathNameA) {
...@@ -631,7 +634,8 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) ...@@ -631,7 +634,8 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive)
test_ValidPathA(curdir,NONDIR_LONG,SHORTFILE,tmpstr,&passfail,"test11"); test_ValidPathA(curdir,NONDIR_LONG,SHORTFILE,tmpstr,&passfail,"test11");
ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have"); ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have");
ok(passfail.shorterror==ERROR_PATH_NOT_FOUND || 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'", "GetShortPathA returned %ld and not 'ERROR_PATH_NOT_FOUND'",
passfail.shorterror); passfail.shorterror);
if(pGetLongPathNameA) { if(pGetLongPathNameA) {
...@@ -645,7 +649,8 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) ...@@ -645,7 +649,8 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive)
test_ValidPathA(curdir,NONDIR_LONG,LONGFILE,tmpstr,&passfail,"test12"); test_ValidPathA(curdir,NONDIR_LONG,LONGFILE,tmpstr,&passfail,"test12");
ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have"); ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have");
ok(passfail.shorterror==ERROR_PATH_NOT_FOUND || 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'", "GetShortPathA returned %ld and not 'ERROR_PATH_NOT_FOUND'",
passfail.shorterror); passfail.shorterror);
if(pGetLongPathNameA) { if(pGetLongPathNameA) {
...@@ -681,7 +686,8 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) ...@@ -681,7 +686,8 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive)
test_ValidPathA(curdir,"",tmpstr,tmpstr1,&passfail,"test16"); test_ValidPathA(curdir,"",tmpstr,tmpstr1,&passfail,"test16");
ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have"); ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have");
ok(passfail.shorterror==ERROR_PATH_NOT_FOUND || 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'", "GetShortPathA returned %ld and not 'ERROR_FILE_NOT_FOUND'",
passfail.shorterror); passfail.shorterror);
if(pGetLongPathNameA) { if(pGetLongPathNameA) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment