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

kernel32/tests: Fix failures with virtual Drives (AppVirt Client).

Browse Source
This commit is contained in:
Detlef Riekenberg 2013-03-11 00:11:22 +01:00 committed by Alexandre Julliard
parent 4d51a688e3
commit 3826193f33
1 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dlls/kernel32/tests/drive.c
View File

@ -114,16 +114,12 @@ static void test_GetDiskFreeSpaceA(void)
drive, ret, GetLastError()); drive, ret, GetLastError());
else else
{ {
ok(ret ||
GetLastError() == ERROR_NOT_READY || if (!ret)
GetLastError() == ERROR_INVALID_FUNCTION || /* GetDiskFreeSpaceA() should succeed, but it can fail with too many
GetLastError() == ERROR_INVALID_DRIVE || different GetLastError() results to be usable for a ok() */
GetLastError() == ERROR_PATH_NOT_FOUND || trace("GetDiskFreeSpaceA(%s) failed with %d\n", drive, GetLastError());
GetLastError() == ERROR_REQUEST_ABORTED ||
GetLastError() == ERROR_NETNAME_DELETED ||
GetLastError() == ERROR_UNRECOGNIZED_VOLUME,
"GetDiskFreeSpaceA(%s): ret=%d GetLastError=%d\n",
drive, ret, GetLastError());
if( GetVersion() & 0x80000000) if( GetVersion() & 0x80000000)
/* win3.0 through winME */ /* win3.0 through winME */
ok( total_clusters <= 65535, ok( total_clusters <= 65535,
@ -135,14 +131,12 @@ static void test_GetDiskFreeSpaceA(void)
tot.QuadPart = sectors_per_cluster; tot.QuadPart = sectors_per_cluster;
tot.QuadPart = (tot.QuadPart * bytes_per_sector) * total_clusters; tot.QuadPart = (tot.QuadPart * bytes_per_sector) * total_clusters;
ret = pGetDiskFreeSpaceExA( drive, &d, &totEx, NULL); ret = pGetDiskFreeSpaceExA( drive, &d, &totEx, NULL);
ok( ret ||
GetLastError() == ERROR_NOT_READY || if (!ret)
GetLastError() == ERROR_INVALID_FUNCTION || /* GetDiskFreeSpaceExA() should succeed, but it can fail with too many
GetLastError() == ERROR_PATH_NOT_FOUND || different GetLastError() results to be usable for a ok() */
GetLastError() == ERROR_REQUEST_ABORTED || trace("GetDiskFreeSpaceExA(%s) failed with %d\n", drive, GetLastError());
GetLastError() == ERROR_NETNAME_DELETED ||
GetLastError() == ERROR_UNRECOGNIZED_VOLUME,
"GetDiskFreeSpaceExA( %s ) failed. GetLastError=%d\n", drive, GetLastError());
ok( bytes_per_sector == 0 || /* empty cd rom drive */ ok( bytes_per_sector == 0 || /* empty cd rom drive */
totEx.QuadPart <= tot.QuadPart, totEx.QuadPart <= tot.QuadPart,
"GetDiskFreeSpaceA should report at least as much bytes on disk %s as GetDiskFreeSpaceExA\n", drive); "GetDiskFreeSpaceA should report at least as much bytes on disk %s as GetDiskFreeSpaceExA\n", drive);
@ -196,15 +190,10 @@ static void test_GetDiskFreeSpaceW(void)
ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND, ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND,
"GetDiskFreeSpaceW(%c): ret=%d GetLastError=%d\n", "GetDiskFreeSpaceW(%c): ret=%d GetLastError=%d\n",
drive[0], ret, GetLastError()); drive[0], ret, GetLastError());
else else if (!ret)
ok( ret || /* GetDiskFreeSpaceW() should succeed, but it can fail with too many
GetLastError() == ERROR_NOT_READY || different GetLastError() results to be usable for a ok() */
GetLastError() == ERROR_INVALID_FUNCTION || trace("GetDiskFreeSpaceW(%c) failed with %d\n", drive[0], GetLastError());
GetLastError() == ERROR_PATH_NOT_FOUND ||
GetLastError() == ERROR_REQUEST_ABORTED ||
GetLastError() == ERROR_UNRECOGNIZED_VOLUME,
"GetDiskFreeSpaceW(%c): ret=%d GetLastError=%d\n",
drive[0], ret, GetLastError());
} }
logical_drives >>= 1; logical_drives >>= 1;
} }