From 95ebcfa0829ef94171e7a206769455a281ea0b36 Mon Sep 17 00:00:00 2001
From: Yuxuan Shui <yshui@codeweavers.com>
Date: Fri, 29 Sep 2023 16:39:51 +0100
Subject: [PATCH] Revert "include: Don't align the stack for PE builds."

This reverts commit 87fbf3305fe733b475a1f907a730f40b4823424b.

We saw hangs in Phasmophobia with the commit, and then discovered this commit is
not strictly necessary for ntlea, so we revert it.
---
 include/msvcrt/corecrt.h |  9 ++++++---
 include/windef.h         | 23 ++++++++++++++---------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h
index 4ddea3edb1e..aba9bc9422e 100644
--- a/include/msvcrt/corecrt.h
+++ b/include/msvcrt/corecrt.h
@@ -82,7 +82,7 @@
 #define __has_attribute(x) 0
 #endif
 
-#if !defined(_MSC_VER) && !defined(__MINGW32__)
+#ifndef _MSC_VER
 # undef __stdcall
 # ifdef __i386__
 #  ifdef __GNUC__
@@ -100,13 +100,16 @@
 #  else
 #   define __stdcall __attribute__((ms_abi))
 #  endif
-# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__CYGWIN__)
+# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__MINGW32__) && !defined(__CYGWIN__)
 #   define __stdcall __attribute__((pcs("aapcs-vfp")))
 # elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi)
 #  define __stdcall __attribute__((ms_abi))
 # else  /* __i386__ */
 #  define __stdcall
 # endif  /* __i386__ */
+#endif /* __stdcall */
+
+#ifndef _MSC_VER
 # undef __cdecl
 # if defined(__i386__) && defined(__GNUC__)
 #  if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__)
@@ -117,7 +120,7 @@
 # else
 #  define __cdecl __stdcall
 # endif
-#endif  /* _MSC_VER || __MINGW32__ */
+#endif
 
 #if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined (__GNUC__)
 # include <stdarg.h>
diff --git a/include/windef.h b/include/windef.h
index 827e9f92a26..cb7eb1179c8 100644
--- a/include/windef.h
+++ b/include/windef.h
@@ -54,7 +54,7 @@ extern "C" {
 # endif
 #endif
 
-#if !defined(_MSC_VER) && !defined(__MINGW32__)
+#ifndef _MSC_VER
 # undef __stdcall
 # ifdef __i386__
 #  ifdef __GNUC__
@@ -72,13 +72,16 @@ extern "C" {
 #  else
 #   define __stdcall __attribute__((ms_abi))
 #  endif
-# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__CYGWIN__)
+# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__MINGW32__) && !defined(__CYGWIN__)
 #   define __stdcall __attribute__((pcs("aapcs-vfp")))
 # elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi)
 #  define __stdcall __attribute__((ms_abi))
 # else  /* __i386__ */
 #  define __stdcall
 # endif  /* __i386__ */
+#endif /* __stdcall */
+
+#ifndef _MSC_VER
 # undef __cdecl
 # if defined(__i386__) && defined(__GNUC__)
 #  if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__)
@@ -89,13 +92,15 @@ extern "C" {
 # else
 #  define __cdecl __stdcall
 # endif
-# ifndef __fastcall
-#  define __fastcall __stdcall
-# endif
-# ifndef __thiscall
-#  define __thiscall __stdcall
-# endif
-#endif  /* _MSC_VER || __MINGW32__ */
+#endif
+
+#if !defined(_MSC_VER) && !defined(__fastcall)
+# define __fastcall __stdcall
+#endif
+
+#if (!defined(_MSC_VER) || !defined(__clang__)) && !defined(__thiscall)
+# define __thiscall __stdcall
+#endif
 
 #ifndef __ms_va_list
 # if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined (__GNUC__)