June 2021 - Wine-Commits - list.winehq.org

Zebediah Figura : qcap/tests: Add tests for allocator management by the video capture filter.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: c768dbf97fda92306869bc3831fe4e409a07e6d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c768dbf97fda92306869bc38… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 14 22:47:32 2021 -0500 qcap/tests: Add tests for allocator management by the video capture filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/videocapture.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 7733dfdc8ed..530b33a1e32 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -360,8 +360,9 @@ static void testfilter_init(struct testfilter *filter) strmbase_sink_init(&filter->sink, &filter->filter, L"sink", &testsink_ops, NULL); } -static void test_filter_state(IMediaControl *control) +static void test_filter_state(IMediaControl *control, IMemAllocator *allocator) { + IMediaSample *sample; OAFilterState state; HRESULT hr; @@ -369,6 +370,9 @@ static void test_filter_state(IMediaControl *control) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(state == State_Stopped, "Got state %u.\n", state); + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#x.\n", hr); + hr = IMediaControl_Pause(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -376,6 +380,10 @@ static void test_filter_state(IMediaControl *control) ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); ok(state == State_Paused, "Got state %u.\n", state); + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, AM_GBF_NOWAIT); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSample_Release(sample); + hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -397,6 +405,9 @@ static void test_filter_state(IMediaControl *control) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(state == State_Stopped, "Got state %u.\n", state); + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#x.\n", hr); + hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -404,12 +415,33 @@ static void test_filter_state(IMediaControl *control) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(state == State_Running, "Got state %u.\n", state); + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, AM_GBF_NOWAIT); + todo_wine ok(hr == VFW_E_TIMEOUT, "Got hr %#x.\n", hr); + if (hr == S_OK) IMediaSample_Release(sample); + hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_GetState(control, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#x.\n", hr); + + /* Test committing the allocator before the capture filter does. */ + + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_Decommit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); } static void test_connect_pin(IBaseFilter *filter, IPin *source) @@ -460,7 +492,9 @@ static void test_connect_pin(IBaseFilter *filter, IPin *source) hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); - test_filter_state(control); + ok(!!testsink.sink.pAllocator, "Expected to be assigned an allocator.\n"); + + test_filter_state(control, testsink.sink.pAllocator); hr = IPin_ConnectedTo(source, &peer); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : qcap/tests: Add some tests for filter state on the video capture filter.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: 1e16595c33fe06e1c067de3489af76368f6659d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e16595c33fe06e1c067de34… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 14 22:47:31 2021 -0500 qcap/tests: Add some tests for filter state on the video capture filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/videocapture.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index fafd18009f4..7733dfdc8ed 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -360,12 +360,65 @@ static void testfilter_init(struct testfilter *filter) strmbase_sink_init(&filter->sink, &filter->filter, L"sink", &testsink_ops, NULL); } +static void test_filter_state(IMediaControl *control) +{ + OAFilterState state; + HRESULT hr; + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %u.\n", state); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Running, "Got state %u.\n", state); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %u.\n", state); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Running, "Got state %u.\n", state); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); +} + static void test_connect_pin(IBaseFilter *filter, IPin *source) { AM_MEDIA_TYPE req_mt, default_mt, mt, *mts[2]; IAMStreamConfig *stream_config; struct testfilter testsink; IEnumMediaTypes *enummt; + IMediaControl *control; IFilterGraph2 *graph; ULONG count, ref; HRESULT hr; @@ -373,6 +426,7 @@ static void test_connect_pin(IBaseFilter *filter, IPin *source) CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&graph); + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); testfilter_init(&testsink); IFilterGraph2_AddFilter(graph, &testsink.filter.IBaseFilter_iface, L"sink"); IFilterGraph2_AddFilter(graph, filter, L"source"); @@ -406,6 +460,8 @@ static void test_connect_pin(IBaseFilter *filter, IPin *source) hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); + test_filter_state(control); + hr = IPin_ConnectedTo(source, &peer); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(peer == &testsink.sink.pin.IPin_iface, "Got peer %p.\n", peer); @@ -445,6 +501,7 @@ static void test_connect_pin(IBaseFilter *filter, IPin *source) FreeMediaType(&req_mt); FreeMediaType(&default_mt); IAMStreamConfig_Release(stream_config); + IMediaControl_Release(control); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); ref = IBaseFilter_Release(&testsink.filter.IBaseFilter_iface);

1 0

Alexandre Julliard : ntdll: Copy the implementation of __wine_dbg_strdup and __wine_dbg_header to the PE side.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: c2d84da8134cc9d07a114561c10c75bf91078370 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2d84da8134cc9d07a114561… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 15 17:16:30 2021 +0200 ntdll: Copy the implementation of __wine_dbg_strdup and __wine_dbg_header to the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/unix/debug.c | 10 +++++----- dlls/ntdll/unix/loader.c | 2 -- dlls/ntdll/unixlib.h | 5 +---- 4 files changed, 56 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index bcf010724c4..d86d20448bf 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -34,12 +34,33 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); WINE_DECLARE_DEBUG_CHANNEL(thread); +WINE_DECLARE_DEBUG_CHANNEL(pid); +WINE_DECLARE_DEBUG_CHANNEL(timestamp); struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000; +struct debug_info +{ + unsigned int str_pos; /* current position in strings buffer */ + unsigned int out_pos; /* current position in output buffer */ + char strings[1020]; /* buffer for temporary strings */ + char output[1020]; /* current output line */ +}; + +C_ASSERT( sizeof(struct debug_info) == 0x800 ); + static int nb_debug_options; static struct __wine_debug_channel *debug_options; +static inline struct debug_info *get_info(void) +{ +#ifdef _WIN64 + return (struct debug_info *)((TEB32 *)((char *)NtCurrentTeb() + 0x2000) + 1); +#else + return (struct debug_info *)(NtCurrentTeb() + 1); +#endif +} + static void init_options(void) { unsigned int offset = page_size * (sizeof(void *) / 4); @@ -81,7 +102,14 @@ unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel */ const char * __cdecl __wine_dbg_strdup( const char *str ) { - return unix_funcs->dbg_strdup( str ); + struct debug_info *info = get_info(); + unsigned int pos = info->str_pos; + size_t n = strlen( str ) + 1; + + 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 ); } /*********************************************************************** @@ -90,7 +118,27 @@ const char * __cdecl __wine_dbg_strdup( const char *str ) int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_channel *channel, const char *function ) { - return unix_funcs->dbg_header( cls, channel, function ); + static const char * const classes[] = { "fixme", "err", "warn", "trace" }; + struct debug_info *info = get_info(); + char *pos = info->output; + + 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) return 0; + + 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 )) + pos += snprintf( pos, sizeof(info->output) - (pos - info->output), "%s:%s:%s ", + classes[cls], channel->name, function ); + info->out_pos = pos - info->output; + return info->out_pos; } /*********************************************************************** diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 753bc36e469..0272e68bea6 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -277,7 +277,7 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_ { static const char * const classes[] = { "fixme", "err", "warn", "trace" }; struct debug_info *info = get_info(); - char buffer[200], *pos = buffer; + char *pos = info->output; if (!(__wine_dbg_get_channel_flags( channel ) & (1 << cls))) return -1; @@ -295,10 +295,10 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_ 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 )); + pos += snprintf( pos, sizeof(info->output) - (pos - info->output), "%s:%s:%s ", + classes[cls], channel->name, function ); + info->out_pos = pos - info->output; + return info->out_pos; } /*********************************************************************** diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0b2a7f3721c..fca63141ba3 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1850,9 +1850,7 @@ static struct unix_funcs unix_funcs = init_builtin_dll, init_unix_lib, unwind_builtin_dll, - __wine_dbg_strdup, __wine_dbg_output, - __wine_dbg_header, }; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index d0f2f4ed508..cbe5c9d3ccd 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 121 +#define NTDLL_UNIXLIB_VERSION 122 struct unix_funcs { @@ -80,10 +80,7 @@ struct unix_funcs CONTEXT *context ); /* debugging functions */ - const char * (CDECL *dbg_strdup)( const char *str ); int (CDECL *dbg_output)( const char *str ); - int (CDECL *dbg_header)( enum __wine_debug_class cls, struct __wine_debug_channel *channel, - const char *function ); }; #endif /* __NTDLL_UNIXLIB_H */

1 0

Alexandre Julliard : ntdll: Store the debug info in the TEB block after the 32-bit TEB.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: 2084fbd93dd607a6534eba7cab7dd60e0a12ca37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2084fbd93dd607a6534eba7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 15 16:31:49 2021 +0200 ntdll: Store the debug info in the TEB block after the 32-bit TEB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/debug.c | 17 +++++++++++++++-- dlls/ntdll/unix/thread.c | 3 --- dlls/ntdll/unix/unix_private.h | 13 ++----------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index b733ff24ab9..753bc36e469 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -43,6 +43,16 @@ WINE_DECLARE_DEBUG_CHANNEL(pid); WINE_DECLARE_DEBUG_CHANNEL(timestamp); +struct debug_info +{ + unsigned int str_pos; /* current position in strings buffer */ + unsigned int out_pos; /* current position in output buffer */ + char strings[1020]; /* buffer for temporary strings */ + char output[1020]; /* current output line */ +}; + +C_ASSERT( sizeof(struct debug_info) == 0x800 ); + 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); @@ -56,7 +66,11 @@ static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; static inline struct debug_info *get_info(void) { if (!init_done) return &initial_info; - return ntdll_get_thread_data()->debug_info; +#ifdef _WIN64 + return (struct debug_info *)((TEB32 *)((char *)NtCurrentTeb() + teb_offset) + 1); +#else + return (struct debug_info *)(NtCurrentTeb() + 1); +#endif } /* add a string to the output buffer */ @@ -304,6 +318,5 @@ void dbg_init(void) free( debug_options ); debug_options = options; options[nb_debug_options] = default_option; - ntdll_get_thread_data()->debug_info = (struct debug_info *)(options + nb_debug_options + 1); init_done = TRUE; } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 10144dc2e61..c7b94eba923 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -731,11 +731,8 @@ static void pthread_exit_wrapper( int status ) static void start_thread( TEB *teb ) { struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; - struct debug_info debug_info; BOOL suspend; - debug_info.str_pos = debug_info.out_pos = 0; - thread_data->debug_info = &debug_info; thread_data->pthread_id = pthread_self(); signal_init_thread( teb ); server_init_thread( thread_data->start, &suspend ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 37ebd99e536..c8c959029d0 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -47,19 +47,10 @@ static inline BOOL is_machine_64bit( WORD machine ) return (machine == IMAGE_FILE_MACHINE_AMD64 || machine == IMAGE_FILE_MACHINE_ARM64); } -struct debug_info -{ - 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 */ struct ntdll_thread_data { void *cpu_data[16]; /* reserved for CPU-specific data */ - struct debug_info *debug_info; /* info for debugstr functions */ void *kernel_stack; /* stack for thread startup and kernel syscalls */ int request_fd; /* fd for sending server requests */ int reply_fd; /* fd for receiving server replies */ @@ -88,9 +79,9 @@ struct async_fileio }; static const SIZE_T page_size = 0x1000; -static const SIZE_T teb_size = 0x3000; /* TEB64 + TEB32 */ +static const SIZE_T teb_size = 0x3800; /* TEB64 + TEB32 + debug info */ static const SIZE_T signal_stack_mask = 0xffff; -static const SIZE_T signal_stack_size = 0x10000 - 0x3000; +static const SIZE_T signal_stack_size = 0x10000 - 0x3800; static const SIZE_T kernel_stack_size = 0x20000; static const LONG teb_offset = 0x2000;

1 0

Alexandre Julliard : ntdll: Store the current PEB in a global variable.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: 588d91aecf2bf8ac7e9ae1de44ddc01caae52109 URL: https://source.winehq.org/git/wine.git/?a=commit;h=588d91aecf2bf8ac7e9ae1de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 15 12:40:01 2021 +0200 ntdll: Store the current PEB in a global variable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/debug.c | 2 +- dlls/ntdll/unix/env.c | 3 +-- dlls/ntdll/unix/loader.c | 3 ++- dlls/ntdll/unix/server.c | 3 +-- dlls/ntdll/unix/system.c | 16 ++++++++-------- dlls/ntdll/unix/thread.c | 8 ++++---- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unix/virtual.c | 19 +++++++------------ 8 files changed, 25 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=588d91aecf2bf8ac7e9a…

1 0

Nikolay Sivov : mf: Move presentation clock implementation to a separate file.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: 0b774df38721395e1576d2530c691ae38b90a781 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b774df38721395e1576d253… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 15 12:00:11 2021 +0300 mf: Move presentation clock implementation to a separate file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 1 + dlls/mf/clock.c | 1162 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/session.c | 1135 ------------------------------------------------- 3 files changed, 1163 insertions(+), 1135 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b774df38721395e1576…

1 0

Zebediah Figura : qcap/vfwcapture: Do not fail vfw_capture_init_stream() if IMemAllocator::SetProperties() fails.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: f4ae8117c44c68081f0a524090213a7c757ffd86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4ae8117c44c68081f0a5240… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 14 22:47:33 2021 -0500 qcap/vfwcapture: Do not fail vfw_capture_init_stream() if IMemAllocator::SetProperties() fails. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/videocapture.c | 2 +- dlls/qcap/vfwcapture.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 530b33a1e32..c44070b0bd5 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -435,7 +435,7 @@ static void test_filter_state(IMediaControl *control, IMemAllocator *allocator) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(control); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMemAllocator_Decommit(allocator); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 48401344ac4..ae073b845e0 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -197,11 +197,9 @@ static HRESULT vfw_capture_init_stream(struct strmbase_filter *iface) req_props.cbBuffer = get_image_size(filter); req_props.cbAlign = 1; req_props.cbPrefix = 0; - if (FAILED(hr = IMemAllocator_SetProperties(filter->source.pAllocator, &req_props, &ret_props))) - { + if (FAILED(hr = IMemAllocator_SetProperties(filter->source.pAllocator, &req_props, &ret_props)) + && hr != VFW_E_ALREADY_COMMITTED) ERR("Failed to set allocator properties (buffer size %u), hr %#x.\n", req_props.cbBuffer, hr); - return hr; - } if (FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) ERR("Failed to commit allocator, hr %#x.\n", hr);

1 0

Ziqing Hui : d3dx10/tests: Test subresource data for created texture.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: bcb261b4f96e9333a1e6a18c279d03ec3ffbcaa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcb261b4f96e9333a1e6a18c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Jun 11 15:30:30 2021 +0800 d3dx10/tests: Test subresource data for created texture. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 458 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 394 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bcb261b4f96e9333a1e6…

1 0

Ziqing Hui : d3dx10/tests: Use winetest_push_context.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: b798b3869d9b08576139acd13c781c1feabfd92a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b798b3869d9b08576139acd1… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Jun 11 15:30:19 2021 +0800 d3dx10/tests: Use winetest_push_context. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 205 ++++++++++++++++++++++-------------------- 1 file changed, 108 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b798b3869d9b08576139…

1 0

Nikolay Sivov : mf/session: Reset topology status back to READY when stopped.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: 09bb5d949f4b51dda736acabd99684dcc46a2861 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09bb5d949f4b51dda736acab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 15 12:00:14 2021 +0300 mf/session: Reset topology status back to READY when stopped. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 21afbcfc5d8..24aae77ac3a 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -957,6 +957,7 @@ static void session_clear_end_of_presentation(struct media_session *session) { node->flags &= ~TOPO_NODE_END_OF_STREAM; } + session->presentation.topo_status = MF_TOPOSTATUS_READY; } static void session_set_stopped(struct media_session *session, HRESULT status)

1 0