[PATCH 0/3] MR10881: secur32/tests: Directly use secur32 functions in main.c.

[Jacek Caban (＠jacek)]

Fixes -Wunused-but-set-global warnings.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10881

[PATCH 1/3] secur32/tests: Directly use secur32 functions in main.c.

[Jacek Caban]

From: Jacek Caban <[e-mail]>

Fixes -Wunused-but-set-global warnings.
---
 dlls/secur32/tests/main.c | 68 ++++++---------------------------------
 1 file changed, 9 insertions(+), 59 deletions(-)

diff --git a/dlls/secur32/tests/main.c b/dlls/secur32/tests/main.c
index 46a62c8ea02..1da4187022d 100644
--- a/dlls/secur32/tests/main.c
+++ b/dlls/secur32/tests/main.c
@@ -30,45 +30,6 @@
 
 #include "wine/test.h"
 
-static HMODULE secdll;
-static PSecurityFunctionTableA (SEC_ENTRY * pInitSecurityInterfaceA)(void);
-static SECURITY_STATUS (SEC_ENTRY * pEnumerateSecurityPackagesA)(PULONG, PSecPkgInfoA*);
-static SECURITY_STATUS (SEC_ENTRY * pFreeContextBuffer)(PVOID pv);
-static SECURITY_STATUS (SEC_ENTRY * pQuerySecurityPackageInfoA)(SEC_CHAR*, PSecPkgInfoA*);
-static SECURITY_STATUS (SEC_ENTRY * pAcquireCredentialsHandleA)(SEC_CHAR*, SEC_CHAR*,
-                            ULONG, PLUID, PVOID, SEC_GET_KEY_FN, PVOID, PCredHandle, PTimeStamp);
-static SECURITY_STATUS (SEC_ENTRY * pInitializeSecurityContextA)(PCredHandle, PCtxtHandle,
-                            SEC_CHAR*, ULONG, ULONG, ULONG, PSecBufferDesc, ULONG, 
-                            PCtxtHandle, PSecBufferDesc, PULONG, PTimeStamp);
-static SECURITY_STATUS (SEC_ENTRY * pCompleteAuthToken)(PCtxtHandle, PSecBufferDesc);
-static SECURITY_STATUS (SEC_ENTRY * pAcceptSecurityContext)(PCredHandle, PCtxtHandle,
-                            PSecBufferDesc, ULONG, ULONG, PCtxtHandle, PSecBufferDesc,
-                            PULONG, PTimeStamp);
-static SECURITY_STATUS (SEC_ENTRY * pFreeCredentialsHandle)(PCredHandle);
-static SECURITY_STATUS (SEC_ENTRY * pDeleteSecurityContext)(PCtxtHandle);
-static SECURITY_STATUS (SEC_ENTRY * pQueryContextAttributesA)(PCtxtHandle, ULONG, PVOID);
-
-static void InitFunctionPtrs(void)
-{
-    secdll = LoadLibraryA("secur32.dll");
-    if(!secdll)
-        secdll = LoadLibraryA("security.dll");
-    if(secdll)
-    {
-        pInitSecurityInterfaceA = (PVOID)GetProcAddress(secdll, "InitSecurityInterfaceA");
-        pEnumerateSecurityPackagesA = (PVOID)GetProcAddress(secdll, "EnumerateSecurityPackagesA");
-        pFreeContextBuffer = (PVOID)GetProcAddress(secdll, "FreeContextBuffer");
-        pQuerySecurityPackageInfoA = (PVOID)GetProcAddress(secdll, "QuerySecurityPackageInfoA");
-        pAcquireCredentialsHandleA = (PVOID)GetProcAddress(secdll, "AcquireCredentialsHandleA");
-        pInitializeSecurityContextA = (PVOID)GetProcAddress(secdll, "InitializeSecurityContextA");
-        pCompleteAuthToken = (PVOID)GetProcAddress(secdll, "CompleteAuthToken");
-        pAcceptSecurityContext = (PVOID)GetProcAddress(secdll, "AcceptSecurityContext");
-        pFreeCredentialsHandle = (PVOID)GetProcAddress(secdll, "FreeCredentialsHandle");
-        pDeleteSecurityContext = (PVOID)GetProcAddress(secdll, "DeleteSecurityContext");
-        pQueryContextAttributesA = (PVOID)GetProcAddress(secdll, "QueryContextAttributesA");
-    }
-}
-
 /*---------------------------------------------------------*/
 /* General helper functions */
 
@@ -113,7 +74,7 @@ static SECURITY_STATUS setupPackageA(SEC_CHAR *p_package_name,
 {
     SECURITY_STATUS ret;
     
-    ret = pQuerySecurityPackageInfoA( p_package_name, p_pkg_info);
+    ret = QuerySecurityPackageInfoA( p_package_name, p_pkg_info);
     return ret;
 }
 
@@ -124,7 +85,7 @@ static void testInitSecurityInterface(void)
 {
     PSecurityFunctionTableA sec_fun_table = NULL;
 
-    sec_fun_table = pInitSecurityInterfaceA();
+    sec_fun_table = InitSecurityInterfaceA();
     ok(sec_fun_table != NULL, "InitSecurityInterface() returned NULL.\n");
 
 }
@@ -138,7 +99,7 @@ static void testEnumerateSecurityPackages(void)
 
     trace("Running testEnumerateSecurityPackages\n");
     
-    sec_status = pEnumerateSecurityPackagesA(&num_packages, &pkg_info);
+    sec_status = EnumerateSecurityPackagesA(&num_packages, &pkg_info);
 
     ok(sec_status == SEC_E_OK, 
             "EnumerateSecurityPackages() should return %ld, not %08lx\n",
@@ -196,7 +157,7 @@ static void testEnumerateSecurityPackages(void)
         trace("\n");
     }
 
-    pFreeContextBuffer(pkg_info);
+    FreeContextBuffer(pkg_info);
 }
 
 
@@ -227,7 +188,7 @@ static void testQuerySecurityPackageInfo(void)
          * between implementations.
          */
 
-        sec_status = pFreeContextBuffer(pkg_info);
+        sec_status = FreeContextBuffer(pkg_info);
         ok( sec_status == SEC_E_OK,
             "Return value of FreeContextBuffer() shouldn't be %s\n",
             getSecError(sec_status) );
@@ -236,7 +197,7 @@ static void testQuerySecurityPackageInfo(void)
     /* Test with a nonexistent package, test should fail */
 
     pkg_info = (void *)0xdeadbeef;
-    sec_status = pQuerySecurityPackageInfoA(winetest, &pkg_info);
+    sec_status = QuerySecurityPackageInfoA(winetest, &pkg_info);
 
     ok( sec_status == SEC_E_SECPKG_NOT_FOUND,
         "Return value of QuerySecurityPackageInfo() should be %s for a nonexistent package\n",
@@ -283,20 +244,9 @@ cleanup:
 
 START_TEST(main)
 {
-    InitFunctionPtrs();
-    if(pInitSecurityInterfaceA)
-        testInitSecurityInterface();
-    if(pFreeContextBuffer)
-    {
-        if(pEnumerateSecurityPackagesA)
-            testEnumerateSecurityPackages();
-        if(pQuerySecurityPackageInfoA)
-        {
-            testQuerySecurityPackageInfo();
-        }
-    }
-    if(secdll)
-        FreeLibrary(secdll);
+    testInitSecurityInterface();
+    testEnumerateSecurityPackages();
+    testQuerySecurityPackageInfo();
 
     test_get_logon_session_data();
 }
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10881

[PATCH 2/3] kerberos: Remove unused variable.

[Jacek Caban]

From: Jacek Caban <[e-mail]>

Fixes -Wunused-but-set-global warnings.
---
 dlls/kerberos/krb5_ap.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c
index dbae28481a7..07a751640ad 100644
--- a/dlls/kerberos/krb5_ap.c
+++ b/dlls/kerberos/krb5_ap.c
@@ -69,7 +69,6 @@ static const SecPkgInfoW infoW =
     kerberos_comment_W
 };
 
-static ULONG kerberos_package_id;
 static LSA_DISPATCH_TABLE lsa_dispatch;
 
 struct cred_handle
@@ -135,7 +134,6 @@ static NTSTATUS NTAPI kerberos_LsaApInitializePackage(ULONG package_id, PLSA_DIS
             ERR( "no Kerberos support, expect problems\n" );
     }
 
-    kerberos_package_id = package_id;
     lsa_dispatch = *dispatch;
 
     kerberos_name = lsa_dispatch.AllocateLsaHeap(sizeof(MICROSOFT_KERBEROS_NAME_A));
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10881

[PATCH 3/3] msv1_0: Remove unused variables.

[Jacek Caban]

From: Jacek Caban <[e-mail]>

Fixes -Wunused-but-set-global warnings.
---
 dlls/msv1_0/main.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c
index 81f752a48f5..fc828e7574a 100644
--- a/dlls/msv1_0/main.c
+++ b/dlls/msv1_0/main.c
@@ -39,9 +39,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ntlm);
 
-static ULONG ntlm_package_id;
-static LSA_DISPATCH_TABLE lsa_dispatch;
-
 static void ntlm_cleanup( struct ntlm_ctx *ctx )
 {
     WINE_UNIX_CALL( unix_cleanup, ctx );
@@ -112,9 +109,6 @@ static NTSTATUS NTAPI ntlm_LsaApInitializePackage( ULONG package_id, LSA_DISPATC
     memcpy( ptr, "NTLM", sizeof("NTLM") );
     RtlInitString( str, ptr );
 
-    ntlm_package_id = package_id;
-    lsa_dispatch = *dispatch;
-
     *package_name = str;
     return STATUS_SUCCESS;
 }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10881

[PATCH 0/3] MR10881: secur32/tests: Directly use secur32 functions in main.c. - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10881