mirror of
https://github.com/reactos/reactos.git
synced 2025-02-22 16:36:33 +00:00
[SETUPAPI] GetDeviceInstanceKeyPath: Create a new driver instance property if needed and SEH-protect calls to umpnpmgr.
This commit is contained in:
parent
5e3c8ce0c6
commit
adc9bd48b7
1 changed files with 37 additions and 11 deletions
|
@ -239,18 +239,43 @@ GetDeviceInstanceKeyPath(
|
|||
|
||||
ulTransferLength = 300 * sizeof(WCHAR);
|
||||
ulLength = 300 * sizeof(WCHAR);
|
||||
ret = PNP_GetDeviceRegProp(BindingHandle,
|
||||
pszDeviceInst,
|
||||
CM_DRP_DRIVER,
|
||||
&ulType,
|
||||
(PVOID)pszBuffer,
|
||||
&ulTransferLength,
|
||||
&ulLength,
|
||||
0);
|
||||
|
||||
RpcTryExcept
|
||||
{
|
||||
ret = PNP_GetDeviceRegProp(BindingHandle,
|
||||
pszDeviceInst,
|
||||
CM_DRP_DRIVER,
|
||||
&ulType,
|
||||
(PVOID)pszBuffer,
|
||||
&ulTransferLength,
|
||||
&ulLength,
|
||||
0);
|
||||
}
|
||||
RpcExcept(EXCEPTION_EXECUTE_HANDLER)
|
||||
{
|
||||
ret = RpcStatusToCmStatus(RpcExceptionCode());
|
||||
}
|
||||
RpcEndExcept;
|
||||
|
||||
if (ret != CR_SUCCESS)
|
||||
{
|
||||
ERR("PNP_GetDeviceRegProp() failed (Error %lu)\n", ret);
|
||||
goto done;
|
||||
RpcTryExcept
|
||||
{
|
||||
ret = PNP_GetClassInstance(BindingHandle,
|
||||
pszDeviceInst,
|
||||
(PVOID)pszBuffer,
|
||||
300);
|
||||
}
|
||||
RpcExcept(EXCEPTION_EXECUTE_HANDLER)
|
||||
{
|
||||
ret = RpcStatusToCmStatus(RpcExceptionCode());
|
||||
}
|
||||
RpcEndExcept;
|
||||
|
||||
if (ret != CR_SUCCESS)
|
||||
{
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
|
||||
TRACE("szBuffer: %S\n", pszBuffer);
|
||||
|
@ -809,7 +834,8 @@ CM_Add_Empty_Log_Conf(
|
|||
* CM_Add_Empty_Log_Conf_Ex [SETUPAPI.@]
|
||||
*/
|
||||
CONFIGRET
|
||||
WINAPI CM_Add_Empty_Log_Conf_Ex(
|
||||
WINAPI
|
||||
CM_Add_Empty_Log_Conf_Ex(
|
||||
_Out_ PLOG_CONF plcLogConf,
|
||||
_In_ DEVINST dnDevInst,
|
||||
_In_ PRIORITY Priority,
|
||||
|
|
Loading…
Reference in a new issue