[SETUPAPI]

Sync SetupCreateDiskSpaceListW with Wine head.
Fixes remaining setupapi:diskspace test failures.

svn path=/trunk/; revision=56641

diff --git a/reactos/dll/win32/setupapi/diskspace.c b/reactos/dll/win32/setupapi/diskspace.c
index 5efc366..1857c33 100644 (file)
--- a/reactos/dll/win32/setupapi/diskspace.c
+++ b/reactos/dll/win32/setupapi/diskspace.c
@@ -35,7 +35,7 @@ typedef struct {
 
 
 /***********************************************************************
- *             SetupCreateDiskSpaceListW  (SETUPAPI.@)
+ *      SetupCreateDiskSpaceListW  (SETUPAPI.@)
  */
 HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID Reserved1, DWORD Reserved2, UINT Flags)
 {
@@ -44,6 +44,14 @@ HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID Reserved1, DWORD Reserved2, UINT
     WCHAR *ptr;
     LPDISKSPACELIST list=NULL;
 
+    TRACE("(%p, %u, 0x%08x)\n", Reserved1, Reserved2, Flags);
+
+    if (Reserved1 || Reserved2 || Flags & ~SPDSL_IGNORE_DISK)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return NULL;
+    }
+
     rc = GetLogicalDriveStringsW(255,drives);
 
     if (rc == 0)
@@ -73,7 +81,7 @@ HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID Reserved1, DWORD Reserved2, UINT
         }
        ptr += lstrlenW(ptr) + 1;
     }
-    return  (HANDLE)list;
+    return list;
 }