January 2024 - Wine-commits

Hans Leidekker : sxs: Use wide character string literals.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: 755f6a0a2b214e3cd51e374235cbfd26c3934af0 URL: https://gitlab.winehq.org/wine/wine/-/commit/755f6a0a2b214e3cd51e374235cbfd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 12 13:29:27 2024 +0100 sxs: Use wide character string literals. --- dlls/sxs/cache.c | 72 ++++++++++++++++++++++---------------------------------- dlls/sxs/name.c | 29 ++++++++++------------- 2 files changed, 40 insertions(+), 61 deletions(-)

1 0

Hans Leidekker : sxs/tests: Use wide character string literals.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: 72dc82c03316d07a6176fb7aebeb08ce59790e08 URL: https://gitlab.winehq.org/wine/wine/-/commit/72dc82c03316d07a6176fb7aebeb08… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 12 13:56:02 2024 +0100 sxs/tests: Use wide character string literals. --- dlls/sxs/tests/cache.c | 87 +++++++++++++------------------------------------- dlls/sxs/tests/name.c | 55 ++++++++++--------------------- 2 files changed, 39 insertions(+), 103 deletions(-)

1 0

Hans Leidekker : sxs/tests: Get rid of workarounds for old Windows versions.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: b62d7e7a6607e8e88b1618e7f8590e00188250a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/b62d7e7a6607e8e88b1618e7f8590e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 12 13:58:44 2024 +0100 sxs/tests: Get rid of workarounds for old Windows versions. --- dlls/sxs/tests/cache.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/sxs/tests/cache.c b/dlls/sxs/tests/cache.c index dc84aebc867..6c3869e7b58 100644 --- a/dlls/sxs/tests/cache.c +++ b/dlls/sxs/tests/cache.c @@ -47,16 +47,13 @@ static void test_QueryAssemblyInfo( void ) ok( hr == E_INVALIDARG, "got %08lx\n", hr ); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, L"wine", NULL ); - ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ) || - broken(hr == E_INVALIDARG) /* winxp */, "got %08lx\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ), "got %08lx\n", hr ); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, L"wine,version=\"1.2.3.4\"", NULL ); - ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ) || - broken(hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND )) /* winxp */, "got %08lx\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ), "got %08lx\n", hr ); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, L"wine,version=\"1.2.3.4\",type=\"win32\"", NULL ); - ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ) || - broken(hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND )) /* winxp */, "got %08lx\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ), "got %08lx\n", hr ); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, L"wine,version=\"1.2.3.4\",type=\"win32\",processorArchitecture=\"x86\"", NULL );

1 0

Hans Leidekker : sxs/tests: Update QueryAssemblyInfo() test for Windows 10.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: 499fa1d9075b86937ece0811dfe3e4135bcc879a URL: https://gitlab.winehq.org/wine/wine/-/commit/499fa1d9075b86937ece0811dfe3e4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 12 14:19:01 2024 +0100 sxs/tests: Update QueryAssemblyInfo() test for Windows 10. --- dlls/sxs/tests/cache.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/sxs/tests/cache.c b/dlls/sxs/tests/cache.c index 6c3869e7b58..c3b9df86518 100644 --- a/dlls/sxs/tests/cache.c +++ b/dlls/sxs/tests/cache.c @@ -33,7 +33,7 @@ static void test_QueryAssemblyInfo( void ) ASSEMBLY_INFO info; IAssemblyCache *cache = NULL; WCHAR path[MAX_PATH]; - char comctl_path1[MAX_PATH], comctl_path2[MAX_PATH], comctl_path3[MAX_PATH], comctl_path4[MAX_PATH]; + char comctl_path1[MAX_PATH], comctl_path2[MAX_PATH]; const WCHAR *comctlW; hr = CreateAssemblyCache( &cache, 0 ); @@ -65,22 +65,12 @@ static void test_QueryAssemblyInfo( void ) GetWindowsDirectoryA( comctl_path1, MAX_PATH ); lstrcatA( comctl_path1, "\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef" ); GetWindowsDirectoryA( comctl_path2, MAX_PATH ); - lstrcatA( comctl_path2, "\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.3790.4770_x-ww_05fdf087" ); - GetWindowsDirectoryA( comctl_path3, MAX_PATH ); - lstrcatA( comctl_path3, "\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.8250.0_none_c119e7cca62b92bd" ); - GetWindowsDirectoryA( comctl_path4, MAX_PATH ); - lstrcatA( comctl_path4, "\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.7601.17514_none_41e6975e2bd6f2b2" ); + lstrcatA( comctl_path2, "\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.3636_none_a863d714867441db" ); if (GetFileAttributesA( comctl_path1 ) != INVALID_FILE_ATTRIBUTES) comctlW = L"microsoft.windows.common-controls,version=\"6.0.2600.2982\",type=\"win32\",processorArchitecture=\"x86\"," "publicKeyToken=\"6595b64144ccf1df\""; else if (GetFileAttributesA( comctl_path2 ) != INVALID_FILE_ATTRIBUTES) - comctlW = L"microsoft.windows.common-controls,version=\"6.0.3790.4770\",type=\"win32\",processorArchitecture=\"x86\"," - "publicKeyToken=\"6595b64144ccf1df\""; - else if (GetFileAttributesA( comctl_path3 ) != INVALID_FILE_ATTRIBUTES) - comctlW = L"microsoft.windows.common-controls,version=\"6.0.8250.0\",type=\"win32\",processorArchitecture=\"x86\"," - "publicKeyToken=\"6595b64144ccf1df\""; - else if (GetFileAttributesA( comctl_path4 ) != INVALID_FILE_ATTRIBUTES) - comctlW = L"microsoft.windows.common-controls,version=\"6.0.7601.17514\",type=\"win32\",processorArchitecture=\"x86\"," + comctlW = L"microsoft.windows.common-controls,version=\"6.0.19041.3636\",type=\"win32\",processorArchitecture=\"x86\"," "publicKeyToken=\"6595b64144ccf1df\""; else {

1 0

Hans Leidekker : sxs: Skip file copy when assembly is already installed.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: 54c7df15bb2026f3b0247cef9a4513d61f27ccaa URL: https://gitlab.winehq.org/wine/wine/-/commit/54c7df15bb2026f3b0247cef9a4513… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 12 14:20:56 2024 +0100 sxs: Skip file copy when assembly is already installed. --- dlls/sxs/cache.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index f9ecc454550..7dd5b067573 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -598,6 +598,13 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl dst = build_manifest_filename( assembly->arch, assembly->name, assembly->token, assembly->version ); if (!dst) return E_OUTOFMEMORY; + if (GetFileAttributesW( dst ) != INVALID_FILE_ATTRIBUTES) + { + free( dst ); + TRACE("manifest exists, skipping install\n"); + return S_OK; + } + ret = CopyFileW( manifest, dst, FALSE ); free( dst ); if (!ret)

1 0

Vijay Kiran Kamuju : concrt140: Add stub for _Cancellation_beacon::_Confirm_cancel().
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: 05a1062f95a176b1f019ac6f51dabfa4b052ae6c URL: https://gitlab.winehq.org/wine/wine/-/commit/05a1062f95a176b1f019ac6f51dabf… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jan 17 19:44:04 2024 +0100 concrt140: Add stub for _Cancellation_beacon::_Confirm_cancel(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56174 --- dlls/concrt140/concrt140.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/concurrency.c | 10 ++++++++++ 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 7ce3475df4e..f3a39a30599 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -450,9 +450,9 @@ @ stub -arch=win64 ?_ConcRT_CoreAssert(a)details@Concurrency@@YAXPEBD0H(a)Z @ stub -arch=win32 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPB_WZZ @ stub -arch=win64 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPEB_WZZ -@ stub -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ -@ stub -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ -@ stub -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ +@ cdecl -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ(ptr) _Cancellation_beacon__Confirm_cancel +@ thiscall -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ(ptr) _Cancellation_beacon__Confirm_cancel +@ cdecl -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ(ptr) _Cancellation_beacon__Confirm_cancel @ cdecl ?_CurrentContext(a)_Context@details(a)Concurrency@@SA?AV123(a)XZ() _Context__CurrentContext @ stub ?_Current_node(a)location@Concurrency@@SA?AV12(a)XZ @ stub -arch=arm ?_Destroy(a)_AsyncTaskCollection@details(a)Concurrency@@EAAXXZ diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 6a6d38db187..15ceae906c1 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -507,9 +507,9 @@ @ stub -arch=win64 ?_ConcRT_DumpMessage(a)details@Concurrency@@YAXPEB_WZZ @ stub -arch=win32 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPB_WZZ @ stub -arch=win64 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPEB_WZZ -@ stub -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ -@ stub -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ -@ stub -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ +@ cdecl -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ(ptr) _Cancellation_beacon__Confirm_cancel +@ thiscall -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ(ptr) _Cancellation_beacon__Confirm_cancel +@ cdecl -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ(ptr) _Cancellation_beacon__Confirm_cancel @ stub -arch=arm ?_Copy_str(a)exception@std@@AAAXPBD(a)Z @ stub -arch=i386 ?_Copy_str(a)exception@std@@AAEXPBD(a)Z @ stub -arch=win64 ?_Copy_str(a)exception@std@@AEAAXPEBD(a)Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 13d7e401133..2d6798a0af2 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -504,9 +504,9 @@ @ stub -arch=win64 ?_ConcRT_DumpMessage(a)details@Concurrency@@YAXPEB_WZZ @ stub -arch=win32 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPB_WZZ @ stub -arch=win64 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPEB_WZZ -@ stub -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ -@ stub -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ -@ stub -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ +@ cdecl -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ(ptr) _Cancellation_beacon__Confirm_cancel +@ thiscall -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ(ptr) _Cancellation_beacon__Confirm_cancel +@ cdecl -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ(ptr) _Cancellation_beacon__Confirm_cancel @ stub -arch=arm ?_Copy_str(a)exception@std@@AAAXPBD(a)Z @ stub -arch=i386 ?_Copy_str(a)exception@std@@AAEXPBD(a)Z @ stub -arch=win64 ?_Copy_str(a)exception@std@@AEAAXPEBD(a)Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 561c3774260..02a28330b54 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -501,9 +501,9 @@ @ stub -arch=win64 ?_ConcRT_DumpMessage(a)details@Concurrency@@YAXPEB_WZZ @ stub -arch=win32 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPB_WZZ @ stub -arch=win64 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPEB_WZZ -@ stub -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ -@ stub -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ -@ stub -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ +@ cdecl -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ(ptr) msvcr120.?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ +@ thiscall -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ(ptr) msvcr120.?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ +@ cdecl -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ(ptr) msvcr120.?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ @ stub -arch=arm ?_Copy_str(a)exception@std@@AAAXPBD(a)Z @ stub -arch=i386 ?_Copy_str(a)exception@std@@AAEXPBD(a)Z @ stub -arch=win64 ?_Copy_str(a)exception@std@@AEAAXPEBD(a)Z diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 2af2f3ff917..74bd8193476 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -3106,6 +3106,16 @@ void __thiscall _Cancellation_beacon_dtor(_Cancellation_beacon *this) free(this->beacon); } +/* ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ */ +/* ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ */ +/* ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ */ +DEFINE_THISCALL_WRAPPER(_Cancellation_beacon__Confirm_cancel, 4) +bool __thiscall _Cancellation_beacon__Confirm_cancel(_Cancellation_beacon *this) +{ + FIXME("(%p)\n", this); + return TRUE; +} + /* ??0_Condition_variable(a)details@Concurrency@@QAE(a)XZ */ /* ??0_Condition_variable(a)details@Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(_Condition_variable_ctor, 4)

1 0

Piotr Caban : concrt140: Add _Cancellation_beacon::_Confirm_cancel() implementation.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: bcda5979bec20702d9773d8e38737bf51da25d80 URL: https://gitlab.winehq.org/wine/wine/-/commit/bcda5979bec20702d9773d8e38737b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 18 19:56:25 2024 +0100 concrt140: Add _Cancellation_beacon::_Confirm_cancel() implementation. --- dlls/msvcr120/tests/msvcr120.c | 30 ++++++++++++++++++++++++------ dlls/msvcrt/concurrency.c | 14 ++++++++++---- 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 672be695c3d..c76db6582cf 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -184,7 +184,7 @@ typedef struct _UnrealizedChore } _UnrealizedChore; typedef struct { - MSVCRT_bool *cancelling; + long *cancelling; } _Cancellation_beacon; static char* (CDECL *p_setlocale)(int category, const char* locale); @@ -262,6 +262,7 @@ static MSVCRT_bool (__thiscall *p__StructuredTaskCollection__IsCanceling)(_Struc static _Cancellation_beacon* (__thiscall *p__Cancellation_beacon_ctor)(_Cancellation_beacon*); static void (__thiscall *p__Cancellation_beacon_dtor)(_Cancellation_beacon*); +static MSVCRT_bool (__thiscall *p__Cancellation_beacon__Confirm_cancel)(_Cancellation_beacon*); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(module,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -368,6 +369,8 @@ static BOOL init(void) "??0_Cancellation_beacon(a)details@Concurrency@@QEAA(a)XZ"); SET(p__Cancellation_beacon_dtor, "??1_Cancellation_beacon(a)details@Concurrency@@QEAA(a)XZ"); + SET(p__Cancellation_beacon__Confirm_cancel, + "?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ"); } else { #ifdef __arm__ SET(p__StructuredTaskCollection_ctor, @@ -416,6 +419,8 @@ static BOOL init(void) "??0_Cancellation_beacon(a)details@Concurrency@@QAA(a)XZ"); SET(p__Cancellation_beacon_dtor, "??1_Cancellation_beacon(a)details@Concurrency@@QAA(a)XZ"); + SET(p__Cancellation_beacon__Confirm_cancel, + "?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ"); #else SET(p__StructuredTaskCollection_ctor, "??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z"); @@ -463,6 +468,8 @@ static BOOL init(void) "??0_Cancellation_beacon(a)details@Concurrency@@QAE(a)XZ"); SET(p__Cancellation_beacon_dtor, "??1_Cancellation_beacon(a)details@Concurrency@@QAE(a)XZ"); + SET(p__Cancellation_beacon__Confirm_cancel, + "?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ"); #endif SET(p_Context_CurrentContext, "?CurrentContext(a)Context@Concurrency@@SAPAV12(a)XZ"); @@ -1415,11 +1422,16 @@ static void __cdecl chore_proc(_UnrealizedChore *_this) "IsCurrentTaskCollectionCanceling returned TRUE\n"); call_func1(p__Cancellation_beacon_ctor, &beacon); - ok(!*beacon.cancelling, "beacon signalled %x\n", *beacon.cancelling); + ok(!*beacon.cancelling, "beacon signalled %lx\n", *beacon.cancelling); call_func1(p__Cancellation_beacon_ctor, &beacon2); ok(beacon.cancelling != beacon2.cancelling, "beacons point to the same data\n"); - ok(!*beacon.cancelling, "beacon signalled %x\n", *beacon.cancelling); + ok(!*beacon.cancelling, "beacon signalled %lx\n", *beacon.cancelling); + + canceling = call_func1(p__Cancellation_beacon__Confirm_cancel, &beacon); + ok(!canceling, "_Confirm_cancel returned TRUE\n"); + ok(*beacon.cancelling == -1, "beacon signalled %lx\n", *beacon.cancelling); + *beacon.cancelling = 0; } if (!chore->wait_event) @@ -1448,13 +1460,19 @@ static void __cdecl chore_proc(_UnrealizedChore *_this) ok(p_Context_IsCurrentTaskCollectionCanceling(), "IsCurrentTaskCollectionCanceling returned FALSE\n"); - ok(*beacon.cancelling == 1, "beacon not signalled (%x)\n", *beacon.cancelling); + ok(*beacon.cancelling == 1, "beacon not signalled (%lx)\n", *beacon.cancelling); + canceling = call_func1(p__Cancellation_beacon__Confirm_cancel, &beacon); + ok(canceling, "_Confirm_cancel returned FALSE\n"); + ok(*beacon.cancelling == 1, "beacon not signalled (%lx)\n", *beacon.cancelling); call_func1(p__Cancellation_beacon_dtor, &beacon); - ok(*beacon2.cancelling == 1, "beacon not signalled (%x)\n", *beacon2.cancelling); + ok(*beacon2.cancelling == 1, "beacon not signalled (%lx)\n", *beacon2.cancelling); call_func1(p__Cancellation_beacon_dtor, &beacon2); call_func1(p__Cancellation_beacon_ctor, &beacon); - ok(*beacon.cancelling == 1, "beacon not signalled (%x)\n", *beacon.cancelling); + ok(*beacon.cancelling == 1, "beacon not signalled (%lx)\n", *beacon.cancelling); + canceling = call_func1(p__Cancellation_beacon__Confirm_cancel, &beacon); + ok(canceling, "_Confirm_cancel returned FALSE\n"); + ok(*beacon.cancelling == 1, "beacon not signalled (%lx)\n", *beacon.cancelling); call_func1(p__Cancellation_beacon_dtor, &beacon); } } diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 74bd8193476..68091c21e60 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -98,7 +98,7 @@ struct scheduler_list { }; struct beacon { - bool cancelling; + LONG cancelling; struct list entry; struct _StructuredTaskCollection *task_collection; }; @@ -2143,7 +2143,7 @@ void __thiscall _StructuredTaskCollection__Cancel( EnterCriticalSection(&((ExternalContextBase*)this->context)->beacons_cs); LIST_FOR_EACH_ENTRY(beacon, &((ExternalContextBase*)this->context)->beacons, struct beacon, entry) { if (beacon->task_collection == this) - beacon->cancelling = TRUE; + InterlockedIncrement(&beacon->cancelling); } LeaveCriticalSection(&((ExternalContextBase*)this->context)->beacons_cs); @@ -3112,8 +3112,14 @@ void __thiscall _Cancellation_beacon_dtor(_Cancellation_beacon *this) DEFINE_THISCALL_WRAPPER(_Cancellation_beacon__Confirm_cancel, 4) bool __thiscall _Cancellation_beacon__Confirm_cancel(_Cancellation_beacon *this) { - FIXME("(%p)\n", this); - return TRUE; + bool ret; + + TRACE("(%p)\n", this); + + ret = Context_IsCurrentTaskCollectionCanceling(); + if (!ret) + InterlockedDecrement(&this->beacon->cancelling); + return ret; } /* ??0_Condition_variable(a)details@Concurrency@@QAE(a)XZ */

1 0

Alexandre Julliard : winevulkan: Return result through NtCallbackReturn for the debug callbacks.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: 643538a836f33b4996730cf05dc2af77667d6150 URL: https://gitlab.winehq.org/wine/wine/-/commit/643538a836f33b4996730cf05dc2af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 19 13:42:14 2024 +0100 winevulkan: Return result through NtCallbackReturn for the debug callbacks. --- dlls/winevulkan/loader.c | 14 +++++++++----- dlls/winevulkan/vulkan.c | 13 ++++++------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 19fd240f0cb..8ef256f61f0 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -602,15 +602,19 @@ void WINAPI vkFreeCommandBuffers(VkDevice device, VkCommandPool cmd_pool, uint32 } } -static BOOL WINAPI call_vulkan_debug_report_callback( struct wine_vk_debug_report_params *params, ULONG size ) +static NTSTATUS WINAPI call_vulkan_debug_report_callback( void *args, ULONG size ) { - return params->user_callback(params->flags, params->object_type, params->object_handle, params->location, - params->code, params->layer_prefix, params->message, params->user_data); + struct wine_vk_debug_report_params *params = args; + VkBool32 ret = params->user_callback(params->flags, params->object_type, params->object_handle, params->location, + params->code, params->layer_prefix, params->message, params->user_data); + return NtCallbackReturn( &ret, sizeof(ret), STATUS_SUCCESS ); } -static BOOL WINAPI call_vulkan_debug_utils_callback( struct wine_vk_debug_utils_params *params, ULONG size ) +static NTSTATUS WINAPI call_vulkan_debug_utils_callback( void *args, ULONG size ) { - return params->user_callback(params->severity, params->message_types, &params->data, params->user_data); + struct wine_vk_debug_utils_params *params = args; + VkBool32 ret = params->user_callback(params->severity, params->message_types, &params->data, params->user_data); + return NtCallbackReturn( &ret, sizeof(ret), STATUS_SUCCESS ); } BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 2691624db66..c999363e268 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -118,7 +118,6 @@ static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagB struct wine_debug_utils_messenger *object; void *ret_ptr; ULONG ret_len; - VkBool32 result; unsigned int i; TRACE("%i, %u, %p, %p\n", severity, message_types, callback_data, user_data); @@ -166,12 +165,11 @@ static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagB params.data.pObjects = object_name_infos; /* applications should always return VK_FALSE */ - result = KeUserModeCallback( NtUserCallVulkanDebugUtilsCallback, &params, sizeof(params), - &ret_ptr, &ret_len ); + KeUserModeCallback( NtUserCallVulkanDebugUtilsCallback, &params, sizeof(params), &ret_ptr, &ret_len ); free(object_name_infos); - - return result; + if (ret_len == sizeof(VkBool32)) return *(VkBool32 *)ret_ptr; + return VK_FALSE; } static VkBool32 debug_report_callback_conversion(VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT object_type, @@ -207,8 +205,9 @@ static VkBool32 debug_report_callback_conversion(VkDebugReportFlagsEXT flags, Vk if (!params.object_handle) params.object_type = VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT; - return KeUserModeCallback( NtUserCallVulkanDebugReportCallback, &params, sizeof(params), - &ret_ptr, &ret_len ); + KeUserModeCallback( NtUserCallVulkanDebugReportCallback, &params, sizeof(params), &ret_ptr, &ret_len ); + if (ret_len == sizeof(VkBool32)) return *(VkBool32 *)ret_ptr; + return VK_FALSE; } static void wine_vk_physical_device_free(struct wine_phys_dev *phys_dev)

1 0

Alexandre Julliard : wineandroid.drv: Return result through NtCallbackReturn for the start device callback.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: be44253c9497724f5418cf8b4dbe8637aade5884 URL: https://gitlab.winehq.org/wine/wine/-/commit/be44253c9497724f5418cf8b4dbe86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 19 13:43:10 2024 +0100 wineandroid.drv: Return result through NtCallbackReturn for the start device callback. --- dlls/wineandroid.drv/device.c | 3 ++- dlls/wineandroid.drv/dllmain.c | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index b8f6f97eec7..140ae82fe26 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -1177,7 +1177,8 @@ void start_android_device(void) { void *ret_ptr; ULONG ret_len; - thread = ULongToHandle( KeUserModeCallback( client_start_device, NULL, 0, &ret_ptr, &ret_len )); + KeUserModeCallback( client_start_device, NULL, 0, &ret_ptr, &ret_len ); + if (ret_len == sizeof(thread)) thread = *(HANDLE *)ret_ptr; } diff --git a/dlls/wineandroid.drv/dllmain.c b/dlls/wineandroid.drv/dllmain.c index 1045a902ae9..ceda9c5dfb2 100644 --- a/dlls/wineandroid.drv/dllmain.c +++ b/dlls/wineandroid.drv/dllmain.c @@ -34,7 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(android); extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); static HANDLE stop_event; -static HANDLE thread; static NTSTATUS WINAPI ioctl_callback( DEVICE_OBJECT *device, IRP *irp ) @@ -97,10 +96,10 @@ static NTSTATUS WINAPI android_start_device(void *param, ULONG size) HANDLE handles[2]; handles[0] = CreateEventW( NULL, TRUE, FALSE, NULL ); - handles[1] = thread = CreateThread( NULL, 0, device_thread, handles[0], 0, NULL ); + handles[1] = CreateThread( NULL, 0, device_thread, handles[0], 0, NULL ); WaitForMultipleObjects( 2, handles, FALSE, INFINITE ); CloseHandle( handles[0] ); - return HandleToULong( thread ); + return NtCallbackReturn( &handles[1], sizeof(handles[1]), STATUS_SUCCESS ); }

1 0

Alexandre Julliard : winex11.drv: Return result through NtCallbackReturn for the drag and drop callbacks.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: 5cd386143864431611560247aa691592518b5bed URL: https://gitlab.winehq.org/wine/wine/-/commit/5cd386143864431611560247aa6915… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 19 13:46:34 2024 +0100 winex11.drv: Return result through NtCallbackReturn for the drag and drop callbacks. --- dlls/winex11.drv/dllmain.c | 18 ++---------------- dlls/winex11.drv/event.c | 19 +++++++++++++++---- dlls/winex11.drv/unixlib.h | 20 +++----------------- dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/x11drv_dll.h | 5 ++--- dlls/winex11.drv/x11drv_main.c | 7 ------- dlls/winex11.drv/xdnd.c | 21 +++++++++++++-------- 7 files changed, 35 insertions(+), 56 deletions(-) diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index b0a579e4ee2..dbda015fd50 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -25,28 +25,14 @@ HMODULE x11drv_module = 0; -typedef NTSTATUS (*callback_func)( UINT arg ); -static const callback_func callback_funcs[] = -{ - x11drv_dnd_drop_event, - x11drv_dnd_leave_event, -}; - -C_ASSERT( ARRAYSIZE(callback_funcs) == client_funcs_count ); - -static NTSTATUS WINAPI x11drv_callback( void *arg, ULONG size ) -{ - struct client_callback_params *params = arg; - return callback_funcs[params->id]( params->arg ); -} - typedef NTSTATUS (WINAPI *kernel_callback)( void *params, ULONG size ); static const kernel_callback kernel_callbacks[] = { - x11drv_callback, x11drv_dnd_enter_event, x11drv_dnd_position_event, x11drv_dnd_post_drop, + x11drv_dnd_drop_event, + x11drv_dnd_leave_event, }; C_ASSERT( NtUserDriverCallbackFirst + ARRAYSIZE(kernel_callbacks) == client_func_last ); diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 97ebf4ae0d6..aafb89a4fed 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1754,13 +1754,18 @@ static void handle_xdnd_position_event( HWND hwnd, XClientMessageEvent *event ) { struct dnd_position_event_params params; XClientMessageEvent e; + void *ret_ptr; + ULONG ret_len; UINT effect; params.hwnd = HandleToUlong( hwnd ); params.point = root_to_virtual_screen( event->data.l[2] >> 16, event->data.l[2] & 0xFFFF ); params.effect = effect = xdnd_action_to_drop_effect( event->data.l[4] ); - effect = x11drv_client_func( client_func_dnd_position_event, &params, sizeof(params) ); + if (KeUserModeCallback( client_func_dnd_position_event, &params, sizeof(params), + &ret_ptr, &ret_len ) || ret_len != sizeof(effect)) + return; + effect = *(UINT *)ret_ptr; TRACE( "actionRequested(%ld) chosen(0x%x) at x(%d),y(%d)\n", event->data.l[4], effect, (int)params.point.x, (int)params.point.y ); @@ -1786,9 +1791,15 @@ static void handle_xdnd_position_event( HWND hwnd, XClientMessageEvent *event ) static void handle_xdnd_drop_event( HWND hwnd, XClientMessageEvent *event ) { XClientMessageEvent e; - DWORD effect; + void *ret_ptr; + ULONG ret_len; + ULONG arg = HandleToUlong( hwnd ); + UINT effect; - effect = x11drv_client_call( client_dnd_drop_event, HandleToUlong( hwnd )); + if (KeUserModeCallback( client_func_dnd_drop_event, &arg, sizeof(arg), + &ret_ptr, &ret_len ) || ret_len != sizeof(effect)) + return; + effect = *(UINT *)ret_ptr; /* Tell the target we are finished. */ memset( &e, 0, sizeof(e) ); @@ -1806,7 +1817,7 @@ static void handle_xdnd_drop_event( HWND hwnd, XClientMessageEvent *event ) static void handle_xdnd_leave_event( HWND hwnd, XClientMessageEvent *event ) { - x11drv_client_call( client_dnd_leave_event, 0 ); + x11drv_client_func( client_func_dnd_leave_event, NULL, 0 ); } diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index 9f3f7ec2926..0be0d5dae86 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -55,30 +55,16 @@ struct xim_preedit_state_params /* driver client callbacks exposed with KernelCallbackTable interface */ enum x11drv_client_funcs { - client_func_callback = NtUserDriverCallbackFirst, - client_func_dnd_enter_event, + client_func_dnd_enter_event = NtUserDriverCallbackFirst, client_func_dnd_position_event, client_func_dnd_post_drop, + client_func_dnd_drop_event, + client_func_dnd_leave_event, client_func_last }; C_ASSERT( client_func_last <= NtUserDriverCallbackLast + 1 ); -/* simplified interface for client callbacks requiring only a single UINT parameter */ -enum client_callback -{ - client_dnd_drop_event, - client_dnd_leave_event, - client_funcs_count -}; - -/* x11drv_callback params */ -struct client_callback_params -{ - UINT id; - UINT arg; -}; - /* x11drv_dnd_enter_event and x11drv_dnd_post_drop params */ struct format_entry { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6bd671db3ff..d5edb9ba377 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -844,7 +844,6 @@ extern NTSTATUS x11drv_tablet_info( void *arg ); extern NTSTATUS x11drv_client_func( enum x11drv_client_funcs func, const void *params, ULONG size ); -extern NTSTATUS x11drv_client_call( enum client_callback func, UINT arg ); /* GDI helpers */ diff --git a/dlls/winex11.drv/x11drv_dll.h b/dlls/winex11.drv/x11drv_dll.h index 89b8d50057e..bc68c3996c3 100644 --- a/dlls/winex11.drv/x11drv_dll.h +++ b/dlls/winex11.drv/x11drv_dll.h @@ -30,9 +30,8 @@ extern NTSTATUS WINAPI x11drv_dnd_enter_event( void *params, ULONG size ); extern NTSTATUS WINAPI x11drv_dnd_position_event( void *params, ULONG size ); extern NTSTATUS WINAPI x11drv_dnd_post_drop( void *data, ULONG size ); - -extern NTSTATUS x11drv_dnd_drop_event( UINT arg ); -extern NTSTATUS x11drv_dnd_leave_event( UINT arg ); +extern NTSTATUS WINAPI x11drv_dnd_drop_event( void *params, ULONG size ); +extern NTSTATUS WINAPI x11drv_dnd_leave_event( void *params, ULONG size ); extern LRESULT WINAPI foreign_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ); diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index d1f31081b09..1b9555bcfbf 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -1305,13 +1305,6 @@ NTSTATUS x11drv_client_func( enum x11drv_client_funcs id, const void *params, UL } -NTSTATUS x11drv_client_call( enum client_callback func, UINT arg ) -{ - struct client_callback_params params = { .id = func, .arg = arg }; - return x11drv_client_func( client_func_callback, &params, sizeof(params) ); -} - - const unixlib_entry_t __wine_unix_call_funcs[] = { x11drv_init, diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 0e1a747b604..1d3171538cb 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -20,6 +20,8 @@ */ #define COBJMACROS +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "x11drv_dll.h" #include "shellapi.h" #include "shlobj.h" @@ -246,11 +248,13 @@ NTSTATUS WINAPI x11drv_dnd_position_event( void *arg, ULONG size ) } } - return accept ? effect : DROPEFFECT_NONE; + if (!accept) effect = DROPEFFECT_NONE; + return NtCallbackReturn( &effect, sizeof(effect), STATUS_SUCCESS ); } -NTSTATUS x11drv_dnd_drop_event( UINT arg ) +NTSTATUS WINAPI x11drv_dnd_drop_event( void *args, ULONG size ) { + HWND hwnd = UlongToHandle( *(ULONG *)args ); IDropTarget *dropTarget; DWORD effect = XDNDDropEffect; int accept = 0; /* Assume we're not accepting */ @@ -303,7 +307,7 @@ NTSTATUS x11drv_dnd_drop_event( UINT arg ) /* Only send WM_DROPFILES if Drop didn't succeed or DROPEFFECT_NONE was set. * Doing both causes winamp to duplicate the dropped files (#29081) */ - HWND hwnd_drop = window_accepting_files(window_from_point_dnd( UlongToHandle(arg), XDNDxy )); + HWND hwnd_drop = window_accepting_files(window_from_point_dnd( hwnd, XDNDxy )); if (hwnd_drop && X11DRV_XDND_HasHDROP()) { @@ -319,7 +323,8 @@ NTSTATUS x11drv_dnd_drop_event( UINT arg ) TRACE("effectRequested(0x%lx) accept(%d) performed(0x%lx) at x(%ld),y(%ld)\n", XDNDDropEffect, accept, effect, XDNDxy.x, XDNDxy.y); - return accept ? effect : DROPEFFECT_NONE; + if (!accept) effect = DROPEFFECT_NONE; + return NtCallbackReturn( &effect, sizeof(effect), STATUS_SUCCESS ); } /************************************************************************** @@ -327,7 +332,7 @@ NTSTATUS x11drv_dnd_drop_event( UINT arg ) * * Handle an XdndLeave event. */ -NTSTATUS x11drv_dnd_leave_event( UINT arg ) +NTSTATUS WINAPI x11drv_dnd_leave_event( void *params, ULONG size ) { IDropTarget *dropTarget; @@ -347,7 +352,7 @@ NTSTATUS x11drv_dnd_leave_event( UINT arg ) } X11DRV_XDND_FreeDragDropOp(); - return 0; + return STATUS_SUCCESS; } @@ -365,7 +370,7 @@ NTSTATUS WINAPI x11drv_dnd_enter_event( void *params, ULONG size ) memcpy( xdnd_formats, formats, size ); xdnd_formats_end = (struct format_entry *)((char *)xdnd_formats + size); } - return 0; + return STATUS_SUCCESS; } @@ -731,5 +736,5 @@ NTSTATUS WINAPI x11drv_dnd_post_drop( void *data, ULONG size ) PostMessageW( hwnd, WM_DROPFILES, (WPARAM)handle, 0 ); } - return 0; + return STATUS_SUCCESS; }

1 0