wine-devel September 2020

wine-devel@winehq.org

79 participants
771 discussions

[PATCH v2 1/2] wined3d: Fix 3d texture layer count for bind tracking.
by Paul Gofman 29 Sep '20

29 Sep '20

Fixes out of bounds access introduced by commit 61e02c5e4f20de6c82342a2ffaa001150bd7c56f and RiME crash on start. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - sanitize wined3d_bind_layer_count() parameters. dlls/wined3d/wined3d_private.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 93e5b50a9c8..ec4016b74dc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6038,6 +6038,11 @@ static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_vi || (srv_format->green_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_STENCIL)); } +static inline unsigned int wined3d_bind_layer_count(const struct wined3d_texture *texture) +{ + return texture->resource.type == WINED3D_RTYPE_TEXTURE_3D ? texture->resource.depth : texture->layer_count; +} + static inline bool wined3d_srv_all_subresources(const struct wined3d_shader_resource_view *srv) { struct wined3d_texture *texture; @@ -6050,7 +6055,7 @@ static inline bool wined3d_srv_all_subresources(const struct wined3d_shader_reso texture = texture_from_resource(srv->resource); return srv->desc.u.texture.level_count == texture->level_count - && srv->desc.u.texture.layer_count == texture->layer_count; + && srv->desc.u.texture.layer_count == wined3d_bind_layer_count(texture); } static inline bool wined3d_rtv_all_subresources(const struct wined3d_rendertarget_view *rtv) @@ -6064,7 +6069,7 @@ static inline bool wined3d_rtv_all_subresources(const struct wined3d_rendertarge return FALSE; texture = texture_from_resource(rtv->resource); - return texture->level_count == 1 && rtv->layer_count == texture->layer_count; + return texture->level_count == 1 && rtv->layer_count == wined3d_bind_layer_count(texture); } static inline void wined3d_srv_bind_count_inc(struct wined3d_shader_resource_view *srv) @@ -6082,7 +6087,7 @@ static inline void wined3d_srv_bind_count_inc(struct wined3d_shader_resource_vie if (!resource->sub_resource_bind_counts_device && !(resource->sub_resource_bind_counts_device = heap_alloc_zero(texture->level_count - * texture->layer_count * sizeof(*resource->sub_resource_bind_counts_device)))) + * wined3d_bind_layer_count(texture) * sizeof(*resource->sub_resource_bind_counts_device)))) return; for (layer = 0; layer < srv->desc.u.texture.layer_count; ++layer) @@ -6131,7 +6136,7 @@ static inline void wined3d_rtv_bind_count_inc(struct wined3d_rendertarget_view * if (!resource->sub_resource_bind_counts_device && !(resource->sub_resource_bind_counts_device = heap_alloc_zero(texture->level_count - * texture->layer_count * sizeof(*resource->sub_resource_bind_counts_device)))) + * wined3d_bind_layer_count(texture) * sizeof(*resource->sub_resource_bind_counts_device)))) return; for (layer = 0; layer < rtv->layer_count; ++layer) -- 2.26.2

2 3

[PATCH 1/5] wined3d: Move the stencil function to wined3d_depth_stencil_state.
by Zebediah Figura 29 Sep '20

29 Sep '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/device.c | 2 -- dlls/d3d11/state.c | 2 ++ dlls/wined3d/adapter_vk.c | 2 -- dlls/wined3d/context_vk.c | 14 +++++++------- dlls/wined3d/device.c | 13 +++++++++++++ dlls/wined3d/directx.c | 2 -- dlls/wined3d/state.c | 9 ++++----- include/wine/wined3d.h | 7 +++++++ 8 files changed, 33 insertions(+), 18 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 159d3f36334..c913a590dab 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -766,7 +766,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILFAIL, front->StencilFailOp); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILZFAIL, front->StencilDepthFailOp); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILPASS, front->StencilPassOp); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILFUNC, front->StencilFunc); if (front->StencilFailOp != back->StencilFailOp || front->StencilDepthFailOp != back->StencilDepthFailOp || front->StencilPassOp != back->StencilPassOp @@ -777,7 +776,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BACK_STENCILZFAIL, back->StencilDepthFailOp); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BACK_STENCILPASS, back->StencilPassOp); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BACK_STENCILFUNC, back->StencilFunc); } else { diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index c0be2fe592b..14d91c68e86 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -799,6 +799,8 @@ HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEP wined3d_desc.stencil = desc->StencilEnable; wined3d_desc.stencil_read_mask = desc->StencilReadMask; wined3d_desc.stencil_write_mask = desc->StencilWriteMask; + wined3d_desc.front.func = desc->FrontFace.StencilFunc; + wined3d_desc.back.func = desc->BackFace.StencilFunc; /* We cannot fail after creating a wined3d_depth_stencil_state object. It * would lead to double free. */ diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 80b06482e64..4ab21cd7998 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -120,13 +120,11 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_STENCILFAIL), {STATE_RENDER(WINED3D_RS_ZFUNC)}}, {STATE_RENDER(WINED3D_RS_STENCILZFAIL), {STATE_RENDER(WINED3D_RS_ZFUNC)}}, {STATE_RENDER(WINED3D_RS_STENCILPASS), {STATE_RENDER(WINED3D_RS_ZFUNC)}}, - {STATE_RENDER(WINED3D_RS_STENCILFUNC), {STATE_RENDER(WINED3D_RS_ZFUNC)}}, {STATE_RENDER(WINED3D_RS_STENCILREF), {STATE_RENDER(WINED3D_RS_ZFUNC)}}, {STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE), {STATE_RENDER(WINED3D_RS_ZFUNC)}}, {STATE_RENDER(WINED3D_RS_BACK_STENCILFAIL), {STATE_RENDER(WINED3D_RS_ZFUNC)}}, {STATE_RENDER(WINED3D_RS_BACK_STENCILZFAIL), {STATE_RENDER(WINED3D_RS_ZFUNC)}}, {STATE_RENDER(WINED3D_RS_BACK_STENCILPASS), {STATE_RENDER(WINED3D_RS_ZFUNC)}}, - {STATE_RENDER(WINED3D_RS_BACK_STENCILFUNC), {STATE_RENDER(WINED3D_RS_ZFUNC)}}, {STATE_RENDER(WINED3D_RS_WRAP0), {STATE_RENDER(WINED3D_RS_WRAP0), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAP1), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP2), {STATE_RENDER(WINED3D_RS_WRAP0)}}, diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 26cd3f5a4ef..23b4fcbc90c 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2050,12 +2050,18 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->ds_desc.front.passOp = vk_stencil_op_from_wined3d(state->render_states[WINED3D_RS_STENCILPASS]); key->ds_desc.front.depthFailOp = vk_stencil_op_from_wined3d( state->render_states[WINED3D_RS_STENCILZFAIL]); - key->ds_desc.front.compareOp = vk_compare_op_from_wined3d(state->render_states[WINED3D_RS_STENCILFUNC]); + key->ds_desc.front.compareOp = vk_compare_op_from_wined3d(d->desc.front.func); key->ds_desc.front.compareMask = d->desc.stencil_read_mask; key->ds_desc.front.writeMask = d->desc.stencil_write_mask; key->ds_desc.front.reference = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); + key->ds_desc.back.compareOp = vk_compare_op_from_wined3d(d->desc.back.func); + key->ds_desc.back.compareMask = d->desc.stencil_read_mask; + key->ds_desc.back.writeMask = d->desc.stencil_write_mask; + key->ds_desc.back.reference = state->render_states[WINED3D_RS_STENCILREF] + & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); + if (state->render_states[WINED3D_RS_TWOSIDEDSTENCILMODE]) { key->ds_desc.back.failOp = vk_stencil_op_from_wined3d( @@ -2064,12 +2070,6 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte state->render_states[WINED3D_RS_BACK_STENCILPASS]); key->ds_desc.back.depthFailOp = vk_stencil_op_from_wined3d( state->render_states[WINED3D_RS_BACK_STENCILZFAIL]); - key->ds_desc.back.compareOp = vk_compare_op_from_wined3d( - state->render_states[WINED3D_RS_BACK_STENCILFUNC]); - key->ds_desc.back.compareMask = d->desc.stencil_read_mask; - key->ds_desc.back.writeMask = d->desc.stencil_write_mask; - key->ds_desc.back.reference = state->render_states[WINED3D_RS_STENCILREF] - & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); } else { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 754dd7693c9..c72ae633fcc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3685,9 +3685,12 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, set_blend_state = TRUE; break; + case WINED3D_RS_BACK_STENCILFUNC: case WINED3D_RS_STENCILENABLE: + case WINED3D_RS_STENCILFUNC: case WINED3D_RS_STENCILMASK: case WINED3D_RS_STENCILWRITEMASK: + case WINED3D_RS_TWOSIDEDSTENCILMODE: case WINED3D_RS_ZENABLE: case WINED3D_RS_ZWRITEENABLE: set_depth_stencil_state = TRUE; @@ -3847,6 +3850,16 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, desc.stencil = state->rs[WINED3D_RS_STENCILENABLE]; desc.stencil_read_mask = state->rs[WINED3D_RS_STENCILMASK]; desc.stencil_write_mask = state->rs[WINED3D_RS_STENCILWRITEMASK]; + desc.front.func = state->rs[WINED3D_RS_STENCILFUNC]; + + if (state->rs[WINED3D_RS_TWOSIDEDSTENCILMODE]) + { + desc.back.func = state->rs[WINED3D_RS_BACK_STENCILFUNC]; + } + else + { + desc.back = desc.front; + } if ((entry = wine_rb_get(&device->depth_stencil_states, &desc))) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c31cf06ec26..e3f0e0bdb85 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2442,13 +2442,11 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_STENCILFAIL), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_STENCILZFAIL), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_STENCILPASS), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_STENCILFUNC), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_STENCILREF), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_BACK_STENCILFAIL), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_BACK_STENCILZFAIL), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_BACK_STENCILPASS), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_BACK_STENCILFUNC), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP0), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP1), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP2), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4a1a7c80b8f..1819155fae3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1078,9 +1078,9 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ } twosided_enable = state->render_states[WINED3D_RS_TWOSIDEDSTENCILMODE]; - if (!(func = wined3d_gl_compare_func(state->render_states[WINED3D_RS_STENCILFUNC]))) + if (!(func = wined3d_gl_compare_func(d->desc.front.func))) func = GL_ALWAYS; - if (!(func_back = wined3d_gl_compare_func(state->render_states[WINED3D_RS_BACK_STENCILFUNC]))) + if (!(func_back = wined3d_gl_compare_func(d->desc.back.func))) func_back = GL_ALWAYS; mask = d->desc.stencil_read_mask; ref = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); @@ -4769,13 +4769,11 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_STENCILFAIL), { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_STENCILZFAIL), { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_STENCILPASS), { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_STENCILFUNC), { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_STENCILREF), { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE), { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_BACK_STENCILFAIL), { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_BACK_STENCILZFAIL), { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_BACK_STENCILPASS), { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_BACK_STENCILFUNC), { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP0), { STATE_RENDER(WINED3D_RS_WRAP0), state_wrap }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP1), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP2), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, @@ -5575,6 +5573,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 42, 45}, { 47, 47}, { 52, 52}, + { 56, 56}, { 58, 59}, { 61, 127}, {149, 150}, @@ -5582,7 +5581,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {168, 169}, {171, 171}, {174, 177}, - {190, 193}, + {189, 193}, {195, 197}, {206, 209}, { 0, 0}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f77f7dec7eb..f9a4402873f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2036,6 +2036,11 @@ struct wined3d_blend_state_desc } rt[WINED3D_MAX_RENDER_TARGETS]; }; +struct wined3d_stencil_op_desc +{ + enum wined3d_cmp_func func; +}; + struct wined3d_depth_stencil_state_desc { BOOL depth; @@ -2043,6 +2048,8 @@ struct wined3d_depth_stencil_state_desc BOOL stencil; unsigned int stencil_read_mask; unsigned int stencil_write_mask; + struct wined3d_stencil_op_desc front; + struct wined3d_stencil_op_desc back; }; struct wined3d_rasterizer_state_desc -- 2.28.0

2 9

[PATCH 1/2] wined3d: Fix 3d texture layer count for bind tracking.
by Paul Gofman 29 Sep '20

29 Sep '20

Fixes out of bounds access introduced by commit 61e02c5e4f20de6c82342a2ffaa001150bd7c56f and RiME crash on start. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/wined3d/wined3d_private.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 93e5b50a9c8..72b553236db 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6038,6 +6038,12 @@ static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_vi || (srv_format->green_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_STENCIL)); } +static inline unsigned int wined3d_bind_layer_count(const struct wined3d_resource *resource, + unsigned int layer_count) +{ + return resource->type == WINED3D_RTYPE_TEXTURE_3D ? resource->depth : layer_count; +} + static inline bool wined3d_srv_all_subresources(const struct wined3d_shader_resource_view *srv) { struct wined3d_texture *texture; @@ -6050,7 +6056,7 @@ static inline bool wined3d_srv_all_subresources(const struct wined3d_shader_reso texture = texture_from_resource(srv->resource); return srv->desc.u.texture.level_count == texture->level_count - && srv->desc.u.texture.layer_count == texture->layer_count; + && srv->desc.u.texture.layer_count == wined3d_bind_layer_count(srv->resource, texture->layer_count); } static inline bool wined3d_rtv_all_subresources(const struct wined3d_rendertarget_view *rtv) @@ -6064,7 +6070,8 @@ static inline bool wined3d_rtv_all_subresources(const struct wined3d_rendertarge return FALSE; texture = texture_from_resource(rtv->resource); - return texture->level_count == 1 && rtv->layer_count == texture->layer_count; + return texture->level_count == 1 + && rtv->layer_count == wined3d_bind_layer_count(rtv->resource, texture->layer_count); } static inline void wined3d_srv_bind_count_inc(struct wined3d_shader_resource_view *srv) @@ -6082,7 +6089,8 @@ static inline void wined3d_srv_bind_count_inc(struct wined3d_shader_resource_vie if (!resource->sub_resource_bind_counts_device && !(resource->sub_resource_bind_counts_device = heap_alloc_zero(texture->level_count - * texture->layer_count * sizeof(*resource->sub_resource_bind_counts_device)))) + * wined3d_bind_layer_count(resource, texture->layer_count) + * sizeof(*resource->sub_resource_bind_counts_device)))) return; for (layer = 0; layer < srv->desc.u.texture.layer_count; ++layer) @@ -6131,7 +6139,8 @@ static inline void wined3d_rtv_bind_count_inc(struct wined3d_rendertarget_view * if (!resource->sub_resource_bind_counts_device && !(resource->sub_resource_bind_counts_device = heap_alloc_zero(texture->level_count - * texture->layer_count * sizeof(*resource->sub_resource_bind_counts_device)))) + * wined3d_bind_layer_count(resource, texture->layer_count) + * sizeof(*resource->sub_resource_bind_counts_device)))) return; for (layer = 0; layer < rtv->layer_count; ++layer) -- 2.26.2

1 1

[PATCH v7 1/3] winegstreamer: Add a GstPad wrapping the media source's bytestream.
by Derek Lesho 29 Sep '20

29 Sep '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/gst_cbs.c | 58 +++++++++ dlls/winegstreamer/gst_cbs.h | 12 +- dlls/winegstreamer/main.c | 3 + dlls/winegstreamer/media_source.c | 189 +++++++++++++++++++++++++++++- 4 files changed, 258 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index bf7103b1606..12b53bc5d68 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -49,6 +49,8 @@ static void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user) if (cbdata->type < GSTDEMUX_MAX) perform_cb_gstdemux(cbdata); + else if (cbdata->type < MEDIA_SOURCE_MAX) + perform_cb_media_source(cbdata); pthread_mutex_lock(&cbdata->lock); cbdata->finished = 1; @@ -301,3 +303,59 @@ gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) return cbdata.u.query_sink_data.ret; } + +GstFlowReturn bytestream_wrapper_pull_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, + GstBuffer **buf) +{ + struct cb_data cbdata = { BYTESTREAM_WRAPPER_PULL }; + + cbdata.u.getrange_data.pad = pad; + cbdata.u.getrange_data.parent = parent; + cbdata.u.getrange_data.ofs = ofs; + cbdata.u.getrange_data.len = len; + cbdata.u.getrange_data.buf = buf; + + call_cb(&cbdata); + + return cbdata.u.getrange_data.ret; +} + +gboolean bytestream_query_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) +{ + struct cb_data cbdata = { BYTESTREAM_QUERY }; + + cbdata.u.query_function_data.pad = pad; + cbdata.u.query_function_data.parent = parent; + cbdata.u.query_function_data.query = query; + + call_cb(&cbdata); + + return cbdata.u.query_function_data.ret; +} + +gboolean bytestream_pad_mode_activate_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) +{ + struct cb_data cbdata = { BYTESTREAM_PAD_MODE_ACTIVATE }; + + cbdata.u.activate_mode_data.pad = pad; + cbdata.u.activate_mode_data.parent = parent; + cbdata.u.activate_mode_data.mode = mode; + cbdata.u.activate_mode_data.activate = activate; + + call_cb(&cbdata); + + return cbdata.u.activate_mode_data.ret; +} + +gboolean bytestream_pad_event_process_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) +{ + struct cb_data cbdata = { BYTESTREAM_PAD_EVENT_PROCESS }; + + cbdata.u.event_src_data.pad = pad; + cbdata.u.event_src_data.parent = parent; + cbdata.u.event_src_data.event = event; + + call_cb(&cbdata); + + return cbdata.u.event_src_data.ret; +} diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index 4725f23ad1a..3459a9ef8ee 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -43,7 +43,12 @@ enum CB_TYPE { AUTOPLUG_BLACKLIST, UNKNOWN_TYPE, QUERY_SINK, - GSTDEMUX_MAX + GSTDEMUX_MAX, + BYTESTREAM_WRAPPER_PULL, + BYTESTREAM_QUERY, + BYTESTREAM_PAD_MODE_ACTIVATE, + BYTESTREAM_PAD_EVENT_PROCESS, + MEDIA_SOURCE_MAX, }; struct cb_data { @@ -138,6 +143,7 @@ struct cb_data { void mark_wine_thread(void) DECLSPEC_HIDDEN; void perform_cb_gstdemux(struct cb_data *data) DECLSPEC_HIDDEN; +void perform_cb_media_source(struct cb_data *data) DECLSPEC_HIDDEN; GstBusSyncReply watch_bus_wrapper(GstBus *bus, GstMessage *msg, gpointer user) DECLSPEC_HIDDEN; void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; @@ -154,5 +160,9 @@ GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad, void unknown_type_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; +GstFlowReturn bytestream_wrapper_pull_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; +gboolean bytestream_query_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; +gboolean bytestream_pad_mode_activate_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN; +gboolean bytestream_pad_event_process_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DECLSPEC_HIDDEN; #endif diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 2872710b3e2..4ca371d58bd 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -146,6 +146,9 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) TRACE("clsid %s, iid %s, out %p.\n", debugstr_guid(clsid), debugstr_guid(iid), out); + if (!init_gstreamer()) + return CLASS_E_CLASSNOTAVAILABLE; + if (SUCCEEDED(hr = mfplat_get_class_object(clsid, iid, out))) return hr; diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index f365c8a1827..1accf55c6a2 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -17,9 +17,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + +#include <gst/gst.h> + #include "gst_private.h" +#include "gst_cbs.h" #include <stdarg.h> +#include <assert.h> #define COBJMACROS #define NONAMELESSUNION @@ -27,6 +33,7 @@ #include "mfapi.h" #include "mferror.h" #include "mfidl.h" +#include "mfobjects.h" #include "wine/debug.h" #include "wine/heap.h" @@ -39,6 +46,8 @@ struct media_source IMFMediaSource IMFMediaSource_iface; LONG ref; IMFMediaEventQueue *event_queue; + IMFByteStream *byte_stream; + GstPad *my_src; enum { SOURCE_OPENING, @@ -52,6 +61,127 @@ static inline struct media_source *impl_from_IMFMediaSource(IMFMediaSource *ifac return CONTAINING_RECORD(iface, struct media_source, IMFMediaSource_iface); } +static GstFlowReturn bytestream_wrapper_pull(GstPad *pad, GstObject *parent, guint64 ofs, guint len, + GstBuffer **buf) +{ + struct media_source *source = gst_pad_get_element_private(pad); + IMFByteStream *byte_stream = source->byte_stream; + ULONG bytes_read; + GstMapInfo info; + BOOL is_eof; + HRESULT hr; + + TRACE("requesting %u bytes at %s from source %p into buffer %p\n", len, wine_dbgstr_longlong(ofs), source, *buf); + + if (ofs != GST_BUFFER_OFFSET_NONE) + { + if (FAILED(IMFByteStream_SetCurrentPosition(byte_stream, ofs))) + return GST_FLOW_ERROR; + } + + if (FAILED(IMFByteStream_IsEndOfStream(byte_stream, &is_eof))) + return GST_FLOW_ERROR; + if (is_eof) + return GST_FLOW_EOS; + + if (!(*buf)) + *buf = gst_buffer_new_and_alloc(len); + gst_buffer_map(*buf, &info, GST_MAP_WRITE); + hr = IMFByteStream_Read(byte_stream, info.data, len, &bytes_read); + gst_buffer_unmap(*buf, &info); + + gst_buffer_set_size(*buf, bytes_read); + + if (FAILED(hr)) + return GST_FLOW_ERROR; + return GST_FLOW_OK; +} + +static gboolean bytestream_query(GstPad *pad, GstObject *parent, GstQuery *query) +{ + struct media_source *source = gst_pad_get_element_private(pad); + GstFormat format; + QWORD bytestream_len; + + TRACE("GStreamer queries source %p for %s\n", source, GST_QUERY_TYPE_NAME(query)); + + if (FAILED(IMFByteStream_GetLength(source->byte_stream, &bytestream_len))) + return FALSE; + + switch (GST_QUERY_TYPE(query)) + { + case GST_QUERY_DURATION: + { + gst_query_parse_duration(query, &format, NULL); + if (format == GST_FORMAT_PERCENT) + { + gst_query_set_duration(query, GST_FORMAT_PERCENT, GST_FORMAT_PERCENT_MAX); + return TRUE; + } + else if (format == GST_FORMAT_BYTES) + { + QWORD length; + IMFByteStream_GetLength(source->byte_stream, &length); + gst_query_set_duration(query, GST_FORMAT_BYTES, length); + return TRUE; + } + return FALSE; + } + case GST_QUERY_SEEKING: + { + gst_query_parse_seeking (query, &format, NULL, NULL, NULL); + if (format != GST_FORMAT_BYTES) + { + WARN("Cannot seek using format \"%s\".\n", gst_format_get_name(format)); + return FALSE; + } + gst_query_set_seeking(query, GST_FORMAT_BYTES, 1, 0, bytestream_len); + return TRUE; + } + case GST_QUERY_SCHEDULING: + { + gst_query_set_scheduling(query, GST_SCHEDULING_FLAG_SEEKABLE, 1, -1, 0); + gst_query_add_scheduling_mode(query, GST_PAD_MODE_PULL); + return TRUE; + } + default: + { + WARN("Unhandled query type %s\n", GST_QUERY_TYPE_NAME(query)); + return FALSE; + } + } +} + +static gboolean bytestream_pad_mode_activate(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) +{ + struct media_source *source = gst_pad_get_element_private(pad); + + TRACE("%s source pad for mediasource %p in %s mode.\n", + activate ? "Activating" : "Deactivating", source, gst_pad_mode_get_name(mode)); + + return mode == GST_PAD_MODE_PULL; +} + +static gboolean bytestream_pad_event_process(GstPad *pad, GstObject *parent, GstEvent *event) +{ + struct media_source *source = gst_pad_get_element_private(pad); + + TRACE("source %p, type \"%s\".\n", source, GST_EVENT_TYPE_NAME(event)); + + switch (event->type) { + /* the seek event should fail in pull mode */ + case GST_EVENT_SEEK: + return FALSE; + default: + WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); + case GST_EVENT_TAG: + case GST_EVENT_QOS: + case GST_EVENT_RECONFIGURE: + return gst_pad_event_default(pad, parent, event); + } + return TRUE; +} + static HRESULT WINAPI media_source_QueryInterface(IMFMediaSource *iface, REFIID riid, void **out) { struct media_source *source = impl_from_IMFMediaSource(iface); @@ -211,8 +341,12 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) source->state = SOURCE_SHUTDOWN; + if (source->my_src) + gst_object_unref(GST_OBJECT(source->my_src)); if (source->event_queue) IMFMediaEventQueue_Shutdown(source->event_queue); + if (source->byte_stream) + IMFByteStream_Release(source->byte_stream); return S_OK; } @@ -236,19 +370,31 @@ static const IMFMediaSourceVtbl IMFMediaSource_vtbl = static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_source **out_media_source) { + GstStaticPadTemplate src_template = + GST_STATIC_PAD_TEMPLATE("mf_src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); + struct media_source *object = heap_alloc_zero(sizeof(*object)); HRESULT hr; if (!object) return E_OUTOFMEMORY; + object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; + object->ref = 1; + object->byte_stream = bytestream; + IMFByteStream_AddRef(bytestream); + if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) goto fail; - object->state = SOURCE_STOPPED; + object->my_src = gst_pad_new_from_static_template(&src_template, "mf-src"); + gst_pad_set_element_private(object->my_src, object); + gst_pad_set_getrange_function(object->my_src, bytestream_wrapper_pull_wrapper); + gst_pad_set_query_function(object->my_src, bytestream_query_wrapper); + gst_pad_set_activatemode_function(object->my_src, bytestream_pad_mode_activate_wrapper); + gst_pad_set_event_function(object->my_src, bytestream_pad_event_process_wrapper); - object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; - object->ref = 1; + object->state = SOURCE_STOPPED; *out_media_source = object; return S_OK; @@ -716,3 +862,40 @@ HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) return hr; } + +/* helper for callback forwarding */ +void perform_cb_media_source(struct cb_data *cbdata) +{ + switch(cbdata->type) + { + case BYTESTREAM_WRAPPER_PULL: + { + struct getrange_data *data = &cbdata->u.getrange_data; + cbdata->u.getrange_data.ret = bytestream_wrapper_pull(data->pad, data->parent, + data->ofs, data->len, data->buf); + break; + } + case BYTESTREAM_QUERY: + { + struct query_function_data *data = &cbdata->u.query_function_data; + cbdata->u.query_function_data.ret = bytestream_query(data->pad, data->parent, data->query); + break; + } + case BYTESTREAM_PAD_MODE_ACTIVATE: + { + struct activate_mode_data *data = &cbdata->u.activate_mode_data; + cbdata->u.activate_mode_data.ret = bytestream_pad_mode_activate(data->pad, data->parent, data->mode, data->activate); + break; + } + case BYTESTREAM_PAD_EVENT_PROCESS: + { + struct event_src_data *data = &cbdata->u.event_src_data; + cbdata->u.event_src_data.ret = bytestream_pad_event_process(data->pad, data->parent, data->event); + break; + } + default: + { + assert(0); + } + } +} -- 2.28.0

2 5

[PATCH] server: Inherit standard handles together with explicit handle list.
by Nikolay Sivov 29 Sep '20

29 Sep '20

Restores standard handles behavior pre-c58a10c16395c30e7793cde1f748febe0432a6ad, always inheriting them when inherit mode is enabled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49895 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- server/handle.c | 36 ++++++++++++++++++++++++------------ server/handle.h | 3 ++- server/process.c | 14 ++++++++++---- server/process.h | 2 +- server/request.c | 2 +- 5 files changed, 38 insertions(+), 19 deletions(-) diff --git a/server/handle.c b/server/handle.c index d4df33f4730..15382256f10 100644 --- a/server/handle.c +++ b/server/handle.c @@ -354,10 +354,26 @@ static void shrink_handle_table( struct handle_table *table ) table->entries = new_entries; } +static void inherit_handle( struct process *parent, const obj_handle_t handle, struct handle_table *table ) +{ + struct handle_entry *dst, *src; + int index; + + dst = table->entries; + + src = get_handle( parent, handle ); + if (!src || !(src->access & RESERVED_INHERIT)) return; + grab_object_for_handle( src->ptr ); + index = handle_to_index( handle ); + dst[index] = *src; + table->last = max( table->last, index ); +} + /* copy the handle table of the parent process */ /* return 1 if OK, 0 on error */ struct handle_table *copy_handle_table( struct process *process, struct process *parent, - const obj_handle_t *handles, unsigned int handle_count ) + const obj_handle_t *handles, unsigned int handle_count, + const obj_handle_t *std_handles ) { struct handle_table *parent_table = parent->handles; struct handle_table *table; @@ -371,20 +387,16 @@ struct handle_table *copy_handle_table( struct process *process, struct process if (handles) { - struct handle_entry *dst, *src; - int index; - - dst = table->entries; - memset( dst, 0, parent_table->count * sizeof(*dst) ); + memset( table->entries, 0, parent_table->count * sizeof(*table->entries) ); for (i = 0; i < handle_count; i++) { - src = get_handle( parent, handles[i] ); - if (!src || !(src->access & RESERVED_INHERIT)) continue; - grab_object_for_handle( src->ptr ); - index = handle_to_index( handles[i] ); - dst[index] = *src; - table->last = max( table->last, index ); + inherit_handle( parent, handles[i], table ); + } + + for (i = 0; i < 3; i++) + { + inherit_handle( parent, std_handles[i], table ); } } else diff --git a/server/handle.h b/server/handle.h index bb541de13b1..ac3104dc003 100644 --- a/server/handle.h +++ b/server/handle.h @@ -51,7 +51,8 @@ extern obj_handle_t find_inherited_handle( struct process *process, const struct extern void close_process_handles( struct process *process ); extern struct handle_table *alloc_handle_table( struct process *process, int count ); extern struct handle_table *copy_handle_table( struct process *process, struct process *parent, - const obj_handle_t *handles, unsigned int handle_count ); + const obj_handle_t *handles, unsigned int handle_count, + const obj_handle_t *std_handles ); extern unsigned int get_handle_table_count( struct process *process); #endif /* __WINE_SERVER_HANDLE_H */ diff --git a/server/process.c b/server/process.c index 26958308ca7..1786493a814 100644 --- a/server/process.c +++ b/server/process.c @@ -502,7 +502,7 @@ static void start_sigkill_timer( struct process *process ) /* create a new process */ /* if the function fails the fd is closed */ -struct process *create_process( int fd, struct process *parent, int inherit_all, +struct process *create_process( int fd, struct process *parent, int inherit_all, const startup_info_t *info, const struct security_descriptor *sd, const obj_handle_t *handles, unsigned int handle_count, struct token *token ) { @@ -576,8 +576,14 @@ struct process *create_process( int fd, struct process *parent, int inherit_all, } else { + obj_handle_t std_handles[3]; + + std_handles[0] = info->hstdin; + std_handles[1] = info->hstdout; + std_handles[2] = info->hstderr; + process->parent_id = parent->id; - process->handles = inherit_all ? copy_handle_table( process, parent, handles, handle_count ) + process->handles = inherit_all ? copy_handle_table( process, parent, handles, handle_count, std_handles ) : alloc_handle_table( process, 0 ); /* Note: for security reasons, starting a new process does not attempt * to use the current impersonation token for the new process */ @@ -1227,7 +1233,7 @@ DECL_HANDLER(new_process) goto done; } - if (!(process = create_process( socket_fd, parent, req->inherit_all, sd, + if (!(process = create_process( socket_fd, parent, req->inherit_all, info->data, sd, handles, req->handles_size / sizeof(*handles), token ))) goto done; @@ -1325,7 +1331,7 @@ DECL_HANDLER(exec_process) close( socket_fd ); return; } - if (!(process = create_process( socket_fd, NULL, 0, NULL, NULL, 0, NULL ))) return; + if (!(process = create_process( socket_fd, NULL, 0, NULL, NULL, NULL, 0, NULL ))) return; create_thread( -1, process, NULL ); release_object( process ); } diff --git a/server/process.h b/server/process.h index bc81d563b47..56092e5b1ac 100644 --- a/server/process.h +++ b/server/process.h @@ -108,7 +108,7 @@ struct process extern unsigned int alloc_ptid( void *ptr ); extern void free_ptid( unsigned int id ); extern void *get_ptid_entry( unsigned int id ); -extern struct process *create_process( int fd, struct process *parent, int inherit_all, +extern struct process *create_process( int fd, struct process *parent, int inherit_all, const startup_info_t *info, const struct security_descriptor *sd, const obj_handle_t *handles, unsigned int handle_count, struct token *token ); extern data_size_t init_process( struct thread *thread ); diff --git a/server/request.c b/server/request.c index 40e9478e09e..97bf1a746d2 100644 --- a/server/request.c +++ b/server/request.c @@ -583,7 +583,7 @@ static void master_socket_poll_event( struct fd *fd, int event ) int client = accept( get_unix_fd( master_socket->fd ), (struct sockaddr *) &dummy, &len ); if (client == -1) return; fcntl( client, F_SETFL, O_NONBLOCK ); - if ((process = create_process( client, NULL, 0, NULL, NULL, 0, NULL ))) + if ((process = create_process( client, NULL, 0, NULL, NULL, NULL, 0, NULL ))) { create_thread( -1, process, NULL ); release_object( process ); -- 2.28.0

1 0

[PATCH v3 1/4] d3dx10: Move D3DX10GetImageInfo*() to texture.c.
by Ziqing Hui 29 Sep '20

29 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v3: This is a new patch in this patch set. dlls/d3dx10_43/Makefile.in | 3 +- dlls/d3dx10_43/d3dx10_43_main.c | 209 ---------------------------- dlls/d3dx10_43/texture.c | 235 ++++++++++++++++++++++++++++++++ 3 files changed, 237 insertions(+), 210 deletions(-) create mode 100644 dlls/d3dx10_43/texture.c

2 1

[PATCH] d3dcompiler_43/tests: Fix the spelling of a couple of ok() messages.
by Francois Gouget 29 Sep '20

29 Sep '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/d3dcompiler_43/tests/reflection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 0f660aab624..362e070ede0 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1245,7 +1245,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE #endif ok(desc11.uFlags == expected, "Got unexpected uFlags %#x, i %u.\n", desc11.uFlags, i); ok(desc11.ReturnType == pdesc->ReturnType, "Got unexpected ReturnType %#x, i %u.\n", desc11.ReturnType, i); - ok(desc11.Dimension == pdesc->Dimension, "Got unexpected Dimenstion %#x, i %u.\n", desc11.Dimension, i); + ok(desc11.Dimension == pdesc->Dimension, "Got unexpected Dimension %#x, i %u.\n", desc11.Dimension, i); ok(desc11.NumSamples == pdesc->NumSamples, "Got unexpected NumSamples %u, i %u.\n", desc11.NumSamples, i); if (ref12) @@ -1309,7 +1309,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE ok(desc11.BindCount == pdesc->BindCount, "Got unexpected BindCount failed %u, i %u.\n", desc11.BindCount, i); ok(desc11.uFlags == pdesc->uFlags, "Got unexpected uFlags %#x, i %u.\n", desc11.uFlags, i); ok(desc11.ReturnType == pdesc->ReturnType, "Got unexpected ReturnType %#x, i %u.\n", desc11.ReturnType, i); - ok(desc11.Dimension == pdesc->Dimension, "Got unexpected Dimenstion %#x, i %u.\n", desc11.Dimension, i); + ok(desc11.Dimension == pdesc->Dimension, "Got unexpected Dimension %#x, i %u.\n", desc11.Dimension, i); ok(desc11.NumSamples == pdesc->NumSamples, "Got unexpected NumSamples %u, i %u.\n", desc11.NumSamples, i); if (ref12) -- 2.20.1

2 2

[PATCH v4] gdi32: Limit GetGlyphOutlineW(uChar) to a WORD.
by Arkadiusz Hiler 29 Sep '20

29 Sep '20

Fixes eden* PLUS＋MOSAIC. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45400 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- Supersedes 193433 v4: * shorten commit message * shorten ok() messages * old compiler compatibility * fetch glyph 0x10003 metrics to a correct GLYPHMETRICS v3: * ReleaseDC instead of DeleteDC * test only with 0x10000 offset * test GGO_GLYPH_INDEX masking * don't print ret and GetLastError() in case of GetGlyphOutlineW failure we get GDI_ERROR and last error is not used * simplify comparing GLYPHMETRICS - memcmp v2: While investigating the failures with zh_CN locale I figured out that I did some mistakes in my font definition and that I can just reuse wine-test.ttf: * It has .notdef with a distinct width * It has a few characters defined which are handy to test The changes are: * use wine_test font, it's even better than what I had * make sure that our character is different than .notdef * test multiple characters * test multiple values in the higher bytes * make sure that no matter what we put past the two lower bytes we get the same character dlls/gdi32/font.c | 2 ++ dlls/gdi32/tests/font.c | 52 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a71b24423ac..3c5a6e9a231 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2911,6 +2911,8 @@ DWORD WINAPI GetGlyphOutlineW( HDC hdc, UINT uChar, UINT fuFormat, dc = get_dc_ptr(hdc); if(!dc) return GDI_ERROR; + uChar &= 0xffff; + dev = GET_DC_PHYSDEV( dc, pGetGlyphOutline ); ret = dev->funcs->pGetGlyphOutline( dev, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, lpmat2 ); release_dc_ptr( dc ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0ada22d95d5..4c8b1cbb91b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5823,6 +5823,57 @@ todo_wine ReleaseDC(NULL, hdc); } +static void test_GetGlyphOutline_character(void) +{ + HFONT hfont, hfont_old; + LOGFONTA lf; + HDC hdc; + DWORD ret; + GLYPHMETRICS gm1, gm2, gmn; + char test_chars[] = { 'A', 'D', '!', '\0' }; + char *current_char; + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = 72; + lstrcpyA(lf.lfFaceName, "wine_test"); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); + + hdc = GetDC(NULL); + + hfont_old = SelectObject(hdc, hfont); + ok(hfont_old != NULL, "SelectObject failed\n"); + + ret = GetGlyphOutlineW(hdc, 'Z', GGO_METRICS, &gmn, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed to default to .notdef for character 'Z'\n"); + + for (current_char = test_chars; *current_char != '\0'; current_char++) + { + ret = GetGlyphOutlineW(hdc, *current_char, GGO_METRICS, &gm1, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed for '%c'\n", *current_char); + ok(memcmp(&gm1, &gmn, sizeof(gmn)) != 0, "the test character '%c' matches .notdef\n", *current_char); + + ret = GetGlyphOutlineW(hdc, 0x10000 + *current_char, GGO_METRICS, &gm2, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed for 0x10000 + '%c'\n", *current_char); + ok(memcmp(&gm1, &gm2, sizeof(gmn)) == 0, "GetGlyphOutlineW returned wrong metrics for character 0x10000 + '%c'\n", *current_char); + } + + ret = GetGlyphOutlineW(hdc, 0x3, GGO_METRICS|GGO_GLYPH_INDEX, &gm1, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed for glyph index 0x3\n"); + + ret = GetGlyphOutlineW(hdc, 0xFFFF, GGO_METRICS|GGO_GLYPH_INDEX, &gm2, 0, NULL, &mat); + ok(ret == GDI_ERROR, "GetGlyphOutlineW for nonexistent glyph index 0xFFFF has succeded\n"); + + ret = GetGlyphOutlineW(hdc, 0x10003, GGO_METRICS|GGO_GLYPH_INDEX, &gm2, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW for index 0x10003 has failed\n"); + ok(memcmp(&gm1, &gm2, sizeof(gmn)) == 0, "GetGlyphOutlineW returned wrong metrics for glyph 0x10003\n"); + + SelectObject(hdc, hfont_old); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); +} + static void test_fstype_fixup(void) { HDC hdc; @@ -5945,6 +5996,7 @@ static void test_CreateScalableFontResource(void) test_GetGlyphOutline_empty_contour(); test_GetGlyphOutline_metric_clipping(); + test_GetGlyphOutline_character(); test_fstype_fixup(); ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0); -- 2.28.0

2 1

[PATCH 1/4] include: Add windows.media.speechsynthesis.idl draft.
by Rémi Bernon 29 Sep '20

29 Sep '20

This IDL is used by windows.media.speech.dll, which is itself required by Flight Simulator. It will here be used as an illustration and test case for WIDL WinRT features. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This is the beginning of a series to correctly support parameterized interfaces in WIDL in WinRT mode. I'm using this new idl file as well as windows.foundation.idl to illustrate and test the parsing features, and the generated headers. The generated code should closely match MIDL this time, at least on the C side. The C++ side of the WinRT generated headers are based template implementation classes from internal WinRT headers, which we don't have and that will require a lot more work to figure how to do it properly. include/Makefile.in | 1 + include/windows.media.speechsynthesis.idl | 61 +++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 include/windows.media.speechsynthesis.idl diff --git a/include/Makefile.in b/include/Makefile.in index 91a02645c33..dd13656392e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -733,6 +733,7 @@ SOURCES = \ windef.h \ windns.h \ windows.foundation.idl \ + windows.media.speechsynthesis.idl \ windows.h \ windowsx.h \ wine/debug.h \ diff --git a/include/windows.media.speechsynthesis.idl b/include/windows.media.speechsynthesis.idl new file mode 100644 index 00000000000..a0a4c9cbf50 --- /dev/null +++ b/include/windows.media.speechsynthesis.idl @@ -0,0 +1,61 @@ +/* + * Copyright 2020 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace Media { + namespace SpeechSynthesis { + typedef enum VoiceGender VoiceGender; + interface IInstalledVoicesStatic; + interface IVoiceInformation; + } + } +} + +namespace Windows { + namespace Media { + namespace SpeechSynthesis { + /* [contract(Windows.Foundation.UniversalApiContract, 1.0)] */ + enum VoiceGender + { + Male = 0, + Female = 1 + }; + + [ + /* contract(Windows.Foundation.UniversalApiContract, 1.0), */ + /* exclusiveto(Windows.Media.SpeechSynthesis.VoiceInformation), */ + uuid(b127d6a4-1291-4604-aa9c-83134083352c) + ] + interface IVoiceInformation : IInspectable + { + [propget] HRESULT DisplayName([out] [retval] HSTRING* value); + [propget] HRESULT Id([out] [retval] HSTRING* value); + [propget] HRESULT Language([out] [retval] HSTRING* value); + [propget] HRESULT Description([out] [retval] HSTRING* value); + [propget] HRESULT Gender([out] [retval] VoiceGender* value); + } + } + } +} -- 2.28.0

1 4

[PATCH] winebuild: Add unwind info to arm64 syscall stubs
by Martin Storsjo 29 Sep '20

29 Sep '20

Signed-off-by: Martin Storsjo <martin(a)martin.st> --- tools/winebuild/import.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 461f1851d61..0369efa803c 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1604,12 +1604,26 @@ void output_syscalls( DLLSPEC *spec ) output( "\tcmp x8, %u\n", count ); output( "\tbcs 3f\n" ); output( "\tstp x29, x30, [sp,#-160]!\n" ); + output_cfi( "\t.cfi_def_cfa_offset 160\n" ); + output_cfi( "\t.cfi_offset 29, -160\n" ); + output_cfi( "\t.cfi_offset 30, -152\n" ); output( "\tmov x29, sp\n" ); + output_cfi( "\t.cfi_def_cfa_register 29\n" ); output( "\tstp x27, x28, [sp, #144]\n" ); + output_cfi( "\t.cfi_offset 27, -16\n" ); + output_cfi( "\t.cfi_offset 28, -8\n" ); output( "\tstp x25, x26, [sp, #128]\n" ); + output_cfi( "\t.cfi_offset 25, -32\n" ); + output_cfi( "\t.cfi_offset 26, -24\n" ); output( "\tstp x23, x24, [sp, #112]\n" ); + output_cfi( "\t.cfi_offset 23, -48\n" ); + output_cfi( "\t.cfi_offset 24, -40\n" ); output( "\tstp x21, x22, [sp, #96]\n" ); + output_cfi( "\t.cfi_offset 21, -64\n" ); + output_cfi( "\t.cfi_offset 22, -56\n" ); output( "\tstp x19, x20, [sp, #80]\n" ); + output_cfi( "\t.cfi_offset 19, -80\n" ); + output_cfi( "\t.cfi_offset 20, -72\n" ); output( "\tstp x6, x7, [sp, #64]\n" ); output( "\tstp x4, x5, [sp, #48]\n" ); output( "\tstp x2, x3, [sp, #32]\n" ); @@ -1735,6 +1749,9 @@ void output_syscalls( DLLSPEC *spec ) break; case CPU_ARM64: output( "\tstp x29, x30, [sp,#-16]!\n" ); + output_cfi( "\t.cfi_def_cfa_offset 16\n" ); + output_cfi( "\t.cfi_offset 29, -16\n" ); + output_cfi( "\t.cfi_offset 30, -8\n" ); output( "\tmov x8, #%u\n", i ); output( "\tadrp x16, %s\n", arm64_page( asm_name("__wine_syscall_dispatcher") ) ); output( "\tldr x16, [x16, #%s]\n", arm64_pageoff( asm_name("__wine_syscall_dispatcher") ) ); -- 2.17.1

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
78
Older →

Jump to page:

2025

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-devel September 2020