From 290a419f0aa22ba0d1256240f23383baaeca0c54 Mon Sep 17 00:00:00 2001 From: Uwe Bonnes Date: Thu, 9 Jun 2005 09:42:49 +0000 Subject: [PATCH] Don't try to access floppy if it's not mounted. --- dlls/kernel/tests/drive.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/tests/drive.c b/dlls/kernel/tests/drive.c index bace5b99035..3a789780bda 100644 --- a/dlls/kernel/tests/drive.c +++ b/dlls/kernel/tests/drive.c @@ -102,10 +102,11 @@ static void test_GetDiskFreeSpaceA(void) for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++) { + UINT drivetype = GetDriveTypeA(drive); /* Skip floppy drives because NT pops up a MessageBox if no * floppy is present */ - if (GetDriveTypeA(drive)!=DRIVE_REMOVABLE) + if (drivetype != DRIVE_REMOVABLE && drivetype != DRIVE_NO_ROOT_DIR) { ret = GetDiskFreeSpaceA(drive, §ors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); if (!(logical_drives & 1)) @@ -156,8 +157,9 @@ static void test_GetDiskFreeSpaceW(void) for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++) { + UINT drivetype = GetDriveTypeW(drive); /* Skip floppy drives because NT4 pops up a MessageBox if no floppy is present */ - if (GetDriveTypeW(drive)!=DRIVE_REMOVABLE) + if (drivetype != DRIVE_REMOVABLE && drivetype != DRIVE_NO_ROOT_DIR) { ret = GetDiskFreeSpaceW(drive, §ors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); if (!(logical_drives & 1))