Nikolay Sivov : combase: Move CoGetDefaultContext().
Alexandre Julliard
julliard at winehq.org
Tue Aug 11 16:26:49 CDT 2020
Module: wine
Branch: master
Commit: 9d0eeff2ca63e9603de44b88e8e8ac520cc45705
URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d0eeff2ca63e9603de44b88e8e8ac520cc45705
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue Aug 11 08:43:13 2020 +0300
combase: Move CoGetDefaultContext().
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/combase/combase.c | 10 ++++++++++
dlls/combase/combase.spec | 2 +-
dlls/ole32/compobj.c | 9 ---------
dlls/ole32/ole32.spec | 2 +-
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c
index d5f4fad75c..f7c70e1232 100644
--- a/dlls/combase/combase.c
+++ b/dlls/combase/combase.c
@@ -803,6 +803,16 @@ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv)
return IObjContext_QueryInterface(context, riid, 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.@)
*/
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
index 0b3b32206a..735c710d7c 100644
--- 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)
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index e820e82c8a..33e617cca0 100644
--- 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};
diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec
index b25d710a55..dfab64a53b 100644
--- 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)
More information about the wine-cvs
mailing list