July 2023 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : spoolss: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: 229d078703ec7943c63fac08aabd435c7700a8b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/229d078703ec7943c63fac08aabd43… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 5 18:16:32 2023 +1000 spoolss: Remove DECLSPEC_HIDDEN usage. --- dlls/spoolss/spoolss.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/spoolss/spoolss.h b/dlls/spoolss/spoolss.h index b4a8853305e..213fb92460c 100644 --- a/dlls/spoolss/spoolss.h +++ b/dlls/spoolss/spoolss.h @@ -21,5 +21,5 @@ /* ################################ */ -BOOL backend_load_all(void) DECLSPEC_HIDDEN; -void backend_unload_all(void) DECLSPEC_HIDDEN; +BOOL backend_load_all(void); +void backend_unload_all(void);

1 0

Alistair Leslie-Hughes : amstream: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: 50fab83bb9164c0bbc6ba3d457e87c3a447c8736 URL: https://gitlab.winehq.org/wine/wine/-/commit/50fab83bb9164c0bbc6ba3d457e87c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 4 19:06:03 2023 +1000 amstream: Remove DECLSPEC_HIDDEN usage. --- dlls/amstream/amstream_private.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index 999081db754..a030d8847d5 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -33,10 +33,10 @@ #include "austream.h" #include "amstream.h" -HRESULT multimedia_stream_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; -HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; -HRESULT filter_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; -HRESULT ddraw_stream_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; -HRESULT audio_stream_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; +HRESULT multimedia_stream_create(IUnknown *outer, void **out); +HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj); +HRESULT filter_create(IUnknown *outer, void **out); +HRESULT ddraw_stream_create(IUnknown *outer, void **out); +HRESULT audio_stream_create(IUnknown *outer, void **out); #endif /* __AMSTREAM_PRIVATE_INCLUDED__ */

1 0

Alistair Leslie-Hughes : devenum: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: 8654e867be13033518361e607561518a67056f2c URL: https://gitlab.winehq.org/wine/wine/-/commit/8654e867be13033518361e60756151… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 4 19:06:03 2023 +1000 devenum: Remove DECLSPEC_HIDDEN usage. --- dlls/devenum/devenum_private.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index adc9b377d09..0fd8b7b80fd 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -47,11 +47,11 @@ struct moniker IPropertyBag IPropertyBag_iface; }; -HRESULT create_filter_data(VARIANT *var, REGFILTER2 *rgf) DECLSPEC_HIDDEN; -struct moniker *dmo_moniker_create(const GUID class, const GUID clsid) DECLSPEC_HIDDEN; -struct moniker *codec_moniker_create(const GUID *class, const WCHAR *name) DECLSPEC_HIDDEN; -struct moniker *filter_moniker_create(const GUID *class, const WCHAR *name) DECLSPEC_HIDDEN; -HRESULT enum_moniker_create(REFCLSID class, IEnumMoniker **enum_mon) DECLSPEC_HIDDEN; +HRESULT create_filter_data(VARIANT *var, REGFILTER2 *rgf); +struct moniker *dmo_moniker_create(const GUID class, const GUID clsid); +struct moniker *codec_moniker_create(const GUID *class, const WCHAR *name); +struct moniker *filter_moniker_create(const GUID *class, const WCHAR *name); +HRESULT enum_moniker_create(REFCLSID class, IEnumMoniker **enum_mon); -extern ICreateDevEnum devenum_factory DECLSPEC_HIDDEN; -extern IParseDisplayName devenum_parser DECLSPEC_HIDDEN; +extern ICreateDevEnum devenum_factory; +extern IParseDisplayName devenum_parser;

1 0

Alistair Leslie-Hughes : qasf: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: 3628852882eb6ceda006b3986ae88058be72544a URL: https://gitlab.winehq.org/wine/wine/-/commit/3628852882eb6ceda006b3986ae880… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 4 19:06:03 2023 +1000 qasf: Remove DECLSPEC_HIDDEN usage. --- dlls/qasf/qasf_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qasf/qasf_private.h b/dlls/qasf/qasf_private.h index c7e8e92e2ae..7b00ddf0c6b 100644 --- a/dlls/qasf/qasf_private.h +++ b/dlls/qasf/qasf_private.h @@ -29,7 +29,7 @@ #include "wine/debug.h" #include "wine/strmbase.h" -HRESULT asf_reader_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT dmo_wrapper_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT asf_reader_create(IUnknown *outer, IUnknown **out); +HRESULT dmo_wrapper_create(IUnknown *outer, IUnknown **out); #endif /* QASF_PRIVATE_H */

1 0

Alistair Leslie-Hughes : qcap: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: 31c7d1e4bd8738bceabd1abf10eec1bd84457fd1 URL: https://gitlab.winehq.org/wine/wine/-/commit/31c7d1e4bd8738bceabd1abf10eec1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 4 19:06:03 2023 +1000 qcap: Remove DECLSPEC_HIDDEN usage. --- dlls/qcap/qcap_private.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h index ae1571b0baf..8b213671775 100644 --- a/dlls/qcap/qcap_private.h +++ b/dlls/qcap/qcap_private.h @@ -31,13 +31,13 @@ #include "wine/debug.h" #include "wine/strmbase.h" -HRESULT audio_record_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT avi_compressor_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT avi_mux_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT capture_graph_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT file_writer_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT smart_tee_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT audio_record_create(IUnknown *outer, IUnknown **out); +HRESULT avi_compressor_create(IUnknown *outer, IUnknown **out); +HRESULT avi_mux_create(IUnknown *outer, IUnknown **out); +HRESULT capture_graph_create(IUnknown *outer, IUnknown **out); +HRESULT file_writer_create(IUnknown *outer, IUnknown **out); +HRESULT smart_tee_create(IUnknown *outer, IUnknown **out); +HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out); typedef UINT64 video_capture_device_t;

1 0

Alistair Leslie-Hughes : qdvd: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: a0f795e84047399d45306fe68145667995a787fa URL: https://gitlab.winehq.org/wine/wine/-/commit/a0f795e84047399d45306fe6814566… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 4 19:06:03 2023 +1000 qdvd: Remove DECLSPEC_HIDDEN usage. --- dlls/qdvd/qdvd_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qdvd/qdvd_private.h b/dlls/qdvd/qdvd_private.h index 48fced46f10..02b47006713 100644 --- a/dlls/qdvd/qdvd_private.h +++ b/dlls/qdvd/qdvd_private.h @@ -25,7 +25,7 @@ #include "dshow.h" #include "wine/debug.h" -HRESULT graph_builder_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT navigator_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT graph_builder_create(IUnknown *outer, IUnknown **out); +HRESULT navigator_create(IUnknown *outer, IUnknown **out); #endif /* QDVD_PRIVATE_H */

1 0

Alistair Leslie-Hughes : qedit: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: 0d9792a0ec9265141f8539410dfaa83b28d93a0e URL: https://gitlab.winehq.org/wine/wine/-/commit/0d9792a0ec9265141f8539410dfaa8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 4 19:06:03 2023 +1000 qedit: Remove DECLSPEC_HIDDEN usage. --- dlls/qedit/qedit_private.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/qedit/qedit_private.h b/dlls/qedit/qedit_private.h index 0c0655084d5..d3074ab2e2f 100644 --- a/dlls/qedit/qedit_private.h +++ b/dlls/qedit/qedit_private.h @@ -34,9 +34,9 @@ #include "qedit.h" #include "wine/strmbase.h" -HRESULT timeline_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT media_detector_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT null_renderer_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT sample_grabber_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT timeline_create(IUnknown *outer, IUnknown **out); +HRESULT media_detector_create(IUnknown *outer, IUnknown **out); +HRESULT null_renderer_create(IUnknown *outer, IUnknown **out); +HRESULT sample_grabber_create(IUnknown *outer, IUnknown **out); #endif /* __QEDIT_PRIVATE_INCLUDED__ */

1 0

Alistair Leslie-Hughes : quartz: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: ffd160890720591ef21efbb83d09f34a1803868d URL: https://gitlab.winehq.org/wine/wine/-/commit/ffd160890720591ef21efbb83d09f3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 4 19:06:03 2023 +1000 quartz: Remove DECLSPEC_HIDDEN usage. --- dlls/quartz/main.c | 4 +- dlls/quartz/quartz_private.h | 140 +++++++++++++++++++++---------------------- dlls/quartz/regsvr.c | 4 +- 3 files changed, 74 insertions(+), 74 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Return a hlsl_block from the "statement" rule.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: vkd3d Branch: master Commit: 23ff83e8a0cea596f7eec92b6aa50e9e881df5b8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/23ff83e8a0cea596f7eec92b6aa50… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 19:07:27 2022 -0600 vkd3d-shader/hlsl: Return a hlsl_block from the "statement" rule. As well as from the "statement_list" and "compound_statement" rules, which trivially pass through from "statement". --- libs/vkd3d-shader/hlsl.y | 63 ++++++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 82dd19eb..c8b7e255 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -487,9 +487,8 @@ static bool attribute_list_has_duplicates(const struct parse_attribute_list *att } static struct list *create_loop(struct hlsl_ctx *ctx, enum loop_type type, const struct parse_attribute_list *attributes, struct list *init, struct list *cond, - struct list *iter, struct list *body, const struct vkd3d_shader_location *loc) + struct list *iter, struct hlsl_block *body, const struct vkd3d_shader_location *loc) { - struct hlsl_block body_block; struct hlsl_ir_node *loop; unsigned int i; @@ -529,32 +528,27 @@ static struct list *create_loop(struct hlsl_ctx *ctx, enum loop_type type, const if (!append_conditional_break(ctx, cond)) goto oom; - hlsl_block_init(&body_block); - - if (type != LOOP_DO_WHILE) - list_move_tail(&body_block.instrs, cond); - - list_move_tail(&body_block.instrs, body); - if (iter) - list_move_tail(&body_block.instrs, iter); + list_move_tail(&body->instrs, iter); if (type == LOOP_DO_WHILE) - list_move_tail(&body_block.instrs, cond); + list_move_tail(&body->instrs, cond); + else + list_move_head(&body->instrs, cond); - if (!(loop = hlsl_new_loop(ctx, &body_block, loc))) + if (!(loop = hlsl_new_loop(ctx, body, loc))) goto oom; list_add_tail(init, &loop->entry); vkd3d_free(cond); - vkd3d_free(body); + destroy_block(body); return init; oom: destroy_instr_list(init); destroy_instr_list(cond); destroy_instr_list(iter); - destroy_instr_list(body); + destroy_block(body); return NULL; } @@ -4433,6 +4427,7 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type char *name; DWORD modifiers; struct hlsl_ir_node *instr; + struct hlsl_block *block; struct list *list; struct parse_fields fields; struct parse_function function; @@ -4565,7 +4560,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <list> bitand_expr %type <list> bitor_expr %type <list> bitxor_expr -%type <list> compound_statement %type <list> conditional_expr %type <list> declaration %type <list> declaration_statement @@ -4584,8 +4578,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <list> relational_expr %type <list> selection_statement %type <list> shift_expr -%type <list> statement -%type <list> statement_list %type <list> struct_declaration_without_vars %type <list> type_specs %type <list> unary_expr @@ -4606,6 +4598,10 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <attr_list> attribute_list %type <attr_list> attribute_list_optional +%type <block> compound_statement +%type <block> statement +%type <block> statement_list + %type <boolval> boolean %type <buffer_type> buffer_type @@ -4913,15 +4909,15 @@ func_declaration: "Function \"%s\" is already defined.", decl->func->name); hlsl_note(ctx, &decl->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously defined here.", decl->func->name); - hlsl_free_instr_list($2); + destroy_block($2); } else { size_t i; decl->has_body = true; - list_move_tail(&decl->body.instrs, $2); - vkd3d_free($2); + hlsl_block_add_block(&decl->body, $2); + destroy_block($2); /* Semantics are taken from whichever definition has a body. * We can't just replace the hlsl_ir_var pointers, though: if @@ -5098,7 +5094,7 @@ func_prototype: compound_statement: '{' '}' { - if (!($$ = make_empty_list(ctx))) + if (!($$ = make_empty_block(ctx))) YYABORT; } | '{' scope_start statement_list '}' @@ -5913,17 +5909,32 @@ statement_list: | statement_list statement { $$ = $1; - list_move_tail($$, $2); - vkd3d_free($2); + hlsl_block_add_block($$, $2); + destroy_block($2); } statement: declaration_statement + { + $$ = list_to_block($1); + } | expr_statement + { + $$ = list_to_block($1); + } | compound_statement | jump_statement + { + $$ = list_to_block($1); + } | selection_statement + { + $$ = list_to_block($1); + } | loop_statement + { + $$ = list_to_block($1); + } jump_statement: KW_RETURN expr ';' @@ -5985,13 +5996,13 @@ selection_statement: if_body: statement { - $$.then_block = list_to_block($1); + $$.then_block = $1; $$.else_block = NULL; } | statement KW_ELSE statement { - $$.then_block = list_to_block($1); - $$.else_block = list_to_block($3); + $$.then_block = $1; + $$.else_block = $3; } loop_statement:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Return a hlsl_block from the "loop_statement" rule.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: vkd3d Branch: master Commit: 79dd9544b7233ef5704f01db3c73bea77faebd9f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/79dd9544b7233ef5704f01db3c73b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 19:10:38 2022 -0600 vkd3d-shader/hlsl: Return a hlsl_block from the "loop_statement" rule. --- libs/vkd3d-shader/hlsl.y | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c8b7e255..a2f2f373 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -486,7 +486,8 @@ static bool attribute_list_has_duplicates(const struct parse_attribute_list *att return false; } -static struct list *create_loop(struct hlsl_ctx *ctx, enum loop_type type, const struct parse_attribute_list *attributes, struct list *init, struct list *cond, +static struct hlsl_block *create_loop(struct hlsl_ctx *ctx, enum loop_type type, + const struct parse_attribute_list *attributes, struct list *init, struct list *cond, struct list *iter, struct hlsl_block *body, const struct vkd3d_shader_location *loc) { struct hlsl_ir_node *loop; @@ -542,7 +543,7 @@ static struct list *create_loop(struct hlsl_ctx *ctx, enum loop_type type, const vkd3d_free(cond); destroy_block(body); - return init; + return list_to_block(init); oom: destroy_instr_list(init); @@ -4571,7 +4572,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <list> jump_statement %type <list> logicand_expr %type <list> logicor_expr -%type <list> loop_statement %type <list> mul_expr %type <list> postfix_expr %type <list> primary_expr @@ -4599,6 +4599,7 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <attr_list> attribute_list_optional %type <block> compound_statement +%type <block> loop_statement %type <block> statement %type <block> statement_list @@ -5932,9 +5933,6 @@ statement: $$ = list_to_block($1); } | loop_statement - { - $$ = list_to_block($1); - } jump_statement: KW_RETURN expr ';'

1 0