March 2021 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Add IHTMLElement7 stub implementation.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 097ca893357b393c4eeb270ace86cad8779c3658 URL: https://source.winehq.org/git/wine.git/?a=commit;h=097ca893357b393c4eeb270a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 10 14:58:05 2021 +0100 mshtml: Add IHTMLElement7 stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 499 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + 2 files changed, 501 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=097ca893357b393c4eeb…

1 0

Jacek Caban : include: Add IHTMLElement7 declaration.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 48e65244e0cabce8194b738eb93dddca664ac568 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48e65244e0cabce8194b738e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 10 14:57:52 2021 +0100 include: Add IHTMLElement7 declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 35 ++++++ include/mshtml.idl | 353 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 382 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=48e65244e0cabce8194b…

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_set_blend_state().
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 6cc5f9a6ff661d4c055d26be25dba95bfd4c8ac1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cc5f9a6ff661d4c055d26be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 9 20:09:01 2021 -0600 d3d11: Use wined3d_device_context_set_blend_state(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 6a6744d22af..6f98227bef3 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1000,7 +1000,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargetsAndUnord static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11DeviceContext1 *iface, ID3D11BlendState *blend_state, const float blend_factor[4], UINT sample_mask) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); static const float default_blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; struct d3d_blend_state *blend_state_impl; @@ -1012,10 +1012,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi wined3d_mutex_lock(); if (!(blend_state_impl = unsafe_impl_from_ID3D11BlendState(blend_state))) - wined3d_device_set_blend_state(device->wined3d_device, NULL, + wined3d_device_context_set_blend_state(context->wined3d_context, NULL, (const struct wined3d_color *)blend_factor, sample_mask); else - wined3d_device_set_blend_state(device->wined3d_device, blend_state_impl->wined3d_state, + wined3d_device_context_set_blend_state(context->wined3d_context, blend_state_impl->wined3d_state, (const struct wined3d_color *)blend_factor, sample_mask); wined3d_mutex_unlock(); }

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_blend_state().
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 906568e093e3e1d2214033010ccc924505883376 URL: https://source.winehq.org/git/wine.git/?a=commit;h=906568e093e3e1d221403301… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 9 20:08:59 2021 -0600 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_blend_state(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 8 ++++---- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 43f1d04dd0f..4d50ecba23b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1651,18 +1651,18 @@ static void wined3d_cs_exec_set_blend_state(struct wined3d_cs *cs, const void *d device_invalidate_state(cs->c.device, STATE_SAMPLE_MASK); } -void wined3d_cs_emit_set_blend_state(struct wined3d_cs *cs, struct wined3d_blend_state *state, - const struct wined3d_color *blend_factor, unsigned int sample_mask) +void wined3d_device_context_emit_set_blend_state(struct wined3d_device_context *context, + struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask) { struct wined3d_cs_set_blend_state *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_BLEND_STATE; op->state = state; op->factor = *blend_factor; op->sample_mask = sample_mask; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_depth_stencil_state(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 338b489c9b9..8ea7351f5fc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1756,7 +1756,7 @@ void CDECL wined3d_device_set_blend_state(struct wined3d_device *device, state->blend_state = blend_state; state->blend_factor = *blend_factor; state->sample_mask = sample_mask; - wined3d_cs_emit_set_blend_state(device->cs, blend_state, blend_factor, sample_mask); + wined3d_device_context_emit_set_blend_state(&device->cs->c, blend_state, blend_factor, sample_mask); if (prev) wined3d_blend_state_decref(prev); } @@ -2041,7 +2041,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 wined3d_cs_emit_set_render_state(device->cs, i, state->render_states[i]); } - wined3d_cs_emit_set_blend_state(device->cs, state->blend_state, &state->blend_factor, state->sample_mask); + wined3d_device_context_emit_set_blend_state(context, state->blend_state, &state->blend_factor, state->sample_mask); wined3d_cs_emit_set_depth_stencil_state(device->cs, state->depth_stencil_state, state->stencil_ref); wined3d_cs_emit_set_rasterizer_state(device->cs, state->rasterizer_state); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6fc743e74db..7dfa7d2211b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4741,8 +4741,6 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw const RECT *dst_rect, HWND dst_window_override, unsigned int swap_interval, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *query, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_blend_state(struct wined3d_cs *cs, struct wined3d_blend_state *state, - const struct wined3d_color *blend_factor, unsigned int sample_mask) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture, @@ -4810,6 +4808,9 @@ static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d cs->c.ops->push_constants(&cs->c, p, start_idx, count, constants); } +void wined3d_device_context_emit_set_blend_state(struct wined3d_device_context *context, + struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, + unsigned int sample_mask) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_constant_buffer(struct wined3d_device_context *context, enum wined3d_shader_type type, UINT cb_idx, struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type,

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_set_shader().
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: f73857d632cc10f9b09f1143e2f579e2de408769 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f73857d632cc10f9b09f1143… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 9 20:08:56 2021 -0600 d3d11: Use wined3d_device_context_set_shader(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 2 ++ dlls/d3d11/device.c | 39 +++++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index a64d6975f85..5a812e1b254 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -546,6 +546,8 @@ struct d3d11_immediate_context ID3D11Multithread ID3D11Multithread_iface; LONG refcount; + struct wined3d_device_context *wined3d_context; + struct wined3d_private_store private_store; }; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c8ec35a59c0..6a30ab313f0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -512,7 +512,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShader(ID3D11DeviceContext1 *iface, ID3D11PixelShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_pixel_shader *ps = unsafe_impl_from_ID3D11PixelShader(shader); TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", @@ -522,7 +522,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShader(ID3D11DeviceCo FIXME("Dynamic linking is not implemented yet.\n"); wined3d_mutex_lock(); - wined3d_device_set_pixel_shader(device->wined3d_device, ps ? ps->wined3d_shader : NULL); + wined3d_device_context_set_shader(context->wined3d_context, WINED3D_SHADER_TYPE_PIXEL, + ps ? ps->wined3d_shader : NULL); wined3d_mutex_unlock(); } @@ -549,7 +550,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShader(ID3D11DeviceContext1 *iface, ID3D11VertexShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_vertex_shader *vs = unsafe_impl_from_ID3D11VertexShader(shader); TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", @@ -559,7 +560,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShader(ID3D11DeviceCo FIXME("Dynamic linking is not implemented yet.\n"); wined3d_mutex_lock(); - wined3d_device_set_vertex_shader(device->wined3d_device, vs ? vs->wined3d_shader : NULL); + wined3d_device_context_set_shader(context->wined3d_context, WINED3D_SHADER_TYPE_VERTEX, + vs ? vs->wined3d_shader : NULL); wined3d_mutex_unlock(); } @@ -737,7 +739,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetShader(ID3D11DeviceContext1 *iface, ID3D11GeometryShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_geometry_shader *gs = unsafe_impl_from_ID3D11GeometryShader(shader); TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", @@ -747,7 +749,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetShader(ID3D11DeviceCo FIXME("Dynamic linking is not implemented yet.\n"); wined3d_mutex_lock(); - wined3d_device_set_geometry_shader(device->wined3d_device, gs ? gs->wined3d_shader : NULL); + wined3d_device_context_set_shader(context->wined3d_context, WINED3D_SHADER_TYPE_GEOMETRY, + gs ? gs->wined3d_shader : NULL); wined3d_mutex_unlock(); } @@ -1425,7 +1428,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShader(ID3D11DeviceContext1 *iface, ID3D11HullShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d11_hull_shader *hs = unsafe_impl_from_ID3D11HullShader(shader); TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", @@ -1435,7 +1438,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShader(ID3D11DeviceCo FIXME("Dynamic linking is not implemented yet.\n"); wined3d_mutex_lock(); - wined3d_device_set_hull_shader(device->wined3d_device, hs ? hs->wined3d_shader : NULL); + wined3d_device_context_set_shader(context->wined3d_context, WINED3D_SHADER_TYPE_HULL, + hs ? hs->wined3d_shader : NULL); wined3d_mutex_unlock(); } @@ -1492,7 +1496,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShader(ID3D11DeviceContext1 *iface, ID3D11DomainShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d11_domain_shader *ds = unsafe_impl_from_ID3D11DomainShader(shader); TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", @@ -1502,7 +1506,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShader(ID3D11DeviceCo FIXME("Dynamic linking is not implemented yet.\n"); wined3d_mutex_lock(); - wined3d_device_set_domain_shader(device->wined3d_device, ds ? ds->wined3d_shader : NULL); + wined3d_device_context_set_shader(context->wined3d_context, WINED3D_SHADER_TYPE_DOMAIN, + ds ? ds->wined3d_shader : NULL); wined3d_mutex_unlock(); } @@ -1579,7 +1584,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetUnorderedAccessViews( static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShader(ID3D11DeviceContext1 *iface, ID3D11ComputeShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d11_compute_shader *cs = unsafe_impl_from_ID3D11ComputeShader(shader); TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", @@ -1589,7 +1594,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShader(ID3D11DeviceCo FIXME("Dynamic linking is not implemented yet.\n"); wined3d_mutex_lock(); - wined3d_device_set_compute_shader(device->wined3d_device, cs ? cs->wined3d_shader : NULL); + wined3d_device_context_set_shader(context->wined3d_context, WINED3D_SHADER_TYPE_COMPUTE, + cs ? cs->wined3d_shader : NULL); wined3d_mutex_unlock(); } @@ -2577,6 +2583,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceContext1 *iface) { + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; unsigned int i, j; @@ -2584,12 +2591,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_device_set_vertex_shader(device->wined3d_device, NULL); - wined3d_device_set_hull_shader(device->wined3d_device, NULL); - wined3d_device_set_domain_shader(device->wined3d_device, NULL); - wined3d_device_set_geometry_shader(device->wined3d_device, NULL); - wined3d_device_set_pixel_shader(device->wined3d_device, NULL); - wined3d_device_set_compute_shader(device->wined3d_device, NULL); for (i = 0; i < D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT; ++i) { wined3d_device_set_vs_sampler(device->wined3d_device, i, NULL); @@ -2610,6 +2611,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon } for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) { + wined3d_device_context_set_shader(context->wined3d_context, i, NULL); for (j = 0; j < D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT; ++j) wined3d_device_set_constant_buffer(device->wined3d_device, i, j, NULL); } @@ -6458,6 +6460,7 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par wined3d_device_incref(wined3d_device); device->wined3d_device = wined3d_device; + device->immediate_context.wined3d_context = wined3d_device_get_immediate_context(wined3d_device); device->feature_level = d3d_feature_level_from_wined3d(wined3d_device_get_feature_level(wined3d_device));

1 0

Rémi Bernon : widl: Allow runtimeclass to not have a default interface.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: e137becb13113d669c8d5e3cf8d5c2a9c4f50129 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e137becb13113d669c8d5e3c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 9 20:41:18 2021 +0100 widl: Allow runtimeclass to not have a default interface. Or any interfaces, as long as they have a static factory, as MIDL requires. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 2 +- tools/widl/typetree.c | 11 ++++++----- tools/widl/typetree.h | 8 ++++++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 40c1f9d008e..a5e5d6c6fb3 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -488,7 +488,7 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i fprintf(h, "%s", type_get_qualified_name(t, name_type)); break; case TYPE_RUNTIMECLASS: - fprintf(h, "%s", type_get_name(type_runtimeclass_get_default_iface(t), name_type)); + fprintf(h, "%s", type_get_name(type_runtimeclass_get_default_iface(t, TRUE), name_type)); break; case TYPE_DELEGATE: fprintf(h, "%s", type_get_qualified_name(type_delegate_get_iface(t), name_type)); diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 591a58b2849..a4e1696d2af 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -188,7 +188,7 @@ static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t n += strappend(buf, len, pos + n, "rc("); n += append_namespaces(buf, len, pos + n, type->namespace, "", ".", type->name, NULL); n += strappend(buf, len, pos + n, ";"); - n += append_type_signature(buf, len, pos + n, type_runtimeclass_get_default_iface(type)); + n += append_type_signature(buf, len, pos + n, type_runtimeclass_get_default_iface(type, TRUE)); n += strappend(buf, len, pos + n, ")"); return n; case TYPE_POINTER: @@ -379,7 +379,7 @@ static char *format_parameterized_type_impl_name(type_t *type, typeref_list_t *p { pos += strappend(&buf, &len, pos, "ABI::Windows::Foundation::Internal::AggregateType<%s", type->qualified_name); pos += append_pointer_stars(&buf, &len, pos, ref->type); - iface = type_runtimeclass_get_default_iface(type); + iface = type_runtimeclass_get_default_iface(type, TRUE); pos += strappend(&buf, &len, pos, ", %s", iface->qualified_name); pos += append_pointer_stars(&buf, &len, pos, ref->type); pos += strappend(&buf, &len, pos, " >"); @@ -843,10 +843,11 @@ type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, typer runtimeclass->attrs = check_runtimeclass_attrs(runtimeclass->name, attrs); runtimeclass->details.runtimeclass.ifaces = ifaces; runtimeclass->defined = TRUE; - if (!type_runtimeclass_get_default_iface(runtimeclass)) - error_loc("missing default interface on runtimeclass %s\n", runtimeclass->name); + if (!type_runtimeclass_get_default_iface(runtimeclass, FALSE) && + !get_attrp(runtimeclass->attrs, ATTR_STATIC)) + error_loc("runtimeclass %s must have a default interface or static factory\n", runtimeclass->name); - LIST_FOR_EACH_ENTRY(ref, ifaces, typeref_t, entry) + if (ifaces) LIST_FOR_EACH_ENTRY(ref, ifaces, typeref_t, entry) { /* FIXME: this should probably not be allowed, here or in coclass, */ /* but for now there's too many places in Wine IDL where it is to */ diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index b9833dc4e8f..b43b6bfbf79 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -20,6 +20,9 @@ #include "widltypes.h" #include <assert.h> +#include <stdio.h> + +#include "utils.h" #ifndef WIDL_TYPE_TREE_H #define WIDL_TYPE_TREE_H @@ -379,7 +382,7 @@ static inline typeref_list_t *type_runtimeclass_get_ifaces(const type_t *type) return type->details.runtimeclass.ifaces; } -static inline type_t *type_runtimeclass_get_default_iface(const type_t *type) +static inline type_t *type_runtimeclass_get_default_iface(const type_t *type, int check) { typeref_list_t *ifaces = type_runtimeclass_get_ifaces(type); typeref_t *ref; @@ -389,7 +392,8 @@ static inline type_t *type_runtimeclass_get_default_iface(const type_t *type) if (is_attr(ref->attrs, ATTR_DEFAULT)) return ref->type; - return NULL; + if (!check) return NULL; + error_loc_info(&type->loc_info, "runtimeclass %s needs a default interface\n", type->name); } static inline type_t *type_delegate_get_iface(const type_t *type)

1 0

Myah Caron : api-ms-win-core-kernel32-legacy-l1-1-2: Add new dll.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 462f5759d1fc60e3ed4e687ca6c839c232c63300 URL: https://source.winehq.org/git/wine.git/?a=commit;h=462f5759d1fc60e3ed4e687c… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Wed Mar 10 04:41:56 2021 +0000 api-ms-win-core-kernel32-legacy-l1-1-2: Add new dll. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-kernel32-legacy-l1-1-2/Makefile.in | 1 + .../api-ms-win-core-kernel32-legacy-l1-1-2.spec | 10 ++++++++++ tools/make_specfiles | 1 + 5 files changed, 15 insertions(+) diff --git a/configure b/configure index 3b5a50cef53..475fcfdf749 100755 --- a/configure +++ b/configure @@ -970,6 +970,7 @@ enable_api_ms_win_core_job_l1_1_0 enable_api_ms_win_core_job_l2_1_0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 enable_api_ms_win_core_kernel32_legacy_l1_1_1 +enable_api_ms_win_core_kernel32_legacy_l1_1_2 enable_api_ms_win_core_kernel32_private_l1_1_1 enable_api_ms_win_core_largeinteger_l1_1_0 enable_api_ms_win_core_libraryloader_l1_1_0 @@ -20116,6 +20117,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-job-l1-1-0 enable_api_ms_win_core_j wine_fn_config_makefile dlls/api-ms-win-core-job-l2-1-0 enable_api_ms_win_core_job_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-kernel32-legacy-l1-1-0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-kernel32-legacy-l1-1-1 enable_api_ms_win_core_kernel32_legacy_l1_1_1 +wine_fn_config_makefile dlls/api-ms-win-core-kernel32-legacy-l1-1-2 enable_api_ms_win_core_kernel32_legacy_l1_1_2 wine_fn_config_makefile dlls/api-ms-win-core-kernel32-private-l1-1-1 enable_api_ms_win_core_kernel32_private_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-largeinteger-l1-1-0 enable_api_ms_win_core_largeinteger_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-1-0 enable_api_ms_win_core_libraryloader_l1_1_0 diff --git a/configure.ac b/configure.ac index 8ed3b0c2669..5b7f09de924 100644 --- a/configure.ac +++ b/configure.ac @@ -2850,6 +2850,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-job-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-job-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-kernel32-legacy-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-kernel32-legacy-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-kernel32-legacy-l1-1-2) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-kernel32-private-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-largeinteger-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-1-0) diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-2/Makefile.in b/dlls/api-ms-win-core-kernel32-legacy-l1-1-2/Makefile.in new file mode 100644 index 00000000000..e713a0c3892 --- /dev/null +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-2/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-kernel32-legacy-l1-1-2.dll diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-2/api-ms-win-core-kernel32-legacy-l1-1-2.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-2/api-ms-win-core-kernel32-legacy-l1-1-2.spec new file mode 100644 index 00000000000..aa5baafaded --- /dev/null +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-2/api-ms-win-core-kernel32-legacy-l1-1-2.spec @@ -0,0 +1,10 @@ +@ stdcall CreateSemaphoreA(ptr long long str) kernel32.CreateSemaphoreA +@ stdcall GetBinaryTypeW(wstr ptr) kernel32.GetBinaryTypeW +@ stdcall Module32First(long ptr) kernel32.Module32First +@ stdcall Module32Next(long ptr) kernel32.Module32Next +@ stdcall OpenFileMappingA(long long str) kernel32.OpenFileMappingA +@ stdcall OpenMutexA(long long str) kernel32.OpenMutexA +@ stdcall Process32First(ptr ptr) kernel32.Process32First +@ stdcall Process32Next(ptr ptr) kernel32.Process32Next +@ stdcall SetTermsrvAppInstallMode(long) kernel32.SetTermsrvAppInstallMode +@ stdcall VerifyVersionInfoA(ptr long int64) kernel32.VerifyVersionInfoA diff --git a/tools/make_specfiles b/tools/make_specfiles index 11e806b8919..3689a856b9f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -251,6 +251,7 @@ my @dll_groups = "api-ms-win-core-job-l2-1-0", "api-ms-win-core-kernel32-legacy-l1-1-0", "api-ms-win-core-kernel32-legacy-l1-1-1", + "api-ms-win-core-kernel32-legacy-l1-1-2", "api-ms-win-core-kernel32-private-l1-1-1", "api-ms-win-core-largeinteger-l1-1-0", "api-ms-win-core-libraryloader-l1-2-1",

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_set_constant_buffer().
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: ebf64d38ed83764067025aa6170dba13b35b0e95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebf64d38ed83764067025aa6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 9 20:08:58 2021 -0600 d3d11: Use wined3d_device_context_set_constant_buffer(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 6a30ab313f0..6a6744d22af 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -425,7 +425,7 @@ static void d3d11_immediate_context_get_constant_buffers(ID3D11DeviceContext1 *i static void d3d11_immediate_context_set_constant_buffers(ID3D11DeviceContext1 *iface, enum wined3d_shader_type type, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int i; wined3d_mutex_lock(); @@ -433,7 +433,7 @@ static void d3d11_immediate_context_set_constant_buffers(ID3D11DeviceContext1 *i { struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - wined3d_device_set_constant_buffer(device->wined3d_device, type, start_slot + i, + wined3d_device_context_set_constant_buffer(context->wined3d_context, type, start_slot + i, buffer ? buffer->wined3d_buffer : NULL); } wined3d_mutex_unlock(); @@ -2613,7 +2613,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon { wined3d_device_context_set_shader(context->wined3d_context, i, NULL); for (j = 0; j < D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT; ++j) - wined3d_device_set_constant_buffer(device->wined3d_device, i, j, NULL); + wined3d_device_context_set_constant_buffer(context->wined3d_context, i, j, NULL); } for (i = 0; i < D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT; ++i) {

1 0

Zebediah Figura : strmbase: Make the "current_*" fields of struct strmbase_renderer into local variables.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 0d07d1ec6128c4f3b7613e4dd71032080c843047 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d07d1ec6128c4f3b7613e4d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 9 16:19:57 2021 -0600 strmbase: Make the "current_*" fields of struct strmbase_renderer into local variables. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 57 +++++++++++++----------------------------------- include/wine/strmbase.h | 1 - 2 files changed, 15 insertions(+), 43 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index b3641ddee6d..47017f5ced5 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -63,18 +63,12 @@ static void reset_qos(struct strmbase_renderer *filter) filter->avg_rate = -1.0; } -static void perform_qos(struct strmbase_renderer *filter) +static void perform_qos(struct strmbase_renderer *filter, + const REFERENCE_TIME start, const REFERENCE_TIME stop, REFERENCE_TIME jitter) { - REFERENCE_TIME start, stop, jitter, pt, entered, left, duration; + REFERENCE_TIME pt, entered, left, duration; double rate; - if (!filter->filter.clock || filter->current_rstart < 0) - return; - - start = filter->current_rstart; - stop = filter->current_rstop; - jitter = filter->current_jitter; - if (jitter < 0) { /* This is the time the buffer entered the sink. */ @@ -155,16 +149,16 @@ static void perform_qos(struct strmbase_renderer *filter) Quality q; /* If we have a valid rate, start sending QoS messages. */ - if (filter->current_jitter < 0) + if (jitter < 0) { /* Make sure we never go below 0 when adding the jitter to the * timestamp. */ - if (filter->current_rstart < -filter->current_jitter) - filter->current_jitter = -filter->current_rstart; + if (start < -jitter) + jitter = -start; } else { - filter->current_jitter += (filter->current_rstop - filter->current_rstart); + jitter += stop - start; } q.Type = (jitter > 0 ? Famine : Flood); @@ -173,8 +167,8 @@ static void perform_qos(struct strmbase_renderer *filter) q.Proportion = 200; else if (q.Proportion > 5000) q.Proportion = 5000; - q.Late = filter->current_jitter; - q.TimeStamp = filter->current_rstart; + q.Late = jitter; + q.TimeStamp = start; IQualityControl_Notify(&filter->IQualityControl_iface, &filter->filter.IBaseFilter_iface, q); } @@ -182,27 +176,6 @@ static void perform_qos(struct strmbase_renderer *filter) filter->last_left = left; } -static void begin_render(struct strmbase_renderer *filter, - REFERENCE_TIME start, REFERENCE_TIME stop) -{ - filter->current_rstart = start; - filter->current_rstop = max(stop, start); - - if (start >= 0) - { - REFERENCE_TIME now; - IReferenceClock_GetTime(filter->filter.clock, &now); - filter->current_jitter = (now - filter->stream_start) - start; - } - else - { - filter->current_jitter = 0; - } - - TRACE("start %s, stop %s, jitter %s.\n", - debugstr_time(start), debugstr_time(stop), debugstr_time(filter->current_jitter)); -} - static inline struct strmbase_renderer *impl_from_strmbase_filter(struct strmbase_filter *iface) { return CONTAINING_RECORD(iface, struct strmbase_renderer, filter); @@ -384,14 +357,16 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp if (need_wait) { - REFERENCE_TIME now; + REFERENCE_TIME now, jitter; DWORD_PTR cookie; IReferenceClock_GetTime(filter->filter.clock, &now); - begin_render(filter, start, stop); + /* "jitter" describes how early (negative) or late (positive) this + * buffer arrived, relative to its PTS. */ + jitter = (now - filter->stream_start) - start; - if (now - filter->stream_start - start <= -10000) + if (jitter <= -10000) /* if we are early by at least 1 ms */ { HANDLE handles[2] = {filter->advise_event, filter->flush_event}; DWORD ret; @@ -412,7 +387,7 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp if (state == State_Running) hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); - perform_qos(filter); + perform_qos(filter, start, stop, jitter); } else { @@ -588,8 +563,6 @@ void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, ISeekingPassThru_Init(&filter->passthrough.ISeekingPassThru_iface, TRUE, &filter->sink.pin.IPin_iface); filter->IQualityControl_iface.lpVtbl = &quality_control_vtbl; - filter->current_rstart = filter->current_rstop = -1; - filter->pFuncsTable = ops; strmbase_sink_init(&filter->sink, &filter->filter, sink_name, &sink_ops, NULL); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index cad5ebe0a42..4b5ecc86721 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -293,7 +293,6 @@ struct strmbase_renderer IQualityControl *qc_sink; REFERENCE_TIME last_left, avg_duration, avg_pt; - REFERENCE_TIME current_jitter, current_rstart, current_rstop; double avg_rate; const struct strmbase_renderer_ops *pFuncsTable;

1 0

Zebediah Figura : strmbase: Do not pretend to drop samples.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: b9393d08e1491d5fcd36ee926bb891a0326bf52c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9393d08e1491d5fcd36ee92… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 9 16:19:54 2021 -0600 strmbase: Do not pretend to drop samples. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 38 +++----------------------------------- include/wine/strmbase.h | 3 +-- 2 files changed, 4 insertions(+), 37 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index ec915a95ef8..ed815097a0f 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -59,39 +59,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase); static void QualityControlRender_Start(struct strmbase_qc *This, REFERENCE_TIME tStart) { - This->last_in_time = This->last_left = This->avg_duration = This->avg_pt = -1; + This->last_left = This->avg_duration = This->avg_pt = -1; This->clockstart = tStart; This->avg_rate = -1.0; - This->is_dropped = FALSE; -} - -static BOOL QualityControlRender_IsLate(struct strmbase_qc *This, REFERENCE_TIME jitter, - REFERENCE_TIME start, REFERENCE_TIME stop) -{ - REFERENCE_TIME max_lateness = 200000; - - TRACE("jitter %s, start %s, stop %s.\n", debugstr_time(jitter), - debugstr_time(start), debugstr_time(stop)); - - /* we can add a valid stop time */ - if (stop >= start) - max_lateness += stop; - else - max_lateness += start; - - /* if the jitter bigger than duration and lateness we are too late */ - if (start + jitter > max_lateness) { - WARN("buffer is too late %i > %i\n", (int)((start + jitter)/10000), (int)(max_lateness/10000)); - /* !!emergency!!, if we did not receive anything valid for more than a - * second, render it anyway so the user sees something */ - if (This->last_in_time < 0 || - start - This->last_in_time < 10000000) - return TRUE; - FIXME("A lot of buffers are being dropped.\n"); - FIXME("There may be a timestamping problem, or this computer is too slow.\n"); - } - This->last_in_time = start; - return FALSE; } static void QualityControlRender_DoQOS(struct strmbase_qc *priv) @@ -170,7 +140,7 @@ static void QualityControlRender_DoQOS(struct strmbase_qc *priv) if (priv->last_left >= 0) { - if (priv->is_dropped || priv->avg_rate < 0.0) + if (priv->avg_rate < 0.0) { priv->avg_rate = rate; } @@ -231,9 +201,7 @@ static void QualityControlRender_BeginRender(struct strmbase_qc *This, REFERENCE This->current_jitter = 0; } - /* FIXME: This isn't correct; we don't drop samples, nor should. */ - This->is_dropped = QualityControlRender_IsLate(This, This->current_jitter, start, stop); - TRACE("dropped %d, start %s, stop %s, jitter %s.\n", This->is_dropped, + TRACE("start %s, stop %s, jitter %s.\n", debugstr_time(start), debugstr_time(stop), debugstr_time(This->current_jitter)); } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 9df0437dd9a..c45e2a4513e 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -279,10 +279,9 @@ struct strmbase_qc IQualityControl *tonotify; /* Render stuff */ - REFERENCE_TIME last_in_time, last_left, avg_duration, avg_pt; + REFERENCE_TIME last_left, avg_duration, avg_pt; REFERENCE_TIME current_jitter, current_rstart, current_rstop, clockstart; double avg_rate; - BOOL is_dropped; }; struct strmbase_renderer

1 0