wincon.h: Don't use calling convention wrappers on MSVC.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wincon.h: Don't use calling convention wrappers on MSVC.
b7ce75e9 · Jacek Caban · Alexandre Julliard · 59336f2f · b7ce75e9 · b7ce75e9
Commit b7ce75e9 authored Apr 27, 2020 by Jacek Caban Committed by Alexandre Julliard Apr 27, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

console.c dlls/kernel32/console.c +1 -1

console.c dlls/kernelbase/console.c +1 -1

wincon.h include/wincon.h +1 -1

No files found.
--- 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)
 {

--- 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 )
 {

--- 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. */