Jacek Caban : msvcrt: Use more public declarations in exe entry points.
Alexandre Julliard
julliard at winehq.org
Thu Feb 27 17:15:11 CST 2020
Module: wine
Branch: master
Commit: c6b852e3c37247a01547d8ab9d1630684f9c5aaa
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6b852e3c37247a01547d8ab9d1630684f9c5aaa
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Feb 27 11:59:12 2020 +0100
msvcrt: Use more public declarations in exe entry points.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcrt/crt_main.c | 8 ++------
dlls/msvcrt/crt_wmain.c | 8 ++------
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/dlls/msvcrt/crt_main.c b/dlls/msvcrt/crt_main.c
index d9e3e66964..81ec188058 100644
--- a/dlls/msvcrt/crt_main.c
+++ b/dlls/msvcrt/crt_main.c
@@ -25,15 +25,11 @@
#ifdef __MINGW32__
#include <stdarg.h>
+#include <process.h>
#include "windef.h"
#include "winbase.h"
-/* FIXME: Use msvcrt headers once we move to PE file */
-void __cdecl exit(int);
-void __cdecl __getmainargs(int *, char ***, char ***, int, int *);
-void __cdecl __set_app_type(int);
-
int __cdecl main(int argc, char **argv, char **env);
static const IMAGE_NT_HEADERS *get_nt_header( void )
@@ -48,7 +44,7 @@ int __cdecl mainCRTStartup(void)
char **argv, **env;
__getmainargs(&argc, &argv, &env, 0, &new_mode);
- __set_app_type(get_nt_header()->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI ? 2 : 1);
+ _set_app_type(get_nt_header()->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI ? _crt_gui_app : _crt_console_app);
ret = main(argc, argv, env);
diff --git a/dlls/msvcrt/crt_wmain.c b/dlls/msvcrt/crt_wmain.c
index 60a67bbe30..77eb4dbfa7 100644
--- a/dlls/msvcrt/crt_wmain.c
+++ b/dlls/msvcrt/crt_wmain.c
@@ -25,15 +25,11 @@
#ifdef __MINGW32__
#include <stdarg.h>
+#include <process.h>
#include "windef.h"
#include "winbase.h"
-/* FIXME: Use msvcrt headers once we move to PE file */
-void __cdecl exit(int);
-void __cdecl __wgetmainargs(int *, WCHAR ***, WCHAR ***, int, int *);
-void __cdecl __set_app_type(int);
-
int __cdecl wmain(int argc, WCHAR **argv, WCHAR **env);
static const IMAGE_NT_HEADERS *get_nt_header( void )
@@ -48,7 +44,7 @@ int __cdecl wmainCRTStartup(void)
WCHAR **argv, **env;
__wgetmainargs(&argc, &argv, &env, 0, &new_mode);
- __set_app_type(get_nt_header()->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI ? 2 : 1);
+ _set_app_type(get_nt_header()->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI ? _crt_gui_app : _crt_console_app);
ret = wmain(argc, argv, env);
More information about the wine-cvs
mailing list