From 495f24ebb82af9864287f9cbc39aa4db108979d2 Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Tue, 1 Dec 2020 13:52:43 +0100 Subject: [PATCH] msvcrt: Remove MSVCRT_ prefix from data.c functions. Signed-off-by: Piotr Caban Signed-off-by: Alexandre Julliard --- dlls/msvcr100/msvcr100.spec | 30 ++++++++++----------- dlls/msvcr110/msvcr110.spec | 30 ++++++++++----------- dlls/msvcr120/msvcr120.spec | 30 ++++++++++----------- dlls/msvcr70/msvcr70.spec | 26 +++++++++---------- dlls/msvcr71/msvcr71.spec | 26 +++++++++---------- dlls/msvcr80/msvcr80.spec | 38 +++++++++++++-------------- dlls/msvcr90/msvcr90.spec | 30 ++++++++++----------- dlls/msvcrt/data.c | 38 +++++++++++++-------------- dlls/msvcrt/file.c | 10 ++++--- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/msvcrt.spec | 38 +++++++++++++-------------- dlls/msvcrt/process.c | 5 ++-- dlls/msvcrtd/msvcrtd.spec | 22 ++++++++-------- dlls/ucrtbase/ucrtbase.spec | 52 ++++++++++++++++++------------------- include/msvcrt/stdlib.h | 3 +++ 15 files changed, 193 insertions(+), 186 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 3acb927e903..c46c4314138 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -569,8 +569,8 @@ @ cdecl ___lc_handle_func() @ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func @ cdecl ___mb_cur_max_l_func(ptr) -@ cdecl ___setlc_active_func() MSVCRT____setlc_active_func -@ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func +@ cdecl ___setlc_active_func() +@ cdecl ___unguarded_readlc_active_add_func() @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv @ extern __badioinfo MSVCRT___badioinfo @@ -624,35 +624,35 @@ @ cdecl -arch=i386 -norelay __libm_sse2_tan() MSVCRT___libm_sse2_tan @ cdecl -arch=i386 -norelay __libm_sse2_tanf() MSVCRT___libm_sse2_tanf @ extern __mb_cur_max MSVCRT___mb_cur_max -@ cdecl __p___argc() MSVCRT___p___argc -@ cdecl __p___argv() MSVCRT___p___argv +@ cdecl __p___argc() +@ cdecl __p___argv() @ cdecl __p___initenv() @ cdecl __p___mb_cur_max() -@ cdecl __p___wargv() MSVCRT___p___wargv +@ cdecl __p___wargv() @ cdecl __p___winitenv() -@ cdecl __p__acmdln() MSVCRT___p__acmdln +@ cdecl __p__acmdln() @ cdecl __p__commode() @ cdecl __p__daylight() MSVCRT___p__daylight @ cdecl __p__dstbias() MSVCRT___p__dstbias -@ cdecl __p__environ() MSVCRT___p__environ -@ cdecl __p__fmode() MSVCRT___p__fmode +@ cdecl __p__environ() +@ cdecl __p__fmode() @ cdecl __p__iob() __iob_func @ stub __p__mbcasemap() @ cdecl __p__mbctype() @ cdecl __p__pctype() -@ cdecl __p__pgmptr() MSVCRT___p__pgmptr +@ cdecl __p__pgmptr() @ stub __p__pwctype() @ cdecl __p__timezone() MSVCRT___p__timezone @ cdecl __p__tzname() -@ cdecl __p__wcmdln() MSVCRT___p__wcmdln -@ cdecl __p__wenviron() MSVCRT___p__wenviron -@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr +@ cdecl __p__wcmdln() +@ cdecl __p__wenviron() +@ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs @ stub __report_gsfailure -@ cdecl __set_app_type(long) MSVCRT___set_app_type +@ cdecl __set_app_type(long) @ stub __set_flsgetvalue @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr @@ -876,7 +876,7 @@ @ cdecl _get_doserrno(ptr) @ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) -@ cdecl _get_fmode(ptr) MSVCRT__get_fmode +@ cdecl _get_fmode(ptr) @ cdecl _get_heap_handle() @ cdecl _get_invalid_parameter_handler() @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @@ -1277,7 +1277,7 @@ @ cdecl _set_doserrno(long) @ cdecl _set_errno(long) @ cdecl _set_error_mode(long) -@ cdecl _set_fmode(long) MSVCRT__set_fmode +@ cdecl _set_fmode(long) @ cdecl _set_invalid_parameter_handler(ptr) @ stub _set_malloc_crt_max_wait @ cdecl _set_output_format(long) MSVCRT__set_output_format diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 56c446e8831..c7cf4aa0c4a 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -896,8 +896,8 @@ @ cdecl ___lc_locale_name_func() @ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func @ cdecl ___mb_cur_max_l_func(ptr) -@ cdecl ___setlc_active_func() MSVCRT____setlc_active_func -@ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func +@ cdecl ___setlc_active_func() +@ cdecl ___unguarded_readlc_active_add_func() @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv @ extern __badioinfo MSVCRT___badioinfo @@ -973,35 +973,35 @@ @ cdecl -arch=i386 -norelay __libm_sse2_tan() MSVCRT___libm_sse2_tan @ cdecl -arch=i386 -norelay __libm_sse2_tanf() MSVCRT___libm_sse2_tanf @ extern __mb_cur_max MSVCRT___mb_cur_max -@ cdecl __p___argc() MSVCRT___p___argc -@ cdecl __p___argv() MSVCRT___p___argv +@ cdecl __p___argc() +@ cdecl __p___argv() @ cdecl __p___initenv() @ cdecl __p___mb_cur_max() -@ cdecl __p___wargv() MSVCRT___p___wargv +@ cdecl __p___wargv() @ cdecl __p___winitenv() -@ cdecl __p__acmdln() MSVCRT___p__acmdln +@ cdecl __p__acmdln() @ cdecl __p__commode() @ cdecl __p__daylight() MSVCRT___p__daylight @ cdecl __p__dstbias() MSVCRT___p__dstbias -@ cdecl __p__environ() MSVCRT___p__environ -@ cdecl __p__fmode() MSVCRT___p__fmode +@ cdecl __p__environ() +@ cdecl __p__fmode() @ cdecl __p__iob() __iob_func @ stub __p__mbcasemap() @ cdecl __p__mbctype() @ cdecl __p__pctype() -@ cdecl __p__pgmptr() MSVCRT___p__pgmptr +@ cdecl __p__pgmptr() @ stub __p__pwctype() @ cdecl __p__timezone() MSVCRT___p__timezone @ cdecl __p__tzname() -@ cdecl __p__wcmdln() MSVCRT___p__wcmdln -@ cdecl __p__wenviron() MSVCRT___p__wenviron -@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr +@ cdecl __p__wcmdln() +@ cdecl __p__wenviron() +@ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs @ stub __report_gsfailure -@ cdecl __set_app_type(long) MSVCRT___set_app_type +@ cdecl __set_app_type(long) @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr @ cdecl __strncnt(str long) MSVCRT___strncnt @@ -1223,7 +1223,7 @@ @ cdecl _get_doserrno(ptr) @ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) -@ cdecl _get_fmode(ptr) MSVCRT__get_fmode +@ cdecl _get_fmode(ptr) @ cdecl _get_heap_handle() @ cdecl _get_invalid_parameter_handler() @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @@ -1634,7 +1634,7 @@ @ cdecl _set_doserrno(long) @ cdecl _set_errno(long) @ cdecl _set_error_mode(long) -@ cdecl _set_fmode(long) MSVCRT__set_fmode +@ cdecl _set_fmode(long) @ cdecl _set_invalid_parameter_handler(ptr) @ stub _set_malloc_crt_max_wait @ cdecl _set_output_format(long) MSVCRT__set_output_format diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 56a46eb0124..37bb3c5e23e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -881,8 +881,8 @@ @ cdecl ___lc_locale_name_func() @ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func @ cdecl ___mb_cur_max_l_func(ptr) -@ cdecl ___setlc_active_func() MSVCRT____setlc_active_func -@ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func +@ cdecl ___setlc_active_func() +@ cdecl ___unguarded_readlc_active_add_func() @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv @ extern __badioinfo MSVCRT___badioinfo @@ -963,35 +963,35 @@ @ cdecl -arch=i386 -norelay __libm_sse2_tan() MSVCRT___libm_sse2_tan @ cdecl -arch=i386 -norelay __libm_sse2_tanf() MSVCRT___libm_sse2_tanf @ extern __mb_cur_max MSVCRT___mb_cur_max -@ cdecl __p___argc() MSVCRT___p___argc -@ cdecl __p___argv() MSVCRT___p___argv +@ cdecl __p___argc() +@ cdecl __p___argv() @ cdecl __p___initenv() @ cdecl __p___mb_cur_max() -@ cdecl __p___wargv() MSVCRT___p___wargv +@ cdecl __p___wargv() @ cdecl __p___winitenv() -@ cdecl __p__acmdln() MSVCRT___p__acmdln +@ cdecl __p__acmdln() @ cdecl __p__commode() @ cdecl __p__daylight() MSVCRT___p__daylight @ cdecl __p__dstbias() MSVCRT___p__dstbias -@ cdecl __p__environ() MSVCRT___p__environ -@ cdecl __p__fmode() MSVCRT___p__fmode +@ cdecl __p__environ() +@ cdecl __p__fmode() @ cdecl __p__iob() __iob_func @ stub __p__mbcasemap() @ cdecl __p__mbctype() @ cdecl __p__pctype() -@ cdecl __p__pgmptr() MSVCRT___p__pgmptr +@ cdecl __p__pgmptr() @ stub __p__pwctype() @ cdecl __p__timezone() MSVCRT___p__timezone @ cdecl __p__tzname() -@ cdecl __p__wcmdln() MSVCRT___p__wcmdln -@ cdecl __p__wenviron() MSVCRT___p__wenviron -@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr +@ cdecl __p__wcmdln() +@ cdecl __p__wenviron() +@ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs @ stub __report_gsfailure -@ cdecl __set_app_type(long) MSVCRT___set_app_type +@ cdecl __set_app_type(long) @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr @ cdecl __strncnt(str long) MSVCRT___strncnt @@ -1223,7 +1223,7 @@ @ cdecl _get_doserrno(ptr) @ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) -@ cdecl _get_fmode(ptr) MSVCRT__get_fmode +@ cdecl _get_fmode(ptr) @ cdecl _get_heap_handle() @ cdecl _get_invalid_parameter_handler() @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @@ -1645,7 +1645,7 @@ @ cdecl _set_doserrno(long) @ cdecl _set_errno(long) @ cdecl _set_error_mode(long) -@ cdecl _set_fmode(long) MSVCRT__set_fmode +@ cdecl _set_fmode(long) @ cdecl _set_invalid_parameter_handler(ptr) @ stub _set_malloc_crt_max_wait @ cdecl _set_output_format(long) MSVCRT__set_output_format diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 0093cb0a43d..bd2e49e7d7e 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -134,8 +134,8 @@ @ cdecl ___lc_collate_cp_func() @ cdecl ___lc_handle_func() @ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func -@ cdecl ___setlc_active_func() MSVCRT____setlc_active_func -@ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func +@ cdecl ___setlc_active_func() +@ cdecl ___unguarded_readlc_active_add_func() @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv @ extern __badioinfo MSVCRT___badioinfo @@ -161,41 +161,41 @@ @ extern __lc_handle MSVCRT___lc_handle @ cdecl __lconv_init() @ extern __mb_cur_max MSVCRT___mb_cur_max -@ cdecl __p___argc() MSVCRT___p___argc -@ cdecl __p___argv() MSVCRT___p___argv +@ cdecl __p___argc() +@ cdecl __p___argv() @ cdecl __p___initenv() @ cdecl __p___mb_cur_max() -@ cdecl __p___wargv() MSVCRT___p___wargv +@ cdecl __p___wargv() @ cdecl __p___winitenv() -@ cdecl __p__acmdln() MSVCRT___p__acmdln +@ cdecl __p__acmdln() @ cdecl __p__amblksiz() @ cdecl __p__commode() @ cdecl __p__daylight() MSVCRT___p__daylight @ cdecl __p__dstbias() MSVCRT___p__dstbias -@ cdecl __p__environ() MSVCRT___p__environ +@ cdecl __p__environ() @ stub __p__fileinfo() -@ cdecl __p__fmode() MSVCRT___p__fmode +@ cdecl __p__fmode() @ cdecl __p__iob() __iob_func @ stub __p__mbcasemap() @ cdecl __p__mbctype() @ cdecl __p__osver() @ cdecl __p__pctype() -@ cdecl __p__pgmptr() MSVCRT___p__pgmptr +@ cdecl __p__pgmptr() @ stub __p__pwctype() @ cdecl __p__timezone() MSVCRT___p__timezone @ cdecl __p__tzname() -@ cdecl __p__wcmdln() MSVCRT___p__wcmdln -@ cdecl __p__wenviron() MSVCRT___p__wenviron +@ cdecl __p__wcmdln() +@ cdecl __p__wenviron() @ cdecl __p__winmajor() @ cdecl __p__winminor() @ cdecl __p__winver() -@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr +@ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs @ cdecl __security_error_handler(long ptr) -@ cdecl __set_app_type(long) MSVCRT___set_app_type +@ cdecl __set_app_type(long) @ stub __set_buffer_overrun_handler @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 15337909632..a122e847374 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -129,8 +129,8 @@ @ cdecl ___lc_collate_cp_func() @ cdecl ___lc_handle_func() @ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func -@ cdecl ___setlc_active_func() MSVCRT____setlc_active_func -@ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func +@ cdecl ___setlc_active_func() +@ cdecl ___unguarded_readlc_active_add_func() @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv @ extern __badioinfo MSVCRT___badioinfo @@ -156,41 +156,41 @@ @ extern __lc_handle MSVCRT___lc_handle @ cdecl __lconv_init() @ extern __mb_cur_max MSVCRT___mb_cur_max -@ cdecl __p___argc() MSVCRT___p___argc -@ cdecl __p___argv() MSVCRT___p___argv +@ cdecl __p___argc() +@ cdecl __p___argv() @ cdecl __p___initenv() @ cdecl __p___mb_cur_max() -@ cdecl __p___wargv() MSVCRT___p___wargv +@ cdecl __p___wargv() @ cdecl __p___winitenv() -@ cdecl __p__acmdln() MSVCRT___p__acmdln +@ cdecl __p__acmdln() @ cdecl __p__amblksiz() @ cdecl __p__commode() @ cdecl __p__daylight() MSVCRT___p__daylight @ cdecl __p__dstbias() MSVCRT___p__dstbias -@ cdecl __p__environ() MSVCRT___p__environ +@ cdecl __p__environ() @ stub __p__fileinfo() -@ cdecl __p__fmode() MSVCRT___p__fmode +@ cdecl __p__fmode() @ cdecl __p__iob() __iob_func @ stub __p__mbcasemap() @ cdecl __p__mbctype() @ cdecl __p__osver() @ cdecl __p__pctype() -@ cdecl __p__pgmptr() MSVCRT___p__pgmptr +@ cdecl __p__pgmptr() @ stub __p__pwctype() @ cdecl __p__timezone() MSVCRT___p__timezone @ cdecl __p__tzname() -@ cdecl __p__wcmdln() MSVCRT___p__wcmdln -@ cdecl __p__wenviron() MSVCRT___p__wenviron +@ cdecl __p__wcmdln() +@ cdecl __p__wenviron() @ cdecl __p__winmajor() @ cdecl __p__winminor() @ cdecl __p__winver() -@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr +@ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs @ cdecl __security_error_handler(long ptr) -@ cdecl __set_app_type(long) MSVCRT___set_app_type +@ cdecl __set_app_type(long) @ stub __set_buffer_overrun_handler @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 2a4e397296e..04938e39b34 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -203,8 +203,8 @@ @ cdecl ___lc_handle_func() @ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func @ cdecl ___mb_cur_max_l_func(ptr) -@ cdecl ___setlc_active_func() MSVCRT____setlc_active_func -@ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func +@ cdecl ___setlc_active_func() +@ cdecl ___unguarded_readlc_active_add_func() @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv @ extern __badioinfo MSVCRT___badioinfo @@ -267,41 +267,41 @@ @ cdecl -arch=i386 -norelay __libm_sse2_tan() MSVCRT___libm_sse2_tan @ cdecl -arch=i386 -norelay __libm_sse2_tanf() MSVCRT___libm_sse2_tanf @ extern __mb_cur_max MSVCRT___mb_cur_max -@ cdecl __p___argc() MSVCRT___p___argc -@ cdecl __p___argv() MSVCRT___p___argv +@ cdecl __p___argc() +@ cdecl __p___argv() @ cdecl __p___initenv() @ cdecl __p___mb_cur_max() -@ cdecl __p___wargv() MSVCRT___p___wargv +@ cdecl __p___wargv() @ cdecl __p___winitenv() -@ cdecl __p__acmdln() MSVCRT___p__acmdln +@ cdecl __p__acmdln() @ cdecl __p__amblksiz() @ cdecl __p__commode() @ cdecl __p__daylight() MSVCRT___p__daylight @ cdecl __p__dstbias() MSVCRT___p__dstbias -@ cdecl __p__environ() MSVCRT___p__environ -@ cdecl __p__fmode() MSVCRT___p__fmode +@ cdecl __p__environ() +@ cdecl __p__fmode() @ cdecl -arch=i386 __p__iob() __iob_func @ stub __p__mbcasemap() @ cdecl __p__mbctype() @ stub __p__osplatform @ cdecl __p__osver() @ cdecl __p__pctype() -@ cdecl __p__pgmptr() MSVCRT___p__pgmptr +@ cdecl __p__pgmptr() @ stub __p__pwctype() @ cdecl __p__timezone() MSVCRT___p__timezone @ cdecl __p__tzname() -@ cdecl __p__wcmdln() MSVCRT___p__wcmdln -@ cdecl __p__wenviron() MSVCRT___p__wenviron +@ cdecl __p__wcmdln() +@ cdecl __p__wenviron() @ cdecl __p__winmajor() @ cdecl __p__winminor() @ cdecl __p__winver() -@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr +@ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs @ stub __report_gsfailure -@ cdecl __set_app_type(long) MSVCRT___set_app_type +@ cdecl __set_app_type(long) @ stub __set_flsgetvalue @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr @@ -543,12 +543,12 @@ @ cdecl _get_doserrno(ptr) @ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) -@ cdecl _get_fmode(ptr) MSVCRT__get_fmode +@ cdecl _get_fmode(ptr) @ cdecl _get_heap_handle() @ cdecl _get_invalid_parameter_handler() @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle -@ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform -@ cdecl _get_osver(ptr) MSVCRT__get_osver +@ cdecl _get_osplatform(ptr) +@ cdecl _get_osver(ptr) @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output @@ -558,8 +558,8 @@ @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() -@ cdecl _get_winmajor(ptr) MSVCRT__get_winmajor -@ cdecl _get_winminor(ptr) MSVCRT__get_winminor +@ cdecl _get_winmajor(ptr) +@ cdecl _get_winminor(ptr) @ stub _get_winver @ cdecl _get_wpgmptr(ptr) @ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @@ -956,7 +956,7 @@ @ cdecl _set_doserrno(long) @ cdecl _set_errno(long) @ cdecl _set_error_mode(long) -@ cdecl _set_fmode(long) MSVCRT__set_fmode +@ cdecl _set_fmode(long) @ cdecl _set_invalid_parameter_handler(ptr) @ stub _set_malloc_crt_max_wait @ cdecl _set_output_format(long) MSVCRT__set_output_format diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 51c681eff52..bc57fc78f77 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -194,8 +194,8 @@ @ cdecl ___lc_handle_func() @ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func @ cdecl ___mb_cur_max_l_func(ptr) -@ cdecl ___setlc_active_func() MSVCRT____setlc_active_func -@ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func +@ cdecl ___setlc_active_func() +@ cdecl ___unguarded_readlc_active_add_func() @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv @ extern __badioinfo MSVCRT___badioinfo @@ -256,36 +256,36 @@ @ cdecl -arch=i386 -norelay __libm_sse2_tan() MSVCRT___libm_sse2_tan @ cdecl -arch=i386 -norelay __libm_sse2_tanf() MSVCRT___libm_sse2_tanf @ extern __mb_cur_max MSVCRT___mb_cur_max -@ cdecl __p___argc() MSVCRT___p___argc -@ cdecl __p___argv() MSVCRT___p___argv +@ cdecl __p___argc() +@ cdecl __p___argv() @ cdecl __p___initenv() @ cdecl __p___mb_cur_max() -@ cdecl __p___wargv() MSVCRT___p___wargv +@ cdecl __p___wargv() @ cdecl __p___winitenv() -@ cdecl __p__acmdln() MSVCRT___p__acmdln +@ cdecl __p__acmdln() @ cdecl __p__amblksiz() @ cdecl __p__commode() @ cdecl __p__daylight() MSVCRT___p__daylight @ cdecl __p__dstbias() MSVCRT___p__dstbias -@ cdecl __p__environ() MSVCRT___p__environ -@ cdecl __p__fmode() MSVCRT___p__fmode +@ cdecl __p__environ() +@ cdecl __p__fmode() @ cdecl __p__iob() __iob_func @ stub __p__mbcasemap() @ cdecl __p__mbctype() @ cdecl __p__pctype() -@ cdecl __p__pgmptr() MSVCRT___p__pgmptr +@ cdecl __p__pgmptr() @ stub __p__pwctype() @ cdecl __p__timezone() MSVCRT___p__timezone @ cdecl __p__tzname() -@ cdecl __p__wcmdln() MSVCRT___p__wcmdln -@ cdecl __p__wenviron() MSVCRT___p__wenviron -@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr +@ cdecl __p__wcmdln() +@ cdecl __p__wenviron() +@ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs @ stub __report_gsfailure -@ cdecl __set_app_type(long) MSVCRT___set_app_type +@ cdecl __set_app_type(long) @ stub __set_flsgetvalue @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr @@ -526,7 +526,7 @@ @ cdecl _get_doserrno(ptr) @ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) -@ cdecl _get_fmode(ptr) MSVCRT__get_fmode +@ cdecl _get_fmode(ptr) @ cdecl _get_heap_handle() @ cdecl _get_invalid_parameter_handler() @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @@ -932,7 +932,7 @@ @ cdecl _set_doserrno(long) @ cdecl _set_errno(long) @ cdecl _set_error_mode(long) -@ cdecl _set_fmode(long) MSVCRT__set_fmode +@ cdecl _set_fmode(long) @ cdecl _set_invalid_parameter_handler(ptr) @ stub _set_malloc_crt_max_wait @ cdecl _set_output_format(long) MSVCRT__set_output_format diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index aba38ed8f21..dcaf0370559 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -226,7 +226,7 @@ typedef int (CDECL *_INITTERM_E_FN)(void); /*********************************************************************** * __p___argc (MSVCRT.@) */ -int* CDECL MSVCRT___p___argc(void) { return &MSVCRT___argc; } +int* CDECL __p___argc(void) { return &MSVCRT___argc; } /*********************************************************************** * __p__commode (MSVCRT.@) @@ -237,12 +237,12 @@ unsigned int* CDECL __p__commode(void) { return &MSVCRT__commode; } /*********************************************************************** * __p__pgmptr (MSVCRT.@) */ -char** CDECL MSVCRT___p__pgmptr(void) { return &MSVCRT__pgmptr; } +char** CDECL __p__pgmptr(void) { return &MSVCRT__pgmptr; } /*********************************************************************** * __p__wpgmptr (MSVCRT.@) */ -WCHAR** CDECL MSVCRT___p__wpgmptr(void) { return &MSVCRT__wpgmptr; } +WCHAR** CDECL __p__wpgmptr(void) { return &MSVCRT__wpgmptr; } /*********************************************************************** * _get_pgmptr (MSVCRT.@) @@ -268,12 +268,12 @@ int CDECL _get_wpgmptr(WCHAR** p) /*********************************************************************** * __p__fmode (MSVCRT.@) */ -int* CDECL MSVCRT___p__fmode(void) { return &MSVCRT__fmode; } +int* CDECL __p__fmode(void) { return &MSVCRT__fmode; } /*********************************************************************** * _set_fmode (MSVCRT.@) */ -int CDECL MSVCRT__set_fmode(int mode) +int CDECL _set_fmode(int mode) { /* TODO: support _O_WTEXT */ if(!MSVCRT_CHECK_PMT(mode==MSVCRT__O_TEXT || mode==MSVCRT__O_BINARY)) @@ -286,7 +286,7 @@ int CDECL MSVCRT__set_fmode(int mode) /*********************************************************************** * _get_fmode (MSVCRT.@) */ -int CDECL MSVCRT__get_fmode(int *mode) +int CDECL _get_fmode(int *mode) { if(!MSVCRT_CHECK_PMT(mode)) return EINVAL; @@ -318,27 +318,27 @@ unsigned int* CDECL __p__winver(void) { return &MSVCRT__winver; } /********************************************************************* * __p__acmdln (MSVCRT.@) */ -char** CDECL MSVCRT___p__acmdln(void) { return &MSVCRT__acmdln; } +char** CDECL __p__acmdln(void) { return &MSVCRT__acmdln; } /********************************************************************* * __p__wcmdln (MSVCRT.@) */ -wchar_t** CDECL MSVCRT___p__wcmdln(void) { return &MSVCRT__wcmdln; } +wchar_t** CDECL __p__wcmdln(void) { return &MSVCRT__wcmdln; } /********************************************************************* * __p___argv (MSVCRT.@) */ -char*** CDECL MSVCRT___p___argv(void) { return &MSVCRT___argv; } +char*** CDECL __p___argv(void) { return &MSVCRT___argv; } /********************************************************************* * __p___wargv (MSVCRT.@) */ -wchar_t*** CDECL MSVCRT___p___wargv(void) { return &MSVCRT___wargv; } +wchar_t*** CDECL __p___wargv(void) { return &MSVCRT___wargv; } /********************************************************************* * __p__environ (MSVCRT.@) */ -char*** CDECL MSVCRT___p__environ(void) +char*** CDECL __p__environ(void) { return &MSVCRT__environ; } @@ -346,7 +346,7 @@ char*** CDECL MSVCRT___p__environ(void) /********************************************************************* * __p__wenviron (MSVCRT.@) */ -wchar_t*** CDECL MSVCRT___p__wenviron(void) +wchar_t*** CDECL __p__wenviron(void) { return &MSVCRT__wenviron; } @@ -364,7 +364,7 @@ wchar_t*** CDECL __p___winitenv(void) { return &MSVCRT___winitenv; } /********************************************************************* * _get_osplatform (MSVCRT.@) */ -int CDECL MSVCRT__get_osplatform(int *pValue) +int CDECL _get_osplatform(int *pValue) { if (!MSVCRT_CHECK_PMT(pValue != NULL)) return EINVAL; *pValue = MSVCRT__osplatform; @@ -385,7 +385,7 @@ wchar_t *msvcrt_wstrdupa(const char *str) /********************************************************************* * ___unguarded_readlc_active_add_func (MSVCRT.@) */ -unsigned int * CDECL MSVCRT____unguarded_readlc_active_add_func(void) +unsigned int * CDECL ___unguarded_readlc_active_add_func(void) { return &MSVCRT___unguarded_readlc_active; } @@ -393,7 +393,7 @@ unsigned int * CDECL MSVCRT____unguarded_readlc_active_add_func(void) /********************************************************************* * ___setlc_active_func (MSVCRT.@) */ -unsigned int CDECL MSVCRT____setlc_active_func(void) +unsigned int CDECL ___setlc_active_func(void) { return MSVCRT___setlc_active; } @@ -666,7 +666,7 @@ int CDECL _initterm_e(_INITTERM_E_FN *table, _INITTERM_E_FN *end) /********************************************************************* * __set_app_type (MSVCRT.@) */ -void CDECL MSVCRT___set_app_type(int app_type) +void CDECL __set_app_type(int app_type) { TRACE("(%d) %s application\n", app_type, app_type == 2 ? "Gui" : "Console"); MSVCRT_app_type = app_type; @@ -785,7 +785,7 @@ wchar_t* CDECL _get_wide_winmain_command_line(void) /********************************************************************* * _get_winmajor (MSVCRT.@) */ -int CDECL MSVCRT__get_winmajor(int* value) +int CDECL _get_winmajor(int* value) { if (!MSVCRT_CHECK_PMT(value != NULL)) return EINVAL; *value = MSVCRT__winmajor; @@ -795,7 +795,7 @@ int CDECL MSVCRT__get_winmajor(int* value) /********************************************************************* * _get_winminor (MSVCRT.@) */ -int CDECL MSVCRT__get_winminor(int* value) +int CDECL _get_winminor(int* value) { if (!MSVCRT_CHECK_PMT(value != NULL)) return EINVAL; *value = MSVCRT__winminor; @@ -805,7 +805,7 @@ int CDECL MSVCRT__get_winminor(int* value) /********************************************************************* * _get_osver (MSVCRT.@) */ -int CDECL MSVCRT__get_osver(int* value) +int CDECL _get_osver(int* value) { if (!MSVCRT_CHECK_PMT(value != NULL)) return EINVAL; *value = MSVCRT__osver; diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 6ebe1fede83..8da78a94988 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2070,7 +2070,7 @@ wchar_t * CDECL MSVCRT__wmktemp(wchar_t *pattern) static unsigned split_oflags(unsigned oflags) { - int wxflags = 0; + int wxflags = 0; unsigned unsupp; /* until we support everything */ if (oflags & MSVCRT__O_APPEND) wxflags |= WX_APPEND; @@ -2079,8 +2079,12 @@ static unsigned split_oflags(unsigned oflags) else if (oflags & MSVCRT__O_WTEXT) wxflags |= WX_TEXT; else if (oflags & MSVCRT__O_U16TEXT) wxflags |= WX_TEXT; else if (oflags & MSVCRT__O_U8TEXT) wxflags |= WX_TEXT; - else if (*MSVCRT___p__fmode() & MSVCRT__O_BINARY) {/* Nothing to do */} - else wxflags |= WX_TEXT; /* default to TEXT*/ + else + { + int fmode; + _get_fmode(&fmode); + if (!(fmode & MSVCRT__O_BINARY)) wxflags |= WX_TEXT; /* default to TEXT*/ + } if (oflags & MSVCRT__O_NOINHERIT) wxflags |= WX_DONTINHERIT; if ((unsupp = oflags & ~( diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 4648f96d024..91d5b879a6f 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -728,7 +728,6 @@ int WINAPIV _cwprintf(const wchar_t*,...); int WINAPIV MSVCRT_sscanf(const char *, const char *, ...); char*** __cdecl MSVCRT___p__environ(void); int* __cdecl __p___mb_cur_max(void); -int* __cdecl MSVCRT___p__fmode(void); wchar_t* __cdecl MSVCRT__wcsdup(const wchar_t*); size_t __cdecl MSVCRT_strnlen(const char *,size_t); size_t __cdecl MSVCRT_wcsnlen(const wchar_t*,size_t); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 278c749ecbe..f736a72e13d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -195,8 +195,8 @@ @ cdecl ___lc_collate_cp_func() @ cdecl ___lc_handle_func() @ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func -@ cdecl ___setlc_active_func() MSVCRT____setlc_active_func -@ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func +@ cdecl ___setlc_active_func() +@ cdecl ___unguarded_readlc_active_add_func() @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv @ extern __badioinfo MSVCRT___badioinfo @@ -245,40 +245,40 @@ @ cdecl -arch=i386 -norelay __libm_sse2_tan() MSVCRT___libm_sse2_tan @ cdecl -arch=i386 -norelay __libm_sse2_tanf() MSVCRT___libm_sse2_tanf @ extern __mb_cur_max MSVCRT___mb_cur_max -@ cdecl -arch=i386 __p___argc() MSVCRT___p___argc -@ cdecl -arch=i386 __p___argv() MSVCRT___p___argv +@ cdecl -arch=i386 __p___argc() +@ cdecl -arch=i386 __p___argv() @ cdecl -arch=i386 __p___initenv() @ cdecl -arch=i386 __p___mb_cur_max() -@ cdecl -arch=i386 __p___wargv() MSVCRT___p___wargv +@ cdecl -arch=i386 __p___wargv() @ cdecl -arch=i386 __p___winitenv() -@ cdecl -arch=i386 __p__acmdln() MSVCRT___p__acmdln +@ cdecl -arch=i386 __p__acmdln() @ cdecl -arch=i386 __p__amblksiz() @ cdecl -arch=i386 __p__commode() @ cdecl -arch=i386 __p__daylight() MSVCRT___p__daylight @ cdecl -arch=i386 __p__dstbias() MSVCRT___p__dstbias -@ cdecl -arch=i386 __p__environ() MSVCRT___p__environ +@ cdecl -arch=i386 __p__environ() @ stub -arch=i386 __p__fileinfo() -@ cdecl -arch=i386 __p__fmode() MSVCRT___p__fmode +@ cdecl -arch=i386 __p__fmode() @ cdecl -arch=i386 __p__iob() __iob_func @ stub -arch=i386 __p__mbcasemap() @ cdecl -arch=i386 __p__mbctype() @ cdecl -arch=i386 __p__osver() @ cdecl -arch=i386 __p__pctype() -@ cdecl -arch=i386 __p__pgmptr() MSVCRT___p__pgmptr +@ cdecl -arch=i386 __p__pgmptr() @ stub -arch=i386 __p__pwctype() @ cdecl -arch=i386 __p__timezone() MSVCRT___p__timezone @ cdecl -arch=i386 __p__tzname() -@ cdecl -arch=i386 __p__wcmdln() MSVCRT___p__wcmdln -@ cdecl -arch=i386 __p__wenviron() MSVCRT___p__wenviron +@ cdecl -arch=i386 __p__wcmdln() +@ cdecl -arch=i386 __p__wenviron() @ cdecl -arch=i386 __p__winmajor() @ cdecl -arch=i386 __p__winminor() @ cdecl -arch=i386 __p__winver() -@ cdecl -arch=i386 __p__wpgmptr() MSVCRT___p__wpgmptr +@ cdecl -arch=i386 __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo # stub __pwctype_func() @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs -@ cdecl __set_app_type(long) MSVCRT___set_app_type +@ cdecl __set_app_type(long) @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr @ cdecl __strncnt(str long) MSVCRT___strncnt @@ -505,17 +505,17 @@ @ cdecl _get_environ(ptr) MSVCRT__get_environ @ cdecl _get_errno(ptr) # stub _get_fileinfo(ptr) -@ cdecl _get_fmode(ptr) MSVCRT__get_fmode +@ cdecl _get_fmode(ptr) @ cdecl _get_heap_handle() @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle -@ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform -@ cdecl _get_osver(ptr) MSVCRT__get_osver +@ cdecl _get_osplatform(ptr) +@ cdecl _get_osver(ptr) @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_sbh_threshold() @ cdecl _get_wenviron(ptr) MSVCRT__get_wenviron -@ cdecl _get_winmajor(ptr) MSVCRT__get_winmajor -@ cdecl _get_winminor(ptr) MSVCRT__get_winminor +@ cdecl _get_winmajor(ptr) +@ cdecl _get_winminor(ptr) # stub _get_winver(ptr) @ cdecl _get_wpgmptr(ptr) @ cdecl _get_terminate() @@ -897,7 +897,7 @@ @ cdecl _set_errno(long) @ cdecl _set_error_mode(long) # stub _set_fileinfo(long) -@ cdecl _set_fmode(long) MSVCRT__set_fmode +@ cdecl _set_fmode(long) @ cdecl _set_output_format(long) MSVCRT__set_output_format @ cdecl _set_sbh_threshold(long) @ cdecl _seterrormode(long) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index b5c3bb58f15..3b20ca6be21 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -1039,7 +1039,7 @@ FILE* CDECL MSVCRT__wpopen(const wchar_t* command, const wchar_t* mode) { FILE *ret; BOOL readPipe = TRUE; - int textmode, fds[2], fdToDup, fdToOpen, fdStdHandle = -1; + int textmode, fds[2], fdToDup, fdToOpen, fdStdHandle = -1, fmode; const wchar_t *p; wchar_t *comspec, *fullcmd; unsigned int len; @@ -1051,7 +1051,8 @@ FILE* CDECL MSVCRT__wpopen(const wchar_t* command, const wchar_t* mode) if (!command || !mode) return NULL; - textmode = *MSVCRT___p__fmode() & (MSVCRT__O_BINARY | MSVCRT__O_TEXT); + _get_fmode(&fmode); + textmode = fmode & (MSVCRT__O_BINARY | MSVCRT__O_TEXT); for (p = mode; *p; p++) { switch (*p) diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 1fed2fc07ef..76c16cedcbd 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -150,13 +150,13 @@ @ extern __lc_handle MSVCRT___lc_handle @ cdecl __lconv_init() @ extern __mb_cur_max MSVCRT___mb_cur_max -@ cdecl __p___argc() MSVCRT___p___argc -@ cdecl __p___argv() MSVCRT___p___argv +@ cdecl __p___argc() +@ cdecl __p___argv() @ cdecl __p___initenv() @ cdecl __p___mb_cur_max() -@ cdecl __p___wargv() MSVCRT___p___wargv +@ cdecl __p___wargv() @ cdecl __p___winitenv() -@ cdecl __p__acmdln() MSVCRT___p__acmdln +@ cdecl __p__acmdln() @ cdecl __p__amblksiz() @ cdecl __p__commode() @ cdecl __p__crtAssertBusy() @@ -164,28 +164,28 @@ @ cdecl __p__crtDbgFlag() @ cdecl __p__daylight() MSVCRT___p__daylight @ cdecl __p__dstbias() MSVCRT___p__dstbias -@ cdecl __p__environ() MSVCRT___p__environ +@ cdecl __p__environ() @ stub __p__fileinfo() -@ cdecl __p__fmode() MSVCRT___p__fmode +@ cdecl __p__fmode() @ cdecl __p__iob() __iob_func @ stub __p__mbcasemap() @ cdecl __p__mbctype() @ cdecl __p__osver() @ cdecl __p__pctype() -@ cdecl __p__pgmptr() MSVCRT___p__pgmptr +@ cdecl __p__pgmptr() @ stub __p__pwctype() @ cdecl __p__timezone() MSVCRT___p__timezone @ cdecl __p__tzname() -@ cdecl __p__wcmdln() MSVCRT___p__wcmdln -@ cdecl __p__wenviron() MSVCRT___p__wenviron +@ cdecl __p__wcmdln() +@ cdecl __p__wenviron() @ cdecl __p__winmajor() @ cdecl __p__winminor() @ cdecl __p__winver() -@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr +@ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs -@ cdecl __set_app_type(long) MSVCRT___set_app_type +@ cdecl __set_app_type(long) @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr @ cdecl __threadhandle() kernel32.GetCurrentThread diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 424abccdcda..fca2536a5ff 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -121,19 +121,19 @@ @ cdecl -arch=i386 -norelay __libm_sse2_sinf() MSVCRT___libm_sse2_sinf @ cdecl -arch=i386 -norelay __libm_sse2_tan() MSVCRT___libm_sse2_tan @ cdecl -arch=i386 -norelay __libm_sse2_tanf() MSVCRT___libm_sse2_tanf -@ cdecl __p___argc() MSVCRT___p___argc -@ cdecl __p___argv() MSVCRT___p___argv -@ cdecl __p___wargv() MSVCRT___p___wargv -@ cdecl __p__acmdln() MSVCRT___p__acmdln +@ cdecl __p___argc() +@ cdecl __p___argv() +@ cdecl __p___wargv() +@ cdecl __p__acmdln() @ cdecl __p__commode() -@ cdecl __p__environ() MSVCRT___p__environ -@ cdecl __p__fmode() MSVCRT___p__fmode +@ cdecl __p__environ() +@ cdecl __p__fmode() @ stub __p__mbcasemap() @ cdecl __p__mbctype() -@ cdecl __p__pgmptr() MSVCRT___p__pgmptr -@ cdecl __p__wcmdln() MSVCRT___p__wcmdln -@ cdecl __p__wenviron() MSVCRT___p__wenviron -@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr +@ cdecl __p__pgmptr() +@ cdecl __p__wcmdln() +@ cdecl __p__wenviron() +@ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ cdecl __processing_throw() @ stub __pwctype_func @@ -363,7 +363,7 @@ @ cdecl _get_doserrno(ptr) @ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) -@ cdecl _get_fmode(ptr) MSVCRT__get_fmode +@ cdecl _get_fmode(ptr) @ cdecl _get_heap_handle() @ cdecl _get_initial_narrow_environment() @ cdecl _get_initial_wide_environment() @@ -791,19 +791,19 @@ @ cdecl -arch=i386 -norelay _o___libm_sse2_sinf() MSVCRT___libm_sse2_sinf @ cdecl -arch=i386 -norelay _o___libm_sse2_tan() MSVCRT___libm_sse2_tan @ cdecl -arch=i386 -norelay _o___libm_sse2_tanf() MSVCRT___libm_sse2_tanf -@ cdecl _o___p___argc() MSVCRT___p___argc -@ cdecl _o___p___argv() MSVCRT___p___argv -@ cdecl _o___p___wargv() MSVCRT___p___wargv -@ cdecl _o___p__acmdln() MSVCRT___p__acmdln +@ cdecl _o___p___argc() __p___argc +@ cdecl _o___p___argv() __p___argv +@ cdecl _o___p___wargv() __p___wargv +@ cdecl _o___p__acmdln() __p__acmdln @ cdecl _o___p__commode() __p__commode -@ cdecl _o___p__environ() MSVCRT___p__environ -@ cdecl _o___p__fmode() MSVCRT___p__fmode +@ cdecl _o___p__environ() __p__environ +@ cdecl _o___p__fmode() __p__fmode @ stub _o___p__mbcasemap @ cdecl _o___p__mbctype() __p__mbctype -@ cdecl _o___p__pgmptr() MSVCRT___p__pgmptr -@ cdecl _o___p__wcmdln() MSVCRT___p__wcmdln -@ cdecl _o___p__wenviron() MSVCRT___p__wenviron -@ cdecl _o___p__wpgmptr() MSVCRT___p__wpgmptr +@ cdecl _o___p__pgmptr() __p__pgmptr +@ cdecl _o___p__wcmdln() __p__wcmdln +@ cdecl _o___p__wenviron() __p__wenviron +@ cdecl _o___p__wpgmptr() __p__wpgmptr @ cdecl _o___pctype_func() __pctype_func @ stub _o___pwctype_func @ cdecl _o___std_exception_copy(ptr ptr) MSVCRT___std_exception_copy @@ -980,7 +980,7 @@ @ cdecl _o__get_doserrno(ptr) _get_doserrno @ cdecl _o__get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _o__get_errno(ptr) _get_errno -@ cdecl _o__get_fmode(ptr) MSVCRT__get_fmode +@ cdecl _o__get_fmode(ptr) _get_fmode @ cdecl _o__get_heap_handle() _get_heap_handle @ cdecl _o__get_initial_narrow_environment() _get_initial_narrow_environment @ cdecl _o__get_initial_wide_environment() _get_initial_wide_environment @@ -1327,10 +1327,10 @@ @ cdecl _o__seh_filter_dll(long ptr) __CppXcptFilter @ cdecl _o__seh_filter_exe(long ptr) _XcptFilter @ cdecl _o__set_abort_behavior(long long) MSVCRT__set_abort_behavior -@ cdecl _o__set_app_type(long) MSVCRT___set_app_type +@ cdecl _o__set_app_type(long) __set_app_type @ cdecl _o__set_doserrno(long) _set_doserrno @ cdecl _o__set_errno(long) _set_errno -@ cdecl _o__set_fmode(long) MSVCRT__set_fmode +@ cdecl _o__set_fmode(long) _set_fmode @ cdecl _o__set_invalid_parameter_handler(ptr) _set_invalid_parameter_handler @ cdecl _o__set_new_handler(ptr) set_new_handler @ cdecl _o__set_new_mode(long) _set_new_mode @@ -1881,12 +1881,12 @@ @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ cdecl -arch=i386 _set_SSE2_enable(long) MSVCRT__set_SSE2_enable @ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior -@ cdecl _set_app_type(long) MSVCRT___set_app_type +@ cdecl _set_app_type(long) __set_app_type @ cdecl _set_controlfp(long long) @ cdecl _set_doserrno(long) @ cdecl _set_errno(long) @ cdecl _set_error_mode(long) -@ cdecl _set_fmode(long) MSVCRT__set_fmode +@ cdecl _set_fmode(long) @ cdecl _set_invalid_parameter_handler(ptr) @ cdecl _set_new_handler(ptr) set_new_handler @ cdecl _set_new_mode(long) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index fb5c5e23e82..cdfe3e4b742 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -136,6 +136,9 @@ _ACRTIMP errno_t __cdecl _get_errno(int*); _ACRTIMP errno_t __cdecl _set_doserrno(int); _ACRTIMP errno_t __cdecl _set_errno(int); +_ACRTIMP errno_t __cdecl _set_fmode(int); +_ACRTIMP errno_t __cdecl _get_fmode(int*); + #ifndef _CRT_ONEXIT_T_DEFINED #define _CRT_ONEXIT_T_DEFINED typedef int (__cdecl *_onexit_t)(void);