March 2023 - Wine-commits - list.winehq.org

Rémi Bernon : winex11: Initialize IO_STATUS_BLOCK in X11DRV_GetICMProfile.
by Alexandre Julliard 07 Mar '23

07 Mar '23

Module: wine Branch: master Commit: eca1e4ea3666d0f9290f3bc2fc75f3e44e42656c URL: https://gitlab.winehq.org/wine/wine/-/commit/eca1e4ea3666d0f9290f3bc2fc75f3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 6 13:12:19 2023 +0100 winex11: Initialize IO_STATUS_BLOCK in X11DRV_GetICMProfile. To avoid invalid writes on WOW64 Nt calls. --- dlls/winex11.drv/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 54e6b9b2084..e3b0445379a 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1689,7 +1689,7 @@ BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size, else if ((buffer = get_icm_profile( &buflen ))) { static const WCHAR icm[] = {'.','i','c','m',0}; - IO_STATUS_BLOCK io; + IO_STATUS_BLOCK io = {{0}}; UINT64 hash = 0; HANDLE file; int status;

1 0

Jinoh Kang : riched20/tests: Don't specify DT_WORDBREAK in _check_txgetnaturalsize().
by Alexandre Julliard 07 Mar '23

07 Mar '23

Module: wine Branch: master Commit: f54a1dac64c89aea3fe02ae8c0d6eef43a0aa117 URL: https://gitlab.winehq.org/wine/wine/-/commit/f54a1dac64c89aea3fe02ae8c0d6ee… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Mar 6 22:29:43 2023 +0900 riched20/tests: Don't specify DT_WORDBREAK in _check_txgetnaturalsize(). Today, test_TxGetNaturalSize() creates a pop-up window with a fixed size (extent) of 100 x 100. The test function then proceeds to compute the natural size of rich edit control that fits the sample text "TestSomeText" and compare it to the RECT calculated by DrawText. Apparently, this test fails if the width of the sample text "TestSomeText" exceeds the width of the test window's client area. In this case, DrawText() with DT_WORDBREAK breaks the text into the two lines due to text wrapping; however, Rich Edit's ITextServices::TxGetNaturalSize implementation does not seem to perform text wrapping on overflow. This results in extent mismatch. (Note that the test may either succeed or fail depending on the current font used for DEFAULT_GUI_FONT, which defaults to Tahoma according to Microsoft's documentation. To reproduce this failure, it may be necessary to switch fonts or change the width of the pop-up window.) Fix this by omitting the DT_WORDBREAK flag for the DrawText() call in _check_txgetnaturalsize(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54637 --- dlls/riched20/tests/txtsrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index da8e9da5ea6..d75db465ce4 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -753,7 +753,7 @@ static void _check_txgetnaturalsize(HRESULT res, LONG width, LONG height, HDC hd RECT expected_rect = rect; LONG expected_width, expected_height; - DrawTextW(hdc, string, -1, &expected_rect, DT_LEFT | DT_CALCRECT | DT_NOCLIP | DT_EDITCONTROL | DT_WORDBREAK); + DrawTextW(hdc, string, -1, &expected_rect, DT_LEFT | DT_CALCRECT | DT_NOCLIP | DT_EDITCONTROL); expected_width = expected_rect.right - expected_rect.left; expected_height = expected_rect.bottom - expected_rect.top; ok_(__FILE__,line)(res == S_OK, "ITextServices_TxGetNaturalSize failed: 0x%08lx.\n", res);

1 0

Francois Gouget : msado15: Fix the spelling of a comment.
by Alexandre Julliard 07 Mar '23

07 Mar '23

Module: wine Branch: master Commit: 6c6cc2cebc18b7ae15198f18cb4f1f899c1313fe URL: https://gitlab.winehq.org/wine/wine/-/commit/6c6cc2cebc18b7ae15198f18cb4f1f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 7 13:47:59 2023 +0100 msado15: Fix the spelling of a comment. --- dlls/msado15/recordset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index c22b2460147..54625158ac9 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1798,7 +1798,7 @@ static HRESULT WINAPI recordset_put_Filter( _Recordset *iface, VARIANT criteria if (V_VT(&criteria) == VT_BSTR && recordset->state == adStateOpen) { - FIXME("Validating fields not preformed\n"); + FIXME("Validating fields not performed\n"); } VariantCopy(&recordset->filter, &criteria);

1 0

Francois Gouget : winscard: Fix the spelling of a function parameter.
by Alexandre Julliard 07 Mar '23

07 Mar '23

Module: wine Branch: master Commit: 5f08c8fbcc0728222155e488f6fb72f93ad69457 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f08c8fbcc0728222155e488f6fb72… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 7 13:48:18 2023 +0100 winscard: Fix the spelling of a function parameter. --- dlls/winscard/winscard.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index c7954faa400..da4268442a2 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -713,7 +713,7 @@ LONG WINAPI SCardConnectW( SCARDCONTEXT context, const WCHAR *reader, DWORD shar return ret; } -LONG WINAPI SCardReconnect( SCARDHANDLE connect, DWORD share_mode, DWORD preferred_protocols, DWORD initalization, +LONG WINAPI SCardReconnect( SCARDHANDLE connect, DWORD share_mode, DWORD preferred_protocols, DWORD initialization, DWORD *protocol ) { struct handle *handle = (struct handle *)connect; @@ -721,14 +721,14 @@ LONG WINAPI SCardReconnect( SCARDHANDLE connect, DWORD share_mode, DWORD preferr UINT64 protocol64; LONG ret; - TRACE( "%Ix, %#lx, %#lx, %#lx, %p\n", connect, share_mode, preferred_protocols, initalization, protocol ); + TRACE( "%Ix, %#lx, %#lx, %#lx, %p\n", connect, share_mode, preferred_protocols, initialization, protocol ); if (!handle || handle->magic != CONNECT_MAGIC) return ERROR_INVALID_HANDLE; params.handle = handle->unix_handle; params.share_mode = share_mode; params.preferred_protocols = preferred_protocols; - params.initialization = initalization; + params.initialization = initialization; params.protocol = &protocol64; if (!(ret = UNIX_CALL( scard_reconnect, &params )) && protocol) *protocol = protocol64; TRACE( "returning %#lx\n", ret );

1 0

Francois Gouget : riched20/tests: Fix a typo in a comment.
by Alexandre Julliard 07 Mar '23

07 Mar '23

Module: wine Branch: master Commit: 145e3c758b9594596835e291b2fcb3c80e4c0479 URL: https://gitlab.winehq.org/wine/wine/-/commit/145e3c758b9594596835e291b2fcb3… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 15 06:04:05 2023 +0100 riched20/tests: Fix a typo in a comment. --- dlls/riched20/tests/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index e3801d5a611..4f4d637b687 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5856,7 +5856,7 @@ static void test_EM_FORMATRANGE(void) else if (! skip_non_english) ok (r < len, "Expected < %d, got %d\n", len, r); - /* There is at least on more page, but we don't care */ + /* There is at least one more page, but we don't care */ r = SendMessageA(hwndRichEdit, EM_FORMATRANGE, TRUE, 0); todo_wine {

1 0

Alexandre Julliard : ntdll/tests: Check the default stack information against the exe header.
by Alexandre Julliard 07 Mar '23

07 Mar '23

Module: wine Branch: master Commit: c2a2f1caadae9cc7f33cdcc1bacd1bd243dd4b07 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2a2f1caadae9cc7f33cdcc1bacd1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 11:06:09 2023 +0100 ntdll/tests: Check the default stack information against the exe header. --- dlls/ntdll/tests/threadpool.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index d8ca80a99a4..168f00c2852 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -579,6 +579,7 @@ static void CALLBACK simple2_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) static void test_tp_simple(void) { + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); TP_POOL_STACK_INFORMATION stack_info; TP_CALLBACK_ENVIRON environment; TP_CALLBACK_ENVIRON_V3 environment3; @@ -686,8 +687,8 @@ static void test_tp_simple(void) /* test querying and setting the stack size */ status = pTpQueryPoolStackInformation(pool, &stack_info); ok(!status, "TpQueryPoolStackInformation failed: %lx\n", status); - ok(stack_info.StackReserve == 2 * 1024 * 1024, "expected default StackReserve, got %ld\n", (ULONG)stack_info.StackReserve); - ok(stack_info.StackCommit == 4 * 1024, "expected default StackCommit, got %ld\n", (ULONG)stack_info.StackCommit); + ok(stack_info.StackReserve == nt->OptionalHeader.SizeOfStackReserve, "expected default StackReserve, got %Ix\n", stack_info.StackReserve); + ok(stack_info.StackCommit == nt->OptionalHeader.SizeOfStackCommit, "expected default StackCommit, got %Ix\n", stack_info.StackCommit); /* threadpool does not validate the stack size values */ stack_info.StackReserve = stack_info.StackCommit = 1;

1 0

Alexandre Julliard : ntdll/tests: Remove invalid instruction from KiUserExceptionDispatcher test.
by Alexandre Julliard 07 Mar '23

07 Mar '23

Module: wine Branch: master Commit: 16227352a6649375cf6d7fe828ba74bdf28794b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/16227352a6649375cf6d7fe828ba74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 11:08:01 2023 +0100 ntdll/tests: Remove invalid instruction from KiUserExceptionDispatcher test. It trips up box86. --- dlls/ntdll/tests/exception.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 94b2ccf61a6..90d90f3b64a 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1905,8 +1905,7 @@ static void test_kiuserexceptiondispatcher(void) 0x89, 0x79, 0x0c, /* mov %edi, 0xc(%ecx) */ 0x89, 0x69, 0x10, /* mov %ebp, 0x10(%ecx) */ 0x89, 0x61, 0x14, /* mov %esp, 0x14(%ecx) */ - - 0x67, 0x48, 0x8b, 0x71, 0xf0, /* mov -0x10(%ecx),%esi */ + 0x8b, 0x71, 0xf0, /* mov -0x10(%ecx),%esi */ 0xc3, /* ret */ };

1 0

Alexandre Julliard : ntdll/tests: Allow zero size return for NtQueryDirectoryObject on Wow64.
by Alexandre Julliard 07 Mar '23

07 Mar '23

Module: wine Branch: master Commit: 972a1192e0f96922b434e2fa4e2c5b5fadb74557 URL: https://gitlab.winehq.org/wine/wine/-/commit/972a1192e0f96922b434e2fa4e2c5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 11:53:53 2023 +0100 ntdll/tests: Allow zero size return for NtQueryDirectoryObject on Wow64. --- dlls/ntdll/tests/om.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index d663ebcb00f..afe3bad33b8 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2580,6 +2580,11 @@ static void test_query_directory(void) OBJECT_ATTRIBUTES attr; UNICODE_STRING string; NTSTATUS status; + BOOL is_wow64 = FALSE; + +#ifndef _WIN64 + if (!IsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; +#endif RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest" ); InitializeObjectAttributes( &attr, &string, 0, 0, NULL ); @@ -2591,14 +2596,14 @@ static void test_query_directory(void) status = NtQueryDirectoryObject( dir, info, 0, TRUE, TRUE, &context, &size ); ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); ok( context == 0xdeadbeef, "got context %#lx\n", context ); - ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + ok( size == sizeof(*info) || (is_wow64 && !size), "got size %lu\n", size ); context = 0xdeadbeef; size = 0xdeadbeef; status = NtQueryDirectoryObject( dir, info, 0, FALSE, TRUE, &context, &size ); todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); ok( context == 0xdeadbeef, "got context %#lx\n", context ); - todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + todo_wine ok( size == sizeof(*info) || (is_wow64 && !size), "got size %lu\n", size ); context = 0xdeadbeef; size = 0xdeadbeef; @@ -2606,7 +2611,7 @@ static void test_query_directory(void) status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); ok( context == 0xdeadbeef, "got context %#lx\n", context ); - ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + ok( size == sizeof(*info) || (is_wow64 && !size), "got size %lu\n", size ); if (size == sizeof(*info)) ok( !memcmp( &info[0], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); @@ -2616,7 +2621,7 @@ static void test_query_directory(void) status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, TRUE, &context, &size ); todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); ok( context == 0xdeadbeef, "got context %#lx\n", context ); - todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + todo_wine ok( size == sizeof(*info) || (is_wow64 && !size), "got size %lu\n", size ); if (size == sizeof(*info)) ok( !memcmp( &info[0], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); @@ -2673,7 +2678,7 @@ static void test_query_directory(void) status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); ok( context == 2, "got context %#lx\n", context ); - ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + ok( size == sizeof(*info) || (is_wow64 && !size), "got size %lu\n", size ); memset( buffer, 0xcc, sizeof(buffer) ); status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size );

1 0

Alexandre Julliard : wow64: In system calls always return the status from Wow64SystemServiceEx.
by Alexandre Julliard 07 Mar '23

07 Mar '23

Module: wine Branch: master Commit: 419e4d69d6c3a4ea8b355f8b3fc211950eed0cdd URL: https://gitlab.winehq.org/wine/wine/-/commit/419e4d69d6c3a4ea8b355f8b3fc211… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 17:21:29 2023 +0100 wow64: In system calls always return the status from Wow64SystemServiceEx. --- dlls/wow64/syscall.c | 17 ++++++++++++++++- dlls/wow64cpu/cpu.c | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index dd3937640bc..1feeac083d9 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -143,6 +143,19 @@ static EXCEPTION_RECORD *exception_record_32to64( const EXCEPTION_RECORD32 *rec3 } +static NTSTATUS get_context_return_value( void *wow_context ) +{ + switch (current_machine) + { + case IMAGE_FILE_MACHINE_I386: + return ((I386_CONTEXT *)wow_context)->Eax; + case IMAGE_FILE_MACHINE_ARMNT: + return ((ARM_CONTEXT *)wow_context)->R0; + } + return 0; +} + + /********************************************************************** * call_user_exception_dispatcher */ @@ -400,9 +413,11 @@ NTSTATUS WINAPI wow64_NtContinue( UINT *args ) void *context = get_ptr( &args ); BOOLEAN alertable = get_ulong( &args ); + NTSTATUS status = get_context_return_value( context ); + pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, context ); if (alertable) NtTestAlert(); - return STATUS_SUCCESS; + return status; } diff --git a/dlls/wow64cpu/cpu.c b/dlls/wow64cpu/cpu.c index 835353d9af8..13c94751d19 100644 --- a/dlls/wow64cpu/cpu.c +++ b/dlls/wow64cpu/cpu.c @@ -192,6 +192,7 @@ __ASM_GLOBAL_FUNC( syscall_32to64, "movq %rax,%rcx\n\t" /* syscall number */ "leaq 8(%r14),%rdx\n\t" /* parameters */ "call " __ASM_NAME("Wow64SystemServiceEx") "\n\t" + "movl %eax,0xb0(%r13)\n\t" /* context->Eax */ "syscall_32to64_return:\n\t" "movl 0x9c(%r13),%edi\n\t" /* context->Edi */

1 0

Alexandre Julliard : wow64: Push a valid return address when calling KiRaiseUserExceptionDispatcher.
by Alexandre Julliard 07 Mar '23

07 Mar '23

Module: wine Branch: master Commit: 96841d0358fe35c448fce4ad494a1db98f3f2e7a URL: https://gitlab.winehq.org/wine/wine/-/commit/96841d0358fe35c448fce4ad494a1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 17:21:40 2023 +0100 wow64: Push a valid return address when calling KiRaiseUserExceptionDispatcher. --- dlls/wow64/syscall.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 1feeac083d9..de5a42aec4f 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -278,6 +278,8 @@ static void call_raise_user_exception_dispatcher( ULONG code ) I386_CONTEXT ctx = { CONTEXT_I386_ALL }; pBTCpuGetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); + ctx.Esp -= sizeof(ULONG); + *(ULONG *)ULongToPtr( ctx.Esp ) = ctx.Eip; ctx.Eip = (ULONG_PTR)pKiRaiseUserExceptionDispatcher; pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); }

1 0