Alexandre Julliard : kerberos: Use the Unix call helpers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f7b55ffafaac0a32545d948f62363ec2f5b64ba4
URL:    https://gitlab.winehq.org/wine/wine/-/commit/f7b55ffafaac0a32545d948f62363ec...

Author: Alexandre Julliard 
Date:   Fri Nov 25 10:12:17 2022 +0100

kerberos: Use the Unix call helpers.

---

dlls/kerberos/krb5_ap.c | 30 ++++--------------------------
 dlls/kerberos/unixlib.h |  4 +---
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c
index 84d742079e6..42d3358a20d 100644
--- a/dlls/kerberos/krb5_ap.c
+++ b/dlls/kerberos/krb5_ap.c
@@ -39,10 +39,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(kerberos);

-static HINSTANCE instance;
-
-unixlib_handle_t krb5_handle = 0;
-
 #define KERBEROS_CAPS \
     ( SECPKG_FLAG_INTEGRITY \
     | SECPKG_FLAG_PRIVACY \
@@ -134,11 +130,9 @@ static NTSTATUS NTAPI kerberos_LsaApInitializePackage(ULONG package_id, PLSA_DIS
 {
     char *kerberos_name;

-    if (!krb5_handle)
+    if (!__wine_unixlib_handle)
     {
-        if (NtQueryVirtualMemory( GetCurrentProcess(), instance, MemoryWineUnixFuncs,
-                                  &krb5_handle, sizeof(krb5_handle), NULL ) ||
-            KRB5_CALL( process_attach, NULL ))
+        if (__wine_init_unix_call() || KRB5_CALL( process_attach, NULL ))
             ERR( "no Kerberos support, expect problems\n" );
     }

@@ -569,11 +563,9 @@ static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMET
 {
     TRACE("%Iu, %p, %p\n", package_id, params, lsa_function_table);

-    if (!krb5_handle)
+    if (!__wine_unixlib_handle)
     {
-        if (NtQueryVirtualMemory( GetCurrentProcess(), instance, MemoryWineUnixFuncs,
-                                  &krb5_handle, sizeof(krb5_handle), NULL ) ||
-            KRB5_CALL( process_attach, NULL ))
+        if (__wine_init_unix_call() || KRB5_CALL( process_attach, NULL ))
             WARN( "no Kerberos support\n" );
         return STATUS_UNSUCCESSFUL;
     }
@@ -781,17 +773,3 @@ NTSTATUS NTAPI SpUserModeInitialize(ULONG lsa_version, PULONG package_version,
     *table_count = 1;
     return STATUS_SUCCESS;
 }
-
-BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved )
-{
-    switch (reason)
-    {
-    case DLL_PROCESS_ATTACH:
-        instance = hinst;
-        DisableThreadLibraryCalls( hinst );
-        break;
-    case DLL_PROCESS_DETACH:
-        break;
-    }
-    return TRUE;
-}
diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h
index f811f583bb2..1725f813a16 100644
--- a/dlls/kerberos/unixlib.h
+++ b/dlls/kerberos/unixlib.h
@@ -139,6 +139,4 @@ enum unix_funcs
     unix_verify_signature,
 };

-extern unixlib_handle_t krb5_handle DECLSPEC_HIDDEN;
-
-#define KRB5_CALL( func, params ) __wine_unix_call( krb5_handle, unix_ ## func, params )
+#define KRB5_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params )