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

Henri Verbeet : wined3d: Move the "dummy_arbfp_prog" field from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 3d2b82a257493de36e922bb18f3d43dc2600f479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d2b82a257493de36e922bb1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 8 18:09:35 2019 +0430 wined3d: Move the "dummy_arbfp_prog" field from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 33 ++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1a45eca..eb64f14 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1398,11 +1398,6 @@ void wined3d_context_cleanup(struct wined3d_context *context) if (context->valid) { - if (context->dummy_arbfp_prog) - { - GL_EXTCALL(glDeleteProgramsARB(1, &context->dummy_arbfp_prog)); - } - if (gl_info->supported[WINED3D_GL_PRIMITIVE_QUERY]) { for (i = 0; i < context->free_so_statistics_query_count; ++i) @@ -1482,8 +1477,32 @@ void wined3d_context_cleanup(struct wined3d_context *context) void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) { + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; + HGLRC restore_ctx; + HDC restore_dc; + + restore_ctx = wglGetCurrentContext(); + restore_dc = wglGetCurrentDC(); + + if (restore_ctx == context_gl->c.glCtx) + restore_ctx = NULL; + else if (context_gl->c.valid) + context_set_gl_context(&context_gl->c); + + if (context_gl->c.valid) + { + if (context_gl->dummy_arbfp_prog) + GL_EXTCALL(glDeleteProgramsARB(1, &context_gl->dummy_arbfp_prog)); + + checkGLcall("context cleanup"); + } + heap_free(context_gl->texture_type); + context_restore_pixel_format(&context_gl->c); + if (restore_ctx) + context_restore_gl_context(gl_info, restore_dc, restore_ctx); + wined3d_context_cleanup(&context_gl->c); } @@ -2232,8 +2251,8 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi "!!ARBfp1.0\n" "MOV result.color, fragment.color.primary;\n" "END\n"; - GL_EXTCALL(glGenProgramsARB(1, &context->dummy_arbfp_prog)); - GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, context->dummy_arbfp_prog)); + GL_EXTCALL(glGenProgramsARB(1, &context_gl->dummy_arbfp_prog)); + GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, context_gl->dummy_arbfp_prog)); GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(dummy_program), dummy_program)); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b8edf68..b649a47 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2023,7 +2023,6 @@ struct wined3d_context GLint gl_fog_source; GLfloat fog_coord_value; GLfloat color[4], fogstart, fogend, fogcolor[4]; - GLuint dummy_arbfp_prog; unsigned int viewport_count; unsigned int scissor_rect_count; @@ -2039,6 +2038,8 @@ struct wined3d_context_gl struct wined3d_context c; GLenum *texture_type; + + GLuint dummy_arbfp_prog; }; static inline struct wined3d_context_gl *wined3d_context_gl(struct wined3d_context *context)

1 0

Henri Verbeet : wined3d: Store the glEnableWINE and glDisableWINE pointers in the wined3d_gl_info structure.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: da42cf905d07613ad5243ddee16486369025eb6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=da42cf905d07613ad5243dde… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 8 18:09:36 2019 +0430 wined3d: Store the glEnableWINE and glDisableWINE pointers in the wined3d_gl_info structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 4 ++-- dlls/wined3d/context.c | 2 +- dlls/wined3d/gl_compat.c | 8 ++++---- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/wined3d_gl.h | 3 --- dlls/wined3d/wined3d_private.h | 3 +++ 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index b08ba62..e2cd96f 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4654,8 +4654,8 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, } #endif - glEnableWINE = gl_info->gl_ops.gl.p_glEnable; - glDisableWINE = gl_info->gl_ops.gl.p_glDisable; + gl_info->p_glEnableWINE = gl_info->gl_ops.gl.p_glEnable; + gl_info->p_glDisableWINE = gl_info->gl_ops.gl.p_glDisable; if (!wined3d_caps_gl_ctx_create(&adapter_gl->a, &caps_gl_ctx)) { diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index eb64f14..e52e4bc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2978,7 +2978,7 @@ void context_apply_ffp_blit_state(struct wined3d_context *context, const struct /* Other misc states. */ gl_info->gl_ops.gl.p_glDisable(GL_LIGHTING); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_LIGHTING)); - glDisableWINE(GL_FOG); + gl_info->p_glDisableWINE(GL_FOG); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_FOGENABLE)); if (gl_info->supported[EXT_SECONDARY_COLOR]) diff --git a/dlls/wined3d/gl_compat.c b/dlls/wined3d/gl_compat.c index 7e6b510..a2fb09c 100644 --- a/dlls/wined3d/gl_compat.c +++ b/dlls/wined3d/gl_compat.c @@ -437,10 +437,10 @@ void install_gl_compat_wrapper(struct wined3d_gl_info *gl_info, enum wined3d_gl_ gl_info->gl_ops.gl.p_glFogf = wine_glFogf; old_fogcoord_glFogfv = gl_info->gl_ops.gl.p_glFogfv; gl_info->gl_ops.gl.p_glFogfv = wine_glFogfv; - old_fogcoord_glEnable = glEnableWINE; - glEnableWINE = wine_glEnable; - old_fogcoord_glDisable = glDisableWINE; - glDisableWINE = wine_glDisable; + old_fogcoord_glEnable = gl_info->p_glEnableWINE; + gl_info->p_glEnableWINE = wine_glEnable; + old_fogcoord_glDisable = gl_info->p_glDisableWINE; + gl_info->p_glDisableWINE = wine_glDisable; old_fogcoord_glVertex4f = gl_info->gl_ops.gl.p_glVertex4f; gl_info->gl_ops.gl.p_glVertex4f = wine_glVertex4f; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f2ae39e..1d2ffbb 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1125,7 +1125,7 @@ void state_fog_fragpart(struct wined3d_context *context, const struct wined3d_st if (!state->render_states[WINED3D_RS_FOGENABLE]) { /* No fog? Disable it, and we're done :-) */ - glDisableWINE(GL_FOG); + gl_info->p_glDisableWINE(GL_FOG); checkGLcall("glDisable GL_FOG"); return; } @@ -1262,7 +1262,7 @@ void state_fog_fragpart(struct wined3d_context *context, const struct wined3d_st } } - glEnableWINE(GL_FOG); + gl_info->p_glEnableWINE(GL_FOG); checkGLcall("glEnable GL_FOG"); if (new_source != context->fog_source || fogstart == fogend) { diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 5241b6c..0e5ae5e 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -28,9 +28,6 @@ #define GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI 0x8837 /* not in the gl spec */ -void (WINE_GLAPI *glDisableWINE)(GLenum cap) DECLSPEC_HIDDEN; -void (WINE_GLAPI *glEnableWINE)(GLenum cap) DECLSPEC_HIDDEN; - /* OpenGL extensions. */ enum wined3d_gl_extension { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b649a47..2b7172a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2656,6 +2656,9 @@ struct wined3d_gl_info HGLRC (WINAPI *p_wglCreateContextAttribsARB)(HDC dc, HGLRC share, const GLint *attribs); struct opengl_funcs gl_ops; struct wined3d_fbo_ops fbo_ops; + + void (WINE_GLAPI *p_glDisableWINE)(GLenum cap); + void (WINE_GLAPI *p_glEnableWINE)(GLenum cap); }; /* The driver names reflect the lowest GPU supported

1 0

Henri Verbeet : wined3d: Move the extension emulation fields from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: d76bf253185aeb438ddcb13538551d9c36590baa URL: https://source.winehq.org/git/wine.git/?a=commit;h=d76bf253185aeb438ddcb135… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 8 18:09:37 2019 +0430 wined3d: Move the extension emulation fields from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/gl_compat.c | 241 +++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 18 +-- 2 files changed, 159 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d76bf253185aeb438ddc…

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_load_tex_coords().
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 34ab198faf9990b3371c10519dfc6d0162b3953d URL: https://source.winehq.org/git/wine.git/?a=commit;h=34ab198faf9990b3371c1051… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 8 18:09:38 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_load_tex_coords(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 13 +++++++------ dlls/wined3d/state.c | 3 ++- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e52e4bc..97d7656 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5036,19 +5036,19 @@ void context_unload_tex_coords(const struct wined3d_context *context) } } -void context_load_tex_coords(const struct wined3d_context *context, const struct wined3d_stream_info *si, - GLuint *current_bo, const struct wined3d_state *state) +void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, + const struct wined3d_stream_info *si, GLuint *current_bo, const struct wined3d_state *state) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const struct wined3d_format_gl *format_gl; unsigned int mapped_stage = 0; unsigned int texture_idx; - for (texture_idx = 0; texture_idx < context->d3d_info->limits.ffp_blend_stages; ++texture_idx) + for (texture_idx = 0; texture_idx < context_gl->c.d3d_info->limits.ffp_blend_stages; ++texture_idx) { unsigned int coord_idx = state->texture_states[texture_idx][WINED3D_TSS_TEXCOORD_INDEX]; - if ((mapped_stage = context->tex_unit_map[texture_idx]) == WINED3D_UNMAPPED_STAGE) + if ((mapped_stage = context_gl->c.tex_unit_map[texture_idx]) == WINED3D_UNMAPPED_STAGE) continue; if (mapped_stage >= gl_info->limits.texture_coords) @@ -5116,6 +5116,7 @@ static void context_unload_vertex_data(struct wined3d_context *context) static void context_load_vertex_data(struct wined3d_context *context, const struct wined3d_stream_info *si, const struct wined3d_state *state) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_stream_info_element *e; const struct wined3d_format_gl *format_gl; @@ -5305,7 +5306,7 @@ static void context_load_vertex_data(struct wined3d_context *context, } /* Texture coordinates */ - context_load_tex_coords(context, si, &current_bo, state); + wined3d_context_gl_load_tex_coords(context_gl, si, &current_bo, state); } static void context_unload_numbered_array(struct wined3d_context *context, unsigned int i) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1d2ffbb..0f35f2a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3315,6 +3315,7 @@ static void transform_texture(struct wined3d_context *context, const struct wine static void tex_coordindex(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { DWORD stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); static const GLfloat s_plane[] = { 1.0f, 0.0f, 0.0f, 0.0f }; static const GLfloat t_plane[] = { 0.0f, 1.0f, 0.0f, 0.0f }; static const GLfloat r_plane[] = { 0.0f, 0.0f, 1.0f, 0.0f }; @@ -3483,7 +3484,7 @@ static void tex_coordindex(struct wined3d_context *context, const struct wined3d GLuint curVBO = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0U : 0; context_unload_tex_coords(context); - context_load_tex_coords(context, &context->stream_info, &curVBO, state); + wined3d_context_gl_load_tex_coords(context_gl, &context->stream_info, &curVBO, state); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fd27c6e..a226cd4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2054,6 +2054,8 @@ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, + const struct wined3d_stream_info *si, GLuint *current_bo, const struct wined3d_state *state) DECLSPEC_HIDDEN; struct wined3d_fb_state { @@ -2236,8 +2238,6 @@ void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) DECLSPEC_HIDDEN; void context_invalidate_compute_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; void context_invalidate_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; -void context_load_tex_coords(const struct wined3d_context *context, const struct wined3d_stream_info *si, - GLuint *current_bo, const struct wined3d_state *state) DECLSPEC_HIDDEN; void *context_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) DECLSPEC_HIDDEN; struct wined3d_context *context_reacquire(const struct wined3d_device *device,

1 0

Nikolay Sivov : mf: Implement node connections.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 6b1a33ce93cc57bcc1346d09a3f8d429e3d7bd88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b1a33ce93cc57bcc1346d09… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 8 14:46:40 2019 +0300 mf: Implement node connections. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 115 +++++++++++++++++++++++++- dlls/mf/topology.c | 235 ++++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 308 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6b1a33ce93cc57bcc134…

1 0

Nikolay Sivov : mf: Rework node collection implementation.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 184f99945975728d0ac4a3c544b13f1b40bf1c9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=184f99945975728d0ac4a3c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 8 14:46:41 2019 +0300 mf: Rework node collection implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 193 +++++++++++++++++++++++++++-------------------------- 1 file changed, 99 insertions(+), 94 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index eaae7c9..c10bc6a 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -45,15 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); static LONG next_node_id; static TOPOID next_topology_id; -struct topology -{ - IMFTopology IMFTopology_iface; - LONG refcount; - IMFAttributes *attributes; - IMFCollection *nodes; - TOPOID id; -}; - struct node_stream { IMFMediaType *preferred_type; @@ -81,6 +72,20 @@ struct topology_node CRITICAL_SECTION cs; }; +struct topology +{ + IMFTopology IMFTopology_iface; + LONG refcount; + IMFAttributes *attributes; + struct + { + struct topology_node **nodes; + size_t size; + size_t count; + } nodes; + TOPOID id; +}; + struct topology_loader { IMFTopoLoader IMFTopoLoader_iface; @@ -169,19 +174,32 @@ static ULONG WINAPI topology_AddRef(IMFTopology *iface) return refcount; } +static void topology_clear(struct topology *topology) +{ + size_t i; + + for (i = 0; i < topology->nodes.count; ++i) + { + IMFTopologyNode_Release(&topology->nodes.nodes[i]->IMFTopologyNode_iface); + } + heap_free(topology->nodes.nodes); + topology->nodes.nodes = NULL; + topology->nodes.count = 0; + topology->nodes.size = 0; +} + static ULONG WINAPI topology_Release(IMFTopology *iface) { struct topology *topology = impl_from_IMFTopology(iface); ULONG refcount = InterlockedDecrement(&topology->refcount); - TRACE("(%p) refcount=%u\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) { if (topology->attributes) IMFAttributes_Release(topology->attributes); - if (topology->nodes) - IMFCollection_Release(topology->nodes); + topology_clear(topology); heap_free(topology); } @@ -476,80 +494,72 @@ static HRESULT WINAPI topology_GetTopologyID(IMFTopology *iface, TOPOID *id) return S_OK; } -static HRESULT topology_get_node_by_id(const struct topology *topology, TOPOID id, IMFTopologyNode **node) +static HRESULT topology_get_node_by_id(const struct topology *topology, TOPOID id, struct topology_node **node) { - IMFTopologyNode *iter; - unsigned int i = 0; + size_t i = 0; - while (IMFCollection_GetElement(topology->nodes, i++, (IUnknown **)&iter) == S_OK) + for (i = 0; i < topology->nodes.count; ++i) { - TOPOID node_id; - HRESULT hr; - - hr = IMFTopologyNode_GetTopoNodeID(iter, &node_id); - if (FAILED(hr)) - { - IMFTopologyNode_Release(iter); - return hr; - } - - if (node_id == id) + if (topology->nodes.nodes[i]->id == id) { - *node = iter; + *node = topology->nodes.nodes[i]; + IMFTopologyNode_AddRef(&(*node)->IMFTopologyNode_iface); return S_OK; } - - IMFTopologyNode_Release(iter); } return MF_E_NOT_FOUND; } -static HRESULT WINAPI topology_AddNode(IMFTopology *iface, IMFTopologyNode *node) +static HRESULT WINAPI topology_AddNode(IMFTopology *iface, IMFTopologyNode *node_iface) { struct topology *topology = impl_from_IMFTopology(iface); - IMFTopologyNode *match; - HRESULT hr; - TOPOID id; + struct topology_node *node = unsafe_impl_from_IMFTopologyNode(node_iface); + struct topology_node *match; - TRACE("(%p)->(%p)\n", iface, node); + TRACE("%p, %p.\n", iface, node_iface); if (!node) return E_POINTER; - if (FAILED(hr = IMFTopologyNode_GetTopoNodeID(node, &id))) - return hr; + if (SUCCEEDED(topology_get_node_by_id(topology, node->id, &match))) + { + IMFTopologyNode_Release(&match->IMFTopologyNode_iface); + return E_INVALIDARG; + } - if (FAILED(topology_get_node_by_id(topology, id, &match))) - return IMFCollection_AddElement(topology->nodes, (IUnknown *)node); + if (!mf_array_reserve((void **)&topology->nodes.nodes, &topology->nodes.size, topology->nodes.count + 1, + sizeof(*topology->nodes.nodes))) + { + return E_OUTOFMEMORY; + } - IMFTopologyNode_Release(match); + topology->nodes.nodes[topology->nodes.count++] = node; + IMFTopologyNode_AddRef(&node->IMFTopologyNode_iface); - return E_INVALIDARG; + return S_OK; } static HRESULT WINAPI topology_RemoveNode(IMFTopology *iface, IMFTopologyNode *node) { struct topology *topology = impl_from_IMFTopology(iface); - unsigned int i = 0; - IUnknown *element; + size_t i, count; - TRACE("(%p)->(%p)\n", iface, node); + TRACE("%p, %p.\n", iface, node); - while (IMFCollection_GetElement(topology->nodes, i, &element) == S_OK) + for (i = 0; i < topology->nodes.count; ++i) { - BOOL match = element == (IUnknown *)node; - - IUnknown_Release(element); - - if (match) + if (&topology->nodes.nodes[i]->IMFTopologyNode_iface == node) { - IMFCollection_RemoveElement(topology->nodes, i, &element); - IUnknown_Release(element); + count = topology->nodes.count - i - 1; + if (count) + { + memmove(&topology->nodes.nodes[i], &topology->nodes.nodes[i + 1], + count * sizeof(*topology->nodes.nodes)); + } + topology->nodes.count--; return S_OK; } - - ++i; } return E_INVALIDARG; @@ -558,38 +568,43 @@ static HRESULT WINAPI topology_RemoveNode(IMFTopology *iface, IMFTopologyNode *n static HRESULT WINAPI topology_GetNodeCount(IMFTopology *iface, WORD *count) { struct topology *topology = impl_from_IMFTopology(iface); - DWORD nodecount; - HRESULT hr; - TRACE("(%p)->(%p)\n", iface, count); + TRACE("%p, %p.\n", iface, count); - hr = IMFCollection_GetElementCount(topology->nodes, count ? &nodecount : NULL); - if (count) - *count = nodecount; + if (!count) + return E_POINTER; - return hr; + *count = topology->nodes.count; + + return S_OK; } static HRESULT WINAPI topology_GetNode(IMFTopology *iface, WORD index, IMFTopologyNode **node) { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%u, %p)\n", iface, index, node); + TRACE("%p, %u, %p.\n", iface, index, node); if (!node) return E_POINTER; - return SUCCEEDED(IMFCollection_GetElement(topology->nodes, index, (IUnknown **)node)) ? - S_OK : MF_E_INVALIDINDEX; + if (index >= topology->nodes.count) + return MF_E_INVALIDINDEX; + + *node = &topology->nodes.nodes[index]->IMFTopologyNode_iface; + IMFTopologyNode_AddRef(*node); + + return S_OK; } static HRESULT WINAPI topology_Clear(IMFTopology *iface) { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)\n", iface); + TRACE("%p.\n", iface); - return IMFCollection_RemoveAllElements(topology->nodes); + topology_clear(topology); + return S_OK; } static HRESULT WINAPI topology_CloneFrom(IMFTopology *iface, IMFTopology *src_topology) @@ -599,36 +614,27 @@ static HRESULT WINAPI topology_CloneFrom(IMFTopology *iface, IMFTopology *src_to return E_NOTIMPL; } -static HRESULT WINAPI topology_GetNodeByID(IMFTopology *iface, TOPOID id, IMFTopologyNode **node) +static HRESULT WINAPI topology_GetNodeByID(IMFTopology *iface, TOPOID id, IMFTopologyNode **ret) { struct topology *topology = impl_from_IMFTopology(iface); - - TRACE("(%p)->(%p)\n", iface, node); - - return topology_get_node_by_id(topology, id, node); -} - -static HRESULT topology_add_node_of_type(const struct topology *topology, IMFTopologyNode *node, - MF_TOPOLOGY_TYPE filter, IMFCollection *collection) -{ - MF_TOPOLOGY_TYPE node_type; + struct topology_node *node; HRESULT hr; - if (FAILED(hr = IMFTopologyNode_GetNodeType(node, &node_type))) - return hr; + TRACE("%p, %p.\n", iface, ret); - if (node_type != filter) - return S_OK; + if (SUCCEEDED(hr = topology_get_node_by_id(topology, id, &node))) + *ret = &node->IMFTopologyNode_iface; + else + *ret = NULL; - return IMFCollection_AddElement(collection, (IUnknown *)node); + return hr; } static HRESULT topology_get_node_collection(const struct topology *topology, MF_TOPOLOGY_TYPE node_type, IMFCollection **collection) { - IMFTopologyNode *node; - unsigned int i = 0; HRESULT hr; + size_t i; if (!collection) return E_POINTER; @@ -636,15 +642,17 @@ static HRESULT topology_get_node_collection(const struct topology *topology, MF_ if (FAILED(hr = MFCreateCollection(collection))) return hr; - while (IMFCollection_GetElement(topology->nodes, i++, (IUnknown **)&node) == S_OK) + for (i = 0; i < topology->nodes.count; ++i) { - hr = topology_add_node_of_type(topology, node, node_type, *collection); - IMFTopologyNode_Release(node); - if (FAILED(hr)) + if (topology->nodes.nodes[i]->node_type == node_type) { - IMFCollection_Release(*collection); - *collection = NULL; - break; + if (FAILED(hr = IMFCollection_AddElement(*collection, + (IUnknown *)&topology->nodes.nodes[i]->IMFTopologyNode_iface))) + { + IMFCollection_Release(*collection); + *collection = NULL; + break; + } } } @@ -750,9 +758,6 @@ HRESULT WINAPI MFCreateTopology(IMFTopology **topology) object->refcount = 1; hr = MFCreateAttributes(&object->attributes, 0); - if (SUCCEEDED(hr)) - hr = MFCreateCollection(&object->nodes); - if (FAILED(hr)) { IMFTopology_Release(&object->IMFTopology_iface);

1 0

Nikolay Sivov : mf: Disconnect removed nodes.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 37a7b65140c928de8e029d5bea3d27ba1c346573 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37a7b65140c928de8e029d5b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 8 14:46:42 2019 +0300 mf: Disconnect removed nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 10 ++--- dlls/mf/topology.c | 123 +++++++++++++++++++++++++++++++---------------------- 2 files changed, 74 insertions(+), 59 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8b3b8b4..ff3290a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -589,10 +589,9 @@ static void test_topology(void) hr = IMFTopology_Clear(topology); ok(hr == S_OK, "Failed to clear topology, hr %#x.\n", hr); -todo_wine { EXPECT_REF(node, 1); EXPECT_REF(node2, 1); -} + /* Removing connected node breaks connection. */ hr = IMFTopology_AddNode(topology, node); ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); @@ -606,12 +605,10 @@ todo_wine { hr = IMFTopology_RemoveNode(topology, node); ok(hr == S_OK, "Failed to remove a node, hr %#x.\n", hr); -todo_wine { EXPECT_REF(node, 1); EXPECT_REF(node2, 2); -} + hr = IMFTopologyNode_GetOutput(node, 0, &node3, &index); -todo_wine ok(hr == MF_E_NOT_FOUND, "Unexpected hr %#x.\n", hr); hr = IMFTopology_AddNode(topology, node); @@ -623,10 +620,9 @@ todo_wine hr = IMFTopology_RemoveNode(topology, node2); ok(hr == S_OK, "Failed to remove a node, hr %#x.\n", hr); -todo_wine { EXPECT_REF(node, 2); EXPECT_REF(node2, 1); -} + IMFTopologyNode_Release(node); IMFTopologyNode_Release(node2); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index c10bc6a..e10bc8b 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -174,12 +174,81 @@ static ULONG WINAPI topology_AddRef(IMFTopology *iface) return refcount; } +static HRESULT topology_node_disconnect_output(struct topology_node *node, DWORD output_index) +{ + struct topology_node *connection = NULL; + struct node_stream *stream; + DWORD connection_stream; + HRESULT hr = S_OK; + + EnterCriticalSection(&node->cs); + + if (output_index < node->outputs.count) + { + stream = &node->outputs.streams[output_index]; + + if (stream->connection) + { + connection = stream->connection; + connection_stream = stream->connection_stream; + stream->connection = NULL; + stream->connection_stream = 0; + } + else + hr = MF_E_NOT_FOUND; + } + else + hr = E_INVALIDARG; + + LeaveCriticalSection(&node->cs); + + if (connection) + { + EnterCriticalSection(&connection->cs); + + if (connection_stream < connection->inputs.count) + { + stream = &connection->inputs.streams[connection_stream]; + + if (stream->connection) + { + stream->connection = NULL; + stream->connection_stream = 0; + } + } + + LeaveCriticalSection(&connection->cs); + + IMFTopologyNode_Release(&connection->IMFTopologyNode_iface); + IMFTopologyNode_Release(&node->IMFTopologyNode_iface); + } + + return hr; +} + +static void topology_node_disconnect(struct topology_node *node) +{ + struct node_stream *stream; + size_t i; + + for (i = 0; i < node->outputs.count; ++i) + topology_node_disconnect_output(node, i); + + for (i = 0; i < node->inputs.count; ++i) + { + stream = &node->inputs.streams[i]; + if (stream->connection) + topology_node_disconnect_output(stream->connection, stream->connection_stream); + } +} + static void topology_clear(struct topology *topology) { size_t i; for (i = 0; i < topology->nodes.count; ++i) { + topology_node_disconnect(topology->nodes.nodes[i]); IMFTopologyNode_Release(&topology->nodes.nodes[i]->IMFTopologyNode_iface); } heap_free(topology->nodes.nodes); @@ -551,6 +620,8 @@ static HRESULT WINAPI topology_RemoveNode(IMFTopology *iface, IMFTopologyNode *n { if (&topology->nodes.nodes[i]->IMFTopologyNode_iface == node) { + topology_node_disconnect(topology->nodes.nodes[i]); + IMFTopologyNode_Release(&topology->nodes.nodes[i]->IMFTopologyNode_iface); count = topology->nodes.count - i - 1; if (count) { @@ -1248,58 +1319,6 @@ static HRESULT WINAPI topology_node_GetOutputCount(IMFTopologyNode *iface, DWORD return S_OK; } -static HRESULT topology_node_disconnect_output(struct topology_node *node, DWORD output_index) -{ - struct topology_node *connection = NULL; - struct node_stream *stream; - DWORD connection_stream; - HRESULT hr = S_OK; - - EnterCriticalSection(&node->cs); - - if (output_index < node->outputs.count) - { - stream = &node->outputs.streams[output_index]; - - if (stream->connection) - { - connection = stream->connection; - connection_stream = stream->connection_stream; - stream->connection = NULL; - stream->connection_stream = 0; - } - else - hr = MF_E_NOT_FOUND; - } - else - hr = E_INVALIDARG; - - LeaveCriticalSection(&node->cs); - - if (connection) - { - EnterCriticalSection(&connection->cs); - - if (connection_stream < connection->inputs.count) - { - stream = &connection->inputs.streams[connection_stream]; - - if (stream->connection) - { - stream->connection = NULL; - stream->connection_stream = 0; - } - } - - LeaveCriticalSection(&connection->cs); - - IMFTopologyNode_Release(&connection->IMFTopologyNode_iface); - IMFTopologyNode_Release(&node->IMFTopologyNode_iface); - } - - return hr; -} - static HRESULT WINAPI topology_node_ConnectOutput(IMFTopologyNode *iface, DWORD output_index, IMFTopologyNode *peer, DWORD input_index) {

1 0

Nikolay Sivov : mf: Add IMFGetService stub for media session.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 83f59518100c6cb0fdf2132b842cc2f5449e9844 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83f59518100c6cb0fdf2132b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 8 14:46:43 2019 +0300 mf: Add IMFGetService stub for media session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 5 +++++ 2 files changed, 51 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 7f8a283..a433a30 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); struct media_session { IMFMediaSession IMFMediaSession_iface; + IMFGetService IMFGetService_iface; LONG refcount; IMFMediaEventQueue *event_queue; }; @@ -92,6 +93,11 @@ static inline struct media_session *impl_from_IMFMediaSession(IMFMediaSession *i return CONTAINING_RECORD(iface, struct media_session, IMFMediaSession_iface); } +static struct media_session *impl_from_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct media_session, IMFGetService_iface); +} + static struct presentation_clock *impl_from_IMFPresentationClock(IMFPresentationClock *iface) { return CONTAINING_RECORD(iface, struct presentation_clock, IMFPresentationClock_iface); @@ -136,6 +142,12 @@ static HRESULT WINAPI mfsession_QueryInterface(IMFMediaSession *iface, REFIID ri IMFMediaSession_AddRef(iface); return S_OK; } + else if (IsEqualIID(riid, &IID_IMFGetService)) + { + *out = &session->IMFGetService_iface; + IMFMediaSession_AddRef(iface); + return S_OK; + } WARN("Unsupported %s.\n", debugstr_guid(riid)); *out = NULL; @@ -301,6 +313,39 @@ static const IMFMediaSessionVtbl mfmediasessionvtbl = mfsession_GetFullTopology, }; +static HRESULT WINAPI session_get_service_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) +{ + struct media_session *session = impl_from_IMFGetService(iface); + return IMFMediaSession_QueryInterface(&session->IMFMediaSession_iface, riid, obj); +} + +static ULONG WINAPI session_get_service_AddRef(IMFGetService *iface) +{ + struct media_session *session = impl_from_IMFGetService(iface); + return IMFMediaSession_AddRef(&session->IMFMediaSession_iface); +} + +static ULONG WINAPI session_get_service_Release(IMFGetService *iface) +{ + struct media_session *session = impl_from_IMFGetService(iface); + return IMFMediaSession_Release(&session->IMFMediaSession_iface); +} + +static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + FIXME("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static const IMFGetServiceVtbl session_get_service_vtbl = +{ + session_get_service_QueryInterface, + session_get_service_AddRef, + session_get_service_Release, + session_get_service_GetService, +}; + /*********************************************************************** * MFCreateMediaSession (mf.@) */ @@ -319,6 +364,7 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses return E_OUTOFMEMORY; object->IMFMediaSession_iface.lpVtbl = &mfmediasessionvtbl; + object->IMFGetService_iface.lpVtbl = &session_get_service_vtbl; object->refcount = 1; if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) { diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index ff3290a..fc068a9 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -944,6 +944,7 @@ todo_wine static void test_media_session(void) { IMFMediaSession *session; + IMFGetService *gs; IUnknown *unk; HRESULT hr; @@ -956,6 +957,10 @@ static void test_media_session(void) hr = IMFMediaSession_QueryInterface(session, &IID_IMFAttributes, (void **)&unk); ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSession_QueryInterface(session, &IID_IMFGetService, (void **)&gs); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + IMFGetService_Release(gs); + test_session_events(session); IMFMediaSession_Release(session);

1 0

Alexandre Julliard : mountmgr.sys: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: 38b1a1afcaa69b3eb389b6209080f69f2a27a43c URL: https://source.winehq.org/git/wine.git/?a=commit;h=38b1a1afcaa69b3eb389b620… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 7 11:31:21 2019 -0500 mountmgr.sys: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index b792be4..2f43a22 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -132,14 +132,14 @@ static BOOL matching_mount_point( const struct mount_point *mount, const MOUNTMG { const WCHAR *name = (const WCHAR *)((const char *)spec + spec->SymbolicLinkNameOffset); if (spec->SymbolicLinkNameLength != mount->link.Length) return FALSE; - if (memicmpW( name, mount->link.Buffer, mount->link.Length/sizeof(WCHAR))) + if (strncmpiW( name, mount->link.Buffer, mount->link.Length/sizeof(WCHAR))) return FALSE; } if (spec->DeviceNameOffset) { const WCHAR *name = (const WCHAR *)((const char *)spec + spec->DeviceNameOffset); if (spec->DeviceNameLength != mount->name.Length) return FALSE; - if (memicmpW( name, mount->name.Buffer, mount->name.Length/sizeof(WCHAR))) + if (strncmpiW( name, mount->name.Buffer, mount->name.Length/sizeof(WCHAR))) return FALSE; } if (spec->UniqueIdOffset)

1 0

Alexandre Julliard : mshtml: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: d7ef6cbbf9b4f7cf9acd2714903584d5b89914ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7ef6cbbf9b4f7cf9acd2714… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 7 11:31:31 2019 -0500 mshtml: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 6fe3fc8..4ece2d3 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -728,7 +728,7 @@ static void parse_content_type(nsChannelBSC *This, const WCHAR *value) ptr++; len = strlenW(value); - if(ptr + ARRAY_SIZE(charsetW) < value+len && !memicmpW(ptr, charsetW, ARRAY_SIZE(charsetW))) { + if(ptr + ARRAY_SIZE(charsetW) < value+len && !strncmpiW(ptr, charsetW, ARRAY_SIZE(charsetW))) { size_t charset_len, lena; nsACString charset_str; const WCHAR *charset;

1 0