[ros-diffs] [spetreolle] 56641: [SETUPAPI] Sync SetupCreateDiskSpaceListW with Wine head. Fixes remaining setupapi:diskspace test failures.

spetreolle at svn.reactos.org spetreolle at svn.reactos.org
Sat May 19 18:29:56 UTC 2012


Author: spetreolle
Date: Sat May 19 18:29:56 2012
New Revision: 56641

URL: http://svn.reactos.org/svn/reactos?rev=56641&view=rev
Log:
[SETUPAPI]
Sync SetupCreateDiskSpaceListW with Wine head.
Fixes remaining setupapi:diskspace test failures.

Modified:
    trunk/reactos/dll/win32/setupapi/diskspace.c

Modified: trunk/reactos/dll/win32/setupapi/diskspace.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/diskspace.c?rev=56641&r1=56640&r2=56641&view=diff
==============================================================================
--- trunk/reactos/dll/win32/setupapi/diskspace.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/diskspace.c [iso-8859-1] Sat May 19 18:29:56 2012
@@ -35,7 +35,7 @@
 
 
 /***********************************************************************
- *		SetupCreateDiskSpaceListW  (SETUPAPI.@)
+ *      SetupCreateDiskSpaceListW  (SETUPAPI.@)
  */
 HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID Reserved1, DWORD Reserved2, UINT Flags)
 {
@@ -43,6 +43,14 @@
     DWORD rc;
     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);
 
@@ -73,7 +81,7 @@
         }
        ptr += lstrlenW(ptr) + 1;
     }
-    return  (HANDLE)list;
+    return list;
 }
 
 




More information about the Ros-diffs mailing list