February 2020 - Wine-commits

Zebediah Figura : quartz/filtergraph: Iterate over all filters in state change methods.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 05a8d45e8a0c401f7b6b008ae62212115bce4bb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05a8d45e8a0c401f7b6b008a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 19 20:44:58 2020 -0600 quartz/filtergraph: Iterate over all filters in state change methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/tests/dmowrapper.c | 12 +- dlls/quartz/filtergraph.c | 310 ++++++++++++++------------------------ dlls/quartz/tests/avisplit.c | 8 +- dlls/quartz/tests/filtergraph.c | 42 +++--- dlls/quartz/tests/videorenderer.c | 32 ++-- dlls/quartz/tests/vmr7.c | 20 +-- dlls/quartz/tests/vmr9.c | 20 +-- 7 files changed, 178 insertions(+), 266 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=05a8d45e8a0c401f7b6b…

1 0

Nikolay Sivov : mferror: Add some more clock error codes.
by Alexandre Julliard 21 Feb '20

21 Feb '20

1 0

Nikolay Sivov : mf: Implement timer functionality for presentation clock.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 0eda16206aeb3cafa9fdb63cb1dfa188930d13c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eda16206aeb3cafa9fdb63c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 20 16:41:20 2020 +0300 mf: Implement timer functionality for presentation clock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 285 +++++++++++++++++++++++++++++++++++++++++++++++++++--- include/mfidl.idl | 5 + 2 files changed, 275 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0eda16206aeb3cafa9fd…

1 0

Nikolay Sivov : mf: Use more descriptive name for one of the impl_from_* helpers.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: f396d80df5faae4f7e21b92e0e0b7d657b3fc97b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f396d80df5faae4f7e21b92e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 20 16:41:21 2020 +0300 mf: Use more descriptive name for one of the impl_from_* helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index b80499477c..6b5d590a25 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -278,7 +278,7 @@ static struct clock_timer *impl_clock_timer_from_IUnknown(IUnknown *iface) return CONTAINING_RECORD(iface, struct clock_timer, IUnknown_iface); } -static struct sink_notification *impl_from_IUnknown(IUnknown *iface) +static struct sink_notification *impl_sink_notification_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct sink_notification, IUnknown_iface); } @@ -1918,7 +1918,7 @@ static HRESULT WINAPI sink_notification_QueryInterface(IUnknown *iface, REFIID r static ULONG WINAPI sink_notification_AddRef(IUnknown *iface) { - struct sink_notification *notification = impl_from_IUnknown(iface); + struct sink_notification *notification = impl_sink_notification_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&notification->refcount); TRACE("%p, refcount %u.\n", iface, refcount); @@ -1928,7 +1928,7 @@ static ULONG WINAPI sink_notification_AddRef(IUnknown *iface) static ULONG WINAPI sink_notification_Release(IUnknown *iface) { - struct sink_notification *notification = impl_from_IUnknown(iface); + struct sink_notification *notification = impl_sink_notification_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&notification->refcount); TRACE("%p, refcount %u.\n", iface, refcount); @@ -2496,7 +2496,7 @@ static HRESULT WINAPI present_clock_sink_callback_Invoke(IMFAsyncCallback *iface if (FAILED(hr = IMFAsyncResult_GetObject(result, &object))) return hr; - data = impl_from_IUnknown(object); + data = impl_sink_notification_from_IUnknown(object); clock_call_state_change(data->system_time, data->param, data->notification, data->sink);

1 0

Zebediah Figura : d3d9: Use ARRAY_SIZE in d3d9_device_GetStreamSource().
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: bd58d1327aae226fb9b22a117ee8e87351a6df31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd58d1327aae226fb9b22a11… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 19 09:53:50 2020 -0600 d3d9: Use ARRAY_SIZE in d3d9_device_GetStreamSource(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 3b4c9d5277..53e27adf05 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3709,6 +3709,7 @@ static HRESULT WINAPI d3d9_device_GetStreamSource(IDirect3DDevice9Ex *iface, UINT stream_idx, IDirect3DVertexBuffer9 **buffer, UINT *offset, UINT *stride) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + const struct wined3d_stateblock_state *state; const struct wined3d_stream_state *stream; struct d3d9_vertexbuffer *buffer_impl; @@ -3718,14 +3719,15 @@ static HRESULT WINAPI d3d9_device_GetStreamSource(IDirect3DDevice9Ex *iface, if (!buffer) return D3DERR_INVALIDCALL; - if (stream_idx > WINED3D_MAX_STREAMS) + if (stream_idx >= ARRAY_SIZE(state->streams)) { WARN("Stream index %u out of range.\n", stream_idx); return WINED3DERR_INVALIDCALL; } wined3d_mutex_lock(); - stream = &wined3d_stateblock_get_state(device->state)->streams[stream_idx]; + state = wined3d_stateblock_get_state(device->state); + stream = &state->streams[stream_idx]; if (stream->buffer) { buffer_impl = wined3d_buffer_get_parent(stream->buffer);

1 0

Zebediah Figura : d3d9: Validate the stream index in d3d9_device_SetStreamSource().
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: a3b36a34a6f140c7a3ea41db106b2c38a98f099e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3b36a34a6f140c7a3ea41db… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 19 09:53:51 2020 -0600 d3d9: Validate the stream index in d3d9_device_SetStreamSource(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 53e27adf05..8d85a43523 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3669,16 +3669,25 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_vertexbuffer *buffer_impl = unsafe_impl_from_IDirect3DVertexBuffer9(buffer); + const struct wined3d_stateblock_state *state; struct wined3d_buffer *wined3d_buffer; HRESULT hr; TRACE("iface %p, stream_idx %u, buffer %p, offset %u, stride %u.\n", iface, stream_idx, buffer, offset, stride); + if (stream_idx >= ARRAY_SIZE(state->streams)) + { + WARN("Stream index %u out of range.\n", stream_idx); + return WINED3DERR_INVALIDCALL; + } + wined3d_mutex_lock(); if (!buffer_impl) { - const struct wined3d_stream_state *stream = &wined3d_stateblock_get_state(device->state)->streams[stream_idx]; + const struct wined3d_stream_state *stream; + state = wined3d_stateblock_get_state(device->state); + stream = &state->streams[stream_idx]; wined3d_buffer = stream->buffer; offset = stream->offset; stride = stream->stride;

1 0

Zebediah Figura : wined3d: Remove the no longer used extra stream state.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: eb522056456644f79c05e19ee611ac1704fd065d URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb522056456644f79c05e19e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 19 09:53:52 2020 -0600 wined3d: Remove the no longer used extra stream state. This was used to implement high level patches, which were removed in 149a85c2e. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d29dfc312b..444e8fdf63 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3179,7 +3179,7 @@ struct wined3d_state struct wined3d_vertex_declaration *vertex_declaration; struct wined3d_stream_output stream_output[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]; - struct wined3d_stream_state streams[WINED3D_MAX_STREAMS + 1 /* tessellated pseudo-stream */]; + struct wined3d_stream_state streams[WINED3D_MAX_STREAMS]; struct wined3d_buffer *index_buffer; enum wined3d_format_id index_format; unsigned int index_offset; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fa5682e5bd..908a1c9266 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2141,7 +2141,7 @@ struct wined3d_stream_state struct wined3d_stateblock_state { struct wined3d_vertex_declaration *vertex_declaration; - struct wined3d_stream_state streams[WINED3D_MAX_STREAMS + 1]; + struct wined3d_stream_state streams[WINED3D_MAX_STREAMS]; struct wined3d_buffer *index_buffer; enum wined3d_format_id index_format; int base_vertex_index;

1 0

Zebediah Figura : d3d8: Set the primary stateblock when executing draw calls.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: d38daa79d8823b93b56136c57b8935a9c6dbd7ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=d38daa79d8823b93b56136c5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 19 09:53:53 2020 -0600 d3d8: Set the primary stateblock when executing draw calls. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 136 ++++++++++++++++++++++++++++------------------------- 1 file changed, 73 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d38daa79d8823b93b561…

1 0

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetIndices().
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 05fbe3b27606cd157a04c2e7d4cd6707e01cb38e URL: https://source.winehq.org/git/wine.git/?a=commit;h=05fbe3b27606cd157a04c2e7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 19 09:53:54 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetIndices(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 295c61fcd1..0463a58431 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3121,11 +3121,7 @@ static HRESULT WINAPI d3d8_device_SetIndices(IDirect3DDevice8 *iface, wined3d_stateblock_set_base_vertex_index(device->update_state, base_vertex_idx); wined3d_stateblock_set_index_buffer(device->update_state, wined3d_buffer, ib ? ib->format : WINED3DFMT_UNKNOWN); if (!device->recording) - { - wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_idx); - wined3d_device_set_index_buffer(device->wined3d_device, wined3d_buffer, ib ? ib->format : WINED3DFMT_UNKNOWN, 0); device->sysmem_ib = ib && ib->draw_buffer; - } wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetStreamSource().
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: b2a234fb7ea59ad4da934a1407209a9f3de48caa URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2a234fb7ea59ad4da934a14… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 19 09:53:55 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetStreamSource(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0463a58431..8f851fa2a6 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3409,14 +3409,10 @@ static HRESULT WINAPI d3d8_device_SetStreamSource(IDirect3DDevice8 *iface, hr = wined3d_stateblock_set_stream_source(device->update_state, stream_idx, wined3d_buffer, 0, stride); if (SUCCEEDED(hr) && !device->recording) { - hr = wined3d_device_set_stream_source(device->wined3d_device, stream_idx, wined3d_buffer, 0, stride); - if (SUCCEEDED(hr)) - { - if (buffer_impl && buffer_impl->draw_buffer) - device->sysmem_vb |= (1u << stream_idx); - else - device->sysmem_vb &= ~(1u << stream_idx); - } + if (buffer_impl && buffer_impl->draw_buffer) + device->sysmem_vb |= (1u << stream_idx); + else + device->sysmem_vb &= ~(1u << stream_idx); } wined3d_mutex_unlock();

1 0