https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7e40954d53f225d4073089e0bb06134b54cccb4
commit d7e40954d53f225d4073089e0bb06134b54cccb4
Author: Eric Kohl <eric.k...@reactos.org>
AuthorDate: Sat May 19 15:11:17 2018 +0200
Commit: Eric Kohl <eric.k...@reactos.org>
CommitDate: Sat May 19 15:14:30 2018 +0200
[SETUPAPI] Add CM_Free_Resource_Conflict_Handle and
CM_Query_Resource_Conflict_List stubs
---
dll/win32/setupapi/cfgmgr.c | 36 ++++++++++++++++++++++++++++++++++++
dll/win32/setupapi/setupapi.spec | 4 ++--
2 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c
index 3a6c2e94b3..0bedd944e9 100644
--- a/dll/win32/setupapi/cfgmgr.c
+++ b/dll/win32/setupapi/cfgmgr.c
@@ -2233,6 +2233,20 @@ CM_Free_Res_Des_Handle(
}
+/***********************************************************************
+ * CM_Free_Resource_Conflict_Handle [SETUPAPI.@]
+ */
+CONFIGRET
+WINAPI
+CM_Free_Resource_Conflict_Handle(
+ _In_ CONFLICT_LIST clConflictList)
+{
+ FIXME("CM_Free_Resource_Conflict_Handle(%p)\n", clConflictList);
+
+ return CR_CALL_NOT_IMPLEMENTED;
+}
+
+
/***********************************************************************
* CM_Get_Child [SETUPAPI.@]
*/
@@ -6459,6 +6473,28 @@ CM_Query_Remove_SubTree_Ex(
}
+/***********************************************************************
+ * CM_Query_Resource_Conflict_List [SETUPAPI.@]
+ */
+CONFIGRET
+WINAPI
+CM_Query_Resource_Conflict_List(
+ _Out_ PCONFLICT_LIST pclConflictList,
+ _In_ DEVINST dnDevInst,
+ _In_ RESOURCEID ResourceID,
+ _In_ PCVOID ResourceData,
+ _In_ ULONG ResourceLen,
+ _In_ ULONG ulFlags,
+ _In_opt_ HMACHINE hMachine)
+{
+ FIXME("CM_Query_Resource_Conflict_List(%p %lx %lu %p %lu %lx %p)\n",
+ pclConflictList, dnDevInst, ResourceID, ResourceData,
+ ResourceLen, ulFlags, hMachine);
+
+ return CR_CALL_NOT_IMPLEMENTED;
+}
+
+
/***********************************************************************
* CM_Reenumerate_DevNode [SETUPAPI.@]
*/
diff --git a/dll/win32/setupapi/setupapi.spec b/dll/win32/setupapi/setupapi.spec
index a3dab530a7..e3db70232a 100644
--- a/dll/win32/setupapi/setupapi.spec
+++ b/dll/win32/setupapi/setupapi.spec
@@ -51,7 +51,7 @@
@ stdcall CM_Free_Res_Des(ptr ptr long)
@ stdcall CM_Free_Res_Des_Ex(ptr ptr long ptr)
@ stdcall CM_Free_Res_Des_Handle(ptr)
-@ stub CM_Free_Resource_Conflict_Handle
+@ stdcall CM_Free_Resource_Conflict_Handle(ptr)
@ stdcall CM_Get_Child(ptr long long)
@ stdcall CM_Get_Child_Ex(ptr long long ptr)
@ stdcall CM_Get_Class_Key_NameA(ptr str ptr long)
@@ -165,7 +165,7 @@
@ stdcall CM_Query_Arbitrator_Free_Size_Ex(ptr long long long ptr)
@ stdcall CM_Query_Remove_SubTree(long long)
@ stdcall CM_Query_Remove_SubTree_Ex(long long ptr)
-@ stub CM_Query_Resource_Conflict_List
+@ stdcall CM_Query_Resource_Conflict_List(ptr long long ptr long long ptr)
@ stdcall CM_Reenumerate_DevNode(long long)
@ stdcall CM_Reenumerate_DevNode_Ex(long long ptr)
@ stdcall CM_Register_Device_Driver(long long)
