c220674ac4
Viktor Szakats
2026-02-11
Subject
windows: tidy up includes, macros, document dependencies
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
lib/curl_setup.h +9 -1lib/curl_sspi.h +1 -11lib/ldap.c +0 -8lib/vtls/schannel.h +1 -10lib/vtls/schannel_int.h +0 -5
lib/curl_setup.h+9 -1
| @@ -106,6 +106,7 @@ | |
| # ifndef NOGDI | |
| # define NOGDI | |
| # endif | |
| + | |
| /* Detect Windows App environment which has a restricted access | |
| * to the Win32 APIs. */ | |
| # if (defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0602)) || \ | |
| @@ -116,6 +117,12 @@ | |
| # define CURL_WINDOWS_UWP | |
| # endif | |
| # endif | |
| + | |
| + | /* Mandatory to define SECURITY_WIN32 or SECURITY_KERNEL to indicating who is |
| + | compiling the code. */ |
| + | #undef SECURITY_KERNEL |
| + | #undef SECURITY_WIN32 |
| + | #define SECURITY_WIN32 /* for <sspi.h> */ |
| #endif | |
| /* Compatibility */ | |
| @@ -837,7 +844,8 @@ | |
| #ifdef USE_SCHANNEL | |
| /* Must set this before <schannel.h> is included directly or indirectly by | |
| another Windows header. */ | |
| - | # define SCHANNEL_USE_BLACKLISTS 1 |
| + | # define SCHANNEL_USE_BLACKLISTS /* for SCH_CREDENTIALS */ |
| + | # include <subauth.h> /* for [P]UNICODE_STRING in SCH_CREDENTIALS */ |
| #endif | |
| #ifdef __hpux | |
lib/curl_sspi.h+1 -11
| @@ -27,17 +27,7 @@ | |
| #ifdef USE_WINDOWS_SSPI | |
| - | /* |
| - | * When including the following three headers, it is mandatory to define either |
| - | * SECURITY_WIN32 or SECURITY_KERNEL, indicating who is compiling the code. |
| - | */ |
| - | |
| - | #undef SECURITY_WIN32 |
| - | #undef SECURITY_KERNEL |
| - | #define SECURITY_WIN32 1 |
| - | #include <security.h> |
| #include <sspi.h> | |
| - | #include <rpc.h> |
| CURLcode Curl_sspi_global_init(void); | |
| void Curl_sspi_global_cleanup(void); | |
| @@ -56,7 +46,7 @@ void Curl_sspi_free_identity(SEC_WINNT_AUTH_IDENTITY *identity); | |
| /* Forward-declaration of global variables defined in curl_sspi.c */ | |
| extern PSecurityFunctionTable Curl_pSecFn; | |
| - | /* Provide some definitions missing in old headers */ |
| + | /* Provide Service Principal names as macros */ |
| #define SP_NAME_DIGEST "WDigest" | |
| #define SP_NAME_NTLM "NTLM" | |
| #define SP_NAME_NEGOTIATE "Negotiate" | |
lib/ldap.c+0 -8
| @@ -56,14 +56,6 @@ | |
| #endif | |
| #ifdef USE_WIN32_LDAP /* Use Windows LDAP implementation. */ | |
| - | # ifdef _MSC_VER |
| - | # pragma warning(push) |
| - | # pragma warning(disable:4201) |
| - | # endif |
| - | # include <subauth.h> /* for [P]UNICODE_STRING */ |
| - | # ifdef _MSC_VER |
| - | # pragma warning(pop) |
| - | # endif |
| # include <winldap.h> | |
| # include <winber.h> | |
| #else | |
lib/vtls/schannel.h+1 -10
| @@ -28,14 +28,6 @@ | |
| #ifdef USE_SCHANNEL | |
| - | #ifdef _MSC_VER |
| - | #pragma warning(push) |
| - | #pragma warning(disable:4201) |
| - | #endif |
| - | #include <subauth.h> |
| - | #ifdef _MSC_VER |
| - | #pragma warning(pop) |
| - | #endif |
| /* Wincrypt must be included before anything that could include OpenSSL. */ | |
| #ifdef USE_WIN32_CRYPTO | |
| #include <wincrypt.h> | |
| @@ -48,14 +40,13 @@ | |
| #undef OCSP_RESPONSE | |
| #endif | |
| - | #include <schnlsp.h> |
| #include <schannel.h> | |
| #include "../curl_sspi.h" | |
| #include "../cfilters.h" | |
| #include "../urldata.h" | |
| - | /* <wincrypt.h> has been included via the above <schnlsp.h>. |
| + | /* <wincrypt.h> has been included via the above <schannel.h>. |
| * Or in case of ldap.c, it was included via <winldap.h>. | |
| * And since <wincrypt.h> has this: | |
| * #define X509_NAME ((LPCSTR)7) | |
lib/vtls/schannel_int.h+0 -5
| @@ -91,11 +91,6 @@ typedef struct _SCH_CREDENTIALS { | |
| PTLS_PARAMETERS pTlsParameters; | |
| } SCH_CREDENTIALS, * PSCH_CREDENTIALS; | |
| - | #define SCH_CRED_MAX_SUPPORTED_PARAMETERS 16 |
| - | #define SCH_CRED_MAX_SUPPORTED_ALPN_IDS 16 |
| - | #define SCH_CRED_MAX_SUPPORTED_CRYPTO_SETTINGS 16 |
| - | #define SCH_CRED_MAX_SUPPORTED_CHAINING_MODES 16 |
| - | |
| #endif /* SCH_CREDENTIALS_VERSION */ | |
| struct Curl_schannel_cred { | |