[ros-diffs] [ekohl] 22316: Implement CM_Delete_DevNode_Key and add CM_Delete_DevNode_Key_Ex stub.

Author: ekohl
Date: Mon Jun 12 01:56:08 2006
New Revision: 22316

URL: http://svn.reactos.ru/svn/reactos?rev=22316&view=rev
Log:
Implement CM_Delete_DevNode_Key and add CM_Delete_DevNode_Key_Ex stub.

Modified:
    trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def
    trunk/reactos/dll/win32/setupapi/cfgmgr.c
    trunk/reactos/dll/win32/setupapi/setupapi.spec
    trunk/reactos/include/ddk/cfgmgr32.h
    trunk/reactos/include/reactos/wine/cfgmgr32.h

Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr32…
==============================================================================
--- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def (original)
+++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def Mon Jun 12 01:56:08 2006
@@ -43,8 +43,8 @@
 ;CM_Create_Range_List
 CM_Delete_Class_Key(a)8=SETUPAPI.CM_Delete_Class_Key
 CM_Delete_Class_Key_Ex(a)12=SETUPAPI.CM_Delete_Class_Key_Ex
-;CM_Delete_DevNode_Key
-;CM_Delete_DevNode_Key_Ex
+CM_Delete_DevNode_Key(a)12=SETUPAPI.CM_Delete_DevNode_Key
+CM_Delete_DevNode_Key_Ex(a)16=SETUPAPI.CM_Delete_DevNode_Key_Ex
 ;CM_Delete_Range
 ;CM_Detect_Resource_Conflict
 ;CM_Detect_Resource_Conflict_Ex

Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.c…
==============================================================================
--- trunk/reactos/dll/win32/setupapi/cfgmgr.c (original)
+++ trunk/reactos/dll/win32/setupapi/cfgmgr.c Mon Jun 12 01:56:08 2006
@@ -444,6 +444,30 @@
     return PNP_DeleteClassKey(BindingHandle,
                              szGuidString,
                              ulFlags);
+}
+
+/***********************************************************************
+ * CM_Delete_DevNode_Key [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Delete_DevNode_Key(
+    DEVNODE dnDevNode, ULONG ulHardwareProfile, ULONG ulFlags)
+{
+    TRACE("%p %lu %lx\n", dnDevNode, ulHardwareProfile, ulFlags);
+    return CM_Delete_DevNode_Key_Ex(dnDevNode, ulHardwareProfile, ulFlags,
+                                    NULL);
+}
+
+/***********************************************************************
+ * CM_Delete_DevNode_Key_Ex [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Delete_DevNode_Key_Ex(
+    DEVNODE dnDevNode, ULONG ulHardwareProfile, ULONG ulFlags,
+    HANDLE hMachine)
+{
+    FIXME("%p %lu %lx %p\n",
+          dnDevNode, ulHardwareProfile, ulFlags, hMachine);
+
+    return CR_CALL_NOT_IMPLEMENTED;
 }
 
 

Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/setupapi…
==============================================================================
--- trunk/reactos/dll/win32/setupapi/setupapi.spec (original)
+++ trunk/reactos/dll/win32/setupapi/setupapi.spec Mon Jun 12 01:56:08 2006
@@ -27,8 +27,8 @@
 @ stub CM_Create_Range_List
 @ stdcall CM_Delete_Class_Key(ptr long)
 @ stdcall CM_Delete_Class_Key_Ex(ptr long long)
-@ stub CM_Delete_DevNode_Key
-@ stub CM_Delete_DevNode_Key_Ex
+@ stdcall CM_Delete_DevNode_Key(long long long)
+@ stdcall CM_Delete_DevNode_Key_Ex(long long long ptr)
 @ stub CM_Delete_Range
 @ stub CM_Detect_Resource_Conflict
 @ stub CM_Detect_Resource_Conflict_Ex

Modified: trunk/reactos/include/ddk/cfgmgr32.h
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ddk/cfgmgr32.h?rev=…
==============================================================================
--- trunk/reactos/include/ddk/cfgmgr32.h (original)
+++ trunk/reactos/include/ddk/cfgmgr32.h Mon Jun 12 01:56:08 2006
@@ -827,8 +827,26 @@
   IN ULONG  ulFlags,
   IN HANDLE  hMachine);
 
-/* FIXME: Obsolete CM_Delete_DevNode_Key */
-/* FIXME: Obsolete CM_Delete_DevNode_Key_Ex */
+CMAPI
+CONFIGRET
+WINAPI
+CM_Delete_DevNode_Key(
+  IN DEVNODE  dnDevNode,
+  IN ULONG  ulHardwareProfile,
+  IN ULONG  ulFlags);
+
+CMAPI
+CONFIGRET
+WINAPI
+CM_Delete_DevNode_Key_Ex(
+  IN DEVNODE  dnDevNode,
+  IN ULONG  ulHardwareProfile,
+  IN ULONG  ulFlags,
+  IN HANDLE  hMachine);
+
+#define CM_Delete_DevInst_Key CM_Delete_DevNode_Key
+#define CM_Delete_DevInst_Key_Ex CM_Delete_DevNode_Key_Ex
+
 /* FIXME: Obsolete CM_Delete_Range */
 /* FIXME: Obsolete CM_Detected_Resource_Conflict */
 /* FIXME: Obsolete CM_Detected_Resource_Conflict_Ex */

Modified: trunk/reactos/include/reactos/wine/cfgmgr32.h
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/include/reactos/wine/cfgmgr…
==============================================================================
--- trunk/reactos/include/reactos/wine/cfgmgr32.h (original)
+++ trunk/reactos/include/reactos/wine/cfgmgr32.h Mon Jun 12 01:56:08 2006
@@ -31,6 +31,8 @@
 typedef HMACHINE *PHMACHINE;
 typedef DWORD DEVINST;
 typedef DEVINST *PDEVINST;
+typedef DWORD DEVNODE;
+typedef DEVNODE *PDEVNODE;
 typedef ULONG REGDISPOSITION;
 
 typedef CHAR  *DEVINSTID_A;
@@ -207,6 +209,8 @@
 #define     CM_Create_DevNode_Ex WINELIB_NAME_AW(CM_Create_DevNode_Ex)
 CONFIGRET WINAPI CM_Delete_Class_Key( LPGUID, ULONG );
 CONFIGRET WINAPI CM_Delete_Class_Key_Ex( LPGUID, ULONG, HANDLE );
+CONFIGRET WINAPI CM_Delete_DevNode_Key( DEVNODE, ULONG, ULONG );
+CONFIGRET WINAPI CM_Delete_DevNode_Key_Ex( DEVNODE, ULONG, ULONG, HANDLE );
 CONFIGRET WINAPI CM_Disable_DevNode( DEVINST, ULONG );
 CONFIGRET WINAPI CM_Disable_DevNode_Ex( DEVINST, ULONG, HMACHINE );
 CONFIGRET WINAPI CM_Disconnect_Machine( HMACHINE );