wine-commits July 2019

2 participants
228 discussions

Zebediah Figura : strmbase: Simplify IEnumMediaTypesImpl_Next().

by Alexandre Julliard

Module: wine Branch: master Commit: cf09b5a80031d8fe67c5e8b1b7561de3e7273db2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf09b5a80031d8fe67c5e8b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 29 13:43:49 2019 -0500 strmbase: Simplify IEnumMediaTypesImpl_Next(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 8ad2e22..66b5fa1 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -172,44 +172,35 @@ static ULONG WINAPI IEnumMediaTypesImpl_Release(IEnumMediaTypes * iface) return ref; } -static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes * iface, ULONG cMediaTypes, AM_MEDIA_TYPE ** ppMediaTypes, ULONG * pcFetched) +static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes *iface, + ULONG count, AM_MEDIA_TYPE **mts, ULONG *ret_count) { - ULONG cFetched; - IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); - - TRACE("(%p)->(%u, %p, %p)\n", iface, cMediaTypes, ppMediaTypes, pcFetched); + IEnumMediaTypesImpl *enummt = impl_from_IEnumMediaTypes(iface); + ULONG i; - cFetched = min(This->count, This->uIndex + cMediaTypes) - This->uIndex; + TRACE("iface %p, count %u, mts %p, ret_count %p.\n", iface, count, mts, ret_count); - if (This->currentVersion != This->mediaVersionFunction(This->basePin)) + if (enummt->currentVersion != enummt->mediaVersionFunction(enummt->basePin)) return VFW_E_ENUM_OUT_OF_SYNC; - TRACE("Next uIndex: %u, cFetched: %u\n", This->uIndex, cFetched); - - if (cFetched > 0) + for (i = 0; i < count && enummt->uIndex + i < enummt->count; i++) { - ULONG i; - for (i = 0; i < cFetched; i++) + if (!(mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE))) + || FAILED(enummt->enumMediaFunction(enummt->basePin, enummt->uIndex + i, mts[i]))) { - if (!(ppMediaTypes[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE))) - || FAILED(This->enumMediaFunction(This->basePin, This->uIndex + i, ppMediaTypes[i]))) - { - while (i--) - DeleteMediaType(ppMediaTypes[i]); - *pcFetched = 0; - return E_OUTOFMEMORY; - } + while (i--) + DeleteMediaType(mts[i]); + *ret_count = 0; + return E_OUTOFMEMORY; } } - if ((cMediaTypes != 1) || pcFetched) - *pcFetched = cFetched; + if ((count != 1) || ret_count) + *ret_count = i; - This->uIndex += cFetched; + enummt->uIndex += i; - if (cFetched != cMediaTypes) - return S_FALSE; - return S_OK; + return i == count ? S_OK : S_FALSE; } static HRESULT WINAPI IEnumMediaTypesImpl_Skip(IEnumMediaTypes * iface, ULONG cMediaTypes)

4 years, 10 months

Zebediah Figura : qedit/tests: Add some tests for IEnumMediaTypes().

by Alexandre Julliard

Module: wine Branch: master Commit: 038407475bed7a29650c5e1b5bdab38e4e57800e URL: https://source.winehq.org/git/wine.git/?a=commit;h=038407475bed7a29650c5e1b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 29 13:43:48 2019 -0500 qedit/tests: Add some tests for IEnumMediaTypes(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/nullrenderer.c | 45 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index 3d5221b..7841720 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -379,6 +379,50 @@ static void test_media_types(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_enum_media_types(void) +{ + IBaseFilter *filter = create_null_renderer(); + IEnumMediaTypes *enum1, *enum2; + AM_MEDIA_TYPE *mts[2]; + ULONG ref, count; + HRESULT hr; + IPin *pin; + + IBaseFilter_FindPin(filter, sink_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Clone(enum1, &enum2); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum2, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enum1); + IEnumMediaTypes_Release(enum2); + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(nullrenderer) { IBaseFilter *filter; @@ -401,6 +445,7 @@ START_TEST(nullrenderer) test_pin_info(); test_aggregation(); test_media_types(); + test_enum_media_types(); CoUninitialize(); }

4 years, 10 months

Zebediah Figura : qedit/tests: Add some tests for media types.

by Alexandre Julliard

Module: wine Branch: master Commit: b1ffe12e43908ea1a78cce09b25ab6b986216b6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1ffe12e43908ea1a78cce09… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 29 13:43:47 2019 -0500 qedit/tests: Add some tests for media types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/nullrenderer.c | 28 ++++++++++++++++++++++++++++ dlls/qedit/tests/samplegrabber.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index d39b28d..3d5221b 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -352,6 +352,33 @@ static void test_aggregation(void) ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); } +static void test_media_types(void) +{ + IBaseFilter *filter = create_null_renderer(); + AM_MEDIA_TYPE mt = {}, *pmt; + IEnumMediaTypes *enummt; + HRESULT hr; + ULONG ref; + IPin *pin; + + IBaseFilter_FindPin(filter, sink_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(nullrenderer) { IBaseFilter *filter; @@ -373,6 +400,7 @@ START_TEST(nullrenderer) test_find_pin(); test_pin_info(); test_aggregation(); + test_media_types(); CoUninitialize(); } diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 8bc44b9..9bb4eb4 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -449,6 +449,39 @@ static void test_aggregation(void) ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); } +static void test_media_types(void) +{ + IBaseFilter *filter = create_sample_grabber(); + IEnumMediaTypes *enummt; + AM_MEDIA_TYPE mt = {}; + HRESULT hr; + ULONG ref; + IPin *pin; + + IBaseFilter_FindPin(filter, sink_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, source_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(samplegrabber) { IBaseFilter *filter; @@ -470,6 +503,7 @@ START_TEST(samplegrabber) test_find_pin(); test_pin_info(); test_aggregation(); + test_media_types(); CoUninitialize(); }

4 years, 10 months

Henri Verbeet : ddraw: Use wined3d_bit_scan() in viewport_alloc_active_light_index().

by Alexandre Julliard

Module: wine Branch: master Commit: f30248f3361fa175a919e8009b8f1778dba40942 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f30248f3361fa175a919e800… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 28 15:12:21 2019 +0430 ddraw: Use wined3d_bit_scan() in viewport_alloc_active_light_index(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/viewport.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index e94c4b8..556783a 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -152,15 +152,10 @@ void viewport_alloc_active_light_index(struct d3d_light *light) } } } - map = vp->map_lights; - assert(vp->active_lights_count < DDRAW_MAX_ACTIVE_LIGHTS && map != ~0u); - i = 0; - while (map & 1) - { - map >>= 1; - ++i; - } + map = ~vp->map_lights; + assert(vp->active_lights_count < DDRAW_MAX_ACTIVE_LIGHTS && map); + i = wined3d_bit_scan(&map); light->active_light_index = i + 1; ++vp->active_lights_count; vp->map_lights |= 1u << i;

4 years, 10 months

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to find_glsl_vshader().

by Alexandre Julliard

Module: wine Branch: master Commit: e867d986d52ba82a602461fdb6668c4caaac057a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e867d986d52ba82a602461fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 28 15:12:20 2019 +0430 wined3d: Pass a wined3d_context_gl structure to find_glsl_vshader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3aa31c1..8023f7b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8470,12 +8470,11 @@ static inline BOOL vs_args_equal(const struct vs_compile_args *stored, const str return !memcmp(stored->interpolation_mode, new->interpolation_mode, sizeof(new->interpolation_mode)); } -static GLuint find_glsl_vshader(const struct wined3d_context *context, struct shader_glsl_priv *priv, - struct wined3d_shader *shader, const struct vs_compile_args *args) +static GLuint find_glsl_vertex_shader(const struct wined3d_context_gl *context_gl, + struct shader_glsl_priv *priv, struct wined3d_shader *shader, const struct vs_compile_args *args) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_vs_compiled_shader *gl_shaders, *new_array; - uint32_t use_map = context->stream_info.use_map; + uint32_t use_map = context_gl->c.stream_info.use_map; struct glsl_shader_private *shader_data; unsigned int i, new_size; GLuint ret; @@ -10134,7 +10133,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; find_vs_compile_args(state, vshader, context->stream_info.swizzle_map, &vs_compile_args, context); - vs_id = find_glsl_vshader(context, priv, vshader, &vs_compile_args); + vs_id = find_glsl_vertex_shader(context_gl, priv, vshader, &vs_compile_args); vs_list = &vshader->linked_programs; } else if (priv->vertex_pipe == &glsl_vertex_pipe)

4 years, 10 months

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to find_glsl_pshader().

by Alexandre Julliard

Module: wine Branch: master Commit: 6bf34c8366e9c82d59de6859749fd716fdd86842 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bf34c8366e9c82d59de6859… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 28 15:12:19 2019 +0430 wined3d: Pass a wined3d_context_gl structure to find_glsl_pshader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2ed5e7a..3aa31c1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8373,12 +8373,11 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context_g return shader_id; } -static GLuint find_glsl_pshader(const struct wined3d_context *context, +static GLuint find_glsl_fragment_shader(const struct wined3d_context_gl *context_gl, struct wined3d_string_buffer *buffer, struct wined3d_string_buffer_list *string_buffers, struct wined3d_shader *shader, const struct ps_compile_args *args, const struct ps_np2fixup_info **np2fixup_info) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_ps_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; struct ps_np2fixup_info *np2fixup; @@ -10200,7 +10199,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct ps_compile_args ps_compile_args; pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; find_ps_compile_args(state, pshader, context->stream_info.position_transformed, &ps_compile_args, context); - ps_id = find_glsl_pshader(context, &priv->shader_buffer, &priv->string_buffers, + ps_id = find_glsl_fragment_shader(context_gl, &priv->shader_buffer, &priv->string_buffers, pshader, &ps_compile_args, &np2fixup_info); ps_list = &pshader->linked_programs; }

4 years, 10 months

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_compute_shader ().

by Alexandre Julliard

Module: wine Branch: master Commit: 3d765ae072ecb011d75a978cca8481fd5b18df1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d765ae072ecb011d75a978c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 28 15:12:18 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_compute_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1b04e9a..2ed5e7a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8332,14 +8332,13 @@ static void shader_glsl_generate_shader_epilogue(const struct wined3d_shader_con } /* Context activation is done by the caller. */ -static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context *context, +static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context_gl *context_gl, struct wined3d_string_buffer *buffer, struct wined3d_string_buffer_list *string_buffers, const struct wined3d_shader *shader) { const struct wined3d_shader_thread_group_size *thread_group_size = &shader->u.cs.thread_group_size; - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id; unsigned int i; @@ -10010,7 +10009,7 @@ static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, TRACE("Compiling compute shader %p.\n", shader); string_buffer_clear(buffer); - shader_id = shader_glsl_generate_compute_shader(context, buffer, &priv->string_buffers, shader); + shader_id = shader_glsl_generate_compute_shader(context_gl, buffer, &priv->string_buffers, shader); gl_shaders[shader_data->num_gl_shaders++].id = shader_id; program_id = GL_EXTCALL(glCreateProgram());

4 years, 10 months

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_geometry_shader ().

by Alexandre Julliard

Module: wine Branch: master Commit: 9eb34e4f7481f7f8e5dd4dcd5e14da5e1597966c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9eb34e4f7481f7f8e5dd4dcd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 28 15:12:17 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_geometry_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a793bf7..1b04e9a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8203,14 +8203,13 @@ static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context_gl } /* Context activation is done by the caller. */ -static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context *context, +static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct gs_compile_args *args) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_string_buffer *buffer = &priv->shader_buffer; - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_shader_signature_element *output; enum wined3d_primitive_type primitive_type; struct shader_glsl_ctx_priv priv_ctx; @@ -8642,6 +8641,7 @@ static GLuint find_glsl_domain_shader(const struct wined3d_context *context, static GLuint find_glsl_geometry_shader(const struct wined3d_context *context, struct shader_glsl_priv *priv, struct wined3d_shader *shader, const struct gs_compile_args *args) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_gs_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; unsigned int i, new_size; @@ -8687,7 +8687,7 @@ static GLuint find_glsl_geometry_shader(const struct wined3d_context *context, gl_shaders = new_array; string_buffer_clear(&priv->shader_buffer); - ret = shader_glsl_generate_geometry_shader(context, priv, shader, args); + ret = shader_glsl_generate_geometry_shader(context_gl, priv, shader, args); gl_shaders[shader_data->num_gl_shaders].args = *args; gl_shaders[shader_data->num_gl_shaders++].id = ret;

4 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2019