Nikolay Sivov : combase: Move CoInitializeSecurity().
Alexandre Julliard
julliard at winehq.org
Fri Aug 14 16:39:31 CDT 2020
Module: wine
Branch: master
Commit: 561a192317de945ff60a2140c5c027775c7a72ef
URL: https://source.winehq.org/git/wine.git/?a=commit;h=561a192317de945ff60a2140c5c027775c7a72ef
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Fri Aug 14 09:16:29 2020 +0300
combase: Move CoInitializeSecurity().
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 | 13 +++++++++++++
dlls/combase/combase.spec | 2 +-
dlls/ole32/compobj.c | 15 ---------------
dlls/ole32/ole32.spec | 2 +-
4 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c
index 5752d90d5c..8d8d83005b 100644
--- a/dlls/combase/combase.c
+++ b/dlls/combase/combase.c
@@ -785,6 +785,19 @@ HRESULT WINAPI CoRevertToSelf(void)
return hr;
}
+/***********************************************************************
+ * CoInitializeSecurity (combase.@)
+ */
+HRESULT WINAPI CoInitializeSecurity(PSECURITY_DESCRIPTOR sd, LONG cAuthSvc,
+ SOLE_AUTHENTICATION_SERVICE *asAuthSvc, void *reserved1, DWORD authn_level,
+ DWORD imp_level, void *reserved2, DWORD capabilities, void *reserved3)
+{
+ FIXME("%p, %d, %p, %p, %d, %d, %p, %d, %p stub\n", sd, cAuthSvc, asAuthSvc, reserved1, authn_level,
+ imp_level, reserved2, capabilities, reserved3);
+
+ return S_OK;
+}
+
/***********************************************************************
* CoGetObjectContext (combase.@)
*/
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
index be5ed85a8e..0f34dc6918 100644
--- a/dlls/combase/combase.spec
+++ b/dlls/combase/combase.spec
@@ -124,7 +124,7 @@
@ stdcall CoImpersonateClient()
@ stdcall CoIncrementMTAUsage(ptr) ole32.CoIncrementMTAUsage
@ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx
-@ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity
+@ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr)
@ stdcall CoInitializeWOW(long long) ole32.CoInitializeWOW
@ stub CoInvalidateRemoteMachineBindings
@ stdcall CoIsHandlerConnected(ptr) ole32.CoIsHandlerConnected
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index f983b07f20..350508ac9a 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -3352,21 +3352,6 @@ BOOL WINAPI IsEqualGUID(
return !memcmp(rguid1,rguid2,sizeof(GUID));
}
-/***********************************************************************
- * CoInitializeSecurity [OLE32.@]
- */
-HRESULT WINAPI CoInitializeSecurity(PSECURITY_DESCRIPTOR pSecDesc, LONG cAuthSvc,
- SOLE_AUTHENTICATION_SERVICE* asAuthSvc,
- void* pReserved1, DWORD dwAuthnLevel,
- DWORD dwImpLevel, void* pReserved2,
- DWORD dwCapabilities, void* pReserved3)
-{
- FIXME("(%p,%d,%p,%p,%d,%d,%p,%d,%p) - stub!\n", pSecDesc, cAuthSvc,
- asAuthSvc, pReserved1, dwAuthnLevel, dwImpLevel, pReserved2,
- dwCapabilities, pReserved3);
- return S_OK;
-}
-
/***********************************************************************
* CoSuspendClassObjects [OLE32.@]
*
diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec
index 7ab90e7b7a..7b2c583661 100644
--- a/dlls/ole32/ole32.spec
+++ b/dlls/ole32/ole32.spec
@@ -51,7 +51,7 @@
@ stdcall CoIncrementMTAUsage(ptr)
@ stdcall CoInitialize(ptr)
@ stdcall CoInitializeEx(ptr long)
-@ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr)
+@ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) combase.CoInitializeSecurity
@ stdcall CoInitializeWOW(long long)
@ stdcall CoIsHandlerConnected(ptr)
@ stdcall CoIsOle1Class (ptr)
More information about the wine-cvs
mailing list