- Wine-Commits - list.winehq.org

Alexandre Julliard : msvcrt: Unify __CxxQueryExceptionSize implementations.
by Alexandre Julliard May 17, 2024

May 17, 2024

Module: wine Branch: master Commit: e5e52a9a9fbc1c552613a8144a608d83489b67bf URL: https://gitlab.winehq.org/wine/wine/-/commit/e5e52a9a9fbc1c552613a8144a608d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:32:12 2024 +0200 msvcrt: Unify __CxxQueryExceptionSize implementations. --- dlls/msvcrt/except.c | 8 ++++++++ dlls/msvcrt/except_arm.c | 9 --------- dlls/msvcrt/except_arm64.c | 9 --------- dlls/msvcrt/except_arm64ec.c | 9 --------- dlls/msvcrt/except_i386.c | 9 --------- dlls/msvcrt/except_x86_64.c | 9 --------- 6 files changed, 8 insertions(+), 45 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index ba8a6c6b216..c224c472c55 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -287,6 +287,14 @@ int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) return _XcptFilter(ex, ptr); } +/********************************************************************* + * __CxxQueryExceptionSize (MSVCRT.@) + */ +unsigned int CDECL __CxxQueryExceptionSize(void) +{ + return sizeof(cxx_exception_type); +} + /********************************************************************* * _abnormal_termination (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_arm.c b/dlls/msvcrt/except_arm.c index 21173db4925..84a2f358213 100644 --- a/dlls/msvcrt/except_arm.c +++ b/dlls/msvcrt/except_arm.c @@ -85,15 +85,6 @@ BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) } -/********************************************************************* - * __CxxQueryExceptionSize (MSVCRT.@) - */ -unsigned int CDECL __CxxQueryExceptionSize(void) -{ - return sizeof(cxx_exception_type); -} - - /********************************************************************* * _fpieee_flt (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_arm64.c b/dlls/msvcrt/except_arm64.c index 9a7a91a3b2e..fc1af2e2689 100644 --- a/dlls/msvcrt/except_arm64.c +++ b/dlls/msvcrt/except_arm64.c @@ -86,15 +86,6 @@ BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) } -/********************************************************************* - * __CxxQueryExceptionSize (MSVCRT.@) - */ -unsigned int CDECL __CxxQueryExceptionSize(void) -{ - return sizeof(cxx_exception_type); -} - - /******************************************************************* * _setjmp (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_arm64ec.c b/dlls/msvcrt/except_arm64ec.c index f90e3797d05..826884f4df4 100644 --- a/dlls/msvcrt/except_arm64ec.c +++ b/dlls/msvcrt/except_arm64ec.c @@ -85,15 +85,6 @@ BOOL CDECL __CxxDetectRethrow( PEXCEPTION_POINTERS ptrs ) } -/********************************************************************* - * __CxxQueryExceptionSize (MSVCRT.@) - */ -unsigned int CDECL __CxxQueryExceptionSize(void) -{ - return sizeof(cxx_exception_type); -} - - /********************************************************************* * _fpieee_flt (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 98956f2ec48..6ce65fc7122 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -712,15 +712,6 @@ BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) return (msvcrt_get_thread_data()->exc_record == rec); } -/********************************************************************* - * __CxxQueryExceptionSize (MSVCRT.@) - */ -unsigned int CDECL __CxxQueryExceptionSize(void) -{ - return sizeof(cxx_exception_type); -} - - /********************************************************************* * _EH_prolog (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index b4b49ba9373..a2537c9a549 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -679,15 +679,6 @@ BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) } -/********************************************************************* - * __CxxQueryExceptionSize (MSVCRT.@) - */ -unsigned int CDECL __CxxQueryExceptionSize(void) -{ - return sizeof(cxx_exception_type); -} - - /******************************************************************* * longjmp (MSVCRT.@) */

1 0

Alexandre Julliard : msvcrt: Resync cxx.h with msvcp90.
by Alexandre Julliard May 17, 2024

May 17, 2024

Module: wine Branch: master Commit: 9680ef7ea99f0aabe9a8fd8a41d41522bafc8e3e URL: https://gitlab.winehq.org/wine/wine/-/commit/9680ef7ea99f0aabe9a8fd8a41d415… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 09:36:19 2024 +0200 msvcrt: Resync cxx.h with msvcp90. --- dlls/concrt140/concrt140.c | 2 +- dlls/concrt140/details.h | 2 +- dlls/msvcp90/cxx.h | 25 +++-- dlls/msvcp90/exception.c | 28 +++--- dlls/msvcrt/concurrency.c | 3 +- dlls/msvcrt/cpp.c | 12 +-- dlls/msvcrt/cppexcept.h | 188 ++++-------------------------------- dlls/msvcrt/cxx.h | 226 ++++++++++++++++++++++++++++++++++++-------- dlls/msvcrt/except_i386.c | 7 +- dlls/msvcrt/exception_ptr.c | 2 +- dlls/msvcrt/handler4.c | 2 - 11 files changed, 239 insertions(+), 258 deletions(-)

1 0

Nikolay Sivov : vkd3d-shader/fx: Use correct type name when reusing types.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: vkd3d Branch: master Commit: 9c83caeda652d7968c10e54cca2ae3b7fc18f384 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9c83caeda652d7968c10e54cca2ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 21 20:11:05 2024 +0200 vkd3d-shader/fx: Use correct type name when reusing types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 9ad33f25..57b4ac24 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -129,9 +129,11 @@ static void write_pass(struct hlsl_ir_var *var, struct fx_write_context *fx) } static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_context *fx); +static const char * get_fx_4_type_name(const struct hlsl_type *type); static uint32_t write_type(const struct hlsl_type *type, struct fx_write_context *fx) { + const struct hlsl_type *element_type; struct type_entry *type_entry; unsigned int elements_count; const char *name; @@ -140,15 +142,17 @@ static uint32_t write_type(const struct hlsl_type *type, struct fx_write_context if (type->class == HLSL_CLASS_ARRAY) { - name = hlsl_get_multiarray_element_type(type)->name; elements_count = hlsl_get_multiarray_size(type); + element_type = hlsl_get_multiarray_element_type(type); } else { - name = type->name; elements_count = 0; + element_type = type; } + name = get_fx_4_type_name(element_type); + LIST_FOR_EACH_ENTRY(type_entry, &fx->types, struct type_entry, entry) { if (strcmp(type_entry->name, name))

1 0

Nikolay Sivov : vkd3d-shader/fx: Implement writing shared buffers.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: vkd3d Branch: master Commit: a913ac78445e3e700e573f085b44e2aaba6d1bb4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a913ac78445e3e700e573f085b44e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 21 19:06:55 2024 +0200 vkd3d-shader/fx: Implement writing shared buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 70 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 6fb2e8a0..9ad33f25 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -82,7 +82,9 @@ struct fx_write_context uint32_t technique_count; uint32_t group_count; uint32_t buffer_count; + uint32_t shared_buffer_count; uint32_t numeric_variable_count; + uint32_t shared_numeric_variable_count; uint32_t object_variable_count; uint32_t shared_object_count; uint32_t shader_count; @@ -969,11 +971,11 @@ static const struct fx_write_context_ops fx_4_ops = .are_child_effects_supported = true, }; -static void write_fx_4_numeric_variable(struct hlsl_ir_var *var, struct fx_write_context *fx) +static void write_fx_4_numeric_variable(struct hlsl_ir_var *var, bool shared, struct fx_write_context *fx) { struct vkd3d_bytecode_buffer *buffer = &fx->structured; + uint32_t name_offset, type_offset, value_offset; uint32_t semantic_offset, flags = 0; - uint32_t name_offset, type_offset; enum fx_4_numeric_variable_flags { HAS_EXPLICIT_BIND_POINT = 0x4, @@ -993,12 +995,24 @@ static void write_fx_4_numeric_variable(struct hlsl_ir_var *var, struct fx_write semantic_offset = put_u32(buffer, semantic_offset); /* Semantic */ put_u32(buffer, var->buffer_offset); /* Offset in the constant buffer */ - put_u32(buffer, 0); /* FIXME: default value offset */ + value_offset = put_u32(buffer, 0); /* Default value offset */ put_u32(buffer, flags); /* Flags */ - put_u32(buffer, 0); /* Annotations count */ - if (has_annotations(var)) - hlsl_fixme(ctx, &ctx->location, "Writing annotations for numeric variables is not implemented."); + if (shared) + { + fx->shared_numeric_variable_count++; + } + else + { + /* FIXME: write default value */ + set_u32(buffer, value_offset, 0); + + put_u32(buffer, 0); /* Annotations count */ + if (has_annotations(var)) + hlsl_fixme(ctx, &ctx->location, "Writing annotations for numeric variables is not implemented."); + + fx->numeric_variable_count++; + } } struct rhs_named_value @@ -1395,6 +1409,9 @@ static void write_fx_4_buffer(struct hlsl_buffer *b, struct fx_write_context *fx struct hlsl_ctx *ctx = fx->ctx; struct hlsl_ir_var *var; uint32_t count_offset; + bool shared; + + shared = fx->child_effect && b->modifiers & HLSL_STORAGE_SHARED; if (b->reservation.reg_type) bind_point = b->reservation.reg_index; @@ -1411,9 +1428,17 @@ static void write_fx_4_buffer(struct hlsl_buffer *b, struct fx_write_context *fx count_offset = put_u32(buffer, 0); put_u32(buffer, bind_point); /* Bind point */ - put_u32(buffer, 0); /* Annotations count */ - if (b->annotations) - hlsl_fixme(ctx, &b->loc, "Writing annotations for buffers is not implemented."); + if (shared) + { + ++fx->shared_buffer_count; + } + else + { + put_u32(buffer, 0); /* Annotations count */ + if (b->annotations) + hlsl_fixme(ctx, &b->loc, "Writing annotations for buffers is not implemented."); + ++fx->buffer_count; + } count = 0; size = 0; @@ -1422,18 +1447,16 @@ static void write_fx_4_buffer(struct hlsl_buffer *b, struct fx_write_context *fx if (var->buffer != b) continue; - write_fx_4_numeric_variable(var, fx); + write_fx_4_numeric_variable(var, shared, fx); size += get_fx_4_type_size(var->data_type); ++count; } set_u32(buffer, count_offset, count); set_u32(buffer, size_offset, align(size, 16)); - - fx->numeric_variable_count += count; } -static void write_buffers(struct fx_write_context *fx) +static void write_buffers(struct fx_write_context *fx, bool shared) { struct hlsl_buffer *buffer; @@ -1443,9 +1466,10 @@ static void write_buffers(struct fx_write_context *fx) continue; if (!strcmp(buffer->name, "$Params")) continue; + if (fx->child_effect && (shared != !!(buffer->modifiers & HLSL_STORAGE_SHARED))) + continue; write_fx_4_buffer(buffer, fx); - ++fx->buffer_count; } } @@ -1505,9 +1529,9 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&fx.unstructured, 0); /* Empty string placeholder. */ - write_buffers(&fx); + write_buffers(&fx, false); write_objects(&fx, false); - /* TODO: shared buffers */ + write_buffers(&fx, true); write_objects(&fx, true); write_techniques(ctx->globals, &fx); @@ -1516,9 +1540,9 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, fx.buffer_count); /* Buffer count. */ put_u32(&buffer, fx.numeric_variable_count); /* Numeric variable count. */ put_u32(&buffer, fx.object_variable_count); /* Object variable count. */ - put_u32(&buffer, 0); /* Pool buffer count. */ - put_u32(&buffer, 0); /* Pool variable count. */ - put_u32(&buffer, fx.shared_object_count); /* Shared object count. */ + put_u32(&buffer, fx.shared_buffer_count); + put_u32(&buffer, fx.shared_numeric_variable_count); + put_u32(&buffer, fx.shared_object_count); put_u32(&buffer, fx.technique_count); size_offset = put_u32(&buffer, 0); /* Unstructured size. */ put_u32(&buffer, 0); /* String count. */ @@ -1564,7 +1588,7 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&fx.unstructured, 0); /* Empty string placeholder. */ - write_buffers(&fx); + write_buffers(&fx, false); write_objects(&fx, false); /* TODO: interface variables */ @@ -1574,9 +1598,9 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, fx.buffer_count); /* Buffer count. */ put_u32(&buffer, fx.numeric_variable_count); /* Numeric variable count. */ put_u32(&buffer, fx.object_variable_count); /* Object variable count. */ - put_u32(&buffer, 0); /* Pool buffer count. */ - put_u32(&buffer, 0); /* Pool variable count. */ - put_u32(&buffer, 0); /* Pool object count. */ + put_u32(&buffer, fx.shared_buffer_count); + put_u32(&buffer, fx.shared_numeric_variable_count); + put_u32(&buffer, fx.shared_object_count); put_u32(&buffer, fx.technique_count); size_offset = put_u32(&buffer, 0); /* Unstructured size. */ put_u32(&buffer, 0); /* String count. */

1 0

Esme Povirk : gdiplus: Reorder filled arrow cap points to match native.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: 0a324152e75618041d55db2bf4a58daae7e1f50b URL: https://gitlab.winehq.org/wine/wine/-/commit/0a324152e75618041d55db2bf4a58d… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue May 7 11:31:01 2024 -0500 gdiplus: Reorder filled arrow cap points to match native. --- dlls/gdiplus/customlinecap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index b6dcf26fdd1..d493214904c 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -299,11 +299,11 @@ static void arrowcap_update_path(GpAdjustableArrowCap *cap) { memcpy(cap->cap.pathdata.Types, types_filled, sizeof(types_filled)); cap->cap.pathdata.Count = 4; - points[0].X = -cap->width / 2.0; + points[0].X = cap->width / 2.0; points[0].Y = -cap->height; points[1].X = 0.0; points[1].Y = 0.0; - points[2].X = cap->width / 2.0; + points[2].X = -cap->width / 2.0; points[2].Y = -cap->height; points[3].X = 0.0; points[3].Y = -cap->height + cap->middle_inset;

1 0

Esme Povirk : gdiplus: Fix signs on custom line cap rotation in add_anchor.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: 0400ed7ec7a8b180bf3eef01be54b8a3dc68cbd1 URL: https://gitlab.winehq.org/wine/wine/-/commit/0400ed7ec7a8b180bf3eef01be54b8… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon May 6 15:22:50 2024 -0500 gdiplus: Fix signs on custom line cap rotation in add_anchor. --- dlls/gdiplus/graphicspath.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 94fae70ad88..44077950a87 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2260,8 +2260,8 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, TRACE("GpCustomLineCap fill: %d basecap: %d inset: %f join: %d scale: %f pen_width:%f\n", custom->fill, custom->basecap, custom->inset, custom->join, custom->scale, pen_width); - sina = -pen_width * custom->scale * segment_dx / segment_length; - cosa = pen_width * custom->scale * segment_dy / segment_length; + sina = pen_width * custom->scale * segment_dx / segment_length; + cosa = -pen_width * custom->scale * segment_dy / segment_length; /* Coordination where cap needs to be drawn */ posx = endpoint->X; @@ -2277,8 +2277,8 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, for (INT i = 0; i < custom->pathdata.Count; i++) { - tmp_points[i].X = posx + custom->pathdata.Points[i].X * cosa + custom->pathdata.Points[i].Y * sina; - tmp_points[i].Y = posy + custom->pathdata.Points[i].X * sina - custom->pathdata.Points[i].Y * cosa; + tmp_points[i].X = posx + custom->pathdata.Points[i].X * cosa - custom->pathdata.Points[i].Y * sina; + tmp_points[i].Y = posy + custom->pathdata.Points[i].X * sina + custom->pathdata.Points[i].Y * cosa; } if ((custom->pathdata.Types[custom->pathdata.Count - 1] & PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath) widen_closed_figure(tmp_points, 0, custom->pathdata.Count - 1, pen, pen_width, last_point); @@ -2291,8 +2291,8 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, for (INT i = 0; i < custom->pathdata.Count; i++) { /* rotation of CustomCap according to line */ - perp_dx = custom->pathdata.Points[i].X * cosa + custom->pathdata.Points[i].Y * sina; - perp_dy = custom->pathdata.Points[i].X * sina - custom->pathdata.Points[i].Y * cosa; + perp_dx = custom->pathdata.Points[i].X * cosa - custom->pathdata.Points[i].Y * sina; + perp_dy = custom->pathdata.Points[i].X * sina + custom->pathdata.Points[i].Y * cosa; *last_point = add_path_list_node(*last_point, posx + perp_dx, posy + perp_dy, custom->pathdata.Types[i]); }

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmllocation.c.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: d2c11cdd945a438ccaf86658a6fb62a0a419414f URL: https://gitlab.winehq.org/wine/wine/-/commit/d2c11cdd945a438ccaf86658a6fb62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 16 15:50:51 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmllocation.c. --- dlls/mshtml/htmllocation.c | 49 +--------------------------------------------- 1 file changed, 1 insertion(+), 48 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 92701cb42bc..1a5972b50ac 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -59,54 +59,7 @@ static inline HTMLLocation *impl_from_IHTMLLocation(IHTMLLocation *iface) return CONTAINING_RECORD(iface, HTMLLocation, IHTMLLocation_iface); } -static HRESULT WINAPI HTMLLocation_QueryInterface(IHTMLLocation *iface, REFIID riid, void **ppv) -{ - HTMLLocation *This = impl_from_IHTMLLocation(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLLocation_AddRef(IHTMLLocation *iface) -{ - HTMLLocation *This = impl_from_IHTMLLocation(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLLocation_Release(IHTMLLocation *iface) -{ - HTMLLocation *This = impl_from_IHTMLLocation(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLLocation_GetTypeInfoCount(IHTMLLocation *iface, UINT *pctinfo) -{ - HTMLLocation *This = impl_from_IHTMLLocation(iface); - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLLocation_GetTypeInfo(IHTMLLocation *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLLocation *This = impl_from_IHTMLLocation(iface); - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLLocation_GetIDsOfNames(IHTMLLocation *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLLocation *This = impl_from_IHTMLLocation(iface); - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLLocation_Invoke(IHTMLLocation *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLLocation *This = impl_from_IHTMLLocation(iface); - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLLocation, IHTMLLocation, impl_from_IHTMLLocation(iface)->dispex) static HRESULT WINAPI HTMLLocation_put_href(IHTMLLocation *iface, BSTR v) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlhead.c.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: 1e2df994ef24ebef0bb79d52fd55346e46a57185 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e2df994ef24ebef0bb79d52fd5534… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 16 15:40:04 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlhead.c. --- dlls/mshtml/htmlhead.c | 229 ++----------------------------------------------- 1 file changed, 8 insertions(+), 221 deletions(-)

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlimg.c.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: 2ffe440b3453a93506ef9b25cd2516d35f3762d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ffe440b3453a93506ef9b25cd2516… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 16 15:42:31 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlimg.c. --- dlls/mshtml/htmlimg.c | 106 ++------------------------------------------------ 1 file changed, 4 insertions(+), 102 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index f037578e5d4..84eef1ad5ea 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -46,58 +46,8 @@ static inline HTMLImg *impl_from_IHTMLImgElement(IHTMLImgElement *iface) return CONTAINING_RECORD(iface, HTMLImg, IHTMLImgElement_iface); } -static HRESULT WINAPI HTMLImgElement_QueryInterface(IHTMLImgElement *iface, REFIID riid, void **ppv) -{ - HTMLImg *This = impl_from_IHTMLImgElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLImgElement_AddRef(IHTMLImgElement *iface) -{ - HTMLImg *This = impl_from_IHTMLImgElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLImgElement_Release(IHTMLImgElement *iface) -{ - HTMLImg *This = impl_from_IHTMLImgElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLImgElement_GetTypeInfoCount(IHTMLImgElement *iface, UINT *pctinfo) -{ - HTMLImg *This = impl_from_IHTMLImgElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLImgElement_GetTypeInfo(IHTMLImgElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLImg *This = impl_from_IHTMLImgElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLImgElement_GetIDsOfNames(IHTMLImgElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLImg *This = impl_from_IHTMLImgElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLImgElement_Invoke(IHTMLImgElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLImg *This = impl_from_IHTMLImgElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLImgElement, IHTMLImgElement, + impl_from_IHTMLImgElement(iface)->element.node.event_target.dispex) static HRESULT WINAPI HTMLImgElement_put_isMap(IHTMLImgElement *iface, VARIANT_BOOL v) { @@ -767,56 +717,8 @@ static inline HTMLImageElementFactory *impl_from_IHTMLImageElementFactory(IHTMLI return CONTAINING_RECORD(iface, HTMLImageElementFactory, IHTMLImageElementFactory_iface); } -static HRESULT WINAPI HTMLImageElementFactory_QueryInterface(IHTMLImageElementFactory *iface, - REFIID riid, void **ppv) -{ - HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLImageElementFactory_AddRef(IHTMLImageElementFactory *iface) -{ - HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLImageElementFactory_Release(IHTMLImageElementFactory *iface) -{ - HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLImageElementFactory_GetTypeInfoCount(IHTMLImageElementFactory *iface, - UINT *pctinfo) -{ - HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLImageElementFactory_GetTypeInfo(IHTMLImageElementFactory *iface, - UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLImageElementFactory_GetIDsOfNames(IHTMLImageElementFactory *iface, - REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, - DISPID *rgDispId) -{ - HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLImageElementFactory_Invoke(IHTMLImageElementFactory *iface, - DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, - DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, - UINT *puArgErr) -{ - HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLImageElementFactory, IHTMLImageElementFactory, + impl_from_IHTMLImageElementFactory(iface)->dispex) static LONG var_to_size(const VARIANT *v) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmllink.c.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: bb157e487e0fd6b3e4549a75f41de6369b1e1b04 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb157e487e0fd6b3e4549a75f41de6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 16 15:49:19 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmllink.c. --- dlls/mshtml/htmllink.c | 59 ++------------------------------------------------ 1 file changed, 2 insertions(+), 57 deletions(-) diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index f936c9dcfe3..805ec031227 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -44,63 +44,8 @@ static inline HTMLLinkElement *impl_from_IHTMLLinkElement(IHTMLLinkElement *ifac return CONTAINING_RECORD(iface, HTMLLinkElement, IHTMLLinkElement_iface); } -static HRESULT WINAPI HTMLLinkElement_QueryInterface(IHTMLLinkElement *iface, - REFIID riid, void **ppv) -{ - HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLLinkElement_AddRef(IHTMLLinkElement *iface) -{ - HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLLinkElement_Release(IHTMLLinkElement *iface) -{ - HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLLinkElement_GetTypeInfoCount(IHTMLLinkElement *iface, UINT *pctinfo) -{ - HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLLinkElement_GetTypeInfo(IHTMLLinkElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLLinkElement_GetIDsOfNames(IHTMLLinkElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLLinkElement_Invoke(IHTMLLinkElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLLinkElement, IHTMLLinkElement, + impl_from_IHTMLLinkElement(iface)->element.node.event_target.dispex) static HRESULT WINAPI HTMLLinkElement_put_href(IHTMLLinkElement *iface, BSTR v) {

1 0