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

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to destroy_dummy_textures().
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: c9046a3f4eba71d784d26495e74d56f3bc20f752 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9046a3f4eba71d784d26495… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 20 02:00:20 2019 +0430 wined3d: Pass a wined3d_context_gl structure to destroy_dummy_textures(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 81b5a3a..768375d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -812,10 +812,11 @@ static void wined3d_device_gl_create_dummy_textures(struct wined3d_device_gl *de } /* Context activation is done by the caller. */ -static void destroy_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) +static void wined3d_device_gl_destroy_dummy_textures(struct wined3d_device_gl *device_gl, + struct wined3d_context_gl *context_gl) { - struct wined3d_dummy_textures *dummy_textures = &wined3d_device_gl(device)->dummy_textures; - const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_dummy_textures *dummy_textures = &device_gl->dummy_textures; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) { @@ -1054,9 +1055,13 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) { struct wined3d_resource *resource, *cursor; struct wined3d_device *device = object; + struct wined3d_context_gl *context_gl; + struct wined3d_device_gl *device_gl; struct wined3d_context *context; struct wined3d_shader *shader; + device_gl = wined3d_device_gl(device); + LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) { TRACE("Unloading resource %p.\n", resource); @@ -1069,9 +1074,10 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) } context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); device->blitter->ops->blitter_destroy(device->blitter, context); device->shader_backend->shader_free_private(device, context); - destroy_dummy_textures(device, context); + wined3d_device_gl_destroy_dummy_textures(device_gl, context_gl); destroy_default_samplers(device, context); context_release(context);

1 0

Henri Verbeet : wined3d: Use wined3d_texture_gl_load_texture() in texture3d_load_location().
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 9de80e1edd44698ef3e2924781c59499dbbcc5c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9de80e1edd44698ef3e29247… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 20 02:00:21 2019 +0430 wined3d: Use wined3d_texture_gl_load_texture() in texture3d_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 74 ++------------------------------------------------ 1 file changed, 2 insertions(+), 72 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 52dbe51..4b64785 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3352,45 +3352,12 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc } /* Context activation is done by the caller. */ -static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, BOOL dest_is_srgb) -{ - struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - unsigned int row_pitch, slice_pitch; - struct wined3d_bo_address data; - struct wined3d_box src_box; - - /* Optimisations are possible, but the effort should be put into either - * implementing EXT_SRGB_DECODE in the driver or finding out why we - * picked the wrong copy for the original upload and fixing that. - * - * Also keep in mind that we want to avoid using resource.heap_memory - * for DEFAULT pool surfaces. */ - WARN_(d3d_perf)("Performing slow rgb/srgb volume transfer.\n"); - data.buffer_object = 0; - if (!(data.addr = heap_alloc(sub_resource->size))) - return; - - wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, !dest_is_srgb); - wined3d_texture_download_data(texture, sub_resource_idx, context, &data); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, dest_is_srgb); - wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, - &src_box, wined3d_const_bo_address(&data), row_pitch, slice_pitch, 0, 0, 0, FALSE); - - heap_free(data.addr); -} - -/* Context activation is done by the caller. */ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - unsigned int row_pitch, slice_pitch; if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) return FALSE; @@ -3399,43 +3366,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in { case WINED3D_LOCATION_TEXTURE_RGB: case WINED3D_LOCATION_TEXTURE_SRGB: - if (sub_resource->locations & WINED3D_LOCATION_SYSMEM) - { - struct wined3d_const_bo_address data = {0, texture->resource.heap_memory}; - struct wined3d_box src_box; - - data.addr += sub_resource->offset; - wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); - wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); - wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, - &src_box, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); - } - else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) - { - struct wined3d_const_bo_address data = {sub_resource->buffer_object, NULL}; - struct wined3d_box src_box; - - wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); - wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); - wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, - &src_box, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); - } - else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - { - texture3d_srgb_transfer(texture, sub_resource_idx, context, TRUE); - } - else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_SRGB) - { - texture3d_srgb_transfer(texture, sub_resource_idx, context, FALSE); - } - else - { - FIXME("Implement texture loading from %s.\n", wined3d_debug_location(sub_resource->locations)); - return FALSE; - } - break; + return wined3d_texture_gl_load_texture(texture_gl, sub_resource_idx, + context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); case WINED3D_LOCATION_SYSMEM: case WINED3D_LOCATION_BUFFER: @@ -3446,8 +3378,6 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in wined3d_debug_location(sub_resource->locations)); return FALSE; } - - return TRUE; } static const struct wined3d_texture_ops texture3d_ops =

1 0

Andrew Eikum : dxgi/tests: Add tests for setting the fullscreen state of swapchains with destroyed windows.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 67110d37e9f33a234a7f52edd431ecee728a4048 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67110d37e9f33a234a7f52ed… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jun 20 02:47:46 2019 +0430 dxgi/tests: Add tests for setting the fullscreen state of swapchains with destroyed windows. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index bff8947..f5e1b10 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2284,6 +2284,40 @@ static void test_set_fullscreen(void) DestroyWindow(swapchain_desc.OutputWindow); swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + DestroyWindow(swapchain_desc.OutputWindow); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + DestroyWindow(swapchain_desc.OutputWindow); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH; hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr);

1 0

Andrew Eikum : dxgi: Return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE if setting the fullscreen state failed.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 45166d33136c93ac29cb97400f6260683c711df5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45166d33136c93ac29cb9740… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jun 20 02:47:47 2019 +0430 dxgi: Return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE if setting the fullscreen state failed. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 030bb67..4f01d9c 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -385,18 +385,18 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen swapchain_desc.windowed = !fullscreen; hr = wined3d_swapchain_set_fullscreen(swapchain->wined3d_swapchain, &swapchain_desc, NULL); wined3d_mutex_unlock(); - - if (SUCCEEDED(hr)) + if (FAILED(hr)) { - if (swapchain->target) - IDXGIOutput_Release(swapchain->target); - swapchain->target = target; - return S_OK; + if (target) + IDXGIOutput_Release(target); + return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; } - if (target) - IDXGIOutput_Release(target); - return hr; + if (swapchain->target) + IDXGIOutput_Release(swapchain->target); + swapchain->target = target; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFullscreenState(IDXGISwapChain1 *iface,

1 0

Andrew Eikum : wined3d: Validate that we got a valid window in wined3d_device_setup_fullscreen_window ().
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 628d60a1596eb470e155b41e158e6b68d9c3ddd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=628d60a1596eb470e155b41e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jun 20 02:47:48 2019 +0430 wined3d: Validate that we got a valid window in wined3d_device_setup_fullscreen_window(). Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 4 ++-- dlls/wined3d/device.c | 11 ++++++++++- dlls/wined3d/swapchain.c | 4 +++- include/wine/wined3d.h | 3 ++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f5e1b10..69c868c 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2292,7 +2292,7 @@ static void test_set_fullscreen(void) hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); refcount = IDXGISwapChain_Release(swapchain); @@ -2310,7 +2310,7 @@ static void test_set_fullscreen(void) hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); refcount = IDXGISwapChain_Release(swapchain); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 768375d..d35a064 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -927,13 +927,20 @@ static LONG fullscreen_exstyle(LONG exstyle) return exstyle; } -void CDECL wined3d_device_setup_fullscreen_window(struct wined3d_device *device, HWND window, UINT w, UINT h) +HRESULT CDECL wined3d_device_setup_fullscreen_window(struct wined3d_device *device, + HWND window, unsigned int w, unsigned int h) { BOOL filter_messages; LONG style, exstyle; TRACE("Setting up window %p for fullscreen mode.\n", window); + if (!IsWindow(window)) + { + WARN("%p is not a valid window.\n", window); + return WINED3DERR_NOTAVAILABLE; + } + if (device->style || device->exStyle) { ERR("Changing the window style for window %p, but another style (%08x, %08x) is already stored.\n", @@ -957,6 +964,8 @@ void CDECL wined3d_device_setup_fullscreen_window(struct wined3d_device *device, SetWindowPos(window, HWND_TOPMOST, 0, 0, w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); device->filter_messages = filter_messages; + + return WINED3D_OK; } void CDECL wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window, diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7807341..8d6306e 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1478,7 +1478,9 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha if (swapchain->desc.windowed) { /* Switch from windowed to fullscreen */ - wined3d_device_setup_fullscreen_window(device, swapchain->device_window, width, height); + if (FAILED(hr = wined3d_device_setup_fullscreen_window(device, + swapchain->device_window, width, height))) + return hr; } else { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a0ff3f1..abef3f0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2483,7 +2483,8 @@ HRESULT __cdecl wined3d_device_set_vs_consts_i(struct wined3d_device *device, void __cdecl wined3d_device_set_vs_resource_view(struct wined3d_device *device, UINT idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler); -void __cdecl wined3d_device_setup_fullscreen_window(struct wined3d_device *device, HWND window, UINT w, UINT h); +HRESULT __cdecl wined3d_device_setup_fullscreen_window(struct wined3d_device *device, + HWND window, unsigned int w, unsigned int h); BOOL __cdecl wined3d_device_show_cursor(struct wined3d_device *device, BOOL show); void __cdecl wined3d_device_update_sub_resource(struct wined3d_device *device, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch,

1 0

Zebediah Figura : winegstreamer: Use strmbase pin reference counting methods.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 117e07e706a83a8d64d82d772e387ba382dfb207 URL: https://source.winehq.org/git/wine.git/?a=commit;h=117e07e706a83a8d64d82d77… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 19 20:16:10 2019 -0500 winegstreamer: Use strmbase pin reference counting methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 8dc2355..b3d6a83 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1687,18 +1687,6 @@ static HRESULT WINAPI GSTOutPin_QueryInterface(IPin *iface, REFIID riid, void ** return E_NOINTERFACE; } -static ULONG WINAPI GSTOutPin_AddRef(IPin *iface) -{ - GSTOutPin *pin = impl_source_from_IPin(iface); - return IBaseFilter_AddRef(pin->pin.pin.pinInfo.pFilter); -} - -static ULONG WINAPI GSTOutPin_Release(IPin *iface) -{ - GSTOutPin *pin = impl_source_from_IPin(iface); - return IBaseFilter_Release(pin->pin.pin.pinInfo.pFilter); -} - static HRESULT WINAPI GSTOutPin_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE *amt) { FIXME("(%p) stub\n", base); @@ -1794,8 +1782,8 @@ static void free_source_pin(GSTOutPin *pin) static const IPinVtbl GST_OutputPin_Vtbl = { GSTOutPin_QueryInterface, - GSTOutPin_AddRef, - GSTOutPin_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, BaseOutputPinImpl_Disconnect, @@ -1879,18 +1867,6 @@ static inline GSTInPin *impl_sink_from_IPin(IPin *iface) return CONTAINING_RECORD(iface, GSTInPin, pin.IPin_iface); } -static ULONG WINAPI GSTInPin_AddRef(IPin *iface) -{ - GSTInPin *pin = impl_sink_from_IPin(iface); - return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); -} - -static ULONG WINAPI GSTInPin_Release(IPin *iface) -{ - GSTInPin *pin = impl_sink_from_IPin(iface); - return IBaseFilter_Release(pin->pin.pinInfo.pFilter); -} - static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) { GSTInPin *This = impl_sink_from_IPin(iface); @@ -2073,8 +2049,8 @@ static HRESULT WINAPI GSTInPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppE static const IPinVtbl GST_InputPin_Vtbl = { GSTInPin_QueryInterface, - GSTInPin_AddRef, - GSTInPin_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseInputPinImpl_Connect, GSTInPin_ReceiveConnection, GSTInPin_Disconnect,

1 0

Zebediah Figura : wineqtdecoder: Use strmbase pin reference counting methods.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 0d50d935c2e8ce908f3aa734338c3c27b5499a64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d50d935c2e8ce908f3aa734… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 19 20:16:11 2019 -0500 wineqtdecoder: Use strmbase pin reference counting methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 8b271d2..c5d3efa 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -823,18 +823,6 @@ static inline QTInPin *impl_from_IPin( IPin *iface ) return CONTAINING_RECORD(iface, QTInPin, pin.IPin_iface); } -static ULONG WINAPI QTInPin_AddRef(IPin *iface) -{ - QTInPin *pin = impl_from_IPin(iface); - return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); -} - -static ULONG WINAPI QTInPin_Release(IPin *iface) -{ - QTInPin *pin = impl_from_IPin(iface); - return IBaseFilter_Release(pin->pin.pinInfo.pFilter); -} - static HRESULT QT_Process_Video_Track(QTSplitter* filter, Track trk) { AM_MEDIA_TYPE amt; @@ -1268,8 +1256,8 @@ static HRESULT WINAPI QTInPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEn static const IPinVtbl QT_InputPin_Vtbl = { QTInPin_QueryInterface, - QTInPin_AddRef, - QTInPin_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseInputPinImpl_Connect, QTInPin_ReceiveConnection, QTInPin_Disconnect, @@ -1331,18 +1319,6 @@ static HRESULT WINAPI QTOutPin_QueryInterface(IPin *iface, REFIID riid, void **p return E_NOINTERFACE; } -static ULONG WINAPI QTOutPin_AddRef(IPin *iface) -{ - QTOutPin *pin = impl_QTOutPin_from_IPin(iface); - return IBaseFilter_AddRef(pin->pin.pin.pinInfo.pFilter); -} - -static ULONG WINAPI QTOutPin_Release(IPin *iface) -{ - QTOutPin *pin = impl_QTOutPin_from_IPin(iface); - return IBaseFilter_Release(pin->pin.pin.pinInfo.pFilter); -} - static HRESULT WINAPI QTOutPin_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE *amt) { FIXME("(%p) stub\n", base); @@ -1391,8 +1367,8 @@ static HRESULT WINAPI QTOutPin_DecideAllocator(BaseOutputPin *iface, IMemInputPi static const IPinVtbl QT_OutputPin_Vtbl = { QTOutPin_QueryInterface, - QTOutPin_AddRef, - QTOutPin_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, BaseOutputPinImpl_Disconnect,

1 0

Zebediah Figura : quartz/filesource: Store the source pin inline in the AsyncReader structure.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 5bb661abd36d2bc3a72d3eda77a9b701b882ec28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bb661abd36d2bc3a72d3eda… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 19 20:16:12 2019 -0500 quartz/filesource: Store the source pin inline in the AsyncReader structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 339 +++++++++++++++++++---------------------------- 1 file changed, 138 insertions(+), 201 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5bb661abd36d2bc3a72d…

1 0

Zebediah Figura : quartz/filesource: Cancel I/ O from all threads in IAsyncReader::BeginFlush().
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 0523f75933815720db676e3b293ea8dfae090bbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=0523f75933815720db676e3b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 19 20:16:13 2019 -0500 quartz/filesource: Cancel I/O from all threads in IAsyncReader::BeginFlush(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 2a6188a..2d4265d 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1251,7 +1251,7 @@ static HRESULT WINAPI FileAsyncReader_BeginFlush(IAsyncReader * iface) EnterCriticalSection(&filter->sample_cs); filter->flushing = TRUE; - CancelIo(filter->file); + CancelIoEx(filter->file, NULL); SetEvent(filter->handle_list[filter->samples]); LeaveCriticalSection(&filter->sample_cs);

1 0

Zebediah Figura : quartz/filesource: Add a test for cross-thread asynchronous read requests.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: fd79a28593244b860739af8a49fab5030f8f10b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd79a28593244b860739af8a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 19 20:16:14 2019 -0500 quartz/filesource: Add a test for cross-thread asynchronous read requests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filesource.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index b1a8399..c38811a 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -808,12 +808,28 @@ static void test_sync_read_aligned(IAsyncReader *reader, IMemAllocator *allocato IMediaSample_Release(sample); } +struct request_thread_params +{ + IAsyncReader *reader; + IMediaSample *sample; +}; + +static DWORD CALLBACK request_thread(void *arg) +{ + struct request_thread_params *params = arg; + HRESULT hr = IAsyncReader_Request(params->reader, params->sample, 123); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return 0; +} + static void test_request(IAsyncReader *reader, IMemAllocator *allocator) { IMediaSample *sample, *sample2, *ret_sample; + struct request_thread_params params; REFERENCE_TIME start_time, end_time; BYTE *data, *data2; DWORD_PTR cookie; + HANDLE thread; HRESULT hr; LONG len; int i; @@ -897,6 +913,17 @@ static void test_request(IAsyncReader *reader, IMemAllocator *allocator) for (i = 0; i < 88; i++) ok(data2[i] == (512 + i) % 111, "Got wrong byte %02x at %u.\n", data2[i], i); + params.reader = reader; + params.sample = sample; + thread = CreateThread(NULL, 0, request_thread, &params, 0, NULL); + ok(!WaitForSingleObject(thread, 1000), "Wait timed out.\n"); + CloseHandle(thread); + + hr = IAsyncReader_WaitForNext(reader, 1000, &ret_sample, &cookie); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ret_sample == sample, "Samples didn't match.\n"); + ok(cookie == 123, "Got cookie %lu.\n", cookie); + IMediaSample_Release(sample); IMediaSample_Release(sample2); }

1 0