ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel: Fix path test to pass on 95 and 98.

This commit is contained in:
Andrew Ziem 2006-05-16 21:40:46 -06:00 committed by Alexandre Julliard
parent 21196a084a
commit 8bed7bb61a
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/kernel/tests/path.c
View File

@ -339,14 +339,18 @@ static void test_InitPathA(CHAR *newdir, CHAR *curDrive, CHAR *otherDrive)
newdir,tmpstr,tmpstr1,id); newdir,tmpstr,tmpstr1,id);
ok(DeleteFileA(newdir),"Couldn't delete the temporary file we just created\n"); ok(DeleteFileA(newdir),"Couldn't delete the temporary file we just created\n");
ok((id=GetTempFileNameA(tmppath,NULL,0,newdir)),"GetTempFileNameA failed\n"); id=GetTempFileNameA(tmppath,NULL,0,newdir);
sprintf(tmpstr,"%.4x.tmp",id & 0xffff); /* Windows 95, 98 return 0==id, while Windows 2000, XP return 0!=id */
sprintf(tmpstr1,"%x.tmp",id & 0xffff); if (id)
ok(lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr)==0 || {
lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr1)==0, sprintf(tmpstr,"%.4x.tmp",id & 0xffff);
"GetTempFileNameA returned '%s' which doesn't match '%s' or '%s'. id=%x\n", sprintf(tmpstr1,"%x.tmp",id & 0xffff);
newdir,tmpstr,tmpstr1,id); ok(lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr)==0 ||
ok(DeleteFileA(newdir),"Couldn't delete the temporary file we just created\n"); lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr1)==0,
"GetTempFileNameA returned '%s' which doesn't match '%s' or '%s'. id=%x\n",
newdir,tmpstr,tmpstr1,id);
ok(DeleteFileA(newdir),"Couldn't delete the temporary file we just created\n");
}
/* Find first valid drive letter that is neither newdir[0] nor curDrive */ /* Find first valid drive letter that is neither newdir[0] nor curDrive */
drives = GetLogicalDrives() & ~(1<<(newdir[0]-'A')); drives = GetLogicalDrives() & ~(1<<(newdir[0]-'A'));