February 2023 - Wine-commits

Alexandre Julliard : winefile: Use standard va_list instead of __ms_va_list.
by Alexandre Julliard 20 Feb '23

20 Feb '23

Module: wine Branch: master Commit: 297f7cb37e937ddeb3b50a999af27dc3ac484fe6 URL: https://gitlab.winehq.org/wine/wine/-/commit/297f7cb37e937ddeb3b50a999af27d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 20 08:40:27 2023 +0100 winefile: Use standard va_list instead of __ms_va_list. --- programs/winefile/winefile.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 8ad785b924a..6d18954e05a 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2405,8 +2405,7 @@ static void set_space_status(void) args[1] = (DWORD_PTR)StrFormatByteSizeW(ulTotalBytes.QuadPart, b2, ARRAY_SIZE(b2)); FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - RS(fmt,IDS_FREE_SPACE_FMT), 0, 0, buffer, ARRAY_SIZE(buffer), - (__ms_va_list*)args); + RS(fmt,IDS_FREE_SPACE_FMT), 0, 0, buffer, ARRAY_SIZE(buffer), (va_list *)args); } else lstrcpyW(buffer, sQMarks);

1 0

Alexandre Julliard : include: Move __builtin_ms_va_list definitions to vadefs.h.
by Alexandre Julliard 20 Feb '23

20 Feb '23

Module: wine Branch: master Commit: f4c3801495f4fe17a10e2f21339de3b511c78339 URL: https://gitlab.winehq.org/wine/wine/-/commit/f4c3801495f4fe17a10e2f21339de3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 20 08:41:45 2023 +0100 include: Move __builtin_ms_va_list definitions to vadefs.h. --- include/msvcrt/corecrt.h | 12 ------------ include/msvcrt/vadefs.h | 10 +++++++++- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index 4dc2ca53208..bec9c8911c2 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -122,18 +122,6 @@ # endif #endif -#if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined (__GNUC__) -# include <stdarg.h> -# undef va_list -# undef va_start -# undef va_end -# undef va_copy -# define va_list __builtin_ms_va_list -# define va_start(list,arg) __builtin_ms_va_start(list,arg) -# define va_end(list) __builtin_ms_va_end(list) -# define va_copy(dest,src) __builtin_ms_va_copy(dest,src) -#endif - #ifndef WINAPIV # if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__MINGW32__) && !defined(__CYGWIN__) # define WINAPIV __attribute__((pcs("aapcs"))) diff --git a/include/msvcrt/vadefs.h b/include/msvcrt/vadefs.h index 2a612fc055c..462c2d6815f 100644 --- a/include/msvcrt/vadefs.h +++ b/include/msvcrt/vadefs.h @@ -27,7 +27,15 @@ #define _ADDRESSOF(v) (&(v)) #endif -#if defined(__GNUC__) || defined(__clang__) +#if defined (__GNUC__) && (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) + +typedef __builtin_ms_va_list va_list; +#define _crt_va_start(v,l) __builtin_ms_va_start(v,l) +#define _crt_va_arg(v,l) __builtin_va_arg(v,l) +#define _crt_va_end(v) __builtin_ms_va_end(v) +#define _crt_va_copy(d,s) __builtin_ms_va_copy(d,s) + +#elif defined(__GNUC__) || defined(__clang__) typedef __builtin_va_list va_list; #define _crt_va_start(v,l) __builtin_va_start(v,l)

1 0

Connor McAdams : uiautomationcore: Register all UI Automation typelibs.
by Alexandre Julliard 20 Feb '23

20 Feb '23

Module: wine Branch: master Commit: 88a1e949718cfbffedc46a63a8ad7dad05418dd1 URL: https://gitlab.winehq.org/wine/wine/-/commit/88a1e949718cfbffedc46a63a8ad7d… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Dec 27 14:56:21 2022 -0500 uiautomationcore: Register all UI Automation typelibs. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/Makefile.in | 4 +++- dlls/uiautomationcore/uia_classes.idl | 1 + dlls/uiautomationcore/uia_classes_client.idl | 21 +++++++++++++++++++++ dlls/uiautomationcore/uia_classes_core.idl | 21 +++++++++++++++++++++ include/uiautomationclient.idl | 1 + include/uiautomationcore.idl | 1 + 6 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 9910e8e336e..a597c580b24 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -11,4 +11,6 @@ C_SRCS = \ uia_provider.c IDL_SRCS = \ - uia_classes.idl + uia_classes.idl \ + uia_classes_client.idl \ + uia_classes_core.idl diff --git a/dlls/uiautomationcore/uia_classes.idl b/dlls/uiautomationcore/uia_classes.idl index f0a20d61579..aee34c0221d 100644 --- a/dlls/uiautomationcore/uia_classes.idl +++ b/dlls/uiautomationcore/uia_classes.idl @@ -43,6 +43,7 @@ struct uia_pattern_info { [ version(1.0), uuid(8a9ca8eb-856b-43d9-abd7-4a590054064f), + id(1), ] library UIA_wine_private { diff --git a/dlls/uiautomationcore/uia_classes_client.idl b/dlls/uiautomationcore/uia_classes_client.idl new file mode 100644 index 00000000000..f6dcb236bea --- /dev/null +++ b/dlls/uiautomationcore/uia_classes_client.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2022 Connor McAdams for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep regtypelib + +#include "uiautomationclient.idl" diff --git a/dlls/uiautomationcore/uia_classes_core.idl b/dlls/uiautomationcore/uia_classes_core.idl new file mode 100644 index 00000000000..3cd0a7134ed --- /dev/null +++ b/dlls/uiautomationcore/uia_classes_core.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2022 Connor McAdams for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep regtypelib + +#include "uiautomationcore.idl" diff --git a/include/uiautomationclient.idl b/include/uiautomationclient.idl index ce0402a5d33..7a0b50288d4 100644 --- a/include/uiautomationclient.idl +++ b/include/uiautomationclient.idl @@ -69,6 +69,7 @@ typedef void * UIA_HWND; [ uuid(944de083-8fb8-45cf-bcb7-c477acb2f897), lcid(0), + id(2), version(1.0) ] library UIAutomationClient { diff --git a/include/uiautomationcore.idl b/include/uiautomationcore.idl index bd93bd04dff..319bc7be475 100644 --- a/include/uiautomationcore.idl +++ b/include/uiautomationcore.idl @@ -206,6 +206,7 @@ struct UiaChangeInfo { version(1.0), uuid(930299ce-9965-4dec-b0f4-a54848d4b667), lcid(0), + id(3), hidden ] library UIA

1 0

Connor McAdams : uiautomationcore: Add stub IUIAutomation implementation.
by Alexandre Julliard 20 Feb '23

20 Feb '23

Module: wine Branch: master Commit: e8dd3adae72bbe58a66eda8f55ed8df393a9d1b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8dd3adae72bbe58a66eda8f55ed8d… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Feb 1 13:16:28 2023 -0500 uiautomationcore: Add stub IUIAutomation implementation. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/Makefile.in | 1 + dlls/uiautomationcore/tests/uiautomation.c | 55 +++ dlls/uiautomationcore/uia_com_client.c | 702 ++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_main.c | 123 +++++ dlls/uiautomationcore/uia_private.h | 3 + dlls/uiautomationcore/uiautomationcore.spec | 2 +- 6 files changed, 885 insertions(+), 1 deletion(-)

1 0

Connor McAdams : uiautomationcore: Implement IUIAutomation::ElementFromHandle.
by Alexandre Julliard 20 Feb '23

20 Feb '23

Module: wine Branch: master Commit: 2d8bf67b90ccfbc3d5cfc45bbd68ca666ecd99b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/2d8bf67b90ccfbc3d5cfc45bbd68ca… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Feb 1 15:26:40 2023 -0500 uiautomationcore: Implement IUIAutomation::ElementFromHandle. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 88 +++ dlls/uiautomationcore/uia_com_client.c | 936 ++++++++++++++++++++++++++++- 2 files changed, 1022 insertions(+), 2 deletions(-)

1 0

Connor McAdams : uiautomationcore: Implement IUIAutomationElement::GetCurrentPropertyValueEx.
by Alexandre Julliard 20 Feb '23

20 Feb '23

Module: wine Branch: master Commit: 6254f6635cd3b57870e77376df4ff95469e7cf8b URL: https://gitlab.winehq.org/wine/wine/-/commit/6254f6635cd3b57870e77376df4ff9… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Feb 2 13:54:54 2023 -0500 uiautomationcore: Implement IUIAutomationElement::GetCurrentPropertyValueEx. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 157 ++++++++++++++++++++++++----- dlls/uiautomationcore/uia_com_client.c | 39 ++++++- 2 files changed, 170 insertions(+), 26 deletions(-)

1 0

Zebediah Figura : tests: Test macro expansion in pack_matrix pragmas.
by Alexandre Julliard 20 Feb '23

20 Feb '23

Module: vkd3d Branch: master Commit: 1c29b45c1fa7474ebd1c0d0a63084290df8c1f2a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1c29b45c1fa7474ebd1c0d0a63084… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 14 18:07:10 2021 -0500 tests: Test macro expansion in pack_matrix pragmas. --- tests/hlsl-majority-pragma.shader_test | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tests/hlsl-majority-pragma.shader_test b/tests/hlsl-majority-pragma.shader_test index e7fc75cd..d269e859 100644 --- a/tests/hlsl-majority-pragma.shader_test +++ b/tests/hlsl-majority-pragma.shader_test @@ -19,3 +19,31 @@ uniform 8 float4 0.1 0.3 0.0 0.0 uniform 12 float4 0.2 0.4 0.0 0.0 draw quad probe all rgba (0.17, 0.39, 0.17, 0.39) 1 + +% The documentation claims these strings are subject to macro expansion. +% They are not. + +[pixel shader] + +#define KEY pack_matrix +#pragma KEY(row_major) +#define VALUE row_major +#pragma pack_matrix(VALUE) +#define PRAGMA pack_matrix(row_major) +#pragma PRAGMA + +uniform float2x2 r; + +float4 main() : sv_target +{ + float4 ret; + ret.xy = mul(r, float2(0.5, 0.6)); + ret.zw = 0.5; + return ret; +} + +[test] +uniform 0 float4 0.1 0.2 0.0 0.0 +uniform 4 float4 0.3 0.4 0.0 0.0 +draw quad +probe all rgba (0.23, 0.34, 0.5, 0.5) 1

1 0

Zebediah Figura : tests: Add more tests for majority modifier syntax.
by Alexandre Julliard 20 Feb '23

20 Feb '23

Module: vkd3d Branch: master Commit: 1ee7a4e82a6fbd97844008d0eddba409065efc9e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1ee7a4e82a6fbd97844008d0eddba… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 29 16:50:33 2022 -0500 tests: Add more tests for majority modifier syntax. --- Makefile.am | 1 + tests/hlsl-invalid.shader_test | 18 ------- tests/majority-syntax.shader_test | 108 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+), 18 deletions(-) diff --git a/Makefile.am b/Makefile.am index c5c75bef..1f892ef9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -117,6 +117,7 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/logic-operations.shader_test \ + tests/majority-syntax.shader_test \ tests/math.shader_test \ tests/matrix-semantics.shader_test \ tests/max.shader_test \ diff --git a/tests/hlsl-invalid.shader_test b/tests/hlsl-invalid.shader_test index e56205cb..ad062652 100644 --- a/tests/hlsl-invalid.shader_test +++ b/tests/hlsl-invalid.shader_test @@ -86,15 +86,6 @@ uniform float4 main() : sv_target return 0; } -[pixel shader fail] -typedef row_major float4x4 matrix_t; -typedef column_major matrix_t matrix2_t; - -float4 main() : sv_target -{ - return 0; -} - [pixel shader fail] float4 main() { @@ -228,15 +219,6 @@ float4 main() : sv_target return float4(0, 0, 0, 0); } -[pixel shader fail] -typedef row_major float4x4 mat_t; -column_major mat_t m; - -float4 main() : sv_target -{ - return float4(0, 0, 0, 0); -} - [pixel shader fail] typedef struct apple { diff --git a/tests/majority-syntax.shader_test b/tests/majority-syntax.shader_test new file mode 100644 index 00000000..63ba18f3 --- /dev/null +++ b/tests/majority-syntax.shader_test @@ -0,0 +1,108 @@ +[pixel shader] +typedef row_major float2x2 mat_t; + +row_major mat_t m; + +float4 main() : sv_target +{ + return float4(m[0], m[1]); +} + +[test] +uniform 0 float4 0.1 0.3 0.0 0.0 +uniform 4 float4 0.2 0.4 0.0 0.0 +draw quad +probe all rgba (0.1, 0.3, 0.2, 0.4) + +[pixel shader fail] +row_major row_major float4x4 m; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +typedef row_major float4x4 mat_t; +column_major mat_t m; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +typedef row_major float4x4 matrix_t; +typedef column_major matrix_t matrix2_t; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +typedef column_major float4 myfloat_t; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail todo] +column_major float4 f; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +struct apple +{ + float4x4 m; +}; +typedef column_major struct apple apple_t; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail todo] +struct apple +{ + float4x4 m; +}; +column_major struct apple a; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail todo] +typedef float4x4 myarray_t[2]; + +row_major myarray_t a; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail todo] +float4 main(uniform row_major float4 f) : sv_target +{ + return 0; +} + +[pixel shader fail todo] +struct apple +{ + row_major float4 f; +}; + +float4 main() : sv_target +{ + return 0; +}

1 0

Zebediah Figura : vkd3d-shader/hlsl: Check for majority modifiers on non-matrices in apply_type_modifiers().
by Alexandre Julliard 20 Feb '23

20 Feb '23

Module: vkd3d Branch: master Commit: af652874236825405ac5e4a26333b79d98f2aa76 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/af652874236825405ac5e4a26333b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 29 16:56:03 2022 -0500 vkd3d-shader/hlsl: Check for majority modifiers on non-matrices in apply_type_modifiers(). --- libs/vkd3d-shader/hlsl.y | 7 ++++--- tests/majority-syntax.shader_test | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2b62eccf..da78d291 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -903,6 +903,10 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ else default_majority = HLSL_MODIFIER_ROW_MAJOR; } + else if (type->type != HLSL_CLASS_MATRIX) + { + check_invalid_matrix_modifiers(ctx, *modifiers, loc); + } if (!default_majority && !(*modifiers & HLSL_TYPE_MODIFIERS_MASK)) return type; @@ -2041,9 +2045,6 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t } vkd3d_free(v->arrays.sizes); - if (type->type != HLSL_CLASS_MATRIX) - check_invalid_matrix_modifiers(ctx, modifiers, v->loc); - if (modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)) { struct vkd3d_string_buffer *string; diff --git a/tests/majority-syntax.shader_test b/tests/majority-syntax.shader_test index 63ba18f3..4ab385a5 100644 --- a/tests/majority-syntax.shader_test +++ b/tests/majority-syntax.shader_test @@ -48,7 +48,7 @@ float4 main() : sv_target return 0; } -[pixel shader fail todo] +[pixel shader fail] column_major float4 f; float4 main() : sv_target @@ -68,7 +68,7 @@ float4 main() : sv_target return 0; } -[pixel shader fail todo] +[pixel shader fail] struct apple { float4x4 m; @@ -80,7 +80,7 @@ float4 main() : sv_target return 0; } -[pixel shader fail todo] +[pixel shader fail] typedef float4x4 myarray_t[2]; row_major myarray_t a; @@ -90,13 +90,13 @@ float4 main() : sv_target return 0; } -[pixel shader fail todo] +[pixel shader fail] float4 main(uniform row_major float4 f) : sv_target { return 0; } -[pixel shader fail todo] +[pixel shader fail] struct apple { row_major float4 f;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Remove a redundant warning for mutually exclusive majority modifiers.
by Alexandre Julliard 20 Feb '23

20 Feb '23

Module: vkd3d Branch: master Commit: 72ec5563f87dbcb59bc2db18c7708b88bf9597e6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/72ec5563f87dbcb59bc2db18c7708… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 29 17:03:59 2022 -0500 vkd3d-shader/hlsl: Remove a redundant warning for mutually exclusive majority modifiers. We will warn subsequently in apply_type_modifiers() or add_typedef(). --- libs/vkd3d-shader/hlsl.y | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index da78d291..e158f1de 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -408,12 +408,6 @@ static DWORD add_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, DWORD mod, con hlsl_release_string_buffer(ctx, string); return modifiers; } - if ((mod & HLSL_MODIFIERS_MAJORITY_MASK) && (modifiers & HLSL_MODIFIERS_MAJORITY_MASK)) - { - hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "'row_major' and 'column_major' modifiers are mutually exclusive."); - return modifiers; - } return modifiers | mod; }

1 0