November 2020 - Wine-commits

Henri Verbeet : wined3d: Use command buffer IDs for synchronisation in wined3d_buffer_gl_sync_apple().
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: a7c320d184fb9d48239caf0f5529b6992477b82b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7c320d184fb9d48239caf0f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 30 18:29:25 2020 +0330 wined3d: Use command buffer IDs for synchronisation in wined3d_buffer_gl_sync_apple(). Analogous to the Vulkan adapter. This is slightly awkward in OpenGL because it doesn't have explicit command buffers like Vulkan, but calling wined3d_context_gl_submit_command_fence() on swapchain present works well enough in practice. The main advantage of this approach is that it avoids using a separate fence for each usage of each bo. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 + dlls/wined3d/buffer.c | 61 +++---------------- dlls/wined3d/context.c | 4 -- dlls/wined3d/context_gl.c | 130 +++++++++++++++++++++++++++++++++-------- dlls/wined3d/query.c | 2 +- dlls/wined3d/swapchain.c | 1 + dlls/wined3d/wined3d_private.h | 34 +++++++++-- 7 files changed, 146 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7c320d184fb9d48239c…

1 0

Piotr Caban : msvcrt: Use WEOF from public header.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 7acfe8fb73d88c354dcec0f56c3cdc6acacbdc04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7acfe8fb73d88c354dcec0f5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:05 2020 +0100 msvcrt: Use WEOF from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/console.c | 18 ++++++++---------- dlls/msvcrt/file.c | 42 +++++++++++++++++++++--------------------- dlls/msvcrt/mbcs.c | 4 ++-- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/scanf.h | 8 ++++---- dlls/msvcrt/string.c | 22 +++++++++++----------- dlls/msvcrt/wcs.c | 4 ++-- 7 files changed, 48 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7acfe8fb73d88c354dce…

1 0

Piotr Caban : msvcrt: Use EOF from public header.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 8180f4001a6d5a0befe6dfb4c0c3118853b7a413 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8180f4001a6d5a0befe6dfb4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:09 2020 +0100 msvcrt: Use EOF from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/console.c | 18 ++++++------- dlls/msvcrt/file.c | 74 +++++++++++++++++++++++++-------------------------- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/scanf.h | 4 +-- dlls/msvcrt/wcs.c | 4 +-- 6 files changed, 51 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8180f4001a6d5a0befe6…

1 0

Piotr Caban : msvcrt: Use struct tm from public header.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 6c4b7758c691fad6fd5b5f629a8a01b6bc2f961a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c4b7758c691fad6fd5b5f62… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:12 2020 +0100 msvcrt: Use struct tm from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 4 +-- dlls/msvcrt/time.c | 90 ++++++++++++++++++++++++++-------------------------- 2 files changed, 46 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6c4b7758c691fad6fd5b…

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from cpp.c functions.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 772f0331aa1c4e24f97ca5c5ae27a65805cea8d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=772f0331aa1c4e24f97ca5c5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:22 2020 +0100 msvcrt: Remove MSVCRT_ prefix from cpp.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 148 ++++++------- dlls/msvcr110/msvcr110.spec | 192 ++++++++--------- dlls/msvcr120/msvcr120.spec | 192 ++++++++--------- dlls/msvcr70/msvcr70.spec | 154 ++++++------- dlls/msvcr71/msvcr71.spec | 138 ++++++------ dlls/msvcr80/msvcr80.spec | 144 ++++++------- dlls/msvcr90/msvcr90.spec | 144 ++++++------- dlls/msvcrt/cpp.c | 510 ++++++++++++++++++++++---------------------- dlls/msvcrt/cppexcept.h | 8 +- dlls/msvcrt/cxx.h | 14 +- dlls/msvcrt/except_i386.c | 6 +- dlls/msvcrt/except_x86_64.c | 6 +- dlls/msvcrt/msvcrt.h | 17 +- dlls/msvcrt/msvcrt.spec | 216 +++++++++---------- dlls/msvcrt/scheduler.c | 22 +- dlls/msvcrtd/msvcrtd.spec | 138 ++++++------ dlls/ucrtbase/ucrtbase.spec | 36 ++-- 17 files changed, 1042 insertions(+), 1043 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=772f0331aa1c4e24f97c…

1 0

Piotr Caban : msvcrt: Use _beginthread_start_routine_t from public header.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: fbc9110d232fd5e86113fc73153b754278e0f5e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbc9110d232fd5e86113fc73… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:24 2020 +0100 msvcrt: Use _beginthread_start_routine_t from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/console.c | 4 ++-- dlls/msvcrt/msvcrt.h | 2 -- dlls/msvcrt/thread.c | 7 ++++--- dlls/ucrtbase/ucrtbase.spec | 8 ++++---- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index cc390feb603..7074accbfa7 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -564,7 +564,7 @@ int WINAPIV _cwprintf(const wchar_t* format, ...) /********************************************************************* * __conio_common_vcprintf (UCRTBASE.@) */ -int CDECL MSVCRT__conio_common_vcprintf(unsigned __int64 options, const char* format, +int CDECL __conio_common_vcprintf(unsigned __int64 options, const char* format, _locale_t locale, __ms_va_list valist) { if (options & ~UCRTBASE_PRINTF_MASK) @@ -576,7 +576,7 @@ int CDECL MSVCRT__conio_common_vcprintf(unsigned __int64 options, const char* fo /********************************************************************* * __conio_common_vcwprintf (UCRTBASE.@) */ -int CDECL MSVCRT__conio_common_vcwprintf(unsigned __int64 options, const wchar_t* format, +int CDECL __conio_common_vcwprintf(unsigned __int64 options, const wchar_t* format, _locale_t locale, __ms_va_list valist) { if (options & ~UCRTBASE_PRINTF_MASK) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 907d9ba2c99..5f21950f4d4 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -35,8 +35,6 @@ typedef void (__cdecl *unexpected_function)(void); typedef void (__cdecl *_se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); void __cdecl terminate(void); -typedef void (__cdecl *MSVCRT__beginthread_start_routine_t)(void *); -typedef unsigned int (__stdcall *MSVCRT__beginthreadex_start_routine_t)(void *); typedef int (__cdecl *MSVCRT__onexit_t)(void); typedef void (__cdecl *MSVCRT_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, uintptr_t); typedef void (__cdecl *MSVCRT_purecall_handler)(void); diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index bbf1eb5177f..548f4a6ef66 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <process.h> #include "msvcrt.h" #include "wine/debug.h" @@ -26,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); typedef struct { HANDLE thread; - MSVCRT__beginthread_start_routine_t start_address; + _beginthread_start_routine_t start_address; void *arglist; } _beginthread_trampoline_t; @@ -109,7 +110,7 @@ static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) * _beginthread (MSVCRT.@) */ uintptr_t CDECL _beginthread( - MSVCRT__beginthread_start_routine_t start_address, /* [in] Start address of routine that begins execution of new thread */ + _beginthread_start_routine_t start_address, /* [in] Start address of routine that begins execution of new thread */ unsigned int stack_size, /* [in] Stack size for new thread or 0 */ void *arglist) /* [in] Argument list to be passed to new thread or NULL */ { @@ -151,7 +152,7 @@ uintptr_t CDECL _beginthread( uintptr_t CDECL _beginthreadex( void *security, /* [in] Security descriptor for new thread; must be NULL for Windows 9x applications */ unsigned int stack_size, /* [in] Stack size for new thread or 0 */ - MSVCRT__beginthreadex_start_routine_t start_address, /* [in] Start address of routine that begins execution of new thread */ + _beginthreadex_start_routine_t start_address, /* [in] Start address of routine that begins execution of new thread */ void *arglist, /* [in] Argument list to be passed to new thread or NULL */ unsigned int initflag, /* [in] Initial state of new thread (0 for running or CREATE_SUSPEND for suspended) */ unsigned int *thrdaddr) /* [out] Points to a 32-bit variable that receives the thread identifier */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 10d16919769..9b183d91590 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -73,11 +73,11 @@ @ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func @ cdecl ___mb_cur_max_l_func(ptr) @ cdecl __acrt_iob_func(long) MSVCRT___acrt_iob_func -@ cdecl __conio_common_vcprintf(int64 str ptr ptr) MSVCRT__conio_common_vcprintf +@ cdecl __conio_common_vcprintf(int64 str ptr ptr) @ stub __conio_common_vcprintf_p @ stub __conio_common_vcprintf_s @ stub __conio_common_vcscanf -@ cdecl __conio_common_vcwprintf(int64 wstr ptr ptr) MSVCRT__conio_common_vcwprintf +@ cdecl __conio_common_vcwprintf(int64 wstr ptr ptr) __conio_common_vcwprintf @ stub __conio_common_vcwprintf_p @ stub __conio_common_vcwprintf_s @ stub __conio_common_vcwscanf @@ -759,11 +759,11 @@ @ cdecl _o____lc_locale_name_func() ___lc_locale_name_func @ cdecl _o____mb_cur_max_func() MSVCRT____mb_cur_max_func @ cdecl _o___acrt_iob_func(long) MSVCRT___acrt_iob_func -@ cdecl _o___conio_common_vcprintf(int64 str ptr ptr) MSVCRT__conio_common_vcprintf +@ cdecl _o___conio_common_vcprintf(int64 str ptr ptr) __conio_common_vcprintf @ stub _o___conio_common_vcprintf_p @ stub _o___conio_common_vcprintf_s @ stub _o___conio_common_vcscanf -@ cdecl _o___conio_common_vcwprintf(int64 wstr ptr ptr) MSVCRT__conio_common_vcwprintf +@ cdecl _o___conio_common_vcwprintf(int64 wstr ptr ptr) __conio_common_vcwprintf @ stub _o___conio_common_vcwprintf_p @ stub _o___conio_common_vcwprintf_s @ stub _o___conio_common_vcwscanf

1 0

Piotr Caban : msvcrt: Use errno values from public header.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 1317b935efaa841e8842b848d422d1bf2471e448 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1317b935efaa841e8842b848… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:27 2020 +0100 msvcrt: Use errno values from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/ctype.c | 4 +- dlls/msvcrt/data.c | 16 ++--- dlls/msvcrt/dir.c | 106 ++++++++++++++--------------- dlls/msvcrt/environ.c | 36 +++++----- dlls/msvcrt/errno.c | 52 +++++++------- dlls/msvcrt/except_i386.c | 2 +- dlls/msvcrt/file.c | 170 +++++++++++++++++++++++----------------------- dlls/msvcrt/heap.c | 56 +++++++-------- dlls/msvcrt/math.c | 120 ++++++++++++++++---------------- dlls/msvcrt/mbcs.c | 88 ++++++++++++------------ dlls/msvcrt/misc.c | 4 +- dlls/msvcrt/msvcrt.h | 44 +----------- dlls/msvcrt/printf.h | 4 +- dlls/msvcrt/process.c | 8 +-- dlls/msvcrt/string.c | 169 +++++++++++++++++++++++---------------------- dlls/msvcrt/thread.c | 6 +- dlls/msvcrt/time.c | 150 ++++++++++++++++++++-------------------- dlls/msvcrt/wcs.c | 144 +++++++++++++++++++-------------------- 18 files changed, 569 insertions(+), 610 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1317b935efaa841e8842…

1 0

Piotr Caban : msvcrt: Use _onexit_table_t from public header.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: babe6ceb7f7b206ce8181e35934fc0aa1ee02ae5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=babe6ceb7f7b206ce8181e35… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:30 2020 +0100 msvcrt: Use _onexit_table_t from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 37 +++++++++++++++++++------------------ dlls/msvcrt/msvcrt.h | 8 -------- 2 files changed, 19 insertions(+), 26 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index df0b4636207..8e175859153 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <process.h> #include <stdio.h> #include "msvcrt.h" #include "mtdll.h" @@ -31,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); static MSVCRT_purecall_handler purecall_handler = NULL; -static MSVCRT__onexit_table_t MSVCRT_atexit_table; +static _onexit_table_t MSVCRT_atexit_table; typedef void (__stdcall *_tls_callback_type)(void*,ULONG,void*); static _tls_callback_type tls_atexit_callback; @@ -53,7 +54,7 @@ static int MSVCRT_error_mode = MSVCRT__OUT_TO_DEFAULT; void (*CDECL _aexit_rtn)(int) = MSVCRT__exit; -static int initialize_onexit_table(MSVCRT__onexit_table_t *table) +static int initialize_onexit_table(_onexit_table_t *table) { if (!table) return -1; @@ -63,7 +64,7 @@ static int initialize_onexit_table(MSVCRT__onexit_table_t *table) return 0; } -static int register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func) +static int register_onexit_function(_onexit_table_t *table, _onexit_t func) { if (!table) return -1; @@ -86,7 +87,7 @@ static int register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT__onexi if (table->_last == table->_end) { int len = table->_end - table->_first; - MSVCRT__onexit_t *tmp = MSVCRT_realloc(table->_first, 2 * len * sizeof(void *)); + _PVFV *tmp = MSVCRT_realloc(table->_first, 2 * len * sizeof(void *)); if (!tmp) { WARN("failed to grow table.\n"); @@ -98,16 +99,16 @@ static int register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT__onexi table->_last = table->_first + len; } - *table->_last = func; + *table->_last = (_PVFV)func; table->_last++; LeaveCriticalSection(&MSVCRT_onexit_cs); return 0; } -static int execute_onexit_table(MSVCRT__onexit_table_t *table) +static int execute_onexit_table(_onexit_table_t *table) { - MSVCRT__onexit_t *func; - MSVCRT__onexit_table_t copy; + _onexit_table_t copy; + _PVFV *func; if (!table) return -1; @@ -145,9 +146,9 @@ static void call_atexit(void) /********************************************************************* * __dllonexit (MSVCRT.@) */ -MSVCRT__onexit_t CDECL __dllonexit(MSVCRT__onexit_t func, MSVCRT__onexit_t **start, MSVCRT__onexit_t **end) +_onexit_t CDECL __dllonexit(_onexit_t func, _onexit_t **start, _onexit_t **end) { - MSVCRT__onexit_t *tmp; + _onexit_t *tmp; int len; TRACE("(%p,%p,%p)\n", func, start, end); @@ -336,7 +337,7 @@ void CDECL MSVCRT__cexit(void) /********************************************************************* * _onexit (MSVCRT.@) */ -MSVCRT__onexit_t CDECL MSVCRT__onexit(MSVCRT__onexit_t func) +_onexit_t CDECL MSVCRT__onexit(_onexit_t func) { TRACE("(%p)\n",func); @@ -380,11 +381,11 @@ void CDECL MSVCRT_exit(int exitcode) int CDECL MSVCRT_atexit(void (__cdecl *func)(void)) { TRACE("(%p)\n", func); - return MSVCRT__onexit((MSVCRT__onexit_t)func) == (MSVCRT__onexit_t)func ? 0 : -1; + return MSVCRT__onexit((_onexit_t)func) == (_onexit_t)func ? 0 : -1; } #if _MSVCR_VER >= 140 -static MSVCRT__onexit_table_t MSVCRT_quick_exit_table; +static _onexit_table_t MSVCRT_quick_exit_table; /********************************************************************* * _crt_at_quick_exit (UCRTBASE.@) @@ -392,7 +393,7 @@ static MSVCRT__onexit_table_t MSVCRT_quick_exit_table; int CDECL MSVCRT__crt_at_quick_exit(void (__cdecl *func)(void)) { TRACE("(%p)\n", func); - return register_onexit_function(&MSVCRT_quick_exit_table, (MSVCRT__onexit_t)func); + return register_onexit_function(&MSVCRT_quick_exit_table, (_onexit_t)func); } /********************************************************************* @@ -412,13 +413,13 @@ void CDECL MSVCRT_quick_exit(int exitcode) int CDECL MSVCRT__crt_atexit(void (__cdecl *func)(void)) { TRACE("(%p)\n", func); - return MSVCRT__onexit((MSVCRT__onexit_t)func) == (MSVCRT__onexit_t)func ? 0 : -1; + return MSVCRT__onexit((_onexit_t)func) == (_onexit_t)func ? 0 : -1; } /********************************************************************* * _initialize_onexit_table (UCRTBASE.@) */ -int CDECL MSVCRT__initialize_onexit_table(MSVCRT__onexit_table_t *table) +int CDECL MSVCRT__initialize_onexit_table(_onexit_table_t *table) { TRACE("(%p)\n", table); @@ -428,7 +429,7 @@ int CDECL MSVCRT__initialize_onexit_table(MSVCRT__onexit_table_t *table) /********************************************************************* * _register_onexit_function (UCRTBASE.@) */ -int CDECL MSVCRT__register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func) +int CDECL MSVCRT__register_onexit_function(_onexit_table_t *table, _onexit_t func) { TRACE("(%p %p)\n", table, func); @@ -438,7 +439,7 @@ int CDECL MSVCRT__register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT /********************************************************************* * _execute_onexit_table (UCRTBASE.@) */ -int CDECL MSVCRT__execute_onexit_table(MSVCRT__onexit_table_t *table) +int CDECL MSVCRT__execute_onexit_table(_onexit_table_t *table) { TRACE("(%p)\n", table); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index d154d9757d8..43dad306e58 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -36,7 +36,6 @@ typedef void (__cdecl *unexpected_function)(void); typedef void (__cdecl *_se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); void __cdecl terminate(void); -typedef int (__cdecl *MSVCRT__onexit_t)(void); typedef void (__cdecl *MSVCRT_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, uintptr_t); typedef void (__cdecl *MSVCRT_purecall_handler)(void); typedef void (__cdecl *MSVCRT_security_error_handler)(int, void *); @@ -93,13 +92,6 @@ typedef struct threadmbcinfostruct { unsigned char mbcasemap[256]; } threadmbcinfo; -typedef struct MSVCRT__onexit_table_t -{ - MSVCRT__onexit_t *_first; - MSVCRT__onexit_t *_last; - MSVCRT__onexit_t *_end; -} MSVCRT__onexit_table_t; - typedef struct _frame_info { void *object;

1 0

Piotr Caban : msvcrt: Use printf and scanf flags from public header.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: eb6f79f96a81371d328476d255e27d3a47925b13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb6f79f96a81371d328476d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:33 2020 +0100 msvcrt: Use printf and scanf flags from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 25 ++++++++++++------------- dlls/msvcrt/printf.h | 8 ++++---- dlls/msvcrt/scanf.c | 12 ++++++------ dlls/msvcrt/wcs.c | 8 ++++---- 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 43dad306e58..6c7d1c291d1 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -23,6 +23,7 @@ #include <errno.h> #include <stdarg.h> #include <stdint.h> +#include <stdio.h> #include <wchar.h> #include "windef.h" @@ -1020,23 +1021,21 @@ extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t, #define UNDNAME_NO_SPECIAL_SYMS (0x4000) #define UNDNAME_NO_COMPLEX_TYPE (0x8000) -#define UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION (0x0001) -#define UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR (0x0002) -#define UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS (0x0004) -#define UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY (0x0008) -#define UCRTBASE_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS (0x0010) -#define UCRTBASE_PRINTF_STANDARD_ROUNDING (0x0020) - -#define UCRTBASE_PRINTF_MASK (0x003F) +#define UCRTBASE_PRINTF_MASK ( \ + _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION | \ + _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR | \ + _CRT_INTERNAL_PRINTF_LEGACY_WIDE_SPECIFIERS | \ + _CRT_INTERNAL_PRINTF_LEGACY_MSVCRT_COMPATIBILITY | \ + _CRT_INTERNAL_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS | \ + _CRT_INTERNAL_PRINTF_STANDARD_ROUNDING ) #define MSVCRT_PRINTF_POSITIONAL_PARAMS (0x0100) #define MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER (0x0200) -#define UCRTBASE_SCANF_SECURECRT (0x0001) -#define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) -#define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) - -#define UCRTBASE_SCANF_MASK (0x0007) +#define UCRTBASE_SCANF_MASK ( \ + _CRT_INTERNAL_SCANF_SECURECRT | \ + _CRT_INTERNAL_SCANF_LEGACY_WIDE_SPECIFIERS | \ + _CRT_INTERNAL_SCANF_LEGACY_MSVCRT_COMPATIBILITY ) #define COOPERATIVE_TIMEOUT_INFINITE ((unsigned int)-1) #define COOPERATIVE_WAIT_TIMEOUT ~0 diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index c3f833bffb9..bfcf0378793 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -960,10 +960,10 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API BOOL positional_params = options & MSVCRT_PRINTF_POSITIONAL_PARAMS; BOOL invoke_invalid_param_handler = options & MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER; #if _MSVCR_VER >= 140 - BOOL legacy_wide = options & UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS; - BOOL legacy_msvcrt_compat = options & UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY; - BOOL three_digit_exp = options & UCRTBASE_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS; - BOOL standard_rounding = options & UCRTBASE_PRINTF_STANDARD_ROUNDING; + BOOL legacy_wide = options & _CRT_INTERNAL_PRINTF_LEGACY_WIDE_SPECIFIERS; + BOOL legacy_msvcrt_compat = options & _CRT_INTERNAL_PRINTF_LEGACY_MSVCRT_COMPATIBILITY; + BOOL three_digit_exp = options & _CRT_INTERNAL_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS; + BOOL standard_rounding = options & _CRT_INTERNAL_PRINTF_STANDARD_ROUNDING; #else BOOL legacy_wide = TRUE, legacy_msvcrt_compat = TRUE; BOOL three_digit_exp = MSVCRT__get_output_format() != MSVCRT__TWO_DIGIT_EXPONENT; diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 4deac62ac7f..a09619ed0e5 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -674,7 +674,7 @@ int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, * but parsing of those isn't implemented at all yet. */ if (options & ~UCRTBASE_SCANF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - if (options & UCRTBASE_SCANF_SECURECRT) + if (options & _CRT_INTERNAL_SCANF_SECURECRT) return MSVCRT_vsnscanf_s_l(input, length, format, locale, valist); else return MSVCRT_vsnscanf_l(input, length, format, locale, valist); @@ -694,7 +694,7 @@ int CDECL MSVCRT__stdio_common_vswscanf(unsigned __int64 options, * but parsing of those isn't implemented at all yet. */ if (options & ~UCRTBASE_SCANF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - if (options & UCRTBASE_SCANF_SECURECRT) + if (options & _CRT_INTERNAL_SCANF_SECURECRT) return MSVCRT_vsnwscanf_s_l(input, length, format, locale, valist); else return MSVCRT_vsnwscanf_l(input, length, format, locale, valist); @@ -709,9 +709,9 @@ int CDECL MSVCRT__stdio_common_vfscanf(unsigned __int64 options, _locale_t locale, __ms_va_list valist) { - if (options & ~UCRTBASE_SCANF_SECURECRT) + if (options & ~_CRT_INTERNAL_SCANF_SECURECRT) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - if (options & UCRTBASE_SCANF_SECURECRT) + if (options & _CRT_INTERNAL_SCANF_SECURECRT) return MSVCRT_vfscanf_s_l(file, format, locale, valist); else return MSVCRT_vfscanf_l(file, format, locale, valist); @@ -726,9 +726,9 @@ int CDECL MSVCRT__stdio_common_vfwscanf(unsigned __int64 options, _locale_t locale, __ms_va_list valist) { - if (options & ~UCRTBASE_SCANF_SECURECRT) + if (options & ~_CRT_INTERNAL_SCANF_SECURECRT) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - if (options & UCRTBASE_SCANF_SECURECRT) + if (options & _CRT_INTERNAL_SCANF_SECURECRT) return MSVCRT_vfwscanf_s_l(file, format, locale, valist); else return MSVCRT_vfwscanf_l(file, format, locale, valist); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 55f6dcd5530..e494d45e003 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -896,11 +896,11 @@ int CDECL __stdio_common_vsprintf( unsigned __int64 options, char *str, size_t l if(!str) return ret; - if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) + if(options & _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) return ret>len ? -1 : ret; if(ret>=len) { if(len) str[len-1] = 0; - if(options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) + if(options & _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR) return ret; return len > 0 ? -2 : -1; } @@ -1509,11 +1509,11 @@ int CDECL MSVCRT__stdio_common_vswprintf( unsigned __int64 options, if(!str) return ret; - if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) + if(options & _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) return ret>len ? -1 : ret; if(ret>=len) { if(len) str[len-1] = 0; - if(options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) + if(options & _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR) return ret; return len > 0 ? -2 : -1; }

1 0

Piotr Caban : msvcrt: Use _CRT_FLOAT and _CRT_DBL from public header.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 811647dff44ab93b89200d873d7707a02331d89a URL: https://source.winehq.org/git/wine.git/?a=commit;h=811647dff44ab93b89200d87… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:36 2020 +0100 msvcrt: Use _CRT_FLOAT and _CRT_DBL from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 15 --------------- dlls/msvcrt/string.c | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 6c7d1c291d1..3d3a2d92dfe 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -984,21 +984,6 @@ int create_positional_ctx_w(void*, const wchar_t*, __ms_va_list) DECLSPEC_HIDDEN printf_arg arg_clbk_valist(void*, int, int, __ms_va_list*) DECLSPEC_HIDDEN; printf_arg arg_clbk_positional(void*, int, int, __ms_va_list*) DECLSPEC_HIDDEN; -#define MSVCRT_FLT_MIN 1.175494351e-38F -#define MSVCRT_DBL_MIN 2.2250738585072014e-308 -#define MSVCRT__OVERFLOW 3 -#define MSVCRT__UNDERFLOW 4 - -typedef struct -{ - float f; -} MSVCRT__CRT_FLOAT; - -typedef struct -{ - double x; -} MSVCRT__CRT_DOUBLE; - extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t,unsigned short int); /* __unDName/__unDNameEx flags */ diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 08750711ab9..8586cc5537c 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1092,7 +1092,7 @@ double CDECL MSVCRT__atof_l( const char *str, _locale_t locale) /********************************************************************* * _atoflt_l (MSVCRT.@) */ -int CDECL MSVCRT__atoflt_l( MSVCRT__CRT_FLOAT *value, char *str, _locale_t locale) +int CDECL MSVCRT__atoflt_l(_CRT_FLOAT *value, char *str, _locale_t locale) { double d; int err; @@ -1100,16 +1100,16 @@ int CDECL MSVCRT__atoflt_l( MSVCRT__CRT_FLOAT *value, char *str, _locale_t local d = strtod_helper(str, NULL, locale, &err); value->f = d; if(isinf(value->f)) - return MSVCRT__OVERFLOW; - if((d!=0 || err) && value->f>-MSVCRT_FLT_MIN && value->f<MSVCRT_FLT_MIN) - return MSVCRT__UNDERFLOW; + return _OVERFLOW; + if((d!=0 || err) && value->f>-FLT_MIN && value->f<FLT_MIN) + return _UNDERFLOW; return 0; } /********************************************************************* * _atoflt (MSVCR100.@) */ -int CDECL MSVCRT__atoflt(MSVCRT__CRT_FLOAT *value, char *str) +int CDECL MSVCRT__atoflt(_CRT_FLOAT *value, char *str) { return MSVCRT__atoflt_l(value, str, NULL); } @@ -1117,22 +1117,22 @@ int CDECL MSVCRT__atoflt(MSVCRT__CRT_FLOAT *value, char *str) /********************************************************************* * _atodbl_l (MSVCRT.@) */ -int CDECL MSVCRT__atodbl_l(MSVCRT__CRT_DOUBLE *value, char *str, _locale_t locale) +int CDECL MSVCRT__atodbl_l(_CRT_DOUBLE *value, char *str, _locale_t locale) { int err; value->x = strtod_helper(str, NULL, locale, &err); if(isinf(value->x)) - return MSVCRT__OVERFLOW; - if((value->x!=0 || err) && value->x>-MSVCRT_DBL_MIN && value->x<MSVCRT_DBL_MIN) - return MSVCRT__UNDERFLOW; + return _OVERFLOW; + if((value->x!=0 || err) && value->x>-DBL_MIN && value->x<DBL_MIN) + return _UNDERFLOW; return 0; } /********************************************************************* * _atodbl (MSVCRT.@) */ -int CDECL MSVCRT__atodbl(MSVCRT__CRT_DOUBLE *value, char *str) +int CDECL MSVCRT__atodbl(_CRT_DOUBLE *value, char *str) { return MSVCRT__atodbl_l(value, str, NULL); } @@ -1482,8 +1482,8 @@ int CDECL MSVCRT__atoldbl_l( MSVCRT__LDOUBLE *value, const char *str, _locale_t char *endptr; switch(__STRINGTOLD_L( value, &endptr, str, 0, locale )) { - case 1: return MSVCRT__UNDERFLOW; - case 2: return MSVCRT__OVERFLOW; + case 1: return _UNDERFLOW; + case 2: return _OVERFLOW; default: return 0; } }

1 0