[KERNEL32_APITEST]: Rewrite DeviceIoControl to test both disk.sys and cdrom.sys

diff --git a/modules/rostests/apitests/kernel32/DeviceIoControl.c b/modules/rostests/apitests/kernel32/DeviceIoControl.c
index 2f993eb..faa10d5 100644 (file)
--- a/modules/rostests/apitests/kernel32/DeviceIoControl.c
+++ b/modules/rostests/apitests/kernel32/DeviceIoControl.c
@@ -13,9 +13,13 @@
 
 WCHAR Letter;
 HANDLE Device;
+UINT DriveType;
+
+#define ok_type(condition, format, ...) ok(condition, "(%d): " format, DriveType,  ##__VA_ARGS__)
+#define skip_type(format, ...) skip("(%d): " format, DriveType, ##__VA_ARGS__)
 
 static
-VOID
+BOOL
 GetDiskGeometry(VOID)
 {
     UINT Ret;
@@ -25,32 +29,47 @@ GetDiskGeometry(VOID)
 
     Size = 0;
     Ret = DeviceIoControl(Device, IOCTL_DISK_GET_DRIVE_GEOMETRY, NULL, 0, &DG, sizeof(DG) - 1, &Size, NULL);
-    ok(Ret == 0, "DeviceIoControl succeed\n");
+    ok_type(Ret == 0, "DeviceIoControl succeed\n");
     Error = GetLastError();
-    ok(Error == ERROR_INSUFFICIENT_BUFFER, "Expecting ERROR_INSUFFICIENT_BUFFER, got %ld\n", Error);
-    ok(Size == 0, "Invalid output size: %ld\n", Size);
+    ok_type(Error == ERROR_INSUFFICIENT_BUFFER, "Expecting ERROR_INSUFFICIENT_BUFFER, got %ld\n", Error);
+    ok_type(Size == 0, "Invalid output size: %ld\n", Size);
 
     Size = 0;
     Ret = DeviceIoControl(Device, IOCTL_DISK_GET_DRIVE_GEOMETRY, NULL, 0, &DG, sizeof(DG), &Size, NULL);
-    ok(Ret != 0, "DeviceIoControl failed: %ld\n", GetLastError());
-    ok(Size == sizeof(DG), "Invalid output size: %ld\n", Size);
+    /* Specific for CDROM, no disk present */
+    if (Ret == 0 && GetLastError() == ERROR_NOT_READY)
+    {
+        skip_type("No CDROM present\n");
+        return FALSE;
+    }
+    ok_type(Ret != 0, "DeviceIoControl failed: %ld\n", GetLastError());
+    ok_type(Size == sizeof(DG), "Invalid output size: %ld\n", Size);
 
     Size = 0;
     Ret = DeviceIoControl(Device, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0, &DGE, FIELD_OFFSET(DISK_GEOMETRY_EX, Data) - 1, &Size, NULL);
-    ok(Ret == 0, "DeviceIoControl succeed\n");
+    ok_type(Ret == 0, "DeviceIoControl succeed\n");
     Error = GetLastError();
-    ok(Error == ERROR_INSUFFICIENT_BUFFER, "Expecting ERROR_INSUFFICIENT_BUFFER, got %ld\n", Error);
-    ok(Size == 0, "Invalid output size: %ld\n", Size);
+    ok_type(Error == ERROR_INSUFFICIENT_BUFFER, "Expecting ERROR_INSUFFICIENT_BUFFER, got %ld\n", Error);
+    ok_type(Size == 0, "Invalid output size: %ld\n", Size);
 
     Size = 0;
     Ret = DeviceIoControl(Device, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0, &DGE, FIELD_OFFSET(DISK_GEOMETRY_EX, Data), &Size, NULL);
-    ok(Ret != 0, "DeviceIoControl failed: %ld\n", GetLastError());
-    ok(Size == FIELD_OFFSET(DISK_GEOMETRY_EX, Data), "Invalid output size: %ld\n", Size);
+    ok_type(Ret != 0, "DeviceIoControl failed: %ld\n", GetLastError());
+    ok_type(Size == FIELD_OFFSET(DISK_GEOMETRY_EX, Data), "Invalid output size: %ld\n", Size);
 
     Size = 0;
     Ret = DeviceIoControl(Device, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0, &DGE, sizeof(DGE), &Size, NULL);
-    ok(Ret != 0, "DeviceIoControl failed: %ld\n", GetLastError());
-    ok(Size == sizeof(DGE), "Invalid output size: %ld\n", Size);
+    ok_type(Ret != 0, "DeviceIoControl failed: %ld\n", GetLastError());
+    if (DriveType == DRIVE_FIXED)
+    {
+        ok_type(Size == sizeof(DGE), "Invalid output size: %ld\n", Size);
+    }
+    else
+    {
+        ok_type(Size == FIELD_OFFSET(DISK_GEOMETRY_EX, Data), "Invalid output size: %ld\n", Size);
+    }
+
+    return TRUE;
 }
 
 static
@@ -64,36 +83,44 @@ QueryDeviceName(VOID)
 
     Size = 0;
     Ret = DeviceIoControl(Device, IOCTL_MOUNTDEV_QUERY_DEVICE_NAME, NULL, 0, &MDN, sizeof(MDN) - 1, &Size, NULL);
-    ok(Ret == 0, "DeviceIoControl succeed\n");
+    ok_type(Ret == 0, "DeviceIoControl succeed\n");
     Error = GetLastError();
-    ok(Error == ERROR_INVALID_PARAMETER, "Expecting ERROR_INVALID_PARAMETER, got %ld\n", Error);
-    ok(Size == 0, "Invalid output size: %ld\n", Size);
+    if (DriveType == DRIVE_FIXED)
+    {
+        ok_type(Error == ERROR_INVALID_PARAMETER, "Expecting ERROR_INVALID_PARAMETER, got %ld\n", Error);
+    }
+    else
+    {
+        ok_type(Error == ERROR_INSUFFICIENT_BUFFER, "Expecting ERROR_INSUFFICIENT_BUFFER, got %ld\n", Error);
+    }
+    ok_type(Size == 0, "Invalid output size: %ld\n", Size);
 
     Ret = DeviceIoControl(Device, IOCTL_MOUNTDEV_QUERY_DEVICE_NAME, NULL, 0, &MDN, sizeof(MDN), &Size, NULL);
-    ok(Ret == 0, "DeviceIoControl succeed\n");
+    ok_type(Ret == 0, "DeviceIoControl succeed\n");
     Error = GetLastError();
-    ok(Error == ERROR_MORE_DATA, "Expecting ERROR_MORE_DATA, got %ld\n", Error);
-    ok(Size == sizeof(MOUNTDEV_NAME), "Invalid output size: %ld\n", Size);
+    ok_type(Error == ERROR_MORE_DATA, "Expecting ERROR_MORE_DATA, got %ld\n", Error);
+    ok_type(Size == sizeof(MOUNTDEV_NAME), "Invalid output size: %ld\n", Size);
 
     AllocatedMDN = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MOUNTDEV_NAME, Name) + MDN.NameLength + sizeof(UNICODE_NULL));
     if (AllocatedMDN == NULL)
     {
-        skip("Memory allocation failure\n");
+        skip_type("Memory allocation failure\n");
         return;
     }
 
     Size = 0;
     Ret = DeviceIoControl(Device, IOCTL_MOUNTDEV_QUERY_DEVICE_NAME, NULL, 0, AllocatedMDN, FIELD_OFFSET(MOUNTDEV_NAME, Name) + MDN.NameLength, &Size, NULL);
-    ok(Ret != 0, "DeviceIoControl failed: %ld\n", GetLastError());
-    ok(Size == FIELD_OFFSET(MOUNTDEV_NAME, Name) + MDN.NameLength, "Invalid output size: %ld\n", Size);
-    ok(AllocatedMDN->NameLength == MDN.NameLength, "Mismatching sizes: %d %d\n", AllocatedMDN->NameLength, MDN.NameLength);
+    ok_type(Ret != 0, "DeviceIoControl failed: %ld\n", GetLastError());
+    ok_type(Size == FIELD_OFFSET(MOUNTDEV_NAME, Name) + MDN.NameLength, "Invalid output size: %ld\n", Size);
+    ok_type(AllocatedMDN->NameLength == MDN.NameLength, "Mismatching sizes: %d %d\n", AllocatedMDN->NameLength, MDN.NameLength);
 
     if (Ret != 0)
     {
         IsValid = FALSE;
         AllocatedMDN->Name[AllocatedMDN->NameLength / sizeof(WCHAR) - 1] = UNICODE_NULL;
 
-        if (wcsstr(AllocatedMDN->Name, L"\\Device\\HarddiskVolume") != NULL)
+        if ((DriveType == DRIVE_FIXED && wcsstr(AllocatedMDN->Name, L"\\Device\\HarddiskVolume") != NULL) ||
+            (DriveType == DRIVE_CDROM && wcsstr(AllocatedMDN->Name, L"\\Device\\CdRom") != NULL))
         {
             IsValid = TRUE;
         }
@@ -102,11 +129,11 @@ QueryDeviceName(VOID)
             IsValid = (AllocatedMDN->Name[12] == Letter && AllocatedMDN->Name[13] == L':');
         }
 
-        ok(IsValid, "Invalid name: %.*S", AllocatedMDN->NameLength, AllocatedMDN->Name);
+        ok_type(IsValid, "Invalid name: %.*S\n", AllocatedMDN->NameLength, AllocatedMDN->Name);
     }
     else
     {
-        skip("Failed to query device name\n");
+        skip_type("Failed to query device name\n");
     }
 
     HeapFree(GetProcessHeap(), 0, AllocatedMDN);
@@ -122,29 +149,36 @@ QueryUniqueId(VOID)
 
     Size = 0;
     Ret = DeviceIoControl(Device, IOCTL_MOUNTDEV_QUERY_UNIQUE_ID, NULL, 0, &MUI, sizeof(MUI) - 1, &Size, NULL);
-    ok(Ret == 0, "DeviceIoControl succeed\n");
+    ok_type(Ret == 0, "DeviceIoControl succeed\n");
     Error = GetLastError();
-    ok(Error == ERROR_INVALID_PARAMETER, "Expecting ERROR_INVALID_PARAMETER, got %ld\n", Error);
-    ok(Size == 0, "Invalid output size: %ld\n", Size);
+    if (DriveType == DRIVE_FIXED)
+    {
+        ok_type(Error == ERROR_INVALID_PARAMETER, "Expecting ERROR_INVALID_PARAMETER, got %ld\n", Error);
+    }
+    else
+    {
+        ok_type(Error == ERROR_INSUFFICIENT_BUFFER, "Expecting ERROR_INSUFFICIENT_BUFFER, got %ld\n", Error);
+    }
+    ok_type(Size == 0, "Invalid output size: %ld\n", Size);
 
     Ret = DeviceIoControl(Device, IOCTL_MOUNTDEV_QUERY_UNIQUE_ID, NULL, 0, &MUI, sizeof(MUI), &Size, NULL);
-    ok(Ret == 0, "DeviceIoControl succeed\n");
+    ok_type(Ret == 0, "DeviceIoControl succeed\n");
     Error = GetLastError();
-    ok(Error == ERROR_MORE_DATA, "Expecting ERROR_MORE_DATA, got %ld\n", Error);
-    ok(Size == sizeof(MOUNTDEV_UNIQUE_ID), "Invalid output size: %ld\n", Size);
+    ok_type(Error == ERROR_MORE_DATA, "Expecting ERROR_MORE_DATA, got %ld\n", Error);
+    ok_type(Size == sizeof(MOUNTDEV_UNIQUE_ID), "Invalid output size: %ld\n", Size);
 
     AllocatedMUI = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MOUNTDEV_UNIQUE_ID, UniqueId) + MUI.UniqueIdLength + sizeof(UNICODE_NULL));
     if (AllocatedMUI == NULL)
     {
-        skip("Memory allocation failure\n");
+        skip_type("Memory allocation failure\n");
         return;
     }
 
     Size = 0;
     Ret = DeviceIoControl(Device, IOCTL_MOUNTDEV_QUERY_UNIQUE_ID, NULL, 0, AllocatedMUI, FIELD_OFFSET(MOUNTDEV_UNIQUE_ID, UniqueId) + MUI.UniqueIdLength, &Size, NULL);
-    ok(Ret != 0, "DeviceIoControl failed: %ld\n", GetLastError());
-    ok(Size == FIELD_OFFSET(MOUNTDEV_UNIQUE_ID, UniqueId) + MUI.UniqueIdLength, "Invalid output size: %ld\n", Size);
-    ok(AllocatedMUI->UniqueIdLength == MUI.UniqueIdLength, "Mismatching sizes: %d %d\n", AllocatedMUI->UniqueIdLength, MUI.UniqueIdLength);
+    ok_type(Ret != 0, "DeviceIoControl failed: %ld\n", GetLastError());
+    ok_type(Size == FIELD_OFFSET(MOUNTDEV_UNIQUE_ID, UniqueId) + MUI.UniqueIdLength, "Invalid output size: %ld\n", Size);
+    ok_type(AllocatedMUI->UniqueIdLength == MUI.UniqueIdLength, "Mismatching sizes: %d %d\n", AllocatedMUI->UniqueIdLength, MUI.UniqueIdLength);
 
     HeapFree(GetProcessHeap(), 0, AllocatedMUI);
 }
@@ -153,30 +187,59 @@ START_TEST(DeviceIoControl)
 {
     UINT Ret;
     WCHAR Path[MAX_PATH];
+    DWORD DriveMap, Current;
+    BOOL DiskDone, CdRomDone;
 
-    Path[0] = 'C';
-    Path[1] = ':';
-    Path[2] = '\\';
-    Ret = GetSystemDirectoryW(Path, MAX_PATH);
-    ok(Ret > 0, "GetSystemDirectory failed\n");
-
-    Letter = towupper(Path[0]);
-    ok(Path[1] == ':', "Not a drive letter: %c\n", Path[1]);
-    ok(Path[2] == '\\', "Not a drive letter: %c\n", Path[2]);
-
-    Ret = StringCchPrintfW(Path, MAX_PATH, L"\\\\?\\%c:", Letter);
-    ok(Ret == S_OK, "StringCchPrintfW failed: %d\n", Ret);
-
-    Device = CreateFileW(Path, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-    if (Device == INVALID_HANDLE_VALUE)
+    DiskDone = FALSE;
+    CdRomDone = FALSE;
+    DriveMap = GetLogicalDrives();
+    for (Current = 0; Current < 26; ++Current)
     {
-        skip("CreateFileW for %S failed: %ld\n", Path, GetLastError());
-        return;
+        if (DriveMap & (1 << Current))
+        {
+            Ret = StringCchPrintfW(Path, MAX_PATH, L"%c:\\", Current + L'A');
+            ok(Ret == S_OK, "StringCchPrintfW failed: %d\n", Ret);
+
+            DriveType = GetDriveTypeW(Path);
+            if ((DriveType == DRIVE_FIXED && !DiskDone) ||
+                (DriveType == DRIVE_CDROM && !CdRomDone))
+            {
+                Ret = StringCchPrintfW(Path, MAX_PATH, L"\\\\?\\%c:", Current + L'A');
+                ok(Ret == S_OK, "StringCchPrintfW failed: %d\n", Ret);
+
+                Device = CreateFileW(Path, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+                if (Device == INVALID_HANDLE_VALUE)
+                {
+                    skip_type("CreateFileW for %S failed: %ld\n", Path, GetLastError());
+                    continue;
+                }
+
+                DiskDone = (DiskDone || (DriveType == DRIVE_FIXED));
+                CdRomDone = (CdRomDone || (DriveType == DRIVE_CDROM));
+
+                if (GetDiskGeometry())
+                {
+                    QueryDeviceName();
+                    QueryUniqueId();
+                }
+
+                CloseHandle(Device);
+            }
+
+            if (CdRomDone && DiskDone)
+            {
+                break;
+            }
+        }
     }
 
-    GetDiskGeometry();
-    QueryDeviceName();
-    QueryUniqueId();
+    if (!DiskDone)
+    {
+        skip("No disk drive found\n");
+    }
 
-    CloseHandle(Device);
+    if (!CdRomDone)
+    {
+        skip("No CDROM drive found\n");
+    }
 }