ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Print assertion failure messages to stderr. 

This matches Windows behaviour. In particular, redirecting stderr with freopen()
followed by assert(0) will print the failure message to the relevant file.

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-06-29 15:12:22 -05:00 committed by Alexandre Julliard
parent ec9e556d31
commit 3533605293
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msvcrt/exit.c
View File

@ -305,7 +305,7 @@ void CDECL MSVCRT__wassert(const MSVCRT_wchar_t* str, const MSVCRT_wchar_t* file
DoMessageBoxW(assertion_failed, text);
}
else
_cwprintf(format_console, str, file, line);
MSVCRT_fwprintf(MSVCRT_stderr, format_console, str, file, line);
MSVCRT_raise(MSVCRT_SIGABRT);
MSVCRT__exit(3);

3
dlls/msvcrt/msvcrt.h
View File

@ -447,6 +447,8 @@ struct MSVCRT__iobuf {
typedef struct MSVCRT__iobuf MSVCRT_FILE;
extern MSVCRT_FILE MSVCRT__iob[];
struct MSVCRT_lconv {
char* decimal_point;
char* thousands_sep;
@ -1107,6 +1109,7 @@ MSVCRT___time32_t __cdecl MSVCRT__time32(MSVCRT___time32_t*);
MSVCRT___time64_t __cdecl MSVCRT__time64(MSVCRT___time64_t*);
MSVCRT_FILE* __cdecl MSVCRT__fdopen(int, const char *);
MSVCRT_FILE* __cdecl MSVCRT__wfdopen(int, const MSVCRT_wchar_t *);
int WINAPIV MSVCRT_fwprintf(MSVCRT_FILE *file, const MSVCRT_wchar_t *format, ...);
int __cdecl MSVCRT_vsnprintf(char *str, MSVCRT_size_t len, const char *format, __ms_va_list valist);
int __cdecl MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len,
const MSVCRT_wchar_t *format, __ms_va_list valist );

2
dlls/msvcrt/scanf.c
View File

@ -35,8 +35,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
extern MSVCRT_FILE MSVCRT__iob[];
/* helper function for *scanf. Returns the value of character c in the
* given base, or -1 if the given character is not a digit of the base.
*/