September 2023 - Wine-Commits

Brendan Shanks : winspool.drv: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: c95ec7236c8d7133ebe5099724ebb4c32612085a URL: https://gitlab.winehq.org/wine/wine/-/commit/c95ec7236c8d7133ebe5099724ebb4… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Sep 13 15:33:23 2023 -0700 winspool.drv: Ensure unixlib function tables and enum stay in sync. --- dlls/winspool.drv/cups.c | 4 ++++ dlls/winspool.drv/wspool.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/winspool.drv/cups.c b/dlls/winspool.drv/cups.c index 1034277aad6..6ad270709cc 100644 --- a/dlls/winspool.drv/cups.c +++ b/dlls/winspool.drv/cups.c @@ -433,6 +433,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = get_ppd, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + #ifdef _WIN64 typedef ULONG PTR32; @@ -523,4 +525,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_get_ppd, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); + #endif /* _WIN64 */ diff --git a/dlls/winspool.drv/wspool.h b/dlls/winspool.drv/wspool.h index 6a8a4fee1a8..29a459ed91c 100644 --- a/dlls/winspool.drv/wspool.h +++ b/dlls/winspool.drv/wspool.h @@ -72,4 +72,5 @@ enum cups_funcs unix_enum_printers, unix_get_default_page_size, unix_get_ppd, + unix_funcs_count, };

1 0

Brendan Shanks : winegstreamer: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: 40051cfa5bb86491800690ce5f45fd34df9d3b49 URL: https://gitlab.winehq.org/wine/wine/-/commit/40051cfa5bb86491800690ce5f45fd… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Sep 13 16:02:10 2023 -0700 winegstreamer: Ensure unixlib function tables and enum stay in sync. --- dlls/winegstreamer/unixlib.h | 2 ++ dlls/winegstreamer/wg_parser.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index a5015ef9b22..a3131e9f789 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -414,6 +414,8 @@ enum unix_funcs unix_wg_muxer_create, unix_wg_muxer_destroy, + + unix_wg_funcs_count, }; #endif /* __WINE_WINEGSTREAMER_UNIXLIB_H */ diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 016691d448d..299eea09c90 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1950,6 +1950,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = X(wg_muxer_destroy), }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_wg_funcs_count); + #ifdef _WIN64 typedef ULONG PTR32; @@ -2217,4 +2219,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = X(wg_muxer_destroy), }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_wg_funcs_count); + #endif /* _WIN64 */

1 0

Brendan Shanks : bcrypt: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: 2fd33f6ce10f67cfe553f6bac9a8a853c997f9ab URL: https://gitlab.winehq.org/wine/wine/-/commit/2fd33f6ce10f67cfe553f6bac9a8a8… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Aug 30 12:48:43 2023 -0700 bcrypt: Ensure unixlib function tables and enum stay in sync. --- dlls/bcrypt/bcrypt_internal.h | 1 + dlls/bcrypt/gnutls.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 5dc21484ccb..26a98eba1dc 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -319,6 +319,7 @@ enum key_funcs unix_key_asymmetric_destroy, unix_key_asymmetric_export, unix_key_asymmetric_import, + unix_funcs_count, }; #endif /* __BCRYPT_INTERNAL_H */ diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index bc0e036a53d..5d8c71c78c5 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -2271,6 +2271,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = key_asymmetric_import }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + #ifdef _WIN64 typedef ULONG PTR32; @@ -2752,6 +2754,8 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_key_asymmetric_import }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); + #endif /* _WIN64 */ #endif /* HAVE_GNUTLS_CIPHER_INIT */

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Remove HLSL_OP3_LERP.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: vkd3d Branch: master Commit: f251da574c21ce17c5defebc9c9d8f75ad9b4e4f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f251da574c21ce17c5defebc9c9d8… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Sep 13 10:24:31 2023 +0200 vkd3d-shader/hlsl: Remove HLSL_OP3_LERP. It is unused, and it's not clear whether it would be of any help to have it. --- libs/vkd3d-shader/hlsl.c | 1 - libs/vkd3d-shader/hlsl.h | 1 - 2 files changed, 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 09580970..5fe9047b 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2486,7 +2486,6 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP2_RSHIFT] = ">>", [HLSL_OP3_DP2ADD] = "dp2add", - [HLSL_OP3_LERP] = "lerp", [HLSL_OP3_MOVC] = "movc", [HLSL_OP3_TERNARY] = "ternary", }; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 04e681a9..bece9a4a 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -551,7 +551,6 @@ enum hlsl_ir_expr_op HLSL_OP2_RSHIFT, HLSL_OP3_DP2ADD, - HLSL_OP3_LERP, /* TERNARY is used specifically for ternary operator, and later lowered according to profile to e.g. MOVC. */ HLSL_OP3_MOVC, HLSL_OP3_TERNARY,

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Document some possibly obscure HLSL opcodes.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: vkd3d Branch: master Commit: ee28861837c825818ace2e1e50825ade87a9c723 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ee28861837c825818ace2e1e50825… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Sep 12 17:30:55 2023 +0200 vkd3d-shader/hlsl: Document some possibly obscure HLSL opcodes. --- libs/vkd3d-shader/hlsl.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index bece9a4a..44cebaaf 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -550,8 +550,13 @@ enum hlsl_ir_expr_op HLSL_OP2_NEQUAL, HLSL_OP2_RSHIFT, + /* DP2ADD(a, b, c) computes the scalar product of a.xy and b.xy, + * then adds c. */ HLSL_OP3_DP2ADD, - /* TERNARY is used specifically for ternary operator, and later lowered according to profile to e.g. MOVC. */ + /* MOVC(a, b, c) returns c if a is bitwise zero and b otherwise. + * TERNARY(a, b, c) returns c if a == 0 and b otherwise. + * They differ for floating point numbers, because + * -0.0 == 0.0, but it is not bitwise zero. */ HLSL_OP3_MOVC, HLSL_OP3_TERNARY, };

1 0

Brendan Shanks : ws2_32: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: 9492913deefa44295f5ac0b4f6f45fa1a5f2d036 URL: https://gitlab.winehq.org/wine/wine/-/commit/9492913deefa44295f5ac0b4f6f45f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Sep 13 15:11:40 2023 -0700 ws2_32: Ensure unixlib function tables and enum stay in sync. --- dlls/ws2_32/unixlib.c | 4 ++++ dlls/ws2_32/ws2_32_private.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index db36f18c7bd..88845e43ad2 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -1071,6 +1071,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = unix_getnameinfo, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == ws_unix_funcs_count ); + #ifdef _WIN64 typedef ULONG PTR32; @@ -1349,4 +1351,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_unix_getnameinfo, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == ws_unix_funcs_count ); + #endif /* _WIN64 */ diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 6ebcd6837ae..a009a1eefd3 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -141,6 +141,7 @@ enum ws_unix_funcs ws_unix_gethostbyname, ws_unix_gethostname, ws_unix_getnameinfo, + ws_unix_funcs_count, }; #endif

1 0

Brendan Shanks : msv1_0: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: 798eff6a0e6885c821dffc67e205f70a41c538a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/798eff6a0e6885c821dffc67e205f7… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Sep 13 15:07:10 2023 -0700 msv1_0: Ensure unixlib function tables and enum stay in sync. --- dlls/msv1_0/unixlib.c | 4 ++++ dlls/msv1_0/unixlib.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/msv1_0/unixlib.c b/dlls/msv1_0/unixlib.c index 779250fc650..5ab028ed51f 100644 --- a/dlls/msv1_0/unixlib.c +++ b/dlls/msv1_0/unixlib.c @@ -243,6 +243,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = ntlm_check_version, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + #ifdef _WIN64 typedef ULONG PTR32; @@ -301,4 +303,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = ntlm_check_version, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); + #endif /* _WIN64 */ diff --git a/dlls/msv1_0/unixlib.h b/dlls/msv1_0/unixlib.h index 7aee646ed50..92edb8e18dc 100644 --- a/dlls/msv1_0/unixlib.h +++ b/dlls/msv1_0/unixlib.h @@ -111,4 +111,5 @@ enum ntlm_funcs unix_cleanup, unix_fork, unix_check_version, + unix_funcs_count, };

1 0

Brendan Shanks : crypt32: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: 495e1a0c5b4fc90c557ef4198bdc0758195d180d URL: https://gitlab.winehq.org/wine/wine/-/commit/495e1a0c5b4fc90c557ef4198bdc07… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Sep 13 15:52:50 2023 -0700 crypt32: Ensure unixlib function tables and enum stay in sync. --- dlls/crypt32/crypt32_private.h | 1 + dlls/crypt32/unixlib.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index b5beb1b8a0e..fd1157ec295 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -510,6 +510,7 @@ enum unix_funcs unix_import_store_cert, unix_close_cert_store, unix_enum_root_certs, + unix_funcs_count, }; #define CRYPT32_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params ) diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c index e90642fb0d5..72770caab5f 100644 --- a/dlls/crypt32/unixlib.c +++ b/dlls/crypt32/unixlib.c @@ -695,6 +695,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = enum_root_certs, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + #ifdef _WIN64 typedef ULONG PTR32; @@ -796,4 +798,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_enum_root_certs, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); + #endif /* _WIN64 */

1 0

Rémi Bernon : dmime: Use PARENTSRC with dmusic.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: aeea45946abee7bb673c12c24bd6b590dcb98c72 URL: https://gitlab.winehq.org/wine/wine/-/commit/aeea45946abee7bb673c12c24bd6b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 30 19:56:28 2023 +0200 dmime: Use PARENTSRC with dmusic. --- dlls/dmime/Makefile.in | 1 + dlls/dmime/dmobject.c | 731 ------------------------------------------------- dlls/dmime/dmobject.h | 124 --------- 3 files changed, 1 insertion(+), 855 deletions(-)

1 0

Rémi Bernon : dmscript: Use PARENTSRC with dmusic.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: d6f049e8a59a606c82a747e896735826eb6052e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d6f049e8a59a606c82a747e8967358… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 30 19:55:16 2023 +0200 dmscript: Use PARENTSRC with dmusic. --- dlls/dmscript/Makefile.in | 1 + dlls/dmscript/dmobject.c | 732 ---------------------------------------------- dlls/dmscript/dmobject.h | 124 -------- 3 files changed, 1 insertion(+), 856 deletions(-)

1 0