From 7afd05c21762fcd1df184f3175bb4bd022a362a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
Date: Tue, 5 Jul 2005 14:00:33 +0000
Subject: [PATCH] Fix compilation due to revision 16425. I forgot a parameter
 in SetupDiGetClassDevsExA/W ...

svn path=/trunk/; revision=16427
---
 reactos/include/wine/setupapi.h |  4 ++--
 reactos/lib/setupapi/devinst.c  | 14 +++++++++-----
 reactos/lib/setupapi/stubs.c    | 23 -----------------------
 3 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/reactos/include/wine/setupapi.h b/reactos/include/wine/setupapi.h
index 2b9cc31d6da..5bcff895859 100644
--- a/reactos/include/wine/setupapi.h
+++ b/reactos/include/wine/setupapi.h
@@ -741,8 +741,8 @@ BOOL     WINAPI SetupDiGetClassDescriptionExW(const GUID*, PWSTR, DWORD, PDWORD,
 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);
diff --git a/reactos/lib/setupapi/devinst.c b/reactos/lib/setupapi/devinst.c
index e1ae9d288b5..1ddbca0e232 100644
--- a/reactos/lib/setupapi/devinst.c
+++ b/reactos/lib/setupapi/devinst.c
@@ -990,7 +990,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsA(
        DWORD flags)
 {
     return SetupDiGetClassDevsExA(class, enumstr, parent,
-                                  flags, NULL, NULL);
+                                  flags, NULL, NULL, NULL);
 }
 
 /***********************************************************************
@@ -1003,7 +1003,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsW(
        DWORD flags)
 {
     return SetupDiGetClassDevsExW(class, enumstr, parent,
-                                  flags, NULL, NULL);
+                                  flags, NULL, NULL, NULL);
 }
 
 /***********************************************************************
@@ -1014,6 +1014,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExA(
        LPCSTR enumstr,
        HWND parent,
        DWORD flags,
+       HDEVINFO deviceset,
        LPCSTR machine,
        PVOID reserved)
 {
@@ -1043,7 +1044,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExA(
         }
         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 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW(
        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",
diff --git a/reactos/lib/setupapi/stubs.c b/reactos/lib/setupapi/stubs.c
index 67ad32be14c..5434f745baf 100644
--- a/reactos/lib/setupapi/stubs.c
+++ b/reactos/lib/setupapi/stubs.c
@@ -68,29 +68,6 @@ BOOL WINAPI SetupDiGetDeviceInfoListDetailW(HDEVINFO devinfo, PSP_DEVINFO_LIST_D
   return FALSE;
 }
 
-/***********************************************************************
- *		  (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.@)
  */