wine-commits November 2023

wine-commits@winehq.org

1 participants
989 discussions

Marc-Aurel Zent : ntdll: Implement thread-ID alerts using kqueue/kevent.
by Alexandre Julliard 16 Nov '23

16 Nov '23

Module: wine Branch: master Commit: c23c72fe8e0308e8f8180990c9d2da4a755fc729 URL: https://gitlab.winehq.org/wine/wine/-/commit/c23c72fe8e0308e8f8180990c9d2da… Author: Marc-Aurel Zent <marc_aurel(a)me.com> Date: Mon Oct 9 09:47:38 2023 +0200 ntdll: Implement thread-ID alerts using kqueue/kevent. --- dlls/ntdll/unix/sync.c | 96 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 65 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index b21fcc0b046..bfbcaf4a851 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -49,11 +49,11 @@ #include <stdlib.h> #include <time.h> #ifdef __APPLE__ -# include <mach/mach.h> -# include <mach/task.h> -# include <mach/semaphore.h> # include <mach/mach_time.h> #endif +#ifdef HAVE_KQUEUE +# include <sys/event.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -2354,8 +2354,8 @@ NTSTATUS WINAPI NtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS cl union tid_alert_entry { -#ifdef __APPLE__ - semaphore_t sem; +#ifdef HAVE_KQUEUE + int kq; #else HANDLE event; #ifdef __linux__ @@ -2396,15 +2396,35 @@ static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) entry = &tid_alert_blocks[block_idx][idx % TID_ALERT_BLOCK_SIZE]; -#ifdef __APPLE__ - if (!entry->sem) +#ifdef HAVE_KQUEUE + if (!entry->kq) { - semaphore_t sem; + int kq = kqueue(); + static const struct kevent init_event = + { + .ident = 1, + .filter = EVFILT_USER, + .flags = EV_ADD | EV_CLEAR, + .fflags = 0, + .data = 0, + .udata = NULL + }; + + if (kq == -1) + { + ERR( "kqueue failed with error: %d (%s)\n", errno, strerror( errno ) ); + return NULL; + } - if (semaphore_create( mach_task_self(), &sem, SYNC_POLICY_FIFO, 0 )) + if (kevent( kq, &init_event, 1, NULL, 0, NULL) == -1) + { + ERR( "kevent creation failed with error: %d (%s)\n", errno, strerror( errno ) ); + close( kq ); return NULL; - if (InterlockedCompareExchange( (LONG *)&entry->sem, sem, 0 )) - semaphore_destroy( mach_task_self(), sem ); + } + + if (InterlockedCompareExchange( (LONG *)&entry->kq, kq, 0 )) + close( kq ); } #else #ifdef __linux__ @@ -2438,9 +2458,21 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) if (!entry) return STATUS_INVALID_CID; -#ifdef __APPLE__ - semaphore_signal( entry->sem ); - return STATUS_SUCCESS; +#ifdef HAVE_KQUEUE + { + static const struct kevent signal_event = + { + .ident = 1, + .filter = EVFILT_USER, + .flags = 0, + .fflags = NOTE_TRIGGER, + .data = 0, + .udata = NULL + }; + + kevent( entry->kq, &signal_event, 1, NULL, 0, NULL ); + return STATUS_SUCCESS; + } #else #ifdef __linux__ if (use_futexes()) @@ -2457,7 +2489,7 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) } -#if defined(__linux__) || defined(__APPLE__) +#if defined(__linux__) || defined(HAVE_KQUEUE) static LONGLONG get_absolute_timeout( const LARGE_INTEGER *timeout ) { LARGE_INTEGER now; @@ -2480,7 +2512,7 @@ static LONGLONG update_timeout( ULONGLONG end ) #endif -#ifdef __APPLE__ +#ifdef HAVE_KQUEUE /*********************************************************************** * NtWaitForAlertByThreadId (NTDLL.@) @@ -2488,14 +2520,14 @@ static LONGLONG update_timeout( ULONGLONG end ) NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEGER *timeout ) { union tid_alert_entry *entry = get_tid_alert_entry( NtCurrentTeb()->ClientId.UniqueThread ); - semaphore_t sem; ULONGLONG end; - kern_return_t ret; + int ret; + struct timespec timespec; + struct kevent wait_event; TRACE( "%p %s\n", address, debugstr_timeout( timeout ) ); if (!entry) return STATUS_INVALID_CID; - sem = entry->sem; if (timeout) { @@ -2505,27 +2537,29 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG end = get_absolute_timeout( timeout ); } - for (;;) + do { if (timeout) { LONGLONG timeleft = update_timeout( end ); - mach_timespec_t timespec; timespec.tv_sec = timeleft / (ULONGLONG)TICKSPERSEC; timespec.tv_nsec = (timeleft % TICKSPERSEC) * 100; - ret = semaphore_timedwait( sem, timespec ); + if (timespec.tv_sec > 0x7FFFFFFF) timeout = NULL; } - else - ret = semaphore_wait( sem ); - switch (ret) - { - case KERN_SUCCESS: return STATUS_ALERTED; - case KERN_ABORTED: continue; - case KERN_OPERATION_TIMED_OUT: return STATUS_TIMEOUT; - default: return STATUS_INVALID_HANDLE; - } + ret = kevent( entry->kq, NULL, 0, &wait_event, 1, timeout ? &timespec : NULL ); + } while (ret == -1 && errno == EINTR); + + switch (ret) + { + case 1: + return STATUS_ALERTED; + case 0: + return STATUS_TIMEOUT; + default: + ERR( "kevent failed with error: %d (%s)\n", errno, strerror( errno ) ); + return STATUS_INVALID_HANDLE; } }

1 0

Myah Caron : windows.ui: Support accent colors in uisettings3_GetColorValue.
by Alexandre Julliard 16 Nov '23

16 Nov '23

Module: wine Branch: master Commit: 3448a84cac437f66bf7bdd833a6ce5026fddd4cc URL: https://gitlab.winehq.org/wine/wine/-/commit/3448a84cac437f66bf7bdd833a6ce5… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Fri Sep 22 20:41:23 2023 +0000 windows.ui: Support accent colors in uisettings3_GetColorValue. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55640 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/windows.ui/tests/uisettings.c | 95 ++++++++++++++++++++++++++++++++++++++ dlls/windows.ui/uisettings.c | 64 +++++++++++++++++++++++-- 2 files changed, 154 insertions(+), 5 deletions(-) diff --git a/dlls/windows.ui/tests/uisettings.c b/dlls/windows.ui/tests/uisettings.c index 8d739cb7bef..40588f0000f 100644 --- a/dlls/windows.ui/tests/uisettings.c +++ b/dlls/windows.ui/tests/uisettings.c @@ -75,6 +75,45 @@ static DWORD set_app_theme( DWORD mode ) return ret; } +static BOOL get_accent_palette( DWORD *colors, DWORD *len ) +{ + BOOL ret = TRUE; + DWORD type; + HKEY hkey; + + if (RegOpenKeyExW( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Accent", 0, KEY_QUERY_VALUE, &hkey )) return FALSE; + if (RegQueryValueExW( hkey, L"AccentPalette", NULL, &type, (BYTE *)colors, len ) || type != REG_BINARY) ret = FALSE; + RegCloseKey( hkey ); + return ret; +} + +static BOOL delete_accent_palette(void) +{ + BOOL ret = TRUE; + HRESULT res; + HKEY hkey; + + res = RegOpenKeyExW( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Accent", 0, KEY_SET_VALUE, &hkey ); + if (res != 0) return res == ERROR_FILE_NOT_FOUND; + + res = RegDeleteValueW( hkey, L"AccentPalette" ); + if (res != 0 && res != ERROR_FILE_NOT_FOUND) ret = FALSE; + + RegCloseKey( hkey ); + return ret; +} + +static DWORD set_accent_palette( DWORD *colors, DWORD len ) +{ + DWORD ret = 1; + HKEY hkey; + + if (RegOpenKeyExW( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Accent", 0, KEY_SET_VALUE, &hkey )) return 0; + if (RegSetValueExW( hkey, L"AccentPalette", 0, REG_BINARY, (const BYTE *)&colors, len )) ret = 0; + RegCloseKey( hkey ); + return ret; +} + static void reset_color( Color *value ) { value->A = 1; @@ -83,6 +122,60 @@ static void reset_color( Color *value ) value->B = 1; } +static BOOL compare_dword_color( Color color, DWORD dword ) +{ + return (color.R == (dword & 0xFF) && color.G == ((dword >> 8) & 0xFF) && color.B == ((dword >> 16) & 0xFF)); +} + +static void test_single_accent( IUISettings3 *uisettings3, UIColorType type, DWORD expected ) +{ + Color value; + HRESULT hr; + BOOL result; + + reset_color( &value ); + hr = IUISettings3_GetColorValue( uisettings3, type, &value ); + ok( hr == S_OK, "GetColorValue returned %#lx\n", hr ); + + result = compare_dword_color( value, expected ); + ok( result, "got unexpected value.A == %d value.R == %d value.G == %d value.B == %d (type = %d)\n", value.A, value.R, value.G, value.B, type ); +} + +static void test_AccentColor( IUISettings3 *uisettings3 ) +{ + DWORD default_palette[8]; + DWORD default_palette_len = sizeof(default_palette); + DWORD accent_palette[8]; + DWORD accent_palette_len = sizeof(accent_palette); + + if (!get_accent_palette( default_palette, &default_palette_len )) default_palette_len = 0; + + /* deleting AccentPalette fills a default value */ + ok( delete_accent_palette(), "failed to delete AccentPalette key.\n"); + ok( !get_accent_palette( accent_palette, &accent_palette_len ), "AccentPalette should not be available.\n" ); + + test_single_accent( uisettings3, UIColorType_Accent, 0x00d77800 ); + ok( get_accent_palette( accent_palette, &accent_palette_len ), "failed to retrieve AccentPalette key.\n" ); + + /* default values */ + test_single_accent( uisettings3, UIColorType_AccentDark1, 0x009e5a00 ); + test_single_accent( uisettings3, UIColorType_AccentDark2, 0x00754200 ); + test_single_accent( uisettings3, UIColorType_AccentDark3, 0x00422600 ); + test_single_accent( uisettings3, UIColorType_AccentLight1, 0x00e39c42 ); + test_single_accent( uisettings3, UIColorType_AccentLight2, 0x00edb976 ); + test_single_accent( uisettings3, UIColorType_AccentLight3, 0x00ffd8a6 ); + + test_single_accent( uisettings3, UIColorType_Accent, accent_palette[3] ); + test_single_accent( uisettings3, UIColorType_AccentDark1, accent_palette[4] ); + test_single_accent( uisettings3, UIColorType_AccentDark2, accent_palette[5] ); + test_single_accent( uisettings3, UIColorType_AccentDark3, accent_palette[6] ); + test_single_accent( uisettings3, UIColorType_AccentLight1, accent_palette[2] ); + test_single_accent( uisettings3, UIColorType_AccentLight2, accent_palette[1] ); + test_single_accent( uisettings3, UIColorType_AccentLight3, accent_palette[0] ); + + if (default_palette_len) set_accent_palette( default_palette, default_palette_len ); +} + static void test_UISettings(void) { static const WCHAR *uisettings_name = L"Windows.UI.ViewManagement.UISettings"; @@ -126,6 +219,8 @@ static void test_UISettings(void) check_interface( inspectable, &IID_IAgileObject, TRUE ); + test_AccentColor( uisettings3 ); + default_theme = get_app_theme(); /* Light Theme */ diff --git a/dlls/windows.ui/uisettings.c b/dlls/windows.ui/uisettings.c index 041388da33b..b36194a2ac3 100644 --- a/dlls/windows.ui/uisettings.c +++ b/dlls/windows.ui/uisettings.c @@ -266,6 +266,40 @@ static DWORD get_app_theme(void) return ret; } +static DWORD initialize_accent_palette( HKEY hkey, DWORD offset ) +{ + DWORD palette[7] = { 0x00ffd8a6, 0x00edb976, 0x00e39c42, 0x00d77800, 0x009e5a00, 0x00754200, 0x00422600 }; + DWORD len = sizeof(palette); + + RegSetValueExW( hkey, L"AccentPalette", 0, REG_BINARY, (const BYTE *)&palette, len ); + return palette[offset]; +} + +static void dword_to_color( DWORD color, Color *out ) +{ + out->R = color & 0xFF; + out->G = (color >> 8) & 0xFF; + out->B = (color >> 16) & 0xFF; + out->A = 0xFF; +} + +static void get_accent_palette_color( DWORD offset, Color *out ) +{ + DWORD palette[7]; + DWORD ret = 0, len = sizeof(palette), type; + HKEY hkey; + + if (!RegCreateKeyW( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Accent", &hkey )) + { + if (RegQueryValueExW( hkey, L"AccentPalette", NULL, &type, (BYTE *)&palette, &len ) || type != REG_BINARY) + ret = initialize_accent_palette( hkey, offset ); + else + ret = palette[offset]; + RegCloseKey( hkey ); + } + dword_to_color( ret, out ); +} + static void set_color_value( BYTE a, BYTE r, BYTE g, BYTE b, Color *out ) { out->A = a; @@ -283,19 +317,39 @@ static HRESULT WINAPI uisettings3_GetColorValue( IUISettings3 *iface, UIColorTyp switch (type) { case UIColorType_Foreground: + theme = get_app_theme(); + set_color_value( 255, theme ? 0 : 255, theme ? 0 : 255, theme ? 0 : 255, value ); + break; case UIColorType_Background: theme = get_app_theme(); + set_color_value( 255, theme ? 255 : 0, theme ? 255 : 0, theme ? 255 : 0, value ); + break; + case UIColorType_Accent: + get_accent_palette_color( 3, value ); + break; + case UIColorType_AccentDark1: + get_accent_palette_color( 4, value ); + break; + case UIColorType_AccentDark2: + get_accent_palette_color( 5, value ); + break; + case UIColorType_AccentDark3: + get_accent_palette_color( 6, value ); + break; + case UIColorType_AccentLight1: + get_accent_palette_color( 2, value ); + break; + case UIColorType_AccentLight2: + get_accent_palette_color( 1, value ); + break; + case UIColorType_AccentLight3: + get_accent_palette_color( 0, value ); break; default: FIXME( "type %d not implemented.\n", type ); return E_NOTIMPL; } - if (type == UIColorType_Foreground) - set_color_value( 255, theme ? 0 : 255, theme ? 0 : 255, theme ? 0 : 255, value ); - else - set_color_value( 255, theme ? 255 : 0, theme ? 255 : 0, theme ? 255 : 0, value ); - TRACE( "Returning value.A = %d, value.R = %d, value.G = %d, value.B = %d\n", value->A, value->R, value->G, value->B ); return S_OK; }

1 0

Eric Pouech : dbghelp: Pretend mach-o is present in case of failure.
by Alexandre Julliard 16 Nov '23

16 Nov '23

Module: wine Branch: master Commit: 60108ea1bc284c08fd1d6f5ac9f480c7071c8937 URL: https://gitlab.winehq.org/wine/wine/-/commit/60108ea1bc284c08fd1d6f5ac9f480… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Nov 16 18:38:02 2023 +0100 dbghelp: Pretend mach-o is present in case of failure. On MacOs, starting with Big Sur 11.0.1, the system dynamic libraries are no longer directly accessible on disk. They are still available through dlopen and friends. For getting access to the images (and their debug symbol), Apple provides, in the developper kit, the tools to extract the files. Note that this is handled as a database of all system libraries, where ASLR is in place such that segments of a given library are no longer contiguous in memory (dbghelp doesn't currently handle this). Apart from not having image information nor debug information, another side effect is that dbghelp tries every time it refreshes the mach-o module list to reload any library for which it didn't have an image file. This can be lengthy (esp when a typical process has more than 300 modules loaded). This patch forces the creation of the dbghelp module even if the image file isn't found. This patch cuts startup time of 'winedbg notepad' from 9.9 to 7.4s. YMMV. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 3 ++- dlls/dbghelp/macho_module.c | 45 ++++++++++++++++++++++++++++++++---------- dlls/dbghelp/module.c | 3 +++ include/dbghelp.h | 3 ++- programs/winedbg/info.c | 9 +++++++-- 5 files changed, 49 insertions(+), 14 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 15f91e683f5..acba5faca37 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -441,7 +441,8 @@ struct module struct module* next; enum dhext_module_type type : 16; unsigned short is_virtual : 1, - is_wine_builtin : 1; + is_wine_builtin : 1, + has_file_image : 1; struct cpu* cpu; DWORD64 reloc_delta; WCHAR* real_path; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 2d831449d39..90c38b557bb 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1405,6 +1405,9 @@ static BOOL macho_load_debug_info(struct process *pcs, struct module* module) return FALSE; } + if (!module->has_file_image) /* no much more we can do here */ + return FALSE; + ifm = &module->format_info[DFI_MACHO]->u.macho_info->file_map; fmap = &ifm->u.macho; @@ -1489,17 +1492,22 @@ static void macho_module_remove(struct process* pcs, struct module_format* modfm * TRUE on success */ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, - ULONG_PTR load_addr, struct macho_info* macho_info) + ULONG_PTR load_addr, struct macho_info* macho_info, BOOL with_image) { BOOL ret = TRUE; BOOL split_segs; struct image_file_map fmap; - TRACE("(%p/%p, %s, 0x%08Ix, %p/0x%08x)\n", pcs, pcs->handle, debugstr_w(filename), - load_addr, macho_info, macho_info->flags); + TRACE("(%p/%p, %s, 0x%08Ix, %p/0x%08x, %u)\n", pcs, pcs->handle, debugstr_w(filename), + load_addr, macho_info, macho_info->flags, with_image); split_segs = image_uses_split_segs(pcs, load_addr); - if (!macho_map_file(pcs, filename, split_segs, &fmap)) return FALSE; + if (with_image) + { + if (!macho_map_file(pcs, filename, split_segs, &fmap)) return FALSE; + } + else + reset_file_map(&fmap); if (macho_info->flags & MACHO_INFO_MODULE) { @@ -1507,18 +1515,21 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, struct module_format* modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct macho_module_info)); if (!modfmt) goto leave; - if (!load_addr) + if (!load_addr && with_image) load_addr = fmap.u.macho.segs_start; macho_info->module = module_new(pcs, filename, DMT_MACHO, module_is_wine_host(filename, L".so"), FALSE, load_addr, - fmap.u.macho.segs_size, 0, calc_crc32(fmap.u.macho.handle), + with_image ? fmap.u.macho.segs_size : 1024, + 0, with_image ? calc_crc32(fmap.u.macho.handle) : 0, image_get_machine(pcs, load_addr)); if (!macho_info->module) { HeapFree(GetProcessHeap(), 0, modfmt); goto leave; } - macho_info->module->reloc_delta = macho_info->module->module.BaseOfImage - fmap.u.macho.segs_start; + macho_info->module->reloc_delta = macho_info->module->module.BaseOfImage; + if (with_image) macho_info->module->reloc_delta -= fmap.u.macho.segs_start; + macho_module_info = (void*)(modfmt + 1); macho_info->module->format_info[DFI_MACHO] = modfmt; @@ -1531,6 +1542,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, macho_module_info->file_map = fmap; reset_file_map(&fmap); + if (!with_image) macho_info->module->has_file_image = 0; macho_info->module->format_info[DFI_MACHO]->u.macho_info->in_use = 1; macho_info->module->format_info[DFI_MACHO]->u.macho_info->is_loader = 0; @@ -1566,7 +1578,7 @@ struct macho_load_params static BOOL macho_load_file_cb(void *param, HANDLE handle, const WCHAR *filename) { struct macho_load_params *macho_load = param; - return macho_load_file(macho_load->process, filename, macho_load->load_addr, macho_load->macho_info); + return macho_load_file(macho_load->process, filename, macho_load->load_addr, macho_load->macho_info, TRUE); } /****************************************************************** @@ -1606,7 +1618,7 @@ static BOOL macho_search_and_load_file(struct process* pcs, const WCHAR* filenam /* Try the path as given. */ if (!ret) - ret = macho_load_file(pcs, filename, load_addr, macho_info); + ret = macho_load_file(pcs, filename, load_addr, macho_info, TRUE); /* Try DYLD_FALLBACK_LIBRARY_PATH, with just the filename (no directories). */ if (!ret) { @@ -1618,6 +1630,19 @@ static BOOL macho_search_and_load_file(struct process* pcs, const WCHAR* filenam if (!ret && p == filename) ret = search_dll_path(pcs, filename, IMAGE_FILE_MACHINE_UNKNOWN, macho_load_file_cb, &load_params); + if (!ret && load_addr) + { + /* Starting at macos 11.0, the system libraries are no longer present on the file system. + * So, if we cannot find an image by its filename, just declare the module without + * any debug information. + * This avoids, when walking the internal module list, to search each time + * for the module filename. + * Note: doesn't seem to be a simple way to get the size of the loaded Mach-O module + * without the corresponding file image. And it has also ASLR in place, + * where segments of the same module are not contiguous. + */ + ret = macho_load_file(pcs, filename, load_addr, macho_info, FALSE); + } return ret; } @@ -1908,7 +1933,7 @@ static BOOL macho_search_loader(struct process* pcs, struct macho_info* macho_in if (pathW) { MultiByteToWideChar(CP_UNIXCP, 0, path, -1, pathW, len); - ret = macho_load_file(pcs, pathW, 0, macho_info); + ret = macho_load_file(pcs, pathW, 0, macho_info, TRUE); HeapFree(GetProcessHeap(), 0, pathW); } } diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index b86234daf46..b12007d270e 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -237,6 +237,8 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->type = type; module->is_virtual = !!virtual; module->is_wine_builtin = !!builtin; + module->has_file_image = TRUE; + for (i = 0; i < DFI_LAST; i++) module->format_info[i] = NULL; module->sortlist_valid = FALSE; module->sorttab_size = 0; @@ -1687,6 +1689,7 @@ BOOL WINAPI wine_get_module_information(HANDLE proc, DWORD64 base, struct dhext_ dhmi.type = module->type; dhmi.is_virtual = module->is_virtual; dhmi.is_wine_builtin = module->is_wine_builtin; + dhmi.has_file_image = module->has_file_image; dhmi.debug_format_bitmask = module->debug_format_bitmask; if ((module = module_get_container(pcs, module))) { diff --git a/include/dbghelp.h b/include/dbghelp.h index b638447140c..919efb27be0 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -1267,7 +1267,8 @@ struct dhext_module_information { enum dhext_module_type type; unsigned is_wine_builtin : 1, - is_virtual : 1; + is_virtual : 1, + has_file_image : 1; unsigned debug_format_bitmask; }; diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 7491c4bd5fe..d95b286454a 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -191,9 +191,10 @@ static const char* get_machine_str(DWORD machine) static void module_print_info(const struct info_module *module, BOOL is_embedded, BOOL multi_machine) { char buffer[9]; - snprintf(buffer, sizeof(buffer), "%s%s", + snprintf(buffer, sizeof(buffer), "%s%s%s", is_embedded ? " \\-" : "", - get_module_type(module, is_embedded)); + get_module_type(module, is_embedded), + module->ext_module_info.has_file_image ? "" : "^"); if (multi_machine) dbg_printf("%-8s%16I64x-%16I64x %-16s%-16s%s\n", @@ -266,6 +267,7 @@ void info_win32_module(DWORD64 base, BOOL multi_machine) UINT i, j, num_printed = 0; BOOL opt; DWORD machine; + BOOL has_missing_filename = FALSE; if (!dbg_curr_process) { @@ -308,6 +310,7 @@ void info_win32_module(DWORD64 base, BOOL multi_machine) (base < im.modules[i].mi.BaseOfImage || base >= im.modules[i].mi.BaseOfImage + im.modules[i].mi.ImageSize)) continue; if (!multi_machine && machine != im.modules[i].mi.MachineType) continue; + if (!im.modules[i].ext_module_info.has_file_image) has_missing_filename = TRUE; if (im.modules[i].ext_module_info.type == DMT_ELF || im.modules[i].ext_module_info.type == DMT_MACHO) { module_print_info(&im.modules[i], FALSE, multi_machine); @@ -335,6 +338,8 @@ void info_win32_module(DWORD64 base, BOOL multi_machine) if (base && !num_printed) dbg_printf("'0x%0*I64x' is not a valid module address\n", ADDRWIDTH, base); + if (has_missing_filename) + dbg_printf("^ denotes modules for which image file couldn't be found\n"); } struct class_walker

1 0

Eric Pouech : dbghelp: Expose PE native vs builtin information to winedbg.
by Alexandre Julliard 16 Nov '23

16 Nov '23

Module: wine Branch: master Commit: 01c98c5eafd68d77f388aaba2c0a6d44a01ab41c URL: https://gitlab.winehq.org/wine/wine/-/commit/01c98c5eafd68d77f388aaba2c0a6d… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Nov 16 18:38:02 2023 +0100 dbghelp: Expose PE native vs builtin information to winedbg. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 7 ++++--- dlls/dbghelp/elf_module.c | 5 +++-- dlls/dbghelp/macho_module.c | 3 ++- dlls/dbghelp/minidump.c | 2 +- dlls/dbghelp/module.c | 23 +++++++++++++---------- dlls/dbghelp/pe_module.c | 32 +++++++++++++++++++++++--------- include/dbghelp.h | 2 ++ programs/winedbg/info.c | 27 ++++++++++++++++----------- 8 files changed, 64 insertions(+), 37 deletions(-)

1 0

Eric Pouech : dbghelp: No longer decorate ELF/Mach-O module names.
by Alexandre Julliard 16 Nov '23

16 Nov '23

Module: wine Branch: master Commit: 8d75739b6a5b6fe4cc80686c1850f157be950bcb URL: https://gitlab.winehq.org/wine/wine/-/commit/8d75739b6a5b6fe4cc80686c1850f1… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Nov 16 18:38:02 2023 +0100 dbghelp: No longer decorate ELF/Mach-O module names. Rely solely on extended module information. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/elf_module.c | 5 +---- dlls/dbghelp/module.c | 23 +++++++++++++++-------- programs/winedbg/info.c | 37 ++++++++++++++++++++++--------------- 4 files changed, 39 insertions(+), 28 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index e8f536e95a8..bce5a9c044d 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -716,7 +716,6 @@ extern BOOL macho_read_wine_loader_dbg_info(struct process* pcs, ULONG_P void minidump_add_memory_block(struct dump_context* dc, ULONG64 base, ULONG size, ULONG rva); /* module.c */ -extern const WCHAR S_ElfW[]; extern const WCHAR S_WineLoaderW[]; extern const struct loader_ops no_loader_ops; extern const struct loader_ops empty_loader_ops; @@ -748,6 +747,7 @@ extern BOOL module_remove(struct process* pcs, struct module* module); extern void module_set_module(struct module* module, const WCHAR* name); extern WCHAR* get_wine_loader_name(struct process *pcs) __WINE_DEALLOC(HeapFree, 3) __WINE_MALLOC; +extern BOOL module_is_wine_host(const WCHAR* module_name, const WCHAR* ext); /* msc.c */ extern BOOL pe_load_debug_directory(const struct process* pcs, diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 5ada8c70c9b..303863c773b 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1082,11 +1082,8 @@ static BOOL elf_load_debug_info_from_map(struct module* module, } lret = dwarf2_parse(module, module->reloc_delta, thunks, fmap); ret = ret || lret; - } - if (wcsstr(module->modulename, S_ElfW) || !wcscmp(module->modulename, S_WineLoaderW)) - { /* add the thunks for native libraries */ - if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY)) + if (module_is_wine_host(module->modulename, L".so")) elf_new_wine_thunks(module, ht_symtab, thunks); } /* add all the public symbols from symtab */ diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 62cff1260dc..ae90e8c5aa1 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -35,7 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); #define NOTE_GNU_BUILD_ID 3 -const WCHAR S_ElfW[] = L"<elf>"; const WCHAR S_WineLoaderW[] = L"<wine-loader>"; static const WCHAR * const ext[] = {L".acm", L".dll", L".drv", L".exe", L".ocx", L".vxd", NULL}; @@ -54,6 +53,20 @@ static int match_ext(const WCHAR* ptr, size_t len) return 0; } +/* FIXME: implemented from checking on modulename (ie foo.dll.so) + * and Wine loader, but fails to identify unixlib. + * Would require a stronger tagging of ELF modules. + */ +BOOL module_is_wine_host(const WCHAR* module_name, const WCHAR* ext) +{ + size_t len, extlen; + if (!wcscmp(module_name, S_WineLoaderW)) return TRUE; + len = wcslen(module_name); + extlen = wcslen(ext); + return len > extlen && !wcsicmp(&module_name[len - extlen], ext) && + match_ext(module_name, len - extlen); +} + static const WCHAR* get_filename(const WCHAR* name, const WCHAR* endptr) { const WCHAR* ptr; @@ -101,7 +114,7 @@ static BOOL is_wine_loader(const WCHAR *module) static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) { const WCHAR *ptr, *endptr; - size_t len, l; + size_t len; endptr = in + lstrlenW(in); endptr -= match_ext(in, endptr - in); @@ -111,12 +124,6 @@ static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) out[len] = '\0'; if (is_wine_loader(out)) lstrcpynW(out, S_WineLoaderW, size); - else - { - if (len > 3 && !wcsicmp(&out[len - 3], L".so") && - (l = match_ext(out, len - 3))) - lstrcpyW(&out[len - l - 3], L"<elf>"); - } while ((*out = towlower(*out))) out++; } diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index ce33539321d..e74cca2573a 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -130,6 +130,17 @@ struct info_modules unsigned num_used; }; +static const char* get_module_type(const struct info_module* im) +{ + switch (im->ext_module_info.type) + { + case DMT_ELF: return "ELF"; + case DMT_MACHO: return "Mach-O"; + case DMT_PE: return "PE"; + default: return "----"; + } +} + static const char* get_symtype_str(const struct info_module* im) { switch (im->mi.SymType) @@ -180,13 +191,15 @@ static const char* get_machine_str(DWORD machine) static void module_print_info(const struct info_module *module, BOOL is_embedded, BOOL multi_machine) { if (multi_machine) - dbg_printf("%16I64x-%16I64x\t%s\t%-16s%s\n", + dbg_printf("%s%s\t%16I64x-%16I64x\t%s\t%-16s%s\n", + is_embedded ? " \\-" : "", get_module_type(module), module->mi.BaseOfImage, module->mi.BaseOfImage + module->mi.ImageSize, get_machine_str(module->mi.MachineType), is_embedded ? "\\" : get_symtype_str(module), module->name); else - dbg_printf("%*.*I64x-%*.*I64x\t%-16s%s\n", + dbg_printf("%s%s\t%*.*I64x-%*.*I64x\t%-16s%s\n", + is_embedded ? " \\-" : "", get_module_type(module), ADDRWIDTH, ADDRWIDTH, module->mi.BaseOfImage, ADDRWIDTH, ADDRWIDTH, module->mi.BaseOfImage + module->mi.ImageSize, is_embedded ? "\\" : get_symtype_str(module), module->name); @@ -206,7 +219,9 @@ static int __cdecl module_compare(const void* p1, const void* p2) static inline BOOL module_is_container(const struct info_module *wmod_cntnr, const struct info_module *wmod_child) { - return wmod_cntnr->mi.BaseOfImage <= wmod_child->mi.BaseOfImage && + return (wmod_cntnr->ext_module_info.type == DMT_ELF || wmod_cntnr->ext_module_info.type == DMT_MACHO) && + (wmod_child->ext_module_info.type == DMT_PE) && + wmod_cntnr->mi.BaseOfImage <= wmod_child->mi.BaseOfImage && wmod_cntnr->mi.BaseOfImage + wmod_cntnr->mi.ImageSize >= wmod_child->mi.BaseOfImage + wmod_child->mi.ImageSize; } @@ -288,33 +303,25 @@ void info_win32_module(DWORD64 base, BOOL multi_machine) (base < im.modules[i].mi.BaseOfImage || base >= im.modules[i].mi.BaseOfImage + im.modules[i].mi.ImageSize)) continue; if (!multi_machine && machine != im.modules[i].mi.MachineType) continue; - if (strstr(im.modules[i].name, "<elf>")) + if (im.modules[i].ext_module_info.type == DMT_ELF || im.modules[i].ext_module_info.type == DMT_MACHO) { - dbg_printf("ELF\t"); module_print_info(&im.modules[i], FALSE, multi_machine); /* print all modules embedded in this one */ for (j = 0; j < im.num_used; j++) { - if (!strstr(im.modules[j].name, "<elf>") && module_is_container(&im.modules[i], &im.modules[j])) - { - dbg_printf(" \\-PE\t"); + if (module_is_container(&im.modules[i], &im.modules[j])) module_print_info(&im.modules[j], TRUE, multi_machine); - } } } else { /* check module is not embedded in another module */ - for (j = 0; j < im.num_used; j++) + for (j = 0; j < im.num_used; j++) { - if (strstr(im.modules[j].name, "<elf>") && module_is_container(&im.modules[j], &im.modules[i])) + if (module_is_container(&im.modules[j], &im.modules[i])) break; } if (j < im.num_used) continue; - if (strstr(im.modules[i].name, ".so") || strchr(im.modules[i].name, '<')) - dbg_printf("ELF\t"); - else - dbg_printf("PE\t"); module_print_info(&im.modules[i], FALSE, multi_machine); } num_printed++;

1 0

Eric Pouech : dbghelp: Expose some internal information about modules to winedbg.
by Alexandre Julliard 16 Nov '23

16 Nov '23

Module: wine Branch: master Commit: c50e02ec9ce78361afca88f740c7b71bf7b23986 URL: https://gitlab.winehq.org/wine/wine/-/commit/c50e02ec9ce78361afca88f740c7b7… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Nov 16 18:38:02 2023 +0100 dbghelp: Expose some internal information about modules to winedbg. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp.c | 7 +++++ dlls/dbghelp/dbghelp.spec | 3 ++ dlls/dbghelp/dbghelp_private.h | 13 +++----- dlls/dbghelp/dwarf.c | 25 ++++++++------- dlls/dbghelp/image_private.h | 2 +- dlls/dbghelp/module.c | 37 ++++++++++++++++++++-- dlls/dbghelp/stabs.c | 2 +- include/dbghelp.h | 33 ++++++++++++++++++++ programs/winedbg/info.c | 69 +++++++++++++++++++++--------------------- programs/winedbg/winedbg.c | 1 + 10 files changed, 131 insertions(+), 61 deletions(-)

1 0

Eric Pouech : dbghelp: Remove DMT_ entries for .DBG and .PDB files.
by Alexandre Julliard 16 Nov '23

16 Nov '23

Module: wine Branch: master Commit: 416d29e26c47a56ea0493565291cd4fb55333bec URL: https://gitlab.winehq.org/wine/wine/-/commit/416d29e26c47a56ea0493565291cd4… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Nov 16 18:38:02 2023 +0100 dbghelp: Remove DMT_ entries for .DBG and .PDB files. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 4 +- dlls/dbghelp/msc.c | 4 +- dlls/dbghelp/path.c | 146 ++++++++++++++--------------------------- dlls/dbghelp/pe_module.c | 2 +- 4 files changed, 53 insertions(+), 103 deletions(-)

1 0

Alexandre Julliard : wow64cpu: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 16 Nov '23

16 Nov '23

Module: wine Branch: master Commit: 79b6d8d949243857133eeba41538e58102d753ad URL: https://gitlab.winehq.org/wine/wine/-/commit/79b6d8d949243857133eeba41538e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 16 16:07:25 2023 +0100 wow64cpu: Remove DECLSPEC_HIDDEN usage. --- dlls/wow64cpu/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wow64cpu/cpu.c b/dlls/wow64cpu/cpu.c index acfd21f474b..49fde60d63d 100644 --- a/dlls/wow64cpu/cpu.c +++ b/dlls/wow64cpu/cpu.c @@ -171,7 +171,7 @@ static void copy_context_64to32( I386_CONTEXT *ctx32, DWORD flags, AMD64_CONTEXT * * Execute a 64-bit syscall from 32-bit code, then return to 32-bit. */ -extern void WINAPI syscall_32to64(void) DECLSPEC_HIDDEN; +extern void WINAPI syscall_32to64(void); __ASM_GLOBAL_FUNC( syscall_32to64, /* cf. BTCpuSimulate prolog */ __ASM_SEH(".seh_stackalloc 0x28\n\t") @@ -234,7 +234,7 @@ __ASM_GLOBAL_FUNC( syscall_32to64, * * Execute a 64-bit Unix call from 32-bit code, then return to 32-bit. */ -extern void WINAPI unix_call_32to64(void) DECLSPEC_HIDDEN; +extern void WINAPI unix_call_32to64(void); __ASM_GLOBAL_FUNC( unix_call_32to64, /* cf. BTCpuSimulate prolog */ __ASM_SEH(".seh_stackalloc 0x28\n\t")

1 0

Alexandre Julliard : wow64: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 16 Nov '23

16 Nov '23

Module: wine Branch: master Commit: a7f7832107b74681f545e9146cedefdbebb049e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a7f7832107b74681f545e9146cedef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 16 16:07:14 2023 +0100 wow64: Remove DECLSPEC_HIDDEN usage. --- dlls/wow64/syscall.c | 2 +- dlls/wow64/wow64_private.h | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 3da989acca6..11d2bebfae2 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -334,7 +334,7 @@ static void call_raise_user_exception_dispatcher( ULONG code ) /* based on RtlRaiseException: call NtRaiseException with context setup to return to caller */ -void WINAPI raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) DECLSPEC_HIDDEN; +void WINAPI raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ); #ifdef __x86_64__ __ASM_GLOBAL_FUNC( raise_exception, "sub $0x28,%rsp\n\t" diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index bd955e3fdac..62eccd3474e 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -28,16 +28,16 @@ ALL_SYSCALLS32 #undef SYSCALL_ENTRY -extern void init_image_mapping( HMODULE module ) DECLSPEC_HIDDEN; -extern void init_file_redirects(void) DECLSPEC_HIDDEN; -extern BOOL get_file_redirect( OBJECT_ATTRIBUTES *attr ) DECLSPEC_HIDDEN; +extern void init_image_mapping( HMODULE module ); +extern void init_file_redirects(void); +extern BOOL get_file_redirect( OBJECT_ATTRIBUTES *attr ); -extern USHORT native_machine DECLSPEC_HIDDEN; -extern USHORT current_machine DECLSPEC_HIDDEN; -extern ULONG_PTR args_alignment DECLSPEC_HIDDEN; -extern ULONG_PTR highest_user_address DECLSPEC_HIDDEN; -extern ULONG_PTR default_zero_bits DECLSPEC_HIDDEN; -extern SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock DECLSPEC_HIDDEN; +extern USHORT native_machine; +extern USHORT current_machine; +extern ULONG_PTR args_alignment; +extern ULONG_PTR highest_user_address; +extern ULONG_PTR default_zero_bits; +extern SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock; extern void (WINAPI *pBTCpuNotifyFlushInstructionCache2)( const void *, SIZE_T ); extern void (WINAPI *pBTCpuNotifyMapViewOfSection)( void * ); @@ -245,8 +245,8 @@ static inline void put_iosb( IO_STATUS_BLOCK32 *io32, const IO_STATUS_BLOCK *io } extern void put_section_image_info( SECTION_IMAGE_INFORMATION32 *info32, - const SECTION_IMAGE_INFORMATION *info ) DECLSPEC_HIDDEN; + const SECTION_IMAGE_INFORMATION *info ); extern void put_vm_counters( VM_COUNTERS_EX32 *info32, const VM_COUNTERS_EX *info, - ULONG size ) DECLSPEC_HIDDEN; + ULONG size ); #endif /* __WOW64_PRIVATE_H */

1 0

Alexandre Julliard : wow64win: Use the generated syscall list.
by Alexandre Julliard 16 Nov '23

16 Nov '23

Module: wine Branch: master Commit: c2868b331e625529cfc3cd79721e9ddd639e3bb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2868b331e625529cfc3cd79721e9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 16 14:09:55 2023 +0100 wow64win: Use the generated syscall list. --- dlls/wow64win/syscall.c | 8 +- dlls/wow64win/syscall.h | 427 --------------------------------------- dlls/wow64win/wow64win_private.h | 8 +- 3 files changed, 8 insertions(+), 435 deletions(-)

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
99
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2023