https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0fbaea843e90d8ba6f48a3f797fb3de18a2396ea
commit 0fbaea843e90d8ba6f48a3f797fb3de18a2396ea Author: Eric Kohl <[email protected]> AuthorDate: Mon May 21 02:30:35 2018 +0200 Commit: Eric Kohl <[email protected]> CommitDate: Mon May 21 02:30:35 2018 +0200 [SETUPAPI] Add stubs for CM_Detect_Resource_Conflict and CM_Detect_Resource_Conflict_Ex --- dll/win32/setupapi/cfgmgr.c | 49 ++++++++++++++++++++++++++++++++++++++++ dll/win32/setupapi/setupapi.spec | 4 ++-- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index 5d2f8cda45..c7087e6d0f 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -1548,6 +1548,55 @@ CM_Delete_Range( } +/*********************************************************************** + * CM_Detect_Resource_Conflict [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CM_Detect_Resource_Conflict( + _In_ DEVINST dnDevInst, + _In_ RESOURCEID ResourceID, + _In_reads_bytes_(ResourceLen) PCVOID ResourceData, + _In_ ULONG ResourceLen, + _Out_ PBOOL pbConflictDetected, + _In_ ULONG ulFlags) +{ + TRACE("CM_Detect_Resource_Conflict(%p %lu %p %lu %p 0x%lx)\n", + dnDevInst, ResourceID, ResourceData, ResourceLen, + pbConflictDetected, ulFlags); + + return CM_Detect_Resource_Conflict_Ex(dnDevInst, + ResourceID, + ResourceData, + ResourceLen, + pbConflictDetected, + ulFlags, + NULL); +} + + +/*********************************************************************** + * CM_Detect_Resource_Conflict_Ex [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CM_Detect_Resource_Conflict_Ex( + _In_ DEVINST dnDevInst, + _In_ RESOURCEID ResourceID, + _In_reads_bytes_(ResourceLen) PCVOID ResourceData, + _In_ ULONG ResourceLen, + _Out_ PBOOL pbConflictDetected, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) +{ + FIXME("CM_Detect_Resource_Conflict_Ex(%p %lu %p %lu %p 0x%lx %p)\n", + dnDevInst, ResourceID, ResourceData, ResourceLen, + pbConflictDetected, ulFlags, hMachine); + + return CR_CALL_NOT_IMPLEMENTED; +} + + /*********************************************************************** * CM_Disable_DevNode [SETUPAPI.@] */ diff --git a/dll/win32/setupapi/setupapi.spec b/dll/win32/setupapi/setupapi.spec index e43a8dbe98..527f4fd42b 100644 --- a/dll/win32/setupapi/setupapi.spec +++ b/dll/win32/setupapi/setupapi.spec @@ -28,8 +28,8 @@ @ stdcall CM_Delete_DevNode_Key(long long long) @ stdcall CM_Delete_DevNode_Key_Ex(long long long ptr) @ stdcall CM_Delete_Range(int64 int64 ptr long) -@ stub CM_Detect_Resource_Conflict -@ stub CM_Detect_Resource_Conflict_Ex +@ stdcall CM_Detect_Resource_Conflict(long long ptr long ptr long) +@ stdcall CM_Detect_Resource_Conflict_Ex(long long ptr long ptr long ptr) @ stdcall CM_Disable_DevNode(long long) @ stdcall CM_Disable_DevNode_Ex(long long ptr) @ stdcall CM_Disconnect_Machine(ptr)
