From b7ce75e9896a38af5579524adaba8b9952d60221 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Mon, 27 Apr 2020 01:19:00 +0200 Subject: [PATCH] wincon.h: Don't use calling convention wrappers on MSVC. Signed-off-by: Jacek Caban Signed-off-by: Alexandre Julliard --- dlls/kernel32/console.c | 2 +- dlls/kernelbase/console.c | 2 +- include/wincon.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 472d5139901..99734cedf6d 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1802,7 +1802,7 @@ static COORD get_console_font_size(HANDLE hConsole, DWORD index) return c; } -#if defined(__i386__) && !defined(__MINGW32__) +#if defined(__i386__) && !defined(__MINGW32__) && !defined(_MSC_VER) #undef GetConsoleFontSize DWORD WINAPI GetConsoleFontSize(HANDLE hConsole, DWORD index) { diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 347f1d2a637..7dabc91e67c 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -577,7 +577,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleTitleW( LPWSTR title, DWORD size ) /*********************************************************************** * GetLargestConsoleWindowSize (kernelbase.@) */ -#if defined(__i386__) && !defined(__MINGW32__) +#if defined(__i386__) && !defined(__MINGW32__) && !defined(_MSC_VER) #undef GetLargestConsoleWindowSize DWORD WINAPI DECLSPEC_HOTPATCH GetLargestConsoleWindowSize( HANDLE handle ) { diff --git a/include/wincon.h b/include/wincon.h index ececc662207..9f4ccced110 100644 --- a/include/wincon.h +++ b/include/wincon.h @@ -268,7 +268,7 @@ typedef struct tagINPUT_RECORD #define CONSOLE_TEXTMODE_BUFFER 1 -#if defined(__i386__) && !defined(__MINGW32__) +#if defined(__i386__) && !defined(__MINGW32__) && !defined(_MSC_VER) /* Note: this should return a COORD, but calling convention for returning * structures is different between Windows and gcc on i386. */