wrapper: make inclusion of Windows csprng header tightly scoped

Including NTSecAPI.h in git-compat-util.h causes build errors in any other file that includes winternl.h. NTSecAPI.h was included in order to get access to the RtlGenRandom cryptographically secure PRNG. This change scopes the inclusion of ntsecapi.h to wrapper.c, which is the only place that it's actually needed. The build breakage is due to the definition of UNICODE_STRING in NtSecApi.h: #ifndef _NTDEF_ typedef LSA_UNICODE_STRING UNICODE_STRING, *PUNICODE_STRING; typedef LSA_STRING STRING, *PSTRING ; #endif LsaLookup.h: typedef struct _LSA_UNICODE_STRING { USHORT Length; USHORT MaximumLength; #ifdef MIDL_PASS [size_is(MaximumLength/2), length_is(Length/2)] #endif // MIDL_PASS PWSTR Buffer; } LSA_UNICODE_STRING, *PLSA_UNICODE_STRING; winternl.h also defines UNICODE_STRING: typedef struct _UNICODE_STRING { USHORT Length; USHORT MaximumLength; PWSTR Buffer; } UNICODE_STRING; typedef UNICODE_STRING *PUNICODE_STRING; Both definitions have equivalent layouts. Apparently these internal Windows headers aren't designed to be included together. This is an oversight in the headers and does not represent an incompatibility between the APIs. Signed-off-by: Neeraj Singh <neerajsi@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Neeraj Singh committed Mar 10, 2022 at 22:43 UTC 19d3f228c8df7e946278c96fb52acf1cea0f6a7a
3 files changed +7 -11
compat/winansi.c
-5
@@ -4,11 +4,6 @@
4
5 #undef NOGDI
6
7 -/*
8 - * Including the appropriate header file for RtlGenRandom causes MSVC to see a
9 - * redefinition of types in an incompatible way when including headers below.
10 - */
11 -#undef HAVE_RTLGENRANDOM
7 #include "../git-compat-util.h"
8 #include <wingdi.h>
9 #include <winreg.h>
git-compat-util.h
-6
@@ -197,12 +197,6 @@
197 #endif
198 #include <windows.h>
199 #define GIT_WINDOWS_NATIVE
200 -#ifdef HAVE_RTLGENRANDOM
201 -/* This is required to get access to RtlGenRandom. */
202 -#define SystemFunction036 NTAPI SystemFunction036
203 -#include <NTSecAPI.h>
204 -#undef SystemFunction036
205 -#endif
200 #endif
201
202 #include <unistd.h>
wrapper.c
+7
@@ -4,6 +4,13 @@
4 #include "cache.h"
5 #include "config.h"
6
7 +#ifdef HAVE_RTLGENRANDOM
8 +/* This is required to get access to RtlGenRandom. */
9 +#define SystemFunction036 NTAPI SystemFunction036
10 +#include <NTSecAPI.h>
11 +#undef SystemFunction036
12 +#endif
13 +
14 static int memory_limit_check(size_t size, int gentle)
15 {
16 static size_t limit = 0;