From 2e115ab4420e9595c956c082e76b603fa684be20 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 4 Dec 2020 10:31:11 +0100
Subject: [PATCH] Revert "winecrt0: Make the main() and wmain() entry points
 cdecl."

This reverts commit f2a7405a09c66e4b9adc15d4e9b7379ed4c78f54.
We now have separate entry points for msvcrt builds.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/winecrt0/exe_entry.c   | 2 +-
 dlls/winecrt0/exe_main.c    | 2 +-
 dlls/winecrt0/exe_wentry.c  | 2 +-
 dlls/winecrt0/exe_wmain.c   | 2 +-
 programs/winebrowser/main.c | 2 +-
 programs/winedbg/winedbg.c  | 2 +-
 programs/winevdm/winevdm.c  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/winecrt0/exe_entry.c b/dlls/winecrt0/exe_entry.c
index 93a323f42a6..d4d1d7d6757 100644
--- a/dlls/winecrt0/exe_entry.c
+++ b/dlls/winecrt0/exe_entry.c
@@ -27,7 +27,7 @@
 #include "winbase.h"
 #include "winternl.h"
 
-extern int __cdecl main( int argc, char *argv[] );
+extern int main( int argc, char *argv[] );
 
 static char **build_argv( const char *src, int *ret_argc )
 {
diff --git a/dlls/winecrt0/exe_main.c b/dlls/winecrt0/exe_main.c
index d966fafc9e6..8861cbf1449 100644
--- a/dlls/winecrt0/exe_main.c
+++ b/dlls/winecrt0/exe_main.c
@@ -27,7 +27,7 @@
 #include "winbase.h"
 #include "winuser.h"
 
-int __cdecl main( int argc, char *argv[] )
+int main( int argc, char *argv[] )
 {
     STARTUPINFOA info;
     char *cmdline = GetCommandLineA();
diff --git a/dlls/winecrt0/exe_wentry.c b/dlls/winecrt0/exe_wentry.c
index 0524dce99a7..a4c1a0897fb 100644
--- a/dlls/winecrt0/exe_wentry.c
+++ b/dlls/winecrt0/exe_wentry.c
@@ -27,7 +27,7 @@
 #include "winbase.h"
 #include "winternl.h"
 
-extern int __cdecl wmain( int argc, WCHAR *argv[] );
+extern int wmain( int argc, WCHAR *argv[] );
 
 static WCHAR **build_argv( const WCHAR *src, int *ret_argc )
 {
diff --git a/dlls/winecrt0/exe_wmain.c b/dlls/winecrt0/exe_wmain.c
index 7ada198a12f..e576a8baceb 100644
--- a/dlls/winecrt0/exe_wmain.c
+++ b/dlls/winecrt0/exe_wmain.c
@@ -29,7 +29,7 @@
 
 int WINAPI wWinMain(HINSTANCE,HINSTANCE,LPWSTR,int);
 
-int __cdecl wmain( int argc, WCHAR *argv[] )
+int wmain( int argc, WCHAR *argv[] )
 {
     STARTUPINFOW info;
     WCHAR *cmdline = GetCommandLineW();
diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c
index c70457e50b3..7c82d674f66 100644
--- a/programs/winebrowser/main.c
+++ b/programs/winebrowser/main.c
@@ -448,7 +448,7 @@ static WCHAR *convert_file_uri(IUri *uri)
  * Main entry point. This is a console application so we have a wmain() not a
  * winmain().
  */
-int __cdecl wmain(int argc, WCHAR *argv[])
+int wmain(int argc, WCHAR *argv[])
 {
     static const WCHAR nohomeW[] = {'-','n','o','h','o','m','e',0};
 
diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c
index 538367926e8..838089e8628 100644
--- a/programs/winedbg/winedbg.c
+++ b/programs/winedbg/winedbg.c
@@ -664,7 +664,7 @@ static void restart_if_wow64(void)
     }
 }
 
-int __cdecl main(int argc, char** argv)
+int main(int argc, char** argv)
 {
     int 	        retv = 0;
     HANDLE              hFile = INVALID_HANDLE_VALUE;
diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c
index e550232c9af..0a43e579793 100644
--- a/programs/winevdm/winevdm.c
+++ b/programs/winevdm/winevdm.c
@@ -493,7 +493,7 @@ static void usage(void)
 /***********************************************************************
  *           main
  */
-int __cdecl main( int argc, char *argv[] )
+int main( int argc, char *argv[] )
 {
     DWORD count;
     HINSTANCE16 instance;
-- 
2.11.4.GIT