September 2022 - Wine-Commits

Alexandre Julliard : ntdll/tests: Fix some race conditions.
by Alexandre Julliard Sept. 1, 2022

Sept. 1, 2022

Module: wine Branch: master Commit: e4e26bbc3eff51a3afe63fbd7eea1f4a837218ae URL: https://gitlab.winehq.org/wine/wine/-/commit/e4e26bbc3eff51a3afe63fbd7eea1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 1 11:58:50 2022 +0200 ntdll/tests: Fix some race conditions. --- dlls/ntdll/tests/threadpool.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 18ccca11874..008755e6e5d 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -1163,11 +1163,6 @@ static void CALLBACK instance_semaphore_completion_cb(TP_CALLBACK_INSTANCE *inst static void CALLBACK instance_finalization_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) { HANDLE *semaphores = userdata; - DWORD result; - - Sleep(50); - result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); ReleaseSemaphore(semaphores[1], 1, NULL); } @@ -1926,7 +1921,7 @@ static void test_tp_multi_wait(void) multi_wait_info.result = 0; ReleaseSemaphore(semaphores[i], 1, NULL); - result = WaitForSingleObject(semaphore, 100); + result = WaitForSingleObject(semaphore, 2000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); ok(multi_wait_info.result == i, "expected result %d, got %lu\n", i, multi_wait_info.result); @@ -1939,7 +1934,7 @@ static void test_tp_multi_wait(void) multi_wait_info.result = 0; ReleaseSemaphore(semaphores[i], 1, NULL); - result = WaitForSingleObject(semaphore, 100); + result = WaitForSingleObject(semaphore, 2000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); ok(multi_wait_info.result == i, "expected result %d, got %lu\n", i, multi_wait_info.result); @@ -1956,7 +1951,7 @@ static void test_tp_multi_wait(void) for (i = 0; i < ARRAY_SIZE(semaphores); i++) { - result = WaitForSingleObject(semaphore, 150); + result = WaitForSingleObject(semaphore, 2000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); }

1 0

Alexandre Julliard : include: Always use the standard varargs macros.
by Alexandre Julliard Sept. 1, 2022

Sept. 1, 2022

Module: wine Branch: master Commit: 30281362210e987ffc3aa4dcfc1183683b679abc URL: https://gitlab.winehq.org/wine/wine/-/commit/30281362210e987ffc3aa4dcfc1183… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 1 10:24:20 2022 +0200 include: Always use the standard varargs macros. --- include/wine/debug.h | 45 +++------------------------------------------ 1 file changed, 3 insertions(+), 42 deletions(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 55497e9d73f..c20924818dd 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -81,49 +81,21 @@ struct __wine_debug_channel #define __WINE_IS_DEBUG_ON(dbcl,dbch) \ (__WINE_GET_DEBUGGING##dbcl(dbch) && (__wine_dbg_get_channel_flags(dbch) & (1 << __WINE_DBCL##dbcl))) -#if defined(__GNUC__) || defined(__clang__) - #define __WINE_DPRINTF(dbcl,dbch) \ do { if(__WINE_GET_DEBUGGING(dbcl,(dbch))) { \ struct __wine_debug_channel * const __dbch = (dbch); \ const enum __wine_debug_class __dbcl = __WINE_DBCL##dbcl; \ __WINE_DBG_LOG -#define __WINE_DBG_LOG(args...) \ - wine_dbg_log( __dbcl, __dbch, __FUNCTION__, args); } } while(0) +#define __WINE_DBG_LOG(...) \ + wine_dbg_log( __dbcl, __dbch, __func__, __VA_ARGS__); } } while(0) -#if !defined(__WINE_USE_MSVCRT) || defined(__MINGW32__) +#if defined(__MINGW32__) || (!defined(__WINE_USE_MSVCRT) && (defined(__GNUC__) || defined(__clang__))) #define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) #else #define __WINE_PRINTF_ATTR(fmt,args) #endif - -#ifdef WINE_NO_TRACE_MSGS -#define WINE_TRACE(args...) do { } while(0) -#define WINE_TRACE_(ch) WINE_TRACE -#endif - -#ifdef WINE_NO_DEBUG_MSGS -#define WINE_WARN(args...) do { } while(0) -#define WINE_WARN_(ch) WINE_WARN -#define WINE_FIXME(args...) do { } while(0) -#define WINE_FIXME_(ch) WINE_FIXME -#endif - -#elif defined(__SUNPRO_C) - -#define __WINE_DPRINTF(dbcl,dbch) \ - do { if(__WINE_GET_DEBUGGING(dbcl,(dbch))) { \ - struct __wine_debug_channel * const __dbch = (dbch); \ - const enum __WINE_DEBUG_CLASS __dbcl = __WINE_DBCL##dbcl; \ - __WINE_DBG_LOG - -#define __WINE_DBG_LOG(...) \ - wine_dbg_log( __dbcl, __dbch, __func__, __VA_ARGS__); } } while(0) - -#define __WINE_PRINTF_ATTR(fmt,args) - #ifdef WINE_NO_TRACE_MSGS #define WINE_TRACE(...) do { } while(0) #define WINE_TRACE_(ch) WINE_TRACE @@ -136,17 +108,6 @@ struct __wine_debug_channel #define WINE_FIXME_(ch) WINE_FIXME #endif -#else /* !__GNUC__ && !__SUNPRO_C */ - -#define __WINE_DPRINTF(dbcl,dbch) \ - (!__WINE_GET_DEBUGGING(dbcl,(dbch)) || \ - (wine_dbg_log(__WINE_DBCL##dbcl,(dbch),__FILE__,"%d: ",__LINE__) == -1)) ? \ - (void)0 : (void)wine_dbg_printf - -#define __WINE_PRINTF_ATTR(fmt, args) - -#endif /* !__GNUC__ && !__SUNPRO_C */ - extern int WINAPI __wine_dbg_write( const char *str, unsigned int len ); extern unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ); extern const char * __cdecl __wine_dbg_strdup( const char *str );

1 0

Alexandre Julliard : include: Add a va_list version of the wine_dbg_log function.
by Alexandre Julliard Sept. 1, 2022

Sept. 1, 2022

Module: wine Branch: master Commit: 65ad7fcdab207a279136124d305ea78817ff8e3a URL: https://gitlab.winehq.org/wine/wine/-/commit/65ad7fcdab207a279136124d305ea7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 1 10:15:39 2022 +0200 include: Add a va_list version of the wine_dbg_log function. --- include/wine/debug.h | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 115f5c396b9..55497e9d73f 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -210,6 +210,24 @@ static inline int __wine_dbg_cdecl wine_dbg_printf( const char *format, ... ) return ret; } +static int __wine_dbg_cdecl wine_dbg_vlog( enum __wine_debug_class cls, + struct __wine_debug_channel *channel, const char *func, + const char *format, va_list args ) __WINE_PRINTF_ATTR(4,0); +static inline int __wine_dbg_cdecl wine_dbg_vlog( enum __wine_debug_class cls, + struct __wine_debug_channel *channel, + const char *function, const char *format, 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) ret += wine_dbg_vprintf( format, args ); + return ret; +} + 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); @@ -217,21 +235,12 @@ 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]; 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; - va_start( args, format ); - vsnprintf( buffer, sizeof(buffer), format, args ); + ret = wine_dbg_vlog( cls, channel, function, format, args ); va_end( args ); - ret += __wine_dbg_output( buffer ); return ret; }

1 0