[SETUPAPI]
[reactos.git] / reactos / dll / win32 / setupapi / cfgmgr.c
index ccff5e6..3705804 100644 (file)
@@ -153,7 +153,7 @@ CONFIGRET WINAPI CMP_Report_LogOn(
     if (!PnpGetLocalHandles(&BindingHandle, NULL))
         return CR_FAILURE;
 
-    bAdmin = IsUserAdmin();
+    bAdmin = pSetupIsUserAdmin();
 
     for (i = 0; i < 30; i++)
     {
@@ -179,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.@]
  */
@@ -209,7 +237,7 @@ CONFIGRET WINAPI CM_Add_Empty_Log_Conf_Ex(
     FIXME("%p %p %lu %lx %p\n",
           plcLogConf, dnDevInst, Priority, ulFlags, hMachine);
 
-    if (!IsUserAdmin())
+    if (!pSetupIsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (plcLogConf == NULL)
@@ -240,7 +268,7 @@ CONFIGRET WINAPI CM_Add_Empty_Log_Conf_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -312,7 +340,7 @@ CONFIGRET WINAPI CM_Add_ID_ExA(
 
     TRACE("%p %s %lx %p\n", dnDevInst, pszID, ulFlags, hMachine);
 
-    if (CaptureAndConvertAnsiArg(pszID, &pszIDW))
+    if (pSetupCaptureAndConvertAnsiArg(pszID, &pszIDW))
         return CR_INVALID_DATA;
 
     ret = CM_Add_ID_ExW(dnDevInst, pszIDW, ulFlags, hMachine);
@@ -336,7 +364,7 @@ CONFIGRET WINAPI CM_Add_ID_ExW(
 
     TRACE("%p %s %lx %p\n", dnDevInst, debugstr_w(pszID), ulFlags, hMachine);
 
-    if (!IsUserAdmin())
+    if (!pSetupIsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (dnDevInst == 0)
@@ -364,7 +392,7 @@ CONFIGRET WINAPI CM_Add_ID_ExW(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -385,6 +413,34 @@ CONFIGRET WINAPI CM_Add_ID_ExW(
 }
 
 
+/***********************************************************************
+ * CM_Add_Res_Des [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Add_Res_Des(
+    PRES_DES prdResDes, LOG_CONF lcLogConf, RESOURCEID ResourceID,
+    PCVOID ResourceData, ULONG ResourceLen, ULONG ulFlags)
+{
+    TRACE("%p %p %lu %p %lu %lx\n", prdResDes, lcLogConf, ResourceID,
+          ResourceData, ResourceLen, ulFlags);
+    return CM_Add_Res_Des_Ex(prdResDes, lcLogConf, ResourceID, ResourceData,
+                             ResourceLen, ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Add_Res_Des_Ex [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Add_Res_Des_Ex(
+    PRES_DES prdResDes, LOG_CONF lcLogConf, RESOURCEID ResourceID,
+    PCVOID ResourceData, ULONG ResourceLen, ULONG ulFlags, HMACHINE hMachine)
+{
+    FIXME("%p %p %lu %p %lu %lx %p\n", prdResDes, lcLogConf, ResourceID,
+          ResourceData, ResourceLen, ulFlags, hMachine);
+
+    return CR_CALL_NOT_IMPLEMENTED;
+}
+
+
 /***********************************************************************
  * CM_Connect_MachineA [SETUPAPI.@]
  */
@@ -399,7 +455,7 @@ CONFIGRET WINAPI CM_Connect_MachineA(
     if (UNCServerName == NULL || *UNCServerName == 0)
         return CM_Connect_MachineW(NULL, phMachine);
 
-    if (CaptureAndConvertAnsiArg(UNCServerName, &pServerNameW))
+    if (pSetupCaptureAndConvertAnsiArg(UNCServerName, &pServerNameW))
         return CR_INVALID_DATA;
 
     ret = CM_Connect_MachineW(pServerNameW, phMachine);
@@ -452,18 +508,18 @@ CONFIGRET WINAPI CM_Connect_MachineW(
         }
         lstrcpyW(pMachine->szMachineName, UNCServerName);
 
-        pMachine->StringTable = StringTableInitialize();
+        pMachine->StringTable = pSetupStringTableInitialize();
         if (pMachine->StringTable == NULL)
         {
             HeapFree(GetProcessHeap(), 0, pMachine);
             return CR_FAILURE;
         }
 
-        StringTableAddString(pMachine->StringTable, L"PLT", 1);
+        pSetupStringTableAddString(pMachine->StringTable, L"PLT", 1);
 
         if (!PnpBindRpc(UNCServerName, &pMachine->BindingHandle))
         {
-            StringTableDestroy(pMachine->StringTable);
+            pSetupStringTableDestroy(pMachine->StringTable);
             HeapFree(GetProcessHeap(), 0, pMachine);
             return CR_INVALID_MACHINENAME;
         }
@@ -516,7 +572,7 @@ CONFIGRET WINAPI CM_Create_DevNode_ExA(
     TRACE("%p %s %p %lx %p\n",
           pdnDevInst, debugstr_a(pDeviceID), dnParent, ulFlags, hMachine);
 
-    if (CaptureAndConvertAnsiArg(pDeviceID, &pDeviceIDW))
+    if (pSetupCaptureAndConvertAnsiArg(pDeviceID, &pDeviceIDW))
         return CR_INVALID_DATA;
 
     ret = CM_Create_DevNode_ExW(pdnDevInst, pDeviceIDW, dnParent, ulFlags,
@@ -543,7 +599,7 @@ CONFIGRET WINAPI CM_Create_DevNode_ExW(
     FIXME("%p %s %p %lx %p\n",
           pdnDevInst, debugstr_w(pDeviceID), dnParent, ulFlags, hMachine);
 
-    if (!IsUserAdmin())
+    if (!pSetupIsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (pdnDevInst == NULL)
@@ -574,7 +630,7 @@ CONFIGRET WINAPI CM_Create_DevNode_ExW(
             return CR_FAILURE;
     }
 
-    lpParentDevInst = StringTableStringFromId(StringTable, dnParent);
+    lpParentDevInst = pSetupStringTableStringFromId(StringTable, dnParent);
     if (lpParentDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -594,7 +650,7 @@ CONFIGRET WINAPI CM_Create_DevNode_ExW(
 
     if (ret == CR_SUCCESS)
     {
-        *pdnDevInst = StringTableAddString(StringTable, pDeviceID, 1);
+        *pdnDevInst = pSetupStringTableAddString(StringTable, pDeviceID, 1);
         if (*pdnDevInst == 0)
             ret = CR_NO_SUCH_DEVNODE;
     }
@@ -713,7 +769,7 @@ CONFIGRET WINAPI CM_Disable_DevNode_Ex(
 
     FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine);
 
-    if (!IsUserAdmin())
+    if (!pSetupIsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (dnDevInst == 0)
@@ -738,7 +794,7 @@ CONFIGRET WINAPI CM_Disable_DevNode_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -776,7 +832,7 @@ CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE hMachine)
     if (pMachine->bLocal == FALSE)
     {
         if (pMachine->StringTable != NULL)
-            StringTableDestroy(pMachine->StringTable);
+            pSetupStringTableDestroy(pMachine->StringTable);
 
         if (!PnpUnbindRpc(pMachine->BindingHandle))
             return CR_ACCESS_DENIED;
@@ -812,7 +868,7 @@ CONFIGRET WINAPI CM_Enable_DevNode_Ex(
 
     TRACE("%p %lx %p\n", dnDevInst, ulFlags, hMachine);
 
-    if (!IsUserAdmin())
+    if (!pSetupIsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (dnDevInst == 0)
@@ -837,7 +893,7 @@ CONFIGRET WINAPI CM_Enable_DevNode_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -1079,7 +1135,7 @@ CONFIGRET WINAPI CM_Free_Log_Conf_Ex(
 
     TRACE("%lx %lx %lx\n", lcLogConfToBeFreed, ulFlags, hMachine);
 
-    if (!IsUserAdmin())
+    if (!pSetupIsUserAdmin())
         return CR_ACCESS_DENIED;
 
     pLogConfInfo = (PLOG_CONF_INFO)lcLogConfToBeFreed;
@@ -1105,7 +1161,7 @@ CONFIGRET WINAPI CM_Free_Log_Conf_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, pLogConfInfo->dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, pLogConfInfo->dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -1144,6 +1200,42 @@ CONFIGRET WINAPI CM_Free_Log_Conf_Handle(
 }
 
 
+/***********************************************************************
+ * CM_Free_Res_Des [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Free_Res_Des(
+   PRES_DES prdResDes, RES_DES rdResDes, ULONG ulFlags)
+{
+    TRACE("%p %p %lx\n", prdResDes, rdResDes, ulFlags);
+    return CM_Free_Res_Des_Ex(prdResDes, rdResDes, ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Free_Res_Des_Ex [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Free_Res_Des_Ex(
+    PRES_DES prdResDes, RES_DES rdResDes, ULONG ulFlags,
+    HMACHINE hMachine)
+{
+    FIXME("%p %p %lx %lx\n", prdResDes, rdResDes, ulFlags, hMachine);
+
+    return CR_CALL_NOT_IMPLEMENTED;
+}
+
+
+/***********************************************************************
+ * CM_Free_Res_Des_Handle [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Free_Res_Des_Handle(
+    RES_DES rdResDes)
+{
+    FIXME("%p\n", rdResDes);
+
+    return CR_CALL_NOT_IMPLEMENTED;
+}
+
+
 /***********************************************************************
  * CM_Get_Child [SETUPAPI.@]
  */
@@ -1197,7 +1289,7 @@ CONFIGRET WINAPI CM_Get_Child_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -1221,7 +1313,7 @@ CONFIGRET WINAPI CM_Get_Child_Ex(
 
     TRACE("szRelatedDevInst: %s\n", debugstr_w(szRelatedDevInst));
 
-    dwIndex = StringTableAddString(StringTable, szRelatedDevInst, 1);
+    dwIndex = pSetupStringTableAddString(StringTable, szRelatedDevInst, 1);
     if (dwIndex == -1)
         return CR_FAILURE;
 
@@ -1504,7 +1596,7 @@ CONFIGRET WINAPI CM_Get_Depth_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -1681,7 +1773,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Registry_Property_ExW(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -1769,7 +1861,7 @@ CM_Get_DevNode_Status_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -1825,7 +1917,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)
@@ -1886,10 +1978,10 @@ CONFIGRET WINAPI CM_Get_Device_ID_ExW(
             return CR_FAILURE;
     }
 
-    if (!StringTableStringFromIdEx(StringTable,
-                                   dnDevInst,
-                                   Buffer,
-                                   &BufferLen))
+    if (!pSetupStringTableStringFromIdEx(StringTable,
+                                         dnDevInst,
+                                         Buffer,
+                                         &BufferLen))
         return CR_FAILURE;
 
     return CR_SUCCESS;
@@ -1931,7 +2023,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));
@@ -1948,7 +2040,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_ExA(
     }
     else
     {
-        if (CaptureAndConvertAnsiArg(pszFilter, &pszFilterW))
+        if (pSetupCaptureAndConvertAnsiArg(pszFilter, &pszFilterW))
         {
             ret = CR_INVALID_DEVICE_ID;
             goto Done;
@@ -1987,10 +2079,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;
 }
 
 
@@ -2036,7 +2165,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_Size_ExA(
     }
     else
     {
-        if (CaptureAndConvertAnsiArg(pszFilter, &pszFilterW))
+        if (pSetupCaptureAndConvertAnsiArg(pszFilter, &pszFilterW))
             return CR_INVALID_DEVICE_ID;
 
         ret = CM_Get_Device_ID_List_Size_ExW(pulLen,
@@ -2142,7 +2271,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(
             return CR_FAILURE;
     }
 
-    DeviceId = StringTableStringFromId(StringTable, dnDevInst);
+    DeviceId = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (DeviceId == NULL)
     {
         *pulLen = 0;
@@ -2156,67 +2285,97 @@ CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(
 
 
 /***********************************************************************
- * CM_Get_First_Log_Conf [SETUPAPI.@]
+ * CM_Get_Device_Interface_AliasA [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Get_First_Log_Conf(
-    PLOG_CONF plcLogConf, DEVINST dnDevInst, ULONG ulFlags)
+CONFIGRET WINAPI CM_Get_Device_Interface_AliasA(
+    LPCSTR pszDeviceInterface, LPGUID AliasInterfaceGuid,
+    LPSTR pszAliasDeviceInterface, PULONG pulLength, ULONG ulFlags)
 {
-    TRACE("%p %lx %lx\n", plcLogConf, dnDevInst, ulFlags);
-    return CM_Get_First_Log_Conf_Ex(plcLogConf, dnDevInst, ulFlags, NULL);
+    TRACE("%p %p %p %p %lu\n", pszDeviceInterface, AliasInterfaceGuid,
+          pszAliasDeviceInterface, pulLength, ulFlags);
+
+    return CM_Get_Device_Interface_Alias_ExA(pszDeviceInterface,
+        AliasInterfaceGuid, pszAliasDeviceInterface, pulLength,
+        ulFlags, NULL);
 }
 
 
 /***********************************************************************
- * CM_Get_First_Log_Conf_Ex [SETUPAPI.@]
+ * CM_Get_Device_Interface_AliasW [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Get_First_Log_Conf_Ex(
-    PLOG_CONF plcLogConf, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine)
+CONFIGRET WINAPI CM_Get_Device_Interface_AliasW(
+    LPCWSTR pszDeviceInterface, LPGUID AliasInterfaceGuid,
+    LPWSTR pszAliasDeviceInterface, PULONG pulLength, ULONG ulFlags)
+{
+    TRACE("%p %p %p %p %lu\n", pszDeviceInterface, AliasInterfaceGuid,
+          pszAliasDeviceInterface, pulLength, ulFlags);
+
+    return CM_Get_Device_Interface_Alias_ExW(pszDeviceInterface,
+        AliasInterfaceGuid, pszAliasDeviceInterface, pulLength,
+        ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Get_Device_Interface_Alias_ExA [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Get_Device_Interface_Alias_ExA(
+    LPCSTR pszDeviceInterface, LPGUID AliasInterfaceGuid, LPSTR pszAliasDeviceInterface,
+    PULONG pulLength, ULONG ulFlags, HMACHINE hMachine)
+{
+    FIXME("%p %p %p %p %lu %lx\n", pszDeviceInterface, AliasInterfaceGuid,
+          pszAliasDeviceInterface, pulLength, ulFlags, hMachine);
+
+    return CR_CALL_NOT_IMPLEMENTED;
+}
+
+
+/***********************************************************************
+ * CM_Get_Device_Interface_Alias_ExW [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Get_Device_Interface_Alias_ExW(
+    LPCWSTR pszDeviceInterface, LPGUID AliasInterfaceGuid, LPWSTR pszAliasDeviceInterface,
+    PULONG pulLength, ULONG ulFlags, HMACHINE hMachine)
 {
     RPC_BINDING_HANDLE BindingHandle = NULL;
-    HSTRING_TABLE StringTable = NULL;
-    LPWSTR lpDevInst = NULL;
+    ULONG ulTransferLength;
     CONFIGRET ret = CR_SUCCESS;
-    ULONG ulTag;
-    PLOG_CONF_INFO pLogConfInfo;
 
-    FIXME("%p %lx %lx %lx\n", plcLogConf, dnDevInst, ulFlags, hMachine);
+    TRACE("%p %p %p %p %lu %lx\n", pszDeviceInterface, AliasInterfaceGuid,
+          pszAliasDeviceInterface, pulLength, ulFlags, hMachine);
 
-    if (dnDevInst == 0)
-        return CR_INVALID_DEVINST;
+    if (pszDeviceInterface == NULL ||
+        AliasInterfaceGuid == NULL ||
+        pszAliasDeviceInterface == NULL ||
+        pulLength == NULL)
+        return CR_INVALID_POINTER;
 
-    if (ulFlags & ~LOG_CONF_BITS)
+    if (ulFlags != 0)
         return CR_INVALID_FLAG;
 
-    if (plcLogConf)
-        *plcLogConf = 0;
-
     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))
+        if (!PnpGetLocalHandles(&BindingHandle, NULL))
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
-    if (lpDevInst == NULL)
-        return CR_INVALID_DEVNODE;
+    ulTransferLength = *pulLength;
 
     RpcTryExcept
     {
-        ret = PNP_GetFirstLogConf(BindingHandle,
-                                  lpDevInst,
-                                  ulFlags,
-                                  &ulTag,
-                                  ulFlags);
+        ret = PNP_GetInterfaceDeviceAlias(BindingHandle,
+                                          (LPWSTR)pszDeviceInterface,
+                                          AliasInterfaceGuid,
+                                          pszAliasDeviceInterface,
+                                          pulLength,
+                                          &ulTransferLength,
+                                          0);
     }
     RpcExcept(EXCEPTION_EXECUTE_HANDLER)
     {
@@ -2224,50 +2383,117 @@ CONFIGRET WINAPI CM_Get_First_Log_Conf_Ex(
     }
     RpcEndExcept;
 
-    if (ret != CR_SUCCESS)
-        return ret;
+    return ret;
+}
 
-    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;
+/***********************************************************************
+ *      CM_Get_Device_Interface_ListA (SETUPAPI.@)
+ */
+CONFIGRET WINAPI CM_Get_Device_Interface_ListA(
+    LPGUID InterfaceClassGuid, DEVINSTID_A pDeviceID, PCHAR Buffer,
+    ULONG BufferLen, ULONG ulFlags)
+{
+    TRACE("%s %s %p %lu 0x%08lx\n", debugstr_guid(InterfaceClassGuid),
+          pDeviceID, Buffer, BufferLen, ulFlags);
+
+    return CM_Get_Device_Interface_List_ExA(InterfaceClassGuid, pDeviceID,
+                                            Buffer, BufferLen, ulFlags, NULL);
+}
 
-    *plcLogConf = (LOG_CONF)pLogConfInfo;
 
-    return CR_SUCCESS;
+/***********************************************************************
+ *      CM_Get_Device_Interface_ListW (SETUPAPI.@)
+ */
+CONFIGRET WINAPI CM_Get_Device_Interface_ListW(
+    LPGUID InterfaceClassGuid, DEVINSTID_W pDeviceID, PWCHAR Buffer,
+    ULONG BufferLen, ULONG ulFlags)
+{
+    TRACE("%s %s %p %lu 0x%08lx\n", debugstr_guid(InterfaceClassGuid),
+          debugstr_w(pDeviceID), Buffer, BufferLen, ulFlags);
+
+    return CM_Get_Device_Interface_List_ExW(InterfaceClassGuid, pDeviceID,
+                                            Buffer, BufferLen, ulFlags, NULL);
 }
 
 
 /***********************************************************************
- * CM_Get_Global_State [SETUPAPI.@]
+ *      CM_Get_Device_Interface_List_ExA (SETUPAPI.@)
  */
-CONFIGRET WINAPI CM_Get_Global_State(
-    PULONG pulState, ULONG ulFlags)
+CONFIGRET WINAPI CM_Get_Device_Interface_List_ExA(
+    LPGUID InterfaceClassGuid, DEVINSTID_A pDeviceID, PCHAR Buffer,
+    ULONG BufferLen, ULONG ulFlags, HMACHINE hMachine)
 {
-    TRACE("%p %lx\n", pulState, ulFlags);
-    return CM_Get_Global_State_Ex(pulState, ulFlags, NULL);
+    DEVINSTID_W pDeviceIdW = NULL;
+    PWCHAR BufferW = NULL;
+    CONFIGRET ret = CR_SUCCESS;
+
+    TRACE("%s %s %p %lu 0x%08lx %p\n", debugstr_guid(InterfaceClassGuid),
+          pDeviceID, Buffer, BufferLen, ulFlags, hMachine);
+
+    if (Buffer == NULL ||
+        BufferLen == 0)
+        return CR_INVALID_POINTER;
+
+    if (pDeviceID != NULL)
+    {
+        if (!pSetupCaptureAndConvertAnsiArg(pDeviceID, &pDeviceIdW))
+            return CR_INVALID_DEVICE_ID;
+    }
+
+    BufferW = MyMalloc(BufferLen * sizeof(WCHAR));
+    if (BufferW == NULL)
+    {
+        ret = CR_OUT_OF_MEMORY;
+        goto Done;
+    }
+
+    ret = CM_Get_Device_Interface_List_ExW(InterfaceClassGuid, pDeviceIdW,
+                                           BufferW, BufferLen, ulFlags,
+                                           hMachine);
+    if (ret != CR_SUCCESS)
+        goto Done;
+
+    if (WideCharToMultiByte(CP_ACP,
+                            0,
+                            BufferW,
+                            lstrlenW(BufferW) + 1,
+                            Buffer,
+                            BufferLen,
+                            NULL,
+                            NULL) == 0)
+        ret = CR_FAILURE;
+
+Done:
+    if (BufferW != NULL)
+        MyFree(BufferW);
+
+    if (pDeviceIdW != NULL)
+        MyFree(pDeviceIdW);
+
+    return ret;
 }
 
 
 /***********************************************************************
- * CM_Get_Global_State_Ex [SETUPAPI.@]
+ *      CM_Get_Device_Interface_List_ExW (SETUPAPI.@)
  */
-CONFIGRET WINAPI CM_Get_Global_State_Ex(
-    PULONG pulState, ULONG ulFlags, HMACHINE hMachine)
+CONFIGRET WINAPI CM_Get_Device_Interface_List_ExW(
+    LPGUID InterfaceClassGuid, DEVINSTID_W pDeviceID, PWCHAR Buffer,
+    ULONG BufferLen, ULONG ulFlags, HMACHINE hMachine)
 {
     RPC_BINDING_HANDLE BindingHandle = NULL;
-    CONFIGRET ret;
+    PNP_RPC_BUFFER_SIZE BufferSize = 0;
+    CONFIGRET ret = CR_SUCCESS;
 
-    TRACE("%p %lx %lx\n", pulState, ulFlags, hMachine);
+    TRACE("%s %s %p %lu 0x%08lx %p\n", debugstr_guid(InterfaceClassGuid),
+          debugstr_w(pDeviceID), Buffer, BufferLen, ulFlags, hMachine);
 
-    if (pulState == NULL)
+    if (Buffer == NULL ||
+        BufferLen == 0)
         return CR_INVALID_POINTER;
 
-    if (ulFlags != 0)
+    if (ulFlags & ~CM_GET_DEVICE_INTERFACE_LIST_BITS)
         return CR_INVALID_FLAG;
 
     if (hMachine != NULL)
@@ -2282,9 +2508,17 @@ CONFIGRET WINAPI CM_Get_Global_State_Ex(
             return CR_FAILURE;
     }
 
+    *Buffer = 0;
+    BufferSize = BufferLen;
+
     RpcTryExcept
     {
-        ret = PNP_GetGlobalState(BindingHandle, pulState, ulFlags);
+        ret = PNP_GetInterfaceDeviceList(BindingHandle,
+                                         InterfaceClassGuid,
+                                         pDeviceID,
+                                         (LPBYTE)Buffer,
+                                         &BufferSize,
+                                         ulFlags);
     }
     RpcExcept(EXCEPTION_EXECUTE_HANDLER)
     {
@@ -2297,85 +2531,88 @@ CONFIGRET WINAPI CM_Get_Global_State_Ex(
 
 
 /***********************************************************************
- * CM_Get_HW_Prof_FlagsA [SETUPAPI.@]
+ *      CM_Get_Device_Interface_List_SizeA (SETUPAPI.@)
  */
-CONFIGRET WINAPI CM_Get_HW_Prof_FlagsA(
-    DEVINSTID_A szDevInstName, ULONG ulHardwareProfile, PULONG pulValue,
+CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeA(
+    PULONG pulLen, LPGUID InterfaceClassGuid, DEVINSTID_A pDeviceId,
     ULONG ulFlags)
 {
-    TRACE("%s %lu %p %lx\n", szDevInstName,
-          ulHardwareProfile, pulValue, ulFlags);
+    TRACE("%p %p %s 0x%08lx\n", pulLen, InterfaceClassGuid,
+          pDeviceId, ulFlags);
 
-    return CM_Get_HW_Prof_Flags_ExA(szDevInstName, ulHardwareProfile,
-                                    pulValue, ulFlags, NULL);
+    return CM_Get_Device_Interface_List_Size_ExA(pulLen, InterfaceClassGuid,
+                                                 pDeviceId, ulFlags, NULL);
 }
 
 
 /***********************************************************************
- * CM_Get_HW_Prof_FlagsW [SETUPAPI.@]
+ *      CM_Get_Device_Interface_List_SizeW (SETUPAPI.@)
  */
-CONFIGRET WINAPI CM_Get_HW_Prof_FlagsW(
-    DEVINSTID_W szDevInstName, ULONG ulHardwareProfile, PULONG pulValue,
+CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeW(
+    PULONG pulLen, LPGUID InterfaceClassGuid, DEVINSTID_W pDeviceId,
     ULONG ulFlags)
 {
-    TRACE("%s %lu %p %lx\n", debugstr_w(szDevInstName),
-          ulHardwareProfile, pulValue, ulFlags);
+    TRACE("%p %p %s 0x%08lx\n", pulLen, InterfaceClassGuid,
+          debugstr_w(pDeviceId), ulFlags);
 
-    return CM_Get_HW_Prof_Flags_ExW(szDevInstName, ulHardwareProfile,
-                                    pulValue, ulFlags, NULL);
+    return CM_Get_Device_Interface_List_Size_ExW(pulLen, InterfaceClassGuid,
+                                                 pDeviceId, ulFlags, NULL);
 }
 
 
 /***********************************************************************
- * CM_Get_HW_Prof_Flags_ExA [SETUPAPI.@]
+ *      CM_Get_Device_Interface_List_Size_ExA (SETUPAPI.@)
  */
-CONFIGRET WINAPI CM_Get_HW_Prof_Flags_ExA(
-    DEVINSTID_A szDevInstName, ULONG ulHardwareProfile, PULONG pulValue,
+CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExA(
+    PULONG pulLen, LPGUID InterfaceClassGuid, DEVINSTID_A pDeviceId,
     ULONG ulFlags, HMACHINE hMachine)
 {
-    DEVINSTID_W pszDevIdW = NULL;
+    DEVINSTID_W pDeviceIdW = NULL;
     CONFIGRET ret = CR_SUCCESS;
 
-    TRACE("%s %lu %p %lx %lx\n", szDevInstName,
-          ulHardwareProfile, pulValue, ulFlags, hMachine);
+    TRACE("%p %p %s 0x%08lx %p\n", pulLen, InterfaceClassGuid,
+          pDeviceId, ulFlags, hMachine);
 
-    if (szDevInstName != NULL)
+    if (pulLen == NULL)
+        return CR_INVALID_POINTER;
+
+    if (pDeviceId != NULL)
     {
-       if (CaptureAndConvertAnsiArg(szDevInstName, &pszDevIdW))
-         return CR_INVALID_DEVICE_ID;
+        if (!pSetupCaptureAndConvertAnsiArg(pDeviceId, &pDeviceIdW))
+            return CR_INVALID_DEVICE_ID;
     }
 
-    ret = CM_Get_HW_Prof_Flags_ExW(pszDevIdW, ulHardwareProfile,
-                                   pulValue, ulFlags, hMachine);
+    *pulLen = 0;
 
-    if (pszDevIdW != NULL)
-        MyFree(pszDevIdW);
+    ret = CM_Get_Device_Interface_List_Size_ExW(pulLen, InterfaceClassGuid,
+                                                pDeviceIdW, ulFlags, hMachine);
+
+    if (pDeviceIdW != NULL)
+        MyFree(pDeviceIdW);
 
     return ret;
 }
 
 
 /***********************************************************************
- * CM_Get_HW_Prof_Flags_ExW [SETUPAPI.@]
+ *      CM_Get_Device_Interface_List_Size_ExW (SETUPAPI.@)
  */
-CONFIGRET WINAPI CM_Get_HW_Prof_Flags_ExW(
-    DEVINSTID_W szDevInstName, ULONG ulHardwareProfile, PULONG pulValue,
+CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExW(
+    PULONG pulLen, LPGUID InterfaceClassGuid, DEVINSTID_W pDeviceId,
     ULONG ulFlags, HMACHINE hMachine)
 {
     RPC_BINDING_HANDLE BindingHandle = NULL;
-    CONFIGRET ret;
+    CONFIGRET ret = CR_SUCCESS;
 
-    FIXME("%s %lu %p %lx %lx\n", debugstr_w(szDevInstName),
-          ulHardwareProfile, pulValue, ulFlags, hMachine);
+    TRACE("%p %p %s 0x%08lx %p\n", pulLen, InterfaceClassGuid,
+          debugstr_w(pDeviceId), ulFlags, hMachine);
 
-    if ((szDevInstName == NULL) || (pulValue == NULL))
+    if (pulLen == NULL)
         return CR_INVALID_POINTER;
 
-    if (ulFlags != 0)
+    if (ulFlags & ~CM_GET_DEVICE_INTERFACE_LIST_BITS)
         return CR_INVALID_FLAG;
 
-    /* FIXME: Check whether szDevInstName is valid */
-
     if (hMachine != NULL)
     {
         BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle;
@@ -2388,10 +2625,15 @@ CONFIGRET WINAPI CM_Get_HW_Prof_Flags_ExW(
             return CR_FAILURE;
     }
 
+    *pulLen = 0;
+
     RpcTryExcept
     {
-        ret = PNP_HwProfFlags(BindingHandle, PNP_GET_HWPROFFLAGS, szDevInstName,
-                              ulHardwareProfile, pulValue, NULL, NULL, 0, 0);
+        ret = PNP_GetInterfaceDeviceListSize(BindingHandle,
+                                             pulLen,
+                                             InterfaceClassGuid,
+                                             pDeviceId,
+                                             ulFlags);
     }
     RpcExcept(EXCEPTION_EXECUTE_HANDLER)
     {
@@ -2404,41 +2646,40 @@ CONFIGRET WINAPI CM_Get_HW_Prof_Flags_ExW(
 
 
 /***********************************************************************
- * CM_Get_Log_Conf_Priority [SETUPAPI.@]
+ * CM_Get_First_Log_Conf [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Get_Log_Conf_Priority(
-    LOG_CONF lcLogConf, PPRIORITY pPriority, ULONG ulFlags)
+CONFIGRET WINAPI CM_Get_First_Log_Conf(
+    PLOG_CONF plcLogConf, DEVINST dnDevInst, ULONG ulFlags)
 {
-    TRACE("%p %p %lx\n", lcLogConf, pPriority, ulFlags);
-    return CM_Get_Log_Conf_Priority_Ex(lcLogConf, pPriority, ulFlags, NULL);
+    TRACE("%p %lx %lx\n", plcLogConf, dnDevInst, ulFlags);
+    return CM_Get_First_Log_Conf_Ex(plcLogConf, dnDevInst, ulFlags, NULL);
 }
 
 
 /***********************************************************************
- * CM_Get_Log_Conf_Priority_Ex [SETUPAPI.@]
+ * CM_Get_First_Log_Conf_Ex [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Get_Log_Conf_Priority_Ex(
-    LOG_CONF lcLogConf, PPRIORITY pPriority, ULONG ulFlags,
-    HMACHINE hMachine)
+CONFIGRET WINAPI CM_Get_First_Log_Conf_Ex(
+    PLOG_CONF plcLogConf, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine)
 {
     RPC_BINDING_HANDLE BindingHandle = NULL;
     HSTRING_TABLE StringTable = NULL;
+    LPWSTR lpDevInst = NULL;
+    CONFIGRET ret = CR_SUCCESS;
+    ULONG ulTag;
     PLOG_CONF_INFO pLogConfInfo;
-    LPWSTR lpDevInst;
-    CONFIGRET ret;
 
-    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;
+    FIXME("%p %lx %lx %lx\n", plcLogConf, dnDevInst, ulFlags, hMachine);
 
-    if (pPriority == NULL)
-        return CR_INVALID_POINTER;
+    if (dnDevInst == 0)
+        return CR_INVALID_DEVINST;
 
-    if (ulFlags != 0)
+    if (ulFlags & ~LOG_CONF_BITS)
         return CR_INVALID_FLAG;
 
+    if (plcLogConf)
+        *plcLogConf = 0;
+
     if (hMachine != NULL)
     {
         BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle;
@@ -2455,18 +2696,17 @@ CONFIGRET WINAPI CM_Get_Log_Conf_Priority_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, pLogConfInfo->dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
     RpcTryExcept
     {
-        ret = PNP_GetLogConfPriority(BindingHandle,
-                                     lpDevInst,
-                                     pLogConfInfo->ulFlags,
-                                     pLogConfInfo->ulTag,
-                                     pPriority,
-                                     0);
+        ret = PNP_GetFirstLogConf(BindingHandle,
+                                  lpDevInst,
+                                  ulFlags,
+                                  &ulTag,
+                                  ulFlags);
     }
     RpcExcept(EXCEPTION_EXECUTE_HANDLER)
     {
@@ -2474,44 +2714,51 @@ CONFIGRET WINAPI CM_Get_Log_Conf_Priority_Ex(
     }
     RpcEndExcept;
 
-    return ret;
+    if (ret != CR_SUCCESS)
+        return ret;
+
+    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;
+
+        *plcLogConf = (LOG_CONF)pLogConfInfo;
+    }
+
+    return CR_SUCCESS;
 }
 
 
 /***********************************************************************
- * CM_Get_Next_Log_Conf [SETUPAPI.@]
+ * CM_Get_Global_State [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Get_Next_Log_Conf(
-    PLOG_CONF plcLogConf, LOG_CONF lcLogConf, ULONG ulFlags)
+CONFIGRET WINAPI CM_Get_Global_State(
+    PULONG pulState, ULONG ulFlags)
 {
-    TRACE("%p %p %lx\n", plcLogConf, lcLogConf, ulFlags);
-    return CM_Get_Next_Log_Conf_Ex(plcLogConf, lcLogConf, ulFlags, NULL);
+    TRACE("%p %lx\n", pulState, ulFlags);
+    return CM_Get_Global_State_Ex(pulState, ulFlags, NULL);
 }
 
 
 /***********************************************************************
- * CM_Get_Next_Log_Conf_Ex [SETUPAPI.@]
+ * CM_Get_Global_State_Ex [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Get_Next_Log_Conf_Ex(
-    PLOG_CONF plcLogConf, LOG_CONF lcLogConf, ULONG ulFlags,
-    HMACHINE hMachine)
+CONFIGRET WINAPI CM_Get_Global_State_Ex(
+    PULONG pulState, ULONG ulFlags, HMACHINE hMachine)
 {
     RPC_BINDING_HANDLE BindingHandle = NULL;
-    HSTRING_TABLE StringTable = NULL;
-    PLOG_CONF_INFO pLogConfInfo;
-    PLOG_CONF_INFO pNewLogConfInfo;
-    ULONG ulNewTag;
-    LPWSTR lpDevInst;
     CONFIGRET ret;
 
-    FIXME("%p %p %lx %lx\n", plcLogConf, lcLogConf, ulFlags, hMachine);
-
-    if (plcLogConf)
-        *plcLogConf = 0;
+    TRACE("%p %lx %lx\n", pulState, ulFlags, hMachine);
 
-    pLogConfInfo = (PLOG_CONF_INFO)lcLogConf;
-    if (pLogConfInfo == NULL || pLogConfInfo->ulMagic != LOG_CONF_MAGIC)
-        return CR_INVALID_LOG_CONF;
+    if (pulState == NULL)
+        return CR_INVALID_POINTER;
 
     if (ulFlags != 0)
         return CR_INVALID_FLAG;
@@ -2521,29 +2768,16 @@ CONFIGRET WINAPI CM_Get_Next_Log_Conf_Ex(
         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))
+        if (!PnpGetLocalHandles(&BindingHandle, NULL))
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, pLogConfInfo->dnDevInst);
-    if (lpDevInst == NULL)
-        return CR_INVALID_DEVNODE;
-
     RpcTryExcept
     {
-        ret = PNP_GetNextLogConf(BindingHandle,
-                                 lpDevInst,
-                                 pLogConfInfo->ulFlags,
-                                 pLogConfInfo->ulTag,
-                                 &ulNewTag,
-                                 0);
+        ret = PNP_GetGlobalState(BindingHandle, pulState, ulFlags);
     }
     RpcExcept(EXCEPTION_EXECUTE_HANDLER)
     {
@@ -2551,92 +2785,106 @@ CONFIGRET WINAPI CM_Get_Next_Log_Conf_Ex(
     }
     RpcEndExcept;
 
-    if (ret != CR_SUCCESS)
-        return ret;
+    return ret;
+}
 
-    if (plcLogConf)
-    {
-        pNewLogConfInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_CONF_INFO));
-        if (pNewLogConfInfo == NULL)
-            return CR_OUT_OF_MEMORY;
 
-        pNewLogConfInfo->ulMagic = LOG_CONF_MAGIC;
-        pNewLogConfInfo->dnDevInst = pLogConfInfo->dnDevInst;
-        pNewLogConfInfo->ulFlags = pLogConfInfo->ulFlags;
-        pNewLogConfInfo->ulTag = ulNewTag;
+/***********************************************************************
+ * CM_Get_HW_Prof_FlagsA [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Get_HW_Prof_FlagsA(
+    DEVINSTID_A szDevInstName, ULONG ulHardwareProfile, PULONG pulValue,
+    ULONG ulFlags)
+{
+    TRACE("%s %lu %p %lx\n", szDevInstName,
+          ulHardwareProfile, pulValue, ulFlags);
 
-        *plcLogConf = (LOG_CONF)pNewLogConfInfo;
-    }
+    return CM_Get_HW_Prof_Flags_ExA(szDevInstName, ulHardwareProfile,
+                                    pulValue, ulFlags, NULL);
+}
 
-    return CR_SUCCESS;
+
+/***********************************************************************
+ * CM_Get_HW_Prof_FlagsW [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Get_HW_Prof_FlagsW(
+    DEVINSTID_W szDevInstName, ULONG ulHardwareProfile, PULONG pulValue,
+    ULONG ulFlags)
+{
+    TRACE("%s %lu %p %lx\n", debugstr_w(szDevInstName),
+          ulHardwareProfile, pulValue, ulFlags);
+
+    return CM_Get_HW_Prof_Flags_ExW(szDevInstName, ulHardwareProfile,
+                                    pulValue, ulFlags, NULL);
 }
 
 
 /***********************************************************************
- * CM_Get_Parent [SETUPAPI.@]
+ * CM_Get_HW_Prof_Flags_ExA [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Get_Parent(
-    PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags)
+CONFIGRET WINAPI CM_Get_HW_Prof_Flags_ExA(
+    DEVINSTID_A szDevInstName, ULONG ulHardwareProfile, PULONG pulValue,
+    ULONG ulFlags, HMACHINE hMachine)
 {
-    TRACE("%p %p %lx\n", pdnDevInst, dnDevInst, ulFlags);
-    return CM_Get_Parent_Ex(pdnDevInst, dnDevInst, ulFlags, NULL);
+    DEVINSTID_W pszDevIdW = NULL;
+    CONFIGRET ret = CR_SUCCESS;
+
+    TRACE("%s %lu %p %lx %lx\n", szDevInstName,
+          ulHardwareProfile, pulValue, ulFlags, hMachine);
+
+    if (szDevInstName != NULL)
+    {
+       if (pSetupCaptureAndConvertAnsiArg(szDevInstName, &pszDevIdW))
+         return CR_INVALID_DEVICE_ID;
+    }
+
+    ret = CM_Get_HW_Prof_Flags_ExW(pszDevIdW, ulHardwareProfile,
+                                   pulValue, ulFlags, hMachine);
+
+    if (pszDevIdW != NULL)
+        MyFree(pszDevIdW);
+
+    return ret;
 }
 
 
 /***********************************************************************
- * CM_Get_Parent_Ex [SETUPAPI.@]
+ * CM_Get_HW_Prof_Flags_ExW [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Get_Parent_Ex(
-    PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine)
+CONFIGRET WINAPI CM_Get_HW_Prof_Flags_ExW(
+    DEVINSTID_W szDevInstName, ULONG ulHardwareProfile, PULONG pulValue,
+    ULONG ulFlags, HMACHINE hMachine)
 {
-    WCHAR szRelatedDevInst[MAX_DEVICE_ID_LEN];
     RPC_BINDING_HANDLE BindingHandle = NULL;
-    HSTRING_TABLE StringTable = NULL;
-    LPWSTR lpDevInst;
-    DWORD dwIndex, dwLength = MAX_DEVICE_ID_LEN;
     CONFIGRET ret;
 
-    TRACE("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine);
+    FIXME("%s %lu %p %lx %lx\n", debugstr_w(szDevInstName),
+          ulHardwareProfile, pulValue, ulFlags, hMachine);
 
-    if (pdnDevInst == NULL)
+    if ((szDevInstName == NULL) || (pulValue == NULL))
         return CR_INVALID_POINTER;
 
-    if (dnDevInst == 0)
-        return CR_INVALID_DEVINST;
-
     if (ulFlags != 0)
         return CR_INVALID_FLAG;
 
-    *pdnDevInst = -1;
+    /* FIXME: Check whether szDevInstName is valid */
 
     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))
+        if (!PnpGetLocalHandles(&BindingHandle, NULL))
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
-    if (lpDevInst == NULL)
-        return CR_INVALID_DEVNODE;
-
     RpcTryExcept
     {
-        ret = PNP_GetRelatedDeviceInstance(BindingHandle,
-                                           PNP_GET_PARENT_DEVICE_INSTANCE,
-                                           lpDevInst,
-                                           szRelatedDevInst,
-                                           &dwLength,
-                                           0);
+        ret = PNP_HwProfFlags(BindingHandle, PNP_GET_HWPROFFLAGS, szDevInstName,
+                              ulHardwareProfile, pulValue, NULL, NULL, 0, 0);
     }
     RpcExcept(EXCEPTION_EXECUTE_HANDLER)
     {
@@ -2644,57 +2892,153 @@ CONFIGRET WINAPI CM_Get_Parent_Ex(
     }
     RpcEndExcept;
 
-    if (ret != CR_SUCCESS)
-        return ret;
-
-    TRACE("szRelatedDevInst: %s\n", debugstr_w(szRelatedDevInst));
+    return ret;
+}
 
-    dwIndex = StringTableAddString(StringTable, szRelatedDevInst, 1);
-    if (dwIndex == -1)
-        return CR_FAILURE;
 
-    *pdnDevInst = dwIndex;
+/***********************************************************************
+ * CM_Get_Hardware_Profile_InfoA [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Get_Hardware_Profile_InfoA(
+    ULONG ulIndex, PHWPROFILEINFO_A pHWProfileInfo, ULONG ulFlags)
+{
+    TRACE("%lu %p %lx\n", ulIndex, pHWProfileInfo, ulFlags);
 
-    return CR_SUCCESS;
+    return CM_Get_Hardware_Profile_Info_ExA(ulIndex, pHWProfileInfo,
+                                            ulFlags, NULL);
 }
 
 
 /***********************************************************************
- * CM_Get_Sibling [SETUPAPI.@]
+ * CM_Get_Hardware_Profile_InfoW [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Get_Sibling(
-    PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags)
+CONFIGRET WINAPI CM_Get_Hardware_Profile_InfoW(
+    ULONG ulIndex, PHWPROFILEINFO_W pHWProfileInfo, ULONG ulFlags)
 {
-    TRACE("%p %p %lx\n", pdnDevInst, dnDevInst, ulFlags);
-    return CM_Get_Sibling_Ex(pdnDevInst, dnDevInst, ulFlags, NULL);
+    TRACE("%lu %p %lx\n", ulIndex, pHWProfileInfo, ulFlags);
+
+    return CM_Get_Hardware_Profile_Info_ExW(ulIndex, pHWProfileInfo,
+                                            ulFlags, NULL);
 }
 
 
 /***********************************************************************
- * CM_Get_Sibling_Ex [SETUPAPI.@]
+ * CM_Get_Hardware_Profile_Info_ExA [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Get_Sibling_Ex(
-    PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine)
+CONFIGRET WINAPI CM_Get_Hardware_Profile_Info_ExA(
+    ULONG ulIndex, PHWPROFILEINFO_A pHWProfileInfo, ULONG ulFlags,
+    HMACHINE hMachine)
 {
-    WCHAR szRelatedDevInst[MAX_DEVICE_ID_LEN];
-    RPC_BINDING_HANDLE BindingHandle = NULL;
-    HSTRING_TABLE StringTable = NULL;
-    LPWSTR lpDevInst;
-    DWORD dwIndex, dwLength = MAX_DEVICE_ID_LEN;
+    HWPROFILEINFO_W LocalProfileInfo;
     CONFIGRET ret;
 
-    TRACE("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine);
+    TRACE("%lu %p %lx %lx\n", ulIndex, pHWProfileInfo, ulFlags, hMachine);
 
-    if (pdnDevInst == NULL)
+    if (pHWProfileInfo == NULL)
         return CR_INVALID_POINTER;
 
-    if (dnDevInst == 0)
-        return CR_INVALID_DEVINST;
-
-    if (ulFlags != 0)
-        return CR_INVALID_FLAG;
+    ret = CM_Get_Hardware_Profile_Info_ExW(ulIndex, &LocalProfileInfo,
+                                           ulFlags, hMachine);
+    if (ret == CR_SUCCESS)
+    {
+        pHWProfileInfo->HWPI_ulHWProfile = LocalProfileInfo.HWPI_ulHWProfile;
+        pHWProfileInfo->HWPI_dwFlags = LocalProfileInfo.HWPI_dwFlags;
 
-    *pdnDevInst = -1;
+        if (WideCharToMultiByte(CP_ACP,
+                                0,
+                                LocalProfileInfo.HWPI_szFriendlyName,
+                                lstrlenW(LocalProfileInfo.HWPI_szFriendlyName) + 1,
+                                pHWProfileInfo->HWPI_szFriendlyName,
+                                MAX_PROFILE_LEN,
+                                NULL,
+                                NULL) == 0)
+            ret = CR_FAILURE;
+    }
+
+    return ret;
+}
+
+
+/***********************************************************************
+ * CM_Get_Hardware_Profile_Info_ExW [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Get_Hardware_Profile_Info_ExW(
+    ULONG ulIndex, PHWPROFILEINFO_W pHWProfileInfo, ULONG ulFlags,
+    HMACHINE hMachine)
+{
+    RPC_BINDING_HANDLE BindingHandle = NULL;
+    CONFIGRET ret;
+
+    TRACE("%lu %p %lx %lx\n", ulIndex, pHWProfileInfo, ulFlags, hMachine);
+
+    if (pHWProfileInfo == 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;
+    }
+    else
+    {
+        if (!PnpGetLocalHandles(&BindingHandle, NULL))
+            return CR_FAILURE;
+    }
+
+    RpcTryExcept
+    {
+        ret = PNP_GetHwProfInfo(BindingHandle, ulIndex, pHWProfileInfo,
+                                sizeof(HWPROFILEINFO_W), 0);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
+}
+
+
+/***********************************************************************
+ * 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;
+    CONFIGRET ret;
+
+    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)
     {
@@ -2712,18 +3056,95 @@ CONFIGRET WINAPI CM_Get_Sibling_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, pLogConfInfo->dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
     RpcTryExcept
     {
-        ret = PNP_GetRelatedDeviceInstance(BindingHandle,
-                                           PNP_GET_SIBLING_DEVICE_INSTANCE,
-                                           lpDevInst,
-                                           szRelatedDevInst,
-                                           &dwLength,
-                                           0);
+        ret = PNP_GetLogConfPriority(BindingHandle,
+                                     lpDevInst,
+                                     pLogConfInfo->ulFlags,
+                                     pLogConfInfo->ulTag,
+                                     pPriority,
+                                     0);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
+}
+
+
+/***********************************************************************
+ * CM_Get_Next_Log_Conf [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Get_Next_Log_Conf(
+    PLOG_CONF plcLogConf, LOG_CONF lcLogConf, ULONG ulFlags)
+{
+    TRACE("%p %p %lx\n", plcLogConf, lcLogConf, ulFlags);
+    return CM_Get_Next_Log_Conf_Ex(plcLogConf, lcLogConf, ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Get_Next_Log_Conf_Ex [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Get_Next_Log_Conf_Ex(
+    PLOG_CONF plcLogConf, LOG_CONF lcLogConf, ULONG ulFlags,
+    HMACHINE hMachine)
+{
+    RPC_BINDING_HANDLE BindingHandle = NULL;
+    HSTRING_TABLE StringTable = NULL;
+    PLOG_CONF_INFO pLogConfInfo;
+    PLOG_CONF_INFO pNewLogConfInfo;
+    ULONG ulNewTag;
+    LPWSTR lpDevInst;
+    CONFIGRET ret;
+
+    FIXME("%p %p %lx %lx\n", plcLogConf, lcLogConf, ulFlags, hMachine);
+
+    if (plcLogConf)
+        *plcLogConf = 0;
+
+    pLogConfInfo = (PLOG_CONF_INFO)lcLogConf;
+    if (pLogConfInfo == NULL || pLogConfInfo->ulMagic != LOG_CONF_MAGIC)
+        return CR_INVALID_LOG_CONF;
+
+    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 = pSetupStringTableStringFromId(StringTable, pLogConfInfo->dnDevInst);
+    if (lpDevInst == NULL)
+        return CR_INVALID_DEVNODE;
+
+    RpcTryExcept
+    {
+        ret = PNP_GetNextLogConf(BindingHandle,
+                                 lpDevInst,
+                                 pLogConfInfo->ulFlags,
+                                 pLogConfInfo->ulTag,
+                                 &ulNewTag,
+                                 0);
     }
     RpcExcept(EXCEPTION_EXECUTE_HANDLER)
     {
@@ -2734,189 +3155,949 @@ CONFIGRET WINAPI CM_Get_Sibling_Ex(
     if (ret != CR_SUCCESS)
         return ret;
 
-    TRACE("szRelatedDevInst: %s\n", debugstr_w(szRelatedDevInst));
+    if (plcLogConf)
+    {
+        pNewLogConfInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_CONF_INFO));
+        if (pNewLogConfInfo == NULL)
+            return CR_OUT_OF_MEMORY;
 
-    dwIndex = StringTableAddString(StringTable, szRelatedDevInst, 1);
-    if (dwIndex == -1)
-        return CR_FAILURE;
+        pNewLogConfInfo->ulMagic = LOG_CONF_MAGIC;
+        pNewLogConfInfo->dnDevInst = pLogConfInfo->dnDevInst;
+        pNewLogConfInfo->ulFlags = pLogConfInfo->ulFlags;
+        pNewLogConfInfo->ulTag = ulNewTag;
 
-    *pdnDevInst = dwIndex;
+        *plcLogConf = (LOG_CONF)pNewLogConfInfo;
+    }
 
     return CR_SUCCESS;
 }
 
 
 /***********************************************************************
- * CM_Get_Version [SETUPAPI.@]
+ * CM_Get_Next_Re_Des [SETUPAPI.@]
  */
-WORD WINAPI CM_Get_Version(VOID)
+CONFIGRET WINAPI CM_Get_Next_Res_Des(
+    PRES_DES prdResDes, RES_DES rdResDes, RESOURCEID ForResource,
+    PRESOURCEID pResourceID, ULONG ulFlags)
 {
-    TRACE("\n");
-    return CM_Get_Version_Ex(NULL);
+    TRACE("%p %p %lu %p %lx\n", prdResDes, rdResDes, ForResource,
+          pResourceID, ulFlags);
+    return CM_Get_Next_Res_Des_Ex(prdResDes, rdResDes, ForResource,
+                                  pResourceID, ulFlags, NULL);
 }
 
 
 /***********************************************************************
- * CM_Get_Version_Ex [SETUPAPI.@]
+ * CM_Get_Next_Re_Des_Ex [SETUPAPI.@]
  */
-WORD WINAPI CM_Get_Version_Ex(HMACHINE hMachine)
+CONFIGRET WINAPI CM_Get_Next_Res_Des_Ex(
+    PRES_DES prdResDes, RES_DES rdResDes, RESOURCEID ForResource,
+    PRESOURCEID pResourceID, ULONG ulFlags, HMACHINE hMachine)
+{
+    FIXME("%p %p %lu %p %lx %lx\n", prdResDes, rdResDes, ForResource,
+          pResourceID, ulFlags, hMachine);
+
+    return CR_CALL_NOT_IMPLEMENTED;
+}
+
+
+/***********************************************************************
+ * CM_Get_Parent [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Get_Parent(
+    PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags)
+{
+    TRACE("%p %p %lx\n", pdnDevInst, dnDevInst, ulFlags);
+    return CM_Get_Parent_Ex(pdnDevInst, dnDevInst, ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Get_Parent_Ex [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Get_Parent_Ex(
+    PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine)
 {
+    WCHAR szRelatedDevInst[MAX_DEVICE_ID_LEN];
     RPC_BINDING_HANDLE BindingHandle = NULL;
-    WORD Version = 0;
+    HSTRING_TABLE StringTable = NULL;
+    LPWSTR lpDevInst;
+    DWORD dwIndex, dwLength = MAX_DEVICE_ID_LEN;
     CONFIGRET ret;
 
-    TRACE("%lx\n", hMachine);
+    TRACE("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine);
+
+    if (pdnDevInst == NULL)
+        return CR_INVALID_POINTER;
+
+    if (dnDevInst == 0)
+        return CR_INVALID_DEVINST;
+
+    if (ulFlags != 0)
+        return CR_INVALID_FLAG;
+
+    *pdnDevInst = -1;
 
     if (hMachine != NULL)
     {
         BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle;
         if (BindingHandle == NULL)
-            return 0;
+            return CR_FAILURE;
+
+        StringTable = ((PMACHINE_INFO)hMachine)->StringTable;
+        if (StringTable == 0)
+            return CR_FAILURE;
+    }
+    else
+    {
+        if (!PnpGetLocalHandles(&BindingHandle, &StringTable))
+            return CR_FAILURE;
+    }
+
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
+    if (lpDevInst == NULL)
+        return CR_INVALID_DEVNODE;
+
+    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;
+
+    TRACE("szRelatedDevInst: %s\n", debugstr_w(szRelatedDevInst));
+
+    dwIndex = pSetupStringTableAddString(StringTable, szRelatedDevInst, 1);
+    if (dwIndex == -1)
+        return CR_FAILURE;
+
+    *pdnDevInst = dwIndex;
+
+    return CR_SUCCESS;
+}
+
+
+/***********************************************************************
+ * CM_Get_Res_Des_Data [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Get_Res_Des_Data(
+    RES_DES rdResDes, PVOID Buffer, ULONG BufferLen, ULONG ulFlags)
+{
+    TRACE("%p %p %l %lx\n", rdResDes, Buffer, BufferLen, ulFlags);
+    return CM_Get_Res_Des_Data_Ex(rdResDes, Buffer, BufferLen, ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Get_Res_Des_Data_Ex [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Get_Res_Des_Data_Ex(
+    RES_DES rdResDes, PVOID Buffer, ULONG BufferLen, ULONG ulFlags,
+    HMACHINE hMachine)
+{
+    FIXME("%p %p %l %lx %lx\n", rdResDes, Buffer, BufferLen, ulFlags, hMachine);
+    return CR_CALL_NOT_IMPLEMENTED;
+}
+
+
+/***********************************************************************
+ * CM_Get_Res_Des_Size [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Get_Res_Des_Data_Size(
+    PULONG pulSize, RES_DES rdResDes, ULONG ulFlags)
+{
+    TRACE("%p %p %lx\n", pulSize, rdResDes, ulFlags);
+    return CM_Get_Res_Des_Data_Size_Ex(pulSize, rdResDes, ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Get_Res_Des_Size_Ex [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Get_Res_Des_Data_Size_Ex(
+    PULONG pulSize, RES_DES rdResDes, ULONG ulFlags, HMACHINE hMachine)
+{
+    TRACE("%p %p %lx %lx\n", pulSize, rdResDes, ulFlags, hMachine);
+    return CR_CALL_NOT_IMPLEMENTED;
+}
+
+
+/***********************************************************************
+ * CM_Get_Sibling [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Get_Sibling(
+    PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags)
+{
+    TRACE("%p %p %lx\n", pdnDevInst, dnDevInst, ulFlags);
+    return CM_Get_Sibling_Ex(pdnDevInst, dnDevInst, ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Get_Sibling_Ex [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Get_Sibling_Ex(
+    PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine)
+{
+    WCHAR szRelatedDevInst[MAX_DEVICE_ID_LEN];
+    RPC_BINDING_HANDLE BindingHandle = NULL;
+    HSTRING_TABLE StringTable = NULL;
+    LPWSTR lpDevInst;
+    DWORD dwIndex, dwLength = MAX_DEVICE_ID_LEN;
+    CONFIGRET ret;
+
+    TRACE("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine);
+
+    if (pdnDevInst == NULL)
+        return CR_INVALID_POINTER;
+
+    if (dnDevInst == 0)
+        return CR_INVALID_DEVINST;
+
+    if (ulFlags != 0)
+        return CR_INVALID_FLAG;
+
+    *pdnDevInst = -1;
+
+    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 = pSetupStringTableStringFromId(StringTable, dnDevInst);
+    if (lpDevInst == NULL)
+        return CR_INVALID_DEVNODE;
+
+    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;
+
+    TRACE("szRelatedDevInst: %s\n", debugstr_w(szRelatedDevInst));
+
+    dwIndex = pSetupStringTableAddString(StringTable, szRelatedDevInst, 1);
+    if (dwIndex == -1)
+        return CR_FAILURE;
+
+    *pdnDevInst = dwIndex;
+
+    return CR_SUCCESS;
+}
+
+
+/***********************************************************************
+ * CM_Get_Version [SETUPAPI.@]
+ */
+WORD WINAPI CM_Get_Version(VOID)
+{
+    TRACE("\n");
+    return CM_Get_Version_Ex(NULL);
+}
+
+
+/***********************************************************************
+ * CM_Get_Version_Ex [SETUPAPI.@]
+ */
+WORD WINAPI CM_Get_Version_Ex(HMACHINE hMachine)
+{
+    RPC_BINDING_HANDLE BindingHandle = NULL;
+    WORD Version = 0;
+    CONFIGRET ret;
+
+    TRACE("%lx\n", hMachine);
+
+    if (hMachine != NULL)
+    {
+        BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle;
+        if (BindingHandle == NULL)
+            return 0;
+    }
+    else
+    {
+        if (!PnpGetLocalHandles(&BindingHandle, NULL))
+            return CR_FAILURE;
+    }
+
+    RpcTryExcept
+    {
+        ret = PNP_GetVersion(BindingHandle, &Version);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    if (ret != CR_SUCCESS)
+        return 0;
+
+    return Version;
+}
+
+
+/***********************************************************************
+ * CM_Is_Dock_Station_Present [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Is_Dock_Station_Present(
+    PBOOL pbPresent)
+{
+    TRACE("%p\n", pbPresent);
+    return CM_Is_Dock_Station_Present_Ex(pbPresent, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Is_Dock_Station_Present_Ex [SETUPAPI.@]
+ */
+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);
+
+    if (pbPresent == NULL)
+        return CR_INVALID_POINTER;
+
+    *pbPresent = FALSE;
+
+    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_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);
+}
+
+
+/***********************************************************************
+ * CM_Locate_DevNodeA [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Locate_DevNodeA(
+    PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags)
+{
+    TRACE("%p %s %lu\n", pdnDevInst, pDeviceID, ulFlags);
+    return CM_Locate_DevNode_ExA(pdnDevInst, pDeviceID, ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Locate_DevNodeW [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Locate_DevNodeW(
+    PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, ULONG ulFlags)
+{
+    TRACE("%p %s %lu\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags);
+    return CM_Locate_DevNode_ExW(pdnDevInst, pDeviceID, ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Locate_DevNode_ExA [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Locate_DevNode_ExA(
+    PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags, HMACHINE hMachine)
+{
+    DEVINSTID_W pDevIdW = NULL;
+    CONFIGRET ret = CR_SUCCESS;
+
+    TRACE("%p %s %lu %lx\n", pdnDevInst, pDeviceID, ulFlags, hMachine);
+
+    if (pDeviceID != NULL)
+    {
+       if (pSetupCaptureAndConvertAnsiArg(pDeviceID, &pDevIdW))
+         return CR_INVALID_DEVICE_ID;
+    }
+
+    ret = CM_Locate_DevNode_ExW(pdnDevInst, pDevIdW, ulFlags, hMachine);
+
+    if (pDevIdW != NULL)
+        MyFree(pDevIdW);
+
+    return ret;
+}
+
+
+/***********************************************************************
+ * CM_Locate_DevNode_ExW [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Locate_DevNode_ExW(
+    PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, ULONG ulFlags, HMACHINE hMachine)
+{
+    WCHAR DeviceIdBuffer[MAX_DEVICE_ID_LEN];
+    RPC_BINDING_HANDLE BindingHandle = NULL;
+    HSTRING_TABLE StringTable = NULL;
+    CONFIGRET ret = CR_SUCCESS;
+
+    TRACE("%p %s %lu %lx\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags, hMachine);
+
+    if (pdnDevInst == NULL)
+        return CR_INVALID_POINTER;
+
+    if (ulFlags & ~CM_LOCATE_DEVNODE_BITS)
+        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;
+    }
+
+    if (pDeviceID != NULL && lstrlenW(pDeviceID) != 0)
+    {
+        lstrcpyW(DeviceIdBuffer, pDeviceID);
+    }
+    else
+    {
+        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));
+
+    RpcTryExcept
+    {
+        /* Validate the device ID */
+        ret = PNP_ValidateDeviceInstance(BindingHandle,
+                                         DeviceIdBuffer,
+                                         ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    if (ret == CR_SUCCESS)
+    {
+        *pdnDevInst = pSetupStringTableAddString(StringTable, DeviceIdBuffer, 1);
+        if (*pdnDevInst == -1)
+            ret = CR_FAILURE;
+    }
+
+    return ret;
+}
+
+
+/***********************************************************************
+ * CM_Modify_Res_Des [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Modify_Res_Des(
+    PRES_DES prdResDes, RES_DES rdResDes, RESOURCEID ResourceID,
+    PCVOID ResourceData, ULONG ResourceLen, ULONG ulFlags)
+{
+    TRACE("%p %p %lx %p %lu %lx", prdResDes, rdResDes, ResourceID, ResourceData,
+          ResourceLen, ulFlags);
+    return CM_Modify_Res_Des_Ex(prdResDes, rdResDes, ResourceID, ResourceData,
+                                ResourceLen, ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Modify_Res_Des_Ex [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Modify_Res_Des_Ex(
+    PRES_DES prdResDes, RES_DES rdResDes, RESOURCEID ResourceID, PCVOID ResourceData,
+    ULONG ResourceLen, ULONG ulFlags, HMACHINE hMachine)
+{
+    FIXME("%p %p %lx %p %lu %lx %lx", prdResDes, rdResDes, ResourceID, ResourceData,
+          ResourceLen, ulFlags, hMachine);
+    return CR_CALL_NOT_IMPLEMENTED;
+}
+
+
+/***********************************************************************
+ * CM_Move_DevNode [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Move_DevNode(
+    DEVINST dnFromDevInst, DEVINST dnToDevInst, ULONG ulFlags)
+{
+    TRACE("%lx %lx %lx\n", dnFromDevInst, dnToDevInst, ulFlags);
+    return CM_Move_DevNode_Ex(dnFromDevInst, dnToDevInst, ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Move_DevNode_Ex [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Move_DevNode_Ex(
+    DEVINST dnFromDevInst, DEVINST dnToDevInst, ULONG ulFlags,
+    HMACHINE hMachine)
+{
+    RPC_BINDING_HANDLE BindingHandle = NULL;
+    HSTRING_TABLE StringTable = NULL;
+    LPWSTR lpFromDevInst;
+    LPWSTR lpToDevInst;
+    CONFIGRET ret;
+
+    FIXME("%lx %lx %lx %lx\n",
+          dnFromDevInst, dnToDevInst, ulFlags, hMachine);
+
+    if (!pSetupIsUserAdmin())
+        return CR_ACCESS_DENIED;
+
+    if (dnFromDevInst == 0 || dnToDevInst == 0)
+        return CR_INVALID_DEVNODE;
+
+    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;
+    }
+
+    lpFromDevInst = pSetupStringTableStringFromId(StringTable, dnFromDevInst);
+    if (lpFromDevInst == NULL)
+        return CR_INVALID_DEVNODE;
+
+    lpToDevInst = pSetupStringTableStringFromId(StringTable, dnToDevInst);
+    if (lpToDevInst == NULL)
+        return CR_INVALID_DEVNODE;
+
+    RpcTryExcept
+    {
+        ret = PNP_DeviceInstanceAction(BindingHandle,
+                                       PNP_DEVINST_MOVE,
+                                       ulFlags,
+                                       lpFromDevInst,
+                                       lpToDevInst);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
+}
+
+
+/***********************************************************************
+ * CM_Open_Class_KeyA [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Open_Class_KeyA(
+    LPGUID pClassGuid, LPCSTR pszClassName, REGSAM samDesired,
+    REGDISPOSITION Disposition, PHKEY phkClass, ULONG ulFlags)
+{
+    TRACE("%p %s %lx %lx %p %lx\n",
+          debugstr_guid(pClassGuid), pszClassName,
+          samDesired, Disposition, phkClass, ulFlags);
+
+    return CM_Open_Class_Key_ExA(pClassGuid, pszClassName, samDesired,
+                                 Disposition, phkClass, ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Open_Class_KeyW [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Open_Class_KeyW(
+    LPGUID pClassGuid, LPCWSTR pszClassName, REGSAM samDesired,
+    REGDISPOSITION Disposition, PHKEY phkClass, ULONG ulFlags)
+{
+    TRACE("%p %s %lx %lx %p %lx\n",
+          debugstr_guid(pClassGuid), debugstr_w(pszClassName),
+          samDesired, Disposition, phkClass, ulFlags);
+
+    return CM_Open_Class_Key_ExW(pClassGuid, pszClassName, samDesired,
+                                 Disposition, phkClass, ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Open_Class_Key_ExA [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Open_Class_Key_ExA(
+    LPGUID pClassGuid, LPCSTR pszClassName, REGSAM samDesired,
+    REGDISPOSITION Disposition, PHKEY phkClass, ULONG ulFlags,
+    HMACHINE hMachine)
+{
+    CONFIGRET rc = CR_SUCCESS;
+    LPWSTR pszClassNameW = NULL;
+
+    TRACE("%p %s %lx %lx %p %lx %lx\n",
+          debugstr_guid(pClassGuid), pszClassName,
+          samDesired, Disposition, phkClass, ulFlags, hMachine);
+
+    if (pszClassName != NULL)
+    {
+       if (pSetupCaptureAndConvertAnsiArg(pszClassName, &pszClassNameW))
+         return CR_INVALID_DATA;
+    }
+
+    rc = CM_Open_Class_Key_ExW(pClassGuid, pszClassNameW, samDesired,
+                               Disposition, phkClass, ulFlags, hMachine);
+
+    if (pszClassNameW != NULL)
+        MyFree(pszClassNameW);
+
+    return CR_SUCCESS;
+}
+
+
+/***********************************************************************
+ * CM_Open_Class_Key_ExW [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Open_Class_Key_ExW(
+    LPGUID pClassGuid, LPCWSTR pszClassName, REGSAM samDesired,
+    REGDISPOSITION Disposition, PHKEY phkClass, ULONG ulFlags,
+    HMACHINE hMachine)
+{
+    WCHAR szKeyName[MAX_PATH];
+    LPWSTR lpGuidString;
+    DWORD dwDisposition;
+    DWORD dwError;
+    HKEY hKey;
+
+    TRACE("%p %s %lx %lx %p %lx %lx\n",
+          debugstr_guid(pClassGuid), debugstr_w(pszClassName),
+          samDesired, Disposition, phkClass, ulFlags, hMachine);
+
+    /* Check Disposition and ulFlags */
+    if ((Disposition & ~RegDisposition_Bits) ||
+        (ulFlags & ~CM_OPEN_CLASS_KEY_BITS))
+        return CR_INVALID_FLAG;
+
+    /* Check phkClass */
+    if (phkClass == NULL)
+        return CR_INVALID_POINTER;
+
+    *phkClass = NULL;
+
+    if (ulFlags == CM_OPEN_CLASS_KEY_INTERFACE &&
+        pszClassName != NULL)
+        return CR_INVALID_DATA;
+
+    if (hMachine == NULL)
+    {
+        hKey = HKEY_LOCAL_MACHINE;
+    }
+    else
+    {
+       if (RegConnectRegistryW(((PMACHINE_INFO)hMachine)->szMachineName,
+                               HKEY_LOCAL_MACHINE, &hKey))
+           return CR_REGISTRY_ERROR;
+    }
+
+    if (ulFlags & CM_OPEN_CLASS_KEY_INTERFACE)
+    {
+        lstrcpyW(szKeyName, DeviceClasses);
+    }
+    else
+    {
+        lstrcpyW(szKeyName, ControlClass);
+    }
+
+    if (pClassGuid != NULL)
+    {
+        if (UuidToStringW((UUID*)pClassGuid, &lpGuidString) != RPC_S_OK)
+        {
+            RegCloseKey(hKey);
+            return CR_INVALID_DATA;
+        }
+
+        lstrcatW(szKeyName, Backslash);
+        lstrcatW(szKeyName, lpGuidString);
+    }
+
+    if (Disposition == RegDisposition_OpenAlways)
+    {
+        dwError = RegCreateKeyExW(hKey, szKeyName, 0, NULL, 0, samDesired,
+                                  NULL, phkClass, &dwDisposition);
     }
     else
     {
-        if (!PnpGetLocalHandles(&BindingHandle, NULL))
-            return CR_FAILURE;
+        dwError = RegOpenKeyExW(hKey, szKeyName, 0, samDesired, phkClass);
     }
 
-    RpcTryExcept
+    RegCloseKey(hKey);
+
+    if (pClassGuid != NULL)
+        RpcStringFreeW(&lpGuidString);
+
+    if (dwError != ERROR_SUCCESS)
     {
-        ret = PNP_GetVersion(BindingHandle, &Version);
+        *phkClass = NULL;
+        return CR_NO_SUCH_REGISTRY_KEY;
     }
-    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+
+    if (pszClassName != NULL)
     {
-        ret = RpcStatusToCmStatus(RpcExceptionCode());
+        RegSetValueExW(*phkClass, Class, 0, REG_SZ, (LPBYTE)pszClassName,
+                       (lstrlenW(pszClassName) + 1) * sizeof(WCHAR));
     }
-    RpcEndExcept;
-
-    if (ret != CR_SUCCESS)
-        return 0;
 
-    return Version;
+    return CR_SUCCESS;
 }
 
 
 /***********************************************************************
- * CM_Is_Dock_Station_Present [SETUPAPI.@]
+ * CM_Open_DevNode_Key [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Is_Dock_Station_Present(
-    PBOOL pbPresent)
+CONFIGRET WINAPI CM_Open_DevNode_Key(
+    DEVINST dnDevNode, REGSAM samDesired, ULONG ulHardwareProfile,
+    REGDISPOSITION Disposition, PHKEY phkDevice, ULONG ulFlags)
 {
-    TRACE("%p\n", pbPresent);
-    return CM_Is_Dock_Station_Present_Ex(pbPresent, NULL);
+    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_Is_Dock_Station_Present_Ex [SETUPAPI.@]
+ * CM_Open_DevNode_Key_Ex [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Is_Dock_Station_Present_Ex(
-    PBOOL pbPresent, HMACHINE hMachine)
+CONFIGRET WINAPI CM_Open_DevNode_Key_Ex(
+    DEVINST dnDevNode, REGSAM samDesired, ULONG ulHardwareProfile,
+    REGDISPOSITION Disposition, PHKEY phkDevice, ULONG ulFlags,
+    HMACHINE hMachine)
 {
-    RPC_BINDING_HANDLE BindingHandle = NULL;
-    CONFIGRET ret;
-
-    TRACE("%p %lx\n", pbPresent, hMachine);
-
-    if (pbPresent == NULL)
-        return CR_INVALID_POINTER;
-
-    *pbPresent = FALSE;
-
-    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_IsDockStationPresent(BindingHandle,
-                                       pbPresent);
-    }
-    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
-    {
-        ret = RpcStatusToCmStatus(RpcExceptionCode());
-    }
-    RpcEndExcept;
+    FIXME("%lx %lx %lu %lx %p %lx %lx\n", dnDevNode, samDesired,
+          ulHardwareProfile, Disposition, phkDevice, ulFlags, hMachine);
 
-    return ret;
+    return CR_CALL_NOT_IMPLEMENTED;
 }
 
 
 /***********************************************************************
- * CM_Locate_DevNodeA [SETUPAPI.@]
+ * CM_Query_And_Remove_SubTreeA [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Locate_DevNodeA(
-    PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags)
+CONFIGRET WINAPI CM_Query_And_Remove_SubTreeA(
+    DEVINST dnAncestor, PPNP_VETO_TYPE pVetoType, LPSTR pszVetoName,
+    ULONG ulNameLength, ULONG ulFlags)
 {
-    TRACE("%p %s %lu\n", pdnDevInst, pDeviceID, ulFlags);
-    return CM_Locate_DevNode_ExA(pdnDevInst, pDeviceID, ulFlags, NULL);
+    TRACE("%lx %p %s %lu %lx\n", dnAncestor, pVetoType, pszVetoName,
+          ulNameLength, ulFlags);
+
+    return CM_Query_And_Remove_SubTree_ExA(dnAncestor, pVetoType, pszVetoName,
+                                           ulNameLength, ulFlags, NULL);
 }
 
 
 /***********************************************************************
- * CM_Locate_DevNodeW [SETUPAPI.@]
+ * CM_Query_And_Remove_SubTreeW [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Locate_DevNodeW(
-    PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, ULONG ulFlags)
+CONFIGRET WINAPI CM_Query_And_Remove_SubTreeW(
+    DEVINST dnAncestor, PPNP_VETO_TYPE pVetoType, LPWSTR pszVetoName,
+    ULONG ulNameLength, ULONG ulFlags)
 {
-    TRACE("%p %s %lu\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags);
-    return CM_Locate_DevNode_ExW(pdnDevInst, pDeviceID, ulFlags, NULL);
+    TRACE("%lx %p %s %lu %lx\n", dnAncestor, pVetoType,
+          debugstr_w(pszVetoName), ulNameLength, ulFlags);
+
+    return CM_Query_And_Remove_SubTree_ExW(dnAncestor, pVetoType, pszVetoName,
+                                           ulNameLength, ulFlags, NULL);
 }
 
 
 /***********************************************************************
- * CM_Locate_DevNode_ExA [SETUPAPI.@]
+ * CM_Query_And_Remove_SubTree_ExA [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Locate_DevNode_ExA(
-    PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags, HMACHINE hMachine)
+CONFIGRET WINAPI CM_Query_And_Remove_SubTree_ExA(
+    DEVINST dnAncestor, PPNP_VETO_TYPE pVetoType, LPSTR pszVetoName,
+    ULONG ulNameLength, ULONG ulFlags, HMACHINE hMachine)
 {
-    DEVINSTID_W pDevIdW = NULL;
-    CONFIGRET ret = CR_SUCCESS;
+    LPWSTR lpLocalVetoName;
+    CONFIGRET ret;
 
-    TRACE("%p %s %lu %lx\n", pdnDevInst, pDeviceID, ulFlags, hMachine);
+    TRACE("%lx %p %s %lu %lx %lx\n", dnAncestor, pVetoType, pszVetoName,
+          ulNameLength, ulFlags, hMachine);
 
-    if (pDeviceID != NULL)
+    if (pszVetoName == NULL && ulNameLength == 0)
+        return CR_INVALID_POINTER;
+
+    lpLocalVetoName = HeapAlloc(GetProcessHeap(), 0, ulNameLength * sizeof(WCHAR));
+    if (lpLocalVetoName == NULL)
+        return CR_OUT_OF_MEMORY;
+
+    ret = CM_Query_And_Remove_SubTree_ExW(dnAncestor, pVetoType, lpLocalVetoName,
+                                          ulNameLength, ulFlags, hMachine);
+    if (ret == CR_REMOVE_VETOED)
     {
-       if (CaptureAndConvertAnsiArg(pDeviceID, &pDevIdW))
-         return CR_INVALID_DEVICE_ID;
+        if (WideCharToMultiByte(CP_ACP,
+                                0,
+                                lpLocalVetoName,
+                                ulNameLength,
+                                pszVetoName,
+                                ulNameLength,
+                                NULL,
+                                NULL) == 0)
+            ret = CR_FAILURE;
     }
 
-    ret = CM_Locate_DevNode_ExW(pdnDevInst, pDevIdW, ulFlags, hMachine);
-
-    if (pDevIdW != NULL)
-        MyFree(pDevIdW);
+    HeapFree(GetProcessHeap(), 0, lpLocalVetoName);
 
     return ret;
 }
 
 
 /***********************************************************************
- * CM_Locate_DevNode_ExW [SETUPAPI.@]
+ * CM_Query_And_Remove_SubTree_ExW [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Locate_DevNode_ExW(
-    PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, ULONG ulFlags, HMACHINE hMachine)
+CONFIGRET WINAPI CM_Query_And_Remove_SubTree_ExW(
+    DEVINST dnAncestor, PPNP_VETO_TYPE pVetoType, LPWSTR pszVetoName,
+    ULONG ulNameLength, ULONG ulFlags, HMACHINE hMachine)
 {
-    WCHAR DeviceIdBuffer[MAX_DEVICE_ID_LEN];
     RPC_BINDING_HANDLE BindingHandle = NULL;
     HSTRING_TABLE StringTable = NULL;
-    CONFIGRET ret = CR_SUCCESS;
+    LPWSTR lpDevInst;
+    CONFIGRET ret;
 
-    TRACE("%p %s %lu %lx\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags, hMachine);
+    TRACE("%lx %p %s %lu %lx %lx\n", dnAncestor, pVetoType,
+          debugstr_w(pszVetoName), ulNameLength, ulFlags, hMachine);
 
-    if (pdnDevInst == NULL)
-        return CR_INVALID_POINTER;
+    if (dnAncestor == 0)
+        return CR_INVALID_DEVNODE;
 
-    if (ulFlags & ~CM_LOCATE_DEVNODE_BITS)
+    if (ulFlags & ~CM_REMOVE_BITS)
         return CR_INVALID_FLAG;
 
+    if (pszVetoName == NULL && ulNameLength == 0)
+        return CR_INVALID_POINTER;
+
     if (hMachine != NULL)
     {
         BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle;
@@ -2933,36 +4114,18 @@ CONFIGRET WINAPI CM_Locate_DevNode_ExW(
             return CR_FAILURE;
     }
 
-    if (pDeviceID != NULL && lstrlenW(pDeviceID) != 0)
-    {
-        lstrcpyW(DeviceIdBuffer, pDeviceID);
-    }
-    else
-    {
-        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));
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnAncestor);
+    if (lpDevInst == NULL)
+        return CR_INVALID_DEVNODE;
 
     RpcTryExcept
     {
-        /* Validate the device ID */
-        ret = PNP_ValidateDeviceInstance(BindingHandle,
-                                         DeviceIdBuffer,
-                                         ulFlags);
+        ret = PNP_QueryRemove(BindingHandle,
+                              lpDevInst,
+                              pVetoType,
+                              pszVetoName,
+                              ulNameLength,
+                              ulFlags);
     }
     RpcExcept(EXCEPTION_EXECUTE_HANDLER)
     {
@@ -2970,51 +4133,65 @@ CONFIGRET WINAPI CM_Locate_DevNode_ExW(
     }
     RpcEndExcept;
 
-    if (ret == CR_SUCCESS)
-    {
-        *pdnDevInst = StringTableAddString(StringTable, DeviceIdBuffer, 1);
-        if (*pdnDevInst == -1)
-            ret = CR_FAILURE;
-    }
-
     return ret;
 }
 
 
 /***********************************************************************
- * CM_Move_DevNode [SETUPAPI.@]
+ * CM_Query_Remove_SubTree [SETUPAPI.@]
+ *
+ * This function is obsolete in Windows XP and above.
  */
-CONFIGRET WINAPI CM_Move_DevNode(
-    DEVINST dnFromDevInst, DEVINST dnToDevInst, ULONG ulFlags)
+CONFIGRET WINAPI CM_Query_Remove_SubTree(
+    DEVINST dnAncestor, ULONG ulFlags)
 {
-    TRACE("%lx %lx %lx\n", dnFromDevInst, dnToDevInst, ulFlags);
-    return CM_Move_DevNode_Ex(dnFromDevInst, dnToDevInst, ulFlags, NULL);
+    TRACE("%lx %lx\n", dnAncestor, ulFlags);
+    return CR_CALL_NOT_IMPLEMENTED;
 }
 
 
 /***********************************************************************
- * CM_Move_DevNode_Ex [SETUPAPI.@]
+ * CM_Query_Remove_SubTree_Ex [SETUPAPI.@]
+ *
+ * This function is obsolete in Windows XP and above.
  */
-CONFIGRET WINAPI CM_Move_DevNode_Ex(
-    DEVINST dnFromDevInst, DEVINST dnToDevInst, ULONG ulFlags,
-    HMACHINE hMachine)
+CONFIGRET WINAPI CM_Query_Remove_SubTree_Ex(
+    DEVINST dnAncestor, ULONG ulFlags, HMACHINE hMachine)
+{
+    TRACE("%lx %lx %lx\n", dnAncestor, ulFlags, hMachine);
+    return CR_CALL_NOT_IMPLEMENTED;
+}
+
+
+/***********************************************************************
+ * CM_Reenumerate_DevNode [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Reenumerate_DevNode(
+    DEVINST dnDevInst, ULONG ulFlags)
+{
+    TRACE("%lx %lx\n", dnDevInst, ulFlags);
+    return CM_Reenumerate_DevNode_Ex(dnDevInst, ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Reenumerate_DevNode_Ex [SETUPAPI.@]
+ */
+CONFIGRET WINAPI
+CM_Reenumerate_DevNode_Ex(
+    DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine)
 {
     RPC_BINDING_HANDLE BindingHandle = NULL;
     HSTRING_TABLE StringTable = NULL;
-    LPWSTR lpFromDevInst;
-    LPWSTR lpToDevInst;
+    LPWSTR lpDevInst;
     CONFIGRET ret;
 
-    FIXME("%lx %lx %lx %lx\n",
-          dnFromDevInst, dnToDevInst, ulFlags, hMachine);
-
-    if (!IsUserAdmin())
-        return CR_ACCESS_DENIED;
+    FIXME("%lx %lx %lx\n", dnDevInst, ulFlags, hMachine);
 
-    if (dnFromDevInst == 0 || dnToDevInst == 0)
+    if (dnDevInst == 0)
         return CR_INVALID_DEVNODE;
 
-    if (ulFlags != 0)
+    if (ulFlags & ~CM_REENUMERATE_BITS)
         return CR_INVALID_FLAG;
 
     if (hMachine != NULL)
@@ -3033,21 +4210,17 @@ CONFIGRET WINAPI CM_Move_DevNode_Ex(
             return CR_FAILURE;
     }
 
-    lpFromDevInst = StringTableStringFromId(StringTable, dnFromDevInst);
-    if (lpFromDevInst == NULL)
-        return CR_INVALID_DEVNODE;
-
-    lpToDevInst = StringTableStringFromId(StringTable, dnToDevInst);
-    if (lpToDevInst == NULL)
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
+    if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
     RpcTryExcept
     {
         ret = PNP_DeviceInstanceAction(BindingHandle,
-                                       PNP_DEVINST_MOVE,
+                                       PNP_DEVINST_REENUMERATE,
                                        ulFlags,
-                                       lpFromDevInst,
-                                       lpToDevInst);
+                                       lpDevInst,
+                                       NULL);
     }
     RpcExcept(EXCEPTION_EXECUTE_HANDLER)
     {
@@ -3060,224 +4233,292 @@ CONFIGRET WINAPI CM_Move_DevNode_Ex(
 
 
 /***********************************************************************
- * CM_Open_Class_KeyA [SETUPAPI.@]
+ * CM_Register_Device_InterfaceA [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Open_Class_KeyA(
-    LPGUID pClassGuid, LPCSTR pszClassName, REGSAM samDesired,
-    REGDISPOSITION Disposition, PHKEY phkClass, ULONG ulFlags)
+CONFIGRET WINAPI CM_Register_Device_InterfaceA(
+    DEVINST dnDevInst, LPGUID InterfaceClassGuid, LPCSTR pszReference,
+    LPSTR pszDeviceInterface, PULONG pulLength, ULONG ulFlags)
 {
-    TRACE("%p %s %lx %lx %p %lx\n",
-          debugstr_guid(pClassGuid), pszClassName,
-          samDesired, Disposition, phkClass, ulFlags);
+    TRACE("%lx %s %s %p %p %lx\n", dnDevInst, debugstr_guid(InterfaceClassGuid),
+          pszReference, pszDeviceInterface, pulLength, ulFlags);
 
-    return CM_Open_Class_Key_ExA(pClassGuid, pszClassName, samDesired,
-                                 Disposition, phkClass, ulFlags, NULL);
+    return CM_Register_Device_Interface_ExA(dnDevInst, InterfaceClassGuid,
+                                            pszReference, pszDeviceInterface,
+                                            pulLength, ulFlags, NULL);
 }
 
 
 /***********************************************************************
- * CM_Open_Class_KeyW [SETUPAPI.@]
+ * CM_Register_Device_InterfaceW [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Open_Class_KeyW(
-    LPGUID pClassGuid, LPCWSTR pszClassName, REGSAM samDesired,
-    REGDISPOSITION Disposition, PHKEY phkClass, ULONG ulFlags)
+CONFIGRET WINAPI CM_Register_Device_InterfaceW(
+    DEVINST dnDevInst, LPGUID InterfaceClassGuid, LPCWSTR pszReference,
+    LPWSTR pszDeviceInterface, PULONG pulLength, ULONG ulFlags)
 {
-    TRACE("%p %s %lx %lx %p %lx\n",
-          debugstr_guid(pClassGuid), debugstr_w(pszClassName),
-          samDesired, Disposition, phkClass, ulFlags);
+    TRACE("%lx %s %s %p %p %lx\n", dnDevInst, debugstr_guid(InterfaceClassGuid),
+          debugstr_w(pszReference), pszDeviceInterface, pulLength, ulFlags);
 
-    return CM_Open_Class_Key_ExW(pClassGuid, pszClassName, samDesired,
-                                 Disposition, phkClass, ulFlags, NULL);
+    return CM_Register_Device_Interface_ExW(dnDevInst, InterfaceClassGuid,
+                                            pszReference, pszDeviceInterface,
+                                            pulLength, ulFlags, NULL);
 }
 
 
-/***********************************************************************
- * CM_Open_Class_Key_ExA [SETUPAPI.@]
- */
-CONFIGRET WINAPI CM_Open_Class_Key_ExA(
-    LPGUID pClassGuid, LPCSTR pszClassName, REGSAM samDesired,
-    REGDISPOSITION Disposition, PHKEY phkClass, ULONG ulFlags,
-    HMACHINE hMachine)
-{
-    CONFIGRET rc = CR_SUCCESS;
-    LPWSTR pszClassNameW = NULL;
+/***********************************************************************
+ * CM_Register_Device_Interface_ExA [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Register_Device_Interface_ExA(
+    DEVINST dnDevInst, LPGUID InterfaceClassGuid, LPCSTR pszReference,
+    LPSTR pszDeviceInterface, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine)
+{
+    LPWSTR pszReferenceW = NULL;
+    LPWSTR pszDeviceInterfaceW = NULL;
+    ULONG ulLength;
+    CONFIGRET ret;
+
+    TRACE("%lx %s %s %p %p %lx %lx\n", dnDevInst, debugstr_guid(InterfaceClassGuid),
+          pszReference, pszDeviceInterface, pulLength, ulFlags, hMachine);
+
+    if (pulLength == NULL || pszDeviceInterface == NULL)
+        return CR_INVALID_POINTER;
+
+    if (pszReference != NULL)
+    {
+        if (pSetupCaptureAndConvertAnsiArg(pszReference, &pszReferenceW))
+            return CR_INVALID_DATA;
+    }
+
+    ulLength = *pulLength;
 
-    TRACE("%p %s %lx %lx %p %lx %lx\n",
-          debugstr_guid(pClassGuid), pszClassName,
-          samDesired, Disposition, phkClass, ulFlags, hMachine);
+    pszDeviceInterfaceW = HeapAlloc(GetProcessHeap(), 0, ulLength * sizeof(WCHAR));
+    if (pszDeviceInterfaceW == NULL)
+    {
+        ret = CR_OUT_OF_MEMORY;
+        goto Done;
+    }
 
-    if (pszClassName != NULL)
+    ret = CM_Register_Device_Interface_ExW(dnDevInst,
+                                           InterfaceClassGuid,
+                                           pszReferenceW,
+                                           pszDeviceInterfaceW,
+                                           &ulLength,
+                                           ulFlags,
+                                           hMachine);
+    if (ret == CR_SUCCESS)
     {
-       if (CaptureAndConvertAnsiArg(pszClassName, &pszClassNameW))
-         return CR_INVALID_DATA;
+        if (WideCharToMultiByte(CP_ACP,
+                                0,
+                                pszDeviceInterfaceW,
+                                ulLength,
+                                pszDeviceInterface,
+                                *pulLength,
+                                NULL,
+                                NULL) == 0)
+            ret = CR_FAILURE;
     }
 
-    rc = CM_Open_Class_Key_ExW(pClassGuid, pszClassNameW, samDesired,
-                               Disposition, phkClass, ulFlags, hMachine);
+    *pulLength = ulLength;
 
-    if (pszClassNameW != NULL)
-        MyFree(pszClassNameW);
+Done:
+    if (pszDeviceInterfaceW != NULL)
+        HeapFree(GetProcessHeap(), 0, pszDeviceInterfaceW);
 
-    return CR_SUCCESS;
+    if (pszReferenceW != NULL)
+        MyFree(pszReferenceW);
+
+    return ret;
 }
 
 
 /***********************************************************************
- * CM_Open_Class_Key_ExW [SETUPAPI.@]
+ * CM_Register_Device_Interface_ExW [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Open_Class_Key_ExW(
-    LPGUID pClassGuid, LPCWSTR pszClassName, REGSAM samDesired,
-    REGDISPOSITION Disposition, PHKEY phkClass, ULONG ulFlags,
-    HMACHINE hMachine)
+CONFIGRET WINAPI CM_Register_Device_Interface_ExW(
+    DEVINST dnDevInst, LPGUID InterfaceClassGuid, LPCWSTR pszReference,
+    LPWSTR pszDeviceInterface, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine)
 {
-    WCHAR szKeyName[MAX_PATH];
-    LPWSTR lpGuidString;
-    DWORD dwDisposition;
-    DWORD dwError;
-    HKEY hKey;
+    RPC_BINDING_HANDLE BindingHandle = NULL;
+    HSTRING_TABLE StringTable = NULL;
+    LPWSTR lpDevInst;
+    ULONG ulTransferLength;
+    CONFIGRET ret;
 
-    TRACE("%p %s %lx %lx %p %lx %lx\n",
-          debugstr_guid(pClassGuid), debugstr_w(pszClassName),
-          samDesired, Disposition, phkClass, ulFlags, hMachine);
+    TRACE("%lx %s %s %p %p %lx %lx\n", dnDevInst, debugstr_guid(InterfaceClassGuid),
+          debugstr_w(pszReference), pszDeviceInterface, pulLength, ulFlags, hMachine);
 
-    /* Check Disposition and ulFlags */
-    if ((Disposition & ~RegDisposition_Bits) ||
-        (ulFlags & ~CM_OPEN_CLASS_KEY_BITS))
-        return CR_INVALID_FLAG;
+    if (dnDevInst == 0)
+        return CR_INVALID_DEVNODE;
 
-    /* Check phkClass */
-    if (phkClass == NULL)
+    if (InterfaceClassGuid == NULL ||
+        pszDeviceInterface == NULL ||
+        pulLength == NULL)
         return CR_INVALID_POINTER;
 
-    *phkClass = NULL;
-
-    if (ulFlags == CM_OPEN_CLASS_KEY_INTERFACE &&
-        pszClassName != NULL)
-        return CR_INVALID_DATA;
+    if (ulFlags != 0)
+        return CR_INVALID_FLAG;
 
-    if (hMachine == NULL)
-    {
-        hKey = HKEY_LOCAL_MACHINE;
-    }
-    else
+    if (hMachine != NULL)
     {
-       if (RegConnectRegistryW(((PMACHINE_INFO)hMachine)->szMachineName,
-                               HKEY_LOCAL_MACHINE, &hKey))
-           return CR_REGISTRY_ERROR;
-    }
+        BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle;
+        if (BindingHandle == NULL)
+            return CR_FAILURE;
 
-    if (ulFlags & CM_OPEN_CLASS_KEY_INTERFACE)
-    {
-        lstrcpyW(szKeyName, DeviceClasses);
+        StringTable = ((PMACHINE_INFO)hMachine)->StringTable;
+        if (StringTable == 0)
+            return CR_FAILURE;
     }
     else
     {
-        lstrcpyW(szKeyName, ControlClass);
+        if (!PnpGetLocalHandles(&BindingHandle, &StringTable))
+            return CR_FAILURE;
     }
 
-    if (pClassGuid != NULL)
-    {
-        if (UuidToStringW((UUID*)pClassGuid, &lpGuidString) != RPC_S_OK)
-        {
-            RegCloseKey(hKey);
-            return CR_INVALID_DATA;
-        }
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
+    if (lpDevInst == NULL)
+        return CR_INVALID_DEVNODE;
 
-        lstrcatW(szKeyName, Backslash);
-        lstrcatW(szKeyName, lpGuidString);
-    }
+    ulTransferLength = *pulLength;
 
-    if (Disposition == RegDisposition_OpenAlways)
+    RpcTryExcept
     {
-        dwError = RegCreateKeyExW(hKey, szKeyName, 0, NULL, 0, samDesired,
-                                  NULL, phkClass, &dwDisposition);
+        ret = PNP_RegisterDeviceClassAssociation(BindingHandle,
+                                                 lpDevInst,
+                                                 InterfaceClassGuid,
+                                                 (LPWSTR)pszReference,
+                                                 pszDeviceInterface,
+                                                 pulLength,
+                                                 &ulTransferLength,
+                                                 0);
     }
-    else
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
     {
-        dwError = RegOpenKeyExW(hKey, szKeyName, 0, samDesired, phkClass);
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
     }
+    RpcEndExcept;
 
-    RegCloseKey(hKey);
+    return ret;
+}
 
-    if (pClassGuid != NULL)
-        RpcStringFreeW(&lpGuidString);
 
-    if (dwError != ERROR_SUCCESS)
-    {
-        *phkClass = NULL;
-        return CR_NO_SUCH_REGISTRY_KEY;
-    }
+/***********************************************************************
+ * CM_Remove_SubTree [SETUPAPI.@]
+ *
+ * This function is obsolete in Windows XP and above.
+ */
+CONFIGRET WINAPI CM_Remove_SubTree(
+    DEVINST dnAncestor, ULONG ulFlags)
+{
+    TRACE("%lx %lx\n", dnAncestor, ulFlags);
+    return CR_CALL_NOT_IMPLEMENTED;
+}
 
-    if (pszClassName != NULL)
-    {
-        RegSetValueExW(*phkClass, Class, 0, REG_SZ, (LPBYTE)pszClassName,
-                       (lstrlenW(pszClassName) + 1) * sizeof(WCHAR));
-    }
 
-    return CR_SUCCESS;
+/***********************************************************************
+ * CM_Remove_SubTree_Ex [SETUPAPI.@]
+ *
+ * This function is obsolete in Windows XP and above.
+ */
+CONFIGRET WINAPI CM_Remove_SubTree_Ex(
+    DEVINST dnAncestor, ULONG ulFlags, HMACHINE hMachine)
+{
+    TRACE("%lx %lx %lx\n", dnAncestor, ulFlags, hMachine);
+    return CR_CALL_NOT_IMPLEMENTED;
 }
 
 
 /***********************************************************************
- * CM_Open_DevNode_Key [SETUPAPI.@]
+ * CM_Request_Device_EjectA [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Open_DevNode_Key(
-    DEVINST dnDevNode, REGSAM samDesired, ULONG ulHardwareProfile,
-    REGDISPOSITION Disposition, PHKEY phkDevice, ULONG ulFlags)
+CONFIGRET WINAPI CM_Request_Device_EjectA(
+    DEVINST dnDevInst, PPNP_VETO_TYPE pVetoType, LPSTR pszVetoName,
+    ULONG ulNameLength, 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);
+    TRACE("%lx %p %s %lu %lx\n", dnDevInst, pVetoType, pszVetoName,
+          ulNameLength, ulFlags);
+    return CM_Request_Device_Eject_ExA(dnDevInst, pVetoType, pszVetoName,
+                                       ulNameLength, ulFlags, NULL);
 }
 
 
 /***********************************************************************
- * CM_Open_DevNode_Key_Ex [SETUPAPI.@]
+ * CM_Request_Device_EjectW [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Open_DevNode_Key_Ex(
-    DEVINST dnDevNode, REGSAM samDesired, ULONG ulHardwareProfile,
-    REGDISPOSITION Disposition, PHKEY phkDevice, ULONG ulFlags,
-    HMACHINE hMachine)
+CONFIGRET WINAPI CM_Request_Device_EjectW(
+    DEVINST dnDevInst, PPNP_VETO_TYPE pVetoType, LPWSTR pszVetoName,
+    ULONG ulNameLength, ULONG ulFlags)
 {
-    FIXME("%lx %lx %lu %lx %p %lx %lx\n", dnDevNode, samDesired,
-          ulHardwareProfile, Disposition, phkDevice, ulFlags, hMachine);
-
-    return CR_CALL_NOT_IMPLEMENTED;
+    TRACE("%lx %p %s %lu %lx\n", dnDevInst, pVetoType, debugstr_w(pszVetoName),
+          ulNameLength, ulFlags);
+    return CM_Request_Device_Eject_ExW(dnDevInst, pVetoType, pszVetoName,
+                                       ulNameLength, ulFlags, NULL);
 }
 
 
 /***********************************************************************
- * CM_Reenumerate_DevNode [SETUPAPI.@]
+ * CM_Request_Device_Eject_ExA [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Reenumerate_DevNode(
-    DEVINST dnDevInst, ULONG ulFlags)
+CONFIGRET WINAPI CM_Request_Device_Eject_ExA(
+    DEVINST dnDevInst, PPNP_VETO_TYPE pVetoType, LPSTR pszVetoName,
+    ULONG ulNameLength, ULONG ulFlags, HMACHINE hMachine)
 {
-    TRACE("%lx %lx\n", dnDevInst, ulFlags);
-    return CM_Reenumerate_DevNode_Ex(dnDevInst, ulFlags, NULL);
+    LPWSTR lpLocalVetoName;
+    CONFIGRET ret;
+
+    TRACE("%lx %p %s %lu %lx %lx\n", dnDevInst, pVetoType, pszVetoName,
+          ulNameLength, ulFlags, hMachine);
+
+    if (pszVetoName == NULL && ulNameLength == 0)
+        return CR_INVALID_POINTER;
+
+    lpLocalVetoName = HeapAlloc(GetProcessHeap(), 0, ulNameLength * sizeof(WCHAR));
+    if (lpLocalVetoName == NULL)
+        return CR_OUT_OF_MEMORY;
+
+    ret = CM_Request_Device_Eject_ExW(dnDevInst, pVetoType, lpLocalVetoName,
+                                      ulNameLength, ulFlags, hMachine);
+    if (ret == CR_REMOVE_VETOED)
+    {
+        if (WideCharToMultiByte(CP_ACP,
+                                0,
+                                lpLocalVetoName,
+                                ulNameLength,
+                                pszVetoName,
+                                ulNameLength,
+                                NULL,
+                                NULL) == 0)
+            ret = CR_FAILURE;
+    }
+
+    HeapFree(GetProcessHeap(), 0, lpLocalVetoName);
+
+    return ret;
 }
 
 
 /***********************************************************************
- * CM_Reenumerate_DevNode_Ex [SETUPAPI.@]
+ * CM_Request_Device_Eject_ExW [SETUPAPI.@]
  */
-CONFIGRET WINAPI
-CM_Reenumerate_DevNode_Ex(
-    DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine)
+CONFIGRET WINAPI CM_Request_Device_Eject_ExW(
+    DEVINST dnDevInst, PPNP_VETO_TYPE pVetoType, LPWSTR pszVetoName,
+    ULONG ulNameLength, ULONG ulFlags, HMACHINE hMachine)
 {
     RPC_BINDING_HANDLE BindingHandle = NULL;
     HSTRING_TABLE StringTable = NULL;
     LPWSTR lpDevInst;
     CONFIGRET ret;
 
-    FIXME("%lx %lx %lx\n", dnDevInst, ulFlags, hMachine);
+    TRACE("%lx %p %s %lu %lx %lx\n", dnDevInst, pVetoType,
+          debugstr_w(pszVetoName), ulNameLength, ulFlags, hMachine);
 
     if (dnDevInst == 0)
         return CR_INVALID_DEVNODE;
 
-    if (ulFlags & ~CM_REENUMERATE_BITS)
+    if (ulFlags != 0)
         return CR_INVALID_FLAG;
 
+    if (pszVetoName == NULL && ulNameLength == 0)
+        return CR_INVALID_POINTER;
+
     if (hMachine != NULL)
     {
         BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle;
@@ -3294,17 +4535,18 @@ CM_Reenumerate_DevNode_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
     RpcTryExcept
     {
-        ret = PNP_DeviceInstanceAction(BindingHandle,
-                                       PNP_DEVINST_REENUMERATE,
-                                       ulFlags,
-                                       lpDevInst,
-                                       NULL);
+        ret = PNP_RequestDeviceEject(BindingHandle,
+                                     lpDevInst,
+                                     pVetoType,
+                                     pszVetoName,
+                                     ulNameLength,
+                                     ulFlags);
     }
     RpcExcept(EXCEPTION_EXECUTE_HANDLER)
     {
@@ -3385,7 +4627,7 @@ CONFIGRET WINAPI CM_Run_Detection_Ex(
 
     TRACE("%lx %lx\n", ulFlags, hMachine);
 
-    if (!IsUserAdmin())
+    if (!pSetupIsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (ulFlags & ~CM_DETECT_BITS)
@@ -3464,7 +4706,7 @@ CONFIGRET WINAPI CM_Set_DevNode_Problem_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -3692,7 +4934,7 @@ CONFIGRET WINAPI CM_Set_DevNode_Registry_Property_ExW(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -3796,7 +5038,7 @@ CONFIGRET WINAPI CM_Set_HW_Prof_Ex(
 
     TRACE("%lu %lu %lx\n", ulHardwareProfile, ulFlags, hMachine);
 
-    if (!IsUserAdmin())
+    if (!pSetupIsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (ulFlags != 0)
@@ -3871,7 +5113,7 @@ CONFIGRET WINAPI CM_Set_HW_Prof_Flags_ExA(
 
     if (szDevInstName != NULL)
     {
-       if (CaptureAndConvertAnsiArg(szDevInstName, &pszDevIdW))
+       if (pSetupCaptureAndConvertAnsiArg(szDevInstName, &pszDevIdW))
          return CR_INVALID_DEVICE_ID;
     }
 
@@ -3957,7 +5199,7 @@ CONFIGRET WINAPI CM_Setup_DevNode_Ex(
 
     FIXME("%lx %lx %lx\n", dnDevInst, ulFlags, hMachine);
 
-    if (!IsUserAdmin())
+    if (!pSetupIsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (dnDevInst == 0)
@@ -3982,7 +5224,7 @@ CONFIGRET WINAPI CM_Setup_DevNode_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -4050,7 +5292,7 @@ CONFIGRET WINAPI CM_Uninstall_DevNode_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnPhantom);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnPhantom);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -4068,3 +5310,101 @@ CONFIGRET WINAPI CM_Uninstall_DevNode_Ex(
 
     return ret;
 }
+
+
+/***********************************************************************
+ * CM_Unregister_Device_InterfaceA [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Unregister_Device_InterfaceA(
+    LPCSTR pszDeviceInterface, ULONG ulFlags)
+{
+    TRACE("%s %lx\n", pszDeviceInterface, ulFlags);
+
+    return CM_Unregister_Device_Interface_ExA(pszDeviceInterface,
+                                              ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Unregister_Device_InterfaceW [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Unregister_Device_InterfaceW(
+    LPCWSTR pszDeviceInterface, ULONG ulFlags)
+{
+    TRACE("%s %lx\n", debugstr_w(pszDeviceInterface), ulFlags);
+
+    return CM_Unregister_Device_Interface_ExW(pszDeviceInterface,
+                                              ulFlags, NULL);
+}
+
+
+/***********************************************************************
+ * CM_Unregister_Device_Interface_ExA [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Unregister_Device_Interface_ExA(
+    LPCSTR pszDeviceInterface, ULONG ulFlags, HMACHINE hMachine)
+{
+    LPWSTR pszDeviceInterfaceW = NULL;
+    CONFIGRET ret;
+
+    TRACE("%s %lx %lx\n", pszDeviceInterface, ulFlags, hMachine);
+
+    if (pszDeviceInterface == NULL)
+        return CR_INVALID_POINTER;
+
+    if (pSetupCaptureAndConvertAnsiArg(pszDeviceInterface, &pszDeviceInterfaceW))
+        return CR_INVALID_DATA;
+
+    ret = CM_Unregister_Device_Interface_ExW(pszDeviceInterfaceW,
+                                             ulFlags, hMachine);
+
+    if (pszDeviceInterfaceW != NULL)
+        MyFree(pszDeviceInterfaceW);
+
+    return ret;
+}
+
+
+/***********************************************************************
+ * CM_Unregister_Device_Interface_ExW [SETUPAPI.@]
+ */
+CONFIGRET WINAPI CM_Unregister_Device_Interface_ExW(
+    LPCWSTR pszDeviceInterface, ULONG ulFlags, HMACHINE hMachine)
+{
+    RPC_BINDING_HANDLE BindingHandle = NULL;
+    CONFIGRET ret;
+
+    TRACE("%s %lx %lx\n", debugstr_w(pszDeviceInterface), ulFlags, hMachine);
+
+    if (pszDeviceInterface == 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;
+    }
+    else
+    {
+        if (!PnpGetLocalHandles(&BindingHandle, NULL))
+            return CR_FAILURE;
+    }
+
+    RpcTryExcept
+    {
+        ret = PNP_UnregisterDeviceClassAssociation(BindingHandle,
+                                                   (LPWSTR)pszDeviceInterface,
+                                                   ulFlags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        ret = RpcStatusToCmStatus(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return ret;
+}