Module: wine Branch: master Commit: 90755c8ea353c81e02da4902707b077636e6a2ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=90755c8ea353c81e02da49027...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Fri Aug 7 09:11:46 2020 +0300
combase: Move CoGetCallState().
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/combase/combase.c | 10 ++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/ole32.spec | 2 +- dlls/ole32/ole32_main.c | 9 --------- 4 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 752658012c..7947109fef 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -607,3 +607,13 @@ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv)
return IObjContext_QueryInterface(context, riid, ppv); } + +/*********************************************************************** + * CoGetCallState (combase.@) + */ +HRESULT WINAPI CoGetCallState(int arg1, ULONG *arg2) +{ + FIXME("%d, %p.\n", arg1, arg2); + + return E_NOTIMPL; +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index c84c10a21f..b9ccea5913 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -97,7 +97,7 @@ @ stub CoGetApartmentID @ stdcall CoGetApartmentType(ptr ptr) ole32.CoGetApartmentType @ stdcall CoGetCallContext(ptr ptr) ole32.CoGetCallContext -@ stdcall CoGetCallState(long ptr) ole32.CoGetCallState +@ stdcall CoGetCallState(long ptr) @ stdcall CoGetCallerTID(ptr) ole32.CoGetCallerTID @ stub CoGetCancelObject @ stdcall CoGetClassObject(ptr long ptr ptr ptr) ole32.CoGetClassObject diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index faccb54292..370a32eeae 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -28,7 +28,7 @@ @ stdcall CoGetActivationState(int128 long ptr) @ stdcall CoGetApartmentType(ptr ptr) @ stdcall CoGetCallContext(ptr ptr) -@ stdcall CoGetCallState(long ptr) +@ stdcall CoGetCallState(long ptr) combase.CoGetCallState @ stdcall CoGetCallerTID(ptr) @ stdcall CoGetClassObject(ptr long ptr ptr ptr) @ stdcall CoGetContextToken(ptr) diff --git a/dlls/ole32/ole32_main.c b/dlls/ole32/ole32_main.c index 414fdf2b36..13b3d3681b 100644 --- a/dlls/ole32/ole32_main.c +++ b/dlls/ole32/ole32_main.c @@ -167,15 +167,6 @@ HRESULT WINAPI CoGetActivationState(GUID guid, DWORD unknown, DWORD *unknown2) return E_NOTIMPL; }
-/*********************************************************************** - * CoGetCallState (ole32.@) - */ -HRESULT WINAPI CoGetCallState(int unknown, PULONG unknown2) -{ - FIXME("%d, %p\n", unknown, unknown2); - return E_NOTIMPL; -} - /****************************************************************************** * IsValidInterface [OLE32.@] *