- Wine-Commits - list.winehq.org

Rémi Bernon : makedep: Use #pragma makedep testdll for TESTDLL resources.
by Alexandre Julliard Sept. 5, 2023

Sept. 5, 2023

Module: wine Branch: master Commit: 81da9ff0f8dea4932a3afdc4c447c1c9242bb596 URL: https://gitlab.winehq.org/wine/wine/-/commit/81da9ff0f8dea4932a3afdc4c447c1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 11 10:15:22 2023 +0200 makedep: Use #pragma makedep testdll for TESTDLL resources. --- dlls/combase/tests/wine.combase.test.c | 4 ++++ dlls/dinput/tests/driver_bus.c | 4 ++++ dlls/dinput/tests/driver_hid.c | 4 ++++ dlls/dinput/tests/driver_hid_poll.c | 4 ++++ dlls/imagehlp/tests/testdll.c | 4 ++++ dlls/imm32/tests/ime_wrapper.c | 4 ++++ dlls/kernel32/tests/dummy.c | 22 ++++++++++++++++++++ dlls/msi/tests/custom.c | 4 ++++ dlls/msi/tests/selfreg.c | 4 ++++ dlls/ntoskrnl.exe/tests/driver.c | 4 ++++ dlls/ntoskrnl.exe/tests/driver2.c | 4 ++++ dlls/ntoskrnl.exe/tests/driver3.c | 4 ++++ dlls/ntoskrnl.exe/tests/driver_netio.c | 4 ++++ dlls/ntoskrnl.exe/tests/driver_pnp.c | 4 ++++ dlls/ole32/tests/testlib.c | 4 ++++ dlls/setupapi/tests/coinst.c | 4 ++++ dlls/setupapi/tests/selfreg.c | 4 ++++ dlls/ucrtbase/tests/threaddll.c | 4 ++++ tools/makedep.c | 38 ++++++++++++++++++++++++---------- 19 files changed, 117 insertions(+), 11 deletions(-)

1 0

Rémi Bernon : windows.applicationmodel/tests: Add some IPackageManager tests.
by Alexandre Julliard Sept. 5, 2023

Sept. 5, 2023

Module: wine Branch: master Commit: 2f8fa39ddfdfc6c0a668927c5da97a8007eecc3c URL: https://gitlab.winehq.org/wine/wine/-/commit/2f8fa39ddfdfc6c0a668927c5da97a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 11 10:15:22 2023 +0200 windows.applicationmodel/tests: Add some IPackageManager tests. --- dlls/windows.applicationmodel/tests/model.c | 81 +++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/windows.applicationmodel/tests/model.c b/dlls/windows.applicationmodel/tests/model.c index a86da0e84ad..50513e45fd4 100644 --- a/dlls/windows.applicationmodel/tests/model.c +++ b/dlls/windows.applicationmodel/tests/model.c @@ -30,7 +30,11 @@ #define WIDL_using_Windows_Foundation_Collections #include "windows.foundation.h" #define WIDL_using_Windows_ApplicationModel +#define WIDL_using_Windows_ApplicationModel_Core +#define WIDL_using_Windows_Management_Deployment +#define WIDL_using_Windows_Storage #include "windows.applicationmodel.h" +#include "windows.management.deployment.h" #include "wine/test.h" @@ -47,6 +51,82 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) IUnknown_Release( unk ); } +static void test_PackageManager(void) +{ + static const WCHAR *statics_name = RuntimeClass_Windows_Management_Deployment_PackageManager; + IStorageFolder *storage_folder; + IStorageItem *storage_item; + IActivationFactory *factory; + IIterable_Package *packages; + IPackageManager *manager; + IIterator_Package *iter; + IPackage *package; + HSTRING str; + HRESULT hr; + LONG ref; + + hr = WindowsCreateString( statics_name, wcslen( statics_name ), &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + hr = RoGetActivationFactory( str, &IID_IActivationFactory, (void **)&factory ); + WindowsDeleteString( str ); + todo_wine + ok( hr == S_OK || broken( hr == REGDB_E_CLASSNOTREG ), "got hr %#lx.\n", hr ); + if (hr == REGDB_E_CLASSNOTREG) + { + todo_wine + win_skip( "%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w( statics_name ) ); + return; + } + + check_interface( factory, &IID_IUnknown ); + check_interface( factory, &IID_IInspectable ); + check_interface( factory, &IID_IAgileObject ); + + hr = IActivationFactory_ActivateInstance( factory, (IInspectable **)&manager ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + check_interface( manager, &IID_IUnknown ); + check_interface( manager, &IID_IInspectable ); + check_interface( manager, &IID_IAgileObject ); + check_interface( manager, &IID_IPackageManager ); + + hr = IPackageManager_FindPackages( manager, &packages ); + ok( hr == S_OK || broken(hr == E_ACCESSDENIED) /* w8adm */, "got hr %#lx.\n", hr ); + if (broken(hr == E_ACCESSDENIED)) + { + win_skip("Unable to list packages, skipping package manager tests\n"); + goto skip_tests; + } + + hr = IIterable_Package_First( packages, &iter ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IIterator_Package_get_Current( iter, &package ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IPackage_get_InstalledLocation( package, &storage_folder ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IStorageFolder_QueryInterface( storage_folder, &IID_IStorageItem, (void **)&storage_item ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IStorageItem_get_Path( storage_item, &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + WindowsDeleteString( str ); + ref = IStorageItem_Release( storage_item ); + ok( ref == 1, "got ref %ld.\n", ref ); + ref = IStorageFolder_Release( storage_folder ); + ok( !ref, "got ref %ld.\n", ref ); + IPackage_Release( package ); + ref = IIterator_Package_Release( iter ); + ok( !ref, "got ref %ld.\n", ref ); + ref = IIterable_Package_Release( packages ); + ok( !ref, "got ref %ld.\n", ref ); + +skip_tests: + ref = IPackageManager_Release( manager ); + ok( !ref, "got ref %ld.\n", ref ); + ref = IActivationFactory_Release( factory ); + ok( ref == 1, "got ref %ld.\n", ref ); +} + static void test_PackageStatics(void) { static const WCHAR *package_statics_name = L"Windows.ApplicationModel.Package"; @@ -82,6 +162,7 @@ START_TEST(model) hr = RoInitialize( RO_INIT_MULTITHREADED ); ok( hr == S_OK, "RoInitialize failed, hr %#lx\n", hr ); + test_PackageManager(); test_PackageStatics(); RoUninitialize();

1 0

Mohamad Al-Jaf : windows.applicationmodel: Add stub DLL.
by Alexandre Julliard Sept. 5, 2023

Sept. 5, 2023

Module: wine Branch: master Commit: 04c26b455f7deecbb5cdd56da89fd2c5266cc9c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/04c26b455f7deecbb5cdd56da89fd2… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Dec 18 22:14:58 2022 -0500 windows.applicationmodel: Add stub DLL. --- configure | 3 + configure.ac | 2 + dlls/windows.applicationmodel/Makefile.in | 9 ++ dlls/windows.applicationmodel/classes.idl | 33 ++++++ dlls/windows.applicationmodel/main.c | 46 ++++++++ dlls/windows.applicationmodel/package.c | 116 +++++++++++++++++++++ dlls/windows.applicationmodel/private.h | 40 +++++++ dlls/windows.applicationmodel/tests/Makefile.in | 5 + dlls/windows.applicationmodel/tests/model.c | 88 ++++++++++++++++ .../windows.applicationmodel.spec | 3 + include/windows.applicationmodel.core.idl | 2 + include/windows.applicationmodel.idl | 2 + 12 files changed, 349 insertions(+)

1 0

Biswapriyo Nath : include: Add AudioEffectsManager runtimeclass in windows.media.effects.idl.
by Alexandre Julliard Sept. 5, 2023

Sept. 5, 2023

Module: wine Branch: master Commit: 9ae771bac8e9ff5fda3e8bc1bb677c1ea731c9b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ae771bac8e9ff5fda3e8bc1bb677c… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 5 05:28:42 2023 +0000 include: Add AudioEffectsManager runtimeclass in windows.media.effects.idl. --- include/windows.media.effects.idl | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/include/windows.media.effects.idl b/include/windows.media.effects.idl index f0f8cba0c83..395d98df67f 100644 --- a/include/windows.media.effects.idl +++ b/include/windows.media.effects.idl @@ -22,6 +22,9 @@ import "inspectable.idl"; import "windows.foundation.idl"; +import "windows.media.idl"; +import "windows.media.capture.idl"; +import "windows.media.render.idl"; import "windows.storage.streams.idl"; namespace Windows.Media.Effects { @@ -29,11 +32,13 @@ namespace Windows.Media.Effects { interface IAudioCaptureEffectsManager; interface IAudioEffect; + interface IAudioEffectsManagerStatics; interface IAudioRenderEffectsManager; interface IAudioRenderEffectsManager2; runtimeclass AudioCaptureEffectsManager; runtimeclass AudioEffect; + runtimeclass AudioEffectsManager; runtimeclass AudioRenderEffectsManager; declare { @@ -102,6 +107,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.AudioEffectsManager), + uuid(66406c04-86fa-47cc-a315-f489d8c3fe10) + ] + interface IAudioEffectsManagerStatics : IInspectable + { + [overload("CreateAudioRenderEffectsManager")] + HRESULT CreateAudioRenderEffectsManager( + [in] HSTRING device_id, + [in] Windows.Media.Render.AudioRenderCategory category, + [out, retval] Windows.Media.Effects.AudioRenderEffectsManager **value + ); + [overload("CreateAudioRenderEffectsManager")] + HRESULT CreateAudioRenderEffectsManagerWithMode( + [in] HSTRING device_id, + [in] Windows.Media.Render.AudioRenderCategory category, + [in] Windows.Media.AudioProcessing mode, + [out, retval] Windows.Media.Effects.AudioRenderEffectsManager **value + ); + [overload("CreateAudioCaptureEffectsManager")] + HRESULT CreateAudioCaptureEffectsManager( + [in] HSTRING device_id, + [in] Windows.Media.Capture.MediaCategory category, + [out, retval] Windows.Media.Effects.AudioCaptureEffectsManager **value + ); + [overload("CreateAudioCaptureEffectsManager")] + HRESULT CreateAudioCaptureEffectsManagerWithMode( + [in] HSTRING device_id, + [in] Windows.Media.Capture.MediaCategory category, + [in] Windows.Media.AudioProcessing mode, + [out, retval] Windows.Media.Effects.AudioCaptureEffectsManager **value + ); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.Effects.AudioRenderEffectsManager), @@ -157,6 +197,16 @@ namespace Windows.Media.Effects { [default] interface Windows.Media.Effects.IAudioEffect; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Media.Effects.IAudioEffectsManagerStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(mta) + ] + runtimeclass AudioEffectsManager + { + } + [ 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 Sept. 5, 2023

Sept. 5, 2023

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

Biswapriyo Nath : include: Add AudioCaptureEffectsManager runtimeclass in windows.media.effects.idl.
by Alexandre Julliard Sept. 5, 2023

Sept. 5, 2023

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

Paul Gofman : ntdll/tests: Adjust test_raiseexception_regs() for Win11 results.
by Alexandre Julliard Sept. 5, 2023

Sept. 5, 2023

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_nested_exception() for Win11 results.
by Alexandre Julliard Sept. 5, 2023

Sept. 5, 2023

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 Sept. 5, 2023

Sept. 5, 2023

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

Paul Gofman : include: Define up to date exception flags.
by Alexandre Julliard Sept. 5, 2023

Sept. 5, 2023

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