combase: Move CoInitializeSecurity().

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 CoInitializeSecurity().
561a1923 · Nikolay Sivov · Alexandre Julliard · bca780c0 · 561a1923 · 561a1923
Commit 561a1923 authored Aug 14, 2020 by Nikolay Sivov Committed by Alexandre Julliard Aug 14, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 17 deletions

combase.c dlls/combase/combase.c +13 -0

combase.spec dlls/combase/combase.spec +1 -1

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

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

No files found.
--- a/dlls/combase/combase.c
+++ b/dlls/combase/combase.c
@@ -786,6 +786,19 @@ HRESULT WINAPI CoRevertToSelf(void)
 }

 /***********************************************************************
+ *           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.@)
 */
 HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv)

--- 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

--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -3353,21 +3353,6 @@ BOOL WINAPI IsEqualGUID(
 }

 /***********************************************************************
- *           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.@]
 *
 * Suspends all registered class objects to prevent further requests coming in

--- 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)