[PATCH 1/4] combase: Move currently unimplemented COM API functions.
Nikolay Sivov
nsivov at codeweavers.com
Wed Sep 2 06:14:46 CDT 2020
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/combase/combase.c | 89 +++++++++++++++++++++++++++++++
dlls/combase/combase.spec | 20 +++----
dlls/combase/rpc.c | 10 ++++
dlls/ole32/compobj.c | 108 --------------------------------------
dlls/ole32/ole2.c | 11 ----
dlls/ole32/ole32.spec | 20 +++----
6 files changed, 119 insertions(+), 139 deletions(-)
diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c
index d959034b57f..99352712f78 100644
--- a/dlls/combase/combase.c
+++ b/dlls/combase/combase.c
@@ -2595,6 +2595,16 @@ static void unlock_init_spies(struct tlsdata *tlsdata)
}
}
+/******************************************************************************
+ * CoInitializeWOW (combase.@)
+ */
+HRESULT WINAPI CoInitializeWOW(DWORD arg1, DWORD arg2)
+{
+ FIXME("%#x, %#x\n", arg1, arg2);
+
+ return S_OK;
+}
+
/******************************************************************************
* CoInitializeEx (combase.@)
*/
@@ -3062,6 +3072,85 @@ HRESULT WINAPI CoRegisterChannelHook(REFGUID guidExtension, IChannelHook *channe
return rpc_register_channel_hook(guidExtension, channel_hook);
}
+/***********************************************************************
+ * CoDisableCallCancellation (combase.@)
+ */
+HRESULT WINAPI CoDisableCallCancellation(void *reserved)
+{
+ FIXME("%p stub\n", reserved);
+
+ return E_NOTIMPL;
+}
+
+/***********************************************************************
+ * CoEnableCallCancellation (combase.@)
+ */
+HRESULT WINAPI CoEnableCallCancellation(void *reserved)
+{
+ FIXME("%p stub\n", reserved);
+
+ return E_NOTIMPL;
+}
+
+/***********************************************************************
+ * CoGetCallerTID (combase.@)
+ */
+HRESULT WINAPI CoGetCallerTID(DWORD *tid)
+{
+ FIXME("stub!\n");
+ return E_NOTIMPL;
+}
+
+/***********************************************************************
+ * CoIsHandlerConnected (combase.@)
+ */
+BOOL WINAPI CoIsHandlerConnected(IUnknown *object)
+{
+ FIXME("%p\n", object);
+
+ return TRUE;
+}
+
+/***********************************************************************
+ * CoSuspendClassObjects (combase.@)
+ */
+HRESULT WINAPI CoSuspendClassObjects(void)
+{
+ FIXME("\n");
+
+ return S_OK;
+}
+
+/***********************************************************************
+ * CoResumeClassObjects (combase.@)
+ */
+HRESULT WINAPI CoResumeClassObjects(void)
+{
+ FIXME("stub\n");
+
+ return S_OK;
+}
+
+/***********************************************************************
+ * CoRegisterSurrogate (combase.@)
+ */
+HRESULT WINAPI CoRegisterSurrogate(ISurrogate *surrogate)
+{
+ FIXME("%p stub\n", surrogate);
+
+ return E_NOTIMPL;
+}
+
+/***********************************************************************
+ * CoRegisterSurrogateEx (combase.@)
+ */
+HRESULT WINAPI CoRegisterSurrogateEx(REFGUID guid, void *reserved)
+{
+ FIXME("%s, %p stub\n", debugstr_guid(guid), reserved);
+
+ return E_NOTIMPL;
+}
+
/***********************************************************************
* DllMain (combase.@)
*/
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
index 3a09ce064b0..50b58419bc5 100644
--- a/dlls/combase/combase.spec
+++ b/dlls/combase/combase.spec
@@ -87,10 +87,10 @@
@ stub CoDeactivateObject
@ stub CoDecodeProxy
@ stdcall CoDecrementMTAUsage(ptr)
-@ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation
+@ stdcall CoDisableCallCancellation(ptr)
@ stub CoDisconnectContext
@ stdcall CoDisconnectObject(ptr long)
-@ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation
+@ stdcall CoEnableCallCancellation(ptr)
@ stdcall CoFileTimeNow(ptr)
@ stdcall CoFreeUnusedLibraries()
@ stdcall CoFreeUnusedLibrariesEx(long long)
@@ -99,7 +99,7 @@
@ stdcall CoGetApartmentType(ptr ptr)
@ stdcall CoGetCallContext(ptr ptr)
@ stdcall CoGetCallState(long ptr)
-@ stdcall CoGetCallerTID(ptr) ole32.CoGetCallerTID
+@ stdcall CoGetCallerTID(ptr)
@ stub CoGetCancelObject
@ stdcall CoGetClassObject(ptr long ptr ptr ptr)
@ stub CoGetClassVersion
@@ -125,9 +125,9 @@
@ stdcall CoIncrementMTAUsage(ptr)
@ stdcall CoInitializeEx(ptr long)
@ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr)
-@ stdcall CoInitializeWOW(long long) ole32.CoInitializeWOW
+@ stdcall CoInitializeWOW(long long)
@ stub CoInvalidateRemoteMachineBindings
-@ stdcall CoIsHandlerConnected(ptr) ole32.CoIsHandlerConnected
+@ stdcall CoIsHandlerConnected(ptr)
@ stdcall CoLockObjectExternal(ptr long long)
@ stdcall CoMarshalHresult(ptr long)
@ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr)
@@ -145,11 +145,11 @@
@ stdcall CoRegisterMallocSpy(ptr)
@ stdcall CoRegisterMessageFilter(ptr ptr)
@ stdcall CoRegisterPSClsid(ptr ptr)
-@ stdcall CoRegisterSurrogate(ptr) ole32.CoRegisterSurrogate
-@ stdcall CoRegisterSurrogateEx(ptr ptr) ole32.CoRegisterSurrogateEx
+@ stdcall CoRegisterSurrogate(ptr)
+@ stdcall CoRegisterSurrogateEx(ptr ptr)
@ stdcall CoReleaseMarshalData(ptr)
@ stdcall CoReleaseServerProcess()
-@ stdcall CoResumeClassObjects() ole32.CoResumeClassObjects
+@ stdcall CoResumeClassObjects()
@ stub CoRetireServer
@ stdcall CoRevertToSelf()
@ stdcall CoRevokeClassObject(long)
@@ -158,7 +158,7 @@
@ stub CoSetCancelObject
@ stdcall CoSetErrorInfo(long ptr) SetErrorInfo
@ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long)
-@ stdcall CoSuspendClassObjects() ole32.CoSuspendClassObjects
+@ stdcall CoSuspendClassObjects()
@ stdcall CoSwitchCallContext(ptr ptr)
@ stdcall CoTaskMemAlloc(long)
@ stdcall CoTaskMemFree(ptr)
@@ -176,7 +176,7 @@
@ stdcall CreateErrorInfo(ptr)
@ stdcall CreateStreamOnHGlobal(ptr long ptr) ole32.CreateStreamOnHGlobal
@ stub DcomChannelSetHResult
-@ stdcall DllDebugObjectRPCHook(long ptr) ole32.DllDebugObjectRPCHook
+@ stdcall DllDebugObjectRPCHook(long ptr)
@ stdcall DllGetActivationFactory(ptr ptr)
@ stdcall -private DllGetClassObject(ptr ptr ptr) ole32.DllGetClassObject
@ stub EnableHookObject
diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c
index ebfc19329d8..513c1e6c13a 100644
--- a/dlls/combase/rpc.c
+++ b/dlls/combase/rpc.c
@@ -2244,3 +2244,13 @@ void rpc_start_remoting(struct apartment *apt)
}
start_apartment_remote_unknown(apt);
}
+
+/******************************************************************************
+ * DllDebugObjectRPCHook (combase.@)
+ */
+BOOL WINAPI DllDebugObjectRPCHook(BOOL trace, /* ORPC_INIT_ARGS * */ void *args)
+{
+ FIXME("%d, %p: stub\n", trace, args);
+
+ return TRUE;
+}
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index a9a9af53108..f4fe82de436 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -561,21 +561,6 @@ HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY
return S_OK;
}
-/***********************************************************************
- * CoResumeClassObjects (OLE32.@)
- *
- * Resumes all class objects registered with REGCLS_SUSPENDED.
- *
- * RETURNS
- * Success: S_OK.
- * Failure: HRESULT code.
- */
-HRESULT WINAPI CoResumeClassObjects(void)
-{
- FIXME("stub\n");
- return S_OK;
-}
-
/***********************************************************************
* CoLoadLibrary (OLE32.@)
*
@@ -635,24 +620,6 @@ void WINAPI CoFreeAllLibraries(void)
/* NOP */
}
-/***********************************************************************
- * CoInitializeWOW (OLE32.@)
- *
- * WOW equivalent of CoInitialize?
- *
- * PARAMS
- * x [I] Unknown.
- * y [I] Unknown.
- *
- * RETURNS
- * Unknown.
- */
-HRESULT WINAPI CoInitializeWOW(DWORD x,DWORD y)
-{
- FIXME("(0x%08x,0x%08x),stub!\n",x,y);
- return 0;
-}
-
/***********************************************************************
* CoGetState [OLE32.@]
*
@@ -834,41 +801,6 @@ BOOL WINAPI IsEqualGUID(
return !memcmp(rguid1,rguid2,sizeof(GUID));
}
-/***********************************************************************
- * CoSuspendClassObjects [OLE32.@]
- *
- * Suspends all registered class objects to prevent further requests coming in
- * for those objects.
- *
- * RETURNS
- * Success: S_OK.
- * Failure: HRESULT code.
- */
-HRESULT WINAPI CoSuspendClassObjects(void)
-{
- FIXME("\n");
- return S_OK;
-}
-
-/***********************************************************************
- * CoIsHandlerConnected [OLE32.@]
- *
- * Determines whether a proxy is connected to a remote stub.
- *
- * PARAMS
- * pUnk [I] Pointer to object that may or may not be connected.
- *
- * RETURNS
- * TRUE if pUnk is not a proxy or if pUnk is connected to a remote stub, or
- * FALSE otherwise.
- */
-BOOL WINAPI CoIsHandlerConnected(IUnknown *pUnk)
-{
- FIXME("%p\n", pUnk);
-
- return TRUE;
-}
-
/***********************************************************************
* CoAllowSetForegroundWindow [OLE32.@]
*
@@ -1005,46 +937,6 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
return CLASS_E_CLASSNOTAVAILABLE;
}
-/***********************************************************************
- * CoDisableCallCancellation [OLE32.@]
- */
-HRESULT WINAPI CoDisableCallCancellation(void *reserved)
-{
- FIXME("(%p): stub\n", reserved);
-
- return E_NOTIMPL;
-}
-
-/***********************************************************************
- * CoEnableCallCancellation [OLE32.@]
- */
-HRESULT WINAPI CoEnableCallCancellation(void *reserved)
-{
- FIXME("(%p): stub\n", reserved);
-
- return E_NOTIMPL;
-}
-
-/***********************************************************************
- * CoRegisterSurrogate [OLE32.@]
- */
-HRESULT WINAPI CoRegisterSurrogate(ISurrogate *surrogate)
-{
- FIXME("(%p): stub\n", surrogate);
-
- return E_NOTIMPL;
-}
-
-/***********************************************************************
- * CoRegisterSurrogateEx [OLE32.@]
- */
-HRESULT WINAPI CoRegisterSurrogateEx(REFGUID guid, void *reserved)
-{
- FIXME("(%s %p): stub\n", debugstr_guid(guid), reserved);
-
- return E_NOTIMPL;
-}
-
typedef struct {
IGlobalOptions IGlobalOptions_iface;
LONG ref;
diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c
index 4f4a1378b1e..15c4f8234f3 100644
--- a/dlls/ole32/ole2.c
+++ b/dlls/ole32/ole2.c
@@ -2729,14 +2729,3 @@ void WINAPI PropSysFreeString(LPOLESTR str)
{
SysFreeString(str);
}
-
-/******************************************************************************
- * DllDebugObjectRPCHook (OLE32.@)
- * turns on and off internal debugging, pointer is only used on macintosh
- */
-
-BOOL WINAPI DllDebugObjectRPCHook(BOOL b, void *dummy)
-{
- FIXME("stub\n");
- return TRUE;
-}
diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec
index cf48d043b75..44c03b6628c 100644
--- a/dlls/ole32/ole32.spec
+++ b/dlls/ole32/ole32.spec
@@ -15,10 +15,10 @@
@ stdcall CoCreateInstance(ptr ptr long ptr ptr) combase.CoCreateInstance
@ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) combase.CoCreateInstanceEx
@ stdcall CoDecrementMTAUsage(ptr) combase.CoDecrementMTAUsage
-@ stdcall CoDisableCallCancellation(ptr)
+@ stdcall CoDisableCallCancellation(ptr) combase.CoDisableCallCancellation
@ stdcall CoDisconnectObject(ptr long) combase.CoDisconnectObject
@ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime
-@ stdcall CoEnableCallCancellation(ptr)
+@ stdcall CoEnableCallCancellation(ptr) combase.CoEnableCallCancellation
@ stdcall CoFileTimeNow(ptr) combase.CoFileTimeNow
@ stdcall CoFileTimeToDosDateTime(ptr ptr ptr) kernel32.FileTimeToDosDateTime
@ stdcall CoFreeAllLibraries()
@@ -29,7 +29,7 @@
@ stdcall CoGetApartmentType(ptr ptr) combase.CoGetApartmentType
@ stdcall CoGetCallContext(ptr ptr) combase.CoGetCallContext
@ stdcall CoGetCallState(long ptr) combase.CoGetCallState
-@ stdcall CoGetCallerTID(ptr)
+@ stdcall CoGetCallerTID(ptr) combase.CoGetCallerTID
@ stdcall CoGetClassObject(ptr long ptr ptr ptr) combase.CoGetClassObject
@ stdcall CoGetContextToken(ptr) combase.CoGetContextToken
@ stdcall CoGetCurrentLogicalThreadId(ptr) combase.CoGetCurrentLogicalThreadId
@@ -52,8 +52,8 @@
@ stdcall CoInitialize(ptr)
@ stdcall CoInitializeEx(ptr long) combase.CoInitializeEx
@ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) combase.CoInitializeSecurity
-@ stdcall CoInitializeWOW(long long)
-@ stdcall CoIsHandlerConnected(ptr)
+@ stdcall CoInitializeWOW(long long) combase.CoInitializeWOW
+@ stdcall CoIsHandlerConnected(ptr) combase.CoIsHandlerConnected
@ stdcall CoIsOle1Class (ptr)
@ stdcall CoLoadLibrary(wstr long)
@ stdcall CoLockObjectExternal(ptr long long) combase.CoLockObjectExternal
@@ -70,18 +70,18 @@
@ stdcall CoRegisterMallocSpy(ptr) combase.CoRegisterMallocSpy
@ stdcall CoRegisterMessageFilter(ptr ptr) combase.CoRegisterMessageFilter
@ stdcall CoRegisterPSClsid(ptr ptr) combase.CoRegisterPSClsid
-@ stdcall CoRegisterSurrogate(ptr)
-@ stdcall CoRegisterSurrogateEx(ptr ptr)
+@ stdcall CoRegisterSurrogate(ptr) combase.CoRegisterSurrogate
+@ stdcall CoRegisterSurrogateEx(ptr ptr) combase.CoRegisterSurrogateEx
@ stdcall CoReleaseMarshalData(ptr) combase.CoReleaseMarshalData
@ stdcall CoReleaseServerProcess() combase.CoReleaseServerProcess
-@ stdcall CoResumeClassObjects()
+@ stdcall CoResumeClassObjects() combase.CoResumeClassObjects
@ stdcall CoRevertToSelf() combase.CoRevertToSelf
@ stdcall CoRevokeClassObject(long) combase.CoRevokeClassObject
@ stdcall CoRevokeInitializeSpy(int64) combase.CoRevokeInitializeSpy
@ stdcall CoRevokeMallocSpy() combase.CoRevokeMallocSpy
@ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long) combase.CoSetProxyBlanket
@ stdcall CoSetState(ptr)
-@ stdcall CoSuspendClassObjects()
+@ stdcall CoSuspendClassObjects() combase.CoSuspendClassObjects
@ stdcall CoSwitchCallContext(ptr ptr) combase.CoSwitchCallContext
@ stdcall CoTaskMemAlloc(long) combase.CoTaskMemAlloc
@ stdcall CoTaskMemFree(ptr) combase.CoTaskMemFree
@@ -107,7 +107,7 @@
@ stdcall CreatePointerMoniker(ptr ptr)
@ stdcall CreateStreamOnHGlobal(ptr long ptr)
@ stdcall DestroyRunningObjectTable()
-@ stdcall DllDebugObjectRPCHook(long ptr)
+@ stdcall DllDebugObjectRPCHook(long ptr) combase.DllDebugObjectRPCHook
@ stdcall -private DllGetClassObject (ptr ptr ptr)
@ stub DllGetClassObjectWOW
@ stdcall -private DllRegisterServer()
--
2.28.0
More information about the wine-devel
mailing list