combase: Move CoGetDefaultContext().

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 CoGetDefaultContext().
9d0eeff2 · Nikolay Sivov · Alexandre Julliard · 532df76a · 9d0eeff2 · 9d0eeff2
Commit 9d0eeff2 authored Aug 11, 2020 by Nikolay Sivov Committed by Alexandre Julliard Aug 11, 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

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

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

No files found.
--- a/dlls/combase/combase.c
+++ b/dlls/combase/combase.c
@@ -804,6 +804,16 @@ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv)
 }

 /***********************************************************************
+ *           CoGetDefaultContext    (combase.@)
+ */
+HRESULT WINAPI CoGetDefaultContext(APTTYPE type, REFIID riid, void **obj)
+{
+    FIXME("%d, %s, %p stub\n", type, debugstr_guid(riid), obj);
+
+    return E_NOINTERFACE;
+}
+
+/***********************************************************************
 *          CoGetCallState        (combase.@)
 */
 HRESULT WINAPI CoGetCallState(int arg1, ULONG *arg2)

--- a/dlls/combase/combase.spec
+++ b/dlls/combase/combase.spec
@@ -105,7 +105,7 @@
 @ stdcall CoGetContextToken(ptr) ole32.CoGetContextToken
 @ stdcall CoGetCurrentLogicalThreadId(ptr) ole32.CoGetCurrentLogicalThreadId
 @ stdcall CoGetCurrentProcess() ole32.CoGetCurrentProcess
-@ stdcall CoGetDefaultContext(long ptr ptr) ole32.CoGetDefaultContext
+@ stdcall CoGetDefaultContext(long ptr ptr)
 @ stub CoGetErrorInfo
 @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr)
 @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr)

--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -4262,15 +4262,6 @@ HRESULT WINAPI CoGetContextToken( ULONG_PTR *token )
    return S_OK;
 }

-/***********************************************************************
- *           CoGetDefaultContext [OLE32.@]
- */
-HRESULT WINAPI CoGetDefaultContext(APTTYPE type, REFIID riid, LPVOID *ppv)
-{
-    FIXME("%d %s %p stub\n", type, debugstr_guid(riid), ppv);
-    return E_NOINTERFACE;
-}
-
 HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 {
    static const WCHAR wszInprocHandler32[] = {'I','n','p','r','o','c','H','a','n','d','l','e','r','3','2',0};

--- a/dlls/ole32/ole32.spec
+++ b/dlls/ole32/ole32.spec
@@ -34,7 +34,7 @@
 @ stdcall CoGetContextToken(ptr)
 @ stdcall CoGetCurrentLogicalThreadId(ptr)
 @ stdcall CoGetCurrentProcess()
-@ stdcall CoGetDefaultContext(long ptr ptr)
+@ stdcall CoGetDefaultContext(long ptr ptr) combase.CoGetDefaultContext
 @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) combase.CoGetInstanceFromFile
 @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) combase.CoGetInstanceFromIStorage
 @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr)