November 2023 - Wine-Commits

Jacek Caban : configure: Disable -Wmicrosoft-enum-forward-reference warnings.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: wine Branch: master Commit: 6f1ed05bad82944a843e45dd0680ea7804de634a URL: https://gitlab.winehq.org/wine/wine/-/commit/6f1ed05bad82944a843e45dd0680ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 1 23:57:30 2023 +0100 configure: Disable -Wmicrosoft-enum-forward-reference warnings. --- configure | 33 +++++++++++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 34 insertions(+) diff --git a/configure b/configure index 9a98c212059..646f44ede24 100755 --- a/configure +++ b/configure @@ -11003,6 +11003,39 @@ printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_var"\" = x"yes" then : as_fn_append ${wine_arch}_EXTRACFLAGS " -Wno-pragma-pack" +fi } + { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-Wmicrosoft-enum-forward-reference" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wmicrosoft-enum-forward-reference" >&5 +printf %s "checking whether $CC supports -Wmicrosoft-enum-forward-reference... " >&6; } +if eval test \${$as_ac_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS -nostdlib -nodefaultlibs -Wmicrosoft-enum-forward-reference" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + eval "$as_ac_var=yes" +else $as_nop + eval "$as_ac_var=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +eval ac_res=\$$as_ac_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_var"\" = x"yes" +then : + as_fn_append ${wine_arch}_EXTRACFLAGS " -Wno-microsoft-enum-forward-reference" fi } { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-Wshift-overflow=2" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wshift-overflow=2" >&5 diff --git a/configure.ac b/configure.ac index 3b6a590a6cd..fd1a58b9170 100644 --- a/configure.ac +++ b/configure.ac @@ -960,6 +960,7 @@ This is an error since --enable-archs=$wine_arch was requested.])]) WINE_TRY_PE_CFLAGS([-Winit-self]) WINE_TRY_PE_CFLAGS([-Wpacked-not-aligned],[AS_VAR_APPEND(${wine_arch}_EXTRACFLAGS,[" -Wno-packed-not-aligned"])]) WINE_TRY_PE_CFLAGS([-Wpragma-pack],[AS_VAR_APPEND(${wine_arch}_EXTRACFLAGS,[" -Wno-pragma-pack"])]) + WINE_TRY_PE_CFLAGS([-Wmicrosoft-enum-forward-reference],[AS_VAR_APPEND(${wine_arch}_EXTRACFLAGS,[" -Wno-microsoft-enum-forward-reference"])]) WINE_TRY_PE_CFLAGS([-Wshift-overflow=2]) WINE_TRY_PE_CFLAGS([-Wstrict-prototypes]) WINE_TRY_PE_CFLAGS([-Wtype-limits])

1 0

Alex Henrie : sechost: Use CRT allocation functions.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: wine Branch: master Commit: fdc3e50634174225a1e9ca72f8014447e0f96a3f URL: https://gitlab.winehq.org/wine/wine/-/commit/fdc3e50634174225a1e9ca72f80144… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 1 22:41:14 2023 -0600 sechost: Use CRT allocation functions. --- dlls/sechost/security.c | 5 +- dlls/sechost/service.c | 196 ++++++++++++++++++++++++------------------------ 2 files changed, 99 insertions(+), 102 deletions(-)

1 0

Alex Henrie : user32/tests: Use CRT allocation functions.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: wine Branch: master Commit: faae2162b89e951a94f74f65986f6a1015366cf3 URL: https://gitlab.winehq.org/wine/wine/-/commit/faae2162b89e951a94f74f65986f6a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 1 23:16:10 2023 -0600 user32/tests: Use CRT allocation functions. --- dlls/user32/tests/clipboard.c | 8 +++---- dlls/user32/tests/cursoricon.c | 50 +++++++++++++++++++++--------------------- dlls/user32/tests/dde.c | 10 ++++----- dlls/user32/tests/input.c | 4 ++-- dlls/user32/tests/listbox.c | 8 +++---- dlls/user32/tests/monitor.c | 7 +++--- dlls/user32/tests/msg.c | 26 +++++++++++----------- 7 files changed, 56 insertions(+), 57 deletions(-)

1 0

Alex Henrie : fsutil/tests: Use CRT allocation functions.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: wine Branch: master Commit: 1798540cb79a38563121b4c40d2dc469aeb42e46 URL: https://gitlab.winehq.org/wine/wine/-/commit/1798540cb79a38563121b4c40d2dc4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 1 23:31:21 2023 -0600 fsutil/tests: Use CRT allocation functions. --- programs/fsutil/tests/fsutil.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/fsutil/tests/fsutil.c b/programs/fsutil/tests/fsutil.c index 0e02d8cac65..aae311b79c4 100644 --- a/programs/fsutil/tests/fsutil.c +++ b/programs/fsutil/tests/fsutil.c @@ -45,11 +45,10 @@ static DWORD runcmd(const char* cmd) DWORD rc; /* Create a writable copy for CreateProcessA() */ - wcmd = HeapAlloc(GetProcessHeap(), 0, strlen(cmd) + 1); - strcpy(wcmd, cmd); + wcmd = strdup(cmd); rc = CreateProcessA(NULL, wcmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); - HeapFree(GetProcessHeap(), 0, wcmd); + free(wcmd); if (!rc) return 260;

1 0

Alex Henrie : browseui: Use the wcsdup function instead of reimplementing it.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: wine Branch: master Commit: 699694b23886044612250d0c11c5809da46a5c06 URL: https://gitlab.winehq.org/wine/wine/-/commit/699694b23886044612250d0c11c580… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 1 23:36:14 2023 -0600 browseui: Use the wcsdup function instead of reimplementing it. --- dlls/browseui/progressdlg.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 1e22ef636e1..9834a4089f2 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -100,12 +100,8 @@ struct create_params static LPWSTR load_string(HINSTANCE hInstance, UINT uiResourceId) { WCHAR string[256]; - LPWSTR ret; - LoadStringW(hInstance, uiResourceId, string, ARRAY_SIZE(string)); - ret = malloc((lstrlenW(string) + 1) * sizeof(WCHAR)); - lstrcpyW(ret, string); - return ret; + return wcsdup(string); } static void set_progress_marquee(ProgressDialog *This)

1 0

Alex Henrie : ninput: Use CRT allocation functions.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: wine Branch: master Commit: bd4b49782ddc4d3ea483561dc15b26d2a2333dd9 URL: https://gitlab.winehq.org/wine/wine/-/commit/bd4b49782ddc4d3ea483561dc15b26… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 00:04:38 2023 -0600 ninput: Use CRT allocation functions. --- dlls/ninput/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ninput/main.c b/dlls/ninput/main.c index 56d82b08ac5..e89e71968c7 100644 --- a/dlls/ninput/main.c +++ b/dlls/ninput/main.c @@ -21,7 +21,6 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" -#include "wine/heap.h" #include "interactioncontext.h" @@ -46,7 +45,7 @@ HRESULT WINAPI CreateInteractionContext(HINTERACTIONCONTEXT *handle) if (!handle) return E_POINTER; - if (!(context = heap_alloc(sizeof(*context)))) + if (!(context = malloc(sizeof(*context)))) return E_OUTOFMEMORY; context->filter_pointers = TRUE; @@ -67,7 +66,7 @@ HRESULT WINAPI DestroyInteractionContext(HINTERACTIONCONTEXT handle) if (!context) return E_HANDLE; - heap_free(context); + free(context); return S_OK; }

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Parse empty technique declarations.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: vkd3d Branch: master Commit: dbcc4c4e401332a390a8d4e06cf92bfe50baae6f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dbcc4c4e401332a390a8d4e06cf92… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 1 22:53:29 2023 +0100 vkd3d-shader/hlsl: Parse empty technique declarations. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 43 +++++++++++++++++++++++++++++++++++ tests/hlsl/technique-fx_2.shader_test | 6 ++--- tests/hlsl/technique-fx_4.shader_test | 4 ++-- tests/hlsl/technique-fx_5.shader_test | 4 ++-- 4 files changed, 50 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 8acfc666..3c30c0cb 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4955,6 +4955,7 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls %type <name> any_identifier %type <name> var_identifier +%type <name> technique_name %type <parameter> parameter @@ -4996,8 +4997,50 @@ hlsl_prog: destroy_block($2); } | hlsl_prog preproc_directive + | hlsl_prog technique | hlsl_prog ';' +technique_name: + %empty + { + $$ = NULL; + } + | any_identifier + +pass_list: + %empty + +technique9: + KW_TECHNIQUE technique_name '{' pass_list '}' + { + hlsl_fixme(ctx, &@$, "Unsupported \'technique\' declaration."); + } + +technique10: + KW_TECHNIQUE10 technique_name '{' pass_list '}' + { + if (ctx->profile->type == VKD3D_SHADER_TYPE_EFFECT && ctx->profile->major_version == 2) + hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, + "The 'technique10' keyword is invalid for this profile."); + + hlsl_fixme(ctx, &@$, "Unsupported \'technique10\' declaration."); + } + +technique11: + KW_TECHNIQUE11 technique_name '{' pass_list '}' + { + if (ctx->profile->type == VKD3D_SHADER_TYPE_EFFECT && ctx->profile->major_version == 2) + hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, + "The 'technique11' keyword is invalid for this profile."); + + hlsl_fixme(ctx, &@$, "Unsupported \'technique11\' declaration."); + } + +technique: + technique9 + | technique10 + | technique11 + buffer_declaration: buffer_type any_identifier colon_attribute { diff --git a/tests/hlsl/technique-fx_2.shader_test b/tests/hlsl/technique-fx_2.shader_test index 6e130747..90c734d5 100644 --- a/tests/hlsl/technique-fx_2.shader_test +++ b/tests/hlsl/technique-fx_2.shader_test @@ -76,7 +76,7 @@ technique10 float4 f; % fx_5_0 keyword fails with fx_2_0 profile -[effect fail] +[effect fail todo] technique { } @@ -85,7 +85,7 @@ technique11 { } -[effect fail] +[effect fail todo] technique { } @@ -94,7 +94,7 @@ tEchnique10 { } -[effect fail] +[effect fail todo] technique { } diff --git a/tests/hlsl/technique-fx_4.shader_test b/tests/hlsl/technique-fx_4.shader_test index 230553e5..fb8a3e67 100644 --- a/tests/hlsl/technique-fx_4.shader_test +++ b/tests/hlsl/technique-fx_4.shader_test @@ -46,7 +46,7 @@ technique11 { } -[effect fail] +[effect fail todo] technique { } @@ -55,7 +55,7 @@ tEchnique10 { } -[effect fail] +[effect fail todo] technique { } diff --git a/tests/hlsl/technique-fx_5.shader_test b/tests/hlsl/technique-fx_5.shader_test index f0b51198..aeea1a84 100644 --- a/tests/hlsl/technique-fx_5.shader_test +++ b/tests/hlsl/technique-fx_5.shader_test @@ -46,7 +46,7 @@ technique11 { } -[effect fail] +[effect fail todo] technique { } @@ -55,7 +55,7 @@ tEchnique10 { } -[effect fail] +[effect fail todo] technique { }

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add a keyword for fx_5_0 techniques.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: vkd3d Branch: master Commit: ea8ff5394ceb5f83bc36dbbda7d9d0738ba10971 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ea8ff5394ceb5f83bc36dbbda7d9d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 1 21:54:17 2023 +0100 vkd3d-shader/hlsl: Add a keyword for fx_5_0 techniques. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.l | 1 + libs/vkd3d-shader/hlsl.y | 1 + tests/hlsl/technique-fx_2.shader_test | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 527d853a..a6b78ddf 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -133,6 +133,7 @@ switch {return KW_SWITCH; } tbuffer {return KW_TBUFFER; } technique {return KW_TECHNIQUE; } technique10 {return KW_TECHNIQUE10; } +technique11 {return KW_TECHNIQUE11; } texture {return KW_TEXTURE; } texture1D {return KW_TEXTURE1D; } Texture1D {return KW_TEXTURE1D; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 71c0ae46..8acfc666 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4832,6 +4832,7 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls %token KW_TBUFFER %token KW_TECHNIQUE %token KW_TECHNIQUE10 +%token KW_TECHNIQUE11 %token KW_TEXTURE %token KW_TEXTURE1D %token KW_TEXTURE1DARRAY diff --git a/tests/hlsl/technique-fx_2.shader_test b/tests/hlsl/technique-fx_2.shader_test index 9eaa9a65..978dece1 100644 --- a/tests/hlsl/technique-fx_2.shader_test +++ b/tests/hlsl/technique-fx_2.shader_test @@ -15,7 +15,7 @@ float4 main() : sv_target return technique10; } -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float4 technique11 = {0, 0, 0, 0};

1 0

Conor McCarthy : vkd3d-shader/dxil: Allow empty struct types.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: vkd3d Branch: master Commit: 7419f4e31d2617b29717a1efcf57c25dc930030f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7419f4e31d2617b29717a1efcf57c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Nov 2 13:56:25 2023 +1000 vkd3d-shader/dxil: Allow empty struct types. --- libs/vkd3d-shader/dxil.c | 2 +- tests/hlsl/object-field-offsets.shader_test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 18004139..94f5b862 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -1374,7 +1374,7 @@ static enum vkd3d_result sm6_parser_type_table_init(struct sm6_parser *sm6) case TYPE_CODE_STRUCT_ANON: case TYPE_CODE_STRUCT_NAMED: - if (!dxil_record_validate_operand_min_count(record, 2, sm6)) + if (!dxil_record_validate_operand_min_count(record, 1, sm6)) return VKD3D_ERROR_INVALID_SHADER; if (record->code == TYPE_CODE_STRUCT_NAMED && !struct_name) { diff --git a/tests/hlsl/object-field-offsets.shader_test b/tests/hlsl/object-field-offsets.shader_test index 9cc4581b..8afd9af7 100644 --- a/tests/hlsl/object-field-offsets.shader_test +++ b/tests/hlsl/object-field-offsets.shader_test @@ -45,7 +45,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 5.0 6.0 7.0 8.0 -todo(sm>=6) draw quad +draw quad probe all rgba (1.0, 2.0, 5.0, 0.0)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Use case-insensitive match for the "technique" keyword.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: vkd3d Branch: master Commit: 53b0101a53dca6d1dcda20559edb35238e07c5b0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/53b0101a53dca6d1dcda20559edb3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 1 22:16:47 2023 +0100 vkd3d-shader/hlsl: Use case-insensitive match for the "technique" keyword. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.l | 2 +- tests/hlsl/technique-fx_2.shader_test | 4 ++-- tests/hlsl/technique-fx_4.shader_test | 2 +- tests/hlsl/technique-fx_5.shader_test | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index a6b78ddf..83fe1d34 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -131,7 +131,7 @@ string {return KW_STRING; } struct {return KW_STRUCT; } switch {return KW_SWITCH; } tbuffer {return KW_TBUFFER; } -technique {return KW_TECHNIQUE; } +(?i:technique) {return KW_TECHNIQUE; } technique10 {return KW_TECHNIQUE10; } technique11 {return KW_TECHNIQUE11; } texture {return KW_TEXTURE; } diff --git a/tests/hlsl/technique-fx_2.shader_test b/tests/hlsl/technique-fx_2.shader_test index 978dece1..6e130747 100644 --- a/tests/hlsl/technique-fx_2.shader_test +++ b/tests/hlsl/technique-fx_2.shader_test @@ -1,7 +1,7 @@ [require] shader model < 3.0 -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float4 teChnique = {0, 0, 0, 0}; @@ -30,7 +30,7 @@ float4 main() : sv_target return float4(0, 0, 0, 0); } -[pixel shader fail todo] +[pixel shader fail] typedef float4 Technique; float4 main() : sv_target diff --git a/tests/hlsl/technique-fx_4.shader_test b/tests/hlsl/technique-fx_4.shader_test index 8102e78b..230553e5 100644 --- a/tests/hlsl/technique-fx_4.shader_test +++ b/tests/hlsl/technique-fx_4.shader_test @@ -2,7 +2,7 @@ shader model >= 4.0 shader model < 6.0 -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float4 teChnique = {0, 0, 0, 0}; diff --git a/tests/hlsl/technique-fx_5.shader_test b/tests/hlsl/technique-fx_5.shader_test index 047ed2f2..f0b51198 100644 --- a/tests/hlsl/technique-fx_5.shader_test +++ b/tests/hlsl/technique-fx_5.shader_test @@ -2,7 +2,7 @@ shader model >= 5.0 shader model < 6.0 -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float4 teChnique = {0, 0, 0, 0};

1 0