winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
July 2023
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
865 discussions
Start a n
N
ew thread
Alistair Leslie-Hughes : oledb32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard
05 Jul '23
05 Jul '23
Module: wine Branch: master Commit: 940829a6efd285da852ebb1586331c91485f6336 URL:
https://gitlab.winehq.org/wine/wine/-/commit/940829a6efd285da852ebb1586331c…
Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 30 20:10:47 2023 +1000 oledb32: Remove DECLSPEC_HIDDEN usage. --- dlls/oledb32/oledb_private.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index 773b646f08e..3bc16f73f52 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.h @@ -17,13 +17,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT create_oledb_convert(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; -HRESULT create_data_init(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; -HRESULT create_error_info(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; -HRESULT create_oledb_rowpos(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; -HRESULT create_dslocator(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; +HRESULT create_oledb_convert(IUnknown *outer, void **obj); +HRESULT create_data_init(IUnknown *outer, void **obj); +HRESULT create_error_info(IUnknown *outer, void **obj); +HRESULT create_oledb_rowpos(IUnknown *outer, void **obj); +HRESULT create_dslocator(IUnknown *outer, void **obj); HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID riid, - IUnknown **datasource) DECLSPEC_HIDDEN; + IUnknown **datasource); extern HINSTANCE instance;
1
0
0
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
0
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
0
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
0
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
0
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
0
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
0
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
0
0
Zebediah Figura : vkd3d-shader/hlsl: Free the "iter" block pointer on success in create_loop().
by Alexandre Julliard
05 Jul '23
05 Jul '23
Module: vkd3d Branch: master Commit: 6e303af5192e61c8ca100dd81828a812487e759b URL:
https://gitlab.winehq.org/wine/vkd3d/-/commit/6e303af5192e61c8ca100dd81828a…
Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 29 18:49:54 2023 -0500 vkd3d-shader/hlsl: Free the "iter" block pointer on success in create_loop(). Spotted by Giovanni Mascellani. --- libs/vkd3d-shader/hlsl.y | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a888ec76..42fa2129 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -548,6 +548,7 @@ static struct hlsl_block *create_loop(struct hlsl_ctx *ctx, enum loop_type type, destroy_block(cond); destroy_block(body); + destroy_block(iter); return init; oom:
1
0
0
0
Zebediah Figura : vkd3d-shader/hlsl: Return a hlsl_block from the "expr_statement" and "expr" rules.
by Alexandre Julliard
05 Jul '23
05 Jul '23
Module: vkd3d Branch: master Commit: b0ac77b44d4f49c7ebfafa0b346eeb0deb6e0156 URL:
https://gitlab.winehq.org/wine/vkd3d/-/commit/b0ac77b44d4f49c7ebfafa0b346ee…
Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 19:51:02 2022 -0600 vkd3d-shader/hlsl: Return a hlsl_block from the "expr_statement" and "expr" rules. --- libs/vkd3d-shader/hlsl.y | 83 +++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 44 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 00179664..a888ec76 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -442,19 +442,19 @@ static DWORD add_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, DWORD mod, return modifiers | mod; } -static bool append_conditional_break(struct hlsl_ctx *ctx, struct list *cond_list) +static bool append_conditional_break(struct hlsl_ctx *ctx, struct hlsl_block *cond_block) { struct hlsl_ir_node *condition, *not, *iff, *jump; struct hlsl_block then_block; /* E.g. "for (i = 0; ; ++i)". */ - if (list_empty(cond_list)) + if (list_empty(&cond_block->instrs)) return true; - condition = node_from_list(cond_list); + condition = node_from_block(cond_block); if (!(not = hlsl_new_unary_expr(ctx, HLSL_OP1_LOGIC_NOT, condition, &condition->loc))) return false; - list_add_tail(cond_list, ¬->entry); + hlsl_block_add_instr(cond_block, not); hlsl_block_init(&then_block); @@ -464,7 +464,7 @@ static bool append_conditional_break(struct hlsl_ctx *ctx, struct list *cond_lis if (!(iff = hlsl_new_if(ctx, not, &then_block, NULL, &condition->loc))) return false; - list_add_tail(cond_list, &iff->entry); + hlsl_block_add_instr(cond_block, iff); return true; } @@ -492,8 +492,8 @@ static bool attribute_list_has_duplicates(const struct parse_attribute_list *att } 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) + const struct parse_attribute_list *attributes, struct hlsl_block *init, struct hlsl_block *cond, + struct hlsl_block *iter, struct hlsl_block *body, const struct vkd3d_shader_location *loc) { struct hlsl_ir_node *loop; unsigned int i; @@ -528,32 +528,32 @@ static struct hlsl_block *create_loop(struct hlsl_ctx *ctx, enum loop_type type, } } - if (!init && !(init = make_empty_list(ctx))) + if (!init && !(init = make_empty_block(ctx))) goto oom; if (!append_conditional_break(ctx, cond)) goto oom; if (iter) - list_move_tail(&body->instrs, iter); + hlsl_block_add_block(body, iter); if (type == LOOP_DO_WHILE) - list_move_tail(&body->instrs, cond); + list_move_tail(&body->instrs, &cond->instrs); else - list_move_head(&body->instrs, cond); + list_move_head(&body->instrs, &cond->instrs); if (!(loop = hlsl_new_loop(ctx, body, loc))) goto oom; - list_add_tail(init, &loop->entry); + hlsl_block_add_instr(init, loop); - vkd3d_free(cond); + destroy_block(cond); destroy_block(body); - return list_to_block(init); + return init; oom: - destroy_instr_list(init); - destroy_instr_list(cond); - destroy_instr_list(iter); + destroy_block(init); + destroy_block(cond); + destroy_block(iter); destroy_block(body); return NULL; } @@ -4570,9 +4570,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <list> declaration %type <list> declaration_statement %type <list> equality_expr -%type <list> expr -%type <list> expr_optional -%type <list> expr_statement %type <list> initializer_expr %type <list> logicand_expr %type <list> logicor_expr @@ -4602,6 +4599,9 @@ 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> expr +%type <block> expr_optional +%type <block> expr_statement %type <block> jump_statement %type <block> loop_statement %type <block> selection_statement @@ -5639,7 +5639,7 @@ state: any_identifier '=' expr ';' { vkd3d_free($1); - hlsl_free_instr_list($3); + destroy_block($3); } state_block_start: @@ -5705,17 +5705,12 @@ arrays: } | '[' expr ']' arrays { - struct hlsl_block block; uint32_t *new_array; unsigned int size; - hlsl_block_init(&block); - list_move_tail(&block.instrs, $2); - - size = evaluate_static_expression_as_uint(ctx, &block, &@2); + size = evaluate_static_expression_as_uint(ctx, $2, &@2); - hlsl_block_cleanup(&block); - vkd3d_free($2); + destroy_block($2); $$ = $4; @@ -5925,9 +5920,6 @@ statement: $$ = list_to_block($1); } | expr_statement - { - $$ = list_to_block($1); - } | compound_statement | jump_statement | selection_statement @@ -5936,7 +5928,7 @@ statement: jump_statement: KW_RETURN expr ';' { - $$ = list_to_block($2); + $$ = $2; if (!add_return(ctx, $$, node_from_block($$), &@1)) YYABORT; } @@ -5966,7 +5958,7 @@ jump_statement: selection_statement: KW_IF '(' expr ')' if_body { - struct hlsl_ir_node *condition = node_from_list($3); + struct hlsl_ir_node *condition = node_from_block($3); struct hlsl_ir_node *instr; if (!(instr = hlsl_new_if(ctx, condition, $5.then_block, $5.else_block, &@1))) @@ -5986,7 +5978,7 @@ selection_statement: "if condition type %s is not scalar.", string->buffer); hlsl_release_string_buffer(ctx, string); } - $$ = list_to_block($3); + $$ = $3; hlsl_block_add_instr($$, instr); } @@ -6018,14 +6010,14 @@ loop_statement: } | attribute_list_optional KW_FOR '(' scope_start declaration expr_statement expr_optional ')' statement { - $$ = create_loop(ctx, LOOP_FOR, &$1, $5, $6, $7, $9, &@2); + $$ = create_loop(ctx, LOOP_FOR, &$1, list_to_block($5), $6, $7, $9, &@2); hlsl_pop_scope(ctx); } expr_optional: %empty { - if (!($$ = make_empty_list(ctx))) + if (!($$ = make_empty_block(ctx))) YYABORT; } | expr @@ -6095,7 +6087,7 @@ primary_expr: } | '(' expr ')' { - $$ = $2; + $$ = block_to_list($2); } | var_identifier '(' func_arguments ')' { @@ -6189,10 +6181,10 @@ postfix_expr: } | postfix_expr '[' expr ']' { - struct hlsl_ir_node *array = node_from_list($1), *index = node_from_list($3); + struct hlsl_ir_node *array = node_from_list($1), *index = node_from_block($3); - list_move_head($1, $3); - vkd3d_free($3); + list_move_head($1, &$3->instrs); + destroy_block($3); if (!add_array_access(ctx, $1, array, index, &@2)) { @@ -6451,12 +6443,12 @@ conditional_expr: logicor_expr | logicor_expr '?' expr ':' assignment_expr { - struct hlsl_ir_node *cond = node_from_list($1), *first = node_from_list($3), *second = node_from_list($5); + struct hlsl_ir_node *cond = node_from_list($1), *first = node_from_block($3), *second = node_from_list($5); struct hlsl_type *common_type; - list_move_tail($1, $3); + list_move_tail($1, &$3->instrs); list_move_tail($1, $5); - vkd3d_free($3); + destroy_block($3); vkd3d_free($5); if (!(common_type = get_common_numeric_type(ctx, first, second, &@3))) @@ -6540,9 +6532,12 @@ assign_op: expr: assignment_expr + { + $$ = list_to_block($1); + } | expr ',' assignment_expr { $$ = $1; - list_move_tail($$, $3); + list_move_tail(&$$->instrs, $3); vkd3d_free($3); }
1
0
0
0
← Newer
1
...
72
73
74
75
76
77
78
...
87
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
Results per page:
10
25
50
100
200