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>

combase: Move CoGetActivationState().
bf4ecef0 · Nikolay Sivov · Alexandre Julliard · 90755c8e · bf4ecef0 · bf4ecef0
Commit bf4ecef0 authored Aug 07, 2020 by Nikolay Sivov Committed by Alexandre Julliard Aug 07, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 11 deletions

combase.c dlls/combase/combase.c +10 -0

combase.spec dlls/combase/combase.spec +1 -1

ole32.spec dlls/ole32/ole32.spec +1 -1

ole32_main.c dlls/ole32/ole32_main.c +0 -9

No files found.
--- 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;
+}
--- 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

--- 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

--- 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.@]
 *