Alexandre Julliard : kernel32/tests: Allow more error codes from GetDiskFreeSpace.
Alexandre Julliard
julliard at winehq.org
Tue Feb 3 09:13:37 CST 2009
Module: wine
Branch: master
Commit: bdfa9c3a1bcb134948175d0866df1af351f17bde
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdfa9c3a1bcb134948175d0866df1af351f17bde
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Feb 3 15:04:24 2009 +0100
kernel32/tests: Allow more error codes from GetDiskFreeSpace.
---
dlls/kernel32/tests/drive.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/dlls/kernel32/tests/drive.c b/dlls/kernel32/tests/drive.c
index a94cbdf..81e04bf 100644
--- a/dlls/kernel32/tests/drive.c
+++ b/dlls/kernel32/tests/drive.c
@@ -118,7 +118,10 @@ static void test_GetDiskFreeSpaceA(void)
else
{
ok(ret ||
- (!ret && (GetLastError() == ERROR_NOT_READY || GetLastError() == ERROR_INVALID_DRIVE)),
+ GetLastError() == ERROR_NOT_READY ||
+ GetLastError() == ERROR_INVALID_DRIVE ||
+ GetLastError() == ERROR_PATH_NOT_FOUND ||
+ GetLastError() == ERROR_UNRECOGNIZED_VOLUME,
"GetDiskFreeSpaceA(%s): ret=%d GetLastError=%d\n",
drive, ret, GetLastError());
if( GetVersion() & 0x80000000)
@@ -132,7 +135,10 @@ static void test_GetDiskFreeSpaceA(void)
tot.QuadPart = sectors_per_cluster;
tot.QuadPart = (tot.QuadPart * bytes_per_sector) * total_clusters;
ret = pGetDiskFreeSpaceExA( drive, &d, &totEx, NULL);
- ok( ret || (!ret && ERROR_NOT_READY == GetLastError()),
+ ok( ret ||
+ GetLastError() == ERROR_NOT_READY ||
+ GetLastError() == ERROR_PATH_NOT_FOUND ||
+ GetLastError() == ERROR_UNRECOGNIZED_VOLUME,
"GetDiskFreeSpaceExA( %s ) failed. GetLastError=%d\n", drive, GetLastError());
ok( bytes_per_sector == 0 || /* empty cd rom drive */
totEx.QuadPart <= tot.QuadPart,
@@ -188,7 +194,10 @@ static void test_GetDiskFreeSpaceW(void)
"GetDiskFreeSpaceW(%c): ret=%d GetLastError=%d\n",
drive[0], ret, GetLastError());
else
- ok(ret || GetLastError() == ERROR_NOT_READY,
+ ok( ret ||
+ GetLastError() == ERROR_NOT_READY ||
+ GetLastError() == ERROR_PATH_NOT_FOUND ||
+ GetLastError() == ERROR_UNRECOGNIZED_VOLUME,
"GetDiskFreeSpaceW(%c): ret=%d GetLastError=%d\n",
drive[0], ret, GetLastError());
}
More information about the wine-cvs
mailing list