Account for the fact that the temporary directory may expand to a long
name.
This commit is contained in:
parent
e58820fc58
commit
af7e65b46d
|
@ -510,19 +510,20 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive)
|
||||||
"GetShortPathNameA should not have a trailing \\");
|
"GetShortPathNameA should not have a trailing \\");
|
||||||
|
|
||||||
if (pGetLongPathNameA) {
|
if (pGetLongPathNameA) {
|
||||||
DWORD rc;
|
DWORD rc1,rc2;
|
||||||
sprintf(tmpstr,"%s\\%s\\%s",curdir,LONGDIR,LONGFILE);
|
sprintf(tmpstr,"%s\\%s\\%s",curdir,LONGDIR,LONGFILE);
|
||||||
rc=(*pGetLongPathNameA)(tmpstr,NULL,0);
|
rc1=(*pGetLongPathNameA)(tmpstr,NULL,0);
|
||||||
ok(rc==strlen(tmpstr)+1,
|
rc2=(*pGetLongPathNameA)(curdir,NULL,0);
|
||||||
|
ok((rc1-strlen(tmpstr))==(rc2-strlen(curdir)),
|
||||||
"GetLongPathNameA: wrong return code, %ld instead of %d",
|
"GetLongPathNameA: wrong return code, %ld instead of %d",
|
||||||
rc, strlen(curdir)+1);
|
rc1, strlen(tmpstr)+1);
|
||||||
|
|
||||||
todo_wine {
|
todo_wine {
|
||||||
sprintf(dir,"%c:",curDrive);
|
sprintf(dir,"%c:",curDrive);
|
||||||
rc=(*pGetLongPathNameA)(dir,tmpstr,sizeof(tmpstr));
|
rc1=(*pGetLongPathNameA)(dir,tmpstr,sizeof(tmpstr));
|
||||||
ok(strcmp(dir,tmpstr)==0,
|
ok(strcmp(dir,tmpstr)==0,
|
||||||
"GetLongPathNameA: returned '%s' instead of '%s' (rc=%ld)",
|
"GetLongPathNameA: returned '%s' instead of '%s' (rc=%ld)",
|
||||||
tmpstr,dir,rc);
|
tmpstr,dir,rc1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue