[ros-diffs] [ekohl] 23242: Implement CM_Get_Log_Conf_Priority[_Ex] and add PNP_GetLogConfPriority stub.
ekohl at svn.reactos.org
ekohl at svn.reactos.org
Sun Jul 23 12:35:28 CEST 2006
Author: ekohl
Date: Sun Jul 23 14:35:27 2006
New Revision: 23242
URL: http://svn.reactos.org/svn/reactos?rev=23242&view=rev
Log:
Implement CM_Get_Log_Conf_Priority[_Ex] and add PNP_GetLogConfPriority stub.
Modified:
trunk/reactos/base/services/umpnpmgr/umpnpmgr.c
trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def
trunk/reactos/dll/win32/setupapi/cfgmgr.c
trunk/reactos/dll/win32/setupapi/setupapi.spec
trunk/reactos/include/reactos/idl/pnp.idl
trunk/reactos/include/reactos/wine/cfgmgr32.h
Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/umpnpmgr.c?rev=23242&r1=23241&r2=23242&view=diff
==============================================================================
--- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c (original)
+++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Sun Jul 23 14:35:27 2006
@@ -1325,6 +1325,27 @@
}
+/* Function 46 */
+CONFIGRET
+PNP_GetLogConfPriority(handle_t BindingHandle,
+ wchar_t *DeviceInstance,
+ ULONG ulLogConfType,
+ ULONG ulCurrentTag,
+ ULONG *pPriority,
+ ULONG ulFlags)
+{
+ CONFIGRET ret = CR_SUCCESS;
+
+ DPRINT1("PNP_GetLogConfPriority() called\n");
+
+ *pPriority = 0; /* FIXME */
+
+ DPRINT1("PNP_GetLogConfPriority() done (returns %lx)\n", ret);
+
+ return ret;
+}
+
+
/* Function 58 */
CONFIGRET
PNP_RunDetection(handle_t BindingHandle,
Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def?rev=23242&r1=23241&r2=23242&view=diff
==============================================================================
--- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def (original)
+++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def Sun Jul 23 14:35:27 2006
@@ -129,8 +129,8 @@
;CM_Get_Hardware_Profile_InfoW
;CM_Get_Hardware_Profile_Info_ExA
;CM_Get_Hardware_Profile_Info_ExW
-;CM_Get_Log_Conf_Priority
-;CM_Get_Log_Conf_Priority_Ex
+CM_Get_Log_Conf_Priority=SETUPAPI.CM_Get_Log_Conf_Priority
+CM_Get_Log_Conf_Priority_Ex=SETUPAPI.CM_Get_Log_Conf_Priority_Ex
CM_Get_Next_Log_Conf=SETUPAPI.CM_Get_Next_Log_Conf
CM_Get_Next_Log_Conf_Ex=SETUPAPI.CM_Get_Next_Log_Conf_Ex
;CM_Get_Next_Res_Des
Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.c?rev=23242&r1=23241&r2=23242&view=diff
==============================================================================
--- trunk/reactos/dll/win32/setupapi/cfgmgr.c (original)
+++ trunk/reactos/dll/win32/setupapi/cfgmgr.c Sun Jul 23 14:35:27 2006
@@ -2159,6 +2159,70 @@
return PNP_HwProfFlags(BindingHandle, PNP_GET_HW_PROFILE_FLAGS, szDevInstName,
ulHardwareProfile, pulValue, 0);
+}
+
+
+/***********************************************************************
+ * CM_Get_Log_Conf_Priority [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Get_Log_Conf_Priority(
+ LOG_CONF lcLogConf, PPRIORITY pPriority, ULONG ulFlags)
+{
+ TRACE("%p %p %lx\n", lcLogConf, pPriority, ulFlags);
+ return CM_Get_Log_Conf_Priority_Ex(lcLogConf, pPriority, ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Get_Log_Conf_Priority_Ex [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Get_Log_Conf_Priority_Ex(
+ LOG_CONF lcLogConf, PPRIORITY pPriority, ULONG ulFlags,
+ HMACHINE hMachine)
+{
+ RPC_BINDING_HANDLE BindingHandle = NULL;
+ HSTRING_TABLE StringTable = NULL;
+ PLOG_CONF_INFO pLogConfInfo;
+ LPWSTR lpDevInst;
+
+ FIXME("%p %p %lx %lx\n", lcLogConf, pPriority, ulFlags, hMachine);
+
+ pLogConfInfo = (PLOG_CONF_INFO)lcLogConf;
+ if (pLogConfInfo == NULL || pLogConfInfo->ulMagic != LOG_CONF_MAGIC)
+ return CR_INVALID_LOG_CONF;
+
+ if (pPriority == NULL)
+ return CR_INVALID_POINTER;
+
+ if (ulFlags != 0)
+ return CR_INVALID_FLAG;
+
+ if (hMachine != NULL)
+ {
+ BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle;
+ if (BindingHandle == NULL)
+ return CR_FAILURE;
+
+ StringTable = ((PMACHINE_INFO)hMachine)->StringTable;
+ if (StringTable == 0)
+ return CR_FAILURE;
+ }
+ else
+ {
+ if (!PnpGetLocalHandles(&BindingHandle, &StringTable))
+ return CR_FAILURE;
+ }
+
+ lpDevInst = StringTableStringFromId(StringTable, pLogConfInfo->dnDevInst);
+ if (lpDevInst == NULL)
+ return CR_INVALID_DEVNODE;
+
+ return PNP_GetLogConfPriority(BindingHandle,
+ lpDevInst,
+ pLogConfInfo->ulFlags,
+ pLogConfInfo->ulTag,
+ pPriority,
+ 0);
}
Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupapi.spec?rev=23242&r1=23241&r2=23242&view=diff
==============================================================================
--- trunk/reactos/dll/win32/setupapi/setupapi.spec (original)
+++ trunk/reactos/dll/win32/setupapi/setupapi.spec Sun Jul 23 14:35:27 2006
@@ -109,8 +109,8 @@
@ stub CM_Get_Hardware_Profile_InfoW
@ stub CM_Get_Hardware_Profile_Info_ExA
@ stub CM_Get_Hardware_Profile_Info_ExW
-@ stub CM_Get_Log_Conf_Priority
-@ stub CM_Get_Log_Conf_Priority_Ex
+@ stdcall CM_Get_Log_Conf_Priority(ptr ptr long)
+@ stdcall CM_Get_Log_Conf_Priority_Ex(ptr ptr long long)
@ stdcall CM_Get_Next_Log_Conf(ptr ptr long)
@ stdcall CM_Get_Next_Log_Conf_Ex(ptr ptr long long)
@ stub CM_Get_Next_Res_Des
Modified: trunk/reactos/include/reactos/idl/pnp.idl
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.idl?rev=23242&r1=23241&r2=23242&view=diff
==============================================================================
--- trunk/reactos/include/reactos/idl/pnp.idl (original)
+++ trunk/reactos/include/reactos/idl/pnp.idl Sun Jul 23 14:35:27 2006
@@ -227,6 +227,14 @@
[out] ULONG *pulNextTag,
[in] ULONG ulFlags);
+ /* Function 46 */
+ CONFIGRET PNP_GetLogConfPriority(handle_t BindingHandle,
+ [in, string] wchar_t *DeviceInstance,
+ [in] ULONG ulLogConfType,
+ [in] ULONG ulCurrentTag,
+ [out] ULONG *pPriority,
+ [in] ULONG ulFlags);
+
/* Function 58 */
CONFIGRET PNP_RunDetection(handle_t BindingHandle,
[in] unsigned long Flags);
Modified: trunk/reactos/include/reactos/wine/cfgmgr32.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/cfgmgr32.h?rev=23242&r1=23241&r2=23242&view=diff
==============================================================================
--- trunk/reactos/include/reactos/wine/cfgmgr32.h (original)
+++ trunk/reactos/include/reactos/wine/cfgmgr32.h Sun Jul 23 14:35:27 2006
@@ -307,6 +307,8 @@
CONFIGRET WINAPI CM_Get_HW_Prof_Flags_ExA( DEVINSTID_A, ULONG, PULONG, ULONG, HMACHINE );
CONFIGRET WINAPI CM_Get_HW_Prof_Flags_ExW( DEVINSTID_W, ULONG, PULONG, ULONG, HMACHINE );
#define CM_Get_HW_Prof_Flags_Ex WINELIB_NAME_AW(CM_Get_HW_Prof_Flags_Ex)
+CONFIGRET WINAPI CM_Get_Log_Conf_Priority( LOG_CONF, PPRIORITY, ULONG );
+CONFIGRET WINAPI CM_Get_Log_Conf_Priority_Ex( LOG_CONF, PPRIORITY, ULONG, HMACHINE );
CONFIGRET WINAPI CM_Get_Next_Log_Conf( PLOG_CONF, LOG_CONF, ULONG );
CONFIGRET WINAPI CM_Get_Next_Log_Conf_Ex( PLOG_CONF, LOG_CONF, ULONG, HMACHINE );
CONFIGRET WINAPI CM_Get_Parent( PDEVINST, DEVINST, ULONG );
More information about the Ros-diffs
mailing list