- Wine-Commits - list.winehq.org

Paul Gofman : win32u: Return edidManufactureId and edidProductCodeId from NtUserDisplayConfigGetDeviceInfo().
by Alexandre Julliard Feb. 17, 2023

Feb. 17, 2023

Module: wine Branch: master Commit: f00dcb4bd54ea0d39956692d34b67d7a35eee2bd URL: https://gitlab.winehq.org/wine/wine/-/commit/f00dcb4bd54ea0d39956692d34b67d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 13 14:56:10 2023 -0600 win32u: Return edidManufactureId and edidProductCodeId from NtUserDisplayConfigGetDeviceInfo(). --- dlls/win32u/sysparams.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 1ee2ad9b740..db875e57201 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -224,6 +224,7 @@ struct edid_monitor_info { unsigned int flags; /* MONITOR_INFO_HAS_MONITOR_ID */ + unsigned short manufacturer, product_code; char monitor_id_string[8]; }; @@ -467,6 +468,8 @@ static void get_monitor_info_from_edid( struct edid_monitor_info *info, const un } if (w) return; w = edid[10] | (edid[11] << 8); /* Product code, little endian. */ + info->manufacturer = *(unsigned short *)(edid + 8); + info->product_code = w; sprintf( info->monitor_id_string + 3, "%04X", w ); info->flags = MONITOR_INFO_HAS_MONITOR_ID; TRACE( "Monitor id %s.\n", info->monitor_id_string ); @@ -5732,6 +5735,12 @@ NTSTATUS WINAPI NtUserDisplayConfigGetDeviceInfo( DISPLAYCONFIG_DEVICE_INFO_HEAD snprintf( buffer, ARRAY_SIZE(buffer), "Display%u", monitor->output_id + 1 ); asciiz_to_unicode( target_name->monitorFriendlyDeviceName, buffer ); lstrcpyW( target_name->monitorDevicePath, monitor->dev.interface_name ); + if (monitor->edid_info.flags & MONITOR_INFO_HAS_MONITOR_ID) + { + target_name->edidManufactureId = monitor->edid_info.manufacturer; + target_name->edidProductCodeId = monitor->edid_info.product_code; + target_name->flags.edidIdsValid = 1; + } ret = STATUS_SUCCESS; break; }

1 0

Paul Gofman : win32u: Remove monitor name from gdi driver monitor info.
by Alexandre Julliard Feb. 17, 2023

Feb. 17, 2023

Module: wine Branch: master Commit: 6bc1eea7182acdcdfc74c04bbfbd8710818e5b9a URL: https://gitlab.winehq.org/wine/wine/-/commit/6bc1eea7182acdcdfc74c04bbfbd87… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 13 15:11:25 2023 -0600 win32u: Remove monitor name from gdi driver monitor info. --- dlls/win32u/sysparams.c | 8 +++----- dlls/winemac.drv/cocoa_display.m | 1 - dlls/winemac.drv/display.c | 3 --- dlls/winemac.drv/macdrv_cocoa.h | 2 -- dlls/winex11.drv/desktop.c | 4 ---- dlls/winex11.drv/display.c | 3 --- dlls/winex11.drv/xinerama.c | 4 ---- dlls/winex11.drv/xrandr.c | 7 ------- include/wine/gdi_driver.h | 1 - 9 files changed, 3 insertions(+), 30 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 2269193b7ff..aab148bbfe3 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1311,12 +1311,11 @@ static void add_monitor( const struct gdi_monitor *monitor, void *param ) static const WCHAR default_monitorW[] = {'M','O','N','I','T','O','R','\\','D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; - TRACE( "%s %s %s\n", debugstr_w(monitor->name), wine_dbgstr_rect(&monitor->rc_monitor), - wine_dbgstr_rect(&monitor->rc_work) ); - monitor_index = ctx->monitor_count++; output_index = ctx->output_count++; + TRACE( "%u %s %s\n", monitor_index, wine_dbgstr_rect(&monitor->rc_monitor), wine_dbgstr_rect(&monitor->rc_work) ); + sprintf( buffer, "MonitorID%u", monitor_index ); sprintf( instance, "DISPLAY\\Default_Monitor\\%04X&%04X", ctx->video_count - 1, monitor_index ); set_reg_ascii_value( ctx->adapter_key, buffer, instance ); @@ -1327,8 +1326,7 @@ static void add_monitor( const struct gdi_monitor *monitor, void *param ) link_device( bufferW, guid_devinterface_monitorW ); - lstrcpyW( bufferW, monitor->name ); - if (!bufferW[0]) asciiz_to_unicode( bufferW, "Generic Non-PnP Monitor" ); + asciiz_to_unicode( bufferW, "Generic Non-PnP Monitor" ); set_reg_value( hkey, device_descW, REG_SZ, bufferW, (lstrlenW( bufferW ) + 1) * sizeof(WCHAR) ); set_reg_value( hkey, classW, REG_SZ, monitorW, sizeof(monitorW) ); diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 04f6dda4481..b5096a39ca4 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -675,7 +675,6 @@ int macdrv_get_monitors(uint32_t adapter_id, struct macdrv_monitor** new_monitor if (j == 0) primary_index = monitor_count; - strcpy(monitors[monitor_count].name, "Generic Non-PnP Monitor"); monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE; monitors[monitor_count].rc_monitor = displays[j].frame; monitors[monitor_count].rc_work = displays[j].work_frame; diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index dab81cc8ffb..19ff72a7130 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1192,9 +1192,6 @@ BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage .rc_work = rect_from_cgrect(monitor->rc_work), .state_flags = monitor->state_flags, }; - RtlUTF8ToUnicodeN(gdi_monitor.name, sizeof(gdi_monitor.name), &len, - monitor->name, strlen(monitor->name)); - TRACE("monitor: %s\n", debugstr_a(monitor->name)); device_manager->add_monitor( &gdi_monitor, param ); } diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 6196032c08d..a82dd319330 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -291,8 +291,6 @@ struct macdrv_adapter /* Represent a monitor in EnumDisplayDevices context */ struct macdrv_monitor { - /* Name, in UTF-8 encoding */ - char name[128]; /* as RcMonitor in MONITORINFO struct after conversion by rect_from_cgrect */ CGRect rc_monitor; /* as RcWork in MONITORINFO struct after conversion by rect_from_cgrect */ diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index bb998543ae7..a0367d6ce50 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -287,15 +287,11 @@ static void X11DRV_desktop_free_adapters( struct gdi_adapter *adapters ) static BOOL X11DRV_desktop_get_monitors( ULONG_PTR adapter_id, struct gdi_monitor **new_monitors, int *count ) { - static const WCHAR generic_nonpnp_monitorW[] = { - 'G','e','n','e','r','i','c',' ', - 'N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; struct gdi_monitor *monitor; monitor = calloc( 1, sizeof(*monitor) ); if (!monitor) return FALSE; - lstrcpyW( monitor->name, generic_nonpnp_monitorW ); SetRect( &monitor->rc_monitor, 0, 0, desktop_width, desktop_height ); SetRect( &monitor->rc_work, 0, 0, desktop_width, desktop_height ); query_desktop_work_area( &monitor->rc_work ); diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 34085c49543..78de6a6f88b 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -589,10 +589,7 @@ BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage /* Initialize monitors */ for (monitor = 0; monitor < monitor_count; monitor++) - { - TRACE("monitor: %#x %s\n", monitor, wine_dbgstr_w(monitors[monitor].name)); device_manager->add_monitor( &monitors[monitor], param ); - } handler->free_monitors(monitors, monitor_count); diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 6835aa4a331..2691f9e9c5e 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -287,9 +287,6 @@ static void xinerama_free_adapters( struct gdi_adapter *adapters ) static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct gdi_monitor **new_monitors, int *count ) { - static const WCHAR generic_nonpnp_monitorW[] = { - 'G','e','n','e','r','i','c',' ', - 'N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; struct gdi_monitor *monitor; INT first = (INT)adapter_id; INT monitor_count = 0; @@ -319,7 +316,6 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct gdi_monitor **ne || (EqualRect( &monitors[i].rcMonitor, &monitors[first].rcMonitor ) && !IsRectEmpty( &monitors[first].rcMonitor ))) { - lstrcpyW( monitor[index].name, generic_nonpnp_monitorW ); monitor[index].rc_monitor = monitors[i].rcMonitor; monitor[index].rc_work = monitors[i].rcWork; /* Xinerama only reports monitors already attached */ diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 2b0ee253cea..7c32e683c5d 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1027,9 +1027,6 @@ static void xrandr14_free_adapters( struct gdi_adapter *adapters ) static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct gdi_monitor **new_monitors, int *count ) { - static const WCHAR generic_nonpnp_monitorW[] = { - 'G','e','n','e','r','i','c',' ', - 'N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; struct gdi_monitor *realloc_monitors, *monitors = NULL; XRRScreenResources *screen_resources = NULL; XRROutputInfo *output_info = NULL, *enum_output_info = NULL; @@ -1063,7 +1060,6 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct gdi_monitor **ne /* Inactive but attached monitor, no need to check for mirrored/replica monitors */ if (!output_info->crtc || !crtc_info->mode) { - lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW ); monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; monitors[monitor_count].edid_len = get_edid( adapter_id, &monitors[monitor_count].edid ); monitor_count = 1; @@ -1108,9 +1104,6 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct gdi_monitor **ne enum_crtc_info->width == crtc_info->width && enum_crtc_info->height == crtc_info->height) { - /* FIXME: Read output EDID property and parse the data to get the correct name */ - lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW ); - SetRect( &monitors[monitor_count].rc_monitor, crtc_info->x, crtc_info->y, crtc_info->x + crtc_info->width, crtc_info->y + crtc_info->height ); monitors[monitor_count].rc_work = get_work_area( &monitors[monitor_count].rc_monitor ); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 3db3d0d6af3..3de7e20af9a 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -253,7 +253,6 @@ struct gdi_adapter struct gdi_monitor { - WCHAR name[128]; /* name */ RECT rc_monitor; /* RcMonitor in MONITORINFO struct */ RECT rc_work; /* RcWork in MONITORINFO struct */ DWORD state_flags; /* StateFlags in DISPLAY_DEVICE struct */

1 0

Brendan Shanks : server: On macOS, fake debug registers when running under Rosetta.
by Alexandre Julliard Feb. 17, 2023

Feb. 17, 2023

Module: wine Branch: master Commit: 93fde56b494151f5e4bdfc560f930867bda52514 URL: https://gitlab.winehq.org/wine/wine/-/commit/93fde56b494151f5e4bdfc560f9308… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Feb 8 15:51:29 2023 -0800 server: On macOS, fake debug registers when running under Rosetta. Based on a patch by Tim Clem <tclem(a)codeweavers.com>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54367 --- server/mach.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/server/mach.c b/server/mach.c index 6051396a1bf..3852bb3ee5b 100644 --- a/server/mach.c +++ b/server/mach.c @@ -31,6 +31,9 @@ #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif +#ifdef HAVE_SYS_SYSCTL_H +#include <sys/sysctl.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -74,6 +77,25 @@ static mach_port_t get_process_port( struct process *process ) return process->trace_data; } +static int is_rosetta( void ) +{ + static int rosetta_status, did_check = 0; + if (!did_check) + { + /* returns 0 for native process or on error, 1 for translated */ + int ret = 0; + size_t size = sizeof(ret); + if (sysctlbyname( "sysctl.proc_translated", &ret, &size, NULL, 0 ) == -1) + rosetta_status = 0; + else + rosetta_status = ret; + + did_check = 1; + } + + return rosetta_status; +} + /* initialize the process control mechanism */ void init_tracing_mechanism(void) { @@ -165,6 +187,14 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int /* all other regs are handled on the client side */ assert( flags == SERVER_CTX_DEBUG_REGISTERS ); + if (is_rosetta()) + { + /* getting debug registers of a translated process is not supported cross-process, return all zeroes */ + memset( &context->debug, 0, sizeof(context->debug) ); + context->flags |= SERVER_CTX_DEBUG_REGISTERS; + return; + } + if (thread->unix_pid == -1 || !process_port || mach_port_extract_right( process_port, thread->unix_tid, MACH_MSG_TYPE_COPY_SEND, &port, &type )) @@ -251,6 +281,15 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign return; } + if (is_rosetta()) + { + /* Setting debug registers of a translated process is not supported cross-process + * (and even in-process, setting debug registers never has the desired effect). + */ + set_error( STATUS_UNSUCCESSFUL ); + return; + } + /* get the debug state to determine which flavor to use */ ret = thread_get_state(port, x86_DEBUG_STATE, (thread_state_t)&state, &count); if (ret)

1 0

Zebediah Figura : mfsrcsnk: Add missing DllGetClassObject() export.
by Alexandre Julliard Feb. 17, 2023

Feb. 17, 2023

Module: wine Branch: master Commit: d85bc9f433496d02765727d445a459b7835b3bfc URL: https://gitlab.winehq.org/wine/wine/-/commit/d85bc9f433496d02765727d445a459… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 16 23:40:32 2023 -0600 mfsrcsnk: Add missing DllGetClassObject() export. --- dlls/mfsrcsnk/mfsrcsnk.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mfsrcsnk/mfsrcsnk.spec b/dlls/mfsrcsnk/mfsrcsnk.spec index ab9f2e4c207..485fba3bb31 100644 --- a/dlls/mfsrcsnk/mfsrcsnk.spec +++ b/dlls/mfsrcsnk/mfsrcsnk.spec @@ -1,3 +1,4 @@ +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stdcall MFCreateWAVEMediaSink(ptr ptr ptr)

1 0

Alex Henrie : winspool: Initialize nt_ppd in add_printer_driver.
by Alexandre Julliard Feb. 16, 2023

Feb. 16, 2023

Module: wine Branch: master Commit: d0ce5a77c60e0a9613f1af03d67d13b89816441b URL: https://gitlab.winehq.org/wine/wine/-/commit/d0ce5a77c60e0a9613f1af03d67d13… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 16 09:15:56 2023 -0700 winspool: Initialize nt_ppd in add_printer_driver. This prevents a bad free if RtlDosPathNameToNtPathName_U fails. --- dlls/winspool.drv/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 61017104ab1..456d5e2ecdf 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -635,7 +635,7 @@ static BOOL add_printer_driver( const WCHAR *name, const WCHAR *ppd_dir ) { WCHAR *ppd = get_ppd_filename( ppd_dir, name ); struct get_ppd_params ppd_params; - UNICODE_STRING nt_ppd; + UNICODE_STRING nt_ppd = { .Buffer = NULL }; DRIVER_INFO_3W di3; unsigned int i; BOOL res = FALSE;

1 0

Alexandre Julliard : winedump: Dump the metadata of hybrid PE dlls.
by Alexandre Julliard Feb. 16, 2023

Feb. 16, 2023

Module: wine Branch: master Commit: 7141332431e341e101124afc4e10de48fd5d0963 URL: https://gitlab.winehq.org/wine/wine/-/commit/7141332431e341e101124afc4e10de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 16 16:47:55 2023 +0100 winedump: Dump the metadata of hybrid PE dlls. --- tools/winedump/pe.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 104 insertions(+), 4 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index aa14750d3a1..34b34217d17 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -169,7 +169,7 @@ static const char *get_magic_type(WORD magic) return "???"; } -static ULONGLONG get_hybrid_metadata(void) +static const void *get_hybrid_metadata(void) { unsigned int size; @@ -179,7 +179,7 @@ static ULONGLONG get_hybrid_metadata(void) if (!cfg) return 0; size = min( size, cfg->Size ); if (size <= offsetof( IMAGE_LOAD_CONFIG_DIRECTORY64, CHPEMetadataPointer )) return 0; - return cfg->CHPEMetadataPointer; + return RVA( cfg->CHPEMetadataPointer - ((const IMAGE_OPTIONAL_HEADER64 *)&PE_nt_headers->OptionalHeader)->ImageBase, 1 ); } else { @@ -187,7 +187,7 @@ static ULONGLONG get_hybrid_metadata(void) if (!cfg) return 0; size = min( size, cfg->Size ); if (size <= offsetof( IMAGE_LOAD_CONFIG_DIRECTORY32, CHPEMetadataPointer )) return 0; - return cfg->CHPEMetadataPointer; + return RVA( cfg->CHPEMetadataPointer - PE_nt_headers->OptionalHeader.ImageBase, 1 ); } } @@ -430,7 +430,7 @@ void dump_file_header(const IMAGE_FILE_HEADER *fileHeader, BOOL is_hybrid) static void dump_pe_header(void) { - dump_file_header(&PE_nt_headers->FileHeader, get_hybrid_metadata() != 0); + dump_file_header(&PE_nt_headers->FileHeader, get_hybrid_metadata() != NULL); dump_optional_header((const IMAGE_OPTIONAL_HEADER32*)&PE_nt_headers->OptionalHeader, PE_nt_headers->FileHeader.SizeOfOptionalHeader); if (!PE_alt_headers) return; @@ -1799,6 +1799,104 @@ static void dump_dir_imported_functions(void) printf("\n"); } +static void dump_hybrid_metadata(void) +{ + unsigned int i; + const struct + { + unsigned int version; + unsigned int code_map; + unsigned int code_map_count; + unsigned int code_ranges_to_ep; + unsigned int redir_metadata; + unsigned int __os_arm64x_dispatch_call_no_redirect; + unsigned int __os_arm64x_dispatch_ret; + unsigned int __os_arm64x_check_call; + unsigned int __os_arm64x_check_icall; + unsigned int __os_arm64x_check_icall_cfg; + unsigned int alt_entry; + unsigned int aux_iat; + unsigned int code_ranges_to_ep_count; + unsigned int redir_metadata_count; + unsigned int __os_arm64x_get_x64_information; + unsigned int __os_arm64x_set_x64_information; + unsigned int except_data; + unsigned int except_data_size; + unsigned int __os_arm64x_jump; + unsigned int aux_iat_copy; + } *data = get_hybrid_metadata(); + + if (!data) return; + printf( "Hybrid metadata\n" ); + print_dword( "Version", data->version ); + print_dword( "Code map", data->code_map ); + print_dword( "Code map count", data->code_map_count ); + print_dword( "Code ranges to entry points", data->code_ranges_to_ep ); + print_dword( "Redirection metadata", data->redir_metadata ); + print_dword( "__os_arm64x_dispatch_call_no_redirect", data->__os_arm64x_dispatch_call_no_redirect ); + print_dword( "__os_arm64x_dispatch_ret", data->__os_arm64x_dispatch_ret ); + print_dword( "__os_arm64x_check_call", data->__os_arm64x_check_call ); + print_dword( "__os_arm64x_check_icall", data->__os_arm64x_check_icall ); + print_dword( "__os_arm64x_check_icall_cfg", data->__os_arm64x_check_icall_cfg ); + print_dword( "Alternate entry point", data->alt_entry ); + print_dword( "Auxiliary IAT", data->aux_iat ); + print_dword( "Code ranges to entry points count", data->code_ranges_to_ep_count ); + print_dword( "Redirection metadata count", data->redir_metadata_count ); + print_dword( "__os_arm64x_get_x64_information", data->__os_arm64x_get_x64_information ); + print_dword( "__os_arm64x_set_x64_information", data->__os_arm64x_set_x64_information ); + print_dword( "Exception data", data->except_data ); + print_dword( "Exception data size", data->except_data_size ); + print_dword( "__os_arm64x_jump", data->__os_arm64x_jump ); + print_dword( "Auxiliary IAT copy", data->aux_iat_copy ); + + if (data->code_map) + { + const struct + { + unsigned int start : 30; + unsigned int type : 2; + unsigned int len; + } *map = RVA( data->code_map, data->code_map_count * sizeof(*map) ); + + printf( "\nCode ranges\n" ); + for (i = 0; i < data->code_map_count; i++) + { + static const char *types[] = { "ARM64", "ARM64EC", "x64", "??" }; + unsigned int start = map[i].start & ~0x3; + unsigned int type = map[i].start & 0x3; + printf( " %08x - %08x %s\n", start, start + map[i].len, types[type] ); + } + } + + if (data->code_ranges_to_ep) + { + const struct + { + unsigned int start; + unsigned int end; + unsigned int func; + } *map = RVA( data->code_ranges_to_ep, data->code_ranges_to_ep_count * sizeof(*map) ); + + printf( "\nCode ranges to entry points\n" ); + printf( " Start - End Entry point\n" ); + for (i = 0; i < data->code_ranges_to_ep_count; i++) + printf( " %08x - %08x %08x\n", map[i].start, map[i].end, map[i].func ); + } + + if (data->redir_metadata) + { + const struct + { + unsigned int func; + unsigned int redir; + } *map = RVA( data->redir_metadata, data->redir_metadata_count * sizeof(*map) ); + + printf( "\nEntry point redirection\n" ); + for (i = 0; i < data->redir_metadata_count; i++) + printf( " %08x -> %08x\n", map[i].func, map[i].redir ); + } +} + static void dump_dir_loadconfig(void) { unsigned int dir, size, sizes[2]; @@ -1946,6 +2044,8 @@ static void dump_dir_loadconfig(void) print_dword( "GuardMemcpyFunctionPointer", loadcfg32->GuardMemcpyFunctionPointer ); } } + printf( "\n" ); + dump_hybrid_metadata(); } static void dump_dir_delay_imported_functions(void)

1 0

Jason Millard : vbscript: Fix compile issue with non hex after concat without space.
by Alexandre Julliard Feb. 16, 2023

Feb. 16, 2023

Module: wine Branch: master Commit: e8bd066514fb343790b3831d3e62709f80366d61 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8bd066514fb343790b3831d3e6270… Author: Jason Millard <jsm174(a)gmail.com> Date: Wed Feb 15 16:56:28 2023 -0500 vbscript: Fix compile issue with non hex after concat without space. --- dlls/vbscript/lex.c | 2 +- dlls/vbscript/tests/lang.vbs | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 38ee4a5fd4b..8c5c69ea429 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -473,7 +473,7 @@ static int parse_next_token(void *lval, unsigned *loc, parser_ctx_t *ctx) case '#': return parse_date_literal(ctx, lval); case '&': - if(*++ctx->ptr == 'h' || *ctx->ptr == 'H') + if((*++ctx->ptr == 'h' || *ctx->ptr == 'H') && hex_to_int(ctx->ptr[1]) != -1) return parse_hex_literal(ctx, lval); return '&'; case '=': diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 4a629627a16..77e132133b0 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -18,7 +18,7 @@ OPTION EXPLICIT : : DIM W -dim x, y, z, e +dim x, y, z, e, hi Dim obj call ok(true, "true is not true?") @@ -62,6 +62,11 @@ Call ok(&hfffe& = 65534, "&hfffe& <> -2") Call ok(&hffffffff& = -1, "&hffffffff& <> -1") Call ok((&h01or&h02)=3,"&h01or&h02 <> 3") +' Test concat when no space and var begins with h +hi = "y" +x = "x" &hi +Call ok(x = "xy", "x = " & x & " expected ""xy""") + W = 5 Call ok(W = 5, "W = " & W & " expected " & 5)

1 0

Alexandre Julliard : winedump: Dump the alternate version of some data directories for hybrid PE dlls.
by Alexandre Julliard Feb. 16, 2023

Feb. 16, 2023

Module: wine Branch: master Commit: 385ce6276125ffcc211c7c0515f7f2ad9ee05db8 URL: https://gitlab.winehq.org/wine/wine/-/commit/385ce6276125ffcc211c7c0515f7f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 16 14:29:20 2023 +0100 winedump: Dump the alternate version of some data directories for hybrid PE dlls. --- tools/winedump/pe.c | 588 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 377 insertions(+), 211 deletions(-)

1 0

Brendan Shanks : ntdll: Use __ASM_LOCAL_LABEL in syscall dispatchers.
by Alexandre Julliard Feb. 16, 2023

Feb. 16, 2023

Module: wine Branch: master Commit: 41e708dafa0e917951a9cfb331f97a09d46b2aa6 URL: https://gitlab.winehq.org/wine/wine/-/commit/41e708dafa0e917951a9cfb331f97a… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 9 15:03:05 2023 -0800 ntdll: Use __ASM_LOCAL_LABEL in syscall dispatchers. Fixes compile error on ARM64 macOS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54256 --- dlls/ntdll/unix/signal_arm.c | 8 ++++---- dlls/ntdll/unix/signal_arm64.c | 8 ++++---- dlls/ntdll/unix/signal_i386.c | 8 ++++---- dlls/ntdll/unix/signal_x86_64.c | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 8180bc52b46..681c2e3c0c1 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1701,7 +1701,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "ldr r5, [r4]\n\t" /* table->ServiceTable */ "ldr ip, [r5, ip, lsl #2]\n\t" "blx ip\n" - ".L__wine_syscall_dispatcher_return:\n\t" + __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ":\n\t" "ldr ip, [r8, #0x44]\n\t" /* frame->restore_flags */ #ifndef __SOFTFP__ "tst ip, #4\n\t" /* CONTEXT_FLOATING_POINT */ @@ -1722,12 +1722,12 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "5:\tmovw r0, #0x000d\n\t" /* STATUS_INVALID_PARAMETER */ "movt r0, #0xc000\n\t" "add sp, sp, #0x10\n\t" - "b .L__wine_syscall_dispatcher_return\n\t" + "b " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") "\n\t" ".globl " __ASM_NAME("__wine_syscall_dispatcher_return") "\n" __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t" "mov r8, r0\n\t" "mov r0, r1\n\t" - "b .L__wine_syscall_dispatcher_return" ) + "b " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ) /*********************************************************************** @@ -1762,7 +1762,7 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, "ldr sp, [r8, #0x38]\n\t" "add r8, r8, #0x10\n\t" "ldm r8, {r4-r12,pc}\n\t" - "1:\tb .L__wine_syscall_dispatcher_return" ) + "1:\tb " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ) /*********************************************************************** diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index bd9818c808a..d94b335bc8d 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1522,7 +1522,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "ldr x16, [x16, x20, lsl 3]\n\t" "blr x16\n\t" "mov sp, x22\n" - ".L__wine_syscall_dispatcher_return:\n\t" + __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ":\n\t" "ldp x18, x19, [sp, #0x90]\n\t" "ldp x20, x21, [sp, #0xa0]\n\t" "ldp x22, x23, [sp, #0xb0]\n\t" @@ -1567,12 +1567,12 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "ret x16\n" "4:\tmov x0, #0xc0000000\n\t" /* STATUS_INVALID_PARAMETER */ "movk x0, #0x000d\n\t" - "b .L__wine_syscall_dispatcher_return\n\t" + "b " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") "\n\t" ".globl " __ASM_NAME("__wine_syscall_dispatcher_return") "\n" __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t" "mov sp, x0\n\t" "mov x0, x1\n\t" - "b .L__wine_syscall_dispatcher_return" ) + "b " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ) /*********************************************************************** @@ -1607,7 +1607,7 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, "mov x0, x2\n\t" /* args */ "blr x16\n\t" "ldr w16, [sp, #0x10c]\n\t" /* frame->restore_flags */ - "cbnz w16, .L__wine_syscall_dispatcher_return\n\t" + "cbnz w16, " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") "\n\t" "ldr x18, [sp, #0x90]\n\t" "ldp x16, x17, [sp, #0xf8]\n\t" "mov sp, x16\n\t" diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 1cea685d995..a567aa31b2a 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2630,7 +2630,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "call *(%eax,%edx,4)\n\t" "leal -0x34(%ebp),%esp\n" - ".L__wine_syscall_dispatcher_return:\t" + __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ":\t" __ASM_CFI_CFA_IS_AT1(esp, 0x0c) __ASM_CFI_REG_IS_AT1(esp, esp, 0x0c) __ASM_CFI_REG_IS_AT1(eip, esp, 0x08) @@ -2707,7 +2707,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "iret\n" __ASM_CFI("\t.cfi_restore_state\n") "6:\tmovl $0xc000000d,%eax\n\t" /* STATUS_INVALID_PARAMETER */ - "jmp .L__wine_syscall_dispatcher_return\n\t" + "jmp " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") "\n\t" ".globl " __ASM_NAME("__wine_syscall_dispatcher_return") "\n" __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t" @@ -2722,7 +2722,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movl 8(%esp),%eax\n\t" "movl 4(%esp),%esp\n\t" __ASM_CFI(".cfi_restore_state\n\t") - "jmp .L__wine_syscall_dispatcher_return" ) + "jmp " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ) /*********************************************************************** @@ -2769,7 +2769,7 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, __ASM_CFI_REG_IS_AT1(esi, esp, 0x30) __ASM_CFI_REG_IS_AT1(ebp, esp, 0x34) "testw $0xffff,2(%esp)\n\t" /* frame->restore_flags */ - "jnz .L__wine_syscall_dispatcher_return\n\t" + "jnz " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") "\n\t" "movl 0x08(%esp),%ecx\n\t" /* frame->eip */ __ASM_CFI(".cfi_register %eip, %ecx\n\t") "movl 0x0c(%esp),%esp\n\t" /* frame->esp */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 54babc7d964..13fe7051c66 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2757,7 +2757,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "leaq -0x98(%rbp),%rcx\n\t" /* $rcx is now pointing to "frame" again */ __ASM_CFI(".cfi_restore_state\n") - ".L__wine_syscall_dispatcher_return:\n\t" + __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ":\n\t" "movl 0x94(%rcx),%edx\n\t" /* frame->restore_flags */ #ifdef __linux__ "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ @@ -2849,7 +2849,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t" "movl 0xb0(%rcx),%r14d\n\t" /* frame->syscall_flags */ "movq %rdx,%rax\n\t" - "jmp .L__wine_syscall_dispatcher_return" ) + "jmp " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ) /*********************************************************************** @@ -2930,7 +2930,7 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, "movdqa 0x240(%rcx),%xmm14\n\t" "movdqa 0x250(%rcx),%xmm15\n\t" "testl $0xffff,0x94(%rcx)\n\t" /* frame->restore_flags */ - "jnz .L__wine_syscall_dispatcher_return\n\t" + "jnz " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") "\n\t" #ifdef __linux__ "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ "jz 1f\n\t"

1 0

Brendan Shanks : include: Add __ASM_LOCAL_LABEL macro.
by Alexandre Julliard Feb. 16, 2023

Feb. 16, 2023

Module: wine Branch: master Commit: 1362b0c04f1df59cfac7c3bfe60f5d43b8ba449b URL: https://gitlab.winehq.org/wine/wine/-/commit/1362b0c04f1df59cfac7c3bfe60f5d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Feb 14 21:12:55 2023 -0800 include: Add __ASM_LOCAL_LABEL macro. --- include/wine/asm.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/wine/asm.h b/include/wine/asm.h index 2448f591189..61e197d9586 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -27,6 +27,12 @@ # define __ASM_NAME(name) name #endif +#if defined(__APPLE__) +# define __ASM_LOCAL_LABEL(label) "L" label +#else +# define __ASM_LOCAL_LABEL(label) ".L" label +#endif + #if defined(__WINE_PE_BUILD) && defined(__i386__) # define __ASM_STDCALL(name,args) "_" name "@" #args # define __ASM_FASTCALL(name,args) "@" name "@" #args

1 0