Module: wine Branch: master Commit: bf4ecef04ca028d3fd6adb7a9cf239a2f123f582 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf4ecef04ca028d3fd6adb7a9...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Fri Aug 7 09:11:47 2020 +0300
combase: Move CoGetActivationState().
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 7947109fef..1370aa8271 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -617,3 +617,13 @@ HRESULT WINAPI CoGetCallState(int arg1, ULONG *arg2)
return E_NOTIMPL; } + +/*********************************************************************** + * CoGetActivationState (combase.@) + */ +HRESULT WINAPI CoGetActivationState(GUID guid, DWORD arg2, DWORD *arg3) +{ + FIXME("%s, %x, %p.\n", debugstr_guid(&guid), arg2, arg3); + + return E_NOTIMPL; +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index b9ccea5913..4f737aeb53 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -93,7 +93,7 @@ @ stdcall CoFileTimeNow(ptr) @ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries @ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx -@ stdcall CoGetActivationState(int128 long ptr) ole32.CoGetActivationState +@ stdcall CoGetActivationState(int128 long ptr) @ stub CoGetApartmentID @ stdcall CoGetApartmentType(ptr ptr) ole32.CoGetApartmentType @ stdcall CoGetCallContext(ptr ptr) ole32.CoGetCallContext diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 370a32eeae..ef074bbc26 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -25,7 +25,7 @@ @ stdcall CoFreeLibrary(long) @ stdcall CoFreeUnusedLibraries() @ stdcall CoFreeUnusedLibrariesEx(long long) -@ stdcall CoGetActivationState(int128 long ptr) +@ stdcall CoGetActivationState(int128 long ptr) combase.CoGetActivationState @ stdcall CoGetApartmentType(ptr ptr) @ stdcall CoGetCallContext(ptr ptr) @ stdcall CoGetCallState(long ptr) combase.CoGetCallState diff --git a/dlls/ole32/ole32_main.c b/dlls/ole32/ole32_main.c index 13b3d3681b..daff46864b 100644 --- a/dlls/ole32/ole32_main.c +++ b/dlls/ole32/ole32_main.c @@ -158,15 +158,6 @@ HGLOBAL WINAPI OleMetafilePictFromIconAndLabel(HICON hIcon, LPOLESTR lpszLabel, return hmem; }
-/*********************************************************************** - * CoGetActivationState (ole32.@) - */ -HRESULT WINAPI CoGetActivationState(GUID guid, DWORD unknown, DWORD *unknown2) -{ - FIXME("%s, %x, %p\n", debugstr_guid(&guid), unknown, unknown2); - return E_NOTIMPL; -} - /****************************************************************************** * IsValidInterface [OLE32.@] *