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

Austin English : propvarutil.h: Add extern "C" if __cplusplus is defined.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: da998cb20677d781f643d4984880f17556c423d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da998cb20677d781f643d498… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 3 01:43:54 2019 -0500 propvarutil.h: Add extern "C" if __cplusplus is defined. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46939 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/propvarutil.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/include/propvarutil.h b/include/propvarutil.h index a4eedef..e0a21fa 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -22,6 +22,10 @@ #include <shtypes.h> #include <shlwapi.h> +#ifdef __cplusplus +extern "C" { +#endif + enum tagPROPVAR_CHANGE_FLAGS { PVCHF_DEFAULT = 0x00000000, @@ -120,7 +124,12 @@ inline HRESULT InitPropVariantFromInt64(LONGLONG llVal, PROPVARIANT *ppropvar) return S_OK; } -#endif +#endif /* NO_PROPVAR_INLINES */ +#endif /* __cplusplus */ + + +#ifdef __cplusplus +} #endif #endif /* __WINE_PROPVARUTIL_H */

1 0

Sebastian Lackner : dinput: Do not wait for hook thread startup in IDirectInput8::Initialize.
by Alexandre Julliard April 3, 2019

April 3, 2019

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 : include: Make wine_dbg_sprintf() into an inline function.
by Alexandre Julliard April 3, 2019

April 3, 2019

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 : winecrt0: Add a fallback implementation of __wine_dbg_header().
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 93a9d85488a66e0d40e311d7027ec076c8b2bd20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93a9d85488a66e0d40e311d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 19:27:24 2019 +0200 winecrt0: Add a fallback implementation of __wine_dbg_header(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/debug.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index 8003e03..d7c170c 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -29,9 +29,15 @@ #include "wine/debug.h" #include "wine/heap.h" +WINE_DECLARE_DEBUG_CHANNEL(pid); +WINE_DECLARE_DEBUG_CHANNEL(timestamp); + static const char * (__cdecl *p__wine_dbg_strdup)( const char *str ); static int (__cdecl *p__wine_dbg_output)( const char *str ); static unsigned char (__cdecl *p__wine_dbg_get_channel_flags)( struct __wine_debug_channel *channel ); +static int (__cdecl *p__wine_dbg_header)( enum __wine_debug_class cls, + struct __wine_debug_channel *channel, + const char *function ); static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; @@ -39,6 +45,7 @@ static unsigned char default_flags = (1 << __WINE_DBCL_ERR) | (1 << __WINE_DBCL_ static int nb_debug_options = -1; static int options_size; static struct __wine_debug_channel *debug_options; +static DWORD partial_line_tid; /* id of the last thread to output a partial line */ static void load_func( void **func, const char *name, void *def ) { @@ -163,7 +170,36 @@ static const char * __cdecl fallback__wine_dbg_strdup( const char *str ) static int __cdecl fallback__wine_dbg_output( const char *str ) { - return fwrite( str, 1, strlen(str), stderr ); + size_t len = strlen( str ); + + if (!len) return 0; + interlocked_xchg( (LONG *)&partial_line_tid, str[len - 1] != '\n' ? GetCurrentThreadId() : 0 ); + return fwrite( str, 1, len, stderr ); +} + +static int __cdecl fallback__wine_dbg_header( enum __wine_debug_class cls, + struct __wine_debug_channel *channel, + const char *function ) +{ + char buffer[200], *pos = buffer; + + if (!(__wine_dbg_get_channel_flags( channel ) & (1 << cls))) return -1; + + /* skip header if partial line and no other thread came in between */ + if (partial_line_tid == GetCurrentThreadId()) return 0; + + if (TRACE_ON(timestamp)) + { + ULONG ticks = GetTickCount(); + 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( debug_classes )) + snprintf( pos, sizeof(buffer) - (pos - buffer), "%s:%s:%s ", + debug_classes[cls], channel->name, function ); + + return fwrite( buffer, 1, strlen(buffer), stderr ); } static unsigned char __cdecl fallback__wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ) @@ -205,4 +241,11 @@ unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel return p__wine_dbg_get_channel_flags( channel ); } +int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *function ) +{ + LOAD_FUNC( __wine_dbg_header ); + return p__wine_dbg_header( cls, channel, function ); +} + #endif /* _WIN32 */

1 0

Alexandre Julliard : winecrt0: Add a fallback implementation of __wine_dbg_output().
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 0ad86465ae87d2dc81da2ecd69a7775b6cf56767 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ad86465ae87d2dc81da2ecd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 19:24:52 2019 +0200 winecrt0: Add a fallback implementation of __wine_dbg_output(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/debug.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index 1eb5a46..4ae086c 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -23,11 +23,13 @@ #include "config.h" #include "wine/port.h" +#include <stdio.h> #include "windef.h" #include "winbase.h" #include "wine/debug.h" static const char * (__cdecl *p__wine_dbg_strdup)( const char *str ); +static int (__cdecl *p__wine_dbg_output)( const char *str ); static void load_func( void **func, const char *name, void *def ) { @@ -53,10 +55,21 @@ static const char * __cdecl fallback__wine_dbg_strdup( const char *str ) return ret; } +static int __cdecl fallback__wine_dbg_output( const char *str ) +{ + return fwrite( str, 1, strlen(str), stderr ); +} + const char * __cdecl __wine_dbg_strdup( const char *str ) { LOAD_FUNC( __wine_dbg_strdup ); return p__wine_dbg_strdup( str ); } +int __cdecl __wine_dbg_output( const char *str ) +{ + LOAD_FUNC( __wine_dbg_output ); + return p__wine_dbg_output( str ); +} + #endif /* _WIN32 */

1 0

Alexandre Julliard : ntdll: Use static debug info before initialization is done.
by Alexandre Julliard April 3, 2019

April 3, 2019

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

Zebediah Figura : quartz/tests: Add tests for IBaseFilter::FindPin() on the VMR7 filter.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 42f70a79d6489452861f60926dde04efa9e93ebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=42f70a79d6489452861f6092… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 2 20:59:36 2019 -0500 quartz/tests: Add tests for IBaseFilter::FindPin() on the VMR7 filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 9dbe009..d5253f4 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -393,6 +393,72 @@ static void test_enum_pins(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_find_pin(void) +{ + static const WCHAR input_pinW[] = {'i','n','p','u','t',' ','p','i','n',0}; + static const WCHAR inW[] = {'I','n',0}; + + WCHAR sink_id[] = {'V','M','R',' ','I','n','p','u','t','0',0}; + IBaseFilter *filter = create_vmr7(0); + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + + IBaseFilter_EnumPins(filter, &enum_pins); + + hr = IBaseFilter_FindPin(filter, input_pinW, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, inW, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == pin2, "Pins did not match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + sink_id[9] = '1'; + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + if (SUCCEEDED(set_mixing_mode(filter))) + { + IEnumPins_Reset(enum_pins); + + sink_id[9] = '0'; + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == pin2, "Pins did not match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + sink_id[9] = '1'; + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == pin2, "Pins did not match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + sink_id[9] = '2'; + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + } + else + skip("Mixing mode is not supported.\n"); + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr7) { CoInitialize(NULL); @@ -400,6 +466,7 @@ START_TEST(vmr7) test_filter_config(); test_interfaces(); test_enum_pins(); + test_find_pin(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/tests: Add tests for IBaseFilter::EnumPins() on the VMR7.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 08d91f6d71c2b9794eb8d08503fac287e8d2c6aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=08d91f6d71c2b9794eb8d085… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 2 20:59:35 2019 -0500 quartz/tests: Add tests for IBaseFilter::EnumPins() on the VMR7. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 90fcd77..9dbe009 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -42,6 +42,28 @@ static IBaseFilter *create_vmr7(DWORD mode) return filter; } +static HRESULT set_mixing_mode(IBaseFilter *filter) +{ + IVMRFilterConfig *config; + HRESULT hr; + + hr = IBaseFilter_QueryInterface(filter, &IID_IVMRFilterConfig, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_SetNumberOfStreams(config, 2); + todo_wine ok(hr == VFW_E_DDRAW_CAPS_NOT_SUITABLE || hr == S_OK, "Got hr %#x.\n", hr); + + IVMRFilterConfig_Release(config); + return hr; +} + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + static void test_filter_config(void) { IVMRFilterConfig *config; @@ -240,12 +262,144 @@ static void test_interfaces(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_enum_pins(void) +{ + IBaseFilter *filter = create_vmr7(0); + IEnumPins *enum1, *enum2; + ULONG count, ref; + IPin *pins[3]; + HRESULT hr; + + ref = get_refcount(filter); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IBaseFilter_EnumPins(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + IEnumPins_Release(enum2); + + if (SUCCEEDED(set_mixing_mode(filter))) + { + hr = IEnumPins_Next(enum1, 1, pins, NULL); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 3, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + } + else + skip("Mixing mode is not supported.\n"); + + IEnumPins_Release(enum1); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr7) { CoInitialize(NULL); test_filter_config(); test_interfaces(); + test_enum_pins(); CoUninitialize(); }

1 0

Alexandre Julliard : ntdll: Store offsets instead of pointers in the debug_info structure.
by Alexandre Julliard April 3, 2019

April 3, 2019

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 : ntdll: Remove no longer used debug functions.
by Alexandre Julliard April 3, 2019

April 3, 2019

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