[ros-diffs] [ekohl] 22777: Implement CM_Open_DevNode_Key and add CM_Open_DevNode_Key_Ex stub.

Author: ekohl
Date: Sun Jul  2 23:20:45 2006
New Revision: 22777

URL: http://svn.reactos.org/svn/reactos?rev=22777&view=rev
Log:
Implement CM_Open_DevNode_Key and add CM_Open_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.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr3…
==============================================================================
--- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def (original)
+++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def Sun Jul  2 23:20:45 2006
@@ -159,8 +159,8 @@
 CM_Open_Class_KeyW(a)24=SETUPAPI.CM_Open_Class_KeyW
 CM_Open_Class_Key_ExA(a)28=SETUPAPI.CM_Open_Class_Key_ExA
 CM_Open_Class_Key_ExW(a)28=SETUPAPI.CM_Open_Class_Key_ExW
-;CM_Open_DevNode_Key
-;CM_Open_DevNode_Key_Ex
+CM_Open_DevNode_Key(a)24=SETUPAPI.CM_Open_DevNode_Key
+CM_Open_DevNode_Key_Ex(a)28=SETUPAPI.CM_Open_DevNode_Key_Ex
 ;CM_Query_Arbitrator_Free_Data
 ;CM_Query_Arbitrator_Free_Data_Ex
 ;CM_Query_Arbitrator_Free_Size

Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.…
==============================================================================
--- trunk/reactos/dll/win32/setupapi/cfgmgr.c (original)
+++ trunk/reactos/dll/win32/setupapi/cfgmgr.c Sun Jul  2 23:20:45 2006
@@ -2478,6 +2478,35 @@
     }
 
     return CR_SUCCESS;
+}
+
+
+/***********************************************************************
+ * CM_Open_DevNode_Key [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Open_DevNode_Key(
+    DEVINST dnDevNode, REGSAM samDesired, ULONG ulHardwareProfile,
+    REGDISPOSITION Disposition, PHKEY phkDevice, ULONG ulFlags)
+{
+    TRACE("%lx %lx %lu %lx %p %lx\n", dnDevNode, samDesired,
+          ulHardwareProfile, Disposition, phkDevice, ulFlags);
+    return CM_Open_DevNode_Key_Ex(dnDevNode, samDesired, ulHardwareProfile,
+                                  Disposition, phkDevice, ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Open_DevNode_Key_Ex [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Open_DevNode_Key_Ex(
+    DEVINST dnDevNode, REGSAM samDesired, ULONG ulHardwareProfile,
+    REGDISPOSITION Disposition, PHKEY phkDevice, ULONG ulFlags,
+    HMACHINE hMachine)
+{
+    FIXME("%lx %lx %lu %lx %p %lx %lx\n", dnDevNode, samDesired,
+          ulHardwareProfile, Disposition, phkDevice, ulFlags, hMachine);
+
+    return CR_CALL_NOT_IMPLEMENTED;
 }
 
 

Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap…
==============================================================================
--- trunk/reactos/dll/win32/setupapi/setupapi.spec (original)
+++ trunk/reactos/dll/win32/setupapi/setupapi.spec Sun Jul  2 23:20:45 2006
@@ -143,8 +143,8 @@
 @ stdcall CM_Open_Class_KeyW(ptr wstr long long ptr long)
 @ stdcall CM_Open_Class_Key_ExA(ptr str long long ptr long long)
 @ stdcall CM_Open_Class_Key_ExW(ptr wstr long long ptr long long)
-@ stub CM_Open_DevNode_Key
-@ stub CM_Open_DevNode_Key_Ex
+@ stdcall CM_Open_DevNode_Key(ptr long long long ptr long)
+@ stdcall CM_Open_DevNode_Key_Ex(ptr long long long ptr long long)
 @ stub CM_Query_Arbitrator_Free_Data
 @ stub CM_Query_Arbitrator_Free_Data_Ex
 @ stub CM_Query_Arbitrator_Free_Size

Modified: trunk/reactos/include/ddk/cfgmgr32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/cfgmgr32.h?rev…
==============================================================================
--- trunk/reactos/include/ddk/cfgmgr32.h (original)
+++ trunk/reactos/include/ddk/cfgmgr32.h Sun Jul  2 23:20:45 2006
@@ -1804,8 +1804,31 @@
 #define CM_Open_Class_Key_Ex CM_Open_Class_Key_ExA
 #endif /* UNICODE */
 
-/* FIXME: Obsolete CM_Open_DevNode_Key */
-/* FIXME: Obsolete CM_Open_DevNode_Key_Ex */
+CMAPI
+CONFIGRET
+WINAPI
+CM_Open_DevNode_Key(
+  IN DEVINST  dnDevNode,
+  IN REGSAM  samDesired,
+  IN ULONG  ulHardwareProfile,
+  IN REGDISPOSITION  Disposition,
+  OUT PHKEY  phkDevice,
+  IN ULONG  ulFlags);
+
+CMAPI
+CONFIGRET
+WINAPI
+CM_Open_DevNode_Key_Ex(
+  IN DEVINST  dnDevNode,
+  IN REGSAM  samDesired,
+  IN ULONG  ulHardwareProfile,
+  IN REGDISPOSITION  Disposition,
+  OUT PHKEY  phkDevice,
+  IN ULONG  ulFlags,
+  IN HMACHINE  hMachine);
+
+#define CM_Open_DevInst_Key CM_Open_DevNode_Key
+#define CM_Open_DevInst_Key_Ex CM_Open_DevNode_Key_Ex
 
 /* CM_Query_And_Remove_SubTree.ulFlags constants */
 #define CM_REMOVE_UI_OK             			0x00000000

Modified: trunk/reactos/include/reactos/wine/cfgmgr32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/cfgmg…
==============================================================================
--- trunk/reactos/include/reactos/wine/cfgmgr32.h (original)
+++ trunk/reactos/include/reactos/wine/cfgmgr32.h Sun Jul  2 23:20:45 2006
@@ -304,6 +304,8 @@
 CONFIGRET WINAPI CM_Open_Class_Key_ExA( LPGUID, LPCSTR, REGSAM, REGDISPOSITION, PHKEY,
ULONG, HMACHINE );
 CONFIGRET WINAPI CM_Open_Class_Key_ExW( LPGUID, LPCWSTR, REGSAM, REGDISPOSITION, PHKEY,
ULONG, HMACHINE );
 #define     CM_Open_Class_Key_Ex WINELIB_NAME_AW(CM_Open_Class_Key_Ex)
+CONFIGRET WINAPI CM_Open_DevNode_Key( DEVINST, REGSAM, ULONG, REGDISPOSITION, PHKEY,
ULONG );
+CONFIGRET WINAPI CM_Open_DevNode_Key_Ex( DEVINST, REGSAM, ULONG, REGDISPOSITION, PHKEY,
ULONG, HMACHINE );
 
 CONFIGRET WINAPI CM_Reenumerate_DevNode( DEVINST, ULONG );
 CONFIGRET WINAPI CM_Reenumerate_DevNode_Ex( DEVINST, ULONG, HMACHINE );