Hans Leidekker : setupapi: Add stub implementations of CM_Get_Device_ID_ListW and CM_Enumerate_Classes .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ae45fa6864962bf186ecc80d69b22d1543458bf9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ae45fa6864962bf186ecc80d69...

Author: Hans Leidekker <hans(a)codeweavers.com>
Date:   Tue Aug  4 12:19:05 2009 +0200

setupapi: Add stub implementations of CM_Get_Device_ID_ListW and CM_Enumerate_Classes.

---

 dlls/setupapi/setupapi.spec |    6 +++---
 dlls/setupapi/stubs.c       |   27 ++++++++++++++++++++++++---
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
index e3fe250..2cc20d0 100644
--- a/dlls/setupapi/setupapi.spec
+++ b/dlls/setupapi/setupapi.spec
@@ -38,7 +38,7 @@
 @ stub CM_Dup_Range_List
 @ stub CM_Enable_DevNode
 @ stub CM_Enable_DevNode_Ex
-@ stub CM_Enumerate_Classes
+@ stdcall CM_Enumerate_Classes(long ptr long)
 @ stub CM_Enumerate_Classes_Ex
 @ stub CM_Enumerate_EnumeratorsA
 @ stub CM_Enumerate_EnumeratorsW
@@ -75,8 +75,8 @@
 @ stdcall CM_Get_Device_IDW(ptr ptr long long)
 @ stub CM_Get_Device_ID_ExA
 @ stub CM_Get_Device_ID_ExW
-@ stdcall CM_Get_Device_ID_ListA(ptr ptr long long)
-@ stub CM_Get_Device_ID_ListW
+@ stdcall CM_Get_Device_ID_ListA(str ptr long long)
+@ stdcall CM_Get_Device_ID_ListW(wstr ptr long long)
 @ stub CM_Get_Device_ID_List_ExA
 @ stub CM_Get_Device_ID_List_ExW
 @ stub CM_Get_Device_ID_List_SizeA
diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c
index eed8972..438a7fc 100644
--- a/dlls/setupapi/stubs.c
+++ b/dlls/setupapi/stubs.c
@@ -100,12 +100,24 @@ CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE handle)
 /***********************************************************************
  *             CM_Get_Device_ID_ListA  (SETUPAPI.@)
  */
-
 CONFIGRET WINAPI CM_Get_Device_ID_ListA(
     PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags )
 {
-    FIXME("%p %p %d %d\n", pszFilter, Buffer, BufferLen, ulFlags );
-    memset(Buffer,0,2);
+    FIXME("%s %p %d 0x%08x\n", debugstr_a(pszFilter), Buffer, BufferLen, ulFlags);
+
+    if (BufferLen >= 2) Buffer[0] = Buffer[1] = 0;
+    return CR_SUCCESS;
+}
+
+/***********************************************************************
+ *             CM_Get_Device_ID_ListW  (SETUPAPI.@)
+ */
+CONFIGRET WINAPI CM_Get_Device_ID_ListW(
+    PCWSTR pszFilter, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags )
+{
+    FIXME("%s %p %d 0x%08x\n", debugstr_w(pszFilter), Buffer, BufferLen, ulFlags);
+
+    if (BufferLen >= 2) Buffer[0] = Buffer[1] = 0;
     return CR_SUCCESS;
 }
 
@@ -305,3 +317,12 @@ CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExW(PULONG len, LPGUID class,
     FIXME("%p %p %s 0x%08x %p: stub\n", len, class, debugstr_w(id), flags, machine);
     return CR_FAILURE;
 }
+
+/***********************************************************************
+ *      CM_Enumerate_Classes (SETUPAPI.@)
+ */
+CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags)
+{
+    FIXME("%u %p 0x%08x: stub\n", index, class, flags);
+    return CR_NO_SUCH_VALUE;
+}