September 2023 - Wine-commits

Rémi Bernon : makedep: Support generating .exe TESTDLL resources.
by Alexandre Julliard 05 Sep '23

05 Sep '23

Module: wine Branch: master Commit: 19c1cc1c3ed57a114474042dbe09fae4333f4d5a URL: https://gitlab.winehq.org/wine/wine/-/commit/19c1cc1c3ed57a114474042dbe09fa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 29 16:44:37 2023 +0200 makedep: Support generating .exe TESTDLL resources. --- tools/makedep.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9d2f6317ece..85b111941b5 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3077,7 +3077,7 @@ static void output_source_testdll( struct makefile *make, struct incl_file *sour struct strarray dll_flags = empty_strarray; struct strarray default_imports = empty_strarray; struct strarray all_libs, dep_libs; - const char *dll_name, *obj_name, *res_name, *output_rsrc, *output_file, *debug_file; + const char *dll_name, *obj_name, *res_name, *output_rsrc, *output_file, *debug_file, *ext; struct incl_file *spec_file = find_src_file( make, strmake( "%.spec", obj )); unsigned int arch; @@ -3086,7 +3086,9 @@ static void output_source_testdll( struct makefile *make, struct incl_file *sour strarray_addall( &dll_flags, get_expanded_file_local_var( make, obj, "EXTRADLLFLAGS" )); if (!strarray_exists( &dll_flags, "-nodefaultlibs" )) default_imports = get_default_imports( make, imports ); - if (!spec_file) fatal_error( "testdll source %s needs a .spec file\n", source->name ); + if (strarray_exists( &dll_flags, "-mconsole" )) ext = ".exe"; + else if (!spec_file) fatal_error( "testdll source %s needs a .spec file\n", source->name ); + else ext = ".dll"; for (arch = 0; arch < archs.count; arch++) { @@ -3095,7 +3097,7 @@ static void output_source_testdll( struct makefile *make, struct incl_file *sour strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, arch ) ); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, arch ) ); if (!arch) strarray_addall( &all_libs, libs ); - dll_name = arch_module_name( strmake( "%s.dll", obj ), arch ); + dll_name = arch_module_name( strmake( "%s%s", obj, ext ), arch ); obj_name = obj_dir_path( make, strmake( "%s%s.o", arch_dirs[arch], obj )); output_file = obj_dir_path( make, dll_name ); output_rsrc = strmake( "%s.res", dll_name ); @@ -3109,11 +3111,11 @@ static void output_source_testdll( struct makefile *make, struct incl_file *sour output_filename( output_file ); output_filename( tools_path( make, "wrc" )); output( "\n" ); - output( "\t%secho \"%s.dll TESTDLL \\\"%s\\\"\" | %s -u -o $@\n", cmd_prefix( "WRC" ), obj, output_file, + output( "\t%secho \"%s%s TESTDLL \\\"%s\\\"\" | %s -u -o $@\n", cmd_prefix( "WRC" ), obj, ext, output_file, tools_path( make, "wrc" )); output( "%s:", output_file ); - output_filename( spec_file->filename ); + if (spec_file) output_filename( spec_file->filename ); output_filename( obj_name ); if (res_name) output_filename( res_name ); output_filenames( dep_libs ); @@ -3124,8 +3126,8 @@ static void output_source_testdll( struct makefile *make, struct incl_file *sour output_filename( "-s" ); output_filenames( dll_flags ); if (arch) output_filenames( get_expanded_arch_var_array( make, "EXTRADLLFLAGS", arch )); - output_filename( "-shared" ); - output_filename( spec_file->filename ); + if (!strcmp( ext, ".dll" )) output_filename( "-shared" ); + if (spec_file) output_filename( spec_file->filename ); output_filename( obj_name ); if (res_name) output_filename( res_name ); if ((debug_file = get_debug_file( make, dll_name, arch )))

1 0

Rémi Bernon : windows.applicationmodel/tests: Test IPackageManager_RegisterPackageAsync.
by Alexandre Julliard 05 Sep '23

05 Sep '23

Module: wine Branch: master Commit: 8609fef5c822e32998725bad58582764d289c194 URL: https://gitlab.winehq.org/wine/wine/-/commit/8609fef5c822e32998725bad585827… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 23 11:21:33 2023 +0200 windows.applicationmodel/tests: Test IPackageManager_RegisterPackageAsync. --- dlls/windows.applicationmodel/tests/Makefile.in | 10 +- dlls/windows.applicationmodel/tests/application.c | 33 +++ .../tests/appxmanifest.xml | 26 ++ dlls/windows.applicationmodel/tests/model.c | 326 +++++++++++++++++++++ dlls/windows.applicationmodel/tests/resource.rc | 22 ++ 5 files changed, 414 insertions(+), 3 deletions(-)

1 0

Rémi Bernon : windows.applicationmodel/tests: Test executing a WinRT package application.
by Alexandre Julliard 05 Sep '23

05 Sep '23

Module: wine Branch: master Commit: 9ac4f151c0931fff131e48e75c2c3d9348ee17bb URL: https://gitlab.winehq.org/wine/wine/-/commit/9ac4f151c0931fff131e48e75c2c3d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 23 11:21:33 2023 +0200 windows.applicationmodel/tests: Test executing a WinRT package application. --- dlls/windows.applicationmodel/tests/application.c | 17 ++ dlls/windows.applicationmodel/tests/model.c | 52 +++++ dlls/windows.applicationmodel/tests/winrt_test.h | 245 ++++++++++++++++++++++ 3 files changed, 314 insertions(+)

1 0

Biswapriyo Nath : include: Add AudioCaptureEffectsManager runtimeclass in windows.media.effects.idl.
by Alexandre Julliard 05 Sep '23

05 Sep '23

Module: wine Branch: master Commit: cc1692bb0a09615291569d90bd335a0edeb1274b URL: https://gitlab.winehq.org/wine/wine/-/commit/cc1692bb0a09615291569d90bd335a… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 5 04:45:15 2023 +0000 include: Add AudioCaptureEffectsManager runtimeclass in windows.media.effects.idl. --- include/windows.media.effects.idl | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/include/windows.media.effects.idl b/include/windows.media.effects.idl index 87829fda0bd..7607ed6c7cc 100644 --- a/include/windows.media.effects.idl +++ b/include/windows.media.effects.idl @@ -26,14 +26,17 @@ import "windows.foundation.idl"; namespace Windows.Media.Effects { typedef enum AudioEffectType AudioEffectType; + interface IAudioCaptureEffectsManager; interface IAudioEffect; + runtimeclass AudioCaptureEffectsManager; runtimeclass AudioEffect; declare { interface Windows.Foundation.Collections.IIterable<Windows.Media.Effects.AudioEffect *>; interface Windows.Foundation.Collections.IIterator<Windows.Media.Effects.AudioEffect *>; interface Windows.Foundation.Collections.IVectorView<Windows.Media.Effects.AudioEffect *>; + interface Windows.Foundation.TypedEventHandler<Windows.Media.Effects.AudioCaptureEffectsManager *, IInspectable *>; } [ @@ -65,6 +68,25 @@ namespace Windows.Media.Effects { DeepNoiseSuppression = 19, }; + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.Effects.AudioCaptureEffectsManager), + uuid(8f85c271-038d-4393-8298-540110608eef) + ] + interface IAudioCaptureEffectsManager : IInspectable + { + [eventadd] HRESULT AudioCaptureEffectsChanged( + [in] Windows.Foundation.TypedEventHandler<Windows.Media.Effects.AudioCaptureEffectsManager *, IInspectable *> *handler, + [out, retval] EventRegistrationToken *token + ); + [eventremove] HRESULT AudioCaptureEffectsChanged( + [in] EventRegistrationToken token + ); + HRESULT GetAudioCaptureEffects( + [out, retval] Windows.Foundation.Collections.IVectorView<Windows.Media.Effects.AudioEffect *> **effects + ); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.Effects.AudioEffect), @@ -75,6 +97,16 @@ namespace Windows.Media.Effects { [propget] HRESULT AudioEffectType([out, retval] Windows.Media.Effects.AudioEffectType *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(mta) + ] + runtimeclass AudioCaptureEffectsManager + { + [default] interface Windows.Media.Effects.IAudioCaptureEffectsManager; + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile),

1 0

Biswapriyo Nath : include: Add AudioRenderEffectsManager runtimeclass in windows.media.effects.idl.
by Alexandre Julliard 05 Sep '23

05 Sep '23

Module: wine Branch: master Commit: d53e989b5aa5c0f8a3773b76bf2e9dc849374d5c URL: https://gitlab.winehq.org/wine/wine/-/commit/d53e989b5aa5c0f8a3773b76bf2e9d… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 5 05:04:55 2023 +0000 include: Add AudioRenderEffectsManager runtimeclass in windows.media.effects.idl. --- include/windows.media.effects.idl | 51 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/include/windows.media.effects.idl b/include/windows.media.effects.idl index 7607ed6c7cc..f0f8cba0c83 100644 --- a/include/windows.media.effects.idl +++ b/include/windows.media.effects.idl @@ -22,21 +22,26 @@ import "inspectable.idl"; import "windows.foundation.idl"; +import "windows.storage.streams.idl"; namespace Windows.Media.Effects { typedef enum AudioEffectType AudioEffectType; interface IAudioCaptureEffectsManager; interface IAudioEffect; + interface IAudioRenderEffectsManager; + interface IAudioRenderEffectsManager2; runtimeclass AudioCaptureEffectsManager; runtimeclass AudioEffect; + runtimeclass AudioRenderEffectsManager; declare { interface Windows.Foundation.Collections.IIterable<Windows.Media.Effects.AudioEffect *>; interface Windows.Foundation.Collections.IIterator<Windows.Media.Effects.AudioEffect *>; interface Windows.Foundation.Collections.IVectorView<Windows.Media.Effects.AudioEffect *>; interface Windows.Foundation.TypedEventHandler<Windows.Media.Effects.AudioCaptureEffectsManager *, IInspectable *>; + interface Windows.Foundation.TypedEventHandler<Windows.Media.Effects.AudioRenderEffectsManager *, IInspectable *>; } [ @@ -97,6 +102,41 @@ namespace Windows.Media.Effects { [propget] HRESULT AudioEffectType([out, retval] Windows.Media.Effects.AudioEffectType *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.Effects.AudioRenderEffectsManager), + uuid(4dc98966-8751-42b2-bfcb-39ca7864bd47) + ] + interface IAudioRenderEffectsManager : IInspectable + { + [eventadd] HRESULT AudioRenderEffectsChanged( + [in] Windows.Foundation.TypedEventHandler<Windows.Media.Effects.AudioRenderEffectsManager *, IInspectable *> *handler, + [out, retval] EventRegistrationToken *token + ); + [eventremove] HRESULT AudioRenderEffectsChanged( + [in] EventRegistrationToken token + ); + HRESULT GetAudioRenderEffects( + [out, retval] Windows.Foundation.Collections.IVectorView<Windows.Media.Effects.AudioEffect *> **effects + ); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.Effects.AudioRenderEffectsManager), + uuid(a844cd09-5ecc-44b3-bb4e-1db07287139c) + ] + interface IAudioRenderEffectsManager2 : IInspectable + { + [propget] HRESULT EffectsProviderThumbnail( + [out, retval] Windows.Storage.Streams.IRandomAccessStreamWithContentType **value + ); + [propget] HRESULT EffectsProviderSettingsLabel( + [out, retval] HSTRING *value + ); + HRESULT ShowSettingsUI(); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -116,4 +156,15 @@ namespace Windows.Media.Effects { { [default] interface Windows.Media.Effects.IAudioEffect; } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(mta) + ] + runtimeclass AudioRenderEffectsManager + { + [default] interface Windows.Media.Effects.IAudioRenderEffectsManager; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Media.Effects.IAudioRenderEffectsManager2; + } }

1 0

Paul Gofman : ntdll/tests: Adjust test_raiseexception_regs() for Win11 results.
by Alexandre Julliard 05 Sep '23

05 Sep '23

Module: wine Branch: master Commit: a602e370696d78bc1554a010f046aaadedcc7df3 URL: https://gitlab.winehq.org/wine/wine/-/commit/a602e370696d78bc1554a010f046aa… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 4 15:17:21 2023 -0600 ntdll/tests: Adjust test_raiseexception_regs() for Win11 results. --- dlls/ntdll/tests/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 58cf8ca8eea..e469aa33643 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -5134,7 +5134,7 @@ static LONG CALLBACK test_raiseexception_regs_handle(EXCEPTION_POINTERS *excepti ok(rec->NumberParameters == EXCEPTION_MAXIMUM_PARAMETERS, "got %lu.\n", rec->NumberParameters); ok(rec->ExceptionCode == 0xdeadbeaf, "got %#lx.\n", rec->ExceptionCode); ok(!rec->ExceptionRecord, "got %p.\n", rec->ExceptionRecord); - ok(!rec->ExceptionFlags, "got %#lx.\n", rec->ExceptionFlags); + ok(!rec->ExceptionFlags || rec->ExceptionFlags == EXCEPTION_SOFTWARE_ORIGINATE, "got %#lx.\n", rec->ExceptionFlags); for (i = 0; i < rec->NumberParameters; ++i) ok(rec->ExceptionInformation[i] == i, "got %Iu, i %u.\n", rec->ExceptionInformation[i], i); return EXCEPTION_CONTINUE_EXECUTION;

1 0

Paul Gofman : ntdll/tests: Adjust test_virtual_unwind() for Win11 results.
by Alexandre Julliard 05 Sep '23

05 Sep '23

Module: wine Branch: master Commit: 782b008de9c8a8be65fed015a7c0df8a91d4d80f URL: https://gitlab.winehq.org/wine/wine/-/commit/782b008de9c8a8be65fed015a7c0df… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 4 13:00:28 2023 -0600 ntdll/tests: Adjust test_virtual_unwind() for Win11 results. --- dlls/ntdll/tests/exception.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index cdfa4b026b8..4b31ded98b7 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2309,6 +2309,22 @@ static void test_virtual_unwind(void) { 0x33, 0x40, FALSE, 0x000, 0x010, { {rsp,0x008}, {-1,-1}}}, }; + static const struct results broken_results_0[] = + { + /* offset rbp handler rip frame registers */ + { 0x00, 0x40, FALSE, 0x000, 0x000, { {rsp,0x008}, {-1,-1} }}, + { 0x02, 0x40, FALSE, 0x008, 0x000, { {rsp,0x010}, {rbp,0x000}, {-1,-1} }}, + { 0x09, 0x40, FALSE, 0x118, 0x000, { {rsp,0x120}, {rbp,0x110}, {-1,-1} }}, + { 0x0e, 0x40, FALSE, 0x128, 0x010, { {rsp,0x130}, {rbp,0x120}, {-1,-1} }}, + { 0x15, 0x40, FALSE, 0x128, 0x010, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {-1,-1} }}, + { 0x1c, 0x40, TRUE, 0x128, 0x010, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, + { 0x1d, 0x40, TRUE, 0x128, 0x010, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, + { 0x24, 0x40, TRUE, 0x128, 0x010, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, + /* On Win11 output frame in epilogue corresponds to context->Rsp - 0x8 when fpreg is set. */ + { 0x2b, 0x40, FALSE, 0x128, 0x128, { {rsp,0x130}, {rbp,0x120}, {-1,-1}}}, + { 0x32, 0x40, FALSE, 0x008, 0x008, { {rsp,0x010}, {rbp,0x000}, {-1,-1}}}, + { 0x33, 0x40, FALSE, 0x000, 0x000, { {rsp,0x008}, {-1,-1}}}, + }; static const BYTE function_1[] = { @@ -2445,7 +2461,7 @@ static void test_virtual_unwind(void) static const struct unwind_test tests[] = { - { function_0, sizeof(function_0), unwind_info_0, results_0, ARRAY_SIZE(results_0) }, + { function_0, sizeof(function_0), unwind_info_0, results_0, ARRAY_SIZE(results_0), broken_results_0 }, { function_1, sizeof(function_1), unwind_info_1, results_1, ARRAY_SIZE(results_1) }, { function_2, sizeof(function_2), unwind_info_2, results_2, ARRAY_SIZE(results_2) }, { function_2, sizeof(function_2), unwind_info_3, results_3, ARRAY_SIZE(results_3) },

1 0

Paul Gofman : include: Define up to date exception flags.
by Alexandre Julliard 05 Sep '23

05 Sep '23

Module: wine Branch: master Commit: 9cf55056327c87acbabcf8b755b25ed90932ae8f URL: https://gitlab.winehq.org/wine/wine/-/commit/9cf55056327c87acbabcf8b755b25e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 4 13:29:25 2023 -0600 include: Define up to date exception flags. --- include/winnt.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 2e1aac0f477..c1f007d0536 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2267,8 +2267,15 @@ NTSYSAPI PVOID WINAPI RtlVirtualUnwind(DWORD,ULONG_PTR,ULONG_PTR,RUNTIME_FUNCT #define WT_TRANSFER_IMPERSONATION 0x0100 -#define EXCEPTION_CONTINUABLE 0 +#define EXCEPTION_CONTINUABLE 0x00 #define EXCEPTION_NONCONTINUABLE 0x01 +#define EXCEPTION_UNWINDING 0x02 +#define EXCEPTION_EXIT_UNWIND 0x04 +#define EXCEPTION_STACK_INVALID 0x08 +#define EXCEPTION_NESTED_CALL 0x10 +#define EXCEPTION_TARGET_UNWIND 0x20 +#define EXCEPTION_COLLIDED_UNWIND 0x40 +#define EXCEPTION_SOFTWARE_ORIGINATE 0x80 /* * The exception record used by Win32 to give additional information

1 0

Paul Gofman : ntdll/tests: Adjust test_nested_exception() for Win11 results.
by Alexandre Julliard 05 Sep '23

05 Sep '23

Module: wine Branch: master Commit: 7eaa5119b7f2a4f316689922be0a74dd1c7bd70f URL: https://gitlab.winehq.org/wine/wine/-/commit/7eaa5119b7f2a4f316689922be0a74… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 4 13:33:44 2023 -0600 ntdll/tests: Adjust test_nested_exception() for Win11 results. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55238 --- dlls/ntdll/tests/exception.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 4b31ded98b7..c50dfde753b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4947,7 +4947,8 @@ static DWORD nested_exception_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRAT return ExceptionContinueExecution; } - if (rec->ExceptionCode == 0xdeadbeef && rec->ExceptionFlags == EH_NESTED_CALL) + if (rec->ExceptionCode == 0xdeadbeef && (rec->ExceptionFlags == EH_NESTED_CALL + || rec->ExceptionFlags == (EH_NESTED_CALL | EXCEPTION_SOFTWARE_ORIGINATE))) { ok(!rec->NumberParameters, "Got unexpected rec->NumberParameters %lu.\n", rec->NumberParameters); got_nested_exception = TRUE; @@ -4955,7 +4956,7 @@ static DWORD nested_exception_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRAT return ExceptionContinueSearch; } - ok(rec->ExceptionCode == 0xdeadbeef && !rec->ExceptionFlags, + ok(rec->ExceptionCode == 0xdeadbeef && (!rec->ExceptionFlags || rec->ExceptionFlags == EXCEPTION_SOFTWARE_ORIGINATE), "Got unexpected exception code %#lx, flags %#lx.\n", rec->ExceptionCode, rec->ExceptionFlags); ok(!rec->NumberParameters, "Got unexpected rec->NumberParameters %lu.\n", rec->NumberParameters); ok(frame == (void *)((BYTE *)nested_exception_initial_frame + 8),

1 0

Paul Gofman : ntdll/tests: Adjust test_extended_context() for Win11 results.
by Alexandre Julliard 05 Sep '23

05 Sep '23

Module: wine Branch: master Commit: 53bf758a96151e002d2bba502aa00b6c63e8074d URL: https://gitlab.winehq.org/wine/wine/-/commit/53bf758a96151e002d2bba502aa00b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 4 15:16:31 2023 -0600 ntdll/tests: Adjust test_extended_context() for Win11 results. --- dlls/ntdll/tests/exception.c | 83 ++++++++++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index c50dfde753b..58cf8ca8eea 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -9894,6 +9894,20 @@ static void wait_for_thread_next_suspend(HANDLE thread) #define CONTEXT_NATIVE (CONTEXT_XSTATE & CONTEXT_CONTROL) +struct context_parameters +{ + ULONG flag; + ULONG supported_flags; + ULONG broken_flags; + ULONG context_length; + ULONG legacy_length; + ULONG context_ex_length; + ULONG align; + ULONG flags_offset; + ULONG xsavearea_offset; + ULONG vector_reg_count; +}; + static void test_extended_context(void) { static BYTE except_code_reset_ymm_state[] = @@ -9915,20 +9929,7 @@ static void test_extended_context(void) 0xc3, /* ret */ }; - static const struct - { - ULONG flag; - ULONG supported_flags; - ULONG broken_flags; - ULONG context_length; - ULONG legacy_length; - ULONG context_ex_length; - ULONG align; - ULONG flags_offset; - ULONG xsavearea_offset; - ULONG vector_reg_count; - } - context_arch[] = + static const struct context_parameters context_arch_old[] = { { 0x00100000, /* CONTEXT_AMD64 */ @@ -9955,6 +9956,36 @@ static void test_extended_context(void) 8, }, }; + + static const struct context_parameters context_arch_new[] = + { + { + 0x00100000, /* CONTEXT_AMD64 */ + 0xf800005f, + 0xf8000000, + 0x4d0, /* sizeof(CONTEXT) */ + 0x4d0, /* sizeof(CONTEXT) */ + 0x20, /* sizeof(CONTEXT_EX) */ + 15, + 0x30, + 0x100, /* offsetof(CONTEXT, FltSave) */ + 16, + }, + { + 0x00010000, /* CONTEXT_X86 */ + 0xf800007f, + 0xf8000000, + 0x2cc, /* sizeof(CONTEXT) */ + 0xcc, /* offsetof(CONTEXT, ExtendedRegisters) */ + 0x20, /* sizeof(CONTEXT_EX) */ + 3, + 0, + 0xcc, /* offsetof(CONTEXT, ExtendedRegisters) */ + 8, + }, + }; + const struct context_parameters *context_arch; + const ULONG64 supported_features = 7, supported_compaction_mask = supported_features | ((ULONG64)1 << 63); ULONG expected_length, expected_length_xstate, context_flags, expected_offset; ULONG64 enabled_features, expected_compaction; @@ -10000,7 +10031,15 @@ static void test_extended_context(void) ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, "Got unexpected result ret %#lx, length %#lx.\n", ret, length); - for (test = 0; test < ARRAY_SIZE(context_arch); ++test) + ret = pRtlGetExtendedContextLength(context_arch_new[0].flag, &length); + ok(!ret, "Got %#lx.\n", ret); + if (length == context_arch_new[0].context_length + context_arch_new[0].context_ex_length + + context_arch_new[0].align) + context_arch = context_arch_new; + else + context_arch = context_arch_old; + + for (test = 0; test < 2; ++test) { expected_length = context_arch[test].context_length + context_arch[test].context_ex_length + context_arch[test].align; @@ -10031,18 +10070,19 @@ static void test_extended_context(void) } else { - ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, + ok((ret == STATUS_INVALID_PARAMETER || ret == STATUS_NOT_SUPPORTED) && length == 0xdeadbeef, "Got unexpected result ret %#lx, length %#lx, flags 0x%08lx.\n", ret, length, flags); } SetLastError(0xdeadbeef); bret = pInitializeContext(NULL, flags, NULL, &length2); ok(!bret && length2 == length && GetLastError() - == (!ret ? ERROR_INSUFFICIENT_BUFFER : ERROR_INVALID_PARAMETER), + == (!ret ? ERROR_INSUFFICIENT_BUFFER + : (ret == STATUS_INVALID_PARAMETER ? ERROR_INVALID_PARAMETER : ERROR_NOT_SUPPORTED)), "Got unexpected bret %#x, length2 %#lx, GetLastError() %lu, flags %#lx.\n", bret, length2, GetLastError(), flags); - if (GetLastError() == ERROR_INVALID_PARAMETER) + if (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_NOT_SUPPORTED) continue; SetLastError(0xdeadbeef); @@ -10074,11 +10114,11 @@ static void test_extended_context(void) ok(context_ex->All.Offset == -(int)context_arch[test].context_length, "Got unexpected Offset %ld, flags %#lx.\n", context_ex->All.Offset, flags); - /* No extra 8 bytes in x64 CONTEXT_EX here. */ + /* No extra 8 bytes in x64 CONTEXT_EX here (before Win11). */ ok(context_ex->All.Length == context_arch[test].context_length + context_arch[1].context_ex_length, "Got unexpected Length %#lx, flags %#lx.\n", context_ex->All.Length, flags); - ok(context_ex->XState.Offset == 25, + ok(context_ex->XState.Offset == context_arch[1].context_ex_length + 1, "Got unexpected Offset %ld, flags %#lx.\n", context_ex->XState.Offset, flags); ok(!context_ex->XState.Length, "Got unexpected Length %#lx, flags %#lx.\n", context_ex->XState.Length, flags); @@ -10608,8 +10648,7 @@ static void test_extended_context(void) *(void **)(call_func_code_set_ymm0 + call_func_offsets.ymm0_save) = data; memcpy(code_mem, call_func_code_set_ymm0, sizeof(call_func_code_set_ymm0)); xs->CompactionMask = 2; - if (!compaction_enabled) - xs->Mask = 0; + xs->Mask = compaction_enabled ? 2 : 0; context_ex->XState.Length = sizeof(XSTATE); bret = func();

1 0