commit 3c3d23063c7572008c495d5cc2bccb5b0fc0b599
author Alexandre Julliard <julliard@winehq.org> Fri May 14 04:55:28 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri May 14 04:55:28 2004 +0000
tree a78a89c1ccf4c2ebe520b2680d551de58bc18bdc
parent 463d474cc7d874f4d3c9bfa93f195e62c6e7f1d5

Fixed some of the GetShortPathName tests to use the short version of
the current directory where needed.

dlls/kernel/tests/path.c

diff --git a/dlls/kernel/tests/path.c b/dlls/kernel/tests/path.c
index 0f68989..07f64b9 100644
--- a/dlls/kernel/tests/path.c
+++ b/dlls/kernel/tests/path.c
@@ -227,14 +227,14 @@
          Get(Short|Long)PathNameA should never pass, but GetFullPathNameA
          should.
 */
-static void test_FunnyChars(CHAR *curdir,CHAR *filename, INT valid,CHAR *errstr)
+static void test_FunnyChars(CHAR *curdir,CHAR *curdir_short,CHAR *filename, INT valid,CHAR *errstr)
 {
   CHAR tmpstr[MAX_PATH],tmpstr1[MAX_PATH];
   SLpassfail passfail;
 
   test_ValidPathA(curdir,"",filename,tmpstr,&passfail,errstr);
   if(valid) {
-    sprintf(tmpstr1,"%s\\%s",curdir,filename);
+    sprintf(tmpstr1,"%s\\%s",curdir_short,filename);
       ok((passfail.shortlen==0 &&
           (passfail.shorterror==ERROR_FILE_NOT_FOUND || passfail.shorterror==ERROR_PATH_NOT_FOUND || !passfail.shorterror)) ||
          (passfail.shortlen==strlen(tmpstr1) && lstrcmpiA(tmpstr,tmpstr1)==0),
@@ -643,7 +643,7 @@
 /* Non-existent directories */
   sprintf(tmpstr,"%s\\",NONDIR_SHORT);
   test_ValidPathA(curdir,"",tmpstr,tmpstr1,&passfail,"test15");
-  sprintf(tmpstr2,"%s\\%s",curdir,tmpstr);
+  sprintf(tmpstr2,"%s\\%s",curdir_short,tmpstr);
   ok((passfail.shortlen==0 &&
       (passfail.shorterror==ERROR_PATH_NOT_FOUND ||
        passfail.shorterror==ERROR_FILE_NOT_FOUND)) ||
@@ -765,25 +765,25 @@
     valid=(is_char_ok[i]=='0') ? 0 : 1;
     sprintf(tmpstr1,"check%d-1",i);
     sprintf(tmpstr,"file%c000.ext",funny_chars[i]);
-    test_FunnyChars(curdir,tmpstr,valid,tmpstr1);
+    test_FunnyChars(curdir,curdir_short,tmpstr,valid,tmpstr1);
     sprintf(tmpstr1,"check%d-2",i);
     sprintf(tmpstr,"file000.e%ct",funny_chars[i]);
-    test_FunnyChars(curdir,tmpstr,valid,tmpstr1);
+    test_FunnyChars(curdir,curdir_short,tmpstr,valid,tmpstr1);
     sprintf(tmpstr1,"check%d-3",i);
     sprintf(tmpstr,"%cfile000.ext",funny_chars[i]);
-    test_FunnyChars(curdir,tmpstr,valid,tmpstr1);
+    test_FunnyChars(curdir,curdir_short,tmpstr,valid,tmpstr1);
     sprintf(tmpstr1,"check%d-4",i);
     sprintf(tmpstr,"file000%c.ext",funny_chars[i]);
-    test_FunnyChars(curdir,tmpstr,valid,tmpstr1);
+    test_FunnyChars(curdir,curdir_short,tmpstr,valid,tmpstr1);
     sprintf(tmpstr1,"check%d-5",i);
     sprintf(tmpstr,"Long %c File",funny_chars[i]);
-    test_FunnyChars(curdir,tmpstr,valid,tmpstr1);
+    test_FunnyChars(curdir,curdir_short,tmpstr,valid,tmpstr1);
     sprintf(tmpstr1,"check%d-6",i);
     sprintf(tmpstr,"%c Long File",funny_chars[i]);
-    test_FunnyChars(curdir,tmpstr,valid,tmpstr1);
+    test_FunnyChars(curdir,curdir_short,tmpstr,valid,tmpstr1);
     sprintf(tmpstr1,"check%d-7",i);
     sprintf(tmpstr,"Long File %c",funny_chars[i]);
-    test_FunnyChars(curdir,tmpstr,valid,tmpstr1);
+    test_FunnyChars(curdir,curdir_short,tmpstr,valid,tmpstr1);
   }
 }