diff --git a/include/Makefile.in b/include/Makefile.in index ce0f6fc433a..54bd7e28254 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -428,6 +428,7 @@ SOURCES = \ msvcrt/corecrt_stdio_config.h \ msvcrt/corecrt_wctype.h \ msvcrt/corecrt_wio.h \ + msvcrt/corecrt_wprocess.h \ msvcrt/corecrt_wstdio.h \ msvcrt/corecrt_wstdlib.h \ msvcrt/corecrt_wstring.h \ diff --git a/include/msvcrt/corecrt_wprocess.h b/include/msvcrt/corecrt_wprocess.h new file mode 100644 index 00000000000..aa71aeff6b9 --- /dev/null +++ b/include/msvcrt/corecrt_wprocess.h @@ -0,0 +1,37 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the Wine project. + */ + +#ifndef _WPROCESS_DEFINED +#define _WPROCESS_DEFINED + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +intptr_t WINAPIV _wexecl(const wchar_t*,const wchar_t*,...); +intptr_t WINAPIV _wexecle(const wchar_t*,const wchar_t*,...); +intptr_t WINAPIV _wexeclp(const wchar_t*,const wchar_t*,...); +intptr_t WINAPIV _wexeclpe(const wchar_t*,const wchar_t*,...); +intptr_t __cdecl _wexecv(const wchar_t*,const wchar_t* const *); +intptr_t __cdecl _wexecve(const wchar_t*,const wchar_t* const *,const wchar_t* const *); +intptr_t __cdecl _wexecvp(const wchar_t*,const wchar_t* const *); +intptr_t __cdecl _wexecvpe(const wchar_t*,const wchar_t* const *,const wchar_t* const *); +intptr_t WINAPIV _wspawnl(int,const wchar_t*,const wchar_t*,...); +intptr_t WINAPIV _wspawnle(int,const wchar_t*,const wchar_t*,...); +intptr_t WINAPIV _wspawnlp(int,const wchar_t*,const wchar_t*,...); +intptr_t WINAPIV _wspawnlpe(int,const wchar_t*,const wchar_t*,...); +intptr_t __cdecl _wspawnv(int,const wchar_t*,const wchar_t* const *); +intptr_t __cdecl _wspawnve(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *); +intptr_t __cdecl _wspawnvp(int,const wchar_t*,const wchar_t* const *); +intptr_t __cdecl _wspawnvpe(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *); +int __cdecl _wsystem(const wchar_t*); + +#ifdef __cplusplus +} +#endif + +#endif /* _WPROCESS_DEFINED */ diff --git a/include/msvcrt/process.h b/include/msvcrt/process.h index f76807b43a6..a3707129ad7 100644 --- a/include/msvcrt/process.h +++ b/include/msvcrt/process.h @@ -9,6 +9,7 @@ #define __WINE_PROCESS_H #include +#include /* Process creation flags */ #define _P_WAIT 0 @@ -57,27 +58,6 @@ void __cdecl abort(void) DECLSPEC_NORETURN; void __cdecl exit(int) DECLSPEC_NORETURN; int __cdecl system(const char*); -#ifndef _WPROCESS_DEFINED -#define _WPROCESS_DEFINED -intptr_t WINAPIV _wexecl(const wchar_t*,const wchar_t*,...); -intptr_t WINAPIV _wexecle(const wchar_t*,const wchar_t*,...); -intptr_t WINAPIV _wexeclp(const wchar_t*,const wchar_t*,...); -intptr_t WINAPIV _wexeclpe(const wchar_t*,const wchar_t*,...); -intptr_t __cdecl _wexecv(const wchar_t*,const wchar_t* const *); -intptr_t __cdecl _wexecve(const wchar_t*,const wchar_t* const *,const wchar_t* const *); -intptr_t __cdecl _wexecvp(const wchar_t*,const wchar_t* const *); -intptr_t __cdecl _wexecvpe(const wchar_t*,const wchar_t* const *,const wchar_t* const *); -intptr_t WINAPIV _wspawnl(int,const wchar_t*,const wchar_t*,...); -intptr_t WINAPIV _wspawnle(int,const wchar_t*,const wchar_t*,...); -intptr_t WINAPIV _wspawnlp(int,const wchar_t*,const wchar_t*,...); -intptr_t WINAPIV _wspawnlpe(int,const wchar_t*,const wchar_t*,...); -intptr_t __cdecl _wspawnv(int,const wchar_t*,const wchar_t* const *); -intptr_t __cdecl _wspawnve(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *); -intptr_t __cdecl _wspawnvp(int,const wchar_t*,const wchar_t* const *); -intptr_t __cdecl _wspawnvpe(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *); -int __cdecl _wsystem(const wchar_t*); -#endif /* _WPROCESS_DEFINED */ - #ifdef __cplusplus } #endif diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 239c5af86ad..ddb0fc5bc18 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -41,27 +42,6 @@ int __cdecl _wrmdir(const wchar_t*); wchar_t* __cdecl _wsetlocale(int,const wchar_t*); #endif /* _WLOCALE_DEFINED */ -#ifndef _WPROCESS_DEFINED -#define _WPROCESS_DEFINED -int WINAPIV _wexecl(const wchar_t*,const wchar_t*,...); -int WINAPIV _wexecle(const wchar_t*,const wchar_t*,...); -int WINAPIV _wexeclp(const wchar_t*,const wchar_t*,...); -int WINAPIV _wexeclpe(const wchar_t*,const wchar_t*,...); -int __cdecl _wexecv(const wchar_t*,const wchar_t* const *); -int __cdecl _wexecve(const wchar_t*,const wchar_t* const *,const wchar_t* const *); -int __cdecl _wexecvp(const wchar_t*,const wchar_t* const *); -int __cdecl _wexecvpe(const wchar_t*,const wchar_t* const *,const wchar_t* const *); -int WINAPIV _wspawnl(int,const wchar_t*,const wchar_t*,...); -int WINAPIV _wspawnle(int,const wchar_t*,const wchar_t*,...); -int WINAPIV _wspawnlp(int,const wchar_t*,const wchar_t*,...); -int WINAPIV _wspawnlpe(int,const wchar_t*,const wchar_t*,...); -int __cdecl _wspawnv(int,const wchar_t*,const wchar_t* const *); -int __cdecl _wspawnve(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *); -int __cdecl _wspawnvp(int,const wchar_t*,const wchar_t* const *); -int __cdecl _wspawnvpe(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *); -int __cdecl _wsystem(const wchar_t*); -#endif /* _WPROCESS_DEFINED */ - wchar_t __cdecl btowc(int); size_t __cdecl mbrlen(const char *,size_t,mbstate_t*); size_t __cdecl mbrtowc(wchar_t*,const char*,size_t,mbstate_t*);