December 2020 - Wine-Commits

Piotr Caban : msvcrt: Use ctype definition from public header.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: eabef91a9701ac72c91e64d946d31d829da92d3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=eabef91a9701ac72c91e64d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 1 13:51:51 2020 +0100 msvcrt: Use ctype definition 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 | 104 +++++++++++++++++++++++++-------------------------- dlls/msvcrt/locale.c | 4 +- dlls/msvcrt/msvcrt.h | 12 ------ dlls/msvcrt/wcs.c | 28 +++++++------- 4 files changed, 68 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eabef91a9701ac72c91e…

1 0

Piotr Caban : msvcrt: Use FPU control word definitions from public header.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 4674860303badca0b88436fdc9c7d5be4f00b1b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4674860303badca0b88436fd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 1 13:52:29 2020 +0100 msvcrt: Use FPU control word definitions from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 290 +++++++++++++++++++++++++-------------------------- dlls/msvcrt/msvcrt.h | 27 ----- 2 files changed, 145 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4674860303badca0b884…

1 0

Piotr Caban : msvcrt: Use fpclassify constants from public header.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: d571f377e40082bf234c5b2e3b128598a370ae6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d571f377e40082bf234c5b2e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 1 13:52:23 2020 +0100 msvcrt: Use fpclassify constants from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 12 ++++++------ dlls/msvcrt/msvcrt.h | 7 ------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b7a62d9cf2c..9e8739f138c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3586,9 +3586,9 @@ short CDECL MSVCR120__dclass(double x) union { double f; UINT64 i; } u = { x }; int e = u.i >> 52 & 0x7ff; - if (!e) return u.i << 1 ? MSVCRT_FP_SUBNORMAL : MSVCRT_FP_ZERO; - if (e == 0x7ff) return (u.i << 12) ? MSVCRT_FP_NAN : MSVCRT_FP_INFINITE; - return MSVCRT_FP_NORMAL; + if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; + if (e == 0x7ff) return (u.i << 12) ? FP_NAN : FP_INFINITE; + return FP_NORMAL; } /********************************************************************* @@ -3601,9 +3601,9 @@ short CDECL MSVCR120__fdclass(float x) union { float f; UINT32 i; } u = { x }; int e = u.i >> 23 & 0xff; - if (!e) return u.i << 1 ? MSVCRT_FP_SUBNORMAL : MSVCRT_FP_ZERO; - if (e == 0xff) return u.i << 9 ? MSVCRT_FP_NAN : MSVCRT_FP_INFINITE; - return MSVCRT_FP_NORMAL; + if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; + if (e == 0xff) return u.i << 9 ? FP_NAN : FP_INFINITE; + return FP_NORMAL; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index f2c77537dba..bd6f429b747 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -626,13 +626,6 @@ struct MSVCRT__stat64 { #define MSVCRT__O_U16TEXT 0x20000 #define MSVCRT__O_U8TEXT 0x40000 -/* fpclassify constants */ -#define MSVCRT_FP_INFINITE 1 -#define MSVCRT_FP_NAN 2 -#define MSVCRT_FP_NORMAL -1 -#define MSVCRT_FP_SUBNORMAL -2 -#define MSVCRT_FP_ZERO 0 - #define MSVCRT__MCW_EM 0x0008001f #define MSVCRT__MCW_IC 0x00040000 #define MSVCRT__MCW_RC 0x00000300

1 0

Piotr Caban : msvcrt: Use signal definitions from public header.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 2d96d03006798dd64d42735ffbc3dc76fe6a1174 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d96d03006798dd64d42735f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 1 13:52:20 2020 +0100 msvcrt: Use signal definitions from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except.c | 87 ++++++++++++++++++++++++++-------------------------- dlls/msvcrt/exit.c | 5 +-- dlls/msvcrt/msvcrt.h | 16 ---------- 3 files changed, 47 insertions(+), 61 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 91db1b67332..e2b90d9e0bd 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -22,6 +22,7 @@ */ #include <float.h> +#include <signal.h> #include <stdarg.h> #include <stdbool.h> @@ -44,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); static MSVCRT_security_error_handler security_error_handler; #endif -static MSVCRT___sighandler_t sighandlers[MSVCRT_NSIG] = { MSVCRT_SIG_DFL }; +static __sighandler_t sighandlers[NSIG] = { SIG_DFL }; static BOOL WINAPI msvcrt_console_handler(DWORD ctrlType) { @@ -53,10 +54,10 @@ static BOOL WINAPI msvcrt_console_handler(DWORD ctrlType) switch (ctrlType) { case CTRL_C_EVENT: - if (sighandlers[MSVCRT_SIGINT]) + if (sighandlers[SIGINT]) { - if (sighandlers[MSVCRT_SIGINT] != MSVCRT_SIG_IGN) - sighandlers[MSVCRT_SIGINT](MSVCRT_SIGINT); + if (sighandlers[SIGINT] != SIG_IGN) + sighandlers[SIGINT](SIGINT); ret = TRUE; } break; @@ -92,7 +93,7 @@ static const struct static LONG msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) { LONG ret = EXCEPTION_CONTINUE_SEARCH; - MSVCRT___sighandler_t handler; + __sighandler_t handler; if (!except || !except->ExceptionRecord) return EXCEPTION_CONTINUE_SEARCH; @@ -100,16 +101,16 @@ static LONG msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) switch (except->ExceptionRecord->ExceptionCode) { case EXCEPTION_ACCESS_VIOLATION: - if ((handler = sighandlers[MSVCRT_SIGSEGV]) != MSVCRT_SIG_DFL) + if ((handler = sighandlers[SIGSEGV]) != SIG_DFL) { - if (handler != MSVCRT_SIG_IGN) + if (handler != SIG_IGN) { EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)MSVCRT___pxcptinfoptrs(), *old_ep; old_ep = *ep; *ep = except; - sighandlers[MSVCRT_SIGSEGV] = MSVCRT_SIG_DFL; - handler(MSVCRT_SIGSEGV); + sighandlers[SIGSEGV] = SIG_DFL; + handler(SIGSEGV); *ep = old_ep; } ret = EXCEPTION_CONTINUE_EXECUTION; @@ -126,15 +127,15 @@ static LONG msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) case EXCEPTION_FLT_OVERFLOW: case EXCEPTION_FLT_STACK_CHECK: case EXCEPTION_FLT_UNDERFLOW: - if ((handler = sighandlers[MSVCRT_SIGFPE]) != MSVCRT_SIG_DFL) + if ((handler = sighandlers[SIGFPE]) != SIG_DFL) { - if (handler != MSVCRT_SIG_IGN) + if (handler != SIG_IGN) { EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)MSVCRT___pxcptinfoptrs(), *old_ep; unsigned int i; int float_signal = _FPE_INVALID; - sighandlers[MSVCRT_SIGFPE] = MSVCRT_SIG_DFL; + sighandlers[SIGFPE] = SIG_DFL; for (i = 0; i < ARRAY_SIZE(float_exception_map); i++) { if (float_exception_map[i].status == @@ -147,7 +148,7 @@ static LONG msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) old_ep = *ep; *ep = except; - ((float_handler)handler)(MSVCRT_SIGFPE, float_signal); + ((float_handler)handler)(SIGFPE, float_signal); *ep = old_ep; } ret = EXCEPTION_CONTINUE_EXECUTION; @@ -155,16 +156,16 @@ static LONG msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) break; case EXCEPTION_ILLEGAL_INSTRUCTION: case EXCEPTION_PRIV_INSTRUCTION: - if ((handler = sighandlers[MSVCRT_SIGILL]) != MSVCRT_SIG_DFL) + if ((handler = sighandlers[SIGILL]) != SIG_DFL) { - if (handler != MSVCRT_SIG_IGN) + if (handler != SIG_IGN) { EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)MSVCRT___pxcptinfoptrs(), *old_ep; old_ep = *ep; *ep = except; - sighandlers[MSVCRT_SIGILL] = MSVCRT_SIG_DFL; - handler(MSVCRT_SIGILL); + sighandlers[SIGILL] = SIG_DFL; + handler(SIGILL); *ep = old_ep; } ret = EXCEPTION_CONTINUE_EXECUTION; @@ -189,31 +190,31 @@ void msvcrt_free_signals(void) * Some signals may never be generated except through an explicit call to * raise. */ -MSVCRT___sighandler_t CDECL MSVCRT_signal(int sig, MSVCRT___sighandler_t func) +__sighandler_t CDECL MSVCRT_signal(int sig, __sighandler_t func) { - MSVCRT___sighandler_t ret = MSVCRT_SIG_ERR; + __sighandler_t ret = SIG_ERR; TRACE("(%d, %p)\n", sig, func); - if (func == MSVCRT_SIG_ERR) return MSVCRT_SIG_ERR; + if (func == SIG_ERR) return SIG_ERR; switch (sig) { /* Cases handled internally. Note SIGTERM is never generated by Windows, * so we effectively mask it. */ - case MSVCRT_SIGABRT: - case MSVCRT_SIGFPE: - case MSVCRT_SIGILL: - case MSVCRT_SIGSEGV: - case MSVCRT_SIGINT: - case MSVCRT_SIGTERM: - case MSVCRT_SIGBREAK: + case SIGABRT: + case SIGFPE: + case SIGILL: + case SIGSEGV: + case SIGINT: + case SIGTERM: + case SIGBREAK: ret = sighandlers[sig]; sighandlers[sig] = func; break; default: - ret = MSVCRT_SIG_ERR; + ret = SIG_ERR; } return ret; } @@ -223,41 +224,41 @@ MSVCRT___sighandler_t CDECL MSVCRT_signal(int sig, MSVCRT___sighandler_t func) */ int CDECL MSVCRT_raise(int sig) { - MSVCRT___sighandler_t handler; + __sighandler_t handler; TRACE("(%d)\n", sig); switch (sig) { - case MSVCRT_SIGFPE: - case MSVCRT_SIGILL: - case MSVCRT_SIGSEGV: + case SIGFPE: + case SIGILL: + case SIGSEGV: handler = sighandlers[sig]; - if (handler == MSVCRT_SIG_DFL) MSVCRT__exit(3); - if (handler != MSVCRT_SIG_IGN) + if (handler == SIG_DFL) MSVCRT__exit(3); + if (handler != SIG_IGN) { EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)MSVCRT___pxcptinfoptrs(), *old_ep; - sighandlers[sig] = MSVCRT_SIG_DFL; + sighandlers[sig] = SIG_DFL; old_ep = *ep; *ep = NULL; - if (sig == MSVCRT_SIGFPE) + if (sig == SIGFPE) ((float_handler)handler)(sig, _FPE_EXPLICITGEN); else handler(sig); *ep = old_ep; } break; - case MSVCRT_SIGABRT: - case MSVCRT_SIGINT: - case MSVCRT_SIGTERM: - case MSVCRT_SIGBREAK: + case SIGABRT: + case SIGINT: + case SIGTERM: + case SIGBREAK: handler = sighandlers[sig]; - if (handler == MSVCRT_SIG_DFL) MSVCRT__exit(3); - if (handler != MSVCRT_SIG_IGN) + if (handler == SIG_DFL) MSVCRT__exit(3); + if (handler != SIG_IGN) { - sighandlers[sig] = MSVCRT_SIG_DFL; + sighandlers[sig] = SIG_DFL; handler(sig); } break; diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index ad7b9bc8f7d..4444431f94d 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <process.h> +#include <signal.h> #include <stdio.h> #include "msvcrt.h" #include "mtdll.h" @@ -258,7 +259,7 @@ void CDECL MSVCRT_abort(void) else _cputs("\nabnormal program termination\n"); } - MSVCRT_raise(MSVCRT_SIGABRT); + MSVCRT_raise(SIGABRT); /* in case raise() returns */ MSVCRT__exit(3); } @@ -297,7 +298,7 @@ void CDECL MSVCRT__wassert(const wchar_t* str, const wchar_t* file, unsigned int else MSVCRT_fwprintf(MSVCRT_stderr, L"Assertion failed: %ls, file %ls, line %d\n\n", str, file, line); - MSVCRT_raise(MSVCRT_SIGABRT); + MSVCRT_raise(SIGABRT); MSVCRT__exit(3); } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 2e720999318..f2c77537dba 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -662,22 +662,6 @@ struct MSVCRT__stat64 { #define MSVCRT_CLOCKS_PER_SEC 1000 -/* signals */ -#define MSVCRT_SIGINT 2 -#define MSVCRT_SIGILL 4 -#define MSVCRT_SIGFPE 8 -#define MSVCRT_SIGSEGV 11 -#define MSVCRT_SIGTERM 15 -#define MSVCRT_SIGBREAK 21 -#define MSVCRT_SIGABRT 22 -#define MSVCRT_NSIG (MSVCRT_SIGABRT + 1) - -typedef void (__cdecl *MSVCRT___sighandler_t)(int); - -#define MSVCRT_SIG_DFL ((MSVCRT___sighandler_t)0) -#define MSVCRT_SIG_IGN ((MSVCRT___sighandler_t)1) -#define MSVCRT_SIG_ERR ((MSVCRT___sighandler_t)-1) - #define MSVCRT__TRUNCATE ((size_t)-1) #define _MAX__TIME64_T (((__time64_t)0x00000007 << 32) | 0x93406FFF)

1 0

Piotr Caban : msvcrt: Use floating point exception signals definition from public header.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 9e085387ac8e6a6c34bc6e7bec8135ef84a247d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e085387ac8e6a6c34bc6e7b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 1 13:52:16 2020 +0100 msvcrt: Use floating point exception signals definition from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except.c | 19 ++++++++++--------- dlls/msvcrt/msvcrt.h | 12 ------------ 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 94cee55a7d7..91db1b67332 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -21,6 +21,7 @@ * FIXME: Incomplete support for nested exceptions/try block cleanup. */ +#include <float.h> #include <stdarg.h> #include <stdbool.h> @@ -79,13 +80,13 @@ static const struct NTSTATUS status; int signal; } float_exception_map[] = { - { EXCEPTION_FLT_DENORMAL_OPERAND, MSVCRT__FPE_DENORMAL }, - { EXCEPTION_FLT_DIVIDE_BY_ZERO, MSVCRT__FPE_ZERODIVIDE }, - { EXCEPTION_FLT_INEXACT_RESULT, MSVCRT__FPE_INEXACT }, - { EXCEPTION_FLT_INVALID_OPERATION, MSVCRT__FPE_INVALID }, - { EXCEPTION_FLT_OVERFLOW, MSVCRT__FPE_OVERFLOW }, - { EXCEPTION_FLT_STACK_CHECK, MSVCRT__FPE_STACKOVERFLOW }, - { EXCEPTION_FLT_UNDERFLOW, MSVCRT__FPE_UNDERFLOW }, + { EXCEPTION_FLT_DENORMAL_OPERAND, _FPE_DENORMAL }, + { EXCEPTION_FLT_DIVIDE_BY_ZERO, _FPE_ZERODIVIDE }, + { EXCEPTION_FLT_INEXACT_RESULT, _FPE_INEXACT }, + { EXCEPTION_FLT_INVALID_OPERATION, _FPE_INVALID }, + { EXCEPTION_FLT_OVERFLOW, _FPE_OVERFLOW }, + { EXCEPTION_FLT_STACK_CHECK, _FPE_STACKOVERFLOW }, + { EXCEPTION_FLT_UNDERFLOW, _FPE_UNDERFLOW }, }; static LONG msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) @@ -131,7 +132,7 @@ static LONG msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) { EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)MSVCRT___pxcptinfoptrs(), *old_ep; unsigned int i; - int float_signal = MSVCRT__FPE_INVALID; + int float_signal = _FPE_INVALID; sighandlers[MSVCRT_SIGFPE] = MSVCRT_SIG_DFL; for (i = 0; i < ARRAY_SIZE(float_exception_map); i++) @@ -242,7 +243,7 @@ int CDECL MSVCRT_raise(int sig) old_ep = *ep; *ep = NULL; if (sig == MSVCRT_SIGFPE) - ((float_handler)handler)(sig, MSVCRT__FPE_EXPLICITGEN); + ((float_handler)handler)(sig, _FPE_EXPLICITGEN); else handler(sig); *ep = old_ep; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 5b1e5ac40b0..2e720999318 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -678,18 +678,6 @@ typedef void (__cdecl *MSVCRT___sighandler_t)(int); #define MSVCRT_SIG_IGN ((MSVCRT___sighandler_t)1) #define MSVCRT_SIG_ERR ((MSVCRT___sighandler_t)-1) -#define MSVCRT__FPE_INVALID 0x81 -#define MSVCRT__FPE_DENORMAL 0x82 -#define MSVCRT__FPE_ZERODIVIDE 0x83 -#define MSVCRT__FPE_OVERFLOW 0x84 -#define MSVCRT__FPE_UNDERFLOW 0x85 -#define MSVCRT__FPE_INEXACT 0x86 -#define MSVCRT__FPE_UNEMULATED 0x87 -#define MSVCRT__FPE_SQRTNEG 0x88 -#define MSVCRT__FPE_STACKOVERFLOW 0x8a -#define MSVCRT__FPE_STACKUNDERFLOW 0x8b -#define MSVCRT__FPE_EXPLICITGEN 0x8c - #define MSVCRT__TRUNCATE ((size_t)-1) #define _MAX__TIME64_T (((__time64_t)0x00000007 << 32) | 0x93406FFF)

1 0

Piotr Caban : msvcrt: Use _ARGMAX from public header.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 45ac13551966f7a89ad4678fbc0f76f858663bcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=45ac13551966f7a89ad4678f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 1 13:52:05 2020 +0100 msvcrt: Use _ARGMAX from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/printf.h | 4 ++-- dlls/msvcrt/wcs.c | 6 +++--- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 3ab18e8ac8e..bc1305e5228 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5108,7 +5108,7 @@ static int puts_clbk_file_w(void *file, int len, const wchar_t *str) static int vfprintf_helper(DWORD options, FILE* file, const char *format, _locale_t locale, __ms_va_list valist) { - printf_arg args_ctx[MSVCRT__ARGMAX+1]; + printf_arg args_ctx[_ARGMAX+1]; BOOL tmp_buf; int ret; @@ -5140,7 +5140,7 @@ static int vfprintf_helper(DWORD options, FILE* file, const char *format, static int vfwprintf_helper(DWORD options, FILE* file, const wchar_t *format, _locale_t locale, __ms_va_list valist) { - printf_arg args_ctx[MSVCRT__ARGMAX+1]; + printf_arg args_ctx[_ARGMAX+1]; BOOL tmp_buf; int ret; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index bfa01e21901..5b1e5ac40b0 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -886,7 +886,6 @@ int fpnum_double(struct fpnum*, double*) DECLSPEC_HIDDEN; #define MSVCRT_CHECK_PMT_ERR(x,err) ((x) || (MSVCRT_INVALID_PMT( 0, (err) ), FALSE)) #define MSVCRT_CHECK_PMT(x) MSVCRT_CHECK_PMT_ERR((x), EINVAL) -#define MSVCRT__ARGMAX 100 typedef int (*puts_clbk_a)(void*, int, const char*); typedef int (*puts_clbk_w)(void*, int, const wchar_t*); typedef union _printf_arg diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 72dffb30e37..826e8e76805 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -1225,7 +1225,7 @@ static printf_arg arg_clbk_type(void *ctx, int pos, int type, __ms_va_list *vali } else args[0].get_int |= TYPE_CLBK_POSITIONAL; - if(pos<1 || pos>MSVCRT__ARGMAX) + if(pos<1 || pos>_ARGMAX) args[0].get_int |= TYPE_CLBK_ERROR_POS; else if(args[pos].get_int && args[pos].get_int!=type) args[0].get_int |= TYPE_CLBK_ERROR_TYPE; @@ -1252,7 +1252,7 @@ int FUNC_NAME(create_positional_ctx)(void *args_ctx, const APICHAR *format, __ms if(args[0].get_int != TYPE_CLBK_POSITIONAL) return -1; - for(i=MSVCRT__ARGMAX; i>0; i--) + for(i=_ARGMAX; i>0; i--) if(args[i].get_int) break; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index b36d832a10a..8b43dcadf95 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1159,7 +1159,7 @@ int CDECL MSVCRT__vscprintf_l(const char *format, int CDECL MSVCRT__vscprintf_p_l(const char *format, _locale_t locale, __ms_va_list args) { - printf_arg args_ctx[MSVCRT__ARGMAX+1]; + printf_arg args_ctx[_ARGMAX+1]; struct _str_ctx_a puts_ctx = {INT_MAX, NULL}; int ret; @@ -1337,7 +1337,7 @@ int CDECL MSVCRT_vswprintf_c(wchar_t *str, size_t len, static int MSVCRT_vswprintf_p_l_opt(wchar_t *buffer, size_t length, const wchar_t *format, DWORD options, _locale_t locale, __ms_va_list args) { - printf_arg args_ctx[MSVCRT__ARGMAX+1]; + printf_arg args_ctx[_ARGMAX+1]; struct _str_ctx_w puts_ctx = {length, buffer}; int ret; @@ -1716,7 +1716,7 @@ static int MSVCRT_vsprintf_p_l_opt(char *buffer, size_t length, const char *form DWORD options, _locale_t locale, __ms_va_list args) { static const char nullbyte = '\0'; - printf_arg args_ctx[MSVCRT__ARGMAX+1]; + printf_arg args_ctx[_ARGMAX+1]; struct _str_ctx_a puts_ctx = {length, buffer}; int ret;

1 0

Piotr Caban : msvcrt: Use __utimbuf{32,64} from public header.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 2d471db92f0df5d0682369651c0cbb94312cc988 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d471db92f0df5d068236965… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 1 13:51:47 2020 +0100 msvcrt: Use __utimbuf{32,64} from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 6 +++-- dlls/msvcr70/msvcr70.spec | 9 ++++--- dlls/msvcr71/msvcr71.spec | 9 ++++--- dlls/msvcrt/file.c | 64 ++++++++--------------------------------------- dlls/msvcrt/msvcrt.h | 12 --------- dlls/msvcrt/msvcrt.spec | 9 ++++--- dlls/msvcrtd/msvcrtd.spec | 9 ++++--- 7 files changed, 38 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d471db92f0df5d06823…

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from heap.c functions.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: d784dbb89993d0565ea132109b110cc9500c97f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d784dbb89993d0565ea13210… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 1 13:51:32 2020 +0100 msvcrt: Remove MSVCRT_ prefix from heap.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 20 ++--- dlls/msvcr100/msvcr100.spec | 58 +++++++-------- dlls/msvcr110/msvcr110.spec | 58 +++++++-------- dlls/msvcr120/msvcr120.spec | 58 +++++++-------- dlls/msvcr70/msvcr70.spec | 38 +++++----- dlls/msvcr71/msvcr71.spec | 38 +++++----- dlls/msvcr80/msvcr80.spec | 60 +++++++-------- dlls/msvcr90/msvcr90.spec | 58 +++++++-------- dlls/msvcrt/console.c | 4 +- dlls/msvcrt/cpp.c | 44 +++++------ dlls/msvcrt/data.c | 6 +- dlls/msvcrt/dir.c | 12 +-- dlls/msvcrt/environ.c | 4 +- dlls/msvcrt/errno.c | 14 ++-- dlls/msvcrt/except.c | 2 +- dlls/msvcrt/exit.c | 8 +- dlls/msvcrt/file.c | 56 +++++++------- dlls/msvcrt/heap.c | 56 +++++++------- dlls/msvcrt/locale.c | 174 ++++++++++++++++++++++---------------------- dlls/msvcrt/main.c | 16 ++-- dlls/msvcrt/math.c | 8 +- dlls/msvcrt/mbcs.c | 8 +- dlls/msvcrt/msvcrt.h | 12 +-- dlls/msvcrt/msvcrt.spec | 52 ++++++------- dlls/msvcrt/process.c | 104 +++++++++++++------------- dlls/msvcrt/scheduler.c | 46 ++++++------ dlls/msvcrt/string.c | 2 +- dlls/msvcrt/thread.c | 8 +- dlls/msvcrt/time.c | 24 +++--- dlls/msvcrt/wcs.c | 2 +- dlls/msvcrtd/msvcrtd.spec | 42 +++++------ dlls/ucrtbase/ucrtbase.spec | 38 +++++----- 32 files changed, 562 insertions(+), 568 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d784dbb89993d0565ea1…

1 0

Gabriel Ivăncescu : winex11.drv: Always enable minimize/maximize functions for minimized windows.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 688fe7068c689050d1100e0b2702367eb3180c53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=688fe7068c689050d1100e0b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 13 15:26:18 2020 +0200 winex11.drv: Always enable minimize/maximize functions for minimized windows. A window without a minimize or maximize box can still be programmatically minimized by the Windows API. However, some WMs will refuse to change the state and not allow it to be maximized again, despite it being minimized, due to lacking those functions, thus not sending WM_STATE change notifications when clicking the minimized window on the taskbar. Heroes of Might and Magic V does this, for example, when losing focus. It minimizes itself. When maximizing it by clicking on the taskbar it won't send a WM_STATE change notification (since it was never changed) and fail to maximize properly, showing a black screen (the game will still think it is minimized). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ba722721ad2..f46cbfb088a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -752,6 +752,10 @@ static void set_mwm_hints( struct x11drv_win_data *data, DWORD style, DWORD ex_s if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE; if (style & WS_MAXIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MAXIMIZE; if (style & WS_SYSMENU) mwm_hints.functions |= MWM_FUNC_CLOSE; + + /* The window can be programmatically minimized even without + a minimize box button. Allow the WM to restore it. */ + if (style & WS_MINIMIZE) mwm_hints.functions |= MWM_FUNC_MINIMIZE | MWM_FUNC_MAXIMIZE; } }

1 0

Akihiro Sagawa : ntdll: Add a timezone mapping rule for North Korea Standard Time.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 22612bcff5ecc7ece4acc4325aa8b19e6129b2cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=22612bcff5ecc7ece4acc432… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Nov 30 22:00:34 2020 +0900 ntdll: Add a timezone mapping rule for North Korea Standard Time. Otherwise, another UTC+9 timezone matches to the timezone. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50213 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 8add2cabd4f..a889b2e020c 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1742,12 +1742,31 @@ static BOOL match_tz_info( const RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, match_tz_date(&tzi->DaylightDate, &reg_tzi->DaylightDate)); } +static BOOL match_past_tz_bias( time_t past_time, LONG past_bias ) +{ + LONG bias; + struct tm *tm; + if (!past_time) return TRUE; + + tm = gmtime( &past_time ); + bias = (LONG)(mktime(tm) - past_time) / 60; + return bias == past_bias; +} + static BOOL match_tz_name( const char *tz_name, const RTL_DYNAMIC_TIME_ZONE_INFORMATION *reg_tzi ) { - static const struct { WCHAR key_name[32]; const char *short_name; } mapping[] = + static const struct { + WCHAR key_name[32]; + const char *short_name; + time_t past_time; + LONG past_bias; + } + mapping[] = { + { {'N','o','r','t','h',' ','K','o','r','e','a',' ','S','t','a','n','d','a','r','d',' ','T','i','m','e',0 }, + "KST", 1451606400 /* 2016-01-01 00:00:00 UTC */, -510 }, { {'K','o','r','e','a',' ','S','t','a','n','d','a','r','d',' ','T','i','m','e',0 }, - "KST" }, + "KST", 1451606400 /* 2016-01-01 00:00:00 UTC */, -540 }, { {'T','o','k','y','o',' ','S','t','a','n','d','a','r','d',' ','T','i','m','e',0 }, "JST" }, { {'Y','a','k','u','t','s','k',' ','S','t','a','n','d','a','r','d',' ','T','i','m','e',0 }, @@ -1759,7 +1778,8 @@ static BOOL match_tz_name( const char *tz_name, const RTL_DYNAMIC_TIME_ZONE_INFO for (i = 0; i < ARRAY_SIZE(mapping); i++) { if (!wcscmp( mapping[i].key_name, reg_tzi->TimeZoneKeyName )) - return !strcmp( mapping[i].short_name, tz_name ); + return !strcmp( mapping[i].short_name, tz_name ) + && match_past_tz_bias( mapping[i].past_time, mapping[i].past_bias ); } return TRUE; }

1 0