Alexandre Julliard : secur32: Use the Unix call helpers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f82dc3d7c419a0760001a6d994789f62a9160373
URL:    https://gitlab.winehq.org/wine/wine/-/commit/f82dc3d7c419a0760001a6d994789f6...

Author: Alexandre Julliard 
Date:   Fri Nov 25 10:16:06 2022 +0100

secur32: Use the Unix call helpers.

---

dlls/secur32/schannel.c     | 16 ++++------------
 dlls/secur32/secur32.c      |  3 ---
 dlls/secur32/secur32_priv.h |  2 --
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c
index 98c6f93bc1c..23917626497 100644
--- a/dlls/secur32/schannel.c
+++ b/dlls/secur32/schannel.c
@@ -40,9 +40,7 @@

WINE_DEFAULT_DEBUG_CHANNEL(secur32);

-static unixlib_handle_t gnutls_handle;
-
-#define GNUTLS_CALL( func, params ) __wine_unix_call( gnutls_handle, unix_ ## func, params )
+#define GNUTLS_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params )

#define SCHAN_INVALID_HANDLE ~0UL

@@ -1685,15 +1683,10 @@ void SECUR32_initSchannelSP(void)
     };
     SecureProvider *provider;

-    if (!gnutls_handle)
+    if (__wine_init_unix_call() || GNUTLS_CALL( process_attach, NULL ))
     {
-        if (NtQueryVirtualMemory( GetCurrentProcess(), hsecur32, MemoryWineUnixFuncs,
-                                  &gnutls_handle, sizeof(gnutls_handle), NULL ) ||
-            GNUTLS_CALL( process_attach, NULL ))
-        {
-            ERR( "no schannel support, expect problems\n" );
-            return;
-        }
+        ERR( "no schannel support, expect problems\n" );
+        return;
     }

schan_handle_table = malloc(64 * sizeof(*schan_handle_table));
@@ -1751,5 +1744,4 @@ void SECUR32_deinitSchannelSP(void)
     }
     free(schan_handle_table);
     GNUTLS_CALL( process_detach, NULL );
-    gnutls_handle = 0;
 }
diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c
index 4875ce85651..d703757bae7 100644
--- a/dlls/secur32/secur32.c
+++ b/dlls/secur32/secur32.c
@@ -40,8 +40,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(secur32);

-HINSTANCE hsecur32;
-
 /**
  *  Type definitions
  */
@@ -1183,7 +1181,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved)
     switch (reason)
     {
     case DLL_PROCESS_ATTACH:
-        hsecur32 = hinstDLL;
         DisableThreadLibraryCalls(hinstDLL);
         SECUR32_initializeProviders();
         break;
diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h
index c43b1f446c4..258454560fe 100644
--- a/dlls/secur32/secur32_priv.h
+++ b/dlls/secur32/secur32_priv.h
@@ -26,8 +26,6 @@
 #include "schannel.h"
 #include "wine/list.h"

-extern HINSTANCE hsecur32 DECLSPEC_HIDDEN;
-
 typedef struct _SecureProvider
 {
     struct list             entry;