Module: wine Branch: master Commit: c15733dead9510f5851e4a4cb6c51151d193fbb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c15733dead9510f5851e4a4cb...
Author: Jacek Caban jacek@codeweavers.com Date: Thu Feb 27 11:59:02 2020 +0100
include: Add corecrt_startup.h header.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/msvcrt/tests/data.c | 1 - include/Makefile.in | 1 + include/msvcrt/corecrt_startup.h | 47 ++++++++++++++++++++++++++++++++++++++++ include/msvcrt/process.h | 2 +- 4 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index b664edbab1..050a234ce8 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -32,7 +32,6 @@ #include <errno.h> #include <direct.h>
-void __cdecl __getmainargs(int *, char ***, char ***, int, int *); static int* (__cdecl *p___p___argc)(void); static char*** (__cdecl *p___p___argv)(void);
diff --git a/include/Makefile.in b/include/Makefile.in index c4ade26688..ce0f6fc433 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -424,6 +424,7 @@ SOURCES = \ msvcrt/assert.h \ msvcrt/conio.h \ msvcrt/corecrt.h \ + msvcrt/corecrt_startup.h \ msvcrt/corecrt_stdio_config.h \ msvcrt/corecrt_wctype.h \ msvcrt/corecrt_wio.h \ diff --git a/include/msvcrt/corecrt_startup.h b/include/msvcrt/corecrt_startup.h new file mode 100644 index 0000000000..cd374ec10b --- /dev/null +++ b/include/msvcrt/corecrt_startup.h @@ -0,0 +1,47 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the Wine project. + */ + +#ifndef _INC_CORECRT_STARTUP +#define _INC_CORECRT_STARTUP + +#include <corecrt.h> + +typedef enum _crt_argv_mode +{ + _crt_argv_no_arguments, + _crt_argv_unexpanded_arguments, + _crt_argv_expanded_arguments +} _crt_argv_mode; + +typedef enum _crt_app_type +{ + _crt_unknown_app, + _crt_console_app, + _crt_gui_app +} _crt_app_type; + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef _UCRT +_ACRTIMP void __cdecl __getmainargs(int *, char ***, char ***, int, int *); +_ACRTIMP void __cdecl __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, int *); +#define _set_app_type __set_app_type +#endif /* _UCRT */ + +_ACRTIMP errno_t __cdecl _configure_narrow_argv(_crt_argv_mode); +_ACRTIMP errno_t __cdecl _configure_wide_argv(_crt_argv_mode); +_ACRTIMP char **__cdecl _get_initial_narrow_environment(void); +_ACRTIMP wchar_t **__cdecl _get_initial_wide_environment(void); +_ACRTIMP int __cdecl _initialize_narrow_environment(void); +_ACRTIMP int __cdecl _initialize_wide_environment(void); +_ACRTIMP void __cdecl _set_app_type(_crt_app_type); + +#ifdef __cplusplus +} +#endif + +#endif /* _INC_CORECRT_STARTUP */ diff --git a/include/msvcrt/process.h b/include/msvcrt/process.h index 2514e24238..f76807b43a 100644 --- a/include/msvcrt/process.h +++ b/include/msvcrt/process.h @@ -8,7 +8,7 @@ #ifndef __WINE_PROCESS_H #define __WINE_PROCESS_H
-#include <corecrt.h> +#include <corecrt_startup.h>
/* Process creation flags */ #define _P_WAIT 0