February 2022 - Wine-Commits

Zebediah Figura : wined3d: Consider WINED3D_LOCATION_CLEARED to be a CPU-accessible location.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 4103a7085c1643bcbc7b59ed2419b6b03b1882cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4103a7085c1643bcbc7b59ed… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 23 20:21:39 2022 -0600 wined3d: Consider WINED3D_LOCATION_CLEARED to be a CPU-accessible location. For the purposes of texture2d_blt(). The main goal here is to allow uploading from WINED3D_LOCATION_CLEARED to a multisample texture (and hence initializing it). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8c931d0b225..f9cc2a1cf0c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -32,7 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); -static const DWORD surface_simple_locations = WINED3D_LOCATION_SYSMEM | WINED3D_LOCATION_BUFFER; +static const DWORD surface_simple_locations = WINED3D_LOCATION_SYSMEM + | WINED3D_LOCATION_BUFFER | WINED3D_LOCATION_CLEARED; /* Works correctly only for <= 4 bpp formats. */ static void get_color_masks(const struct wined3d_format *format, uint32_t *masks)

1 0

Alexandre Julliard : include: Add a few locale definitions.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 0fef0daa9cc4f13d7d43a98d7738ef8eaeb2e4f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fef0daa9cc4f13d7d43a98d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 24 18:36:01 2022 +0100 include: Add a few locale definitions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnls.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/winnls.h b/include/winnls.h index 4b1323cc694..80066b3b897 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -316,6 +316,9 @@ extern "C" { #define LOCALE_SSHORTTIME 0x0079 #define LOCALE_SOPENTYPELANGUAGETAG 0X007A #define LOCALE_SSORTLOCALE 0x007B +#define LOCALE_SRELATIVELONGDATE 0x007C +#define LOCALE_SSHORTESTAM 0x007E +#define LOCALE_SSHORTESTPM 0x007F #define LOCALE_IDEFAULTEBCDICCODEPAGE 0x1012 #define LOCALE_IPAPERSIZE 0x100A @@ -538,6 +541,9 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define CAL_SSHORTESTDAYNAME7 0x37 #define CAL_SMONTHDAY 0x38 #define CAL_SABBREVERASTRING 0x39 +#define CAL_SRELATIVELONGDATE 0x3a +#define CAL_SENGLISHERANAME 0x3b +#define CAL_SENGLISHABBREVERANAME 0x3c /* Calendar types */ #define CAL_GREGORIAN 1

1 0

Jacek Caban : win32u: Move NtUserGetGUIThreadInfo implementation from user32.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: de739e9f9170d03159fcb7bd35c1fa2918d09912 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de739e9f9170d03159fcb7bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 24 01:28:31 2022 +0100 win32u: Move NtUserGetGUIThreadInfo implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/focus.c | 2 +- dlls/user32/message.c | 41 +----------------------------- dlls/user32/painting.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/win.c | 2 +- dlls/win32u/Makefile.in | 1 + dlls/win32u/message.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 36 ++++++++++++++++++++++++++ include/ntuser.h | 1 + 12 files changed, 113 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=de739e9f9170d03159fc…

1 0

Zebediah Figura : wined3d: Introduce a wined3d_texture_get_bo_address() helper.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 71b8ec3fd202cb3cf3a59660ad1ce41dc34fa3d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71b8ec3fd202cb3cf3a59660… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 23 20:21:35 2022 -0600 wined3d: Introduce a wined3d_texture_get_bo_address() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 2 +- dlls/wined3d/surface.c | 15 +++++----- dlls/wined3d/texture.c | 63 +++++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 4 +-- 4 files changed, 49 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71b8ec3fd202cb3cf3a5…

1 0

Zebediah Figura : wined3d: Remove the now redundant "locations" parameter from wined3d_texture_get_memory().
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 23fbec27223eabc79455073f2bf801d1f96ee1f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23fbec27223eabc79455073f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 23 20:21:36 2022 -0600 wined3d: Remove the now redundant "locations" parameter from wined3d_texture_get_memory(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 35b41a2f70b..b6908dac891 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -847,8 +847,11 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, } static void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_bo_address *data, DWORD locations) + struct wined3d_bo_address *data) { + struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; + DWORD locations = sub_resource->locations; + TRACE("texture %p, sub_resource_idx %u, data %p, locations %s.\n", texture, sub_resource_idx, data, wined3d_debug_location(locations)); @@ -3227,7 +3230,7 @@ static BOOL wined3d_texture_gl_load_texture(struct wined3d_texture_gl *texture_g wined3d_texture_set_map_binding(&texture_gl->t, WINED3D_LOCATION_SYSMEM); } - wined3d_texture_get_memory(&texture_gl->t, sub_resource_idx, &data, sub_resource->locations); + wined3d_texture_get_memory(&texture_gl->t, sub_resource_idx, &data); if (conversion) { width = src_box.right - src_box.left; @@ -4497,8 +4500,7 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); src_level = src_sub_resource_idx % src_texture->level_count; - wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data, - src_texture->sub_resources[src_sub_resource_idx].locations); + wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data); wined3d_texture_get_pitch(src_texture, src_level, &src_row_pitch, &src_slice_pitch); dst_texture->texture_ops->texture_upload_data(context, wined3d_const_bo_address(&data), @@ -5126,7 +5128,7 @@ static BOOL wined3d_texture_vk_load_texture(struct wined3d_texture_vk *texture_v } level = sub_resource_idx % texture_vk->t.level_count; - wined3d_texture_get_memory(&texture_vk->t, sub_resource_idx, &data, sub_resource->locations); + wined3d_texture_get_memory(&texture_vk->t, sub_resource_idx, &data); wined3d_texture_get_level_box(&texture_vk->t, level, &src_box); wined3d_texture_get_pitch(&texture_vk->t, level, &row_pitch, &slice_pitch); wined3d_texture_vk_upload_data(context, wined3d_const_bo_address(&data), texture_vk->t.resource.format,

1 0

Zebediah Figura : wined3d: Handle WINED3D_LOCATION_CLEARED in wined3d_texture_load_location().
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 3a67b7f2fbdd2a902a29f1395535ba45d2477388 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a67b7f2fbdd2a902a29f139… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 23 20:21:37 2022 -0600 wined3d: Handle WINED3D_LOCATION_CLEARED in wined3d_texture_load_location(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b6908dac891..6a11f613732 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -815,6 +815,23 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, return TRUE; } + if (current & WINED3D_LOCATION_CLEARED) + { + struct wined3d_bo_address addr; + + /* FIXME: Clear textures on the GPU if possible. */ + + if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM)) + return FALSE; + wined3d_texture_get_bo_address(texture, sub_resource_idx, &addr, WINED3D_LOCATION_SYSMEM); + memset(addr.addr, 0, texture->sub_resources[sub_resource_idx].size); + wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_SYSMEM); + current |= WINED3D_LOCATION_SYSMEM; + + if (current & location) + return TRUE; + } + if (!current) { ERR("Sub-resource %u of texture %p does not have any up to date location.\n",

1 0

Zebediah Figura : wined3d: Handle DISCARDED and CLEARED locations in wined3d_texture_get_memory().
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: f4e65025b6d3c47aac429a8ea6844c5ba2f7bbcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4e65025b6d3c47aac429a8e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 23 20:21:38 2022 -0600 wined3d: Handle DISCARDED and CLEARED locations in wined3d_texture_get_memory(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6a11f613732..00146cf32d1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -864,14 +864,24 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, } static void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_bo_address *data) + struct wined3d_context *context, struct wined3d_bo_address *data) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; DWORD locations = sub_resource->locations; - TRACE("texture %p, sub_resource_idx %u, data %p, locations %s.\n", - texture, sub_resource_idx, data, wined3d_debug_location(locations)); + TRACE("texture %p, context %p, sub_resource_idx %u, data %p, locations %s.\n", + texture, context, sub_resource_idx, data, wined3d_debug_location(locations)); + if (locations & (WINED3D_LOCATION_DISCARDED | WINED3D_LOCATION_CLEARED)) + { + locations = (wined3d_texture_use_pbo(texture, context->d3d_info) ? WINED3D_LOCATION_BUFFER : WINED3D_LOCATION_SYSMEM); + if (!wined3d_texture_load_location(texture, sub_resource_idx, context, locations)) + { + data->buffer_object = 0; + data->addr = NULL; + return; + } + } if (locations & WINED3D_LOCATION_BUFFER) { wined3d_texture_get_bo_address(texture, sub_resource_idx, data, WINED3D_LOCATION_BUFFER); @@ -3247,7 +3257,7 @@ static BOOL wined3d_texture_gl_load_texture(struct wined3d_texture_gl *texture_g wined3d_texture_set_map_binding(&texture_gl->t, WINED3D_LOCATION_SYSMEM); } - wined3d_texture_get_memory(&texture_gl->t, sub_resource_idx, &data); + wined3d_texture_get_memory(&texture_gl->t, sub_resource_idx, &context_gl->c, &data); if (conversion) { width = src_box.right - src_box.left; @@ -4517,7 +4527,7 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); src_level = src_sub_resource_idx % src_texture->level_count; - wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data); + wined3d_texture_get_memory(src_texture, src_sub_resource_idx, context, &data); wined3d_texture_get_pitch(src_texture, src_level, &src_row_pitch, &src_slice_pitch); dst_texture->texture_ops->texture_upload_data(context, wined3d_const_bo_address(&data), @@ -5145,7 +5155,7 @@ static BOOL wined3d_texture_vk_load_texture(struct wined3d_texture_vk *texture_v } level = sub_resource_idx % texture_vk->t.level_count; - wined3d_texture_get_memory(&texture_vk->t, sub_resource_idx, &data); + wined3d_texture_get_memory(&texture_vk->t, sub_resource_idx, context, &data); wined3d_texture_get_level_box(&texture_vk->t, level, &src_box); wined3d_texture_get_pitch(&texture_vk->t, level, &row_pitch, &slice_pitch); wined3d_texture_vk_upload_data(context, wined3d_const_bo_address(&data), texture_vk->t.resource.format,

1 0

Zebediah Figura : wined3d: Use WINED3D_LOCATION_CLEARED for the initial location of textures.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 1632b8e7a419ebf256c4a356a58d505ef918f2fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=1632b8e7a419ebf256c4a356… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 23 20:21:40 2022 -0600 wined3d: Use WINED3D_LOCATION_CLEARED for the initial location of textures. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 00146cf32d1..13c26692f77 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3918,16 +3918,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc if (wined3d_texture_use_pbo(texture, d3d_info)) texture->resource.map_binding = WINED3D_LOCATION_BUFFER; - if (desc->resource_type != WINED3D_RTYPE_TEXTURE_3D - || !wined3d_texture_use_pbo(texture, d3d_info)) - { - if (!wined3d_resource_prepare_sysmem(&texture->resource)) - { - wined3d_texture_cleanup_sync(texture); - return E_OUTOFMEMORY; - } - } - sub_count = level_count * layer_count; if (sub_count / layer_count != level_count) { @@ -3956,12 +3946,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc struct wined3d_texture_sub_resource *sub_resource; sub_resource = &texture->sub_resources[i]; - sub_resource->locations = WINED3D_LOCATION_DISCARDED; - if (desc->resource_type != WINED3D_RTYPE_TEXTURE_3D) - { - wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_SYSMEM); - wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_SYSMEM); - } + sub_resource->locations = WINED3D_LOCATION_CLEARED; if (FAILED(hr = device_parent->ops->texture_sub_resource_created(device_parent, desc->resource_type, texture, i, &sub_resource->parent, &sub_resource->parent_ops)))

1 0

Zebediah Figura : winegstreamer: Return S_FALSE from wg_parser_stream_get_event() if the stream is EOS.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 28c9c138d2658a4c3252a94d45a1e8b7ac28be7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=28c9c138d2658a4c3252a94d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 23 15:46:48 2022 -0600 winegstreamer: Return S_FALSE from wg_parser_stream_get_event() if the stream is EOS. Instead of using WG_PARSER_EVENT_EOS. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 2 +- dlls/winegstreamer/main.c | 4 +- dlls/winegstreamer/media_source.c | 30 ++----- dlls/winegstreamer/quartz_parser.c | 26 +++--- dlls/winegstreamer/unixlib.h | 1 - dlls/winegstreamer/wg_parser.c | 56 ++++++------- dlls/winegstreamer/wm_reader.c | 164 +++++++++++++++++-------------------- 7 files changed, 120 insertions(+), 163 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=28c9c138d2658a4c3252…

1 0

Zebediah Figura : winegstreamer: Explicitly sleep in the DirectShow streaming thread after receiving EOS.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 7da1828c4927faec011d1c15d2f3f9bbb43435b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7da1828c4927faec011d1c15… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 23 15:46:46 2022 -0600 winegstreamer: Explicitly sleep in the DirectShow streaming thread after receiving EOS. Instead of waiting for another event from the wg_parser object. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/quartz_parser.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 4afd265bca7..30afd0874ea 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -74,6 +74,7 @@ struct parser_source SourceSeeking seek; CRITICAL_SECTION flushing_cs; + CONDITION_VARIABLE eos_cv; HANDLE thread; /* This variable is read and written by both the streaming thread and @@ -81,6 +82,8 @@ struct parser_source * thread when the streaming thread is not running, or when it is blocked * by flushing_cs. */ bool need_segment; + + bool eos; }; static inline struct parser *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -823,6 +826,13 @@ static DWORD CALLBACK stream_thread(void *arg) EnterCriticalSection(&pin->flushing_cs); + if (pin->eos) + { + SleepConditionVariableCS(&pin->eos_cv, &pin->flushing_cs, INFINITE); + LeaveCriticalSection(&pin->flushing_cs); + continue; + } + if (!wg_parser_stream_get_event(pin->wg_stream, &event)) { LeaveCriticalSection(&pin->flushing_cs); @@ -839,6 +849,7 @@ static DWORD CALLBACK stream_thread(void *arg) case WG_PARSER_EVENT_EOS: IPin_EndOfStream(pin->pin.pin.peer); + pin->eos = true; break; case WG_PARSER_EVENT_NONE: @@ -973,17 +984,19 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) for (i = 0; i < filter->source_count; ++i) { + struct parser_source *pin = filter->sources[i]; HRESULT hr; - if (!filter->sources[i]->pin.pin.peer) + if (!pin->pin.pin.peer) continue; - if (FAILED(hr = IMemAllocator_Commit(filter->sources[i]->pin.pAllocator))) + if (FAILED(hr = IMemAllocator_Commit(pin->pin.pAllocator))) ERR("Failed to commit allocator, hr %#lx.\n", hr); - filter->sources[i]->need_segment = true; + pin->need_segment = true; + pin->eos = false; - filter->sources[i]->thread = CreateThread(NULL, 0, stream_thread, filter->sources[i], 0, NULL); + pin->thread = CreateThread(NULL, 0, stream_thread, pin, 0, NULL); } return S_OK; @@ -1009,6 +1022,7 @@ static HRESULT parser_cleanup_stream(struct strmbase_filter *iface) IMemAllocator_Decommit(pin->pin.pAllocator); + WakeConditionVariable(&pin->eos_cv); WaitForSingleObject(pin->thread, INFINITE); CloseHandle(pin->thread); pin->thread = NULL; @@ -1371,9 +1385,13 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, struct parser_source *flush_pin = filter->sources[i]; flush_pin->need_segment = true; + flush_pin->eos = false; if (flush_pin->pin.pin.peer) + { LeaveCriticalSection(&flush_pin->flushing_cs); + WakeConditionVariable(&flush_pin->eos_cv); + } } return S_OK; @@ -1613,6 +1631,7 @@ static struct parser_source *create_pin(struct parser *filter, InitializeCriticalSection(&pin->flushing_cs); pin->flushing_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": pin.flushing_cs"); + InitializeConditionVariable(&pin->eos_cv); filter->sources[filter->source_count++] = pin; return pin;

1 0