[ros-diffs] [hpoussin] 16427: Fix compilation due to revision 16425.

Fix compilation due to revision 16425.
I forgot a parameter in SetupDiGetClassDevsExA/W ...
Modified: trunk/reactos/include/wine/setupapi.h
Modified: trunk/reactos/lib/setupapi/devinst.c
Modified: trunk/reactos/lib/setupapi/stubs.c
  _____

Modified: trunk/reactos/include/wine/setupapi.h
--- trunk/reactos/include/wine/setupapi.h	2005-07-05 13:15:10 UTC
(rev 16426)
+++ trunk/reactos/include/wine/setupapi.h	2005-07-05 14:00:33 UTC
(rev 16427)
@@ -741,8 +741,8 @@

HDEVINFO WINAPI SetupDiGetClassDevsA(CONST GUID *,LPCSTR,HWND,DWORD);
 HDEVINFO WINAPI SetupDiGetClassDevsW(CONST GUID *,LPCWSTR,HWND,DWORD);
 #define         SetupDiGetClassDevs
WINELIB_NAME_AW(SetupDiGetClassDevs)
-HDEVINFO WINAPI SetupDiGetClassDevsExA(CONST GUID
*,LPCSTR,HWND,DWORD,LPCSTR,PVOID);
-HDEVINFO WINAPI SetupDiGetClassDevsExW(CONST GUID
*,LPCWSTR,HWND,DWORD,LPCWSTR,PVOID);
+HDEVINFO WINAPI SetupDiGetClassDevsExA(CONST GUID
*,LPCSTR,HWND,DWORD,HDEVINFO,LPCSTR,PVOID);
+HDEVINFO WINAPI SetupDiGetClassDevsExW(CONST GUID
*,LPCWSTR,HWND,DWORD,HDEVINFO,LPCWSTR,PVOID);
 #define         SetupDiGetClassDevsEx
WINELIB_NAME_AW(SetupDiGetClassDevsEx)
 BOOL     WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO,
PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_A,
                                                  DWORD, PDWORD,
PSP_DEVINFO_DATA);
  _____

Modified: trunk/reactos/lib/setupapi/devinst.c
--- trunk/reactos/lib/setupapi/devinst.c	2005-07-05 13:15:10 UTC
(rev 16426)
+++ trunk/reactos/lib/setupapi/devinst.c	2005-07-05 14:00:33 UTC
(rev 16427)
@@ -990,7 +990,7 @@

DWORD flags)
 {
     return SetupDiGetClassDevsExA(class, enumstr, parent,
-                                  flags, NULL, NULL);
+                                  flags, NULL, NULL, NULL);
 }

/***********************************************************************
@@ -1003,7 +1003,7 @@
        DWORD flags)
 {
     return SetupDiGetClassDevsExW(class, enumstr, parent,
-                                  flags, NULL, NULL);
+                                  flags, NULL, NULL, NULL);
 }

/***********************************************************************
@@ -1014,6 +1014,7 @@
        LPCSTR enumstr,
        HWND parent,
        DWORD flags,
+       HDEVINFO deviceset,
        LPCSTR machine,
        PVOID reserved)
 {
@@ -1043,7 +1044,7 @@
         }
         MultiByteToWideChar(CP_ACP, 0, machine, -1, machineW, len);
     }
-    ret = SetupDiGetClassDevsExW(class, enumstrW, parent, flags,
machineW, reserved);
+    ret = SetupDiGetClassDevsExW(class, enumstrW, parent, flags,
deviceset, machineW, reserved);

end:
     HeapFree(GetProcessHeap(), 0, enumstrW);
@@ -1195,18 +1196,21 @@
        LPCWSTR enumstr,
        HWND parent,
        DWORD flags,
+       HDEVINFO deviceset,
        LPCWSTR machine,
        PVOID reserved)
 {
     HDEVINFO ret = (HDEVINFO)INVALID_HANDLE_VALUE;

-    TRACE("%s %s %p 0x%08lx\n", debugstr_guid(class),
debugstr_w(enumstr),
-     parent, flags);
+    TRACE("%s %s %p 0x%08lx %p %s %p\n", debugstr_guid(class),
debugstr_w(enumstr),
+     parent, flags, deviceset, debugstr_w(machine), reserved);

if (flags & DIGCF_PRESENT)
         FIXME(": flag DIGCF_PRESENT ignored\n");
     if (flags & DIGCF_PROFILE)
         FIXME(": flag DIGCF_PROFILE ignored\n");
+    if (deviceset)
+       FIXME(": deviceset ignored\n");

if (enumstr)
         FIXME(": unimplemented for enumerator strings (%s)\n",
  _____

Modified: trunk/reactos/lib/setupapi/stubs.c
--- trunk/reactos/lib/setupapi/stubs.c	2005-07-05 13:15:10 UTC (rev
16426)
+++ trunk/reactos/lib/setupapi/stubs.c	2005-07-05 14:00:33 UTC (rev
16427)
@@ -69,29 +69,6 @@

}

/***********************************************************************
- *		  (SETUPAPI.@)
- *
- * NO WINAPI in description given
- */
-HDEVINFO WINAPI SetupDiGetClassDevsExA(const GUID *class, PCSTR filter,
HWND parent, DWORD flags, HDEVINFO deviceset, PCSTR machine, PVOID
reserved)
-{
-  FIXME("filter %s machine
%s\n",debugstr_a(filter),debugstr_a(machine));
-  return FALSE;
-}
-
-/**********************************************************************
*
- *		  (SETUPAPI.@)
- *
- * NO WINAPI in description given
- */
-HDEVINFO WINAPI SetupDiGetClassDevsExW(const GUID *class, PCWSTR
filter, HWND parent, DWORD flags, HDEVINFO deviceset, PCWSTR machine,
PVOID reserved)
-{
-  FIXME("\n");
-  return FALSE;
-}
-
-
-/**********************************************************************
*
  *		SetupCopyOEMInfA  (SETUPAPI.@)
  */
 BOOL WINAPI SetupCopyOEMInfA(PCSTR sourceinffile, PCSTR sourcemedialoc,