March 2021 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Initialize HTMLPluginsCollection object with compat mode.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: 65aedc8e0fd7f7668d02bc85a153ee6d698b2d45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65aedc8e0fd7f7668d02bc85… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 12 17:40:29 2021 +0100 mshtml: Initialize HTMLPluginsCollection object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/omnavigator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 7e99e1476f7..183c9733684 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -892,8 +892,8 @@ static HRESULT create_plugins_collection(OmNavigator *navigator, HTMLPluginsColl col->ref = 1; col->navigator = navigator; - init_dispex(&col->dispex, (IUnknown*)&col->IHTMLPluginsCollection_iface, - &HTMLPluginsCollection_dispex); + init_dispex_with_compat_mode(&col->dispex, (IUnknown*)&col->IHTMLPluginsCollection_iface, + &HTMLPluginsCollection_dispex, dispex_compat_mode(&navigator->dispex)); *ret = col; return S_OK;

1 0

Jacek Caban : mshtml: Initialize HTMLMimeTypesCollection object with compat mode.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: f96d9b67debe788d62f0cb4823527cdaf51c3582 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f96d9b67debe788d62f0cb48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 12 17:40:35 2021 +0100 mshtml: Initialize HTMLMimeTypesCollection object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/omnavigator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 183c9733684..f3a3ec54924 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1036,8 +1036,8 @@ static HRESULT create_mime_types_collection(OmNavigator *navigator, HTMLMimeType col->ref = 1; col->navigator = navigator; - init_dispex(&col->dispex, (IUnknown*)&col->IHTMLMimeTypesCollection_iface, - &HTMLMimeTypesCollection_dispex); + init_dispex_with_compat_mode(&col->dispex, (IUnknown*)&col->IHTMLMimeTypesCollection_iface, + &HTMLMimeTypesCollection_dispex, dispex_compat_mode(&navigator->dispex)); *ret = col; return S_OK;

1 0

Paul Gofman : ddraw: Store hardware_device flag in struct d3d_device.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: fb6b5ce72ec54d801309bda6407869f5d6be6e59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb6b5ce72ec54d801309bda6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 11 16:33:53 2021 +0300 ddraw: Store hardware_device flag in struct d3d_device. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 6 +++--- dlls/ddraw/ddraw_private.h | 3 ++- dlls/ddraw/device.c | 12 +++++++----- dlls/ddraw/surface.c | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d616330c307..705d0335d95 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4330,7 +4330,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid, TRACE("iface %p, riid %s, surface %p, device %p.\n", iface, debugstr_guid(riid), surface, device); wined3d_mutex_lock(); - if (SUCCEEDED(hr = d3d_device_create(ddraw, target, (IUnknown *)surface, 7, &object, NULL))) + if (SUCCEEDED(hr = d3d_device_create(ddraw, riid, target, (IUnknown *)surface, 7, &object, NULL))) { *device = &object->IDirect3DDevice7_iface; } @@ -4359,7 +4359,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid, return CLASS_E_NOAGGREGATION; wined3d_mutex_lock(); - if (SUCCEEDED(hr = d3d_device_create(ddraw, surface_impl, (IUnknown *)surface, 3, &device_impl, NULL))) + if (SUCCEEDED(hr = d3d_device_create(ddraw, riid, surface_impl, (IUnknown *)surface, 3, &device_impl, NULL))) { *device = &device_impl->IDirect3DDevice3_iface; } @@ -4385,7 +4385,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, iface, debugstr_guid(riid), surface, device); wined3d_mutex_lock(); - if (SUCCEEDED(hr = d3d_device_create(ddraw, surface_impl, (IUnknown *)surface, 2, &device_impl, NULL))) + if (SUCCEEDED(hr = d3d_device_create(ddraw, riid, surface_impl, (IUnknown *)surface, 2, &device_impl, NULL))) { *device = &device_impl->IDirect3DDevice2_iface; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 6bbd62949ac..e25ab23c2bc 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -317,6 +317,7 @@ struct d3d_device IUnknown IUnknown_inner; LONG ref; UINT version; + BOOL hardware_device; IUnknown *outer_unknown; struct wined3d_device *wined3d_device; @@ -364,7 +365,7 @@ struct d3d_device const struct wined3d_stateblock_state *stateblock_state; }; -HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, +HRESULT d3d_device_create(struct ddraw *ddraw, const GUID *guid, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, struct d3d_device **device, IUnknown *outer_unknown) DECLSPEC_HIDDEN; enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device *device) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4d24c22650e..5e66007213d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6925,7 +6925,7 @@ static void ddraw_reset_viewport_state(struct ddraw *ddraw) wined3d_stateblock_set_scissor_rect(ddraw->state, &rect); } -static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, +static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, const GUID *guid, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, IUnknown *outer_unknown) { static const struct wined3d_matrix ident = @@ -6948,6 +6948,8 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, device->IUnknown_inner.lpVtbl = &d3d_device_inner_vtbl; device->ref = 1; device->version = version; + device->hardware_device = IsEqualGUID(&IID_IDirect3DTnLHalDevice, guid) + || IsEqualGUID(&IID_IDirect3DHALDevice, guid); if (outer_unknown) device->outer_unknown = outer_unknown; @@ -7006,14 +7008,14 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, return D3D_OK; } -HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, +HRESULT d3d_device_create(struct ddraw *ddraw, const GUID *guid, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, struct d3d_device **device, IUnknown *outer_unknown) { struct d3d_device *object; HRESULT hr; - TRACE("ddraw %p, target %p, version %u, device %p, outer_unknown %p.\n", - ddraw, target, version, device, outer_unknown); + TRACE("ddraw %p, guid %s, target %p, version %u, device %p, outer_unknown %p.\n", + ddraw, debugstr_guid(guid), target, version, device, outer_unknown); if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE) || (target->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) @@ -7054,7 +7056,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn return DDERR_OUTOFMEMORY; } - if (FAILED(hr = d3d_device_init(object, ddraw, target, rt_iface, version, outer_unknown))) + if (FAILED(hr = d3d_device_init(object, ddraw, guid, target, rt_iface, version, outer_unknown))) { WARN("Failed to initialize device, hr %#x.\n", hr); heap_free(object); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0ca19d4f8a5..b910fb6817e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -256,7 +256,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, { HRESULT hr; - if (FAILED(hr = d3d_device_create(This->ddraw, This, (IUnknown *)&This->IDirectDrawSurface_iface, + if (FAILED(hr = d3d_device_create(This->ddraw, riid, This, (IUnknown *)&This->IDirectDrawSurface_iface, 1, &This->device1, (IUnknown *)&This->IDirectDrawSurface_iface))) { This->device1 = NULL;

1 0

Paul Gofman : ddraw/tests: Compute output caps instead of coding them in test_rt_caps().
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: b5a531d9b045e0a68795f6f62a8d8862dc6a9fdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5a531d9b045e0a68795f6f6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 11 16:33:54 2021 +0300 ddraw/tests: Compute output caps instead of coding them in test_rt_caps(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 79 ++++++++++++--------------------- dlls/ddraw/tests/ddraw2.c | 78 +++++++++++--------------------- dlls/ddraw/tests/ddraw4.c | 108 +++++++++++++------------------------------- dlls/ddraw/tests/ddraw7.c | 111 +++++++++++++--------------------------------- 4 files changed, 116 insertions(+), 260 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b5a531d9b045e0a68795…

1 0

Paul Gofman : ddraw: Create the second texture for system memory bindable surfaces.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: d2d9f713df7932aac4b137ec3bf647d5da7faaef URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2d9f713df7932aac4b137ec… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 11 16:33:55 2021 +0300 ddraw: Create the second texture for system memory bindable surfaces. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 18 +++++ dlls/ddraw/device.c | 60 +++++++++++++++- dlls/ddraw/executebuffer.c | 6 ++ dlls/ddraw/surface.c | 173 ++++++++++++++++++++++++++++++++++++++------- 4 files changed, 229 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d2d9f713df7932aac4b1…

1 0

Paul Gofman : ddraw: Allow creating software device with system memory surface.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: bea6b223a32c132e72b4c555bcba670876f1cdcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bea6b223a32c132e72b4c555… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 11 16:33:56 2021 +0300 ddraw: Allow creating software device with system memory surface. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 12 ++++++------ dlls/ddraw/tests/ddraw1.c | 1 - dlls/ddraw/tests/ddraw2.c | 1 - dlls/ddraw/tests/ddraw4.c | 1 - dlls/ddraw/tests/ddraw7.c | 1 - 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e4822e5d29e..1ea28709e9d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -7007,6 +7007,12 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, c device->hardware_device = IsEqualGUID(&IID_IDirect3DTnLHalDevice, guid) || IsEqualGUID(&IID_IDirect3DHALDevice, guid); + if (device->hardware_device && !(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + { + WARN("Surface %p is not in video memory.\n", target); + return D3DERR_SURFACENOTINVIDMEM; + } + if (outer_unknown) device->outer_unknown = outer_unknown; else @@ -7094,12 +7100,6 @@ HRESULT d3d_device_create(struct ddraw *ddraw, const GUID *guid, struct ddraw_su return DDERR_OUTOFMEMORY; } - if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) - { - WARN("Surface %p is not in video memory.\n", target); - return D3DERR_SURFACENOTINVIDMEM; - } - if (ddraw->d3ddevice) { FIXME("Only one Direct3D device per DirectDraw object supported.\n"); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 82081840320..5cf8cf4a94b 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -4557,7 +4557,6 @@ static void test_rt_caps(const GUID *device_guid) surface_desc.ddsCaps.dwCaps, expected_caps, i, software_device); hr = IDirectDrawSurface_QueryInterface(surface, device_guid, (void **)&device); - todo_wine_if(software_device && test_data[i].create_device_hr == D3DERR_SURFACENOTINVIDMEM) ok((!software_device && hr == test_data[i].create_device_hr) || (software_device && (hr == (test_data[i].create_device_hr == D3DERR_SURFACENOTINVIDMEM ? DD_OK : test_data[i].create_device_hr))), diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2346992750c..98beaaf8cba 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -5029,7 +5029,6 @@ static void test_rt_caps(const GUID *device_guid) hr = IDirect3D2_CreateDevice(d3d, device_guid, surface, &device); - todo_wine_if(software_device && test_data[i].create_device_hr == D3DERR_SURFACENOTINVIDMEM) ok((!software_device && hr == test_data[i].create_device_hr) || (software_device && (hr == (test_data[i].create_device_hr == D3DERR_SURFACENOTINVIDMEM ? DD_OK : test_data[i].create_device_hr))), diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index d0fba7a3a21..1801ef2d2e2 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6658,7 +6658,6 @@ static void test_rt_caps(const GUID *device_guid) hr = IDirect3D3_CreateDevice(d3d, device_guid, surface, &device, NULL); - todo_wine_if(software_device && test_data[i].create_device_hr == D3DERR_SURFACENOTINVIDMEM) ok((!software_device && hr == test_data[i].create_device_hr) || (software_device && (hr == (test_data[i].create_device_hr == D3DERR_SURFACENOTINVIDMEM ? DD_OK : test_data[i].create_device_hr))), diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 3b40210a214..cba5cb4be2a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6388,7 +6388,6 @@ static void test_rt_caps(const GUID *device_guid) surface_desc.ddsCaps.dwCaps2, test_data[i].caps2_in, i, software_device); hr = IDirect3D7_CreateDevice(d3d, device_guid, surface, &device); - todo_wine_if(software_device && test_data[i].create_device_hr == D3DERR_SURFACENOTINVIDMEM) ok((!software_device && hr == test_data[i].create_device_hr) || (software_device && (hr == (test_data[i].create_device_hr == D3DERR_SURFACENOTINVIDMEM ? DD_OK : test_data[i].create_device_hr))),

1 0

Paul Gofman : ddraw: Allow setting system memory surfaces as render targets for software device.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: ff6bf06ce3663c4f2a8b14f4a5f3d5ca0443ce4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff6bf06ce3663c4f2a8b14f4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 11 16:33:57 2021 +0300 ddraw: Allow setting system memory surfaces as render targets for software device. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 1ea28709e9d..005de0805e1 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1898,7 +1898,7 @@ static HRESULT d3d_device7_SetRenderTarget(IDirect3DDevice7 *iface, return DDERR_INVALIDCAPS; } - if (!(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + if (device->hardware_device && !(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) { WARN("Surface %p is not in video memory.\n", target_impl); wined3d_mutex_unlock(); @@ -1974,7 +1974,7 @@ static HRESULT WINAPI d3d_device3_SetRenderTarget(IDirect3DDevice3 *iface, return DDERR_INVALIDPIXELFORMAT; } - if (!(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + if (device->hardware_device && !(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) { WARN("Surface %p is not in video memory.\n", target_impl); IDirectDrawSurface4_AddRef(target); @@ -2023,7 +2023,7 @@ static HRESULT WINAPI d3d_device2_SetRenderTarget(IDirect3DDevice2 *iface, return DDERR_INVALIDPIXELFORMAT; } - if (!(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + if (device->hardware_device && !(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) { WARN("Surface %p is not in video memory.\n", target_impl); IDirectDrawSurface_AddRef(target);

1 0

Zebediah Figura : quartz/vmr9: Assume that the filter is connected and stopped in VMR9_BreakConnect().
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: 40d77283eba0b88b3258bcdba5ad3b95d0461615 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40d77283eba0b88b3258bcdb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 11 17:21:57 2021 -0600 quartz/vmr9: Assume that the filter is connected and stopped in VMR9_BreakConnect(). strmbase provides those guarantees. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index f95c2bfbce2..b5344207398 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -514,26 +514,21 @@ static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE static HRESULT WINAPI VMR9_BreakConnect(struct strmbase_renderer *This) { - struct quartz_vmr *pVMR9 = impl_from_IBaseFilter(&This->filter.IBaseFilter_iface); + struct quartz_vmr *filter = impl_from_IBaseFilter(&This->filter.IBaseFilter_iface); HRESULT hr = S_OK; DWORD i; - if (!pVMR9->mode) + if (!filter->mode) return S_FALSE; - if (This->sink.pin.peer && pVMR9->allocator && pVMR9->presenter) + + if (filter->allocator && filter->presenter) { - if (pVMR9->renderer.filter.state != State_Stopped) - { - ERR("Disconnecting while not stopped! UNTESTED!!\n"); - } - if (pVMR9->renderer.filter.state == State_Running) - hr = IVMRImagePresenter9_StopPresenting(pVMR9->presenter, pVMR9->cookie); - - for (i = 0; i < pVMR9->num_surfaces; ++i) - IDirect3DSurface9_Release(pVMR9->surfaces[i]); - free(pVMR9->surfaces); - IVMRSurfaceAllocator9_TerminateDevice(pVMR9->allocator, pVMR9->cookie); - pVMR9->num_surfaces = 0; + for (i = 0; i < filter->num_surfaces; ++i) + IDirect3DSurface9_Release(filter->surfaces[i]); + free(filter->surfaces); + + IVMRSurfaceAllocator9_TerminateDevice(filter->allocator, filter->cookie); + filter->num_surfaces = 0; } return hr; }

1 0

Zebediah Figura : strmbase: Rename pfnBreakConnect to renderer_disconnect.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: 4bede3b27be2073560d185e2a047949f18df6d7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bede3b27be2073560d185e2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 11 17:21:58 2021 -0600 strmbase: Rename pfnBreakConnect to renderer_disconnect. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 4 ++-- dlls/strmbase/renderer.c | 4 ++-- include/wine/strmbase.h | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index b5344207398..6ac01c3b8ae 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -512,7 +512,7 @@ static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE return hr; } -static HRESULT WINAPI VMR9_BreakConnect(struct strmbase_renderer *This) +static HRESULT vmr_disconnect(struct strmbase_renderer *This) { struct quartz_vmr *filter = impl_from_IBaseFilter(&This->filter.IBaseFilter_iface); HRESULT hr = S_OK; @@ -638,7 +638,7 @@ static const struct strmbase_renderer_ops renderer_ops = .renderer_start_stream = vmr_start_stream, .renderer_stop_stream = vmr_stop_stream, .renderer_connect = vmr_connect, - .pfnBreakConnect = VMR9_BreakConnect, + .renderer_disconnect = vmr_disconnect, .renderer_destroy = vmr_destroy, .renderer_query_interface = vmr_query_interface, .renderer_pin_query_interface = vmr_pin_query_interface, diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index e6adf41add9..47be6e0fd30 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -427,8 +427,8 @@ static void sink_disconnect(struct strmbase_sink *iface) { struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface); - if (filter->pFuncsTable->pfnBreakConnect) - filter->pFuncsTable->pfnBreakConnect(filter); + if (filter->pFuncsTable->renderer_disconnect) + filter->pFuncsTable->renderer_disconnect(filter); } static HRESULT sink_eos(struct strmbase_sink *iface) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 347482b1eb9..dcb9b1bf3d9 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -305,8 +305,6 @@ struct strmbase_renderer BOOL eos; }; -typedef HRESULT (WINAPI *BaseRenderer_BreakConnect) (struct strmbase_renderer *iface); - struct strmbase_renderer_ops { HRESULT (*renderer_query_accept)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); @@ -315,7 +313,7 @@ struct strmbase_renderer_ops void (*renderer_start_stream)(struct strmbase_renderer *iface); void (*renderer_stop_stream)(struct strmbase_renderer *iface); HRESULT (*renderer_connect)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); - BaseRenderer_BreakConnect pfnBreakConnect; + HRESULT (*renderer_disconnect)(struct strmbase_renderer *iface); void (*renderer_destroy)(struct strmbase_renderer *iface); HRESULT (*renderer_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out); HRESULT (*renderer_pin_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out);

1 0

Zebediah Figura : strmbase: Return void from renderer_disconnect.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: 26476fcf483b9c7513644506f5f8bb834e3a90b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26476fcf483b9c7513644506… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 11 17:21:59 2021 -0600 strmbase: Return void from renderer_disconnect. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 9 ++------- include/wine/strmbase.h | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 6ac01c3b8ae..2562b74932a 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -512,16 +512,12 @@ static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE return hr; } -static HRESULT vmr_disconnect(struct strmbase_renderer *This) +static void vmr_disconnect(struct strmbase_renderer *This) { struct quartz_vmr *filter = impl_from_IBaseFilter(&This->filter.IBaseFilter_iface); - HRESULT hr = S_OK; DWORD i; - if (!filter->mode) - return S_FALSE; - - if (filter->allocator && filter->presenter) + if (filter->mode && filter->allocator && filter->presenter) { for (i = 0; i < filter->num_surfaces; ++i) IDirect3DSurface9_Release(filter->surfaces[i]); @@ -530,7 +526,6 @@ static HRESULT vmr_disconnect(struct strmbase_renderer *This) IVMRSurfaceAllocator9_TerminateDevice(filter->allocator, filter->cookie); filter->num_surfaces = 0; } - return hr; } static void vmr_free(struct quartz_vmr *filter) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index dcb9b1bf3d9..9906a9ffd74 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -313,7 +313,7 @@ struct strmbase_renderer_ops void (*renderer_start_stream)(struct strmbase_renderer *iface); void (*renderer_stop_stream)(struct strmbase_renderer *iface); HRESULT (*renderer_connect)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); - HRESULT (*renderer_disconnect)(struct strmbase_renderer *iface); + void (*renderer_disconnect)(struct strmbase_renderer *iface); void (*renderer_destroy)(struct strmbase_renderer *iface); HRESULT (*renderer_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out); HRESULT (*renderer_pin_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out);

1 0