April 2019 - Wine-commits - list.winehq.org

Sebastian Lackner : dinput: Do not wait for hook thread startup in IDirectInput8::Initialize.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 890d1b812a9477b434486ab503c15dd3fce3e964 URL: https://source.winehq.org/git/wine.git/?a=commit;h=890d1b812a9477b434486ab5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 3 11:39:36 2019 +0800 dinput: Do not wait for hook thread startup in IDirectInput8::Initialize. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=21403 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 54777da..66dc6e3 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1719,7 +1719,7 @@ static DWORD WINAPI hook_thread_proc(void *param) /* Force creation of the message queue */ PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE ); - SetEvent(*(LPHANDLE)param); + SetEvent(param); while (GetMessageW( &msg, 0, 0, 0 )) { @@ -1785,6 +1785,7 @@ static DWORD WINAPI hook_thread_proc(void *param) } static DWORD hook_thread_id; +static HANDLE hook_thread_event; static CRITICAL_SECTION_DEBUG dinput_critsect_debug = { @@ -1803,24 +1804,21 @@ static BOOL check_hook_thread(void) TRACE("IDirectInputs left: %d\n", list_count(&direct_input_list)); if (!list_empty(&direct_input_list) && !hook_thread) { - HANDLE event; - - event = CreateEventW(NULL, FALSE, FALSE, NULL); - hook_thread = CreateThread(NULL, 0, hook_thread_proc, &event, 0, &hook_thread_id); - if (event && hook_thread) - { - HANDLE handles[2]; - handles[0] = event; - handles[1] = hook_thread; - WaitForMultipleObjects(2, handles, FALSE, INFINITE); - } + hook_thread_event = CreateEventW(NULL, FALSE, FALSE, NULL); + hook_thread = CreateThread(NULL, 0, hook_thread_proc, hook_thread_event, 0, &hook_thread_id); LeaveCriticalSection(&dinput_hook_crit); - CloseHandle(event); } else if (list_empty(&direct_input_list) && hook_thread) { DWORD tid = hook_thread_id; + if (hook_thread_event) /* if thread is not started yet */ + { + WaitForSingleObject(hook_thread_event, INFINITE); + CloseHandle(hook_thread_event); + hook_thread_event = NULL; + } + hook_thread_id = 0; PostThreadMessageW(tid, WM_USER+0x10, 0, 0); LeaveCriticalSection(&dinput_hook_crit); @@ -1861,6 +1859,13 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface) callwndproc_hook = NULL; } + if (hook_thread_event) /* if thread is not started yet */ + { + WaitForSingleObject(hook_thread_event, INFINITE); + CloseHandle(hook_thread_event); + hook_thread_event = NULL; + } + PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, 0 ); LeaveCriticalSection(&dinput_hook_crit);

1 0

Alexandre Julliard : ntdll: Use static debug info before initialization is done.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: b3c8d5d36850e484b5cc84ab818a75db567a06a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3c8d5d36850e484b5cc84ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 09:50:31 2019 +0200 ntdll: Use static debug info before initialization is done. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/debugtools.c | 13 ++++++++++++- dlls/ntdll/thread.c | 5 ----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index 254673b..4e2fd78 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -43,11 +43,18 @@ WINE_DECLARE_DEBUG_CHANNEL(timestamp); static struct __wine_debug_functions default_funcs; -/* ---------------------------------------------------------------------- */ +static BOOL init_done; +static struct debug_info initial_info; /* debug info for initial thread */ /* get the debug info pointer for the current thread */ static inline struct debug_info *get_info(void) { + if (!init_done) + { + if (!initial_info.str_pos) initial_info.str_pos = initial_info.strings; + if (!initial_info.out_pos) initial_info.out_pos = initial_info.output; + return &initial_info; + } return ntdll_get_thread_data()->debug_info; } @@ -199,5 +206,9 @@ static const struct __wine_debug_functions funcs = */ void debug_init(void) { + if (!initial_info.str_pos) initial_info.str_pos = initial_info.strings; + if (!initial_info.out_pos) initial_info.out_pos = initial_info.output; + ntdll_get_thread_data()->debug_info = &initial_info; + init_done = TRUE; __wine_dbg_set_functions( &funcs, &default_funcs, sizeof(funcs) ); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 9f4a08f..6445ec6 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -163,7 +163,6 @@ void thread_init(void) LARGE_INTEGER now; NTSTATUS status; struct ntdll_thread_data *thread_data; - static struct debug_info debug_info; /* debug info for initial thread */ virtual_init(); @@ -231,13 +230,9 @@ void thread_init(void) thread_data->reply_fd = -1; thread_data->wait_fd[0] = -1; thread_data->wait_fd[1] = -1; - thread_data->debug_info = &debug_info; signal_init_thread( teb ); virtual_init_threading(); - - debug_info.str_pos = debug_info.strings; - debug_info.out_pos = debug_info.output; debug_init(); /* setup the server connection */

1 0

Alexandre Julliard : include: Make wine_dbgstr_an()/wine_dbgstr_wn() into inline functions.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 9f75f7189935aeec55df79a5abbc3d2691ec5f7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f75f7189935aeec55df79a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 19:23:43 2019 +0200 include: Make wine_dbgstr_an()/wine_dbgstr_wn() into inline functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/debugtools.c | 54 ++++++---------------------- dlls/ntdll/ntdll.spec | 3 ++ include/wine/debug.h | 96 +++++++++++++++++++++++++++++++++++++++++++++++-- libs/wine/debug.c | 4 +++ 4 files changed, 111 insertions(+), 46 deletions(-) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index 4e2fd78..42db30a 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -41,8 +41,6 @@ WINE_DECLARE_DEBUG_CHANNEL(pid); WINE_DECLARE_DEBUG_CHANNEL(timestamp); -static struct __wine_debug_functions default_funcs; - static BOOL init_done; static struct debug_info initial_info; /* debug info for initial thread */ @@ -77,49 +75,17 @@ static void release_temp_buffer( char *ptr, size_t size ) } /*********************************************************************** - * NTDLL_dbgstr_an + * __wine_dbg_strdup (NTDLL.@) */ -static const char *NTDLL_dbgstr_an( const char *src, int n ) +const char * __cdecl __wine_dbg_strdup( const char *str ) { - const char *res; struct debug_info *info = get_info(); - /* save current position to restore it on exception */ - char *old_pos = info->str_pos; - - __TRY - { - res = default_funcs.dbgstr_an( src, n ); - } - __EXCEPT_PAGE_FAULT - { - release_temp_buffer( old_pos, 0 ); - return "(invalid)"; - } - __ENDTRY - return res; -} - -/*********************************************************************** - * NTDLL_dbgstr_wn - */ -static const char *NTDLL_dbgstr_wn( const WCHAR *src, int n ) -{ - const char *res; - struct debug_info *info = get_info(); - /* save current position to restore it on exception */ - char *old_pos = info->str_pos; + char *res = info->str_pos; + size_t n = strlen( str ) + 1; - __TRY - { - res = default_funcs.dbgstr_wn( src, n ); - } - __EXCEPT_PAGE_FAULT - { - release_temp_buffer( old_pos, 0 ); - return "(invalid)"; - } - __ENDTRY - return res; + if (res + n > &info->strings[sizeof(info->strings)]) res = info->strings; + info->str_pos = res + n; + return strcpy( res, str ); } /*********************************************************************** @@ -195,8 +161,8 @@ static const struct __wine_debug_functions funcs = { get_temp_buffer, release_temp_buffer, - NTDLL_dbgstr_an, - NTDLL_dbgstr_wn, + wine_dbgstr_an, + wine_dbgstr_wn, NTDLL_dbg_vprintf, NTDLL_dbg_vlog }; @@ -210,5 +176,5 @@ void debug_init(void) if (!initial_info.out_pos) initial_info.out_pos = initial_info.output; ntdll_get_thread_data()->debug_info = &initial_info; init_done = TRUE; - __wine_dbg_set_functions( &funcs, &default_funcs, sizeof(funcs) ); + __wine_dbg_set_functions( &funcs, NULL, sizeof(funcs) ); } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 233c4ef..7622289 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1505,6 +1505,9 @@ @ cdecl wine_server_send_fd(long) @ cdecl __wine_make_process_system() +# Debugging +@ cdecl -norelay __wine_dbg_strdup(str) + # Virtual memory @ cdecl __wine_locked_recvmsg(long ptr long) diff --git a/include/wine/debug.h b/include/wine/debug.h index 07ac88d..65322d0 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -23,6 +23,9 @@ #include <stdarg.h> #include <windef.h> +#ifndef _NTSYSTEM_ +#include <winbase.h> +#endif #ifndef GUID_DEFINED #include <guiddef.h> #endif @@ -157,6 +160,7 @@ extern int __wine_dbg_set_channel_flags( struct __wine_debug_channel *channel, unsigned char set, unsigned char clear ); extern void __wine_dbg_set_functions( const struct __wine_debug_functions *new_funcs, struct __wine_debug_functions *old_funcs, size_t size ); +extern const char * __cdecl __wine_dbg_strdup( const char *str ); /* * Exported definitions and macros @@ -165,14 +169,102 @@ extern void __wine_dbg_set_functions( const struct __wine_debug_functions *new_f /* These functions return a printable version of a string, including quotes. The string will be valid for some time, but not indefinitely as strings are re-used. */ -extern const char *wine_dbgstr_an( const char * s, int n ); -extern const char *wine_dbgstr_wn( const WCHAR *s, int n ); extern const char *wine_dbg_sprintf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2); extern int wine_dbg_printf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2); extern int wine_dbg_log( enum __wine_debug_class cls, struct __wine_debug_channel *ch, const char *func, const char *format, ... ) __WINE_PRINTF_ATTR(4,5); +static inline const char *wine_dbgstr_an( const char *str, int n ) +{ + static const char hex[16] = "0123456789abcdef"; + char buffer[300], *dst = buffer; + + if (!str) return "(null)"; + if (!((ULONG_PTR)str >> 16)) return wine_dbg_sprintf( "#%04x", LOWORD(str) ); +#ifndef _NTSYSTEM_ + if (IsBadStringPtrA( str, n )) return "(invalid)"; +#endif + if (n == -1) for (n = 0; str[n]; n++) ; + *dst++ = '"'; + while (n-- > 0 && dst <= buffer + sizeof(buffer) - 9) + { + unsigned char c = *str++; + switch (c) + { + case '\n': *dst++ = '\\'; *dst++ = 'n'; break; + case '\r': *dst++ = '\\'; *dst++ = 'r'; break; + case '\t': *dst++ = '\\'; *dst++ = 't'; break; + case '"': *dst++ = '\\'; *dst++ = '"'; break; + case '\\': *dst++ = '\\'; *dst++ = '\\'; break; + default: + if (c < ' ' || c >= 127) + { + *dst++ = '\\'; + *dst++ = 'x'; + *dst++ = hex[(c >> 4) & 0x0f]; + *dst++ = hex[c & 0x0f]; + } + else *dst++ = c; + } + } + *dst++ = '"'; + if (n > 0) + { + *dst++ = '.'; + *dst++ = '.'; + *dst++ = '.'; + } + *dst = 0; + return __wine_dbg_strdup( buffer ); +} + +static inline const char *wine_dbgstr_wn( const WCHAR *str, int n ) +{ + static const char hex[16] = "0123456789abcdef"; + char buffer[300], *dst = buffer; + + if (!str) return "(null)"; + if (!((ULONG_PTR)str >> 16)) return wine_dbg_sprintf( "#%04x", LOWORD(str) ); +#ifndef _NTSYSTEM_ + if (IsBadStringPtrW( str, n )) return "(invalid)"; +#endif + if (n == -1) for (n = 0; str[n]; n++) ; + *dst++ = 'L'; + *dst++ = '"'; + while (n-- > 0 && dst <= buffer + sizeof(buffer) - 10) + { + WCHAR c = *str++; + switch (c) + { + case '\n': *dst++ = '\\'; *dst++ = 'n'; break; + case '\r': *dst++ = '\\'; *dst++ = 'r'; break; + case '\t': *dst++ = '\\'; *dst++ = 't'; break; + case '"': *dst++ = '\\'; *dst++ = '"'; break; + case '\\': *dst++ = '\\'; *dst++ = '\\'; break; + default: + if (c < ' ' || c >= 127) + { + *dst++ = '\\'; + *dst++ = hex[(c >> 12) & 0x0f]; + *dst++ = hex[(c >> 8) & 0x0f]; + *dst++ = hex[(c >> 4) & 0x0f]; + *dst++ = hex[c & 0x0f]; + } + else *dst++ = c; + } + } + *dst++ = '"'; + if (n > 0) + { + *dst++ = '.'; + *dst++ = '.'; + *dst++ = '.'; + } + *dst = 0; + return __wine_dbg_strdup( buffer ); +} + static inline const char *wine_dbgstr_a( const char *s ) { return wine_dbgstr_an( s, -1 ); diff --git a/libs/wine/debug.c b/libs/wine/debug.c index ae12356..0c3b4ef 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -30,6 +30,8 @@ # include <sys/stat.h> #endif +#define wine_dbgstr_an wine_dbgstr_an_inline +#define wine_dbgstr_wn wine_dbgstr_wn_inline #include "wine/debug.h" #include "wine/library.h" @@ -420,11 +422,13 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch /* wrappers to use the function pointers */ +#undef wine_dbgstr_an const char *wine_dbgstr_an( const char * s, int n ) { return funcs.dbgstr_an(s, n); } +#undef wine_dbgstr_wn const char *wine_dbgstr_wn( const WCHAR *s, int n ) { return funcs.dbgstr_wn(s, n);

1 0

Alexandre Julliard : include: Make wine_dbg_sprintf() into an inline function.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: f2e6f05fe33a2933e45c0741847bf0dbbf43b940 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e6f05fe33a2933e45c0741… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 10:02:14 2019 +0200 include: Make wine_dbg_sprintf() into an inline function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/debug.h | 26 +++++++++++++++++++++++++- libs/wine/debug.c | 2 ++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 65322d0..fd8e56e 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -22,6 +22,7 @@ #define __WINE_WINE_DEBUG_H #include <stdarg.h> +#include <stdio.h> #include <windef.h> #ifndef _NTSYSTEM_ #include <winbase.h> @@ -169,12 +170,35 @@ extern const char * __cdecl __wine_dbg_strdup( const char *str ); /* These functions return a printable version of a string, including quotes. The string will be valid for some time, but not indefinitely as strings are re-used. */ -extern const char *wine_dbg_sprintf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2); extern int wine_dbg_printf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2); extern int wine_dbg_log( enum __wine_debug_class cls, struct __wine_debug_channel *ch, const char *func, const char *format, ... ) __WINE_PRINTF_ATTR(4,5); +#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +# define __wine_dbg_cdecl __cdecl +# define __wine_dbg_va_list __builtin_ms_va_list +# define __wine_dbg_va_start(list,arg) __builtin_ms_va_start(list,arg) +# define __wine_dbg_va_end(list) __builtin_ms_va_end(list) +#else +# define __wine_dbg_cdecl +# define __wine_dbg_va_list va_list +# define __wine_dbg_va_start(list,arg) va_start(list,arg) +# define __wine_dbg_va_end(list) va_end(list) +#endif + +static const char * __wine_dbg_cdecl wine_dbg_sprintf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2); +static inline const char * __wine_dbg_cdecl wine_dbg_sprintf( const char *format, ... ) +{ + char buffer[200]; + __wine_dbg_va_list args; + + __wine_dbg_va_start( args, format ); + vsnprintf( buffer, sizeof(buffer), format, args ); + __wine_dbg_va_end( args ); + return __wine_dbg_strdup( buffer ); +} + static inline const char *wine_dbgstr_an( const char *str, int n ) { static const char hex[16] = "0123456789abcdef"; diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 0c3b4ef..1bf59dd 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -30,6 +30,7 @@ # include <sys/stat.h> #endif +#define wine_dbg_sprintf wine_dbg_sprintf_inline #define wine_dbgstr_an wine_dbgstr_an_inline #define wine_dbgstr_wn wine_dbgstr_wn_inline #include "wine/debug.h" @@ -228,6 +229,7 @@ int wine_dbg_printf( const char *format, ... ) } /* printf with temp buffer allocation */ +#undef wine_dbg_sprintf const char *wine_dbg_sprintf( const char *format, ... ) { static const int max_size = 200;

1 0

Alexandre Julliard : include: Make wine_dbg_printf() into an inline function.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: ddf1ff2f6ae39e6962441a5a88439755ff72c525 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddf1ff2f6ae39e6962441a5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 19:24:39 2019 +0200 include: Make wine_dbg_printf() into an inline function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/debugtools.c | 34 ++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + include/wine/debug.h | 14 +++++++++++++- libs/wine/debug.c | 2 ++ 4 files changed, 50 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index 42db30a..9c3add4 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -74,6 +74,20 @@ static void release_temp_buffer( char *ptr, size_t size ) info->str_pos = ptr + size; } +/* add a string to the output buffer */ +static int append_output( struct debug_info *info, const char *str, size_t len ) +{ + if (len >= sizeof(info->output) - (info->out_pos - info->output)) + { + fprintf( stderr, "wine_dbg_output: debugstr buffer overflow (contents: '%s')\n", info->output ); + info->out_pos = info->output; + abort(); + } + memcpy( info->out_pos, str, len ); + info->out_pos += len; + return len; +} + /*********************************************************************** * __wine_dbg_strdup (NTDLL.@) */ @@ -89,6 +103,26 @@ const char * __cdecl __wine_dbg_strdup( const char *str ) } /*********************************************************************** + * __wine_dbg_output (NTDLL.@) + */ +int __cdecl __wine_dbg_output( const char *str ) +{ + struct debug_info *info = get_info(); + const char *end = strrchr( str, '\n' ); + int ret = 0; + + if (end) + { + ret += append_output( info, str, end + 1 - str ); + write( 2, info->output, info->out_pos - info->output ); + info->out_pos = info->output; + str = end + 1; + } + if (*str) ret += append_output( info, str, strlen( str )); + return ret; +} + +/*********************************************************************** * NTDLL_dbg_vprintf */ static int NTDLL_dbg_vprintf( const char *format, va_list args ) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7622289..98991ad 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1506,6 +1506,7 @@ @ cdecl __wine_make_process_system() # Debugging +@ cdecl -norelay __wine_dbg_output(str) @ cdecl -norelay __wine_dbg_strdup(str) # Virtual memory diff --git a/include/wine/debug.h b/include/wine/debug.h index fd8e56e..2412c2b 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -162,6 +162,7 @@ extern int __wine_dbg_set_channel_flags( struct __wine_debug_channel *channel, extern void __wine_dbg_set_functions( const struct __wine_debug_functions *new_funcs, struct __wine_debug_functions *old_funcs, size_t size ); extern const char * __cdecl __wine_dbg_strdup( const char *str ); +extern int __cdecl __wine_dbg_output( const char *str ); /* * Exported definitions and macros @@ -171,7 +172,6 @@ extern const char * __cdecl __wine_dbg_strdup( const char *str ); quotes. The string will be valid for some time, but not indefinitely as strings are re-used. */ -extern int wine_dbg_printf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2); extern int wine_dbg_log( enum __wine_debug_class cls, struct __wine_debug_channel *ch, const char *func, const char *format, ... ) __WINE_PRINTF_ATTR(4,5); @@ -199,6 +199,18 @@ static inline const char * __wine_dbg_cdecl wine_dbg_sprintf( const char *format return __wine_dbg_strdup( buffer ); } +static int __wine_dbg_cdecl wine_dbg_printf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2); +static inline int __wine_dbg_cdecl wine_dbg_printf( const char *format, ... ) +{ + char buffer[1024]; + __wine_dbg_va_list args; + + __wine_dbg_va_start( args, format ); + vsnprintf( buffer, sizeof(buffer), format, args ); + __wine_dbg_va_end( args ); + return __wine_dbg_output( buffer ); +} + static inline const char *wine_dbgstr_an( const char *str, int n ) { static const char hex[16] = "0123456789abcdef"; diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 1bf59dd..2d56b01 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -31,6 +31,7 @@ #endif #define wine_dbg_sprintf wine_dbg_sprintf_inline +#define wine_dbg_printf wine_dbg_printf_inline #define wine_dbgstr_an wine_dbgstr_an_inline #define wine_dbgstr_wn wine_dbgstr_wn_inline #include "wine/debug.h" @@ -217,6 +218,7 @@ static void debug_init(void) } /* varargs wrapper for funcs.dbg_vprintf */ +#undef wine_dbg_printf int wine_dbg_printf( const char *format, ... ) { int ret;

1 0

Alexandre Julliard : ntdll: Export __wine_dbg_get_channel_flags().
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 9911cfdeae63539110d991a5915b339219d3f0e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9911cfdeae63539110d991a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 19:25:28 2019 +0200 ntdll: Export __wine_dbg_get_channel_flags(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/debugtools.c | 153 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + include/wine/debug.h | 4 +- libs/wine/debug.c | 2 + libs/wine/wine.def | 2 +- 5 files changed, 158 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index 9c3add4..1e4a3a1 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -43,6 +43,12 @@ WINE_DECLARE_DEBUG_CHANNEL(timestamp); static BOOL init_done; static struct debug_info initial_info; /* debug info for initial thread */ +static unsigned char default_flags = (1 << __WINE_DBCL_ERR) | (1 << __WINE_DBCL_FIXME); +static int nb_debug_options = -1; +static int options_size; +static struct __wine_debug_channel *debug_options; + +static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; /* get the debug info pointer for the current thread */ static inline struct debug_info *get_info(void) @@ -88,6 +94,153 @@ static int append_output( struct debug_info *info, const char *str, size_t len ) return len; } +/* add a new debug option at the end of the option list */ +static void add_option( const char *name, unsigned char set, unsigned char clear ) +{ + int min = 0, max = nb_debug_options - 1, pos, res; + + if (!name[0]) /* "all" option */ + { + default_flags = (default_flags & ~clear) | set; + return; + } + if (strlen(name) >= sizeof(debug_options[0].name)) return; + + while (min <= max) + { + pos = (min + max) / 2; + res = strcmp( name, debug_options[pos].name ); + if (!res) + { + debug_options[pos].flags = (debug_options[pos].flags & ~clear) | set; + return; + } + if (res < 0) max = pos - 1; + else min = pos + 1; + } + if (nb_debug_options >= options_size) + { + options_size = max( options_size * 2, 16 ); + debug_options = realloc( debug_options, options_size * sizeof(debug_options[0]) ); + } + + pos = min; + if (pos < nb_debug_options) memmove( &debug_options[pos + 1], &debug_options[pos], + (nb_debug_options - pos) * sizeof(debug_options[0]) ); + strcpy( debug_options[pos].name, name ); + debug_options[pos].flags = (default_flags & ~clear) | set; + nb_debug_options++; +} + +/* parse a set of debugging option specifications and add them to the option list */ +static void parse_options( const char *str ) +{ + char *opt, *next, *options; + unsigned int i; + + if (!(options = strdup(str))) return; + for (opt = options; opt; opt = next) + { + const char *p; + unsigned char set = 0, clear = 0; + + if ((next = strchr( opt, ',' ))) *next++ = 0; + + p = opt + strcspn( opt, "+-" ); + if (!p[0]) p = opt; /* assume it's a debug channel name */ + + if (p > opt) + { + for (i = 0; i < ARRAY_SIZE(debug_classes); i++) + { + int len = strlen(debug_classes[i]); + if (len != (p - opt)) continue; + if (!memcmp( opt, debug_classes[i], len )) /* found it */ + { + if (*p == '+') set |= 1 << i; + else clear |= 1 << i; + break; + } + } + if (i == ARRAY_SIZE(debug_classes)) /* bad class name, skip it */ + continue; + } + else + { + if (*p == '-') clear = ~0; + else set = ~0; + } + if (*p == '+' || *p == '-') p++; + if (!p[0]) continue; + + if (!strcmp( p, "all" )) + default_flags = (default_flags & ~clear) | set; + else + add_option( p, set, clear ); + } + free( options ); +} + +/* print the usage message */ +static void debug_usage(void) +{ + static const char usage[] = + "Syntax of the WINEDEBUG variable:\n" + " WINEDEBUG=[class]+xxx,[class]-yyy,...\n\n" + "Example: WINEDEBUG=+relay,warn-heap\n" + " turns on relay traces, disable heap warnings\n" + "Available message classes: err, warn, fixme, trace\n"; + write( 2, usage, sizeof(usage) - 1 ); + exit(1); +} + +/* initialize all options at startup */ +static void init_options(void) +{ + char *wine_debug = getenv("WINEDEBUG"); + struct stat st1, st2; + + nb_debug_options = 0; + + /* check for stderr pointing to /dev/null */ + if (!fstat( 2, &st1 ) && S_ISCHR(st1.st_mode) && + !stat( "/dev/null", &st2 ) && S_ISCHR(st2.st_mode) && + st1.st_rdev == st2.st_rdev) + { + default_flags = 0; + return; + } + if (!wine_debug) return; + if (!strcmp( wine_debug, "help" )) debug_usage(); + parse_options( wine_debug ); +} + +/*********************************************************************** + * __wine_dbg_get_channel_flags (NTDLL.@) + * + * Get the flags to use for a given channel, possibly setting them too in case of lazy init + */ +unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ) +{ + int min, max, pos, res; + + if (nb_debug_options == -1) init_options(); + + min = 0; + max = nb_debug_options - 1; + while (min <= max) + { + pos = (min + max) / 2; + res = strcmp( channel->name, debug_options[pos].name ); + if (!res) return debug_options[pos].flags; + if (res < 0) max = pos - 1; + else min = pos + 1; + } + /* no option for this channel */ + if (channel->flags & (1 << __WINE_DBCL_INIT)) channel->flags = default_flags; + return default_flags; +} + /*********************************************************************** * __wine_dbg_strdup (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 98991ad..b608ab9 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1506,6 +1506,7 @@ @ cdecl __wine_make_process_system() # Debugging +@ cdecl -norelay __wine_dbg_get_channel_flags(ptr) @ cdecl -norelay __wine_dbg_output(str) @ cdecl -norelay __wine_dbg_strdup(str) diff --git a/include/wine/debug.h b/include/wine/debug.h index 2412c2b..416b6c8 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -156,9 +156,7 @@ struct __wine_debug_functions const char *function, const char *format, va_list args ); }; -extern unsigned char __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ); -extern int __wine_dbg_set_channel_flags( struct __wine_debug_channel *channel, - unsigned char set, unsigned char clear ); +extern unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ); extern void __wine_dbg_set_functions( const struct __wine_debug_functions *new_funcs, struct __wine_debug_functions *old_funcs, size_t size ); extern const char * __cdecl __wine_dbg_strdup( const char *str ); diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 2d56b01..b9c7e0b 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -30,6 +30,7 @@ # include <sys/stat.h> #endif +#define __wine_dbg_get_channel_flags __wine_dbg_get_channel_flags_inline #define wine_dbg_sprintf wine_dbg_sprintf_inline #define wine_dbg_printf wine_dbg_printf_inline #define wine_dbgstr_an wine_dbgstr_an_inline @@ -61,6 +62,7 @@ static int cmp_name( const void *p1, const void *p2 ) } /* get the flags to use for a given channel, possibly setting them too in case of lazy init */ +#undef __wine_dbg_get_channel_flags unsigned char __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ) { if (nb_debug_options == -1) debug_init(); diff --git a/libs/wine/wine.def b/libs/wine/wine.def index ed315bd..3c88f8a 100644 --- a/libs/wine/wine.def +++ b/libs/wine/wine.def @@ -1,7 +1,7 @@ LIBRARY libwine.dll EXPORTS - __wine_dbg_get_channel_flags + __wine_dbg_get_channel_flags PRIVATE __wine_dbg_set_channel_flags __wine_dbg_set_functions __wine_dll_register

1 0

Alexandre Julliard : include: Make wine_dbg_log() into an inline function.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: cf8193df5b4c5a09208e40d8f3183c00187c8bd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf8193df5b4c5a09208e40d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 19:27:13 2019 +0200 include: Make wine_dbg_log() into an inline function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/debugtools.c | 32 ++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + include/wine/debug.h | 30 +++++++++++++++++++++++++++--- libs/wine/debug.c | 2 ++ 4 files changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index 1e4a3a1..94d2de7 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -276,6 +276,38 @@ int __cdecl __wine_dbg_output( const char *str ) } /*********************************************************************** + * __wine_dbg_header (NTDLL.@) + */ +int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *function ) +{ + static const char * const classes[] = { "fixme", "err", "warn", "trace" }; + struct debug_info *info = get_info(); + char buffer[200], *pos = buffer; + + if (!(__wine_dbg_get_channel_flags( channel ) & (1 << cls))) return -1; + + /* only print header if we are at the beginning of the line */ + if (info->out_pos > info->output) return 0; + + if (init_done) + { + if (TRACE_ON(timestamp)) + { + ULONG ticks = NtGetTickCount(); + pos += sprintf( pos, "%3u.%03u:", ticks / 1000, ticks % 1000 ); + } + if (TRACE_ON(pid)) pos += sprintf( pos, "%04x:", GetCurrentProcessId() ); + pos += sprintf( pos, "%04x:", GetCurrentThreadId() ); + } + if (function && cls < ARRAY_SIZE( classes )) + snprintf( pos, sizeof(buffer) - (pos - buffer), "%s:%s:%s ", + classes[cls], channel->name, function ); + + return append_output( info, buffer, strlen( buffer )); +} + +/*********************************************************************** * NTDLL_dbg_vprintf */ static int NTDLL_dbg_vprintf( const char *format, va_list args ) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b608ab9..292b0f6 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1507,6 +1507,7 @@ # Debugging @ cdecl -norelay __wine_dbg_get_channel_flags(ptr) +@ cdecl -norelay __wine_dbg_header(long long str) @ cdecl -norelay __wine_dbg_output(str) @ cdecl -norelay __wine_dbg_strdup(str) diff --git a/include/wine/debug.h b/include/wine/debug.h index 416b6c8..e95fcfb 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -161,6 +161,8 @@ extern void __wine_dbg_set_functions( const struct __wine_debug_functions *new_f struct __wine_debug_functions *old_funcs, size_t size ); extern const char * __cdecl __wine_dbg_strdup( const char *str ); extern int __cdecl __wine_dbg_output( const char *str ); +extern int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *function ); /* * Exported definitions and macros @@ -170,9 +172,6 @@ extern int __cdecl __wine_dbg_output( const char *str ); quotes. The string will be valid for some time, but not indefinitely as strings are re-used. */ -extern int wine_dbg_log( enum __wine_debug_class cls, struct __wine_debug_channel *ch, const char *func, - const char *format, ... ) __WINE_PRINTF_ATTR(4,5); - #if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) # define __wine_dbg_cdecl __cdecl # define __wine_dbg_va_list __builtin_ms_va_list @@ -209,6 +208,31 @@ static inline int __wine_dbg_cdecl wine_dbg_printf( const char *format, ... ) return __wine_dbg_output( buffer ); } +static int __wine_dbg_cdecl wine_dbg_log( enum __wine_debug_class cls, + struct __wine_debug_channel *channel, const char *func, + const char *format, ... ) __WINE_PRINTF_ATTR(4,5); +static inline int __wine_dbg_cdecl wine_dbg_log( enum __wine_debug_class cls, + struct __wine_debug_channel *channel, + const char *function, const char *format, ... ) +{ + char buffer[1024]; + __wine_dbg_va_list args; + int ret; + + if (*format == '\1') /* special magic to avoid standard prefix */ + { + format++; + function = NULL; + } + if ((ret = __wine_dbg_header( cls, channel, function )) == -1) return ret; + + __wine_dbg_va_start( args, format ); + vsnprintf( buffer, sizeof(buffer), format, args ); + __wine_dbg_va_end( args ); + ret += __wine_dbg_output( buffer ); + return ret; +} + static inline const char *wine_dbgstr_an( const char *str, int n ) { static const char hex[16] = "0123456789abcdef"; diff --git a/libs/wine/debug.c b/libs/wine/debug.c index b9c7e0b..b19fefe 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -33,6 +33,7 @@ #define __wine_dbg_get_channel_flags __wine_dbg_get_channel_flags_inline #define wine_dbg_sprintf wine_dbg_sprintf_inline #define wine_dbg_printf wine_dbg_printf_inline +#define wine_dbg_log wine_dbg_log_inline #define wine_dbgstr_an wine_dbgstr_an_inline #define wine_dbgstr_wn wine_dbgstr_wn_inline #include "wine/debug.h" @@ -252,6 +253,7 @@ const char *wine_dbg_sprintf( const char *format, ... ) /* varargs wrapper for funcs.dbg_vlog */ +#undef wine_dbg_log int wine_dbg_log( enum __wine_debug_class cls, struct __wine_debug_channel *channel, const char *func, const char *format, ... ) {

1 0

Alexandre Julliard : ntdll: Remove no longer used debug functions.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: f438ff566d9cf1928a272afdec0c4f29a17b7e2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f438ff566d9cf1928a272afd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 14:11:42 2019 +0200 ntdll: Remove no longer used debug functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/debugtools.c | 104 ------------------------------------------------ include/wine/debug.h | 13 ------ libs/wine/debug.c | 18 +++++---- 3 files changed, 10 insertions(+), 125 deletions(-) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index 94d2de7..790af11 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -28,14 +28,8 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#include <ctype.h> #include "wine/debug.h" -#include "wine/exception.h" -#include "wine/library.h" -#include "wine/unicode.h" -#include "winnt.h" -#include "winternl.h" #include "ntdll_misc.h" WINE_DECLARE_DEBUG_CHANNEL(pid); @@ -62,24 +56,6 @@ static inline struct debug_info *get_info(void) return ntdll_get_thread_data()->debug_info; } -/* allocate some tmp space for a string */ -static char *get_temp_buffer( size_t n ) -{ - struct debug_info *info = get_info(); - char *res = info->str_pos; - - if (res + n >= &info->strings[sizeof(info->strings)]) res = info->strings; - info->str_pos = res + n; - return res; -} - -/* release extra space that we requested in get_temp_buffer() */ -static void release_temp_buffer( char *ptr, size_t size ) -{ - struct debug_info *info = get_info(); - info->str_pos = ptr + size; -} - /* add a string to the output buffer */ static int append_output( struct debug_info *info, const char *str, size_t len ) { @@ -308,85 +284,6 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_ } /*********************************************************************** - * NTDLL_dbg_vprintf - */ -static int NTDLL_dbg_vprintf( const char *format, va_list args ) -{ - struct debug_info *info = get_info(); - int end; - - int ret = vsnprintf( info->out_pos, sizeof(info->output) - (info->out_pos - info->output), - format, args ); - - /* make sure we didn't exceed the buffer length - * the two checks are due to glibc changes in vsnprintfs return value - * the buffer size can be exceeded in case of a missing \n in - * debug output */ - if ((ret == -1) || (ret >= sizeof(info->output) - (info->out_pos - info->output))) - { - fprintf( stderr, "wine_dbg_vprintf: debugstr buffer overflow (contents: '%s')\n", - info->output); - info->out_pos = info->output; - abort(); - } - - for (end = ret; end > 0; end--) if (info->out_pos[end - 1] == '\n') break; - - if (!end) info->out_pos += ret; - else - { - char *pos = info->output; - write( 2, pos, info->out_pos + end - pos ); - /* move beginning of next line to start of buffer */ - memmove( pos, info->out_pos + end, ret - end ); - info->out_pos = pos + ret - end; - } - return ret; -} - -/*********************************************************************** - * NTDLL_dbg_vlog - */ -static int NTDLL_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_channel *channel, - const char *function, const char *format, va_list args ) -{ - static const char * const classes[] = { "fixme", "err", "warn", "trace" }; - struct debug_info *info = get_info(); - int ret = 0; - - /* only print header if we are at the beginning of the line */ - if (info->out_pos == info->output || info->out_pos[-1] == '\n') - { - if (TRACE_ON(timestamp)) - { - ULONG ticks = NtGetTickCount(); - ret = wine_dbg_printf( "%3u.%03u:", ticks / 1000, ticks % 1000 ); - } - if (TRACE_ON(pid)) - ret += wine_dbg_printf( "%04x:", GetCurrentProcessId() ); - ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); - if (*format == '\1') /* special magic to avoid standard prefix */ - format++; - else if (cls < ARRAY_SIZE( classes )) - ret += wine_dbg_printf( "%s:%s:%s ", classes[cls], channel->name, function ); - } - if (format) - ret += NTDLL_dbg_vprintf( format, args ); - return ret; -} - - -static const struct __wine_debug_functions funcs = -{ - get_temp_buffer, - release_temp_buffer, - wine_dbgstr_an, - wine_dbgstr_wn, - NTDLL_dbg_vprintf, - NTDLL_dbg_vlog -}; - -/*********************************************************************** * debug_init */ void debug_init(void) @@ -395,5 +292,4 @@ void debug_init(void) if (!initial_info.out_pos) initial_info.out_pos = initial_info.output; ntdll_get_thread_data()->debug_info = &initial_info; init_done = TRUE; - __wine_dbg_set_functions( &funcs, NULL, sizeof(funcs) ); } diff --git a/include/wine/debug.h b/include/wine/debug.h index e95fcfb..c7eb185 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -145,20 +145,7 @@ struct __wine_debug_channel #endif /* !__GNUC__ && !__SUNPRO_C */ -struct __wine_debug_functions -{ - char * (*get_temp_buffer)( size_t n ); - void (*release_temp_buffer)( char *buffer, size_t n ); - const char * (*dbgstr_an)( const char * s, int n ); - const char * (*dbgstr_wn)( const WCHAR *s, int n ); - int (*dbg_vprintf)( const char *format, va_list args ); - int (*dbg_vlog)( enum __wine_debug_class cls, struct __wine_debug_channel *channel, - const char *function, const char *format, va_list args ); -}; - extern unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ); -extern void __wine_dbg_set_functions( const struct __wine_debug_functions *new_funcs, - struct __wine_debug_functions *old_funcs, size_t size ); extern const char * __cdecl __wine_dbg_strdup( const char *str ); extern int __cdecl __wine_dbg_output( const char *str ); extern int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_channel *channel, diff --git a/libs/wine/debug.c b/libs/wine/debug.c index b19fefe..0e71022 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -39,9 +39,16 @@ #include "wine/debug.h" #include "wine/library.h" -#if defined(__MINGW32__) || defined(_MSC_VER) -WINE_DECLARE_DEBUG_CHANNEL(pid); -#endif +struct __wine_debug_functions +{ + char * (*get_temp_buffer)( size_t n ); + void (*release_temp_buffer)( char *buffer, size_t n ); + const char * (*dbgstr_an)( const char * s, int n ); + const char * (*dbgstr_wn)( const WCHAR *s, int n ); + int (*dbg_vprintf)( const char *format, va_list args ); + int (*dbg_vlog)( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *function, const char *format, va_list args ); +}; static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; @@ -416,11 +423,6 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch { int ret = 0; -#if defined(__MINGW32__) || defined(_MSC_VER) - if (TRACE_ON(pid)) - ret += wine_dbg_printf( "%04x:", GetCurrentProcessId() ); - ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); -#endif if (cls < ARRAY_SIZE(debug_classes)) ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel->name, func ); if (format)

1 0

Alexandre Julliard : ntdll: Store offsets instead of pointers in the debug_info structure.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: c9bf52502ce986ae73a712146f81a0430afdc24f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9bf52502ce986ae73a71214… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 14:16:29 2019 +0200 ntdll: Store offsets instead of pointers in the debug_info structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/debugtools.c | 30 ++++++++++++------------------ dlls/ntdll/ntdll_misc.h | 8 ++++---- dlls/ntdll/thread.c | 3 +-- 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index 790af11..64355ab 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -47,25 +47,20 @@ static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; /* get the debug info pointer for the current thread */ static inline struct debug_info *get_info(void) { - if (!init_done) - { - if (!initial_info.str_pos) initial_info.str_pos = initial_info.strings; - if (!initial_info.out_pos) initial_info.out_pos = initial_info.output; - return &initial_info; - } + if (!init_done) return &initial_info; return ntdll_get_thread_data()->debug_info; } /* add a string to the output buffer */ static int append_output( struct debug_info *info, const char *str, size_t len ) { - if (len >= sizeof(info->output) - (info->out_pos - info->output)) + if (len >= sizeof(info->output) - info->out_pos) { fprintf( stderr, "wine_dbg_output: debugstr buffer overflow (contents: '%s')\n", info->output ); - info->out_pos = info->output; + info->out_pos = 0; abort(); } - memcpy( info->out_pos, str, len ); + memcpy( info->output + info->out_pos, str, len ); info->out_pos += len; return len; } @@ -223,12 +218,13 @@ unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel const char * __cdecl __wine_dbg_strdup( const char *str ) { struct debug_info *info = get_info(); - char *res = info->str_pos; + unsigned int pos = info->str_pos; size_t n = strlen( str ) + 1; - if (res + n > &info->strings[sizeof(info->strings)]) res = info->strings; - info->str_pos = res + n; - return strcpy( res, str ); + assert( n <= sizeof(info->strings) ); + if (pos + n > sizeof(info->strings)) pos = 0; + info->str_pos = pos + n; + return memcpy( info->strings + pos, str, n ); } /*********************************************************************** @@ -243,8 +239,8 @@ int __cdecl __wine_dbg_output( const char *str ) if (end) { ret += append_output( info, str, end + 1 - str ); - write( 2, info->output, info->out_pos - info->output ); - info->out_pos = info->output; + write( 2, info->output, info->out_pos ); + info->out_pos = 0; str = end + 1; } if (*str) ret += append_output( info, str, strlen( str )); @@ -264,7 +260,7 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_ if (!(__wine_dbg_get_channel_flags( channel ) & (1 << cls))) return -1; /* only print header if we are at the beginning of the line */ - if (info->out_pos > info->output) return 0; + if (info->out_pos) return 0; if (init_done) { @@ -288,8 +284,6 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_ */ void debug_init(void) { - if (!initial_info.str_pos) initial_info.str_pos = initial_info.strings; - if (!initial_info.out_pos) initial_info.out_pos = initial_info.output; ntdll_get_thread_data()->debug_info = &initial_info; init_done = TRUE; } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index ca04583..6a60912 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -221,10 +221,10 @@ extern enum loadorder get_load_order( const WCHAR *app_name, const UNICODE_STRIN struct debug_info { - char *str_pos; /* current position in strings buffer */ - char *out_pos; /* current position in output buffer */ - char strings[1024]; /* buffer for temporary strings */ - char output[1024]; /* current output line */ + unsigned int str_pos; /* current position in strings buffer */ + unsigned int out_pos; /* current position in output buffer */ + char strings[1024]; /* buffer for temporary strings */ + char output[1024]; /* current output line */ }; /* thread private data, stored in NtCurrentTeb()->GdiTebBatch */ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 6445ec6..be46218 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -367,8 +367,7 @@ static void start_thread( struct startup_info *info ) struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; struct debug_info debug_info; - debug_info.str_pos = debug_info.strings; - debug_info.out_pos = debug_info.output; + debug_info.str_pos = debug_info.out_pos = 0; thread_data->debug_info = &debug_info; thread_data->pthread_id = pthread_self();

1 0

Alexandre Julliard : winecrt0: Add a fallback implementation of __wine_dbg_strdup().
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: d6060b7cf76cd1f45327b68f65caef8ea9da96a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6060b7cf76cd1f45327b68f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 19:24:02 2019 +0200 winecrt0: Add a fallback implementation of __wine_dbg_strdup(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/Makefile.in | 1 + dlls/winecrt0/debug.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 6b7c3e8..79ba92f 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -1,6 +1,7 @@ MODULE = libwinecrt0.a C_SRCS = \ + debug.c \ delay_load.c \ dll_entry.c \ dll_main.c \ diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c new file mode 100644 index 0000000..1eb5a46 --- /dev/null +++ b/dlls/winecrt0/debug.c @@ -0,0 +1,62 @@ +/* + * Fallbacks for debugging functions when running on Windows + * + * Copyright 2019 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef _WIN32 + +#include "config.h" +#include "wine/port.h" + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +static const char * (__cdecl *p__wine_dbg_strdup)( const char *str ); + +static void load_func( void **func, const char *name, void *def ) +{ + if (!*func) + { + HMODULE module = GetModuleHandleA( "ntdll.dll" ); + void *proc = GetProcAddress( module, name ); + interlocked_xchg_ptr( func, proc ? proc : def ); + } +} +#define LOAD_FUNC(name) load_func( (void **)&p ## name, #name, fallback ## name ) + +/* FIXME: this is not 100% thread-safe */ +static const char * __cdecl fallback__wine_dbg_strdup( const char *str ) +{ + static char *list[32]; + static int pos; + char *ret = _strdup( str ); + int idx; + + idx = interlocked_xchg_add( &pos, 1 ) % ARRAY_SIZE(list); + free( interlocked_xchg_ptr( (void **)&list[idx], ret )); + return ret; +} + +const char * __cdecl __wine_dbg_strdup( const char *str ) +{ + LOAD_FUNC( __wine_dbg_strdup ); + return p__wine_dbg_strdup( str ); +} + +#endif /* _WIN32 */

1 0