- Wine-Devel - list.winehq.org

[PATCH v4 1/3] uiautomationcore: Implement UiaGetReservedNotSupportedValue.
by Connor McAdams Nov. 4, 2021

Nov. 4, 2021

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/Makefile.in | 1 + dlls/uiautomationcore/uia_main.c | 131 +++++++++++++++++++++++++++++- 2 files changed, 130 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 71ea7b99c94..5a72ea144c4 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,5 +1,6 @@ MODULE = uiautomationcore.dll IMPORTLIB = uiautomationcore +IMPORTS = uuid ole32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 2dada95af80..638899044f9 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -16,12 +16,134 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include "uiautomation.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uiautomation); +struct uia_rsrv_obj_marshal_wrapper +{ + IUnknown IUnknown_iface; + LONG refcount; + + IUnknown *marshaler; + IUnknown *marshal_object; +}; + +static struct uia_rsrv_obj_marshal_wrapper *impl_uia_rsrv_obj_marshal_wrapper_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct uia_rsrv_obj_marshal_wrapper, IUnknown_iface); +} + +static HRESULT WINAPI uia_rsrv_obj_marshal_wrapper_QueryInterface(IUnknown *iface, + REFIID riid, void **ppv) +{ + struct uia_rsrv_obj_marshal_wrapper *wrapper = impl_uia_rsrv_obj_marshal_wrapper_from_IUnknown(iface); + return IUnknown_QueryInterface(wrapper->marshal_object, riid, ppv); +} + +static ULONG WINAPI uia_rsrv_obj_marshal_wrapper_AddRef(IUnknown *iface) +{ + struct uia_rsrv_obj_marshal_wrapper *wrapper = impl_uia_rsrv_obj_marshal_wrapper_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&wrapper->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI uia_rsrv_obj_marshal_wrapper_Release(IUnknown *iface) +{ + struct uia_rsrv_obj_marshal_wrapper *wrapper = impl_uia_rsrv_obj_marshal_wrapper_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&wrapper->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + if (!refcount) + { + IUnknown_Release(wrapper->marshaler); + heap_free(wrapper); + } + + return refcount; +} + +static const IUnknownVtbl uia_rsrv_obj_marshal_wrapper_vtbl = { + uia_rsrv_obj_marshal_wrapper_QueryInterface, + uia_rsrv_obj_marshal_wrapper_AddRef, + uia_rsrv_obj_marshal_wrapper_Release, +}; + +/* + * When passing the ReservedNotSupportedValue/ReservedMixedAttributeValue + * interface pointers across apartments within the same process, create a free + * threaded marshaler so that the pointer value is preserved. + */ +static HRESULT uia_rsrv_obj_create_marshal_wrapper(IUnknown *reserved, void **ppv) +{ + struct uia_rsrv_obj_marshal_wrapper *wrapper; + HRESULT hr; + + TRACE("%p, %p\n", reserved, ppv); + + wrapper = heap_alloc(sizeof(*wrapper)); + if (!wrapper) + return E_OUTOFMEMORY; + + wrapper->IUnknown_iface.lpVtbl = &uia_rsrv_obj_marshal_wrapper_vtbl; + wrapper->marshal_object = reserved; + wrapper->refcount = 1; + + if (FAILED(hr = CoCreateFreeThreadedMarshaler(&wrapper->IUnknown_iface, &wrapper->marshaler))) + { + heap_free(wrapper); + return hr; + } + + hr = IUnknown_QueryInterface(wrapper->marshaler, &IID_IMarshal, ppv); + IUnknown_Release(&wrapper->IUnknown_iface); + + return hr; +} + +/* + * UiaReservedNotSupportedValue object. + */ +static HRESULT WINAPI uia_reserved_obj_QueryInterface(IUnknown *iface, + REFIID riid, void **ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = iface; + else if (IsEqualIID(riid, &IID_IMarshal)) + return uia_rsrv_obj_create_marshal_wrapper(iface, ppv); + else + return E_NOINTERFACE; + + return S_OK; +} + +static ULONG WINAPI uia_reserved_obj_AddRef(IUnknown *iface) +{ + return 1; +} + +static ULONG WINAPI uia_reserved_obj_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl uia_reserved_obj_vtbl = { + uia_reserved_obj_QueryInterface, + uia_reserved_obj_AddRef, + uia_reserved_obj_Release, +}; + +static IUnknown uia_reserved_ns_iface = {&uia_reserved_obj_vtbl}; + /*********************************************************************** * UiaClientsAreListening (uiautomationcore.@) */ @@ -46,8 +168,13 @@ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value) */ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value) { - FIXME("(%p) stub!\n", value); - *value = NULL; + TRACE("(%p)\n", value); + + if (!value) + return E_INVALIDARG; + + *value = &uia_reserved_ns_iface; + return S_OK; } -- 2.25.1

2 4

[PATCH v2] ntdll: Don't constraint TEB address to 2GB for native x64 process.
by Paul Gofman Nov. 4, 2021

Nov. 4, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - don't change virtual_alloc_first_teb(). dlls/ntdll/unix/virtual.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 756a7388a22..f62ca1f5f01 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3021,6 +3021,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) void *ptr = NULL; NTSTATUS status = STATUS_SUCCESS; SIZE_T block_size = signal_stack_mask + 1; + BOOL is_wow = !!NtCurrentTeb()->WowTebOffset; server_enter_uninterrupted_section( &virtual_mutex, &sigset ); if (next_free_teb) @@ -3035,7 +3036,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) { SIZE_T total = 32 * block_size; - if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, is_win64 ? 0x7fffffff : 0, + if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, is_win64 && is_wow ? 0x7fffffff : 0, &total, MEM_RESERVE, PAGE_READWRITE ))) { server_leave_uninterrupted_section( &virtual_mutex, &sigset ); @@ -3048,7 +3049,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &block_size, MEM_COMMIT, PAGE_READWRITE ); } - *ret_teb = teb = init_teb( ptr, !!NtCurrentTeb()->WowTebOffset ); + *ret_teb = teb = init_teb( ptr, is_wow ); server_leave_uninterrupted_section( &virtual_mutex, &sigset ); if ((status = signal_alloc_thread( teb ))) -- 2.33.1

1 0

[PATCH] ntdll: Don't constraint TEB address to 2GB for native x64 process.
by Paul Gofman Nov. 4, 2021

Nov. 4, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/virtual.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 756a7388a22..3dc06d520dd 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2985,6 +2985,7 @@ static TEB *init_teb( void *ptr, BOOL is_wow ) */ TEB *virtual_alloc_first_teb(void) { + static const BOOL is_wow = FALSE; void *ptr; NTSTATUS status; SIZE_T data_size = page_size; @@ -3000,14 +3001,14 @@ TEB *virtual_alloc_first_teb(void) exit(1); } - NtAllocateVirtualMemory( NtCurrentProcess(), &teb_block, is_win64 ? 0x7fffffff : 0, &total, + NtAllocateVirtualMemory( NtCurrentProcess(), &teb_block, is_win64 && is_wow ? 0x7fffffff : 0, &total, MEM_RESERVE | MEM_TOP_DOWN, PAGE_READWRITE ); teb_block_pos = 30; ptr = (char *)teb_block + 30 * block_size; data_size = 2 * block_size; NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &data_size, MEM_COMMIT, PAGE_READWRITE ); peb = (PEB *)((char *)teb_block + 31 * block_size + (is_win64 ? 0 : page_size)); - return init_teb( ptr, FALSE ); + return init_teb( ptr, is_wow ); } @@ -3021,6 +3022,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) void *ptr = NULL; NTSTATUS status = STATUS_SUCCESS; SIZE_T block_size = signal_stack_mask + 1; + BOOL is_wow = !!NtCurrentTeb()->WowTebOffset; server_enter_uninterrupted_section( &virtual_mutex, &sigset ); if (next_free_teb) @@ -3035,7 +3037,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) { SIZE_T total = 32 * block_size; - if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, is_win64 ? 0x7fffffff : 0, + if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, is_win64 && is_wow ? 0x7fffffff : 0, &total, MEM_RESERVE, PAGE_READWRITE ))) { server_leave_uninterrupted_section( &virtual_mutex, &sigset ); @@ -3048,7 +3050,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &block_size, MEM_COMMIT, PAGE_READWRITE ); } - *ret_teb = teb = init_teb( ptr, !!NtCurrentTeb()->WowTebOffset ); + *ret_teb = teb = init_teb( ptr, is_wow ); server_leave_uninterrupted_section( &virtual_mutex, &sigset ); if ((status = signal_alloc_thread( teb ))) -- 2.33.1

2 1

[PATCH v2 1/3] include: Rename LDR_WINE_INTERNAL to LDR_WINE_BUILTIN.
by Zebediah Figura Nov. 4, 2021

Nov. 4, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- This series makes it possible to use dynamic libraries from an external path without needing to first copy them into a prefix. As an example, on Debian I am able to install the "libz-minw-w64-dev" package, and then use the following configure command to compile Wine: configure --enable-win64 ZLIB_PE_CFLAGS="$(x86_64-w64-mingw32-pkg-config --cflags zlib)" ZLIB_PE_LIBS="$(x86_64-w64-mingw32-pkg-config --libs zlib)" SYSTEMDLLDIR=/usr/x86_64-w64-mingw32/lib/ whereafter libraries are linked directly to system zlib1.dll, and no further configuration is needed I would like to submit patches in the future to allow the use of pkg-config for automatically detecting compile flags and libraries. I would also like to find some way to obviate manual specification of DLL bindirs. v2: Rebased on top of current git; no other change. dlls/kernel32/kernel_main.c | 2 +- dlls/krnl386.exe16/ne_module.c | 2 +- dlls/ntdll/loader.c | 10 +++++----- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/signal_x86_64.c | 2 +- include/winternl.h | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 4467af739e0..317ee782d7a 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -136,7 +136,7 @@ static BOOL process_attach( HMODULE module ) { LDR_DATA_TABLE_ENTRY *ldr; - if (LdrFindEntryForAddress( GetModuleHandleW( 0 ), &ldr ) || !(ldr->Flags & LDR_WINE_INTERNAL)) + if (LdrFindEntryForAddress( GetModuleHandleW( 0 ), &ldr ) || !(ldr->Flags & LDR_WINE_BUILTIN)) LoadLibraryA( "krnl386.exe16" ); } #endif diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index c26fe778253..108e88e5546 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -982,7 +982,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ return ERROR_FILE_NOT_FOUND; } /* check if module was loaded native */ - if (LdrFindEntryForAddress( main_owner, &ldr ) || !(ldr->Flags & LDR_WINE_INTERNAL)) + if (LdrFindEntryForAddress( main_owner, &ldr ) || !(ldr->Flags & LDR_WINE_BUILTIN)) { FreeLibrary( mod32 ); descr = NULL; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 255d5afef79..17c8d7f7485 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1081,7 +1081,7 @@ static BOOL is_dll_native_subsystem( LDR_DATA_TABLE_ENTRY *mod, const IMAGE_NT_H if (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_NATIVE) return FALSE; if (nt->OptionalHeader.SectionAlignment < page_size) return TRUE; - if (mod->Flags & LDR_WINE_INTERNAL) return TRUE; + if (mod->Flags & LDR_WINE_BUILTIN) return TRUE; if ((imports = RtlImageDirectoryEntryToData( mod->DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size ))) @@ -1310,7 +1310,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name wm->ldr.DllBase = hModule; wm->ldr.SizeOfImage = nt->OptionalHeader.SizeOfImage; - wm->ldr.Flags = LDR_DONT_RESOLVE_REFS | (builtin ? LDR_WINE_INTERNAL : 0); + wm->ldr.Flags = LDR_DONT_RESOLVE_REFS | (builtin ? LDR_WINE_BUILTIN : 0); wm->ldr.TlsIndex = -1; wm->ldr.LoadCount = 1; wm->CheckSum = nt->OptionalHeader.CheckSum; @@ -1454,7 +1454,7 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved if (wm->ldr.Flags & LDR_DONT_RESOLVE_REFS) return STATUS_SUCCESS; if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, reason ); - if (wm->ldr.Flags & LDR_WINE_INTERNAL && reason == DLL_PROCESS_ATTACH) + if (wm->ldr.Flags & LDR_WINE_BUILTIN && reason == DLL_PROCESS_ATTACH) unix_funcs->init_builtin_dll( wm->ldr.DllBase ); if (!entry) return STATUS_SUCCESS; @@ -3643,7 +3643,7 @@ static void free_modref( WINE_MODREF *wm ) if (!TRACE_ON(module)) TRACE_(loaddll)("Unloaded module %s : %s\n", debugstr_w(wm->ldr.FullDllName.Buffer), - (wm->ldr.Flags & LDR_WINE_INTERNAL) ? "builtin" : "native" ); + (wm->ldr.Flags & LDR_WINE_BUILTIN) ? "builtin" : "native" ); free_tls_slot( &wm->ldr ); RtlReleaseActivationContext( wm->ldr.ActivationContext ); @@ -4079,7 +4079,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR } release_address_space(); if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, DLL_PROCESS_ATTACH ); - if (wm->ldr.Flags & LDR_WINE_INTERNAL) unix_funcs->init_builtin_dll( wm->ldr.DllBase ); + if (wm->ldr.Flags & LDR_WINE_BUILTIN) unix_funcs->init_builtin_dll( wm->ldr.DllBase ); if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); process_breakpoint(); } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 290639b676b..bfbaeab47c9 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -191,7 +191,7 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX /* then look for host system exception information */ - if (!module || (module->Flags & LDR_WINE_INTERNAL)) + if (!module || (module->Flags & LDR_WINE_BUILTIN)) { status = unix_funcs->unwind_builtin_dll( type, dispatch, context ); if (status != STATUS_SUCCESS) return status; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ef32eba68b7..8515b176e5d 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -275,7 +275,7 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX /* then look for host system exception information */ - if (!module || (module->Flags & LDR_WINE_INTERNAL)) + if (!module || (module->Flags & LDR_WINE_BUILTIN)) { status = unix_funcs->unwind_builtin_dll( type, dispatch, context ); diff --git a/include/winternl.h b/include/winternl.h index eea97f1238b..216a3b3fdaa 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3394,7 +3394,7 @@ typedef void (CALLBACK *PLDR_DLL_NOTIFICATION_FUNCTION)(ULONG, LDR_DLL_NOTIFICAT /* these ones is Wine specific */ #define LDR_DONT_RESOLVE_REFS 0x40000000 -#define LDR_WINE_INTERNAL 0x80000000 +#define LDR_WINE_BUILTIN 0x80000000 /* flag for LdrAddRefDll */ #define LDR_ADDREF_DLL_PIN 0x00000001 -- 2.33.0

2 3

[PATCH] comctl32: Fix 'pszHeaderTitle' copypasta.
by Serge Gautherie Nov. 4, 2021

Nov. 4, 2021

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to https://source.winehq.org/git/wine.git/commit/335983ed9172e1a985c5b237676cf… Part of ReactOS-Bug: https://jira.reactos.org/browse/CORE-12912 --- dlls/comctl32/propsheet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 1604b9e..556d63f 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3372,7 +3372,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) if (ppshpage->dwFlags & PSP_USEHEADERSUBTITLE) { SelectObject(hdc, psInfo->hFont); SetRect(&r, 40, 25, rzone.right - 69, rzone.bottom); - if (!IS_INTRESOURCE(ppshpage->pszHeaderTitle)) + if (!IS_INTRESOURCE(ppshpage->pszHeaderSubTitle)) DrawTextW(hdc, ppshpage->pszHeaderSubTitle, -1, &r, DT_LEFT | DT_WORDBREAK); else { -- 2.10.0.windows.1

1 0

Feedback requested / dwarf4
by Eric Pouech Nov. 4, 2021

Nov. 4, 2021

Background ---------- Wine has been using dwarf2 debug format for years, and hasn't updated to dwarf4 yet (gcc and most of distros switched more than 10 years ago). As gcc & distros have switched to dwarf5 for 6 months to a year, it's time to catch up. Status ------ As of today, support for reading and managing dwarf4 debug info is included in dbghelp (as well as dwarf2 and dwarf3) and is available through winedbg. However, by default all Wine components are still compiled with dwarf2. Since most system shared libraries are now shipped with dwarf5, it means that no modules with dwarf4 debug information are crunched. Need for help ------------- Before enabling dwarf4 as wine's default debug format, feedback is requested on all those changes. How can you help: 1) Setup the dwarf4 debug format for wine compilation using: > ./configure CFLAGS="-gdwarf-4 -O2" CROSSCFLAGS="-gdwarf-4 -O2" > make -B The two options to configure are needed to configure both the compiler for ELF parts, and the cross compiler for PE parts. And you need to recompile everything to generate correct debug information. 2) Report any strange / unexpected behavior Given the magnitude of change, I'd be surprised if everything would be perfect. So, your contribution here for testing and shaking would be much appreciated. Improvements (dwarf4 over dwarf2) ------------ Here's a typical debugging session (wine compiles with dwarf2): [eric:~/work/output-wine/wine64]$ ./wine programs/winedbg/winedbg.exe.so notepad WineDbg starting on pid 0100 RtlDefaultNpAcl () at Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731 0x000000007bc50679 RtlDefaultNpAcl+0x2b9 [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731] in ntdll: ret 1731 } Wine-dbg>b CreateWindowExW Breakpoint 1 at 0x000000006eb91448 CreateWindowExW [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 Wine-dbg>c Stopped on breakpoint 1 at 0x000000006eb91448 CreateWindowExW [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 CreateWindowExW () at Z:\home\eric\work\wine\dlls\user32\win.c:1913 1913 { Wine-dbg>bt Backtrace: =>0 0x000000006eb91448 CreateWindowExW(exStyle=<is not available>, className=<is not available>, windowName=<is not available>, style=<is not available>, x=<is not available>, y=<is not available>, width=<is not available>, height=<is not available>, parent=<is not available>, menu=<is not available>, instance=<is no t available>, data=<is not available>) [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 (0x0000000000000559) 1 0x0000000000405008 WinMain+0x3a7(hInstance=0x400000, prev=<is not available>, cmdline=<is not available>, show=0x1) [Z:\home\eric\work\wine\programs\notepad\main.c:792] in notepad (0x0000000000000559) 2 0x0000000000406326 main+0xa5(argc=<is not available>, argv=<is not available>) [Z:\home\eric\work\wine\dlls\msvcrt\crt_winmain.c:53] in notepad (0x0000000000000000) 3 0x0000000000406155 mainCRTStartup+0x64() [Z:\home\eric\work\wine\dlls\msvcrt\crt_main.c:58] in notepad (0x0000000000000000) 4 0x000000007b62c679 BaseThreadInitThunk+0x8(unknown=<is not available>, entry=<is not available>, arg=<is not available>) [Z:\home\eric\work\wine\dlls\kernel32\thread.c:61] in kernel32 (0x0000000000000000) 5 0x000000007bc56c73 RtlUserThreadStart+0x82(entry=0x4060f0, arg=0x3f0000) [Z:\home\eric\work\wine\dlls\ntdll\thread.c:241] in ntdll (0x0000000000000000) Wine-dbg> Note that most of variables in stack trace are not useful. With Wine recompiled with dwarf 4 support, you get: [eric:~/work/output-wine/winedw4-64]$ ./wine programs/winedbg/winedbg.exe.so notepad WineDbg starting on pid 0104 0100:fixme:dbghelp_dwarf:compute_location Only supporting one breg (rcx/330 -> r14/342) RtlDefaultNpAcl () at Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731 0x000000007bc50679 RtlDefaultNpAcl+0x2b9 [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731] in ntdll: ret 1731 } Wine-dbg>b CreateWindowExW 0100:fixme:dbghelp_dwarf:dwarf2_read_range no entry found 0100:fixme:dbghelp_dwarf:dwarf2_read_range no entry found 0100:fixme:dbghelp_dwarf:compute_location Only supporting one breg (r8/336 -> r10/338) 0100:fixme:dbghelp_dwarf:compute_location Only supporting one breg (rdx/331 -> rcx/330) 0100:fixme:dbghelp_dwarf:compute_location Only supporting one breg (r10/338 -> r8/336) 0100:fixme:dbghelp_dwarf:compute_location Only supporting one breg (rbx/329 -> r12/340) 0100:fixme:dbghelp_dwarf:dwarf2_read_range no entry found Breakpoint 1 at 0x000000006eb91448 CreateWindowExW [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 Wine-dbg>c Stopped on breakpoint 1 at 0x000000006eb91448 CreateWindowExW [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 CreateWindowExW () at Z:\home\eric\work\wine\dlls\user32\win.c:1913 1913 { Wine-dbg>bt Backtrace: =>0 0x000000006eb91448 CreateWindowExW(exStyle=0, className="Notepad", windowName="Notepad", style=0xcf0000, x=0x1, y=0x25, width=0x558, height=0x402, parent=(nil), menu=(nil), instance=0x400000, data=0x0(nil)) [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 (0x0000000000000559) 1 0x0000000000405008 WinMain+0x3a7(hInstance=0x400000, prev=<is not available>, cmdline=<is not available>, show=0x1) [Z:\home\eric\work\wine\programs\notepad\main.c:792] in notepad (0x0000000000000559) 2 0x0000000000406326 main+0xa5(argc=<is not available>, argv=<is not available>) [Z:\home\eric\work\wine\dlls\msvcrt\crt_winmain.c:53] in notepad (0x0000000000000000) 3 0x0000000000406155 mainCRTStartup+0x64() [Z:\home\eric\work\wine\dlls\msvcrt\crt_main.c:58] in notepad (0x0000000000000000) 4 0x000000007b62c679 BaseThreadInitThunk+0x8(unknown=<is not available>, entry=<is not available>, arg=<is not available>) [Z:\home\eric\work\wine\dlls\kernel32\thread.c:61] in kernel32 (0x0000000000000000) 5 0x000000007bc56c73 RtlUserThreadStart+0x82(entry=0x4060f0, arg=0x3f0000) [Z:\home\eric\work\wine\dlls\ntdll\thread.c:241] in ntdll (0x0000000000000000) Wine-dbg> and a much nicer backtrace regarding parameters. Note that the same improvements are also available with winedbg in gdb proxy mode: - same lack of values on parameters/local variables in dwarf-2 - provides (in this example) the same information as winedbg/dbghelp does There are quite a couple of other things available with dwarf4 (split .dwo files, inlined functions...). ---------- Thanks in advance -- Eric Pouech

1 0

Feedback requested / dwarf4
by Eric Pouech Nov. 4, 2021

Nov. 4, 2021

Hi all, Since yesterday, dwarf4 debug format support is included in dbghelp. background ---------- Wine has been using dwarf2 for years, and hasn't updated to dwarf4 (gcc and most of distros switched more than 10 years ago). As distros have been switching to dwarf5 for 6 months to a year now, it's time to be back on track. status ------ As of today, support for reading and managing dwarf4 debug info is included in dbghelp (as well as dwarf2 and dwarf3). However, by default Wine is still compiled with dwarf2. need for help ------------- Before enabling dwa, feedback is requested on dwarf4. How can you help: Setup the dwarf4 debug format for wine compilation using: > ./configure CFLAGS="-gdwarf-4 -O2" CROSSCFLAGS="-gdwarf-4 -O2" > make -B We need to configure both gcc for ELF compilation, and the cross compiler (hence the two options to configure). And we need to recompile everything. improvements ------------ Here's a typical debugging session (compiled with dwarf2): [eric:~/work/output-wine/wine64]$ ./wine programs/winedbg/winedbg.exe.so notepad WineDbg starting on pid 0100 RtlDefaultNpAcl () at Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731 0x000000007bc50679 RtlDefaultNpAcl+0x2b9 [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731] in ntdll: ret 1731 } Wine-dbg>b CreateWindowExW Breakpoint 1 at 0x000000006eb91448 CreateWindowExW [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 Wine-dbg>c Stopped on breakpoint 1 at 0x000000006eb91448 CreateWindowExW [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 CreateWindowExW () at Z:\home\eric\work\wine\dlls\user32\win.c:1913 1913 { Wine-dbg>bt Backtrace: =>0 0x000000006eb91448 CreateWindowExW(exStyle=<is not available>, className=<is not available>, windowName=<is not available>, style=<is not available>, x=<is not available>, y=<is not available>, width=<is not available>, height=<is not available>, parent=<is not available>, menu=<is not available>, instance=<is no t available>, data=<is not available>) [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 (0x0000000000000559) 1 0x0000000000405008 WinMain+0x3a7(hInstance=0x400000, prev=<is not available>, cmdline=<is not available>, show=0x1) [Z:\home\eric\work\wine\programs\notepad\main.c:792] in notepad (0x0000000000000559) 2 0x0000000000406326 main+0xa5(argc=<is not available>, argv=<is not available>) [Z:\home\eric\work\wine\dlls\msvcrt\crt_winmain.c:53] in notepad (0x0000000000000000) 3 0x0000000000406155 mainCRTStartup+0x64() [Z:\home\eric\work\wine\dlls\msvcrt\crt_main.c:58] in notepad (0x0000000000000000) 4 0x000000007b62c679 BaseThreadInitThunk+0x8(unknown=<is not available>, entry=<is not available>, arg=<is not available>) [Z:\home\eric\work\wine\dlls\kernel32\thread.c:61] in kernel32 (0x0000000000000000) 5 0x000000007bc56c73 RtlUserThreadStart+0x82(entry=0x4060f0, arg=0x3f0000) [Z:\home\eric\work\wine\dlls\ntdll\thread.c:241] in ntdll (0x0000000000000000) Wine-dbg> Note that most of variables in stack trace are not useful. With Wine recompiled with dwarf 4 support, you get: [eric:~/work/output-wine/winedw4-64]$ ./wine programs/winedbg/winedbg.exe.so notepad WineDbg starting on pid 0104 0100:fixme:dbghelp_dwarf:compute_location Only supporting one breg (rcx/330 -> r14/342) RtlDefaultNpAcl () at Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731 0x000000007bc50679 RtlDefaultNpAcl+0x2b9 [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731] in ntdll: ret 1731 } Wine-dbg>b CreateWindowExW 0100:fixme:dbghelp_dwarf:dwarf2_read_range no entry found 0100:fixme:dbghelp_dwarf:dwarf2_read_range no entry found 0100:fixme:dbghelp_dwarf:compute_location Only supporting one breg (r8/336 -> r10/338) 0100:fixme:dbghelp_dwarf:compute_location Only supporting one breg (rdx/331 -> rcx/330) 0100:fixme:dbghelp_dwarf:compute_location Only supporting one breg (r10/338 -> r8/336) 0100:fixme:dbghelp_dwarf:compute_location Only supporting one breg (rbx/329 -> r12/340) 0100:fixme:dbghelp_dwarf:dwarf2_read_range no entry found Breakpoint 1 at 0x000000006eb91448 CreateWindowExW [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 Wine-dbg>c Stopped on breakpoint 1 at 0x000000006eb91448 CreateWindowExW [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 CreateWindowExW () at Z:\home\eric\work\wine\dlls\user32\win.c:1913 1913 { Wine-dbg>bt Backtrace: =>0 0x000000006eb91448 CreateWindowExW(exStyle=0, className="Notepad", windowName="Notepad", style=0xcf0000, x=0x1, y=0x25, width=0x558, height=0x402, parent=(nil), menu=(nil), instance=0x400000, data=0x0(nil)) [Z:\home\eric\work\wine\dlls\user32\win.c:1913] in user32 (0x0000000000000559) 1 0x0000000000405008 WinMain+0x3a7(hInstance=0x400000, prev=<is not available>, cmdline=<is not available>, show=0x1) [Z:\home\eric\work\wine\programs\notepad\main.c:792] in notepad (0x0000000000000559) 2 0x0000000000406326 main+0xa5(argc=<is not available>, argv=<is not available>) [Z:\home\eric\work\wine\dlls\msvcrt\crt_winmain.c:53] in notepad (0x0000000000000000) 3 0x0000000000406155 mainCRTStartup+0x64() [Z:\home\eric\work\wine\dlls\msvcrt\crt_main.c:58] in notepad (0x0000000000000000) 4 0x000000007b62c679 BaseThreadInitThunk+0x8(unknown=<is not available>, entry=<is not available>, arg=<is not available>) [Z:\home\eric\work\wine\dlls\kernel32\thread.c:61] in kernel32 (0x0000000000000000) 5 0x000000007bc56c73 RtlUserThreadStart+0x82(entry=0x4060f0, arg=0x3f0000) [Z:\home\eric\work\wine\dlls\ntdll\thread.c:241] in ntdll (0x0000000000000000) Wine-dbg> and a much nicer backtrace regarding parameters. When using winedbg's gdb proxy mode: - same lack of values on parameters/local variables in dwarf-2 - provides (in this example) the same information as winedbg -- -- Eric Pouech

1 0

[PATCH 3/3] comctl32/button: Add a get_box_rect() helper to calculation box rectangle.
by Zhiyi Zhang Nov. 4, 2021

Nov. 4, 2021

get_box_rect() is introduced so that we don't need to duplicate the check box rectangle calculation when painting themed check boxes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 130 +++++++++++++++++++++-------------------- 1 file changed, 67 insertions(+), 63 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 2738a4caee5..6a463cb3460 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1881,11 +1881,65 @@ static void PB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) * Check Box & Radio Button Functions */ +/* Get adjusted check box or radio box rectangle */ +static RECT get_box_rect(LONG style, LONG ex_style, const RECT *content_rect, + const RECT *label_rect, BOOL has_label, SIZE box_size) +{ + RECT rect; + int delta; + + rect = *content_rect; + + if (style & BS_LEFTTEXT || ex_style & WS_EX_RIGHT) + rect.left = rect.right - box_size.cx; + else + rect.right = rect.left + box_size.cx; + + /* Adjust box when label is valid */ + if (has_label) + { + rect.top = label_rect->top; + rect.bottom = label_rect->bottom; + } + + /* Box must have the correct height */ + delta = rect.bottom - rect.top - box_size.cy; + if ((style & BS_VCENTER) == BS_TOP) + { + if (delta <= 0) + rect.top -= -delta / 2 + 1; + + rect.bottom = rect.top + box_size.cy; + } + else if ((style & BS_VCENTER) == BS_BOTTOM) + { + if (delta <= 0) + rect.bottom += -delta / 2 + 1; + + rect.top = rect.bottom - box_size.cy; + } + else + { + if (delta > 0) + { + rect.bottom -= delta / 2 + 1; + rect.top = rect.bottom - box_size.cy; + } + else if (delta < 0) + { + rect.top -= -delta / 2 + 1; + rect.bottom = rect.top + box_size.cy; + } + } + + return rect; +} + static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) { - RECT rbox, labelRect, imageRect, textRect, client; + RECT rbox, labelRect, oldLabelRect, imageRect, textRect, client; HBRUSH hBrush; - int delta, text_offset, checkBoxWidth, checkBoxHeight; + int text_offset; UINT dtFlags; LRESULT cdrf; HFONT hFont; @@ -1893,6 +1947,7 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) LONG state = infoPtr->state; LONG style = GetWindowLongW( infoPtr->hwnd, GWL_STYLE ); LONG ex_style = GetWindowLongW( infoPtr->hwnd, GWL_EXSTYLE ); + SIZE box_size; HWND parent; HRGN hrgn; @@ -1903,10 +1958,10 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) } GetClientRect(infoPtr->hwnd, &client); - rbox = labelRect = client; + labelRect = client; - checkBoxWidth = 12 * GetDpiForWindow( infoPtr->hwnd ) / 96 + 1; - checkBoxHeight = 12 * GetDpiForWindow( infoPtr->hwnd ) / 96 + 1; + box_size.cx = 12 * GetDpiForWindow(infoPtr->hwnd) / 96 + 1; + box_size.cy = box_size.cx; if ((hFont = infoPtr->font)) SelectObject( hDC, hFont ); GetCharWidthW( hDC, '0', '0', &text_offset ); @@ -1920,15 +1975,13 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) hrgn = set_control_clipping( hDC, &client ); if (style & BS_LEFTTEXT || ex_style & WS_EX_RIGHT) - { - labelRect.right -= checkBoxWidth + text_offset; - rbox.left = rbox.right - checkBoxWidth; - } + labelRect.right -= box_size.cx + text_offset; else - { - labelRect.left += checkBoxWidth + text_offset; - rbox.right = checkBoxWidth; - } + labelRect.left += box_size.cx + text_offset; + + oldLabelRect = labelRect; + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); + rbox = get_box_rect(style, ex_style, &client, &labelRect, dtFlags != (UINT)-1L, box_size); init_custom_draw(&nmcd, infoPtr, hDC, &client); @@ -1946,16 +1999,6 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) } /* Draw label */ - client = labelRect; - dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); - - /* Only adjust rbox when rtext is valid */ - if (dtFlags != (UINT)-1L) - { - rbox.top = labelRect.top; - rbox.bottom = labelRect.bottom; - } - /* Send paint notifications */ nmcd.dwDrawStage = CDDS_PREPAINT; cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); @@ -1977,45 +2020,6 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) if (state & BST_PUSHED) flags |= DFCS_PUSHED; if (style & WS_DISABLED) flags |= DFCS_INACTIVE; - /* rbox must have the correct height */ - delta = rbox.bottom - rbox.top - checkBoxHeight; - - if ((style & BS_VCENTER) == BS_TOP) - { - if (delta > 0) - rbox.bottom = rbox.top + checkBoxHeight; - else - { - rbox.top -= -delta / 2 + 1; - rbox.bottom = rbox.top + checkBoxHeight; - } - } - else if ((style & BS_VCENTER) == BS_BOTTOM) - { - if (delta > 0) - rbox.top = rbox.bottom - checkBoxHeight; - else - { - rbox.bottom += -delta / 2 + 1; - rbox.top = rbox.bottom - checkBoxHeight; - } - } - else /* Default */ - { - if (delta > 0) - { - int ofs = delta / 2; - rbox.bottom -= ofs + 1; - rbox.top = rbox.bottom - checkBoxHeight; - } - else if (delta < 0) - { - int ofs = -delta / 2; - rbox.top -= ofs + 1; - rbox.bottom = rbox.top + checkBoxHeight; - } - } - DrawFrameControl(hDC, &rbox, DFC_BUTTON, flags); } @@ -2035,7 +2039,7 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) { labelRect.left--; labelRect.right++; - IntersectRect(&labelRect, &labelRect, &client); + IntersectRect(&labelRect, &labelRect, &oldLabelRect); DrawFocusRect(hDC, &labelRect); } -- 2.32.0

1 0

[PATCH 2/3] comctl32/button: Simplify focus rectangle calculation for drawing themed split buttons.
by Zhiyi Zhang Nov. 4, 2021

Nov. 4, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 00f42322399..2738a4caee5 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2861,7 +2861,7 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - RECT rc, content_rect, push_rect, dropdown_rect; + RECT rc, content_rect, push_rect, dropdown_rect, focus_rect; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; @@ -2889,6 +2889,7 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in { push_rect = rc; DrawThemeBackground(theme, hDC, BP_PUSHBUTTON, state, &rc, NULL); + GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &push_rect, &focus_rect); } else { @@ -2909,6 +2910,7 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in /* The content rect should be the content area of the push button */ GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &push_rect, &content_rect); + focus_rect = content_rect; } if (cdrf & CDRF_NOTIFYPOSTERASE) @@ -2951,18 +2953,7 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in } if (cdrf & CDRF_SKIPPOSTPAINT) return; - if (focused) - { - MARGINS margins; - - GetThemeMargins(theme, hDC, BP_PUSHBUTTON, state, TMT_CONTENTMARGINS, NULL, &margins); - - push_rect.left += margins.cxLeftWidth; - push_rect.top += margins.cyTopHeight; - push_rect.right -= margins.cxRightWidth; - push_rect.bottom -= margins.cyBottomHeight; - DrawFocusRect(hDC, &push_rect); - } + if (focused) DrawFocusRect(hDC, &focus_rect); } static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) -- 2.32.0

1 0

[PATCH 1/3] comctl32/button: Simplify focus rectangle calculation for drawing themed push buttons.
by Zhiyi Zhang Nov. 4, 2021

Nov. 4, 2021

The focus rectangle is the same as the result from GetThemeBackgroundContentRect(). So there is no need to retrieve content margins and calculate it again. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index fbe060513d2..00f42322399 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2651,7 +2651,7 @@ cleanup: */ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - RECT bgRect, textRect; + RECT bgRect, textRect, focusRect; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; @@ -2661,6 +2661,8 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in GetClientRect(infoPtr->hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &textRect); + focusRect = textRect; + init_custom_draw(&nmcd, infoPtr, hDC, &bgRect); parent = GetParent(infoPtr->hwnd); @@ -2698,20 +2700,7 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in } if (cdrf & CDRF_SKIPPOSTPAINT) return; - if (focused) - { - MARGINS margins; - RECT focusRect = bgRect; - - GetThemeMargins(theme, hDC, BP_PUSHBUTTON, state, TMT_CONTENTMARGINS, NULL, &margins); - - focusRect.left += margins.cxLeftWidth; - focusRect.top += margins.cyTopHeight; - focusRect.right -= margins.cxRightWidth; - focusRect.bottom -= margins.cyBottomHeight; - - DrawFocusRect( hDC, &focusRect ); - } + if (focused) DrawFocusRect(hDC, &focusRect); } static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) -- 2.32.0

1 0