[SETUPAPI]

[reactos.git] / reactos / dll / win32 / setupapi / cfgmgr.c

diff --git a/reactos/dll/win32/setupapi/cfgmgr.c b/reactos/dll/win32/setupapi/cfgmgr.c
index 231ad9a..684853f 100644 (file)
--- a/reactos/dll/win32/setupapi/cfgmgr.c
+++ b/reactos/dll/win32/setupapi/cfgmgr.c
@@ -76,6 +76,13 @@ static BOOL GuidToString(LPGUID Guid, LPWSTR String)
 }
 
 
+static CONFIGRET
+RpcStatusToCmStatus(RPC_STATUS Status)
+{
+    return CR_FAILURE;
+}
+
+
 /***********************************************************************
  * CMP_WaitNoPendingInstallEvents [SETUPAPI.@]
  */
@@ -102,6 +109,7 @@ CONFIGRET WINAPI CMP_Init_Detection(
     DWORD dwMagic)
 {
     RPC_BINDING_HANDLE BindingHandle = NULL;
+    CONFIGRET ret;
 
     TRACE("%lu\n", dwMagic);
 
@@ -111,7 +119,17 @@ CONFIGRET WINAPI CMP_Init_Detection(
     if (!PnpGetLocalHandles(&BindingHandle, NULL))
         return CR_FAILURE;
 
-    return PNP_InitDetection(BindingHandle);
+    RpcTryExcept
+    {
+        ret = PNP_InitDetection(BindingHandle);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -135,13 +153,22 @@ CONFIGRET WINAPI CMP_Report_LogOn(
     if (!PnpGetLocalHandles(&BindingHandle, NULL))
         return CR_FAILURE;
 
-    bAdmin = IsUserAnAdmin();
+    bAdmin = IsUserAdmin();
 
     for (i = 0; i < 30; i++)
     {
-        ret = PNP_ReportLogOn(BindingHandle,
-                              bAdmin,
-                              dwProcessId);
+        RpcTryExcept
+        {
+            ret = PNP_ReportLogOn(BindingHandle,
+                                  bAdmin,
+                                  dwProcessId);
+        }
+        RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+        {
+            ret = RpcStatusToCmStatus(RpcExceptionCode());
+        }
+        RpcEndExcept;
+
         if (ret == CR_SUCCESS)
             break;
 
@@ -152,6 +179,34 @@ CONFIGRET WINAPI CMP_Report_LogOn(
 }
 
 
+/***********************************************************************
+ * CMP_WaitServicesAvailable [SETUPAPI.@]
+ */
+CONFIGRET
+WINAPI
+CMP_WaitServicesAvailable(HMACHINE hMachine)
+{
+    RPC_BINDING_HANDLE BindingHandle = NULL;
+    CONFIGRET ret = CR_SUCCESS;
+    WORD Version;
+
+    if (!PnpGetLocalHandles(&BindingHandle, NULL))
+        return CR_FAILURE;
+
+    RpcTryExcept
+    {
+        ret = PNP_GetVersion(BindingHandle, &Version);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
+}
+
+
 /***********************************************************************
  * CM_Add_Empty_Log_Conf [SETUPAPI.@]
  */
@@ -182,7 +237,7 @@ CONFIGRET WINAPI CM_Add_Empty_Log_Conf_Ex(
     FIXME("%p %p %lu %lx %p\n",
           plcLogConf, dnDevInst, Priority, ulFlags, hMachine);
 
-    if (!IsUserAnAdmin())
+    if (!IsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (plcLogConf == NULL)
@@ -217,7 +272,17 @@ CONFIGRET WINAPI CM_Add_Empty_Log_Conf_Ex(
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
-    ret = PNP_AddEmptyLogConf(BindingHandle, lpDevInst, Priority, &ulLogConfTag, ulFlags);
+    RpcTryExcept
+    {
+        ret = PNP_AddEmptyLogConf(BindingHandle, lpDevInst, Priority,
+                                  &ulLogConfTag, ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
     if (ret == CR_SUCCESS)
     {
         pLogConfInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_CONF_INFO));
@@ -295,10 +360,11 @@ CONFIGRET WINAPI CM_Add_ID_ExW(
     RPC_BINDING_HANDLE BindingHandle = NULL;
     HSTRING_TABLE StringTable = NULL;
     LPWSTR lpDevInst;
+    CONFIGRET ret;
 
     TRACE("%p %s %lx %p\n", dnDevInst, debugstr_w(pszID), ulFlags, hMachine);
 
-    if (!IsUserAnAdmin())
+    if (!IsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (dnDevInst == 0)
@@ -330,10 +396,20 @@ CONFIGRET WINAPI CM_Add_ID_ExW(
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
-    return PNP_AddID(BindingHandle,
-                     lpDevInst,
-                     pszID,
-                     ulFlags);
+    RpcTryExcept
+    {
+        ret = PNP_AddID(BindingHandle,
+                        lpDevInst,
+                        pszID,
+                        ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -495,7 +571,7 @@ CONFIGRET WINAPI CM_Create_DevNode_ExW(
     FIXME("%p %s %p %lx %p\n",
           pdnDevInst, debugstr_w(pDeviceID), dnParent, ulFlags, hMachine);
 
-    if (!IsUserAnAdmin())
+    if (!IsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (pdnDevInst == NULL)
@@ -530,11 +606,20 @@ CONFIGRET WINAPI CM_Create_DevNode_ExW(
     if (lpParentDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
-    ret = PNP_CreateDevInst(BindingHandle,
-                            pDeviceID,
-                            lpParentDevInst,
-                            MAX_DEVICE_ID_LEN,
-                            ulFlags);
+    RpcTryExcept
+    {
+        ret = PNP_CreateDevInst(BindingHandle,
+                                pDeviceID,
+                                lpParentDevInst,
+                                MAX_DEVICE_ID_LEN,
+                                ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
     if (ret == CR_SUCCESS)
     {
         *pdnDevInst = StringTableAddString(StringTable, pDeviceID, 1);
@@ -565,6 +650,7 @@ CONFIGRET WINAPI CM_Delete_Class_Key_Ex(
 {
     WCHAR szGuidString[MAX_GUID_STRING_LEN];
     RPC_BINDING_HANDLE BindingHandle = NULL;
+    CONFIGRET ret;
 
     TRACE("%p %lx %lx\n", ClassGuid, ulFlags, hMachine);
 
@@ -589,11 +675,22 @@ CONFIGRET WINAPI CM_Delete_Class_Key_Ex(
             return CR_FAILURE;
     }
 
-    return PNP_DeleteClassKey(BindingHandle,
-                             szGuidString,
-                             ulFlags);
+    RpcTryExcept
+    {
+        ret = PNP_DeleteClassKey(BindingHandle,
+                                 szGuidString,
+                                 ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
+
 /***********************************************************************
  * CM_Delete_DevNode_Key [SETUPAPI.@]
  */
@@ -605,6 +702,7 @@ CONFIGRET WINAPI CM_Delete_DevNode_Key(
                                     NULL);
 }
 
+
 /***********************************************************************
  * CM_Delete_DevNode_Key_Ex [SETUPAPI.@]
  */
@@ -639,10 +737,11 @@ CONFIGRET WINAPI CM_Disable_DevNode_Ex(
     RPC_BINDING_HANDLE BindingHandle = NULL;
     HSTRING_TABLE StringTable = NULL;
     LPWSTR lpDevInst;
+    CONFIGRET ret;
 
     FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine);
 
-    if (!IsUserAnAdmin())
+    if (!IsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (dnDevInst == 0)
@@ -671,11 +770,21 @@ CONFIGRET WINAPI CM_Disable_DevNode_Ex(
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
-    return PNP_DeviceInstanceAction(BindingHandle,
-                                    5,
-                                    ulFlags,
-                                    lpDevInst,
-                                    NULL);
+    RpcTryExcept
+    {
+        ret = PNP_DeviceInstanceAction(BindingHandle,
+                                       PNP_DEVINST_DISABLE,
+                                       ulFlags,
+                                       lpDevInst,
+                                       NULL);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -727,10 +836,11 @@ CONFIGRET WINAPI CM_Enable_DevNode_Ex(
     RPC_BINDING_HANDLE BindingHandle = NULL;
     HSTRING_TABLE StringTable = NULL;
     LPWSTR lpDevInst;
+    CONFIGRET ret;
 
-    FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine);
+    TRACE("%p %lx %p\n", dnDevInst, ulFlags, hMachine);
 
-    if (!IsUserAnAdmin())
+    if (!IsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (dnDevInst == 0)
@@ -759,11 +869,21 @@ CONFIGRET WINAPI CM_Enable_DevNode_Ex(
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
-    return PNP_DeviceInstanceAction(BindingHandle,
-                                    4,
-                                    ulFlags,
-                                    lpDevInst,
-                                    NULL);
+    RpcTryExcept
+    {
+        ret = PNP_DeviceInstanceAction(BindingHandle,
+                                       PNP_DEVINST_ENABLE,
+                                       ulFlags,
+                                       lpDevInst,
+                                       NULL);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -809,13 +929,22 @@ CONFIGRET WINAPI CM_Enumerate_Classes_Ex(
             return CR_FAILURE;
     }
 
-    ret = PNP_EnumerateSubKeys(BindingHandle,
-                               PNP_BRANCH_CLASS,
-                               ulClassIndex,
-                               szBuffer,
-                               MAX_GUID_STRING_LEN,
-                               &ulLength,
-                               ulFlags);
+    RpcTryExcept
+    {
+        ret = PNP_EnumerateSubKeys(BindingHandle,
+                                   PNP_CLASS_SUBKEYS,
+                                   ulClassIndex,
+                                   szBuffer,
+                                   MAX_GUID_STRING_LEN,
+                                   &ulLength,
+                                   ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
     if (ret == CR_SUCCESS)
     {
         /* Remove the {} */
@@ -908,6 +1037,7 @@ CONFIGRET WINAPI CM_Enumerate_Enumerators_ExW(
     HMACHINE hMachine)
 {
     RPC_BINDING_HANDLE BindingHandle = NULL;
+    CONFIGRET ret;
 
     TRACE("%lu %p %p %lx %lx\n", ulEnumIndex, Buffer, pulLength, ulFlags,
           hMachine);
@@ -932,13 +1062,23 @@ CONFIGRET WINAPI CM_Enumerate_Enumerators_ExW(
             return CR_FAILURE;
     }
 
-    return PNP_EnumerateSubKeys(BindingHandle,
-                                PNP_BRANCH_ENUM,
-                                ulEnumIndex,
-                                Buffer,
-                                *pulLength,
-                                pulLength,
-                                ulFlags);
+    RpcTryExcept
+    {
+        ret = PNP_EnumerateSubKeys(BindingHandle,
+                                   PNP_ENUMERATOR_SUBKEYS,
+                                   ulEnumIndex,
+                                   Buffer,
+                                   *pulLength,
+                                   pulLength,
+                                   ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -963,10 +1103,11 @@ CONFIGRET WINAPI CM_Free_Log_Conf_Ex(
     HSTRING_TABLE StringTable = NULL;
     LPWSTR lpDevInst;
     PLOG_CONF_INFO pLogConfInfo;
+    CONFIGRET ret;
 
     TRACE("%lx %lx %lx\n", lcLogConfToBeFreed, ulFlags, hMachine);
 
-    if (!IsUserAnAdmin())
+    if (!IsUserAdmin())
         return CR_ACCESS_DENIED;
 
     pLogConfInfo = (PLOG_CONF_INFO)lcLogConfToBeFreed;
@@ -996,8 +1137,18 @@ CONFIGRET WINAPI CM_Free_Log_Conf_Ex(
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
-    return PNP_FreeLogConf(BindingHandle, lpDevInst, pLogConfInfo->ulFlags,
-                           pLogConfInfo->ulTag, 0);
+    RpcTryExcept
+    {
+        ret = PNP_FreeLogConf(BindingHandle, lpDevInst, pLogConfInfo->ulFlags,
+                              pLogConfInfo->ulTag, 0);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -1042,7 +1193,7 @@ CONFIGRET WINAPI CM_Get_Child_Ex(
     RPC_BINDING_HANDLE BindingHandle = NULL;
     HSTRING_TABLE StringTable = NULL;
     LPWSTR lpDevInst;
-    DWORD dwIndex;
+    DWORD dwIndex, dwLength = MAX_DEVICE_ID_LEN;
     CONFIGRET ret;
 
     TRACE("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine);
@@ -1078,12 +1229,21 @@ CONFIGRET WINAPI CM_Get_Child_Ex(
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
-    ret = PNP_GetRelatedDeviceInstance(BindingHandle,
-                                       PNP_DEVICE_CHILD,
-                                       lpDevInst,
-                                       szRelatedDevInst,
-                                       MAX_DEVICE_ID_LEN,
-                                       0);
+    RpcTryExcept
+    {
+        ret = PNP_GetRelatedDeviceInstance(BindingHandle,
+                                           PNP_GET_CHILD_DEVICE_INSTANCE,
+                                           lpDevInst,
+                                           szRelatedDevInst,
+                                           &dwLength,
+                                           0);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
     if (ret != CR_SUCCESS)
         return ret;
 
@@ -1276,6 +1436,7 @@ CM_Get_Class_Name_ExW(
 {
     WCHAR szGuidString[MAX_GUID_STRING_LEN];
     RPC_BINDING_HANDLE BindingHandle = NULL;
+    CONFIGRET ret;
 
     TRACE("%p %p %p %lx %lx\n",
           ClassGuid, Buffer, pulLength, ulFlags, hMachine);
@@ -1303,11 +1464,21 @@ CM_Get_Class_Name_ExW(
             return CR_FAILURE;
     }
 
-    return PNP_GetClassName(BindingHandle,
-                            szGuidString,
-                            Buffer,
-                            pulLength,
-                            ulFlags);
+    RpcTryExcept
+    {
+        ret = PNP_GetClassName(BindingHandle,
+                               szGuidString,
+                               Buffer,
+                               pulLength,
+                               ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -1331,6 +1502,7 @@ CONFIGRET WINAPI CM_Get_Depth_Ex(
     RPC_BINDING_HANDLE BindingHandle = NULL;
     HSTRING_TABLE StringTable = NULL;
     LPWSTR lpDevInst;
+    CONFIGRET ret;
 
     TRACE("%p %lx %lx %lx\n",
           pulDepth, dnDevInst, ulFlags, hMachine);
@@ -1364,10 +1536,20 @@ CONFIGRET WINAPI CM_Get_Depth_Ex(
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
-    return PNP_GetDepth(BindingHandle,
-                        lpDevInst,
-                        pulDepth,
-                        ulFlags);
+    RpcTryExcept
+    {
+        ret = PNP_GetDepth(BindingHandle,
+                           lpDevInst,
+                           pulDepth,
+                           ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -1532,14 +1714,24 @@ CONFIGRET WINAPI CM_Get_DevNode_Registry_Property_ExW(
         return CR_INVALID_DEVNODE;
 
     ulTransferLength = *pulLength;
-    ret = PNP_GetDeviceRegProp(BindingHandle,
-                               lpDevInst,
-                               ulProperty,
-                               &ulDataType,
-                               Buffer,
-                               &ulTransferLength,
-                               pulLength,
-                               ulFlags);
+
+    RpcTryExcept
+    {
+        ret = PNP_GetDeviceRegProp(BindingHandle,
+                                   lpDevInst,
+                                   ulProperty,
+                                   &ulDataType,
+                                   Buffer,
+                                   &ulTransferLength,
+                                   pulLength,
+                                   ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
     if (ret == CR_SUCCESS)
     {
         if (pulRegDataType != NULL)
@@ -1575,6 +1767,7 @@ CM_Get_DevNode_Status_Ex(
     RPC_BINDING_HANDLE BindingHandle = NULL;
     HSTRING_TABLE StringTable = NULL;
     LPWSTR lpDevInst;
+    CONFIGRET ret;
 
     TRACE("%p %p %lx %lx %lx\n",
           pulStatus, pulProblemNumber, dnDevInst, ulFlags, hMachine);
@@ -1608,11 +1801,21 @@ CM_Get_DevNode_Status_Ex(
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
-    return PNP_GetDeviceStatus(BindingHandle,
-                               lpDevInst,
-                               pulStatus,
-                               pulProblemNumber,
-                               ulFlags);
+    RpcTryExcept
+    {
+        ret = PNP_GetDeviceStatus(BindingHandle,
+                                  lpDevInst,
+                                  pulStatus,
+                                  pulProblemNumber,
+                                  ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -1650,7 +1853,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_ExA(
     WCHAR szBufferW[MAX_DEVICE_ID_LEN];
     CONFIGRET ret = CR_SUCCESS;
 
-    FIXME("%lx %p %ld %ld %lx\n",
+    TRACE("%lx %p %ld %ld %lx\n",
           dnDevInst, Buffer, BufferLen, ulFlags, hMachine);
 
     if (Buffer == NULL)
@@ -1756,7 +1959,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_ExA(
     LPWSTR pszFilterW = NULL;
     CONFIGRET ret = CR_SUCCESS;
 
-    FIXME("%p %p %ld %ld %lx\n",
+    TRACE("%p %p %ld %ld %lx\n",
           pszFilter, Buffer, BufferLen, ulFlags, hMachine);
 
     BufferW = MyMalloc(BufferLen * sizeof(WCHAR));
@@ -1812,10 +2015,47 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_ExW(
     PCWSTR pszFilter, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags,
     HMACHINE hMachine)
 {
-    FIXME("%p %p %ld %ld %lx\n",
+    RPC_BINDING_HANDLE BindingHandle = NULL;
+    CONFIGRET ret;
+
+    TRACE("%p %p %ld %ld %lx\n",
           pszFilter, Buffer, BufferLen, ulFlags, hMachine);
-    memset(Buffer,0,2);
-    return CR_SUCCESS;
+
+    if (Buffer == NULL || BufferLen == 0)
+        return CR_INVALID_POINTER;
+
+    if (ulFlags & ~CM_GETIDLIST_FILTER_BITS)
+        return CR_INVALID_FLAG;
+
+    if (hMachine != NULL)
+    {
+        BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle;
+        if (BindingHandle == NULL)
+            return CR_FAILURE;
+    }
+    else
+    {
+        if (!PnpGetLocalHandles(&BindingHandle, NULL))
+            return CR_FAILURE;
+    }
+
+    *Buffer = 0;
+
+    RpcTryExcept
+    {
+        ret = PNP_GetDeviceList(BindingHandle,
+                                (LPWSTR)pszFilter,
+                                Buffer,
+                                &BufferLen,
+                                ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -1883,6 +2123,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_Size_ExW(
     PULONG pulLen, PCWSTR pszFilter, ULONG ulFlags, HMACHINE hMachine)
 {
     RPC_BINDING_HANDLE BindingHandle = NULL;
+    CONFIGRET ret;
 
     FIXME("%p %s %ld %lx\n", pulLen, debugstr_w(pszFilter), ulFlags, hMachine);
 
@@ -1906,10 +2147,20 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_Size_ExW(
 
     *pulLen = 0;
 
-    return PNP_GetDeviceListSize(BindingHandle,
-                                 (LPWSTR)pszFilter,
-                                 pulLen,
-                                 ulFlags);
+    RpcTryExcept
+    {
+        ret = PNP_GetDeviceListSize(BindingHandle,
+                                    (LPWSTR)pszFilter,
+                                    pulLen,
+                                    ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -2024,24 +2275,36 @@ CONFIGRET WINAPI CM_Get_First_Log_Conf_Ex(
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
-    ret = PNP_GetFirstLogConf(BindingHandle,
-                              lpDevInst,
-                              ulFlags,
-                              &ulTag,
-                              ulFlags);
+    RpcTryExcept
+    {
+        ret = PNP_GetFirstLogConf(BindingHandle,
+                                  lpDevInst,
+                                  ulFlags,
+                                  &ulTag,
+                                  ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
     if (ret != CR_SUCCESS)
         return ret;
 
-    pLogConfInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_CONF_INFO));
-    if (pLogConfInfo == NULL)
-        return CR_OUT_OF_MEMORY;
+    if (plcLogConf)
+    {
+        pLogConfInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_CONF_INFO));
+        if (pLogConfInfo == NULL)
+            return CR_OUT_OF_MEMORY;
 
-    pLogConfInfo->ulMagic = LOG_CONF_MAGIC;
-    pLogConfInfo->dnDevInst = dnDevInst;
-    pLogConfInfo->ulFlags = ulFlags;
-    pLogConfInfo->ulTag = ulTag;
+        pLogConfInfo->ulMagic = LOG_CONF_MAGIC;
+        pLogConfInfo->dnDevInst = dnDevInst;
+        pLogConfInfo->ulFlags = ulFlags;
+        pLogConfInfo->ulTag = ulTag;
 
-    *plcLogConf = (LOG_CONF)pLogConfInfo;
+        *plcLogConf = (LOG_CONF)pLogConfInfo;
+    }
 
     return CR_SUCCESS;
 }
@@ -2065,6 +2328,7 @@ CONFIGRET WINAPI CM_Get_Global_State_Ex(
     PULONG pulState, ULONG ulFlags, HMACHINE hMachine)
 {
     RPC_BINDING_HANDLE BindingHandle = NULL;
+    CONFIGRET ret;
 
     TRACE("%p %lx %lx\n", pulState, ulFlags, hMachine);
 
@@ -2086,7 +2350,17 @@ CONFIGRET WINAPI CM_Get_Global_State_Ex(
             return CR_FAILURE;
     }
 
-    return PNP_GetGlobalState(BindingHandle, pulState, ulFlags);
+    RpcTryExcept
+    {
+        ret = PNP_GetGlobalState(BindingHandle, pulState, ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -2157,6 +2431,7 @@ CONFIGRET WINAPI CM_Get_HW_Prof_Flags_ExW(
     ULONG ulFlags, HMACHINE hMachine)
 {
     RPC_BINDING_HANDLE BindingHandle = NULL;
+    CONFIGRET ret;
 
     FIXME("%s %lu %p %lx %lx\n", debugstr_w(szDevInstName),
           ulHardwareProfile, pulValue, ulFlags, hMachine);
@@ -2181,8 +2456,18 @@ CONFIGRET WINAPI CM_Get_HW_Prof_Flags_ExW(
             return CR_FAILURE;
     }
 
-    return PNP_HwProfFlags(BindingHandle, PNP_GET_HW_PROFILE_FLAGS, szDevInstName,
-                           ulHardwareProfile, pulValue, 0);
+    RpcTryExcept
+    {
+        ret = PNP_HwProfFlags(BindingHandle, PNP_GET_HWPROFFLAGS, szDevInstName,
+                              ulHardwareProfile, pulValue, NULL, NULL, 0, 0);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -2208,6 +2493,7 @@ CONFIGRET WINAPI CM_Get_Log_Conf_Priority_Ex(
     HSTRING_TABLE StringTable = NULL;
     PLOG_CONF_INFO pLogConfInfo;
     LPWSTR lpDevInst;
+    CONFIGRET ret;
 
     FIXME("%p %p %lx %lx\n", lcLogConf, pPriority, ulFlags, hMachine);
 
@@ -2241,12 +2527,22 @@ CONFIGRET WINAPI CM_Get_Log_Conf_Priority_Ex(
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
-    return PNP_GetLogConfPriority(BindingHandle,
-                                  lpDevInst,
-                                  pLogConfInfo->ulFlags,
-                                  pLogConfInfo->ulTag,
-                                  pPriority,
-                                  0);
+    RpcTryExcept
+    {
+        ret = PNP_GetLogConfPriority(BindingHandle,
+                                     lpDevInst,
+                                     pLogConfInfo->ulFlags,
+                                     pLogConfInfo->ulTag,
+                                     pPriority,
+                                     0);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -2308,12 +2604,21 @@ CONFIGRET WINAPI CM_Get_Next_Log_Conf_Ex(
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
-    ret = PNP_GetNextLogConf(BindingHandle,
-                             lpDevInst,
-                             pLogConfInfo->ulFlags,
-                             pLogConfInfo->ulTag,
-                             &ulNewTag,
-                             0);
+    RpcTryExcept
+    {
+        ret = PNP_GetNextLogConf(BindingHandle,
+                                 lpDevInst,
+                                 pLogConfInfo->ulFlags,
+                                 pLogConfInfo->ulTag,
+                                 &ulNewTag,
+                                 0);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
     if (ret != CR_SUCCESS)
         return ret;
 
@@ -2356,7 +2661,7 @@ CONFIGRET WINAPI CM_Get_Parent_Ex(
     RPC_BINDING_HANDLE BindingHandle = NULL;
     HSTRING_TABLE StringTable = NULL;
     LPWSTR lpDevInst;
-    DWORD dwIndex;
+    DWORD dwIndex, dwLength = MAX_DEVICE_ID_LEN;
     CONFIGRET ret;
 
     TRACE("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine);
@@ -2392,12 +2697,21 @@ CONFIGRET WINAPI CM_Get_Parent_Ex(
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
-    ret = PNP_GetRelatedDeviceInstance(BindingHandle,
-                                       PNP_DEVICE_PARENT,
-                                       lpDevInst,
-                                       szRelatedDevInst,
-                                       MAX_DEVICE_ID_LEN,
-                                       0);
+    RpcTryExcept
+    {
+        ret = PNP_GetRelatedDeviceInstance(BindingHandle,
+                                           PNP_GET_PARENT_DEVICE_INSTANCE,
+                                           lpDevInst,
+                                           szRelatedDevInst,
+                                           &dwLength,
+                                           0);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
     if (ret != CR_SUCCESS)
         return ret;
 
@@ -2434,7 +2748,7 @@ CONFIGRET WINAPI CM_Get_Sibling_Ex(
     RPC_BINDING_HANDLE BindingHandle = NULL;
     HSTRING_TABLE StringTable = NULL;
     LPWSTR lpDevInst;
-    DWORD dwIndex;
+    DWORD dwIndex, dwLength = MAX_DEVICE_ID_LEN;
     CONFIGRET ret;
 
     TRACE("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine);
@@ -2470,12 +2784,21 @@ CONFIGRET WINAPI CM_Get_Sibling_Ex(
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
-    ret = PNP_GetRelatedDeviceInstance(BindingHandle,
-                                       PNP_DEVICE_SIBLING,
-                                       lpDevInst,
-                                       szRelatedDevInst,
-                                       MAX_DEVICE_ID_LEN,
-                                       0);
+    RpcTryExcept
+    {
+        ret = PNP_GetRelatedDeviceInstance(BindingHandle,
+                                           PNP_GET_SIBLING_DEVICE_INSTANCE,
+                                           lpDevInst,
+                                           szRelatedDevInst,
+                                           &dwLength,
+                                           0);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
     if (ret != CR_SUCCESS)
         return ret;
 
@@ -2508,6 +2831,7 @@ WORD WINAPI CM_Get_Version_Ex(HMACHINE hMachine)
 {
     RPC_BINDING_HANDLE BindingHandle = NULL;
     WORD Version = 0;
+    CONFIGRET ret;
 
     TRACE("%lx\n", hMachine);
 
@@ -2523,7 +2847,17 @@ WORD WINAPI CM_Get_Version_Ex(HMACHINE hMachine)
             return CR_FAILURE;
     }
 
-    if (PNP_GetVersion(BindingHandle, &Version) != CR_SUCCESS)
+    RpcTryExcept
+    {
+        ret = PNP_GetVersion(BindingHandle, &Version);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    if (ret != CR_SUCCESS)
         return 0;
 
     return Version;
@@ -2548,6 +2882,7 @@ CONFIGRET WINAPI CM_Is_Dock_Station_Present_Ex(
     PBOOL pbPresent, HMACHINE hMachine)
 {
     RPC_BINDING_HANDLE BindingHandle = NULL;
+    CONFIGRET ret;
 
     TRACE("%p %lx\n", pbPresent, hMachine);
 
@@ -2568,8 +2903,73 @@ CONFIGRET WINAPI CM_Is_Dock_Station_Present_Ex(
             return CR_FAILURE;
     }
 
-    return PNP_IsDockStationPresent(BindingHandle,
-                                    (unsigned long *)pbPresent);
+    RpcTryExcept
+    {
+        ret = PNP_IsDockStationPresent(BindingHandle,
+                                       pbPresent);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
+}
+
+
+/***********************************************************************
+ * CM_Is_Version_Available_Ex [SETUPAPI.@]
+ */
+BOOL WINAPI CM_Is_Version_Available(
+     WORD wVersion)
+{
+    TRACE("%hu\n", wVersion);
+    return CM_Is_Version_Available_Ex(wVersion, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Is_Version_Available_Ex [SETUPAPI.@]
+ */
+BOOL WINAPI CM_Is_Version_Available_Ex(
+    WORD wVersion, HMACHINE hMachine)
+{
+    RPC_BINDING_HANDLE BindingHandle = NULL;
+    WORD wServerVersion;
+    CONFIGRET ret;
+
+    TRACE("%hu %lx\n", wVersion, hMachine);
+
+    if (wVersion <= 0x400)
+        return TRUE;
+
+    if (hMachine != NULL)
+    {
+        BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle;
+        if (BindingHandle == NULL)
+            return FALSE;
+    }
+    else
+    {
+        if (!PnpGetLocalHandles(&BindingHandle, NULL))
+            return FALSE;
+    }
+
+    RpcTryExcept
+    {
+        ret = PNP_GetVersion(BindingHandle, &wServerVersion);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    if (ret != CR_SUCCESS)
+        return FALSE;
+
+    return (wServerVersion >= wVersion);
 }
 
 
@@ -2662,19 +3062,37 @@ CONFIGRET WINAPI CM_Locate_DevNode_ExW(
     }
     else
     {
-        /* Get the root device ID */
-        ret = PNP_GetRootDeviceInstance(BindingHandle,
-                                        DeviceIdBuffer,
-                                        MAX_DEVICE_ID_LEN);
+        RpcTryExcept
+        {
+            /* Get the root device ID */
+            ret = PNP_GetRootDeviceInstance(BindingHandle,
+                                            DeviceIdBuffer,
+                                            MAX_DEVICE_ID_LEN);
+        }
+        RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+        {
+            ret = RpcStatusToCmStatus(RpcExceptionCode());
+        }
+        RpcEndExcept;
+
         if (ret != CR_SUCCESS)
             return CR_FAILURE;
     }
     TRACE("DeviceIdBuffer: %s\n", debugstr_w(DeviceIdBuffer));
 
-    /* Validate the device ID */
-    ret = PNP_ValidateDeviceInstance(BindingHandle,
-                                     DeviceIdBuffer,
-                                     ulFlags);
+    RpcTryExcept
+    {
+        /* Validate the device ID */
+        ret = PNP_ValidateDeviceInstance(BindingHandle,
+                                         DeviceIdBuffer,
+                                         ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
     if (ret == CR_SUCCESS)
     {
         *pdnDevInst = StringTableAddString(StringTable, DeviceIdBuffer, 1);
@@ -2708,11 +3126,12 @@ CONFIGRET WINAPI CM_Move_DevNode_Ex(
     HSTRING_TABLE StringTable = NULL;
     LPWSTR lpFromDevInst;
     LPWSTR lpToDevInst;
+    CONFIGRET ret;
 
     FIXME("%lx %lx %lx %lx\n",
           dnFromDevInst, dnToDevInst, ulFlags, hMachine);
 
-    if (!IsUserAnAdmin())
+    if (!IsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (dnFromDevInst == 0 || dnToDevInst == 0)
@@ -2745,11 +3164,21 @@ CONFIGRET WINAPI CM_Move_DevNode_Ex(
     if (lpToDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
-    return PNP_DeviceInstanceAction(BindingHandle,
-                                    2,
-                                    ulFlags,
-                                    lpFromDevInst,
-                                    lpToDevInst);
+    RpcTryExcept
+    {
+        ret = PNP_DeviceInstanceAction(BindingHandle,
+                                       PNP_DEVINST_MOVE,
+                                       ulFlags,
+                                       lpFromDevInst,
+                                       lpToDevInst);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -2962,6 +3391,7 @@ CM_Reenumerate_DevNode_Ex(
     RPC_BINDING_HANDLE BindingHandle = NULL;
     HSTRING_TABLE StringTable = NULL;
     LPWSTR lpDevInst;
+    CONFIGRET ret;
 
     FIXME("%lx %lx %lx\n", dnDevInst, ulFlags, hMachine);
 
@@ -2991,11 +3421,21 @@ CM_Reenumerate_DevNode_Ex(
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
-    return PNP_DeviceInstanceAction(BindingHandle,
-                                    7,
-                                    ulFlags,
-                                    lpDevInst,
-                                    NULL);
+    RpcTryExcept
+    {
+        ret = PNP_DeviceInstanceAction(BindingHandle,
+                                       PNP_DEVINST_REENUMERATE,
+                                       ulFlags,
+                                       lpDevInst,
+                                       NULL);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -3016,6 +3456,7 @@ CONFIGRET WINAPI CM_Request_Eject_PC_Ex(
     HMACHINE hMachine)
 {
     RPC_BINDING_HANDLE BindingHandle = NULL;
+    CONFIGRET ret;
 
     TRACE("%lx\n", hMachine);
 
@@ -3031,7 +3472,17 @@ CONFIGRET WINAPI CM_Request_Eject_PC_Ex(
             return CR_FAILURE;
     }
 
-    return PNP_RequestEjectPC(BindingHandle);
+    RpcTryExcept
+    {
+        ret = PNP_RequestEjectPC(BindingHandle);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -3053,10 +3504,11 @@ CONFIGRET WINAPI CM_Run_Detection_Ex(
     ULONG ulFlags, HMACHINE hMachine)
 {
     RPC_BINDING_HANDLE BindingHandle = NULL;
+    CONFIGRET ret;
 
     TRACE("%lx %lx\n", ulFlags, hMachine);
 
-    if (!IsUserAnAdmin())
+    if (!IsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (ulFlags & ~CM_DETECT_BITS)
@@ -3074,8 +3526,18 @@ CONFIGRET WINAPI CM_Run_Detection_Ex(
             return CR_FAILURE;
     }
 
-    return PNP_RunDetection(BindingHandle,
-                            ulFlags);
+    RpcTryExcept
+    {
+        ret = PNP_RunDetection(BindingHandle,
+                               ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -3099,6 +3561,7 @@ CONFIGRET WINAPI CM_Set_DevNode_Problem_Ex(
     RPC_BINDING_HANDLE BindingHandle = NULL;
     HSTRING_TABLE StringTable = NULL;
     LPWSTR lpDevInst;
+    CONFIGRET ret;
 
     TRACE("%lx %lx %lx %lx\n", dnDevInst, ulProblem, ulFlags, hMachine);
 
@@ -3128,10 +3591,20 @@ CONFIGRET WINAPI CM_Set_DevNode_Problem_Ex(
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
-    return PNP_SetDeviceProblem(BindingHandle,
-                                lpDevInst,
-                                ulProblem,
-                                ulFlags);
+    RpcTryExcept
+    {
+        ret = PNP_SetDeviceProblem(BindingHandle,
+                                   lpDevInst,
+                                   ulProblem,
+                                   ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -3309,6 +3782,7 @@ CONFIGRET WINAPI CM_Set_DevNode_Registry_Property_ExW(
     HSTRING_TABLE StringTable = NULL;
     LPWSTR lpDevInst;
     ULONG ulType;
+    CONFIGRET ret;
 
     TRACE("%lx %lu %p %lx %lx %lx\n",
           dnDevInst, ulProperty, Buffer, ulLength, ulFlags, hMachine);
@@ -3403,13 +3877,77 @@ CONFIGRET WINAPI CM_Set_DevNode_Registry_Property_ExW(
             return CR_INVALID_PROPERTY;
     }
 
-    return PNP_SetDeviceRegProp(BindingHandle,
-                                lpDevInst,
-                                ulProperty,
-                                ulType,
-                                (char *)Buffer,
-                                ulLength,
-                                ulFlags);
+    RpcTryExcept
+    {
+        ret = PNP_SetDeviceRegProp(BindingHandle,
+                                   lpDevInst,
+                                   ulProperty,
+                                   ulType,
+                                   (BYTE *)Buffer,
+                                   ulLength,
+                                   ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
+}
+
+
+/***********************************************************************
+ * CM_Set_HW_Prof [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Set_HW_Prof(
+    ULONG ulHardwareProfile, ULONG ulFlags)
+{
+    TRACE("%lu %lu\n", ulHardwareProfile, ulFlags);
+    return CM_Set_HW_Prof_Ex(ulHardwareProfile, ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Set_HW_Prof_Ex [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Set_HW_Prof_Ex(
+    ULONG ulHardwareProfile, ULONG ulFlags, HMACHINE hMachine)
+{
+    RPC_BINDING_HANDLE BindingHandle = NULL;
+    CONFIGRET ret;
+
+    TRACE("%lu %lu %lx\n", ulHardwareProfile, ulFlags, hMachine);
+
+    if (!IsUserAdmin())
+        return CR_ACCESS_DENIED;
+
+    if (ulFlags != 0)
+        return CR_INVALID_FLAG;
+
+    if (hMachine != NULL)
+    {
+        BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle;
+        if (BindingHandle == NULL)
+            return CR_FAILURE;
+    }
+    else
+    {
+        if (!PnpGetLocalHandles(&BindingHandle, NULL))
+            return CR_FAILURE;
+    }
+
+    RpcTryExcept
+    {
+        ret = PNP_SetHwProf(BindingHandle, ulHardwareProfile, ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -3478,6 +4016,7 @@ CONFIGRET WINAPI CM_Set_HW_Prof_Flags_ExW(
     ULONG ulFlags, HMACHINE hMachine)
 {
     RPC_BINDING_HANDLE BindingHandle = NULL;
+    CONFIGRET ret;
 
     FIXME("%s %lu %lu %lx %lx\n", debugstr_w(szDevInstName),
           ulConfig, ulValue, ulFlags, hMachine);
@@ -3502,8 +4041,18 @@ CONFIGRET WINAPI CM_Set_HW_Prof_Flags_ExW(
             return CR_FAILURE;
     }
 
-    return PNP_HwProfFlags(BindingHandle, PNP_SET_HW_PROFILE_FLAGS, szDevInstName,
-                           ulConfig, &ulValue, 0);
+    RpcTryExcept
+    {
+        ret = PNP_HwProfFlags(BindingHandle, PNP_SET_HWPROFFLAGS, szDevInstName,
+                              ulConfig, &ulValue, NULL, NULL, 0, 0);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -3527,10 +4076,11 @@ CONFIGRET WINAPI CM_Setup_DevNode_Ex(
     RPC_BINDING_HANDLE BindingHandle = NULL;
     HSTRING_TABLE StringTable = NULL;
     LPWSTR lpDevInst;
+    CONFIGRET ret;
 
     FIXME("%lx %lx %lx\n", dnDevInst, ulFlags, hMachine);
 
-    if (!IsUserAnAdmin())
+    if (!IsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (dnDevInst == 0)
@@ -3559,11 +4109,21 @@ CONFIGRET WINAPI CM_Setup_DevNode_Ex(
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
-    return PNP_DeviceInstanceAction(BindingHandle,
-                                    3,
-                                    ulFlags,
-                                    lpDevInst,
-                                    NULL);
+    RpcTryExcept
+    {
+        ret = PNP_DeviceInstanceAction(BindingHandle,
+                                       PNP_DEVINST_SETUP,
+                                       ulFlags,
+                                       lpDevInst,
+                                       NULL);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }
 
 
@@ -3587,6 +4147,7 @@ CONFIGRET WINAPI CM_Uninstall_DevNode_Ex(
     RPC_BINDING_HANDLE BindingHandle = NULL;
     HSTRING_TABLE StringTable = NULL;
     LPWSTR lpDevInst;
+    CONFIGRET ret;
 
     TRACE("%lx %lx %lx\n", dnPhantom, ulFlags, hMachine);
 
@@ -3616,7 +4177,17 @@ CONFIGRET WINAPI CM_Uninstall_DevNode_Ex(
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
-    return PNP_UninstallDevInst(BindingHandle,
-                                lpDevInst,
-                                ulFlags);
+    RpcTryExcept
+    {
+        ret = PNP_UninstallDevInst(BindingHandle,
+                                   lpDevInst,
+                                   ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
 }