undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lazyload: use correct calling conventions

Browse Source 
Christoph Reiter reported on the Git for Windows issue tracker[1], that
mingw_strftime() imports strftime() from ucrtbase.dll with the wrong
calling convention. It should be __cdecl instead of WINAPI, which we
always use in DECLARE_PROC_ADDR().

The MSYS2 project encountered cmake sefaults on x86 Windows caused by
the same issue in the cmake source. [2] There are no known git crashes
that where caused by this, yet, but we should try to prevent them.

We import two other non-WINAPI functions via DECLARE_PROC_ADDR(), too.

* NtSetSystemInformation() (NTAPI)
* GetUserNameExW()         (SEC_ENTRY)

NTAPI, SEC_ENTRY and WINAPI are all ususally defined as __stdcall,
but there are circumstances where they're defined differently.

Teach DECLARE_PROC_ADDR() about calling conventions and be explicit
about when we want to use which calling convention.

Import winnt.h for the definition of NTAPI and sspi.h for SEC_ENTRY
near their respective only users.

[1] https://github.com/git-for-windows/git/issues/3560
[2] https://github.com/msys2/MINGW-packages/issues/10152

Reported-By: Christoph Reiter <reiter.christoph@gmail.com>
Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matthias Aßhauer 2022-01-08 16:02:30 +00:00 committed by Junio C Hamano
parent e9d7761bb9
commit 4a9b204920
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compat/mingw.c
View File

@ -8,6 +8,8 @@
#include "win32/lazyload.h" #include "win32/lazyload.h"
#include "../config.h" #include "../config.h"
#include "dir.h" #include "dir.h"
#define SECURITY_WIN32
#include <sspi.h>
#define HCAST(type, handle) ((type)(intptr_t)handle) #define HCAST(type, handle) ((type)(intptr_t)handle)
@ -1008,7 +1010,7 @@ size_t mingw_strftime(char *s, size_t max,
/* a pointer to the original strftime in case we can't find the UCRT version */ /* a pointer to the original strftime in case we can't find the UCRT version */
static size_t (*fallback)(char *, size_t, const char *, const struct tm *) = strftime; static size_t (*fallback)(char *, size_t, const char *, const struct tm *) = strftime;
size_t ret; size_t ret;
DECLARE_PROC_ADDR(ucrtbase.dll, size_t, strftime, char *, size_t, DECLARE_PROC_ADDR(ucrtbase.dll, size_t, __cdecl, strftime, char *, size_t,
const char *, const struct tm *); const char *, const struct tm *);
if (INIT_PROC_ADDR(strftime)) if (INIT_PROC_ADDR(strftime))
@ -2183,7 +2185,7 @@ enum EXTENDED_NAME_FORMAT {
static char *get_extended_user_info(enum EXTENDED_NAME_FORMAT type) static char *get_extended_user_info(enum EXTENDED_NAME_FORMAT type)
{ {
DECLARE_PROC_ADDR(secur32.dll, BOOL, GetUserNameExW, DECLARE_PROC_ADDR(secur32.dll, BOOL, SEC_ENTRY, GetUserNameExW,
enum EXTENDED_NAME_FORMAT, LPCWSTR, PULONG); enum EXTENDED_NAME_FORMAT, LPCWSTR, PULONG);
static wchar_t wbuffer[1024]; static wchar_t wbuffer[1024];
DWORD len; DWORD len;

6
compat/win32/lazyload.h
View File

@ -4,7 +4,7 @@
/* /*
* A pair of macros to simplify loading of DLL functions. Example: * A pair of macros to simplify loading of DLL functions. Example:
* *
* DECLARE_PROC_ADDR(kernel32.dll, BOOL, CreateHardLinkW, * DECLARE_PROC_ADDR(kernel32.dll, BOOL, WINAPI, CreateHardLinkW,
* LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES); * LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES);
* *
* if (!INIT_PROC_ADDR(CreateHardLinkW)) * if (!INIT_PROC_ADDR(CreateHardLinkW))
@ -25,10 +25,10 @@ struct proc_addr {
}; };
/* Declares a function to be loaded dynamically from a DLL. */ /* Declares a function to be loaded dynamically from a DLL. */
#define DECLARE_PROC_ADDR(dll, rettype, function, ...) \ #define DECLARE_PROC_ADDR(dll, rettype, convention, function, ...) \
static struct proc_addr proc_addr_##function = \ static struct proc_addr proc_addr_##function = \
{ #dll, #function, NULL, 0 }; \ { #dll, #function, NULL, 0 }; \
typedef rettype (WINAPI *proc_type_##function)(__VA_ARGS__); \ typedef rettype (convention *proc_type_##function)(__VA_ARGS__); \
static proc_type_##function function static proc_type_##function function
/* /*

4
compat/win32/trace2_win32_process_info.c
View File

@ -143,8 +143,8 @@ static void get_is_being_debugged(void)
*/ */
static void get_peak_memory_info(void) static void get_peak_memory_info(void)
{ {
DECLARE_PROC_ADDR(psapi.dll, BOOL, GetProcessMemoryInfo, HANDLE, DECLARE_PROC_ADDR(psapi.dll, BOOL, WINAPI, GetProcessMemoryInfo,
PPROCESS_MEMORY_COUNTERS, DWORD); HANDLE, PPROCESS_MEMORY_COUNTERS, DWORD);
if (INIT_PROC_ADDR(GetProcessMemoryInfo)) { if (INIT_PROC_ADDR(GetProcessMemoryInfo)) {
PROCESS_MEMORY_COUNTERS pmc; PROCESS_MEMORY_COUNTERS pmc;

5
compat/winansi.c
View File

@ -45,8 +45,9 @@ typedef struct _CONSOLE_FONT_INFOEX {
static void warn_if_raster_font(void) static void warn_if_raster_font(void)
{ {
DWORD fontFamily = 0; DWORD fontFamily = 0;
DECLARE_PROC_ADDR(kernel32.dll, BOOL, GetCurrentConsoleFontEx, DECLARE_PROC_ADDR(kernel32.dll, BOOL, WINAPI,
HANDLE, BOOL, PCONSOLE_FONT_INFOEX); GetCurrentConsoleFontEx, HANDLE, BOOL,
PCONSOLE_FONT_INFOEX);
/* don't bother if output was ascii only */ /* don't bother if output was ascii only */
if (!non_ascii_used) if (!non_ascii_used)

4
t/helper/test-drop-caches.c
View File

@ -3,6 +3,7 @@
#if defined(GIT_WINDOWS_NATIVE) #if defined(GIT_WINDOWS_NATIVE)
#include "lazyload.h" #include "lazyload.h"
#include <winnt.h>
static int cmd_sync(void) static int cmd_sync(void)
{ {
@ -86,7 +87,8 @@ static int cmd_dropcaches(void)
{ {
HANDLE hProcess = GetCurrentProcess(); HANDLE hProcess = GetCurrentProcess();
HANDLE hToken; HANDLE hToken;
DECLARE_PROC_ADDR(ntdll.dll, DWORD, NtSetSystemInformation, INT, PVOID, ULONG); DECLARE_PROC_ADDR(ntdll.dll, DWORD, NTAPI, NtSetSystemInformation, INT, PVOID,
ULONG);
SYSTEM_MEMORY_LIST_COMMAND command; SYSTEM_MEMORY_LIST_COMMAND command;
int status; int status;