June 2018 - Wine-Devel - list.winehq.org

[PATCH 2/6] dbghelp: Read the 32-bit Mach-O header.

by Zebediah Figura

It is identical to the 64-bit header, except for the "reserved" field. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/dbghelp/image_private.h | 4 +--- dlls/dbghelp/macho_module.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index b12cacb..60cdd35 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -46,10 +46,8 @@ #include <mach-o/loader.h> #ifdef _WIN64 -typedef struct mach_header_64 macho_mach_header; typedef struct section_64 macho_section; #else -typedef struct mach_header macho_mach_header; typedef struct section macho_section; #endif #endif @@ -96,7 +94,7 @@ struct image_file_map struct image_file_map* dsym; /* the debug symbols file associated with this one */ #ifdef HAVE_MACH_O_LOADER_H - macho_mach_header mach_header; + struct mach_header mach_header; const struct load_command* load_commands; const struct uuid_command* uuid; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index ee35af5..679c203 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1196,7 +1196,7 @@ static BOOL image_uses_split_segs(HANDLE process, unsigned long load_addr) struct process *pcs = process_find_by_handle(process); cpu_type_t target_cpu = (pcs->is_64bit) ? CPU_TYPE_X86_64 : CPU_TYPE_X86; uint32_t target_magic = (pcs->is_64bit) ? MH_MAGIC_64 : MH_MAGIC; - macho_mach_header header; + struct mach_header header; if (ReadProcessMemory(process, (void*)load_addr, &header, sizeof(header), NULL) && header.magic == target_magic && header.cputype == target_cpu && -- 2.7.4

June 14, 2018

[PATCH 1/6] dbghelp: Determine the target Mach-O architecture from the process's architecture.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/macho_module.c | 66 +++++++++++++++++++++--------------------- dlls/dbghelp/module.c | 2 +- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 935e766..0963f1e 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -591,7 +591,7 @@ extern int elf_is_in_thunk_area(unsigned long addr, const struct elf_th /* macho_module.c */ extern BOOL macho_enum_modules(HANDLE hProc, enum_modules_cb, void*) DECLSPEC_HIDDEN; extern BOOL macho_fetch_file_info(HANDLE process, const WCHAR* name, unsigned long load_addr, DWORD_PTR* base, DWORD* size, DWORD* checksum) DECLSPEC_HIDDEN; -extern BOOL macho_load_debug_info(struct module* module) DECLSPEC_HIDDEN; +extern BOOL macho_load_debug_info(struct process *pcs, struct module* module) DECLSPEC_HIDDEN; extern struct module* macho_load_module(struct process* pcs, const WCHAR* name, unsigned long) DECLSPEC_HIDDEN; extern BOOL macho_read_wine_loader_dbg_info(struct process* pcs) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 7c40801..ee35af5 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -91,17 +91,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_macho); #ifdef _WIN64 typedef struct segment_command_64 macho_segment_command; typedef struct nlist_64 macho_nlist; - -#define TARGET_CPU_TYPE CPU_TYPE_X86_64 -#define TARGET_MH_MAGIC MH_MAGIC_64 -#define TARGET_SEGMENT_COMMAND LC_SEGMENT_64 #else typedef struct segment_command macho_segment_command; typedef struct nlist macho_nlist; - -#define TARGET_CPU_TYPE CPU_TYPE_X86 -#define TARGET_MH_MAGIC MH_MAGIC -#define TARGET_SEGMENT_COMMAND LC_SEGMENT #endif @@ -610,7 +602,8 @@ static inline void reset_file_map(struct image_file_map* ifm) * * Maps a Mach-O file into memory (and checks it's a real Mach-O file) */ -static BOOL macho_map_file(const WCHAR* filenameW, BOOL split_segs, struct image_file_map* ifm) +static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW, + BOOL split_segs, struct image_file_map* ifm) { struct macho_file_map* fmap = &ifm->u.macho; struct fat_header fat_header; @@ -620,17 +613,16 @@ static BOOL macho_map_file(const WCHAR* filenameW, BOOL split_segs, struct image unsigned len; struct section_info info; BOOL ret = FALSE; + cpu_type_t target_cpu = (pcs->is_64bit) ? CPU_TYPE_X86_64 : CPU_TYPE_X86; + uint32_t target_magic = (pcs->is_64bit) ? MH_MAGIC_64 : MH_MAGIC; + uint32_t target_cmd = (pcs->is_64bit) ? LC_SEGMENT_64 : LC_SEGMENT; TRACE("(%s, %p)\n", debugstr_w(filenameW), fmap); reset_file_map(ifm); ifm->modtype = DMT_MACHO; -#ifdef _WIN64 - ifm->addr_size = 64; -#else - ifm->addr_size = 32; -#endif + ifm->addr_size = (pcs->is_64bit) ? 64 : 32; len = WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, NULL, 0, NULL, NULL); if (!(filename = HeapAlloc(GetProcessHeap(), 0, len))) @@ -670,14 +662,14 @@ static BOOL macho_map_file(const WCHAR* filenameW, BOOL split_segs, struct image struct fat_arch fat_arch; if (read(fmap->fd, &fat_arch, sizeof(fat_arch)) != sizeof(fat_arch)) goto done; - if (swap_ulong_be_to_host(fat_arch.cputype) == TARGET_CPU_TYPE) + if (swap_ulong_be_to_host(fat_arch.cputype) == target_cpu) { fmap->arch_offset = swap_ulong_be_to_host(fat_arch.offset); break; } } if (i >= narch) goto done; - TRACE("... found target arch (%d)\n", TARGET_CPU_TYPE); + TRACE("... found target arch (%d)\n", target_cpu); } else { @@ -691,8 +683,8 @@ static BOOL macho_map_file(const WCHAR* filenameW, BOOL split_segs, struct image goto done; TRACE("... got possible Mach header\n"); /* and check for a Mach-O header */ - if (fmap->mach_header.magic != TARGET_MH_MAGIC || - fmap->mach_header.cputype != TARGET_CPU_TYPE) goto done; + if (fmap->mach_header.magic != target_magic || + fmap->mach_header.cputype != target_cpu) goto done; /* Make sure the file type is one of the ones we expect. */ switch (fmap->mach_header.filetype) { @@ -708,7 +700,7 @@ static BOOL macho_map_file(const WCHAR* filenameW, BOOL split_segs, struct image TRACE("... verified Mach header\n"); fmap->num_sections = 0; - if (macho_enum_load_commands(fmap, TARGET_SEGMENT_COMMAND, macho_count_sections, NULL) < 0) + if (macho_enum_load_commands(fmap, target_cmd, macho_count_sections, NULL) < 0) goto done; TRACE("%d sections\n", fmap->num_sections); @@ -721,7 +713,7 @@ static BOOL macho_map_file(const WCHAR* filenameW, BOOL split_segs, struct image info.split_segs = split_segs; info.section_index = 0; - if (macho_enum_load_commands(fmap, TARGET_SEGMENT_COMMAND, macho_load_section_info, &info) < 0) + if (macho_enum_load_commands(fmap, target_cmd, macho_load_section_info, &info) < 0) { fmap->num_sections = 0; goto done; @@ -1072,11 +1064,11 @@ static void macho_finish_stabs(struct module* module, struct hash_table* ht_symt * TRUE. If it can't be mapped or its UUID doesn't match, return * FALSE. */ -static BOOL try_dsym(const WCHAR* path, struct macho_file_map* fmap) +static BOOL try_dsym(struct process *pcs, const WCHAR* path, struct macho_file_map* fmap) { struct image_file_map dsym_ifm; - if (macho_map_file(path, FALSE, &dsym_ifm)) + if (macho_map_file(pcs, path, FALSE, &dsym_ifm)) { char uuid_string[UUID_STRING_LEN]; @@ -1110,7 +1102,7 @@ static BOOL try_dsym(const WCHAR* path, struct macho_file_map* fmap) * "dsymutil --flat". Finally, use Spotlight to search for a * .dSYM bundle with the same UUID as the module file. */ -static void find_and_map_dsym(struct module* module) +static void find_and_map_dsym(struct process *pcs, struct module* module) { static const WCHAR dot_dsym[] = {'.','d','S','Y','M',0}; static const WCHAR dsym_subpath[] = {'/','C','o','n','t','e','n','t','s','/','R','e','s','o','u','r','c','e','s','/','D','W','A','R','F','/',0}; @@ -1142,12 +1134,12 @@ static void find_and_map_dsym(struct module* module) strcatW(path, dsym_subpath); strcatW(path, p); - if (try_dsym(path, fmap)) + if (try_dsym(pcs, path, fmap)) goto found; strcpyW(path + strlenW(module->module.LoadedImageName), dot_dwarf); - if (try_dsym(path, fmap)) + if (try_dsym(pcs, path, fmap)) goto found; format_uuid(fmap->uuid->uuid, uuid_string); @@ -1175,7 +1167,7 @@ static void find_and_map_dsym(struct module* module) strcatW(path, p); CFRelease(item_path); - if (try_dsym(path, fmap)) + if (try_dsym(pcs, path, fmap)) goto found; } } @@ -1201,9 +1193,13 @@ static BOOL image_uses_split_segs(HANDLE process, unsigned long load_addr) if (process && load_addr) { + struct process *pcs = process_find_by_handle(process); + cpu_type_t target_cpu = (pcs->is_64bit) ? CPU_TYPE_X86_64 : CPU_TYPE_X86; + uint32_t target_magic = (pcs->is_64bit) ? MH_MAGIC_64 : MH_MAGIC; macho_mach_header header; + if (ReadProcessMemory(process, (void*)load_addr, &header, sizeof(header), NULL) && - header.magic == TARGET_MH_MAGIC && header.cputype == TARGET_CPU_TYPE && + header.magic == target_magic && header.cputype == target_cpu && header.flags & MACHO_DYLD_IN_SHARED_CACHE) { split_segs = TRUE; @@ -1218,7 +1214,7 @@ static BOOL image_uses_split_segs(HANDLE process, unsigned long load_addr) * * Loads Mach-O debugging information from the module image file. */ -BOOL macho_load_debug_info(struct module* module) +BOOL macho_load_debug_info(struct process *pcs, struct module* module) { BOOL ret = FALSE; struct macho_debug_info mdi; @@ -1239,7 +1235,7 @@ BOOL macho_load_debug_info(struct module* module) if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY)) { - find_and_map_dsym(module); + find_and_map_dsym(pcs, module); if (dwarf2_parse(module, module->reloc_delta, NULL /* FIXME: some thunks to deal with ? */, &module->format_info[DFI_MACHO]->u.macho_info->file_map)) @@ -1281,12 +1277,16 @@ BOOL macho_fetch_file_info(HANDLE process, const WCHAR* name, unsigned long load DWORD* size, DWORD* checksum) { struct image_file_map fmap; + struct process *pcs; BOOL split_segs; TRACE("(%s, %p, %p, %p)\n", debugstr_w(name), base, size, checksum); + pcs = process_find_by_handle(process); + if (!pcs) return FALSE; + split_segs = image_uses_split_segs(process, load_addr); - if (!macho_map_file(name, split_segs, &fmap)) return FALSE; + if (!macho_map_file(pcs, name, split_segs, &fmap)) return FALSE; if (base) *base = fmap.u.macho.segs_start; *size = fmap.u.macho.segs_size; *checksum = calc_crc32(fmap.u.macho.fd); @@ -1375,7 +1375,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, load_addr, macho_info, macho_info->flags); split_segs = image_uses_split_segs(pcs->handle, load_addr); - if (!macho_map_file(filename, split_segs, &fmap)) return FALSE; + if (!macho_map_file(pcs, filename, split_segs, &fmap)) return FALSE; /* Find the dynamic loader's table of images loaded into the process. */ @@ -1415,7 +1415,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, reset_file_map(&fmap); if (dbghelp_options & SYMOPT_DEFERRED_LOADS) macho_info->module->module.SymType = SymDeferred; - else if (!macho_load_debug_info(macho_info->module)) + else if (!macho_load_debug_info(pcs, macho_info->module)) ret = FALSE; macho_info->module->format_info[DFI_MACHO]->u.macho_info->in_use = 1; @@ -1930,7 +1930,7 @@ struct module* macho_load_module(struct process* pcs, const WCHAR* name, unsign return NULL; } -BOOL macho_load_debug_info(struct module* module) +BOOL macho_load_debug_info(struct process *pcs, struct module* module) { return FALSE; } diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 3659873..040bf9b 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -397,7 +397,7 @@ BOOL module_get_debug(struct module_pair* pair) &idslW64); break; case DMT_MACHO: - ret = macho_load_debug_info(pair->effective); + ret = macho_load_debug_info(pair->pcs, pair->effective); break; default: ret = FALSE; -- 2.7.4

June 14, 2018

wine-3.0.2-rc2 Available

by Michael Stefaniuc

Hello guys, I have pushed wine-3.0.2-rc2 (with tag) to https://github.com/mstefani/wine-stable/tree/stable http://static-winehq.193b.starter-ca-central-1.openshiftapps.com/stable/ Changes since rc1: - Dropped "user32/static: Use correct brush color for centered image background." due to dependencies that are not Stable material. bye michael

June 14, 2018

Re: [PATCH v4 1/5] ntdll: Return BIOS info from NtQuerySystemInformation on Linux

by Alex Henrie

On Thu, Jun 14, 2018 at 7:52 AM Huw Davies <huw(a)codeweavers.com> wrote: > > On Thu, Jun 14, 2018 at 07:26:54AM -0600, Alex Henrie wrote: > > On Thu, Jun 14, 2018 at 2:07 AM Huw Davies <huw(a)codeweavers.com> wrote: > > > > > > On Wed, Jun 13, 2018 at 09:41:15PM -0600, Alex Henrie wrote: > > > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > > > > --- > > > > dlls/ntdll/nt.c | 169 ++++++++++++++++++++++++++++++++++++++++++++++++ > > > > 1 file changed, 169 insertions(+) > > > > > > > > diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c > > > > index dc0ce04f42..72ae381813 100644 > > > > --- a/dlls/ntdll/nt.c > > > > +++ b/dlls/ntdll/nt.c > > > > @@ -66,6 +66,50 @@ > > > > > > > > WINE_DEFAULT_DEBUG_CHANNEL(ntdll); > > > > > > > > +#include "pshpack1.h" > > > > + > > > > +typedef enum _SYSTEM_FIRMWARE_TABLE_ACTION > > > > +{ > > > > + SystemFirmwareTable_Enumerate = 0, > > > > + SystemFirmwareTable_Get = 1 > > > > +} SYSTEM_FIRMWARE_TABLE_ACTION; > > > > + > > > > +typedef struct _SYSTEM_FIRMWARE_TABLE_INFORMATION > > > > +{ > > > > + ULONG ProviderSignature; > > > > + SYSTEM_FIRMWARE_TABLE_ACTION Action; > > > > + ULONG TableID; > > > > + ULONG TableBufferLength; > > > > + UCHAR TableBuffer[1]; > > > > +} SYSTEM_FIRMWARE_TABLE_INFORMATION; > > > > > > These two at least should be in winternl.h > > > > Are you sure? They're not in the native winternl.h. > > I thought we had other 'struct SYSTEM_' definitions in there that > aren't in the native SDK. Here are the SYSTEM structs I found in Wine's winternl.h but not in the Windows SDK: SYSTEM_CACHE_INFORMATION SYSTEM_CONFIGURATION_INFO SYSTEM_CPU_INFORMATION SYSTEM_DRIVER_INFORMATION SYSTEM_HANDLE_ENTRY SYSTEM_HANDLE_INFORMATION SYSTEM_KERNEL_DEBUGGER_INFORMATION SYSTEM_MODULE SYSTEM_MODULE_INFORMATION SYSTEM_TIME_ADJUSTMENT This suggests that we're not worrying about Winelib-compiled programs including winternl.h and then defining those structs on their own (which would cause a redefinition error during compilation). If that's really not something to be concerned about then sure, I can throw SYSTEM_FIRMWARE_TABLE_ACTION and SYSTEM_FIRMWARE_TABLE_INFORMATION into winternl.h too. > > > Also, some tests would be nice, both for the ntdll (free feel to just > > > tidy up mine) and kernel32 functions. > > > > Your test just checks that > > NtQuerySystemInformation(SystemFirmwareTableInformation, ...) returns > > STATUS_SUCCESS, which doesn't seem very useful. The returned data > > itself is dependent on the BIOS and could be very different on > > different computers. > > Well it must be useful because you claimed it returned > STATUS_NOT_IMPLEMENTED before I wrote it ;-) You obviously can't test > the data, but testing the lengths (i.e. the returned length and buffer > length) is also interesting. > > In principle the kernel32 tests could compare the data returned from a > call to the ntdll function with the data returned from the kernel32 > function. OK, that sounds reasonable. -Alex

June 14, 2018

[PATCH] winecfg: Temporary advertise our network capabilities

by André Hentschel

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- For our next release... If not this patch, can we PLEASE do something similar? programs/winecfg/about.c | 28 ++++++++++++++++++++++++++-- programs/winecfg/resource.h | 1 + programs/winecfg/winecfg.rc | 3 ++- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/about.c b/programs/winecfg/about.c index a2b4022..bddcf98 100644 --- a/programs/winecfg/about.c +++ b/programs/winecfg/about.c @@ -36,6 +36,8 @@ static HICON logo = NULL; static HFONT titleFont = NULL; +static HFONT descFont = NULL; +static HFONT versFont = NULL; INT_PTR CALLBACK AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -118,7 +120,28 @@ AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) SendMessageW(hWnd, WM_SETFONT, (WPARAM)titleFont, TRUE); SetWindowTextA(hWnd, PACKAGE_NAME); } - SetDlgItemTextA(hDlg, IDC_ABT_PANEL_TEXT, PACKAGE_VERSION); + /* prepare the title description */ + hWnd = GetDlgItem(hDlg, IDC_ABT_TITLE_DESC); + if(hWnd) + { + static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; + descFont = CreateFontW( + -MulDiv(18, GetDeviceCaps(hDC, LOGPIXELSY), 72), + 0, 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, tahomaW); + SendMessageW(hWnd, WM_SETFONT, (WPARAM)descFont, TRUE); + SetWindowTextA(hWnd, "for Workgroups"); + } + /* prepare the version */ + hWnd = GetDlgItem(hDlg, IDC_ABT_PANEL_TEXT); + if(hWnd) + { + static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; + versFont = CreateFontW( + -MulDiv(8, GetDeviceCaps(hDC, LOGPIXELSY), 72), + 0, 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, tahomaW); + SendMessageW(hWnd, WM_SETFONT, (WPARAM)versFont, TRUE); + SetWindowTextA(hWnd, "Version " PACKAGE_VERSION); + } /* prepare the web link */ SetDlgItemTextA(hDlg, IDC_ABT_WEB_LINK, "<a href=\"" PACKAGE_URL "\">" PACKAGE_URL "</a>"); @@ -166,9 +189,10 @@ AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) switch(GetDlgCtrlID((HWND)lParam)) { case IDC_ABT_TITLE_TEXT: + case IDC_ABT_TITLE_DESC: + case IDC_ABT_PANEL_TEXT: /* set the title to a wine color */ SetTextColor((HDC)wParam, 0x0000007F); - case IDC_ABT_PANEL_TEXT: case IDC_ABT_LICENSE_TEXT: case IDC_ABT_WEB_LINK: SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW)); diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 0c0b038..673c21c 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -218,3 +218,4 @@ #define IDC_ABT_TITLE_TEXT 8436 #define IDC_ABT_WEB_LINK 8437 #define IDC_ABT_LICENSE_TEXT 8438 +#define IDC_ABT_TITLE_DESC 8439 diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 5908b49..0c26761 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -134,7 +134,8 @@ STYLE WS_CHILD FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_ABT_PANEL, "STATIC", SS_OWNERDRAW, 0, 0, 260, 140 - LTEXT "",IDC_ABT_TITLE_TEXT,105,30,55,30 + LTEXT "",IDC_ABT_TITLE_TEXT,155,0,55,22 + LTEXT "",IDC_ABT_TITLE_DESC,123,22,123,20 LTEXT "",IDC_ABT_PANEL_TEXT,160,43,140,8 CONTROL "",IDC_ABT_WEB_LINK,"SysLink", LWS_TRANSPARENT, 105,53,106,8 LTEXT "This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", -- 2.7.4

June 14, 2018