December 2022 - Wine-commits

Eric Pouech : ntdll: Fix export and calling convention of RtlUlonglongByteSwap().
by Alexandre Julliard 16 Dec '22

16 Dec '22

Module: wine Branch: master Commit: 495711c251bad8d39e13af7addfaccc938a2a670 URL: https://gitlab.winehq.org/wine/wine/-/commit/495711c251bad8d39e13af7addfacc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Dec 12 16:58:12 2022 +0100 ntdll: Fix export and calling convention of RtlUlonglongByteSwap(). The RtlU*ByteSwap() family: - has FASTCALL calling convention - is only exported from ntdll and ntoskrnl.exe in 32bit mode (didn't check ARM though) Wine's support for RtlUlonglongByteSwap() doesn't follow these constraints. Note: in __fastcall, 64bit paramaters are passed on the stack, to RtlUlonglongByteSwap() calling convention acts as __stdcall. So: - fix ntdll.spec (resp. ntoskrnl.exe.spec) to only export (resp. forward) RtlUlonglongByteSwap for i386 - always provide an inline implementation in winternl.h - reimplement ntdll.RtlUlonglongByteSwap() for i386 with __fastcall calling convention. - fix ntdll/tests/rtl.c to use correct calling convention. - add test in ntdll/tests/rtl.c for inlined version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53536 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 12 ++++++++---- dlls/ntdll/tests/rtl.c | 24 ++++++++++++++---------- dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/winternl.h | 15 +++++++-------- 6 files changed, 44 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1e6576a5422..5b4cbbaa7fe 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1039,7 +1039,7 @@ @ stdcall RtlTryEnterCriticalSection(ptr) @ stdcall RtlUTF8ToUnicodeN(ptr long ptr ptr long) @ cdecl -i386 -norelay RtlUlongByteSwap() NTDLL_RtlUlongByteSwap -@ cdecl -ret64 RtlUlonglongByteSwap(int64) +@ stdcall -fastcall -arch=i386 -norelay RtlUlonglongByteSwap(int64) # @ stub RtlUnhandledExceptionFilter2 # @ stub RtlUnhandledExceptionFilter @ stdcall RtlUnicodeStringToAnsiSize(ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 5ff6205fe05..00bc16bbfa5 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -641,10 +641,14 @@ DWORD WINAPI RtlComputeCrc32(DWORD dwInitial, const BYTE *pData, INT iLen) * RETURNS * The value with its bytes swapped. */ -ULONGLONG __cdecl RtlUlonglongByteSwap(ULONGLONG i) -{ - return ((ULONGLONG)RtlUlongByteSwap(i) << 32) | RtlUlongByteSwap(i>>32); -} +#ifdef __i386__ +__ASM_FASTCALL_FUNC(RtlUlonglongByteSwap, 8, + "movl 4(%esp),%edx\n\t" + "bswap %edx\n\t" + "movl 8(%esp),%eax\n\t" + "bswap %eax\n\t" + "ret $8") +#endif /************************************************************************* * RtlUlongByteSwap [NTDLL.@] diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 2e0bfb650e4..8f698454957 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -68,7 +68,7 @@ static VOID (WINAPI *pRtlMoveMemory)(LPVOID,LPCVOID,SIZE_T); static VOID (WINAPI *pRtlFillMemory)(LPVOID,SIZE_T,BYTE); static VOID (WINAPI *pRtlFillMemoryUlong)(LPVOID,SIZE_T,ULONG); static VOID (WINAPI *pRtlZeroMemory)(LPVOID,SIZE_T); -static ULONGLONG (WINAPIV *pRtlUlonglongByteSwap)(ULONGLONG source); +static ULONGLONG (FASTCALL *pRtlUlonglongByteSwap)(ULONGLONG source); static DWORD (WINAPI *pRtlGetThreadErrorMode)(void); static NTSTATUS (WINAPI *pRtlSetThreadErrorMode)(DWORD, LPDWORD); static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG); @@ -319,18 +319,22 @@ static void test_RtlZeroMemory(void) static void test_RtlUlonglongByteSwap(void) { - ULONGLONG result; + ULONGLONG llresult; - if ( !pRtlUlonglongByteSwap ) +#ifdef _WIN64 + /* the Rtl*ByteSwap() are always inlined and not exported from ntdll on 64bit */ + llresult = RtlUlonglongByteSwap( 0x7654321087654321ull ); + ok( 0x2143658710325476 == llresult, + "inlined RtlUlonglongByteSwap() returns %#I64x\n", llresult ); +#else + ok( pRtlUlonglongByteSwap != NULL, "RtlUlonglongByteSwap is not available\n"); + if ( pRtlUlonglongByteSwap ) { - win_skip("RtlUlonglongByteSwap is not available\n"); - return; + llresult = pRtlUlonglongByteSwap( 0x7654321087654321ull ); + ok( 0x2143658710325476ull == llresult, + "ntdll.RtlUlonglongByteSwap() returns %#I64x\n", llresult ); } - - result = pRtlUlonglongByteSwap( ((ULONGLONG)0x76543210 << 32) | 0x87654321 ); - ok( (((ULONGLONG)0x21436587 << 32) | 0x10325476) == result, - "RtlUlonglongByteSwap(0x7654321087654321) returns 0x%s, expected 0x2143658710325476\n", - wine_dbgstr_longlong(result)); +#endif } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ce92f6805ab..9548eb98542 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2185,6 +2185,19 @@ LONG FASTCALL NTOSKRNL_InterlockedIncrement( LONG volatile *dest ) return InterlockedIncrement( dest ); } +#ifdef __i386__ + +/************************************************************************* + * RtlUlonglongByteSwap (NTOSKRNL.EXE.@) + */ +__ASM_FASTCALL_FUNC(RtlUlonglongByteSwap, 8, + "movl 4(%esp),%edx\n\t" + "bswap %edx\n\t" + "movl 8(%esp),%eax\n\t" + "bswap %eax\n\t" + "ret $8") + +#endif /* __i386__ */ /*********************************************************************** * ExAllocatePool (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0a484829ca3..321083e5ac4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -68,7 +68,7 @@ @ stdcall -fastcall ObfReferenceObject(ptr) @ stub RtlPrefetchMemoryNonTemporal @ cdecl -i386 -norelay RtlUlongByteSwap() -@ cdecl -ret64 RtlUlonglongByteSwap(int64) +@ stdcall -fastcall -arch=i386 -norelay RtlUlonglongByteSwap(int64) @ cdecl -i386 -norelay RtlUshortByteSwap() @ stub WmiGetClock @ stub Kei386EoiHelper diff --git a/include/winternl.h b/include/winternl.h index 5a99827fe65..c720d962933 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4567,7 +4567,6 @@ NTSYSAPI BOOLEAN WINAPI RtlTryAcquireSRWLockExclusive(RTL_SRWLOCK *); NTSYSAPI BOOLEAN WINAPI RtlTryAcquireSRWLockShared(RTL_SRWLOCK *); NTSYSAPI BOOL WINAPI RtlTryEnterCriticalSection(RTL_CRITICAL_SECTION *); NTSYSAPI NTSTATUS WINAPI RtlUTF8ToUnicodeN(WCHAR*,DWORD,DWORD*,const char*,DWORD); -NTSYSAPI ULONGLONG __cdecl RtlUlonglongByteSwap(ULONGLONG); NTSYSAPI DWORD WINAPI RtlUnicodeStringToAnsiSize(const UNICODE_STRING*); NTSYSAPI NTSTATUS WINAPI RtlUnicodeStringToAnsiString(PANSI_STRING,PCUNICODE_STRING,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlUnicodeStringToInteger(const UNICODE_STRING *,ULONG,ULONG *); @@ -4733,20 +4732,20 @@ static inline BOOLEAN RtlCheckBit(PCRTL_BITMAP lpBits, ULONG ulBit) return FALSE; } -/* These are implemented as __fastcall, so we can't let Winelib apps link with them */ +/* These are implemented as __fastcall, so we can't let Winelib apps link with them. + * Moreover, they're always inlined and not exported on 64bit systems. + */ static inline USHORT RtlUshortByteSwap(USHORT s) { return (s >> 8) | (s << 8); } static inline ULONG RtlUlongByteSwap(ULONG i) { -#if defined(__i386__) && defined(__GNUC__) - ULONG ret; - __asm__("bswap %0" : "=r" (ret) : "0" (i) ); - return ret; -#else return ((ULONG)RtlUshortByteSwap((USHORT)i) << 16) | RtlUshortByteSwap((USHORT)(i >> 16)); -#endif +} +static inline ULONGLONG RtlUlonglongByteSwap(ULONGLONG i) +{ + return ((ULONGLONG)RtlUlongByteSwap((ULONG)i) << 32) | RtlUlongByteSwap((ULONG)(i >> 32)); } /* list manipulation macros */

1 0

Alexandre Julliard : winebuild: Use new ELF tag ids also on 64-bit.
by Alexandre Julliard 16 Dec '22

16 Dec '22

Module: wine Branch: master Commit: df31d3c7fe6365f0fc4098487311e93e186b0417 URL: https://gitlab.winehq.org/wine/wine/-/commit/df31d3c7fe6365f0fc4098487311e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 10:36:44 2022 +0100 winebuild: Use new ELF tag ids also on 64-bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53912 --- tools/winebuild/spec32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 97022996c95..0cf8d783633 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -1517,9 +1517,9 @@ static void fixup_elf64( const char *name, int fd, void *header, size_t header_s { switch (dyn[i].d_tag) { - case 25: dyn[i].d_tag = 0x60009990; break; /* DT_INIT_ARRAY */ - case 27: dyn[i].d_tag = 0x60009991; break; /* DT_INIT_ARRAYSZ */ - case 12: dyn[i].d_tag = 0x60009992; break; /* DT_INIT */ + case 25: dyn[i].d_tag = 0x60009994; break; /* DT_INIT_ARRAY */ + case 27: dyn[i].d_tag = 0x60009995; break; /* DT_INIT_ARRAYSZ */ + case 12: dyn[i].d_tag = 0x60009996; break; /* DT_INIT */ } } lseek( fd, phdr->p_offset, SEEK_SET );

1 0

Alexandre Julliard : winebuild: Disable relay for non-standard fastcall parameters.
by Alexandre Julliard 16 Dec '22

16 Dec '22

Module: wine Branch: master Commit: cb86bb92d2c35ed0d42c5f5677d5068a52b49203 URL: https://gitlab.winehq.org/wine/wine/-/commit/cb86bb92d2c35ed0d42c5f5677d506… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 17:07:28 2022 +0100 winebuild: Disable relay for non-standard fastcall parameters. --- tools/winebuild/parser.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 11b422bd435..141ed80eb26 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -309,16 +309,9 @@ static int parse_spec_arguments( ORDDEF *odp, DLLSPEC *spec, int optional ) error( "A fastcall function must use the stdcall convention\n" ); return 0; } - if (!i || (odp->u.func.args[0] != ARG_PTR && odp->u.func.args[0] != ARG_LONG)) - { - error( "First argument of a fastcall function must be a pointer or integer\n" ); - return 0; - } - if (i > 1 && odp->u.func.args[1] != ARG_PTR && odp->u.func.args[1] != ARG_LONG) - { - error( "Second argument of a fastcall function must be a pointer or integer\n" ); - return 0; - } + if ((i && odp->u.func.args[0] != ARG_PTR && odp->u.func.args[0] != ARG_LONG) || + (i > 1 && odp->u.func.args[1] != ARG_PTR && odp->u.func.args[1] != ARG_LONG)) + odp->flags |= FLAG_NORELAY; /* no relay debug possible for non-standard fastcall args */ } if (odp->flags & FLAG_SYSCALL) {

1 0

Alexandre Julliard : winegcc: Check for Mingw-style .dll.a import libraries.
by Alexandre Julliard 16 Dec '22

16 Dec '22

Module: wine Branch: master Commit: 3c235e053c7ca472b9169d0ef07b82c77843a549 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c235e053c7ca472b9169d0ef07b82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 15:49:00 2022 +0100 winegcc: Check for Mingw-style .dll.a import libraries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53918 --- tools/winegcc/utils.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index a93db878379..f79bfdf5877 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -138,7 +138,15 @@ static file_type guess_lib_type(struct target target, const char* dir, if ((*file = try_lib_path(dir, "", prefix, library, ".def", file_def))) return file_dll; } - else arch_dir = get_arch_dir( target ); + else + { + arch_dir = get_arch_dir( target ); + if (!strcmp( suffix, ".a" )) /* try Mingw-style .dll.a import lib */ + { + if ((*file = try_lib_path(dir, arch_dir, prefix, library, ".dll.a", file_arh))) + return file_arh; + } + } /* static archives */ if ((*file = try_lib_path(dir, arch_dir, prefix, library, suffix, file_arh)))

1 0

Eric Pouech : kernel32/tests: Fix a debugger test failing on Windows.
by Alexandre Julliard 15 Dec '22

15 Dec '22

Module: wine Branch: master Commit: 6e19585112fd358470e7cf62be18fd6a1a5e7605 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e19585112fd358470e7cf62be18fd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 15 17:36:32 2022 +0100 kernel32/tests: Fix a debugger test failing on Windows. Testing: kernel32:debugger, there's sometimes the following error: debugger.c:1760: Test failed: unexpected instruction pointer 778B2A0C Current test code has a workaround when this happens on last thread, but this is clearly not sufficient. Fix the test so that it grabs the thread context only in a place we're sure it's in stopped state at breakpoint instruction. (Current code likely catches cases where the thread is in bp signal handling). Rewrote the test to be in more logical order. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53143 --- dlls/kernel32/tests/debugger.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index abd59c93f88..1dc5bd5fb46 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -318,16 +318,6 @@ static void set_thread_context_(unsigned line, struct debugger_context *ctx, str ok_(__FILE__,line)(ret, "SetThreadContext failed: %lu\n", GetLastError()); } -static void fetch_process_context(struct debugger_context *ctx) -{ - struct debuggee_thread *thread; - - WINE_RB_FOR_EACH_ENTRY(thread, &ctx->threads, struct debuggee_thread, entry) - { - fetch_thread_context(thread); - } -} - #define WAIT_EVENT_TIMEOUT 20000 #define POLL_EVENT_TIMEOUT 200 @@ -1706,8 +1696,6 @@ static void test_debugger(const char *argv0) if (sizeof(loop_code) > 1) { - struct debuggee_thread *prev_thread; - memset(buf, OP_BP, sizeof(buf)); memcpy(proc_code, &loop_code, sizeof(loop_code)); ret = WriteProcessMemory(pi.hProcess, mem, buf, sizeof(buf), NULL); @@ -1735,9 +1723,6 @@ static void test_debugger(const char *argv0) expect_breakpoint_exception(&ctx, thread_proc + 1); exception_cnt = 1; - prev_thread = ctx.current_thread; - fetch_process_context(&ctx); - byte = 0xc3; /* ret */ ret = WriteProcessMemory(pi.hProcess, thread_proc + 1, &byte, 1, NULL); ok(ret, "WriteProcessMemory failed: %lu\n", GetLastError()); @@ -1746,6 +1731,10 @@ static void test_debugger(const char *argv0) { DEBUG_EVENT ev; + fetch_thread_context(ctx.current_thread); + ok(get_ip(&ctx.current_thread->ctx) == thread_proc + 2 + || broken(get_ip(&ctx.current_thread->ctx) == thread_proc), /* sometimes observed on win10 */ + "unexpected instruction pointer2 %p (%p)\n", get_ip(&ctx.current_thread->ctx), thread_proc); /* even when there are more pending events, they are not reported until current event is continued */ ret = WaitForDebugEvent(&ev, 10); ok(GetLastError() == ERROR_SEM_TIMEOUT, "WaitForDebugEvent returned %x(%lu)\n", ret, GetLastError()); @@ -1757,18 +1746,9 @@ static void test_debugger(const char *argv0) ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == thread_proc + 1, "ExceptionAddress = %p\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress); - ok(get_ip(&prev_thread->ctx) == thread_proc + 2 - || broken(get_ip(&prev_thread->ctx) == thread_proc), /* sometimes observed on win10 */ - "unexpected instruction pointer %p\n", get_ip(&prev_thread->ctx)); - prev_thread = ctx.current_thread; exception_cnt++; } - /* for some reason sometimes on Windows one thread has a different address. this is always the thread - * with the last reported exception, so we simply skip the check for the last exception unless it's the only one. */ - if (exception_cnt == 1) - ok(get_ip(&prev_thread->ctx) == thread_proc + 2, "unexpected instruction pointer %p\n", get_ip(&prev_thread->ctx)); - trace("received %u exceptions\n", exception_cnt); for (;;)

1 0

Alexandre Julliard : d3d9/tests: Mark a few more message tests as flaky.
by Alexandre Julliard 15 Dec '22

15 Dec '22

Module: wine Branch: master Commit: d3fa1962a07fbb35c742caeb2586cdbf5858d0e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/d3fa1962a07fbb35c742caeb2586cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 15 18:38:29 2022 +0100 d3d9/tests: Mark a few more message tests as flaky. --- dlls/d3d9/tests/d3d9ex.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index d1ea5587f3a..41f930a2408 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3094,6 +3094,7 @@ static void test_wndproc(void) expect_messages = focus_loss_messages_filtered; windowposchanged_received = 0; SetForegroundWindow(GetDesktopWindow()); + flaky_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); flaky_if(i == 0 || i == 1) @@ -3112,8 +3113,10 @@ static void test_wndproc(void) syscommand_received = 0; expect_messages = sc_restore_messages; SendMessageA(focus_window, WM_SYSCOMMAND, SC_RESTORE, 0); + flaky_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); + flaky ok(syscommand_received == 1, "Got unexpected number of WM_SYSCOMMAND messages: %ld.\n", syscommand_received); expect_messages = NULL; flush_events();

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard 15 Dec '22

15 Dec '22

Module: wine Branch: master Commit: ed0e5d9fc6b918d81136ee81cfd0d16790c35dfa URL: https://gitlab.winehq.org/wine/wine/-/commit/ed0e5d9fc6b918d81136ee81cfd0d1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 15 12:32:51 2022 -0700 po: Update Catalan translation. --- po/ca.po | 162 ++++++++++++++++++--------------------------------------------- 1 file changed, 46 insertions(+), 116 deletions(-)

1 0

Fabian Maurer : urlmon: Pass correct parameter to realloc and simplify code (Coverity).
by Alexandre Julliard 15 Dec '22

15 Dec '22

Module: wine Branch: master Commit: 7a6eeb8c34d714241a65dc7c254e700eaf374c2e URL: https://gitlab.winehq.org/wine/wine/-/commit/7a6eeb8c34d714241a65dc7c254e70… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 11 20:29:58 2022 +0100 urlmon: Pass correct parameter to realloc and simplify code (Coverity). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/urlmon/sec_mgr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index e6d1864b1e7..78e4c96fd60 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -1276,13 +1276,12 @@ static LPDWORD build_zonemap_from_reg(void) if (used == allocated) { LPDWORD new_data; + allocated *= 2; new_data = realloc(data, allocated * sizeof(DWORD)); if (!new_data) goto cleanup; - memset(new_data + allocated, 0, allocated * sizeof(DWORD)); data = new_data; - allocated *= 2; } data[used] = wcstol(name, NULL, 10); }

1 0

Sven Baars : win32u: Account for 16-bit instances in find_class().
by Alexandre Julliard 15 Dec '22

15 Dec '22

Module: wine Branch: master Commit: d904f84ed01edc7ec56fbd736c3610057c5173b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d904f84ed01edc7ec56fbd736c3610… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Dec 14 17:17:12 2022 +0100 win32u: Account for 16-bit instances in find_class(). This mimics the condition in the server. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53384 --- dlls/win32u/class.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index b18fd69edfc..9f3b4251e65 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -353,8 +353,9 @@ static void release_class_ptr( CLASS *ptr ) static CLASS *find_class( HINSTANCE module, UNICODE_STRING *name ) { ATOM atom = get_int_atom_value( name ); - ULONG_PTR instance = (UINT_PTR)module & ~0xffff; + ULONG_PTR instance = (UINT_PTR)module; CLASS *class; + int is_win16; user_lock(); LIST_FOR_EACH_ENTRY( class, &class_list, CLASS, entry ) @@ -368,7 +369,9 @@ static CLASS *find_class( HINSTANCE module, UNICODE_STRING *name ) if (wcsnicmp( class->name, name->Buffer, name->Length / sizeof(WCHAR) ) || class->name[name->Length / sizeof(WCHAR)]) continue; } - if (!class->local || !module || (class->instance & ~0xffff) == instance) + is_win16 = !(class->instance >> 16); + if (!instance || !class->local || class->instance == instance || + (!is_win16 && ((class->instance & ~0xffff) == (instance & ~0xffff)))) { TRACE( "%s %lx -> %p\n", debugstr_us(name), instance, class ); return class;

1 0

Zebediah Figura : win32u: Set the width and height when creating a caret from an existing bitmap.
by Alexandre Julliard 15 Dec '22

15 Dec '22

Module: wine Branch: master Commit: 30398d6f3350914fc1bc127eaa43279d5e30bd0e URL: https://gitlab.winehq.org/wine/wine/-/commit/30398d6f3350914fc1bc127eaa4327… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 14 14:13:45 2022 -0600 win32u: Set the width and height when creating a caret from an existing bitmap. This was omitted in b8732c80b11. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53485 --- dlls/win32u/input.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index eaad697a63e..fd16d03f733 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1843,6 +1843,8 @@ BOOL WINAPI NtUserCreateCaret( HWND hwnd, HBITMAP bitmap, int width, int height BITMAP bitmap_data; if (!NtGdiExtGetObjectW( bitmap, sizeof(bitmap_data), &bitmap_data )) return FALSE; + width = bitmap_data.bmWidth; + height = bitmap_data.bmHeight; caret_bitmap = NtGdiCreateBitmap( bitmap_data.bmWidth, bitmap_data.bmHeight, bitmap_data.bmPlanes, bitmap_data.bmBitsPixel, NULL ); if (caret_bitmap)

1 0