From 579fc688af0c54fe6a49e3b56204c34c77dc6e9e Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Tue, 24 Nov 2020 18:50:06 +0100 Subject: [PATCH] include: Use proper dllimports for msvcrt functions. Signed-off-by: Alexandre Julliard --- dlls/msvcp90/msvcp90.h | 2 - dlls/msvcrt/mathf.c | 13 ++ include/msvcrt/assert.h | 2 +- include/msvcrt/conio.h | 34 ++--- include/msvcrt/corecrt_wctype.h | 44 +++--- include/msvcrt/corecrt_wdirect.h | 10 +- include/msvcrt/corecrt_wio.h | 32 ++--- include/msvcrt/corecrt_wprocess.h | 34 ++--- include/msvcrt/corecrt_wstdio.h | 68 +++++----- include/msvcrt/corecrt_wstdlib.h | 78 +++++------ include/msvcrt/corecrt_wtime.h | 16 +-- include/msvcrt/crtdbg.h | 16 +-- include/msvcrt/ctype.h | 48 +++---- include/msvcrt/direct.h | 16 +-- include/msvcrt/dos.h | 2 +- include/msvcrt/eh.h | 6 +- include/msvcrt/errno.h | 2 +- include/msvcrt/float.h | 30 ++-- include/msvcrt/fpieee.h | 2 +- include/msvcrt/io.h | 86 ++++++------ include/msvcrt/locale.h | 16 +-- include/msvcrt/malloc.h | 40 +++--- include/msvcrt/math.h | 198 ++++++++++++++------------- include/msvcrt/mbctype.h | 32 ++--- include/msvcrt/mbstring.h | 160 +++++++++++----------- include/msvcrt/memory.h | 16 +-- include/msvcrt/process.h | 62 ++++----- include/msvcrt/search.h | 8 +- include/msvcrt/setjmp.h | 8 +- include/msvcrt/signal.h | 6 +- include/msvcrt/stddef.h | 4 +- include/msvcrt/stdio.h | 152 ++++++++++----------- include/msvcrt/stdlib.h | 218 +++++++++++++++--------------- include/msvcrt/sys/stat.h | 26 ++-- include/msvcrt/sys/timeb.h | 4 +- include/msvcrt/sys/utime.h | 12 +- include/msvcrt/time.h | 56 ++++---- include/msvcrt/wchar.h | 5 +- include/msvcrt/wctype.h | 34 ++--- 39 files changed, 804 insertions(+), 794 deletions(-) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 9a9390d6998..d58afba9a0d 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -40,8 +40,6 @@ typedef SSIZE_T streamsize; #endif void __cdecl _invalid_parameter_noinfo(void); -void __cdecl _invalid_parameter(const wchar_t*, const wchar_t*, - const wchar_t*, unsigned int, uintptr_t); BOOL __cdecl __uncaught_exception(void); int __cdecl _callnewh(size_t); diff --git a/dlls/msvcrt/mathf.c b/dlls/msvcrt/mathf.c index 232740df153..4038bdb4cf7 100644 --- a/dlls/msvcrt/mathf.c +++ b/dlls/msvcrt/mathf.c @@ -24,6 +24,7 @@ #endif #include +#include double __cdecl sin(double); double __cdecl cos(double); @@ -48,9 +49,21 @@ float powf(float x, float y) { return pow(x, y); } float sqrtf(float x) { return sqrt(x); } float floorf(float x) { return floor(x); } float ceilf(float x) { return ceil(x); } +__ASM_GLOBAL_IMPORT(sinf) +__ASM_GLOBAL_IMPORT(cosf) +__ASM_GLOBAL_IMPORT(tanf) +__ASM_GLOBAL_IMPORT(atan2f) +__ASM_GLOBAL_IMPORT(expf) +__ASM_GLOBAL_IMPORT(logf) +__ASM_GLOBAL_IMPORT(powf) +__ASM_GLOBAL_IMPORT(sqrtf) +__ASM_GLOBAL_IMPORT(floorf) +__ASM_GLOBAL_IMPORT(ceilf) #endif #if _MSVCR_VER < 120 double exp2(double x) { return pow(2.0, x); } float exp2f(float x) { return powf(2.0f, x); } +__ASM_GLOBAL_IMPORT(exp2) +__ASM_GLOBAL_IMPORT(exp2f) #endif diff --git a/include/msvcrt/assert.h b/include/msvcrt/assert.h index 936265a8368..9a180f7e58d 100644 --- a/include/msvcrt/assert.h +++ b/include/msvcrt/assert.h @@ -28,7 +28,7 @@ extern "C" { #ifdef NDEBUG #define assert(_expr) ((void)0) #else -extern void __cdecl _assert(const char *, const char *, unsigned int); +_ACRTIMP void __cdecl _assert(const char *, const char *, unsigned int); #define assert(_expr) (void)((!!(_expr)) || (_assert(#_expr, __FILE__, __LINE__), 0)) #endif diff --git a/include/msvcrt/conio.h b/include/msvcrt/conio.h index 127232c1221..3ce0fcf1c0d 100644 --- a/include/msvcrt/conio.h +++ b/include/msvcrt/conio.h @@ -14,23 +14,23 @@ extern "C" { #endif -char* __cdecl _cgets(char*); -int WINAPIV _cprintf(const char*,...); -int __cdecl _cputs(const char*); -int WINAPIV _cscanf(const char*,...); -int __cdecl _getch(void); -int __cdecl _getche(void); -int __cdecl _kbhit(void); -int __cdecl _putch(int); -int __cdecl _ungetch(int); +_ACRTIMP char* __cdecl _cgets(char*); +_ACRTIMP int WINAPIV _cprintf(const char*,...); +_ACRTIMP int __cdecl _cputs(const char*); +_ACRTIMP int WINAPIV _cscanf(const char*,...); +_ACRTIMP int __cdecl _getch(void); +_ACRTIMP int __cdecl _getche(void); +_ACRTIMP int __cdecl _kbhit(void); +_ACRTIMP int __cdecl _putch(int); +_ACRTIMP int __cdecl _ungetch(int); #ifdef _M_IX86 -int __cdecl _inp(unsigned short); -__msvcrt_ulong __cdecl _inpd(unsigned short); -unsigned short __cdecl _inpw(unsigned short); -int __cdecl _outp(unsigned short, int); -__msvcrt_ulong __cdecl _outpd(unsigned short, __msvcrt_ulong); -unsigned short __cdecl _outpw(unsigned short, unsigned short); +_ACRTIMP int __cdecl _inp(unsigned short); +_ACRTIMP __msvcrt_ulong __cdecl _inpd(unsigned short); +_ACRTIMP unsigned short __cdecl _inpw(unsigned short); +_ACRTIMP int __cdecl _outp(unsigned short, int); +_ACRTIMP __msvcrt_ulong __cdecl _outpd(unsigned short, __msvcrt_ulong); +_ACRTIMP unsigned short __cdecl _outpw(unsigned short, unsigned short); #endif #ifdef __cplusplus @@ -53,8 +53,8 @@ static inline unsigned short outpw(unsigned short i, unsigned short j) { return #endif #if defined(__GNUC__) && (__GNUC__ < 4) -extern int WINAPIV cprintf(const char*,...) __attribute__((alias("_cprintf"),format(printf,1,2))); -extern int WINAPIV cscanf(const char*,...) __attribute__((alias("_cscanf"),format(scanf,1,2))); +_ACRTIMP int WINAPIV cprintf(const char*,...) __attribute__((alias("_cprintf"),format(printf,1,2))); +_ACRTIMP int WINAPIV cscanf(const char*,...) __attribute__((alias("_cscanf"),format(scanf,1,2))); #else #define cprintf _cprintf #define cscanf _cscanf diff --git a/include/msvcrt/corecrt_wctype.h b/include/msvcrt/corecrt_wctype.h index af44e86772b..9db8c9758b0 100644 --- a/include/msvcrt/corecrt_wctype.h +++ b/include/msvcrt/corecrt_wctype.h @@ -24,28 +24,28 @@ extern "C" { #define _LEADBYTE 0x8000 #define _ALPHA (0x0100|_UPPER|_LOWER) /* (C1_ALPHA|_UPPER|_LOWER) */ -int __cdecl _iswblank_l(wint_t,_locale_t); -int __cdecl _iswctype_l(wint_t,wctype_t,_locale_t); -wchar_t __cdecl _towlower_l(wchar_t,_locale_t); -wchar_t __cdecl _towupper_l(wchar_t,_locale_t); -int __cdecl is_wctype(wint_t,wctype_t); -int __cdecl isleadbyte(int); -int __cdecl iswalnum(wint_t); -int __cdecl iswalpha(wint_t); -int __cdecl iswascii(wint_t); -int __cdecl iswblank(wint_t); -int __cdecl iswcntrl(wint_t); -int __cdecl iswctype(wint_t,wctype_t); -int __cdecl iswdigit(wint_t); -int __cdecl iswgraph(wint_t); -int __cdecl iswlower(wint_t); -int __cdecl iswprint(wint_t); -int __cdecl iswpunct(wint_t); -int __cdecl iswspace(wint_t); -int __cdecl iswupper(wint_t); -int __cdecl iswxdigit(wint_t); -wchar_t __cdecl towlower(wchar_t); -wchar_t __cdecl towupper(wchar_t); +_ACRTIMP int __cdecl _iswblank_l(wint_t,_locale_t); +_ACRTIMP int __cdecl _iswctype_l(wint_t,wctype_t,_locale_t); +_ACRTIMP wchar_t __cdecl _towlower_l(wchar_t,_locale_t); +_ACRTIMP wchar_t __cdecl _towupper_l(wchar_t,_locale_t); +_ACRTIMP int __cdecl is_wctype(wint_t,wctype_t); +_ACRTIMP int __cdecl isleadbyte(int); +_ACRTIMP int __cdecl iswalnum(wint_t); +_ACRTIMP int __cdecl iswalpha(wint_t); +_ACRTIMP int __cdecl iswascii(wint_t); +_ACRTIMP int __cdecl iswblank(wint_t); +_ACRTIMP int __cdecl iswcntrl(wint_t); +_ACRTIMP int __cdecl iswctype(wint_t,wctype_t); +_ACRTIMP int __cdecl iswdigit(wint_t); +_ACRTIMP int __cdecl iswgraph(wint_t); +_ACRTIMP int __cdecl iswlower(wint_t); +_ACRTIMP int __cdecl iswprint(wint_t); +_ACRTIMP int __cdecl iswpunct(wint_t); +_ACRTIMP int __cdecl iswspace(wint_t); +_ACRTIMP int __cdecl iswupper(wint_t); +_ACRTIMP int __cdecl iswxdigit(wint_t); +_ACRTIMP wchar_t __cdecl towlower(wchar_t); +_ACRTIMP wchar_t __cdecl towupper(wchar_t); #ifdef __cplusplus } diff --git a/include/msvcrt/corecrt_wdirect.h b/include/msvcrt/corecrt_wdirect.h index 88abae560c6..be993fc677c 100644 --- a/include/msvcrt/corecrt_wdirect.h +++ b/include/msvcrt/corecrt_wdirect.h @@ -12,11 +12,11 @@ extern "C" { #endif -int __cdecl _wchdir(const wchar_t*); -wchar_t* __cdecl _wgetcwd(wchar_t*,int); -wchar_t* __cdecl _wgetdcwd(int,wchar_t*,int); -int __cdecl _wmkdir(const wchar_t*); -int __cdecl _wrmdir(const wchar_t*); +_ACRTIMP int __cdecl _wchdir(const wchar_t*); +_ACRTIMP wchar_t* __cdecl _wgetcwd(wchar_t*,int); +_ACRTIMP wchar_t* __cdecl _wgetdcwd(int,wchar_t*,int); +_ACRTIMP int __cdecl _wmkdir(const wchar_t*); +_ACRTIMP int __cdecl _wrmdir(const wchar_t*); #ifdef __cplusplus } diff --git a/include/msvcrt/corecrt_wio.h b/include/msvcrt/corecrt_wio.h index 8a4e0636a01..ce61d24dcd2 100644 --- a/include/msvcrt/corecrt_wio.h +++ b/include/msvcrt/corecrt_wio.h @@ -86,22 +86,22 @@ struct _wfinddata64_t { extern "C" { #endif -int __cdecl _waccess(const wchar_t*,int); -int __cdecl _wchmod(const wchar_t*,int); -int __cdecl _wcreat(const wchar_t*,int); -intptr_t __cdecl _wfindfirst32(const wchar_t*,struct _wfinddata32_t*); -intptr_t __cdecl _wfindfirst32i64(const wchar_t*, struct _wfinddata32i64_t*); -intptr_t __cdecl _wfindfirst64(const wchar_t*,struct _wfinddata64_t*); -intptr_t __cdecl _wfindfirst64i32(const wchar_t*, struct _wfinddata64i32_t*); -int __cdecl _wfindnext32(intptr_t,struct _wfinddata32_t*); -int __cdecl _wfindnext32i64(intptr_t,struct _wfinddata32i64_t*); -int __cdecl _wfindnext64(intptr_t,struct _wfinddata64_t*); -int __cdecl _wfindnext64i32(intptr_t,struct _wfinddata64i32_t*); -wchar_t* __cdecl _wmktemp(wchar_t*); -int WINAPIV _wopen(const wchar_t*,int,...); -int __cdecl _wrename(const wchar_t*,const wchar_t*); -int WINAPIV _wsopen(const wchar_t*,int,int,...); -int __cdecl _wunlink(const wchar_t*); +_ACRTIMP int __cdecl _waccess(const wchar_t*,int); +_ACRTIMP int __cdecl _wchmod(const wchar_t*,int); +_ACRTIMP int __cdecl _wcreat(const wchar_t*,int); +_ACRTIMP intptr_t __cdecl _wfindfirst32(const wchar_t*,struct _wfinddata32_t*); +_ACRTIMP intptr_t __cdecl _wfindfirst32i64(const wchar_t*, struct _wfinddata32i64_t*); +_ACRTIMP intptr_t __cdecl _wfindfirst64(const wchar_t*,struct _wfinddata64_t*); +_ACRTIMP intptr_t __cdecl _wfindfirst64i32(const wchar_t*, struct _wfinddata64i32_t*); +_ACRTIMP int __cdecl _wfindnext32(intptr_t,struct _wfinddata32_t*); +_ACRTIMP int __cdecl _wfindnext32i64(intptr_t,struct _wfinddata32i64_t*); +_ACRTIMP int __cdecl _wfindnext64(intptr_t,struct _wfinddata64_t*); +_ACRTIMP int __cdecl _wfindnext64i32(intptr_t,struct _wfinddata64i32_t*); +_ACRTIMP wchar_t* __cdecl _wmktemp(wchar_t*); +_ACRTIMP int WINAPIV _wopen(const wchar_t*,int,...); +_ACRTIMP int __cdecl _wrename(const wchar_t*,const wchar_t*); +_ACRTIMP int WINAPIV _wsopen(const wchar_t*,int,int,...); +_ACRTIMP int __cdecl _wunlink(const wchar_t*); #ifdef __cplusplus } diff --git a/include/msvcrt/corecrt_wprocess.h b/include/msvcrt/corecrt_wprocess.h index aa71aeff6b9..25e70939260 100644 --- a/include/msvcrt/corecrt_wprocess.h +++ b/include/msvcrt/corecrt_wprocess.h @@ -12,23 +12,23 @@ 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*); +_ACRTIMP intptr_t WINAPIV _wexecl(const wchar_t*,const wchar_t*,...); +_ACRTIMP intptr_t WINAPIV _wexecle(const wchar_t*,const wchar_t*,...); +_ACRTIMP intptr_t WINAPIV _wexeclp(const wchar_t*,const wchar_t*,...); +_ACRTIMP intptr_t WINAPIV _wexeclpe(const wchar_t*,const wchar_t*,...); +_ACRTIMP intptr_t __cdecl _wexecv(const wchar_t*,const wchar_t* const *); +_ACRTIMP intptr_t __cdecl _wexecve(const wchar_t*,const wchar_t* const *,const wchar_t* const *); +_ACRTIMP intptr_t __cdecl _wexecvp(const wchar_t*,const wchar_t* const *); +_ACRTIMP intptr_t __cdecl _wexecvpe(const wchar_t*,const wchar_t* const *,const wchar_t* const *); +_ACRTIMP intptr_t WINAPIV _wspawnl(int,const wchar_t*,const wchar_t*,...); +_ACRTIMP intptr_t WINAPIV _wspawnle(int,const wchar_t*,const wchar_t*,...); +_ACRTIMP intptr_t WINAPIV _wspawnlp(int,const wchar_t*,const wchar_t*,...); +_ACRTIMP intptr_t WINAPIV _wspawnlpe(int,const wchar_t*,const wchar_t*,...); +_ACRTIMP intptr_t __cdecl _wspawnv(int,const wchar_t*,const wchar_t* const *); +_ACRTIMP intptr_t __cdecl _wspawnve(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *); +_ACRTIMP intptr_t __cdecl _wspawnvp(int,const wchar_t*,const wchar_t* const *); +_ACRTIMP intptr_t __cdecl _wspawnvpe(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *); +_ACRTIMP int __cdecl _wsystem(const wchar_t*); #ifdef __cplusplus } diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index c1779fb81ad..091a3ade6f2 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -41,44 +41,44 @@ typedef struct _iobuf #define WEOF (wint_t)(0xFFFF) #endif -FILE *__cdecl __acrt_iob_func(unsigned index); +_ACRTIMP FILE *__cdecl __acrt_iob_func(unsigned index); #define stdin (__acrt_iob_func(0)) #define stdout (__acrt_iob_func(1)) #define stderr (__acrt_iob_func(2)) -wint_t __cdecl _fgetwc_nolock(FILE*); -wint_t __cdecl _fgetwchar(void); -wint_t __cdecl _fputwc_nolock(wint_t,FILE*); -wint_t __cdecl _fputwchar(wint_t); -wint_t __cdecl _getwc_nolock(FILE*); -wchar_t* __cdecl _getws(wchar_t*); -wint_t __cdecl _putwc_nolock(wint_t,FILE*); -int __cdecl _putws(const wchar_t*); -wint_t __cdecl _ungetwc_nolock(wint_t,FILE*); -FILE* __cdecl _wfdopen(int,const wchar_t*); -FILE* __cdecl _wfopen(const wchar_t*,const wchar_t*); -errno_t __cdecl _wfopen_s(FILE**,const wchar_t*,const wchar_t*); -FILE* __cdecl _wfreopen(const wchar_t*,const wchar_t*,FILE*); -FILE* __cdecl _wfsopen(const wchar_t*,const wchar_t*,int); -void __cdecl _wperror(const wchar_t*); -FILE* __cdecl _wpopen(const wchar_t*,const wchar_t*); -int __cdecl _wremove(const wchar_t*); -wchar_t* __cdecl _wtempnam(const wchar_t*,const wchar_t*); -wchar_t* __cdecl _wtmpnam(wchar_t*); +_ACRTIMP wint_t __cdecl _fgetwc_nolock(FILE*); +_ACRTIMP wint_t __cdecl _fgetwchar(void); +_ACRTIMP wint_t __cdecl _fputwc_nolock(wint_t,FILE*); +_ACRTIMP wint_t __cdecl _fputwchar(wint_t); +_ACRTIMP wint_t __cdecl _getwc_nolock(FILE*); +_ACRTIMP wchar_t* __cdecl _getws(wchar_t*); +_ACRTIMP wint_t __cdecl _putwc_nolock(wint_t,FILE*); +_ACRTIMP int __cdecl _putws(const wchar_t*); +_ACRTIMP wint_t __cdecl _ungetwc_nolock(wint_t,FILE*); +_ACRTIMP FILE* __cdecl _wfdopen(int,const wchar_t*); +_ACRTIMP FILE* __cdecl _wfopen(const wchar_t*,const wchar_t*); +_ACRTIMP errno_t __cdecl _wfopen_s(FILE**,const wchar_t*,const wchar_t*); +_ACRTIMP FILE* __cdecl _wfreopen(const wchar_t*,const wchar_t*,FILE*); +_ACRTIMP FILE* __cdecl _wfsopen(const wchar_t*,const wchar_t*,int); +_ACRTIMP void __cdecl _wperror(const wchar_t*); +_ACRTIMP FILE* __cdecl _wpopen(const wchar_t*,const wchar_t*); +_ACRTIMP int __cdecl _wremove(const wchar_t*); +_ACRTIMP wchar_t* __cdecl _wtempnam(const wchar_t*,const wchar_t*); +_ACRTIMP wchar_t* __cdecl _wtmpnam(wchar_t*); -wint_t __cdecl fgetwc(FILE*); -wchar_t* __cdecl fgetws(wchar_t*,int,FILE*); -wint_t __cdecl fputwc(wint_t,FILE*); -int __cdecl fputws(const wchar_t*,FILE*); -int __cdecl fputws(const wchar_t*,FILE*); -wint_t __cdecl getwc(FILE*); -wint_t __cdecl getwchar(void); -wchar_t* __cdecl getws(wchar_t*); -wint_t __cdecl putwc(wint_t,FILE*); -wint_t __cdecl putwchar(wint_t); -int __cdecl putws(const wchar_t*); -wint_t __cdecl ungetwc(wint_t,FILE*); +_ACRTIMP wint_t __cdecl fgetwc(FILE*); +_ACRTIMP wchar_t* __cdecl fgetws(wchar_t*,int,FILE*); +_ACRTIMP wint_t __cdecl fputwc(wint_t,FILE*); +_ACRTIMP int __cdecl fputws(const wchar_t*,FILE*); +_ACRTIMP int __cdecl fputws(const wchar_t*,FILE*); +_ACRTIMP wint_t __cdecl getwc(FILE*); +_ACRTIMP wint_t __cdecl getwchar(void); +_ACRTIMP wchar_t* __cdecl getws(wchar_t*); +_ACRTIMP wint_t __cdecl putwc(wint_t,FILE*); +_ACRTIMP wint_t __cdecl putwchar(wint_t); +_ACRTIMP int __cdecl putws(const wchar_t*); +_ACRTIMP wint_t __cdecl ungetwc(wint_t,FILE*); #ifdef _UCRT @@ -361,8 +361,8 @@ _ACRTIMP int WINAPIV wprintf(const wchar_t*,...); _ACRTIMP int WINAPIV wprintf_s(const wchar_t*,...); #ifdef _CRT_NON_CONFORMING_SWPRINTFS -int WINAPIV swprintf(wchar_t*,const wchar_t*,...); -int __cdecl vswprintf(wchar_t*,const wchar_t*,__ms_va_list); +_ACRTIMP int WINAPIV swprintf(wchar_t*,const wchar_t*,...); +_ACRTIMP int __cdecl vswprintf(wchar_t*,const wchar_t*,__ms_va_list); #else /* _CRT_NON_CONFORMING_SWPRINTFS */ static inline int vswprintf(wchar_t *buffer, size_t size, const wchar_t *format, __ms_va_list args) { return _vsnwprintf(buffer,size,format,args); } static inline int WINAPIV swprintf(wchar_t *buffer, size_t size, const wchar_t *format, ...) diff --git a/include/msvcrt/corecrt_wstdlib.h b/include/msvcrt/corecrt_wstdlib.h index da97e42bb92..9883b1ab820 100644 --- a/include/msvcrt/corecrt_wstdlib.h +++ b/include/msvcrt/corecrt_wstdlib.h @@ -12,46 +12,46 @@ extern "C" { #endif -wchar_t* __cdecl _itow(int,wchar_t*,int); -errno_t __cdecl _itow_s(int,wchar_t*,int, int); -wchar_t* __cdecl _i64tow(__int64,wchar_t*,int); -errno_t __cdecl _i64tow_s(__int64, wchar_t*, size_t, int); -wchar_t* __cdecl _ltow(__msvcrt_long,wchar_t*,int); -errno_t __cdecl _ltow_s(__msvcrt_long,wchar_t*,int,int); -wchar_t* __cdecl _ui64tow(unsigned __int64,wchar_t*,int); -errno_t __cdecl _ui64tow_s(unsigned __int64, wchar_t*, size_t, int); -wchar_t* __cdecl _ultow(__msvcrt_ulong,wchar_t*,int); -errno_t __cdecl _ultow_s(__msvcrt_ulong, wchar_t*, size_t, int); -wchar_t* __cdecl _wfullpath(wchar_t*,const wchar_t*,size_t); -wchar_t* __cdecl _wgetenv(const wchar_t*); -void __cdecl _wmakepath(wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); -int __cdecl _wmakepath_s(wchar_t*,size_t,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); -void __cdecl _wperror(const wchar_t*); -int __cdecl _wputenv(const wchar_t*); -void __cdecl _wsearchenv(const wchar_t*,const wchar_t*,wchar_t*); -void __cdecl _wsplitpath(const wchar_t*,wchar_t*,wchar_t*,wchar_t*,wchar_t*); -errno_t __cdecl _wsplitpath_s(const wchar_t*,wchar_t*,size_t,wchar_t*,size_t, - wchar_t*,size_t,wchar_t*,size_t); -int __cdecl _wsystem(const wchar_t*); -double __cdecl _wtof(const wchar_t*); -int __cdecl _wtoi(const wchar_t*); -__int64 __cdecl _wtoi64(const wchar_t*); -__msvcrt_long __cdecl _wtol(const wchar_t*); +_ACRTIMP wchar_t* __cdecl _itow(int,wchar_t*,int); +_ACRTIMP errno_t __cdecl _itow_s(int,wchar_t*,int, int); +_ACRTIMP wchar_t* __cdecl _i64tow(__int64,wchar_t*,int); +_ACRTIMP errno_t __cdecl _i64tow_s(__int64, wchar_t*, size_t, int); +_ACRTIMP wchar_t* __cdecl _ltow(__msvcrt_long,wchar_t*,int); +_ACRTIMP errno_t __cdecl _ltow_s(__msvcrt_long,wchar_t*,int,int); +_ACRTIMP wchar_t* __cdecl _ui64tow(unsigned __int64,wchar_t*,int); +_ACRTIMP errno_t __cdecl _ui64tow_s(unsigned __int64, wchar_t*, size_t, int); +_ACRTIMP wchar_t* __cdecl _ultow(__msvcrt_ulong,wchar_t*,int); +_ACRTIMP errno_t __cdecl _ultow_s(__msvcrt_ulong, wchar_t*, size_t, int); +_ACRTIMP wchar_t* __cdecl _wfullpath(wchar_t*,const wchar_t*,size_t); +_ACRTIMP wchar_t* __cdecl _wgetenv(const wchar_t*); +_ACRTIMP void __cdecl _wmakepath(wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); +_ACRTIMP int __cdecl _wmakepath_s(wchar_t*,size_t,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); +_ACRTIMP void __cdecl _wperror(const wchar_t*); +_ACRTIMP int __cdecl _wputenv(const wchar_t*); +_ACRTIMP void __cdecl _wsearchenv(const wchar_t*,const wchar_t*,wchar_t*); +_ACRTIMP void __cdecl _wsplitpath(const wchar_t*,wchar_t*,wchar_t*,wchar_t*,wchar_t*); +_ACRTIMP errno_t __cdecl _wsplitpath_s(const wchar_t*,wchar_t*,size_t,wchar_t*,size_t, + wchar_t*,size_t,wchar_t*,size_t); +_ACRTIMP int __cdecl _wsystem(const wchar_t*); +_ACRTIMP double __cdecl _wtof(const wchar_t*); +_ACRTIMP int __cdecl _wtoi(const wchar_t*); +_ACRTIMP __int64 __cdecl _wtoi64(const wchar_t*); +_ACRTIMP __msvcrt_long __cdecl _wtol(const wchar_t*); -size_t __cdecl mbstowcs(wchar_t*,const char*,size_t); -errno_t __cdecl mbstowcs_s(size_t*,wchar_t*,size_t,const char*,size_t); -int __cdecl mbtowc(wchar_t*,const char*,size_t); -float __cdecl wcstof(const wchar_t*,wchar_t**); -double __cdecl wcstod(const wchar_t*,wchar_t**); -__msvcrt_long __cdecl wcstol(const wchar_t*,wchar_t**,int); -size_t __cdecl wcstombs(char*,const wchar_t*,size_t); -errno_t __cdecl wcstombs_s(size_t*,char*,size_t,const wchar_t*,size_t); -__msvcrt_ulong __cdecl wcstoul(const wchar_t*,wchar_t**,int); -int __cdecl wctomb(char*,wchar_t); -__int64 __cdecl _wcstoi64(const wchar_t*,wchar_t**,int); -__int64 __cdecl _wcstoi64_l(const wchar_t*,wchar_t**,int,_locale_t); -unsigned __int64 __cdecl _wcstoui64(const wchar_t*,wchar_t**,int); -unsigned __int64 __cdecl _wcstoui64_l(const wchar_t*,wchar_t**,int,_locale_t); +_ACRTIMP size_t __cdecl mbstowcs(wchar_t*,const char*,size_t); +_ACRTIMP errno_t __cdecl mbstowcs_s(size_t*,wchar_t*,size_t,const char*,size_t); +_ACRTIMP int __cdecl mbtowc(wchar_t*,const char*,size_t); +_ACRTIMP float __cdecl wcstof(const wchar_t*,wchar_t**); +_ACRTIMP double __cdecl wcstod(const wchar_t*,wchar_t**); +_ACRTIMP __msvcrt_long __cdecl wcstol(const wchar_t*,wchar_t**,int); +_ACRTIMP size_t __cdecl wcstombs(char*,const wchar_t*,size_t); +_ACRTIMP errno_t __cdecl wcstombs_s(size_t*,char*,size_t,const wchar_t*,size_t); +_ACRTIMP __msvcrt_ulong __cdecl wcstoul(const wchar_t*,wchar_t**,int); +_ACRTIMP int __cdecl wctomb(char*,wchar_t); +_ACRTIMP __int64 __cdecl _wcstoi64(const wchar_t*,wchar_t**,int); +_ACRTIMP __int64 __cdecl _wcstoi64_l(const wchar_t*,wchar_t**,int,_locale_t); +_ACRTIMP unsigned __int64 __cdecl _wcstoui64(const wchar_t*,wchar_t**,int); +_ACRTIMP unsigned __int64 __cdecl _wcstoui64_l(const wchar_t*,wchar_t**,int,_locale_t); #ifdef __cplusplus } diff --git a/include/msvcrt/corecrt_wtime.h b/include/msvcrt/corecrt_wtime.h index 3e0547b0aec..9d96f1a171c 100644 --- a/include/msvcrt/corecrt_wtime.h +++ b/include/msvcrt/corecrt_wtime.h @@ -28,14 +28,14 @@ struct tm { extern "C" { #endif -wchar_t* __cdecl _wasctime(const struct tm*); -size_t __cdecl wcsftime(wchar_t*,size_t,const wchar_t*,const struct tm*); -wchar_t* __cdecl _wctime32(const __time32_t*); -wchar_t* __cdecl _wctime64(const __time64_t*); -wchar_t* __cdecl _wstrdate(wchar_t*); -errno_t __cdecl _wstrdate_s(wchar_t*,size_t); -wchar_t* __cdecl _wstrtime(wchar_t*); -errno_t __cdecl _wstrtime_s(wchar_t*,size_t); +_ACRTIMP wchar_t* __cdecl _wasctime(const struct tm*); +_ACRTIMP size_t __cdecl wcsftime(wchar_t*,size_t,const wchar_t*,const struct tm*); +_ACRTIMP wchar_t* __cdecl _wctime32(const __time32_t*); +_ACRTIMP wchar_t* __cdecl _wctime64(const __time64_t*); +_ACRTIMP wchar_t* __cdecl _wstrdate(wchar_t*); +_ACRTIMP errno_t __cdecl _wstrdate_s(wchar_t*,size_t); +_ACRTIMP wchar_t* __cdecl _wstrtime(wchar_t*); +_ACRTIMP errno_t __cdecl _wstrtime_s(wchar_t*,size_t); #ifndef _USE_32BIT_TIME_T static inline wchar_t* _wctime(const time_t *t) { return _wctime64(t); } diff --git a/include/msvcrt/crtdbg.h b/include/msvcrt/crtdbg.h index 6a7dab01858..dc56eb883f5 100644 --- a/include/msvcrt/crtdbg.h +++ b/include/msvcrt/crtdbg.h @@ -86,14 +86,14 @@ extern int _crtAssertBusy; extern int _crtBreakAlloc; extern int _crtDbgFlag; -int __cdecl _CrtCheckMemory(void); -int WINAPIV _CrtDbgReport(int reportType, const char *filename, int linenumber, - const char *moduleName, const char *format, ...); -int __cdecl _CrtDumpMemoryLeaks(void); -int __cdecl _CrtSetBreakAlloc(int); -int __cdecl _CrtSetDbgFlag(int); -void *__cdecl _CrtSetDumpClient(void *dumpClient); -int __cdecl _CrtSetReportMode(int reportType, int reportMode); +_ACRTIMP int __cdecl _CrtCheckMemory(void); +_ACRTIMP int WINAPIV _CrtDbgReport(int reportType, const char *filename, int linenumber, + const char *moduleName, const char *format, ...); +_ACRTIMP int __cdecl _CrtDumpMemoryLeaks(void); +_ACRTIMP int __cdecl _CrtSetBreakAlloc(int); +_ACRTIMP int __cdecl _CrtSetDbgFlag(int); +_ACRTIMP void *__cdecl _CrtSetDumpClient(void *dumpClient); +_ACRTIMP int __cdecl _CrtSetReportMode(int reportType, int reportMode); #ifdef __cplusplus } diff --git a/include/msvcrt/ctype.h b/include/msvcrt/ctype.h index 872afb3e740..3da9e4693f2 100644 --- a/include/msvcrt/ctype.h +++ b/include/msvcrt/ctype.h @@ -18,30 +18,30 @@ extern "C" { #define WEOF (wint_t)(0xFFFF) #endif -int __cdecl __isascii(int); -int __cdecl __iscsym(int); -int __cdecl __iscsymf(int); -int __cdecl __toascii(int); -int __cdecl _isblank_l(int,_locale_t); -int __cdecl _isctype(int,int); -int __cdecl _tolower(int); -int __cdecl _tolower_l(int,_locale_t); -int __cdecl _toupper(int); -int __cdecl _toupper_l(int,_locale_t); -int __cdecl isalnum(int); -int __cdecl isalpha(int); -int __cdecl isblank(int); -int __cdecl iscntrl(int); -int __cdecl isdigit(int); -int __cdecl isgraph(int); -int __cdecl islower(int); -int __cdecl isprint(int); -int __cdecl ispunct(int); -int __cdecl isspace(int); -int __cdecl isupper(int); -int __cdecl isxdigit(int); -int __cdecl tolower(int); -int __cdecl toupper(int); +_ACRTIMP int __cdecl __isascii(int); +_ACRTIMP int __cdecl __iscsym(int); +_ACRTIMP int __cdecl __iscsymf(int); +_ACRTIMP int __cdecl __toascii(int); +_ACRTIMP int __cdecl _isblank_l(int,_locale_t); +_ACRTIMP int __cdecl _isctype(int,int); +_ACRTIMP int __cdecl _tolower(int); +_ACRTIMP int __cdecl _tolower_l(int,_locale_t); +_ACRTIMP int __cdecl _toupper(int); +_ACRTIMP int __cdecl _toupper_l(int,_locale_t); +_ACRTIMP int __cdecl isalnum(int); +_ACRTIMP int __cdecl isalpha(int); +_ACRTIMP int __cdecl isblank(int); +_ACRTIMP int __cdecl iscntrl(int); +_ACRTIMP int __cdecl isdigit(int); +_ACRTIMP int __cdecl isgraph(int); +_ACRTIMP int __cdecl islower(int); +_ACRTIMP int __cdecl isprint(int); +_ACRTIMP int __cdecl ispunct(int); +_ACRTIMP int __cdecl isspace(int); +_ACRTIMP int __cdecl isupper(int); +_ACRTIMP int __cdecl isxdigit(int); +_ACRTIMP int __cdecl tolower(int); +_ACRTIMP int __cdecl toupper(int); #ifdef __cplusplus } diff --git a/include/msvcrt/direct.h b/include/msvcrt/direct.h index 90c6103e4d8..83ac3689989 100644 --- a/include/msvcrt/direct.h +++ b/include/msvcrt/direct.h @@ -26,14 +26,14 @@ struct _diskfree_t { }; #endif /* _DISKFREE_T_DEFINED */ -int __cdecl _chdir(const char*); -int __cdecl _chdrive(int); -char* __cdecl _getcwd(char*,int); -char* __cdecl _getdcwd(int,char*,int); -int __cdecl _getdrive(void); -__msvcrt_ulong __cdecl _getdrives(void); -int __cdecl _mkdir(const char*); -int __cdecl _rmdir(const char*); +_ACRTIMP int __cdecl _chdir(const char*); +_ACRTIMP int __cdecl _chdrive(int); +_ACRTIMP char* __cdecl _getcwd(char*,int); +_ACRTIMP char* __cdecl _getdcwd(int,char*,int); +_ACRTIMP int __cdecl _getdrive(void); +_ACRTIMP __msvcrt_ulong __cdecl _getdrives(void); +_ACRTIMP int __cdecl _mkdir(const char*); +_ACRTIMP int __cdecl _rmdir(const char*); #ifdef __cplusplus } diff --git a/include/msvcrt/dos.h b/include/msvcrt/dos.h index 8ed73018f51..7a9723e8bba 100644 --- a/include/msvcrt/dos.h +++ b/include/msvcrt/dos.h @@ -36,7 +36,7 @@ struct _diskfree_t { extern "C" { #endif -unsigned int __cdecl _getdiskfree(unsigned int, struct _diskfree_t *); +_ACRTIMP unsigned int __cdecl _getdiskfree(unsigned int, struct _diskfree_t *); #ifdef __cplusplus } diff --git a/include/msvcrt/eh.h b/include/msvcrt/eh.h index 19fa0c79665..659b2271b2d 100644 --- a/include/msvcrt/eh.h +++ b/include/msvcrt/eh.h @@ -36,9 +36,9 @@ typedef void (__cdecl *unexpected_handler)(void); typedef void (__cdecl *unexpected_function)(void); typedef void (__cdecl *_se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); -terminate_function __cdecl set_terminate(terminate_function func); -unexpected_function __cdecl set_unexpected(unexpected_function func); -_se_translator_function __cdecl set_se_translator(_se_translator_function func); +_ACRTIMP terminate_function __cdecl set_terminate(terminate_function func); +_ACRTIMP unexpected_function __cdecl set_unexpected(unexpected_function func); +_ACRTIMP _se_translator_function __cdecl set_se_translator(_se_translator_function func); _ACRTIMP DECLSPEC_NORETURN void __cdecl terminate(void); _ACRTIMP DECLSPEC_NORETURN void __cdecl unexpected(void); diff --git a/include/msvcrt/errno.h b/include/msvcrt/errno.h index 014a35a891e..c32263eb16d 100644 --- a/include/msvcrt/errno.h +++ b/include/msvcrt/errno.h @@ -111,7 +111,7 @@ extern "C" { #endif -extern int* __cdecl _errno(void); +_ACRTIMP int* __cdecl _errno(void); #ifdef __cplusplus } diff --git a/include/msvcrt/float.h b/include/msvcrt/float.h index 0e0ca342192..4ed5a79b5b3 100644 --- a/include/msvcrt/float.h +++ b/include/msvcrt/float.h @@ -134,27 +134,27 @@ extern "C" { #define _CW_DEFAULT (_RC_NEAR + _PC_64 + _EM_INVALID + _EM_ZERODIVIDE + _EM_OVERFLOW + _EM_UNDERFLOW + _EM_INEXACT + _EM_DENORMAL) #endif -unsigned int __cdecl _clearfp(void); -unsigned int __cdecl _statusfp(void); +_ACRTIMP unsigned int __cdecl _clearfp(void); +_ACRTIMP unsigned int __cdecl _statusfp(void); _ACRTIMP int __cdecl __fpe_flt_rounds(void); -unsigned int __cdecl _control87(unsigned int, unsigned int); -unsigned int __cdecl _controlfp(unsigned int, unsigned int); -errno_t __cdecl _controlfp_s(unsigned int *, unsigned int, unsigned int); +_ACRTIMP unsigned int __cdecl _control87(unsigned int, unsigned int); +_ACRTIMP unsigned int __cdecl _controlfp(unsigned int, unsigned int); +_ACRTIMP errno_t __cdecl _controlfp_s(unsigned int *, unsigned int, unsigned int); #ifdef __i386__ -int __cdecl __control87_2(unsigned int, unsigned int, unsigned int *, unsigned int *); +_ACRTIMP int __cdecl __control87_2(unsigned int, unsigned int, unsigned int *, unsigned int *); #endif -double __cdecl _copysign (double, double); -double __cdecl _chgsign (double); -double __cdecl _scalb(double, __msvcrt_long); -double __cdecl _logb(double); -double __cdecl _nextafter(double, double); -int __cdecl _finite(double); -int __cdecl _isnan(double); -int __cdecl _fpclass(double); +_ACRTIMP double __cdecl _copysign (double, double); +_ACRTIMP double __cdecl _chgsign (double); +_ACRTIMP double __cdecl _scalb(double, __msvcrt_long); +_ACRTIMP double __cdecl _logb(double); +_ACRTIMP double __cdecl _nextafter(double, double); +_ACRTIMP int __cdecl _finite(double); +_ACRTIMP int __cdecl _isnan(double); +_ACRTIMP int __cdecl _fpclass(double); #ifdef __x86_64__ -float __cdecl _scalbf(float, __msvcrt_long); +_ACRTIMP float __cdecl _scalbf(float, __msvcrt_long); #endif #ifdef __cplusplus diff --git a/include/msvcrt/fpieee.h b/include/msvcrt/fpieee.h index db2c5a7fa74..aebdabe28e2 100644 --- a/include/msvcrt/fpieee.h +++ b/include/msvcrt/fpieee.h @@ -230,7 +230,7 @@ typedef struct { struct _EXCEPTION_POINTERS; -int __cdecl _fpieee_flt(__msvcrt_ulong _ExceptionCode,struct _EXCEPTION_POINTERS *_PtExceptionPtr,int (__cdecl *_Handler)(_FPIEEE_RECORD *)); +_ACRTIMP int __cdecl _fpieee_flt(__msvcrt_ulong _ExceptionCode,struct _EXCEPTION_POINTERS *_PtExceptionPtr,int (__cdecl *_Handler)(_FPIEEE_RECORD *)); #ifdef __cplusplus } diff --git a/include/msvcrt/io.h b/include/msvcrt/io.h index fb23a214eab..369744d7e1d 100644 --- a/include/msvcrt/io.h +++ b/include/msvcrt/io.h @@ -59,48 +59,48 @@ struct _finddata64_t extern "C" { #endif -int __cdecl _access(const char*,int); -int __cdecl _chmod(const char*,int); -int __cdecl _chsize(int,__msvcrt_ulong); -int __cdecl _chsize_s(int,__int64); -int __cdecl _close(int); -int __cdecl _commit(int); -int __cdecl _creat(const char*,int); -int __cdecl _dup(int); -int __cdecl _dup2(int,int); -int __cdecl _eof(int); -__int64 __cdecl _filelengthi64(int); -__msvcrt_long __cdecl _filelength(int); -int __cdecl _findclose(intptr_t); -intptr_t __cdecl _findfirst(const char*,struct _finddata_t*); -intptr_t __cdecl _findfirsti64(const char*, struct _finddatai64_t*); -intptr_t __cdecl _findfirst64(const char*, struct _finddata64_t*); -int __cdecl _findnext(intptr_t,struct _finddata_t*); -int __cdecl _findnexti64(intptr_t, struct _finddatai64_t*); -int __cdecl _findnext64(intptr_t, struct _finddata64_t*); -intptr_t __cdecl _get_osfhandle(int); -int __cdecl _isatty(int); -int __cdecl _locking(int,int,__msvcrt_long); -__msvcrt_long __cdecl _lseek(int,__msvcrt_long,int); -__int64 __cdecl _lseeki64(int,__int64,int); -char* __cdecl _mktemp(char*); -int __cdecl _mktemp_s(char*,size_t); -int WINAPIV _open(const char*,int,...); -int __cdecl _open_osfhandle(intptr_t,int); -int __cdecl _pipe(int*,unsigned int,int); -int __cdecl _read(int,void*,unsigned int); -int __cdecl _setmode(int,int); -int WINAPIV _sopen(const char*,int,int,...); -errno_t __cdecl _sopen_dispatch(const char*,int,int,int,int*,int); -errno_t __cdecl _sopen_s(int*,const char*,int,int,int); -__msvcrt_long __cdecl _tell(int); -__int64 __cdecl _telli64(int); -int __cdecl _umask(int); -int __cdecl _unlink(const char*); -int __cdecl _write(int,const void*,unsigned int); +_ACRTIMP int __cdecl _access(const char*,int); +_ACRTIMP int __cdecl _chmod(const char*,int); +_ACRTIMP int __cdecl _chsize(int,__msvcrt_ulong); +_ACRTIMP int __cdecl _chsize_s(int,__int64); +_ACRTIMP int __cdecl _close(int); +_ACRTIMP int __cdecl _commit(int); +_ACRTIMP int __cdecl _creat(const char*,int); +_ACRTIMP int __cdecl _dup(int); +_ACRTIMP int __cdecl _dup2(int,int); +_ACRTIMP int __cdecl _eof(int); +_ACRTIMP __int64 __cdecl _filelengthi64(int); +_ACRTIMP __msvcrt_long __cdecl _filelength(int); +_ACRTIMP int __cdecl _findclose(intptr_t); +_ACRTIMP intptr_t __cdecl _findfirst(const char*,struct _finddata_t*); +_ACRTIMP intptr_t __cdecl _findfirsti64(const char*, struct _finddatai64_t*); +_ACRTIMP intptr_t __cdecl _findfirst64(const char*, struct _finddata64_t*); +_ACRTIMP int __cdecl _findnext(intptr_t,struct _finddata_t*); +_ACRTIMP int __cdecl _findnexti64(intptr_t, struct _finddatai64_t*); +_ACRTIMP int __cdecl _findnext64(intptr_t, struct _finddata64_t*); +_ACRTIMP intptr_t __cdecl _get_osfhandle(int); +_ACRTIMP int __cdecl _isatty(int); +_ACRTIMP int __cdecl _locking(int,int,__msvcrt_long); +_ACRTIMP __msvcrt_long __cdecl _lseek(int,__msvcrt_long,int); +_ACRTIMP __int64 __cdecl _lseeki64(int,__int64,int); +_ACRTIMP char* __cdecl _mktemp(char*); +_ACRTIMP int __cdecl _mktemp_s(char*,size_t); +_ACRTIMP int WINAPIV _open(const char*,int,...); +_ACRTIMP int __cdecl _open_osfhandle(intptr_t,int); +_ACRTIMP int __cdecl _pipe(int*,unsigned int,int); +_ACRTIMP int __cdecl _read(int,void*,unsigned int); +_ACRTIMP int __cdecl _setmode(int,int); +_ACRTIMP int WINAPIV _sopen(const char*,int,int,...); +_ACRTIMP errno_t __cdecl _sopen_dispatch(const char*,int,int,int,int*,int); +_ACRTIMP errno_t __cdecl _sopen_s(int*,const char*,int,int,int); +_ACRTIMP __msvcrt_long __cdecl _tell(int); +_ACRTIMP __int64 __cdecl _telli64(int); +_ACRTIMP int __cdecl _umask(int); +_ACRTIMP int __cdecl _unlink(const char*); +_ACRTIMP int __cdecl _write(int,const void*,unsigned int); -int __cdecl remove(const char*); -int __cdecl rename(const char*,const char*); +_ACRTIMP int __cdecl remove(const char*); +_ACRTIMP int __cdecl rename(const char*,const char*); #ifdef __cplusplus } @@ -134,8 +134,8 @@ static inline int unlink(const char* path) { return _unlink(path); } static inline int write(int fd, const void* buf, unsigned int size) { return _write(fd, buf, size); } #if defined(__GNUC__) && (__GNUC__ < 4) -extern int WINAPIV open(const char*,int,...) __attribute__((alias("_open"))); -extern int WINAPIV sopen(const char*,int,int,...) __attribute__((alias("_sopen"))); +_ACRTIMP int WINAPIV open(const char*,int,...) __attribute__((alias("_open"))); +_ACRTIMP int WINAPIV sopen(const char*,int,int,...) __attribute__((alias("_sopen"))); #else #define open _open #define sopen _sopen diff --git a/include/msvcrt/locale.h b/include/msvcrt/locale.h index 120f39c2fcd..a5af1720b97 100644 --- a/include/msvcrt/locale.h +++ b/include/msvcrt/locale.h @@ -62,17 +62,17 @@ struct tm; extern "C" { #endif -char* __cdecl setlocale(int,const char*); -struct lconv* __cdecl localeconv(void); -size_t __cdecl _Strftime(char*,size_t,const char*,const struct tm*,void*); -int __cdecl _configthreadlocale(int); -_locale_t __cdecl _get_current_locale(void); -_locale_t __cdecl _create_locale(int, const char*); -void __cdecl _free_locale(_locale_t); +_ACRTIMP char* __cdecl setlocale(int,const char*); +_ACRTIMP struct lconv* __cdecl localeconv(void); +_ACRTIMP size_t __cdecl _Strftime(char*,size_t,const char*,const struct tm*,void*); +_ACRTIMP int __cdecl _configthreadlocale(int); +_ACRTIMP _locale_t __cdecl _get_current_locale(void); +_ACRTIMP _locale_t __cdecl _create_locale(int, const char*); +_ACRTIMP void __cdecl _free_locale(_locale_t); #ifndef _WLOCALE_DEFINED #define _WLOCALE_DEFINED -wchar_t* __cdecl _wsetlocale(int,const wchar_t*); +_ACRTIMP wchar_t* __cdecl _wsetlocale(int,const wchar_t*); #endif /* _WLOCALE_DEFINED */ #ifdef __cplusplus diff --git a/include/msvcrt/malloc.h b/include/msvcrt/malloc.h index 5b03a5e98ed..5bb843be5a6 100644 --- a/include/msvcrt/malloc.h +++ b/include/msvcrt/malloc.h @@ -44,7 +44,7 @@ typedef struct _heapinfo #endif /* _HEAPINFO_DEFINED */ #ifdef __i386__ -extern unsigned int* __cdecl __p__amblksiz(void); +_ACRTIMP unsigned int* __cdecl __p__amblksiz(void); #define _amblksiz (*__p__amblksiz()); #else extern unsigned int _amblksiz; @@ -54,28 +54,28 @@ extern unsigned int _amblksiz; extern "C" { #endif -void* __cdecl _expand(void*,size_t); -int __cdecl _heapadd(void*,size_t); -int __cdecl _heapchk(void); -int __cdecl _heapmin(void); -int __cdecl _heapset(unsigned int); -size_t __cdecl _heapused(size_t*,size_t*); -int __cdecl _heapwalk(_HEAPINFO*); -size_t __cdecl _msize(void*); +_ACRTIMP void* __cdecl _expand(void*,size_t); +_ACRTIMP int __cdecl _heapadd(void*,size_t); +_ACRTIMP int __cdecl _heapchk(void); +_ACRTIMP int __cdecl _heapmin(void); +_ACRTIMP int __cdecl _heapset(unsigned int); +_ACRTIMP size_t __cdecl _heapused(size_t*,size_t*); +_ACRTIMP int __cdecl _heapwalk(_HEAPINFO*); +_ACRTIMP size_t __cdecl _msize(void*); -void* __cdecl calloc(size_t,size_t); -void __cdecl free(void*); -void* __cdecl malloc(size_t); -void* __cdecl realloc(void*,size_t); +_ACRTIMP void* __cdecl calloc(size_t,size_t); +_ACRTIMP void __cdecl free(void*); +_ACRTIMP void* __cdecl malloc(size_t); +_ACRTIMP void* __cdecl realloc(void*,size_t); -void __cdecl _aligned_free(void*); -void* __cdecl _aligned_malloc(size_t,size_t); -void* __cdecl _aligned_offset_malloc(size_t,size_t,size_t); -void* __cdecl _aligned_realloc(void*,size_t,size_t); -void* __cdecl _aligned_offset_realloc(void*,size_t,size_t,size_t); +_ACRTIMP void __cdecl _aligned_free(void*); +_ACRTIMP void* __cdecl _aligned_malloc(size_t,size_t); +_ACRTIMP void* __cdecl _aligned_offset_malloc(size_t,size_t,size_t); +_ACRTIMP void* __cdecl _aligned_realloc(void*,size_t,size_t); +_ACRTIMP void* __cdecl _aligned_offset_realloc(void*,size_t,size_t,size_t); -size_t __cdecl _get_sbh_threshold(void); -int __cdecl _set_sbh_threshold(size_t size); +_ACRTIMP size_t __cdecl _get_sbh_threshold(void); +_ACRTIMP int __cdecl _set_sbh_threshold(size_t size); #ifdef __cplusplus } diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 615f9a6bf24..0dcbaf55592 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -45,107 +45,107 @@ struct _complex }; #endif /* _COMPLEX_DEFINED */ -double __cdecl sin(double); -double __cdecl cos(double); -double __cdecl tan(double); -double __cdecl sinh(double); -double __cdecl cosh(double); -double __cdecl tanh(double); -double __cdecl asin(double); -double __cdecl acos(double); -double __cdecl atan(double); -double __cdecl atan2(double, double); -double __cdecl asinh(double); -double __cdecl acosh(double); -double __cdecl atanh(double); -double __cdecl exp(double); -double __cdecl log(double); -double __cdecl log10(double); -double __cdecl pow(double, double); -double __cdecl sqrt(double); -double __cdecl ceil(double); -double __cdecl floor(double); -double __cdecl fabs(double); -double __cdecl ldexp(double, int); -double __cdecl frexp(double, int*); -double __cdecl modf(double, double*); -double __cdecl fmod(double, double); -double __cdecl fmin(double, double); -double __cdecl fmax(double, double); -double __cdecl erf(double); +_ACRTIMP double __cdecl sin(double); +_ACRTIMP double __cdecl cos(double); +_ACRTIMP double __cdecl tan(double); +_ACRTIMP double __cdecl sinh(double); +_ACRTIMP double __cdecl cosh(double); +_ACRTIMP double __cdecl tanh(double); +_ACRTIMP double __cdecl asin(double); +_ACRTIMP double __cdecl acos(double); +_ACRTIMP double __cdecl atan(double); +_ACRTIMP double __cdecl atan2(double, double); +_ACRTIMP double __cdecl asinh(double); +_ACRTIMP double __cdecl acosh(double); +_ACRTIMP double __cdecl atanh(double); +_ACRTIMP double __cdecl exp(double); +_ACRTIMP double __cdecl log(double); +_ACRTIMP double __cdecl log10(double); +_ACRTIMP double __cdecl pow(double, double); +_ACRTIMP double __cdecl sqrt(double); +_ACRTIMP double __cdecl ceil(double); +_ACRTIMP double __cdecl floor(double); +_ACRTIMP double __cdecl fabs(double); +_ACRTIMP double __cdecl ldexp(double, int); +_ACRTIMP double __cdecl frexp(double, int*); +_ACRTIMP double __cdecl modf(double, double*); +_ACRTIMP double __cdecl fmod(double, double); +_ACRTIMP double __cdecl fmin(double, double); +_ACRTIMP double __cdecl fmax(double, double); +_ACRTIMP double __cdecl erf(double); -double __cdecl _hypot(double, double); -double __cdecl _j0(double); -double __cdecl _j1(double); -double __cdecl _jn(int, double); -double __cdecl _y0(double); -double __cdecl _y1(double); -double __cdecl _yn(int, double); +_ACRTIMP double __cdecl _hypot(double, double); +_ACRTIMP double __cdecl _j0(double); +_ACRTIMP double __cdecl _j1(double); +_ACRTIMP double __cdecl _jn(int, double); +_ACRTIMP double __cdecl _y0(double); +_ACRTIMP double __cdecl _y1(double); +_ACRTIMP double __cdecl _yn(int, double); -double __cdecl cbrt(double); -double __cdecl exp2(double); -double __cdecl log2(double); -double __cdecl rint(double); -double __cdecl round(double); -double __cdecl trunc(double); +_ACRTIMP double __cdecl cbrt(double); +_ACRTIMP double __cdecl exp2(double); +_ACRTIMP double __cdecl log2(double); +_ACRTIMP double __cdecl rint(double); +_ACRTIMP double __cdecl round(double); +_ACRTIMP double __cdecl trunc(double); -float __cdecl cbrtf(float); -float __cdecl exp2f(float); -float __cdecl log2f(float); -float __cdecl rintf(float); -float __cdecl roundf(float); -float __cdecl truncf(float); +_ACRTIMP float __cdecl cbrtf(float); +_ACRTIMP float __cdecl exp2f(float); +_ACRTIMP float __cdecl log2f(float); +_ACRTIMP float __cdecl rintf(float); +_ACRTIMP float __cdecl roundf(float); +_ACRTIMP float __cdecl truncf(float); -long __cdecl lrint(double); -long __cdecl lrintf(float); -long __cdecl lround(double); -long __cdecl lroundf(float); +_ACRTIMP __msvcrt_long __cdecl lrint(double); +_ACRTIMP __msvcrt_long __cdecl lrintf(float); +_ACRTIMP __msvcrt_long __cdecl lround(double); +_ACRTIMP __msvcrt_long __cdecl lroundf(float); _ACRTIMP double __cdecl scalbn(double,int); _ACRTIMP float __cdecl scalbnf(float,int); -double __cdecl _copysign (double, double); -double __cdecl _chgsign (double); -double __cdecl _scalb(double, __msvcrt_long); -double __cdecl _logb(double); -double __cdecl _nextafter(double, double); -int __cdecl _finite(double); -int __cdecl _isnan(double); -int __cdecl _fpclass(double); +_ACRTIMP double __cdecl _copysign (double, double); +_ACRTIMP double __cdecl _chgsign (double); +_ACRTIMP double __cdecl _scalb(double, __msvcrt_long); +_ACRTIMP double __cdecl _logb(double); +_ACRTIMP double __cdecl _nextafter(double, double); +_ACRTIMP int __cdecl _finite(double); +_ACRTIMP int __cdecl _isnan(double); +_ACRTIMP int __cdecl _fpclass(double); #ifndef __i386__ -float __cdecl sinf(float); -float __cdecl cosf(float); -float __cdecl tanf(float); -float __cdecl sinhf(float); -float __cdecl coshf(float); -float __cdecl tanhf(float); -float __cdecl asinf(float); -float __cdecl acosf(float); -float __cdecl atanf(float); -float __cdecl atan2f(float, float); -float __cdecl asinhf(float); -float __cdecl acoshf(float); -float __cdecl atanhf(float); -float __cdecl expf(float); -float __cdecl logf(float); -float __cdecl log10f(float); -float __cdecl powf(float, float); -float __cdecl sqrtf(float); -float __cdecl ceilf(float); -float __cdecl floorf(float); -float __cdecl fabsf(float); -float __cdecl frexpf(float, int*); -float __cdecl modff(float, float*); -float __cdecl fmodf(float, float); +_ACRTIMP float __cdecl sinf(float); +_ACRTIMP float __cdecl cosf(float); +_ACRTIMP float __cdecl tanf(float); +_ACRTIMP float __cdecl sinhf(float); +_ACRTIMP float __cdecl coshf(float); +_ACRTIMP float __cdecl tanhf(float); +_ACRTIMP float __cdecl asinf(float); +_ACRTIMP float __cdecl acosf(float); +_ACRTIMP float __cdecl atanf(float); +_ACRTIMP float __cdecl atan2f(float, float); +_ACRTIMP float __cdecl asinhf(float); +_ACRTIMP float __cdecl acoshf(float); +_ACRTIMP float __cdecl atanhf(float); +_ACRTIMP float __cdecl expf(float); +_ACRTIMP float __cdecl logf(float); +_ACRTIMP float __cdecl log10f(float); +_ACRTIMP float __cdecl powf(float, float); +_ACRTIMP float __cdecl sqrtf(float); +_ACRTIMP float __cdecl ceilf(float); +_ACRTIMP float __cdecl floorf(float); +_ACRTIMP float __cdecl fabsf(float); +_ACRTIMP float __cdecl frexpf(float, int*); +_ACRTIMP float __cdecl modff(float, float*); +_ACRTIMP float __cdecl fmodf(float, float); -float __cdecl _copysignf(float, float); -float __cdecl _chgsignf(float); -float __cdecl _logbf(float); -int __cdecl _finitef(float); -int __cdecl _isnanf(float); -int __cdecl _fpclassf(float); +_ACRTIMP float __cdecl _copysignf(float, float); +_ACRTIMP float __cdecl _chgsignf(float); +_ACRTIMP float __cdecl _logbf(float); +_ACRTIMP int __cdecl _finitef(float); +_ACRTIMP int __cdecl _isnanf(float); +_ACRTIMP int __cdecl _fpclassf(float); #else @@ -193,13 +193,11 @@ _ACRTIMP float __cdecl copysignf(float, float); #define copysignf(x,y) _copysignf(x,y) #endif -double __cdecl nearbyint(double); -float __cdecl nearbyintf(float); - -float __cdecl _hypotf(float, float); - -int __cdecl _matherr(struct _exception*); -double __cdecl _cabs(struct _complex); +_ACRTIMP double __cdecl nearbyint(double); +_ACRTIMP float __cdecl nearbyintf(float); +_ACRTIMP float __cdecl _hypotf(float, float); +_ACRTIMP int __cdecl _matherr(struct _exception*); +_ACRTIMP double __cdecl _cabs(struct _complex); #if (defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))) || defined(__clang__) # define INFINITY __builtin_inff() @@ -221,10 +219,10 @@ static const union { #define FP_SUBNORMAL -2 #define FP_ZERO 0 -short __cdecl _dclass(double); -short __cdecl _fdclass(float); -int __cdecl _dsign(double); -int __cdecl _fdsign(float); +_ACRTIMP short __cdecl _dclass(double); +_ACRTIMP short __cdecl _fdclass(float); +_ACRTIMP int __cdecl _dsign(double); +_ACRTIMP int __cdecl _fdsign(float); static inline int __isnanf(float x) { diff --git a/include/msvcrt/mbctype.h b/include/msvcrt/mbctype.h index 7ee0aa1cf2e..d821041ea16 100644 --- a/include/msvcrt/mbctype.h +++ b/include/msvcrt/mbctype.h @@ -27,7 +27,7 @@ extern "C" { #endif #ifdef __i386__ -unsigned char* __cdecl __p__mbctype(void); +_ACRTIMP unsigned char* __cdecl __p__mbctype(void); #define _mbctype (__p__mbctype()) #else extern unsigned char MSVCRT_mbctype[]; @@ -53,24 +53,24 @@ extern unsigned char MSVCRT_mbctype[]; #define _MB_CP_ANSI -3 #define _MB_CP_LOCALE -4 -int __cdecl _getmbcp(void); -int __cdecl _ismbbalnum(unsigned int); -int __cdecl _ismbbalpha(unsigned int); -int __cdecl _ismbbgraph(unsigned int); -int __cdecl _ismbbkalnum(unsigned int); -int __cdecl _ismbbkana(unsigned int); -int __cdecl _ismbbkprint(unsigned int); -int __cdecl _ismbbkpunct(unsigned int); -int __cdecl _ismbbprint(unsigned int); -int __cdecl _ismbbpunct(unsigned int); -int __cdecl _setmbcp(int); +_ACRTIMP int __cdecl _getmbcp(void); +_ACRTIMP int __cdecl _ismbbalnum(unsigned int); +_ACRTIMP int __cdecl _ismbbalpha(unsigned int); +_ACRTIMP int __cdecl _ismbbgraph(unsigned int); +_ACRTIMP int __cdecl _ismbbkalnum(unsigned int); +_ACRTIMP int __cdecl _ismbbkana(unsigned int); +_ACRTIMP int __cdecl _ismbbkprint(unsigned int); +_ACRTIMP int __cdecl _ismbbkpunct(unsigned int); +_ACRTIMP int __cdecl _ismbbprint(unsigned int); +_ACRTIMP int __cdecl _ismbbpunct(unsigned int); +_ACRTIMP int __cdecl _setmbcp(int); #ifndef _MBLEADTRAIL_DEFINED #define _MBLEADTRAIL_DEFINED -int __cdecl _ismbblead(unsigned int); -int __cdecl _ismbbtrail(unsigned int); -int __cdecl _ismbslead(const unsigned char*,const unsigned char*); -int __cdecl _ismbstrail(const unsigned char*,const unsigned char*); +_ACRTIMP int __cdecl _ismbblead(unsigned int); +_ACRTIMP int __cdecl _ismbbtrail(unsigned int); +_ACRTIMP int __cdecl _ismbslead(const unsigned char*,const unsigned char*); +_ACRTIMP int __cdecl _ismbstrail(const unsigned char*,const unsigned char*); #endif /* _MBLEADTRAIL_DEFINED */ #ifdef __cplusplus diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h index 15eea68215b..fa35fcd1e42 100644 --- a/include/msvcrt/mbstring.h +++ b/include/msvcrt/mbstring.h @@ -33,89 +33,89 @@ extern "C" { #endif -int __cdecl _ismbcalnum(unsigned int); -int __cdecl _ismbcalpha(unsigned int); -int __cdecl _ismbcdigit(unsigned int); -int __cdecl _ismbcgraph(unsigned int); -int __cdecl _ismbchira(unsigned int); -int __cdecl _ismbckata(unsigned int); -int __cdecl _ismbcl0(unsigned int); -int __cdecl _ismbcl1(unsigned int); -int __cdecl _ismbcl2(unsigned int); -int __cdecl _ismbclegal(unsigned int); -int __cdecl _ismbclower(unsigned int); -int __cdecl _ismbcprint(unsigned int); -int __cdecl _ismbcpunct(unsigned int); -int __cdecl _ismbcspace(unsigned int); -int __cdecl _ismbcsymbol(unsigned int); -int __cdecl _ismbcupper(unsigned int); -unsigned int __cdecl _mbbtombc(unsigned int); -int __cdecl _mbbtype(unsigned char,int); -int __cdecl _mbbtype_l(unsigned char,int,_locale_t); -#define _mbccmp(_cpc1,_cpc2) _mbsncmp((_cpc1),(_cpc2),1) -void __cdecl _mbccpy(unsigned char*,const unsigned char*); -unsigned int __cdecl _mbcjistojms(unsigned int); -unsigned int __cdecl _mbcjmstojis(unsigned int); -size_t __cdecl _mbclen(const unsigned char*); -unsigned int __cdecl _mbctohira(unsigned int); -unsigned int __cdecl _mbctokata(unsigned int); -unsigned int __cdecl _mbctolower(unsigned int); -unsigned int __cdecl _mbctombb(unsigned int); -unsigned int __cdecl _mbctoupper(unsigned int); -int __cdecl _mbsbtype(const unsigned char*,size_t); -unsigned char* __cdecl _mbscat(unsigned char*,const unsigned char*); -unsigned char* __cdecl _mbschr(const unsigned char*,unsigned int); -int __cdecl _mbscmp(const unsigned char*,const unsigned char*); -int __cdecl _mbscmp_l(const unsigned char*,const unsigned char*,_locale_t); -int __cdecl _mbscoll(const unsigned char*,const unsigned char*); -unsigned char* __cdecl _mbscpy(unsigned char*,const unsigned char*); -size_t __cdecl _mbscspn(const unsigned char*,const unsigned char*); -unsigned char* __cdecl _mbsdec(const unsigned char*,const unsigned char*); -unsigned char* __cdecl _mbsdup(const unsigned char*); -int __cdecl _mbsicmp(const unsigned char*,const unsigned char*); -int __cdecl _mbsicoll(const unsigned char*,const unsigned char*); -unsigned char* __cdecl _mbsinc(const unsigned char*); -size_t __cdecl _mbslen(const unsigned char*); -unsigned char* __cdecl _mbslwr(unsigned char*); -errno_t __cdecl _mbslwr_s(unsigned char*, size_t); -unsigned char* __cdecl _mbsnbcat(unsigned char*,const unsigned char*,size_t); -errno_t __cdecl _mbsnbcat_s(unsigned char*,size_t,const unsigned char*,size_t); -int __cdecl _mbsnbcmp(const unsigned char*,const unsigned char*,size_t); -int __cdecl _mbsnbcoll(const unsigned char*,const unsigned char*,size_t); -size_t __cdecl _mbsnbcnt(const unsigned char*,size_t); -unsigned char* __cdecl _mbsnbcpy(unsigned char*,const unsigned char*,size_t); -int __cdecl _mbsnbicmp(const unsigned char*,const unsigned char*,size_t); -int __cdecl _mbsnbicoll(const unsigned char*,const unsigned char*,size_t); -unsigned char* __cdecl _mbsnbset(unsigned char*,unsigned int,size_t); -unsigned char* __cdecl _mbsncat(unsigned char*,const unsigned char*, size_t); -size_t __cdecl _mbsnccnt(const unsigned char*,size_t); -int __cdecl _mbsncmp(const unsigned char*,const unsigned char*,size_t); -int __cdecl _mbsncoll(const unsigned char*,const unsigned char*,size_t); -unsigned char* __cdecl _mbsncpy(unsigned char*,const unsigned char*,size_t); -unsigned int __cdecl _mbsnextc(const unsigned char*); -unsigned int __cdecl _mbsnextc_l(const unsigned char*,_locale_t); -int __cdecl _mbsnicmp(const unsigned char*,const unsigned char*,size_t); -int __cdecl _mbsnicoll(const unsigned char*,const unsigned char*,size_t); -unsigned char* __cdecl _mbsninc(const unsigned char*,size_t); -unsigned char* __cdecl _mbsnset(unsigned char*,unsigned int,size_t); -unsigned char* __cdecl _mbspbrk(const unsigned char*,const unsigned char*); -unsigned char* __cdecl _mbsrchr(const unsigned char*,unsigned int); -unsigned char* __cdecl _mbsrev(unsigned char*); -unsigned char* __cdecl _mbsset(unsigned char*,unsigned int); -size_t __cdecl _mbsspn(const unsigned char*,const unsigned char*); -unsigned char* __cdecl _mbsspnp(const unsigned char*,const unsigned char*); -unsigned char* __cdecl _mbsstr(const unsigned char*,const unsigned char*); -unsigned char* __cdecl _mbstok(unsigned char*,const unsigned char*); -unsigned char* __cdecl _mbstok_l(unsigned char*,const unsigned char*,_locale_t); -unsigned char* __cdecl _mbsupr(unsigned char*); -errno_t __cdecl _mbsupr_s(unsigned char*, size_t); +_ACRTIMP int __cdecl _ismbcalnum(unsigned int); +_ACRTIMP int __cdecl _ismbcalpha(unsigned int); +_ACRTIMP int __cdecl _ismbcdigit(unsigned int); +_ACRTIMP int __cdecl _ismbcgraph(unsigned int); +_ACRTIMP int __cdecl _ismbchira(unsigned int); +_ACRTIMP int __cdecl _ismbckata(unsigned int); +_ACRTIMP int __cdecl _ismbcl0(unsigned int); +_ACRTIMP int __cdecl _ismbcl1(unsigned int); +_ACRTIMP int __cdecl _ismbcl2(unsigned int); +_ACRTIMP int __cdecl _ismbclegal(unsigned int); +_ACRTIMP int __cdecl _ismbclower(unsigned int); +_ACRTIMP int __cdecl _ismbcprint(unsigned int); +_ACRTIMP int __cdecl _ismbcpunct(unsigned int); +_ACRTIMP int __cdecl _ismbcspace(unsigned int); +_ACRTIMP int __cdecl _ismbcsymbol(unsigned int); +_ACRTIMP int __cdecl _ismbcupper(unsigned int); +_ACRTIMP unsigned int __cdecl _mbbtombc(unsigned int); +_ACRTIMP int __cdecl _mbbtype(unsigned char,int); +_ACRTIMP int __cdecl _mbbtype_l(unsigned char,int,_locale_t); +#define _mbccmp(_cpc1,_cpc2) _mbsncmp((_cpc1),(_cpc2),1) +_ACRTIMP void __cdecl _mbccpy(unsigned char*,const unsigned char*); +_ACRTIMP unsigned int __cdecl _mbcjistojms(unsigned int); +_ACRTIMP unsigned int __cdecl _mbcjmstojis(unsigned int); +_ACRTIMP size_t __cdecl _mbclen(const unsigned char*); +_ACRTIMP unsigned int __cdecl _mbctohira(unsigned int); +_ACRTIMP unsigned int __cdecl _mbctokata(unsigned int); +_ACRTIMP unsigned int __cdecl _mbctolower(unsigned int); +_ACRTIMP unsigned int __cdecl _mbctombb(unsigned int); +_ACRTIMP unsigned int __cdecl _mbctoupper(unsigned int); +_ACRTIMP int __cdecl _mbsbtype(const unsigned char*,size_t); +_ACRTIMP unsigned char* __cdecl _mbscat(unsigned char*,const unsigned char*); +_ACRTIMP unsigned char* __cdecl _mbschr(const unsigned char*,unsigned int); +_ACRTIMP int __cdecl _mbscmp(const unsigned char*,const unsigned char*); +_ACRTIMP int __cdecl _mbscmp_l(const unsigned char*,const unsigned char*,_locale_t); +_ACRTIMP int __cdecl _mbscoll(const unsigned char*,const unsigned char*); +_ACRTIMP unsigned char* __cdecl _mbscpy(unsigned char*,const unsigned char*); +_ACRTIMP size_t __cdecl _mbscspn(const unsigned char*,const unsigned char*); +_ACRTIMP unsigned char* __cdecl _mbsdec(const unsigned char*,const unsigned char*); +_ACRTIMP unsigned char* __cdecl _mbsdup(const unsigned char*); +_ACRTIMP int __cdecl _mbsicmp(const unsigned char*,const unsigned char*); +_ACRTIMP int __cdecl _mbsicoll(const unsigned char*,const unsigned char*); +_ACRTIMP unsigned char* __cdecl _mbsinc(const unsigned char*); +_ACRTIMP size_t __cdecl _mbslen(const unsigned char*); +_ACRTIMP unsigned char* __cdecl _mbslwr(unsigned char*); +_ACRTIMP errno_t __cdecl _mbslwr_s(unsigned char*, size_t); +_ACRTIMP unsigned char* __cdecl _mbsnbcat(unsigned char*,const unsigned char*,size_t); +_ACRTIMP errno_t __cdecl _mbsnbcat_s(unsigned char*,size_t,const unsigned char*,size_t); +_ACRTIMP int __cdecl _mbsnbcmp(const unsigned char*,const unsigned char*,size_t); +_ACRTIMP int __cdecl _mbsnbcoll(const unsigned char*,const unsigned char*,size_t); +_ACRTIMP size_t __cdecl _mbsnbcnt(const unsigned char*,size_t); +_ACRTIMP unsigned char* __cdecl _mbsnbcpy(unsigned char*,const unsigned char*,size_t); +_ACRTIMP int __cdecl _mbsnbicmp(const unsigned char*,const unsigned char*,size_t); +_ACRTIMP int __cdecl _mbsnbicoll(const unsigned char*,const unsigned char*,size_t); +_ACRTIMP unsigned char* __cdecl _mbsnbset(unsigned char*,unsigned int,size_t); +_ACRTIMP unsigned char* __cdecl _mbsncat(unsigned char*,const unsigned char*, size_t); +_ACRTIMP size_t __cdecl _mbsnccnt(const unsigned char*,size_t); +_ACRTIMP int __cdecl _mbsncmp(const unsigned char*,const unsigned char*,size_t); +_ACRTIMP int __cdecl _mbsncoll(const unsigned char*,const unsigned char*,size_t); +_ACRTIMP unsigned char* __cdecl _mbsncpy(unsigned char*,const unsigned char*,size_t); +_ACRTIMP unsigned int __cdecl _mbsnextc(const unsigned char*); +_ACRTIMP unsigned int __cdecl _mbsnextc_l(const unsigned char*,_locale_t); +_ACRTIMP int __cdecl _mbsnicmp(const unsigned char*,const unsigned char*,size_t); +_ACRTIMP int __cdecl _mbsnicoll(const unsigned char*,const unsigned char*,size_t); +_ACRTIMP unsigned char* __cdecl _mbsninc(const unsigned char*,size_t); +_ACRTIMP unsigned char* __cdecl _mbsnset(unsigned char*,unsigned int,size_t); +_ACRTIMP unsigned char* __cdecl _mbspbrk(const unsigned char*,const unsigned char*); +_ACRTIMP unsigned char* __cdecl _mbsrchr(const unsigned char*,unsigned int); +_ACRTIMP unsigned char* __cdecl _mbsrev(unsigned char*); +_ACRTIMP unsigned char* __cdecl _mbsset(unsigned char*,unsigned int); +_ACRTIMP size_t __cdecl _mbsspn(const unsigned char*,const unsigned char*); +_ACRTIMP unsigned char* __cdecl _mbsspnp(const unsigned char*,const unsigned char*); +_ACRTIMP unsigned char* __cdecl _mbsstr(const unsigned char*,const unsigned char*); +_ACRTIMP unsigned char* __cdecl _mbstok(unsigned char*,const unsigned char*); +_ACRTIMP unsigned char* __cdecl _mbstok_l(unsigned char*,const unsigned char*,_locale_t); +_ACRTIMP unsigned char* __cdecl _mbsupr(unsigned char*); +_ACRTIMP errno_t __cdecl _mbsupr_s(unsigned char*, size_t); #ifndef _MBLEADTRAIL_DEFINED #define _MBLEADTRAIL_DEFINED -int __cdecl _ismbblead(unsigned int); -int __cdecl _ismbbtrail(unsigned int); -int __cdecl _ismbslead(const unsigned char*,const unsigned char*); -int __cdecl _ismbstrail(const unsigned char*,const unsigned char*); +_ACRTIMP int __cdecl _ismbblead(unsigned int); +_ACRTIMP int __cdecl _ismbbtrail(unsigned int); +_ACRTIMP int __cdecl _ismbslead(const unsigned char*,const unsigned char*); +_ACRTIMP int __cdecl _ismbstrail(const unsigned char*,const unsigned char*); #endif /* _MBLEADTRAIL_DEFINED */ #ifdef __cplusplus diff --git a/include/msvcrt/memory.h b/include/msvcrt/memory.h index ebdd2bee939..fef6df37ee9 100644 --- a/include/msvcrt/memory.h +++ b/include/msvcrt/memory.h @@ -17,14 +17,14 @@ extern "C" { #ifndef _CRT_MEMORY_DEFINED #define _CRT_MEMORY_DEFINED -void* __cdecl memchr(const void*,int,size_t); -int __cdecl memcmp(const void*,const void*,size_t); -void* __cdecl memcpy(void*,const void*,size_t); -errno_t __cdecl memcpy_s(void*,size_t,const void*,size_t); -void* __cdecl memset(void*,int,size_t); -void* __cdecl _memccpy(void*,const void*,int,size_t); -int __cdecl _memicmp(const void*,const void*,size_t); -int __cdecl _memicmp_l(const void*,const void*,size_t,_locale_t); +_ACRTIMP void* __cdecl memchr(const void*,int,size_t); +_ACRTIMP int __cdecl memcmp(const void*,const void*,size_t); +_ACRTIMP void* __cdecl memcpy(void*,const void*,size_t); +_ACRTIMP errno_t __cdecl memcpy_s(void*,size_t,const void*,size_t); +_ACRTIMP void* __cdecl memset(void*,int,size_t); +_ACRTIMP void* __cdecl _memccpy(void*,const void*,int,size_t); +_ACRTIMP int __cdecl _memicmp(const void*,const void*,size_t); +_ACRTIMP int __cdecl _memicmp_l(const void*,const void*,size_t,_locale_t); static inline int memicmp(const void* s1, const void* s2, size_t len) { return _memicmp(s1, s2, len); } static inline void* memccpy(void *s1, const void *s2, int c, size_t n) { return _memccpy(s1, s2, c, n); } diff --git a/include/msvcrt/process.h b/include/msvcrt/process.h index 2307b7990d4..5026d6e62f9 100644 --- a/include/msvcrt/process.h +++ b/include/msvcrt/process.h @@ -28,36 +28,36 @@ extern "C" { typedef void (__cdecl *_beginthread_start_routine_t)(void *); typedef unsigned int (__stdcall *_beginthreadex_start_routine_t)(void *); -uintptr_t __cdecl _beginthread(_beginthread_start_routine_t,unsigned int,void*); -uintptr_t __cdecl _beginthreadex(void*,unsigned int,_beginthreadex_start_routine_t,void*,unsigned int,unsigned int*); -intptr_t __cdecl _cwait(int*,intptr_t,int); +_ACRTIMP uintptr_t __cdecl _beginthread(_beginthread_start_routine_t,unsigned int,void*); +_ACRTIMP uintptr_t __cdecl _beginthreadex(void*,unsigned int,_beginthreadex_start_routine_t,void*,unsigned int,unsigned int*); +_ACRTIMP intptr_t __cdecl _cwait(int*,intptr_t,int); _ACRTIMP DECLSPEC_NORETURN void __cdecl _endthread(void); _ACRTIMP DECLSPEC_NORETURN void __cdecl _endthreadex(unsigned int); -intptr_t WINAPIV _execl(const char*,const char*,...); -intptr_t WINAPIV _execle(const char*,const char*,...); -intptr_t WINAPIV _execlp(const char*,const char*,...); -intptr_t WINAPIV _execlpe(const char*,const char*,...); -intptr_t __cdecl _execv(const char*,const char* const *); -intptr_t __cdecl _execve(const char*,const char* const *,const char* const *); -intptr_t __cdecl _execvp(const char*,const char* const *); -intptr_t __cdecl _execvpe(const char*,const char* const *,const char* const *); -int __cdecl _getpid(void); -intptr_t WINAPIV _spawnl(int,const char*,const char*,...); -intptr_t WINAPIV _spawnle(int,const char*,const char*,...); -intptr_t WINAPIV _spawnlp(int,const char*,const char*,...); -intptr_t WINAPIV _spawnlpe(int,const char*,const char*,...); -intptr_t __cdecl _spawnv(int,const char*,const char* const *); -intptr_t __cdecl _spawnve(int,const char*,const char* const *,const char* const *); -intptr_t __cdecl _spawnvp(int,const char*,const char* const *); -intptr_t __cdecl _spawnvpe(int,const char*,const char* const *,const char* const *); +_ACRTIMP intptr_t WINAPIV _execl(const char*,const char*,...); +_ACRTIMP intptr_t WINAPIV _execle(const char*,const char*,...); +_ACRTIMP intptr_t WINAPIV _execlp(const char*,const char*,...); +_ACRTIMP intptr_t WINAPIV _execlpe(const char*,const char*,...); +_ACRTIMP intptr_t __cdecl _execv(const char*,const char* const *); +_ACRTIMP intptr_t __cdecl _execve(const char*,const char* const *,const char* const *); +_ACRTIMP intptr_t __cdecl _execvp(const char*,const char* const *); +_ACRTIMP intptr_t __cdecl _execvpe(const char*,const char* const *,const char* const *); +_ACRTIMP int __cdecl _getpid(void); +_ACRTIMP intptr_t WINAPIV _spawnl(int,const char*,const char*,...); +_ACRTIMP intptr_t WINAPIV _spawnle(int,const char*,const char*,...); +_ACRTIMP intptr_t WINAPIV _spawnlp(int,const char*,const char*,...); +_ACRTIMP intptr_t WINAPIV _spawnlpe(int,const char*,const char*,...); +_ACRTIMP intptr_t __cdecl _spawnv(int,const char*,const char* const *); +_ACRTIMP intptr_t __cdecl _spawnve(int,const char*,const char* const *,const char* const *); +_ACRTIMP intptr_t __cdecl _spawnvp(int,const char*,const char* const *); +_ACRTIMP intptr_t __cdecl _spawnvpe(int,const char*,const char* const *,const char* const *); -void __cdecl _c_exit(void); -void __cdecl _cexit(void); +_ACRTIMP void __cdecl _c_exit(void); +_ACRTIMP void __cdecl _cexit(void); _ACRTIMP DECLSPEC_NORETURN void __cdecl _exit(int); _ACRTIMP DECLSPEC_NORETURN void __cdecl abort(void); _ACRTIMP DECLSPEC_NORETURN void __cdecl exit(int); _ACRTIMP DECLSPEC_NORETURN void __cdecl quick_exit(int); -int __cdecl system(const char*); +_ACRTIMP int __cdecl system(const char*); #ifdef __cplusplus } @@ -85,14 +85,14 @@ static inline intptr_t spawnvpe(int flags, const char* name, const char* const* #define execvpe _execvpe #if defined(__GNUC__) && (__GNUC__ < 4) -extern intptr_t WINAPIV execl(const char*,const char*,...) __attribute__((alias("_execl"))); -extern intptr_t WINAPIV execle(const char*,const char*,...) __attribute__((alias("_execle"))); -extern intptr_t WINAPIV execlp(const char*,const char*,...) __attribute__((alias("_execlp"))); -extern intptr_t WINAPIV execlpe(const char*,const char*,...) __attribute__((alias("_execlpe"))); -extern intptr_t WINAPIV spawnl(int,const char*,const char*,...) __attribute__((alias("_spawnl"))); -extern intptr_t WINAPIV spawnle(int,const char*,const char*,...) __attribute__((alias("_spawnle"))); -extern intptr_t WINAPIV spawnlp(int,const char*,const char*,...) __attribute__((alias("_spawnlp"))); -extern intptr_t WINAPIV spawnlpe(int,const char*,const char*,...) __attribute__((alias("_spawnlpe"))); +_ACRTIMP intptr_t WINAPIV execl(const char*,const char*,...) __attribute__((alias("_execl"))); +_ACRTIMP intptr_t WINAPIV execle(const char*,const char*,...) __attribute__((alias("_execle"))); +_ACRTIMP intptr_t WINAPIV execlp(const char*,const char*,...) __attribute__((alias("_execlp"))); +_ACRTIMP intptr_t WINAPIV execlpe(const char*,const char*,...) __attribute__((alias("_execlpe"))); +_ACRTIMP intptr_t WINAPIV spawnl(int,const char*,const char*,...) __attribute__((alias("_spawnl"))); +_ACRTIMP intptr_t WINAPIV spawnle(int,const char*,const char*,...) __attribute__((alias("_spawnle"))); +_ACRTIMP intptr_t WINAPIV spawnlp(int,const char*,const char*,...) __attribute__((alias("_spawnlp"))); +_ACRTIMP intptr_t WINAPIV spawnlpe(int,const char*,const char*,...) __attribute__((alias("_spawnlpe"))); #else #define execl _execl #define execle _execle diff --git a/include/msvcrt/search.h b/include/msvcrt/search.h index 0b0412eba77..4abb806fa25 100644 --- a/include/msvcrt/search.h +++ b/include/msvcrt/search.h @@ -26,10 +26,10 @@ extern "C" { #endif -void* __cdecl _lfind(const void*,const void*,unsigned int*,unsigned int,int (__cdecl *)(const void*,const void*)); -void* __cdecl _lsearch(const void*,void*,unsigned int*,unsigned int,int (__cdecl *)(const void*,const void*)); -void* __cdecl bsearch(const void*,const void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); -void __cdecl qsort(void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); +_ACRTIMP void* __cdecl _lfind(const void*,const void*,unsigned int*,unsigned int,int (__cdecl *)(const void*,const void*)); +_ACRTIMP void* __cdecl _lsearch(const void*,void*,unsigned int*,unsigned int,int (__cdecl *)(const void*,const void*)); +_ACRTIMP void* __cdecl bsearch(const void*,const void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); +_ACRTIMP void __cdecl qsort(void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); #ifdef __cplusplus } diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h index 4209d6c6fd7..d4b7f8019ab 100644 --- a/include/msvcrt/setjmp.h +++ b/include/msvcrt/setjmp.h @@ -143,14 +143,14 @@ typedef _JBTYPE jmp_buf[_JBLEN]; extern "C" { #endif -void __cdecl longjmp(jmp_buf,int); +_ACRTIMP void __cdecl longjmp(jmp_buf,int); #ifdef _WIN64 # ifdef _UCRT # define _setjmpex __intrinsic_setjmpex # endif # ifdef __GNUC__ -int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf,void*); +_ACRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf,void*); # define setjmp(buf) _setjmpex(buf,__builtin_frame_address(0)) # define setjmpex(buf) _setjmpex(buf,__builtin_frame_address(0)) # endif @@ -159,9 +159,9 @@ int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf,vo # define _setjmp __intrinsic_setjmp # endif # ifdef __GNUC__ -int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf); +_ACRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf); # else -int __cdecl _setjmp(jmp_buf); +_ACRTIMP int __cdecl _setjmp(jmp_buf); # endif #endif /* _WIN64 */ diff --git a/include/msvcrt/signal.h b/include/msvcrt/signal.h index b1f291a33be..2802c8537e8 100644 --- a/include/msvcrt/signal.h +++ b/include/msvcrt/signal.h @@ -42,9 +42,9 @@ typedef void (__cdecl *__sighandler_t)(int); #define SIG_IGN ((__sighandler_t)1) #define SIG_ERR ((__sighandler_t)-1) -void** __cdecl __pxcptinfoptrs(void); -__sighandler_t __cdecl signal(int sig, __sighandler_t func); -int __cdecl raise(int sig); +_ACRTIMP void** __cdecl __pxcptinfoptrs(void); +_ACRTIMP __sighandler_t __cdecl signal(int sig, __sighandler_t func); +_ACRTIMP int __cdecl raise(int sig); #ifdef __cplusplus } diff --git a/include/msvcrt/stddef.h b/include/msvcrt/stddef.h index 12025d53dc8..8d946e5aedf 100644 --- a/include/msvcrt/stddef.h +++ b/include/msvcrt/stddef.h @@ -33,8 +33,8 @@ extern "C" { #endif -__msvcrt_ulong __cdecl __threadid(void); -__msvcrt_ulong __cdecl __threadhandle(void); +_ACRTIMP __msvcrt_ulong __cdecl __threadid(void); +_ACRTIMP __msvcrt_ulong __cdecl __threadhandle(void); #define _threadid (__threadid()) #ifdef __cplusplus diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index f2aef46e6ff..12136cbe5ad 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -53,10 +53,10 @@ extern "C" { #ifndef _STDIO_DEFINED # ifdef __i386__ -FILE* __cdecl __p__iob(void); +_ACRTIMP FILE* __cdecl __p__iob(void); # define _iob (__p__iob()) # else -FILE* __cdecl __iob_func(void); +_ACRTIMP FILE* __cdecl __iob_func(void); # define _iob (__iob_func()) # endif #endif /* _STDIO_DEFINED */ @@ -66,81 +66,81 @@ FILE* __cdecl __iob_func(void); #ifndef _STDIO_DEFINED #define _STDIO_DEFINED -int __cdecl _fcloseall(void); -FILE* __cdecl _fdopen(int,const char*); -int __cdecl _fgetchar(void); -int __cdecl _filbuf(FILE*); -int __cdecl _fileno(FILE*); -int __cdecl _flsbuf(int,FILE*); -int __cdecl _flushall(void); -int __cdecl _fputchar(int); -FILE* __cdecl _fsopen(const char*,const char*,int); -int __cdecl _get_printf_count_output(void); -int __cdecl _getmaxstdio(void); -int __cdecl _getw(FILE*); -int __cdecl _pclose(FILE*); -FILE* __cdecl _popen(const char*,const char*); -int __cdecl _putw(int,FILE*); -int __cdecl _rmtmp(void); -int __cdecl _set_printf_count_output(int); -int __cdecl _setmaxstdio(int); -char* __cdecl _tempnam(const char*,const char*); -int __cdecl _unlink(const char*); +_ACRTIMP int __cdecl _fcloseall(void); +_ACRTIMP FILE* __cdecl _fdopen(int,const char*); +_ACRTIMP int __cdecl _fgetchar(void); +_ACRTIMP int __cdecl _filbuf(FILE*); +_ACRTIMP int __cdecl _fileno(FILE*); +_ACRTIMP int __cdecl _flsbuf(int,FILE*); +_ACRTIMP int __cdecl _flushall(void); +_ACRTIMP int __cdecl _fputchar(int); +_ACRTIMP FILE* __cdecl _fsopen(const char*,const char*,int); +_ACRTIMP int __cdecl _get_printf_count_output(void); +_ACRTIMP int __cdecl _getmaxstdio(void); +_ACRTIMP int __cdecl _getw(FILE*); +_ACRTIMP int __cdecl _pclose(FILE*); +_ACRTIMP FILE* __cdecl _popen(const char*,const char*); +_ACRTIMP int __cdecl _putw(int,FILE*); +_ACRTIMP int __cdecl _rmtmp(void); +_ACRTIMP int __cdecl _set_printf_count_output(int); +_ACRTIMP int __cdecl _setmaxstdio(int); +_ACRTIMP char* __cdecl _tempnam(const char*,const char*); +_ACRTIMP int __cdecl _unlink(const char*); -size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); -size_t __cdecl _fread_nolock_s(void*,size_t,size_t,size_t,FILE*); -size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*); -int __cdecl _fclose_nolock(FILE*); -int __cdecl _fflush_nolock(FILE*); -int __cdecl _fgetc_nolock(FILE*); -int __cdecl _fputc_nolock(int,FILE*); -int __cdecl _fseek_nolock(FILE*,__msvcrt_long,int); -int __cdecl _fseeki64_nolock(FILE*,__int64,int); -__msvcrt_long __cdecl _ftell_nolock(FILE*); -__int64 __cdecl _ftelli64_nolock(FILE*); -int __cdecl _getc_nolock(FILE*); -int __cdecl _putc_nolock(int,FILE*); -int __cdecl _ungetc_nolock(int,FILE*); +_ACRTIMP size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); +_ACRTIMP size_t __cdecl _fread_nolock_s(void*,size_t,size_t,size_t,FILE*); +_ACRTIMP size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*); +_ACRTIMP int __cdecl _fclose_nolock(FILE*); +_ACRTIMP int __cdecl _fflush_nolock(FILE*); +_ACRTIMP int __cdecl _fgetc_nolock(FILE*); +_ACRTIMP int __cdecl _fputc_nolock(int,FILE*); +_ACRTIMP int __cdecl _fseek_nolock(FILE*,__msvcrt_long,int); +_ACRTIMP int __cdecl _fseeki64_nolock(FILE*,__int64,int); +_ACRTIMP __msvcrt_long __cdecl _ftell_nolock(FILE*); +_ACRTIMP __int64 __cdecl _ftelli64_nolock(FILE*); +_ACRTIMP int __cdecl _getc_nolock(FILE*); +_ACRTIMP int __cdecl _putc_nolock(int,FILE*); +_ACRTIMP int __cdecl _ungetc_nolock(int,FILE*); -void __cdecl clearerr(FILE*); -errno_t __cdecl clearerr_s(FILE*); -int __cdecl fclose(FILE*); -int __cdecl feof(FILE*); -int __cdecl ferror(FILE*); -int __cdecl fflush(FILE*); -int __cdecl fgetc(FILE*); -int __cdecl fgetpos(FILE*,fpos_t*); -char* __cdecl fgets(char*,int,FILE*); -FILE* __cdecl fopen(const char*,const char*); -errno_t __cdecl fopen_s(FILE**,const char*,const char*); -int __cdecl fputc(int,FILE*); -int __cdecl fputs(const char*,FILE*); -size_t __cdecl fread(void*,size_t,size_t,FILE*); -size_t __cdecl fread_s(void*,size_t,size_t,size_t,FILE*); -FILE* __cdecl freopen(const char*,const char*,FILE*); -int __cdecl fseek(FILE*,__msvcrt_long,int); -int __cdecl _fseeki64(FILE*,__int64,int); -int __cdecl fsetpos(FILE*,fpos_t*); -__msvcrt_long __cdecl ftell(FILE*); -__int64 __cdecl _ftelli64(FILE*); -size_t __cdecl fwrite(const void*,size_t,size_t,FILE*); -int __cdecl getc(FILE*); -int __cdecl getchar(void); -char* __cdecl gets(char*); -void __cdecl perror(const char*); -int __cdecl putc(int,FILE*); -int __cdecl putchar(int); -int __cdecl puts(const char*); -int __cdecl remove(const char*); -int __cdecl rename(const char*,const char*); -void __cdecl rewind(FILE*); -void __cdecl setbuf(FILE*,char*); -int __cdecl setvbuf(FILE*,char*,int,size_t); -FILE* __cdecl tmpfile(void); -char* __cdecl tmpnam(char*); -int __cdecl ungetc(int,FILE*); -unsigned int __cdecl _get_output_format(void); -unsigned int __cdecl _set_output_format(void); +_ACRTIMP void __cdecl clearerr(FILE*); +_ACRTIMP errno_t __cdecl clearerr_s(FILE*); +_ACRTIMP int __cdecl fclose(FILE*); +_ACRTIMP int __cdecl feof(FILE*); +_ACRTIMP int __cdecl ferror(FILE*); +_ACRTIMP int __cdecl fflush(FILE*); +_ACRTIMP int __cdecl fgetc(FILE*); +_ACRTIMP int __cdecl fgetpos(FILE*,fpos_t*); +_ACRTIMP char* __cdecl fgets(char*,int,FILE*); +_ACRTIMP FILE* __cdecl fopen(const char*,const char*); +_ACRTIMP errno_t __cdecl fopen_s(FILE**,const char*,const char*); +_ACRTIMP int __cdecl fputc(int,FILE*); +_ACRTIMP int __cdecl fputs(const char*,FILE*); +_ACRTIMP size_t __cdecl fread(void*,size_t,size_t,FILE*); +_ACRTIMP size_t __cdecl fread_s(void*,size_t,size_t,size_t,FILE*); +_ACRTIMP FILE* __cdecl freopen(const char*,const char*,FILE*); +_ACRTIMP int __cdecl fseek(FILE*,__msvcrt_long,int); +_ACRTIMP int __cdecl _fseeki64(FILE*,__int64,int); +_ACRTIMP int __cdecl fsetpos(FILE*,fpos_t*); +_ACRTIMP __msvcrt_long __cdecl ftell(FILE*); +_ACRTIMP __int64 __cdecl _ftelli64(FILE*); +_ACRTIMP size_t __cdecl fwrite(const void*,size_t,size_t,FILE*); +_ACRTIMP int __cdecl getc(FILE*); +_ACRTIMP int __cdecl getchar(void); +_ACRTIMP char* __cdecl gets(char*); +_ACRTIMP void __cdecl perror(const char*); +_ACRTIMP int __cdecl putc(int,FILE*); +_ACRTIMP int __cdecl putchar(int); +_ACRTIMP int __cdecl puts(const char*); +_ACRTIMP int __cdecl remove(const char*); +_ACRTIMP int __cdecl rename(const char*,const char*); +_ACRTIMP void __cdecl rewind(FILE*); +_ACRTIMP void __cdecl setbuf(FILE*,char*); +_ACRTIMP int __cdecl setvbuf(FILE*,char*,int,size_t); +_ACRTIMP FILE* __cdecl tmpfile(void); +_ACRTIMP char* __cdecl tmpnam(char*); +_ACRTIMP int __cdecl ungetc(int,FILE*); +_ACRTIMP unsigned int __cdecl _get_output_format(void); +_ACRTIMP unsigned int __cdecl _set_output_format(void); #ifdef _UCRT @@ -394,7 +394,7 @@ _ACRTIMP int __cdecl vprintf_s(const char*,__ms_va_list); _ACRTIMP int __cdecl vsprintf(char*,const char*,__ms_va_list); _ACRTIMP int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list); -int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list); +_ACRTIMP int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list); static inline int vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { return _vsnprintf(buffer,size,format,args); } _ACRTIMP int WINAPIV _snscanf_l(const char*,size_t,const char*,_locale_t,...); diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 00acd374346..fb5c5e23e82 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -83,26 +83,26 @@ extern "C" { #if defined(__i386__) || defined(_UCRT) -extern unsigned int* __cdecl __p__osver(void); -#define _osver (*__p__osver()) -extern unsigned int* __cdecl __p__winver(void); -#define _winver (*__p__winver()) -extern unsigned int* __cdecl __p__winmajor(void); -#define _winmajor (*__p__winmajor()) -extern unsigned int* __cdecl __p__winminor(void); -#define _winminor (*__p__winminor()) -extern int* __cdecl __p___argc(void); -#define __argc (*__p___argc()) -extern char*** __cdecl __p___argv(void); -#define __argv (*__p___argv()) -extern wchar_t*** __cdecl __p___wargv(void); -#define __wargv (*__p___wargv()) -extern char*** __cdecl __p__environ(void); -#define _environ (*__p__environ()) -extern wchar_t*** __cdecl __p__wenviron(void); -#define _wenviron (*__p__wenviron()) -extern int* __cdecl __p__fmode(void); -#define _fmode (*__p__fmode()) +_ACRTIMP unsigned int* __cdecl __p__osver(void); +_ACRTIMP unsigned int* __cdecl __p__winver(void); +_ACRTIMP unsigned int* __cdecl __p__winmajor(void); +_ACRTIMP unsigned int* __cdecl __p__winminor(void); +_ACRTIMP int* __cdecl __p___argc(void); +_ACRTIMP char*** __cdecl __p___argv(void); +_ACRTIMP wchar_t*** __cdecl __p___wargv(void); +_ACRTIMP char*** __cdecl __p__environ(void); +_ACRTIMP wchar_t*** __cdecl __p__wenviron(void); +_ACRTIMP int* __cdecl __p__fmode(void); +#define _osver (*__p__osver()) +#define _winver (*__p__winver()) +#define _winmajor (*__p__winmajor()) +#define _winminor (*__p__winminor()) +#define __argc (*__p___argc()) +#define __argv (*__p___argv()) +#define __wargv (*__p___wargv()) +#define _environ (*__p__environ()) +#define _wenviron (*__p__wenviron()) +#define _fmode (*__p__fmode()) #else /* __i386__ */ @@ -119,22 +119,22 @@ extern unsigned int _fmode; #endif /* __i386__ */ -extern int __cdecl ___mb_cur_max_func(void); -#define __mb_cur_max ___mb_cur_max_func() -extern __msvcrt_ulong* __cdecl __doserrno(void); -#define _doserrno (*__doserrno()) -extern int* __cdecl _errno(void); -#define errno (*_errno()) +_ACRTIMP int __cdecl ___mb_cur_max_func(void); +#define __mb_cur_max ___mb_cur_max_func() +_ACRTIMP __msvcrt_ulong* __cdecl __doserrno(void); +#define _doserrno (*__doserrno()) +_ACRTIMP int* __cdecl _errno(void); +#define errno (*_errno()) /* FIXME: We need functions to access these: * int _sys_nerr; * char** _sys_errlist; */ -errno_t __cdecl _get_doserrno(int*); -errno_t __cdecl _get_errno(int*); -errno_t __cdecl _set_doserrno(int); -errno_t __cdecl _set_errno(int); +_ACRTIMP errno_t __cdecl _get_doserrno(int*); +_ACRTIMP errno_t __cdecl _get_errno(int*); +_ACRTIMP errno_t __cdecl _set_doserrno(int); +_ACRTIMP errno_t __cdecl _set_errno(int); #ifndef _CRT_ONEXIT_T_DEFINED #define _CRT_ONEXIT_T_DEFINED @@ -142,94 +142,94 @@ typedef int (__cdecl *_onexit_t)(void); #endif -int __cdecl _atodbl(_CRT_DOUBLE*,char*); -int __cdecl _atodbl_l(_CRT_DOUBLE*,char*,_locale_t); -int __cdecl _atoflt(_CRT_FLOAT*,char*); -int __cdecl _atoflt_l(_CRT_FLOAT*,char*,_locale_t); -__int64 __cdecl _atoi64(const char*); -long double __cdecl _atold(const char*); -int __cdecl _atoldbl(_LDOUBLE*,char*); -void __cdecl _beep(unsigned int,unsigned int); -char* __cdecl _ecvt(double,int,int*,int*); -char* __cdecl _fcvt(double,int,int*,int*); -char* __cdecl _fullpath(char*,const char*,size_t); -char* __cdecl _gcvt(double,int,char*); -errno_t __cdecl _gcvt_s(char*, size_t, double, int); -char* __cdecl _i64toa(__int64,char*,int); -errno_t __cdecl _i64toa_s(__int64, char*, size_t, int); -char* __cdecl _itoa(int,char*,int); -errno_t __cdecl _itoa_s(int,char*,size_t,int); -char* __cdecl _ltoa(__msvcrt_long,char*,int); -errno_t __cdecl _ltoa_s(__msvcrt_long, char*, size_t, int); -__msvcrt_ulong __cdecl _lrotl(__msvcrt_ulong,int); -__msvcrt_ulong __cdecl _lrotr(__msvcrt_ulong,int); -void __cdecl _makepath(char*,const char*,const char*,const char*,const char*); -int __cdecl _makepath_s(char*,size_t,const char*,const char*,const char*,const char*); -size_t __cdecl _mbstrlen(const char*); -_onexit_t __cdecl _onexit(_onexit_t); -int __cdecl _putenv(const char*); -unsigned int __cdecl _rotl(unsigned int,int); -unsigned int __cdecl _rotr(unsigned int,int); -void __cdecl _searchenv(const char*,const char*,char*); -int __cdecl _set_error_mode(int); -void __cdecl _seterrormode(int); -void __cdecl _sleep(__msvcrt_ulong); -void __cdecl _splitpath(const char*,char*,char*,char*,char*); -void __cdecl _swab(char*,char*,int); -char* __cdecl _ui64toa(unsigned __int64,char*,int); -errno_t __cdecl _ui64toa_s(unsigned __int64,char*,size_t,int); -char* __cdecl _ultoa(__msvcrt_ulong,char*,int); -errno_t __cdecl _ultoa_s(__msvcrt_ulong,char*,size_t,int); +_ACRTIMP int __cdecl _atodbl(_CRT_DOUBLE*,char*); +_ACRTIMP int __cdecl _atodbl_l(_CRT_DOUBLE*,char*,_locale_t); +_ACRTIMP int __cdecl _atoflt(_CRT_FLOAT*,char*); +_ACRTIMP int __cdecl _atoflt_l(_CRT_FLOAT*,char*,_locale_t); +_ACRTIMP __int64 __cdecl _atoi64(const char*); +_ACRTIMP long double __cdecl _atold(const char*); +_ACRTIMP int __cdecl _atoldbl(_LDOUBLE*,char*); +_ACRTIMP void __cdecl _beep(unsigned int,unsigned int); +_ACRTIMP char* __cdecl _ecvt(double,int,int*,int*); +_ACRTIMP char* __cdecl _fcvt(double,int,int*,int*); +_ACRTIMP char* __cdecl _fullpath(char*,const char*,size_t); +_ACRTIMP char* __cdecl _gcvt(double,int,char*); +_ACRTIMP errno_t __cdecl _gcvt_s(char*, size_t, double, int); +_ACRTIMP char* __cdecl _i64toa(__int64,char*,int); +_ACRTIMP errno_t __cdecl _i64toa_s(__int64, char*, size_t, int); +_ACRTIMP char* __cdecl _itoa(int,char*,int); +_ACRTIMP errno_t __cdecl _itoa_s(int,char*,size_t,int); +_ACRTIMP char* __cdecl _ltoa(__msvcrt_long,char*,int); +_ACRTIMP errno_t __cdecl _ltoa_s(__msvcrt_long, char*, size_t, int); +_ACRTIMP __msvcrt_ulong __cdecl _lrotl(__msvcrt_ulong,int); +_ACRTIMP __msvcrt_ulong __cdecl _lrotr(__msvcrt_ulong,int); +_ACRTIMP void __cdecl _makepath(char*,const char*,const char*,const char*,const char*); +_ACRTIMP int __cdecl _makepath_s(char*,size_t,const char*,const char*,const char*,const char*); +_ACRTIMP size_t __cdecl _mbstrlen(const char*); +_ACRTIMP _onexit_t __cdecl _onexit(_onexit_t); +_ACRTIMP int __cdecl _putenv(const char*); +_ACRTIMP unsigned int __cdecl _rotl(unsigned int,int); +_ACRTIMP unsigned int __cdecl _rotr(unsigned int,int); +_ACRTIMP void __cdecl _searchenv(const char*,const char*,char*); +_ACRTIMP int __cdecl _set_error_mode(int); +_ACRTIMP void __cdecl _seterrormode(int); +_ACRTIMP void __cdecl _sleep(__msvcrt_ulong); +_ACRTIMP void __cdecl _splitpath(const char*,char*,char*,char*,char*); +_ACRTIMP void __cdecl _swab(char*,char*,int); +_ACRTIMP char* __cdecl _ui64toa(unsigned __int64,char*,int); +_ACRTIMP errno_t __cdecl _ui64toa_s(unsigned __int64,char*,size_t,int); +_ACRTIMP char* __cdecl _ultoa(__msvcrt_ulong,char*,int); +_ACRTIMP errno_t __cdecl _ultoa_s(__msvcrt_ulong,char*,size_t,int); _ACRTIMP DECLSPEC_NORETURN void __cdecl _Exit(int); _ACRTIMP DECLSPEC_NORETURN void __cdecl _exit(int); _ACRTIMP DECLSPEC_NORETURN void __cdecl abort(void); -int __cdecl abs(int); -int __cdecl atexit(void (__cdecl *)(void)); -double __cdecl atof(const char*); -int __cdecl atoi(const char*); -int __cdecl _atoi_l(const char*,_locale_t); -__msvcrt_long __cdecl atol(const char*); -__int64 __cdecl atoll(const char*); -void* __cdecl calloc(size_t,size_t); +_ACRTIMP int __cdecl abs(int); +_ACRTIMP int __cdecl atexit(void (__cdecl *)(void)); +_ACRTIMP double __cdecl atof(const char*); +_ACRTIMP int __cdecl atoi(const char*); +_ACRTIMP int __cdecl _atoi_l(const char*,_locale_t); +_ACRTIMP __msvcrt_long __cdecl atol(const char*); +_ACRTIMP __int64 __cdecl atoll(const char*); +_ACRTIMP void* __cdecl calloc(size_t,size_t); #ifndef __i386__ -div_t __cdecl div(int,int); -ldiv_t __cdecl ldiv(__msvcrt_long,__msvcrt_long); +_ACRTIMP div_t __cdecl div(int,int); +_ACRTIMP ldiv_t __cdecl ldiv(__msvcrt_long,__msvcrt_long); #endif -lldiv_t __cdecl lldiv(__int64,__int64); +_ACRTIMP lldiv_t __cdecl lldiv(__int64,__int64); _ACRTIMP DECLSPEC_NORETURN void __cdecl exit(int); -void __cdecl free(void*); -char* __cdecl getenv(const char*); -__msvcrt_long __cdecl labs(__msvcrt_long); -__int64 __cdecl llabs(__int64); -void* __cdecl malloc(size_t); -int __cdecl mblen(const char*,size_t); -void __cdecl perror(const char*); -int __cdecl rand(void); -errno_t __cdecl rand_s(unsigned int*); -void* __cdecl realloc(void*,size_t); -void __cdecl srand(unsigned int); -float __cdecl strtof(const char*,char**); -double __cdecl strtod(const char*,char**); -__msvcrt_long __cdecl strtol(const char*,char**,int); -__msvcrt_ulong __cdecl strtoul(const char*,char**,int); -__int64 __cdecl strtoll_l(const char*,char**,int,_locale_t); -unsigned __int64 __cdecl strtoull_l(const char*,char**,int,_locale_t); -__int64 __cdecl strtoimax(const char*,char**,int); -__int64 __cdecl strtoimax_l(const char*,char**,int,_locale_t); -unsigned __int64 __cdecl strtoumax(const char*,char**,int); -unsigned __int64 __cdecl strtoumax_l(const char*,char**,int,_locale_t); -__int64 __cdecl _strtoi64(const char*,char**,int); -__int64 __cdecl _strtoi64_l(const char*,char**,int,_locale_t); -unsigned __int64 __cdecl _strtoui64(const char*,char**,int); -unsigned __int64 __cdecl _strtoui64_l(const char*,char**,int,_locale_t); -int __cdecl system(const char*); -void* __cdecl bsearch(const void*,const void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); -void __cdecl qsort(void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); +_ACRTIMP void __cdecl free(void*); +_ACRTIMP char* __cdecl getenv(const char*); +_ACRTIMP __msvcrt_long __cdecl labs(__msvcrt_long); +_ACRTIMP __int64 __cdecl llabs(__int64); +_ACRTIMP void* __cdecl malloc(size_t); +_ACRTIMP int __cdecl mblen(const char*,size_t); +_ACRTIMP void __cdecl perror(const char*); +_ACRTIMP int __cdecl rand(void); +_ACRTIMP errno_t __cdecl rand_s(unsigned int*); +_ACRTIMP void* __cdecl realloc(void*,size_t); +_ACRTIMP void __cdecl srand(unsigned int); +_ACRTIMP float __cdecl strtof(const char*,char**); +_ACRTIMP double __cdecl strtod(const char*,char**); +_ACRTIMP __msvcrt_long __cdecl strtol(const char*,char**,int); +_ACRTIMP __msvcrt_ulong __cdecl strtoul(const char*,char**,int); +_ACRTIMP __int64 __cdecl strtoll_l(const char*,char**,int,_locale_t); +_ACRTIMP unsigned __int64 __cdecl strtoull_l(const char*,char**,int,_locale_t); +_ACRTIMP __int64 __cdecl strtoimax(const char*,char**,int); +_ACRTIMP __int64 __cdecl strtoimax_l(const char*,char**,int,_locale_t); +_ACRTIMP unsigned __int64 __cdecl strtoumax(const char*,char**,int); +_ACRTIMP unsigned __int64 __cdecl strtoumax_l(const char*,char**,int,_locale_t); +_ACRTIMP __int64 __cdecl _strtoi64(const char*,char**,int); +_ACRTIMP __int64 __cdecl _strtoi64_l(const char*,char**,int,_locale_t); +_ACRTIMP unsigned __int64 __cdecl _strtoui64(const char*,char**,int); +_ACRTIMP unsigned __int64 __cdecl _strtoui64_l(const char*,char**,int,_locale_t); +_ACRTIMP int __cdecl system(const char*); +_ACRTIMP void* __cdecl bsearch(const void*,const void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); +_ACRTIMP void __cdecl qsort(void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); typedef void (__cdecl *_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, uintptr_t); -_invalid_parameter_handler __cdecl _set_invalid_parameter_handler(_invalid_parameter_handler); -_invalid_parameter_handler __cdecl _get_invalid_parameter_handler(void); +_ACRTIMP _invalid_parameter_handler __cdecl _set_invalid_parameter_handler(_invalid_parameter_handler); +_ACRTIMP _invalid_parameter_handler __cdecl _get_invalid_parameter_handler(void); _ACRTIMP _invalid_parameter_handler __cdecl _get_thread_local_invalid_parameter_handler(void); _ACRTIMP _invalid_parameter_handler __cdecl _set_thread_local_invalid_parameter_handler(_invalid_parameter_handler); void __cdecl _invalid_parameter(const wchar_t *expr, const wchar_t *func, const wchar_t *file, diff --git a/include/msvcrt/sys/stat.h b/include/msvcrt/sys/stat.h index f4813fab655..b09494fb158 100644 --- a/include/msvcrt/sys/stat.h +++ b/include/msvcrt/sys/stat.h @@ -196,19 +196,19 @@ extern "C" { # endif #endif -int __cdecl _fstat32(int, struct _stat32*); -int __cdecl _fstat32i64(int, struct _stat32i64*); -int __cdecl _fstat64(int,struct _stat64*); -int __cdecl _fstat64i32(int,struct _stat64i32*); -int __cdecl _stat32(const char*, struct _stat32*); -int __cdecl _stat32i64(const char*, struct _stat32i64*); -int __cdecl _stat64(const char*,struct _stat64*); -int __cdecl _stat64i32(const char*,struct _stat64i32*); -int __cdecl _umask(int); -int __cdecl _wstat32(const wchar_t*,struct _stat32*); -int __cdecl _wstat32i64(const wchar_t*, struct _stat32i64*); -int __cdecl _wstat64(const wchar_t*,struct _stat64*); -int __cdecl _wstat64i32(const wchar_t*,struct _stat64i32*); +_ACRTIMP int __cdecl _fstat32(int, struct _stat32*); +_ACRTIMP int __cdecl _fstat32i64(int, struct _stat32i64*); +_ACRTIMP int __cdecl _fstat64(int,struct _stat64*); +_ACRTIMP int __cdecl _fstat64i32(int,struct _stat64i32*); +_ACRTIMP int __cdecl _stat32(const char*, struct _stat32*); +_ACRTIMP int __cdecl _stat32i64(const char*, struct _stat32i64*); +_ACRTIMP int __cdecl _stat64(const char*,struct _stat64*); +_ACRTIMP int __cdecl _stat64i32(const char*,struct _stat64i32*); +_ACRTIMP int __cdecl _umask(int); +_ACRTIMP int __cdecl _wstat32(const wchar_t*,struct _stat32*); +_ACRTIMP int __cdecl _wstat32i64(const wchar_t*, struct _stat32i64*); +_ACRTIMP int __cdecl _wstat64(const wchar_t*,struct _stat64*); +_ACRTIMP int __cdecl _wstat64i32(const wchar_t*,struct _stat64i32*); #ifdef __cplusplus } diff --git a/include/msvcrt/sys/timeb.h b/include/msvcrt/sys/timeb.h index 26ece4fea7e..e948daab012 100644 --- a/include/msvcrt/sys/timeb.h +++ b/include/msvcrt/sys/timeb.h @@ -54,8 +54,8 @@ struct __timeb64 extern "C" { #endif -void __cdecl _ftime32(struct __timeb32*); -void __cdecl _ftime64(struct __timeb64*); +_ACRTIMP void __cdecl _ftime32(struct __timeb32*); +_ACRTIMP void __cdecl _ftime64(struct __timeb64*); #ifdef __cplusplus } diff --git a/include/msvcrt/sys/utime.h b/include/msvcrt/sys/utime.h index f9fcfb97810..79a9474cae0 100644 --- a/include/msvcrt/sys/utime.h +++ b/include/msvcrt/sys/utime.h @@ -47,12 +47,12 @@ struct __utimbuf64 extern "C" { #endif -int __cdecl _futime32(int,struct __utimbuf32*); -int __cdecl _futime64(int,struct __utimbuf64*); -int __cdecl _utime32(const char*,struct __utimbuf32*); -int __cdecl _utime64(const char*,struct __utimbuf64*); -int __cdecl _wutime32(const wchar_t*,struct __utimbuf32*); -int __cdecl _wutime64(const wchar_t*,struct __utimbuf64*); +_ACRTIMP int __cdecl _futime32(int,struct __utimbuf32*); +_ACRTIMP int __cdecl _futime64(int,struct __utimbuf64*); +_ACRTIMP int __cdecl _utime32(const char*,struct __utimbuf32*); +_ACRTIMP int __cdecl _utime64(const char*,struct __utimbuf64*); +_ACRTIMP int __cdecl _wutime32(const wchar_t*,struct __utimbuf32*); +_ACRTIMP int __cdecl _wutime64(const wchar_t*,struct __utimbuf64*); #ifdef _USE_32BIT_TIME_T static inline int _futime(int fd, struct _utimbuf *buf) { return _futime32(fd, (struct __utimbuf32*)buf); } diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h index 50d59b4a50c..c0db38ff7a3 100644 --- a/include/msvcrt/time.h +++ b/include/msvcrt/time.h @@ -43,10 +43,10 @@ extern "C" { #define _timezone (*__p__timezone()) #define _tzname (__p__tzname()) -int * __cdecl __p__daylight(void); -__msvcrt_long * __cdecl __p__dstbias(void); -__msvcrt_long * __cdecl __p__timezone(void); -char ** __cdecl __p__tzname(void); +_ACRTIMP int * __cdecl __p__daylight(void); +_ACRTIMP __msvcrt_long * __cdecl __p__dstbias(void); +_ACRTIMP __msvcrt_long * __cdecl __p__timezone(void); +_ACRTIMP char ** __cdecl __p__tzname(void); #else extern int _daylight; extern __msvcrt_long _dstbias; @@ -63,31 +63,31 @@ extern char *_tzname; #define _time32 time #endif -unsigned __cdecl _getsystime(struct tm*); -unsigned __cdecl _setsystime(struct tm*,unsigned); -char* __cdecl _strdate(char*); -errno_t __cdecl _strdate_s(char*,size_t); -char* __cdecl _strtime(char*); -errno_t __cdecl _strtime_s(char*,size_t); -void __cdecl _tzset(void); +_ACRTIMP unsigned __cdecl _getsystime(struct tm*); +_ACRTIMP unsigned __cdecl _setsystime(struct tm*,unsigned); +_ACRTIMP char* __cdecl _strdate(char*); +_ACRTIMP errno_t __cdecl _strdate_s(char*,size_t); +_ACRTIMP char* __cdecl _strtime(char*); +_ACRTIMP errno_t __cdecl _strtime_s(char*,size_t); +_ACRTIMP void __cdecl _tzset(void); -char* __cdecl asctime(const struct tm*); -clock_t __cdecl clock(void); -char* __cdecl _ctime32(const __time32_t*); -char* __cdecl _ctime64(const __time64_t*); -double __cdecl _difftime32(__time32_t,__time32_t); -double __cdecl _difftime64(__time64_t,__time64_t); -struct tm* __cdecl _gmtime32(const __time32_t*); -struct tm* __cdecl _gmtime64(const __time64_t*); -struct tm* __cdecl _localtime32(const __time32_t*); -errno_t __cdecl _localtime32_s(struct tm*, const __time32_t*); -struct tm* __cdecl _localtime64(const __time64_t*); -errno_t __cdecl _localtime64_s(struct tm*, const __time64_t*); -__time32_t __cdecl _mktime32(struct tm*); -__time64_t __cdecl _mktime64(struct tm*); -size_t __cdecl strftime(char*,size_t,const char*,const struct tm*); -__time32_t __cdecl _time32(__time32_t*); -__time64_t __cdecl _time64(__time64_t*); +_ACRTIMP char* __cdecl asctime(const struct tm*); +_ACRTIMP clock_t __cdecl clock(void); +_ACRTIMP char* __cdecl _ctime32(const __time32_t*); +_ACRTIMP char* __cdecl _ctime64(const __time64_t*); +_ACRTIMP double __cdecl _difftime32(__time32_t,__time32_t); +_ACRTIMP double __cdecl _difftime64(__time64_t,__time64_t); +_ACRTIMP struct tm* __cdecl _gmtime32(const __time32_t*); +_ACRTIMP struct tm* __cdecl _gmtime64(const __time64_t*); +_ACRTIMP struct tm* __cdecl _localtime32(const __time32_t*); +_ACRTIMP errno_t __cdecl _localtime32_s(struct tm*, const __time32_t*); +_ACRTIMP struct tm* __cdecl _localtime64(const __time64_t*); +_ACRTIMP errno_t __cdecl _localtime64_s(struct tm*, const __time64_t*); +_ACRTIMP __time32_t __cdecl _mktime32(struct tm*); +_ACRTIMP __time64_t __cdecl _mktime64(struct tm*); +_ACRTIMP size_t __cdecl strftime(char*,size_t,const char*,const struct tm*); +_ACRTIMP __time32_t __cdecl _time32(__time32_t*); +_ACRTIMP __time64_t __cdecl _time64(__time64_t*); #ifndef _USE_32BIT_TIME_T static inline char* ctime(const time_t *t) { return _ctime64(t); } diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index fcf198f9b2c..cb82a08692a 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -31,7 +31,7 @@ typedef int mbstate_t; #ifndef _WLOCALE_DEFINED #define _WLOCALE_DEFINED -wchar_t* __cdecl _wsetlocale(int,const wchar_t*); +_ACRTIMP wchar_t* __cdecl _wsetlocale(int,const wchar_t*); #endif /* _WLOCALE_DEFINED */ wchar_t __cdecl btowc(int); @@ -41,7 +41,8 @@ size_t __cdecl mbsrtowcs(wchar_t*,const char**,size_t,mbstate_t*); size_t __cdecl wcrtomb(char*,wchar_t,mbstate_t*); size_t __cdecl wcsrtombs(char*,const wchar_t**,size_t,mbstate_t*); int __cdecl wctob(wint_t); -errno_t __cdecl wmemcpy_s(wchar_t *, size_t, const wchar_t *, size_t); + +_ACRTIMP errno_t __cdecl wmemcpy_s(wchar_t *, size_t, const wchar_t *, size_t); static inline wchar_t *wmemchr(const wchar_t *s, wchar_t c, size_t n) { diff --git a/include/msvcrt/wctype.h b/include/msvcrt/wctype.h index bedea6207d4..2cf4636a88b 100644 --- a/include/msvcrt/wctype.h +++ b/include/msvcrt/wctype.h @@ -49,23 +49,23 @@ extern "C" { #ifndef _WCTYPE_DEFINED #define _WCTYPE_DEFINED -int __cdecl is_wctype(wint_t,wctype_t); -int __cdecl isleadbyte(int); -int __cdecl iswalnum(wint_t); -int __cdecl iswalpha(wint_t); -int __cdecl iswascii(wint_t); -int __cdecl iswcntrl(wint_t); -int __cdecl iswctype(wint_t,wctype_t); -int __cdecl iswdigit(wint_t); -int __cdecl iswgraph(wint_t); -int __cdecl iswlower(wint_t); -int __cdecl iswprint(wint_t); -int __cdecl iswpunct(wint_t); -int __cdecl iswspace(wint_t); -int __cdecl iswupper(wint_t); -int __cdecl iswxdigit(wint_t); -wchar_t __cdecl towlower(wchar_t); -wchar_t __cdecl towupper(wchar_t); +_ACRTIMP int __cdecl is_wctype(wint_t,wctype_t); +_ACRTIMP int __cdecl isleadbyte(int); +_ACRTIMP int __cdecl iswalnum(wint_t); +_ACRTIMP int __cdecl iswalpha(wint_t); +_ACRTIMP int __cdecl iswascii(wint_t); +_ACRTIMP int __cdecl iswcntrl(wint_t); +_ACRTIMP int __cdecl iswctype(wint_t,wctype_t); +_ACRTIMP int __cdecl iswdigit(wint_t); +_ACRTIMP int __cdecl iswgraph(wint_t); +_ACRTIMP int __cdecl iswlower(wint_t); +_ACRTIMP int __cdecl iswprint(wint_t); +_ACRTIMP int __cdecl iswpunct(wint_t); +_ACRTIMP int __cdecl iswspace(wint_t); +_ACRTIMP int __cdecl iswupper(wint_t); +_ACRTIMP int __cdecl iswxdigit(wint_t); +_ACRTIMP wchar_t __cdecl towlower(wchar_t); +_ACRTIMP wchar_t __cdecl towupper(wchar_t); #endif /* _WCTYPE_DEFINED */ typedef wchar_t wctrans_t;