Nikolay Sivov : combase: Move CoCopyProxy().
Alexandre Julliard
julliard at winehq.org
Thu Aug 6 16:33:43 CDT 2020
Module: wine
Branch: master
Commit: 011f071dd84eca0b4183b2f2bd9d92b6faaf21b9
URL: https://source.winehq.org/git/wine.git/?a=commit;h=011f071dd84eca0b4183b2f2bd9d92b6faaf21b9
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Thu Aug 6 09:13:07 2020 +0300
combase: Move CoCopyProxy().
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 | 21 +++++++++++++++++++++
dlls/combase/combase.spec | 2 +-
dlls/ole32/compobj.c | 35 -----------------------------------
dlls/ole32/ole32.spec | 2 +-
4 files changed, 23 insertions(+), 37 deletions(-)
diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c
index b87c6f19ba..595a7569b0 100644
--- a/dlls/combase/combase.c
+++ b/dlls/combase/combase.c
@@ -503,3 +503,24 @@ HRESULT WINAPI CoSetProxyBlanket(IUnknown *proxy, DWORD authn_service, DWORD aut
if (FAILED(hr)) ERR("-- failed with %#x.\n", hr);
return hr;
}
+
+/***********************************************************************
+ * CoCopyProxy (combase.@)
+ */
+HRESULT WINAPI CoCopyProxy(IUnknown *proxy, IUnknown **proxy_copy)
+{
+ IClientSecurity *client_security;
+ HRESULT hr;
+
+ TRACE("%p, %p.\n", proxy, proxy_copy);
+
+ hr = IUnknown_QueryInterface(proxy, &IID_IClientSecurity, (void **)&client_security);
+ if (SUCCEEDED(hr))
+ {
+ hr = IClientSecurity_CopyProxy(client_security, proxy, proxy_copy);
+ IClientSecurity_Release(client_security);
+ }
+
+ if (FAILED(hr)) ERR("-- failed with %#x.\n", hr);
+ return hr;
+}
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
index 88d3adeec9..669b42486f 100644
--- a/dlls/combase/combase.spec
+++ b/dlls/combase/combase.spec
@@ -75,7 +75,7 @@
@ stdcall CoAddRefServerProcess() ole32.CoAddRefServerProcess
@ stub CoAllowUnmarshalerCLSID
@ stub CoCancelCall
-@ stdcall CoCopyProxy(ptr ptr) ole32.CoCopyProxy
+@ stdcall CoCopyProxy(ptr ptr)
@ stub CoCreateErrorInfo
@ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) ole32.CoCreateFreeThreadedMarshaler
@ stdcall CoCreateGuid(ptr)
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index aeb7c4d29c..b1fedf17c8 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -4192,41 +4192,6 @@ HRESULT WINAPI CoAllowSetForegroundWindow(IUnknown *pUnk, void *pvReserved)
return S_OK;
}
-/***********************************************************************
- * CoCopyProxy [OLE32.@]
- *
- * Copies a proxy.
- *
- * PARAMS
- * pProxy [I] Pointer to the proxy object.
- * ppCopy [O] Copy of the proxy.
- *
- * RETURNS
- * Success: S_OK.
- * Failure: HRESULT code.
- *
- * SEE ALSO
- * CoQueryProxyBlanket, CoSetProxyBlanket.
- */
-HRESULT WINAPI CoCopyProxy(IUnknown *pProxy, IUnknown **ppCopy)
-{
- IClientSecurity *pCliSec;
- HRESULT hr;
-
- TRACE("%p\n", pProxy);
-
- hr = IUnknown_QueryInterface(pProxy, &IID_IClientSecurity, (void **)&pCliSec);
- if (SUCCEEDED(hr))
- {
- hr = IClientSecurity_CopyProxy(pCliSec, pProxy, ppCopy);
- IClientSecurity_Release(pCliSec);
- }
-
- if (FAILED(hr)) ERR("-- failed with 0x%08x\n", hr);
- return hr;
-}
-
-
/***********************************************************************
* CoGetCallContext [OLE32.@]
*
diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec
index 54725e406a..c64392d523 100644
--- a/dlls/ole32/ole32.spec
+++ b/dlls/ole32/ole32.spec
@@ -9,7 +9,7 @@
@ stdcall CoAddRefServerProcess()
@ stdcall CoAllowSetForegroundWindow(ptr ptr)
@ stdcall CoBuildVersion()
-@ stdcall CoCopyProxy(ptr ptr)
+@ stdcall CoCopyProxy(ptr ptr) combase.CoCopyProxy
@ stdcall CoCreateFreeThreadedMarshaler(ptr ptr)
@ stdcall CoCreateGuid(ptr) combase.CoCreateGuid
@ stdcall CoCreateInstance(ptr ptr long ptr ptr)
More information about the wine-cvs
mailing list