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

Zhiyi Zhang : wined3d: Pass a struct wined3d_adapter pointer to wined3d_device_create().
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: a8072e0841248b3c9a8e58c3f433df4250217825 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8072e0841248b3c9a8e58c3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 10 17:30:50 2020 +0800 wined3d: Pass a struct wined3d_adapter pointer to wined3d_device_create(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 9 ++++++++- dlls/d3d9/device.c | 9 ++++++++- dlls/ddraw/ddraw.c | 2 +- dlls/dxgi/device.c | 2 +- dlls/wined3d/directx.c | 11 +++-------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 7 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d6253a4a2b..02b010c22a 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3658,8 +3658,10 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine { struct wined3d_swapchain_desc swapchain_desc; struct wined3d_swapchain *wined3d_swapchain; + struct wined3d_adapter *wined3d_adapter; struct d3d8_swapchain *d3d_swapchain; struct wined3d_caps caps; + unsigned int output_idx; HRESULT hr; static const enum wined3d_feature_level feature_levels[] = @@ -3670,6 +3672,10 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine WINED3D_FEATURE_LEVEL_5, }; + output_idx = adapter; + if (output_idx >= parent->wined3d_output_count) + return D3DERR_INVALIDCALL; + device->IDirect3DDevice8_iface.lpVtbl = &d3d8_device_vtbl; device->device_parent.ops = &d3d8_wined3d_device_parent_ops; device->ref = 1; @@ -3684,7 +3690,8 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine if (!(flags & D3DCREATE_FPU_PRESERVE)) setup_fpu(); wined3d_mutex_lock(); - if (FAILED(hr = wined3d_device_create(wined3d, adapter, device_type, + wined3d_adapter = wined3d_output_get_adapter(parent->wined3d_outputs[output_idx]); + if (FAILED(hr = wined3d_device_create(wined3d, wined3d_adapter, device_type, focus_window, flags, 4, feature_levels, ARRAY_SIZE(feature_levels), &device->device_parent, &device->wined3d_device))) { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8ffe04c94d..84c119d3e0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4590,8 +4590,10 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode) { struct wined3d_swapchain_desc *swapchain_desc; + struct wined3d_adapter *wined3d_adapter; struct d3d9_swapchain *d3d_swapchain; struct wined3d_caps caps; + unsigned int output_idx; unsigned i, count = 1; HRESULT hr; @@ -4606,6 +4608,10 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine WINED3D_FEATURE_LEVEL_5, }; + output_idx = adapter; + if (output_idx >= parent->wined3d_output_count) + return D3DERR_INVALIDCALL; + if (mode) FIXME("Ignoring display mode.\n"); @@ -4616,7 +4622,8 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine if (!(flags & D3DCREATE_FPU_PRESERVE)) setup_fpu(); wined3d_mutex_lock(); - if (FAILED(hr = wined3d_device_create(wined3d, adapter, device_type, + wined3d_adapter = wined3d_output_get_adapter(parent->wined3d_outputs[output_idx]); + if (FAILED(hr = wined3d_device_create(wined3d, wined3d_adapter, device_type, focus_window, flags, 4, feature_levels, ARRAY_SIZE(feature_levels), &device->device_parent, &device->wined3d_device))) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 17a02bbc05..d3a536e412 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5030,7 +5030,7 @@ HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type de ddraw->flags |= DDRAW_NO3D; } - if (FAILED(hr = wined3d_device_create(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type, + if (FAILED(hr = wined3d_device_create(ddraw->wined3d, ddraw->wined3d_adapter, device_type, NULL, 0, DDRAW_STRIDE_ALIGNMENT, feature_levels, ARRAY_SIZE(feature_levels), &ddraw->device_parent, &ddraw->wined3d_device))) { diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 4b23155754..5edd431199 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -519,7 +519,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l IWineDXGIDeviceParent_Release(dxgi_device_parent); if (FAILED(hr = wined3d_device_create(dxgi_factory->wined3d, - dxgi_adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, NULL, 0, 4, + dxgi_adapter->wined3d_adapter, WINED3D_DEVICE_TYPE_HAL, NULL, 0, 4, (const enum wined3d_feature_level *)feature_levels, level_count, wined3d_device_parent, &device->wined3d_device))) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 208e00b839..ecfa444e05 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2319,24 +2319,19 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned in return WINED3D_OK; } -HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, unsigned int adapter_idx, +HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, DWORD flags, BYTE surface_alignment, const enum wined3d_feature_level *feature_levels, unsigned int feature_level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device) { - const struct wined3d_adapter *adapter; struct wined3d_device *object; HRESULT hr; - TRACE("wined3d %p, adapter_idx %u, device_type %#x, focus_window %p, flags %#x, " + TRACE("wined3d %p, adapter %p, device_type %#x, focus_window %p, flags %#x, " "surface_alignment %u, feature_levels %p, feature_level_count %u, device_parent %p, device %p.\n", - wined3d, adapter_idx, device_type, focus_window, flags, surface_alignment, + wined3d, adapter, device_type, focus_window, flags, surface_alignment, feature_levels, feature_level_count, device_parent, device); - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - - adapter = wined3d->adapters[adapter_idx]; if (FAILED(hr = adapter->adapter_ops->adapter_create_device(wined3d, adapter, device_type, focus_window, flags, surface_alignment, feature_levels, feature_level_count, device_parent, &object))) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3530a11f8d..d4b0a14726 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -42,7 +42,7 @@ @ cdecl wined3d_device_copy_resource(ptr ptr ptr) @ cdecl wined3d_device_copy_sub_resource_region(ptr ptr long long long long ptr long ptr long) @ cdecl wined3d_device_copy_uav_counter(ptr ptr long ptr) -@ cdecl wined3d_device_create(ptr long long ptr long long ptr long ptr ptr) +@ cdecl wined3d_device_create(ptr ptr long ptr long long ptr long ptr ptr) @ cdecl wined3d_device_decref(ptr) @ cdecl wined3d_device_dispatch_compute(ptr long long long) @ cdecl wined3d_device_dispatch_compute_indirect(ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 923f184d96..115084e6c4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2312,7 +2312,7 @@ HRESULT __cdecl wined3d_device_copy_sub_resource_region(struct wined3d_device *d unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, unsigned int flags); void __cdecl wined3d_device_copy_uav_counter(struct wined3d_device *device, struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav); -HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, unsigned int adapter_idx, +HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, DWORD behaviour_flags, BYTE surface_alignment, const enum wined3d_feature_level *feature_levels, unsigned int feature_level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device);

1 0

Zhiyi Zhang : wined3d: Refactor wined3d_get_adapter_identifier() to wined3d_adapter_get_identifier().
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 591068cec06257f3d5ed23e19ee4ad055ad978aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=591068cec06257f3d5ed23e1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 10 17:35:09 2020 +0800 wined3d: Refactor wined3d_get_adapter_identifier() to wined3d_adapter_get_identifier(). wined3d_adapter_get_identifier() uses a struct wined3d_adapter pointer as parameter. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 9 ++++++++- dlls/d3d9/directx.c | 18 ++++++++++++++++-- dlls/ddraw/ddraw.c | 4 ++-- dlls/ddraw/main.c | 2 +- dlls/dxgi/adapter.c | 8 ++++---- dlls/wined3d/directx.c | 14 +++----------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 8 files changed, 37 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=591068cec06257f3d5ed…

1 0

Zhiyi Zhang : wined3d: Pass a struct wined3d_adapter pointer to wined3d_check_device_multisample_type().
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: beb4668d58337c52d58b7cefada740695cc0614d URL: https://source.winehq.org/git/wine.git/?a=commit;h=beb4668d58337c52d58b7cef… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 10 17:35:20 2020 +0800 wined3d: Pass a struct wined3d_adapter pointer to wined3d_check_device_multisample_type(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 4 +++- dlls/d3d8/directx.c | 19 +++++++++++++++++-- dlls/d3d9/directx.c | 19 +++++++++++++++++-- dlls/wined3d/directx.c | 10 +++------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 6 files changed, 42 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=beb4668d58337c52d58b…

1 0

Zhiyi Zhang : wined3d: Pass a struct wined3d_adapter pointer to wined3d_check_device_format().
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: f2a850c8442fb174f91e1988c04855a4b7ea7720 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2a850c8442fb174f91e1988… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 10 17:35:35 2020 +0800 wined3d: Pass a struct wined3d_adapter pointer to wined3d_check_device_format(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 4 +++- dlls/d3d8/directx.c | 7 ++++--- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 1 + dlls/d3d9/directx.c | 4 ++-- dlls/d3d9/texture.c | 6 +++++- dlls/ddraw/ddraw.c | 6 +++--- dlls/ddraw/device.c | 12 +++++++----- dlls/ddraw/surface.c | 2 +- dlls/wined3d/directx.c | 18 +++++++----------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 7 ++++--- 12 files changed, 39 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2a850c8442fb174f91e…

1 0

Zhiyi Zhang : wined3d: Pass a struct wined3d_adapter pointer to wined3d_calculate_format_pitch().
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: c9f0d862b55be91f416a0114e9a52226bb2658d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9f0d862b55be91f416a0114… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 10 17:35:46 2020 +0800 wined3d: Pass a struct wined3d_adapter pointer to wined3d_calculate_format_pitch(). Signed-off-by: Zhiyi Zhang <zzhang(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 | 2 +- dlls/ddraw/surface.c | 4 ++-- dlls/wined3d/directx.c | 12 +++--------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7c13d4abd4..e82f9644e3 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1913,7 +1913,7 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *c wined3d_mutex_unlock(); return hr; } - framebuffer_size = wined3d_calculate_format_pitch(ddraw->wined3d, WINED3DADAPTER_DEFAULT, + framebuffer_size = wined3d_calculate_format_pitch(ddraw->wined3d_adapter, mode.format_id, mode.width); framebuffer_size *= mode.height; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 627963232e..85c1ef4966 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6265,7 +6265,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ } if ((desc->dwFlags & DDSD_LINEARSIZE) - && desc->u1.dwLinearSize < wined3d_calculate_format_pitch(ddraw->wined3d, WINED3DADAPTER_DEFAULT, + && desc->u1.dwLinearSize < wined3d_calculate_format_pitch(ddraw->wined3d_adapter, wined3d_desc.format, wined3d_desc.width) * ((desc->dwHeight + 3) / 4)) { WARN("Invalid linear size %u specified.\n", desc->u1.dwLinearSize); @@ -6282,7 +6282,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_INVALIDPARAMS; } - if (desc->u1.lPitch < wined3d_calculate_format_pitch(ddraw->wined3d, WINED3DADAPTER_DEFAULT, + if (desc->u1.lPitch < wined3d_calculate_format_pitch(ddraw->wined3d_adapter, wined3d_desc.format, wined3d_desc.width) || desc->u1.lPitch & 3) { WARN("Invalid pitch %u specified.\n", desc->u1.lPitch); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d026c6a49e..8f8933801a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1738,19 +1738,13 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, return WINED3D_OK; } -UINT CDECL wined3d_calculate_format_pitch(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_format_id format_id, UINT width) +unsigned int CDECL wined3d_calculate_format_pitch(const struct wined3d_adapter *adapter, + enum wined3d_format_id format_id, unsigned int width) { - const struct wined3d_adapter *adapter; unsigned int row_pitch, slice_pitch; - TRACE("wined3d %p, adapter_idx %u, format_id %s, width %u.\n", - wined3d, adapter_idx, debug_d3dformat(format_id), width); - - if (adapter_idx >= wined3d->adapter_count) - return ~0u; + TRACE("adapter %p, format_id %s, width %u.\n", adapter, debug_d3dformat(format_id), width); - adapter = wined3d->adapters[adapter_idx]; wined3d_format_calculate_pitch(wined3d_get_format(adapter, format_id, 0), 1, width, 1, &row_pitch, &slice_pitch); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3e511c6c2e..a25accc237 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -1,7 +1,7 @@ @ stdcall wined3d_mutex_lock() @ stdcall wined3d_mutex_unlock() -@ cdecl wined3d_calculate_format_pitch(ptr long long long) +@ cdecl wined3d_calculate_format_pitch(ptr long long) @ cdecl wined3d_check_depth_stencil_match(ptr long long long long) @ cdecl wined3d_check_device_format(ptr ptr long long long long long long) @ cdecl wined3d_check_device_format_conversion(ptr long long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 035268be7a..d6a9a079d7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2247,8 +2247,8 @@ typedef HRESULT (CDECL *wined3d_device_reset_cb)(struct wined3d_resource *resour void __stdcall wined3d_mutex_lock(void); void __stdcall wined3d_mutex_unlock(void); -UINT __cdecl wined3d_calculate_format_pitch(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_format_id format_id, UINT width); +unsigned int __cdecl wined3d_calculate_format_pitch(const struct wined3d_adapter *adapter, + enum wined3d_format_id format_id, unsigned int width); HRESULT __cdecl wined3d_check_depth_stencil_match(const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, enum wined3d_format_id render_target_format_id, enum wined3d_format_id depth_stencil_format_id);

1 0

Zebediah Figura : winegstreamer: Read into an existing buffer if requested.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: d61504f16b2751d754ea562f8d49fa86330cda43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d61504f16b2751d754ea562f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 10 15:06:20 2020 -0500 winegstreamer: Read into an existing buffer if requested. oggdemux needs this. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a51354b13c..e9548e80e4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -896,9 +896,8 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 HRESULT hr; GstMapInfo info; - TRACE("%p %s %i %p\n", pad, wine_dbgstr_longlong(ofs), len, buf); + TRACE("pad %p, offset %s, length %u, buffer %p.\n", pad, wine_dbgstr_longlong(ofs), len, *buf); - *buf = NULL; if (ofs == GST_BUFFER_OFFSET_NONE) ofs = This->nextpullofs; if (ofs >= This->filesize) { @@ -909,7 +908,8 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 len = This->filesize - ofs; This->nextpullofs = ofs + len; - *buf = gst_buffer_new_and_alloc(len); + if (!*buf) + *buf = gst_buffer_new_and_alloc(len); gst_buffer_map(*buf, &info, GST_MAP_WRITE); hr = IAsyncReader_SyncRead(This->reader, ofs, len, info.data); gst_buffer_unmap(*buf, &info);

1 0

Zebediah Figura : wineqtdecoder: Fix compilation.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: b5448ca6ab4be369d4f38026398e5314d29c9fc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5448ca6ab4be369d4f38026… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 22:03:27 2020 -0500 wineqtdecoder: Fix compilation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wineqtdecoder/main.c b/dlls/wineqtdecoder/main.c index 6e0dd8c46b..435951ba93 100644 --- a/dlls/wineqtdecoder/main.c +++ b/dlls/wineqtdecoder/main.c @@ -146,7 +146,6 @@ static struct class_factory video_decoder_cf = {{&class_factory_vtbl}, video_dec HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) { struct class_factory *factory; - HRESULT hr; TRACE("clsid %s, iid %s, out %p.\n", debugstr_guid(clsid), debugstr_guid(iid), out); @@ -193,7 +192,7 @@ static const REGFILTER2 reg_qt_splitter = .u.s2.rgPins2 = reg_qt_splitter_pins, }; -static const REGFILTERPINS2 reg_qt_splitter_pins[2] = +static const REGFILTERPINS2 reg_video_decoder_pins[2] = { { .nMediaTypes = 1,

1 0

Zebediah Figura : quartz/acmwrapper: Reimplement the ACM wrapper directly on top of strmbase_filter.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 1ac3fe36c20bb73d678b8811e34f26029dfaa3de URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ac3fe36c20bb73d678b8811… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 22:03:28 2020 -0500 quartz/acmwrapper: Reimplement the ACM wrapper directly on top of strmbase_filter. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 318 +++++++++++++++++++++++++++++++++++------ dlls/quartz/tests/acmwrapper.c | 20 +-- 2 files changed, 288 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1ac3fe36c20bb73d678b…

1 0

Zebediah Figura : quartz/avidec: Reimplement the AVI decoder directly on top of strmbase_filter.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: ad13ce161a8c60ecf9bd95b6604c7578a1160d06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad13ce161a8c60ecf9bd95b6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 22:03:29 2020 -0500 quartz/avidec: Reimplement the AVI decoder directly on top of strmbase_filter. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 378 ++++++++++++++++++++++++++++++++++----------- dlls/quartz/tests/avidec.c | 4 +- 2 files changed, 289 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ad13ce161a8c60ecf9bd…

1 0

Zebediah Figura : wineqtdecoder: Reimplement the video decoder directly on top of strmbase_filter.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: b0b2f48ceb4b30e870870d04abf24445fe95102d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0b2f48ceb4b30e870870d04… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 22:03:30 2020 -0500 wineqtdecoder: Reimplement the video decoder directly on top of strmbase_filter. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/Makefile.in | 3 +- dlls/wineqtdecoder/qtvdecoder.c | 261 +++++++++++++++++++++++++++++----------- 2 files changed, 193 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0b2f48ceb4b30e87087…

1 0