wine-commits February 2023

wine-commits@winehq.org

1 participants
599 discussions

Alexandre Julliard : browseui: Use standard va_list instead of __ms_va_list.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: ee165ebd50077fa0219621b4742d96199897a4a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee165ebd50077fa0219621b4742d96… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 11:24:50 2023 +0100 browseui: Use standard va_list instead of __ms_va_list. --- dlls/browseui/progressdlg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 11a973034fa..1e22ef636e1 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -457,10 +457,10 @@ static void update_time_remaining(ProgressDialog *This, ULONGLONG ullCompleted, if (i > 0 && remaining < 2 && remainder != 0) FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - This->remainingMsg[1], 0, 0, line, ARRAY_SIZE(line), (__ms_va_list*)args); + This->remainingMsg[1], 0, 0, line, ARRAY_SIZE(line), (va_list *)args); else FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - This->remainingMsg[0], 0, 0, line, ARRAY_SIZE(line), (__ms_va_list*)args); + This->remainingMsg[0], 0, 0, line, ARRAY_SIZE(line), (va_list *)args); set_buffer(&This->lines[2], line); This->dwUpdate |= UPDATE_LINE3;

1 0

Paul Gofman : win32u: Get friendly monitor name from EDID in NtUserDisplayConfigGetDeviceInfo().
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: 1f31fda00a7126c5ba3defa55f7cba2c550c1686 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f31fda00a7126c5ba3defa55f7cba… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 13 15:55:31 2023 -0600 win32u: Get friendly monitor name from EDID in NtUserDisplayConfigGetDeviceInfo(). --- dlls/win32u/sysparams.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index db875e57201..bcdb8c5103b 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -220,12 +220,15 @@ struct adapter }; #define MONITOR_INFO_HAS_MONITOR_ID 0x00000001 +#define MONITOR_INFO_HAS_MONITOR_NAME 0x00000002 struct edid_monitor_info { unsigned int flags; /* MONITOR_INFO_HAS_MONITOR_ID */ unsigned short manufacturer, product_code; char monitor_id_string[8]; + /* MONITOR_INFO_HAS_MONITOR_NAME */ + WCHAR monitor_name[14]; }; struct monitor @@ -451,9 +454,10 @@ C_ASSERT(sizeof(DEVMODEW) - offsetof(DEVMODEW, dmFields) == 0x94); static void get_monitor_info_from_edid( struct edid_monitor_info *info, const unsigned char *edid, unsigned int edid_len ) { + unsigned int i, j; unsigned short w; unsigned char d; - unsigned int i; + const char *s; info->flags = 0; if (!edid || edid_len < 128) return; @@ -473,6 +477,19 @@ static void get_monitor_info_from_edid( struct edid_monitor_info *info, const un sprintf( info->monitor_id_string + 3, "%04X", w ); info->flags = MONITOR_INFO_HAS_MONITOR_ID; TRACE( "Monitor id %s.\n", info->monitor_id_string ); + + for (i = 0; i < 4; ++i) + { + if (edid[54 + i * 18 + 3] != 0xfc) continue; + /* "Display name" ASCII descriptor. */ + s = (const char *)&edid[54 + i * 18 + 5]; + for (j = 0; s[j] && j < 13; ++j) + info->monitor_name[j] = s[j]; + while (j && isspace(s[j - 1])) --j; + info->monitor_name[j] = 0; + info->flags |= MONITOR_INFO_HAS_MONITOR_NAME; + break; + } } static BOOL write_adapter_mode( HKEY adapter_key, UINT index, const DEVMODEW *mode ) @@ -5731,7 +5748,6 @@ NTSTATUS WINAPI NtUserDisplayConfigGetDeviceInfo( DISPLAYCONFIG_DEVICE_INFO_HEAD continue; target_name->outputTechnology = DISPLAYCONFIG_OUTPUT_TECHNOLOGY_INTERNAL; - /* FIXME: get real monitor name. */ 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 ); @@ -5741,6 +5757,11 @@ NTSTATUS WINAPI NtUserDisplayConfigGetDeviceInfo( DISPLAYCONFIG_DEVICE_INFO_HEAD target_name->edidProductCodeId = monitor->edid_info.product_code; target_name->flags.edidIdsValid = 1; } + if (monitor->edid_info.flags & MONITOR_INFO_HAS_MONITOR_NAME) + { + wcscpy( target_name->monitorFriendlyDeviceName, monitor->edid_info.monitor_name ); + target_name->flags.friendlyNameFromEdid = 1; + } ret = STATUS_SUCCESS; break; }

1 0

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

17 Feb '23

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: Store EDID info in monitors cache.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: 76713da1e013e939c91077c6b36cc3ff31357f85 URL: https://gitlab.winehq.org/wine/wine/-/commit/76713da1e013e939c91077c6b36cc3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 13 14:32:09 2023 -0600 win32u: Store EDID info in monitors cache. --- dlls/win32u/sysparams.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 2805f71311f..1ee2ad9b740 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -170,6 +170,7 @@ static const WCHAR monitorW[] = {'M','o','n','i','t','o','r',0}; static const WCHAR yesW[] = {'Y','e','s',0}; static const WCHAR noW[] = {'N','o',0}; static const WCHAR mode_countW[] = {'M','o','d','e','C','o','u','n','t',0}; +static const WCHAR edidW[] = {'E','D','I','D',0}; static const char guid_devclass_displayA[] = "{4D36E968-E325-11CE-BFC1-08002BE10318}"; static const WCHAR guid_devclass_displayW[] = @@ -238,6 +239,7 @@ struct monitor RECT rc_monitor; RECT rc_work; BOOL is_clone; + struct edid_monitor_info edid_info; }; static struct list adapters = LIST_INIT(adapters); @@ -749,7 +751,7 @@ static BOOL read_monitor_settings( struct adapter *adapter, UINT index, struct m char buffer[4096]; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; WCHAR *device_name, *value_str = (WCHAR *)value->Data, *ptr; - HKEY hkey; + HKEY hkey, subkey; DWORD size, len; monitor->flags = adapter->id ? 0 : MONITORINFOF_PRIMARY; @@ -856,6 +858,14 @@ static BOOL read_monitor_settings( struct adapter *adapter, UINT index, struct m monitor->dev.device_id[size++] = '\\'; lstrcpyW( monitor->dev.device_id + size, device_name ); + /* EDID */ + if ((subkey = reg_open_key( hkey, device_parametersW, sizeof(device_parametersW) ))) + { + if (query_reg_value( subkey, edidW, value, sizeof(buffer) )) + get_monitor_info_from_edid( &monitor->edid_info, value->Data, value->DataLength ); + NtClose( subkey ); + } + NtClose( hkey ); return TRUE; } @@ -1380,7 +1390,6 @@ static void add_monitor( const struct gdi_monitor *monitor, void *param ) if ((subkey = reg_create_key( hkey, device_parametersW, sizeof(device_parametersW), 0, NULL ))) { static const WCHAR bad_edidW[] = {'B','A','D','_','E','D','I','D',0}; - static const WCHAR edidW[] = {'E','D','I','D',0}; if (monitor->edid_len) set_reg_value( subkey, edidW, REG_BINARY, monitor->edid, monitor->edid_len );

1 0

Paul Gofman : win32u: Use monitor ID from EDID when available.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: 480a6088765694e02ea6c69cc6833031419dcde7 URL: https://gitlab.winehq.org/wine/wine/-/commit/480a6088765694e02ea6c69cc68330… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 13 11:37:01 2023 -0600 win32u: Use monitor ID from EDID when available. --- dlls/win32u/sysparams.c | 54 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index aab148bbfe3..2805f71311f 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -218,6 +218,14 @@ struct adapter DEVMODEW *modes; }; +#define MONITOR_INFO_HAS_MONITOR_ID 0x00000001 +struct edid_monitor_info +{ + unsigned int flags; + /* MONITOR_INFO_HAS_MONITOR_ID */ + char monitor_id_string[8]; +}; + struct monitor { struct list entry; @@ -438,6 +446,30 @@ static void adapter_release( struct adapter *adapter ) C_ASSERT(sizeof(DEVMODEW) - offsetof(DEVMODEW, dmFields) == 0x94); +static void get_monitor_info_from_edid( struct edid_monitor_info *info, const unsigned char *edid, unsigned int edid_len ) +{ + unsigned short w; + unsigned char d; + unsigned int i; + + info->flags = 0; + if (!edid || edid_len < 128) return; + + w = (edid[8] << 8) | edid[9]; /* Manufacturer ID, big endian. */ + for (i = 0; i < 3; ++i) + { + d = w & 0x1f; + if (!d || d - 1 > 'Z' - 'A') return; + info->monitor_id_string[2 - i] = 'A' + d - 1; + w >>= 5; + } + if (w) return; + w = edid[10] | (edid[11] << 8); /* Product code, little endian. */ + sprintf( info->monitor_id_string + 3, "%04X", w ); + info->flags = MONITOR_INFO_HAS_MONITOR_ID; + TRACE( "Monitor id %s.\n", info->monitor_id_string ); +} + static BOOL write_adapter_mode( HKEY adapter_key, UINT index, const DEVMODEW *mode ) { WCHAR bufferW[MAX_PATH] = {0}; @@ -871,7 +903,7 @@ static void prepare_devices(void) REG_OPTION_VOLATILE, NULL ); /* delete monitors */ - reg_empty_key( enum_key, "DISPLAY\\DEFAULT_MONITOR" ); + reg_empty_key( enum_key, "DISPLAY" ); sprintf( buffer, "Class\\%s", guid_devclass_monitorA ); hkey = reg_create_key( control_key, bufferW, asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR), 0, NULL ); @@ -1305,19 +1337,25 @@ static void add_monitor( const struct gdi_monitor *monitor, void *param ) struct device_manager_ctx *ctx = param; char buffer[MAX_PATH], instance[64]; unsigned int monitor_index, output_index; + struct edid_monitor_info monitor_info; + char monitor_id_string[16]; WCHAR bufferW[MAX_PATH]; HKEY hkey, subkey; - - 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}; + unsigned int len; 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) ); + get_monitor_info_from_edid( &monitor_info, monitor->edid, monitor->edid_len ); + if (monitor_info.flags & MONITOR_INFO_HAS_MONITOR_ID) + strcpy( monitor_id_string, monitor_info.monitor_id_string ); + else + strcpy( monitor_id_string, "Default_Monitor" ); + sprintf( buffer, "MonitorID%u", monitor_index ); - sprintf( instance, "DISPLAY\\Default_Monitor\\%04X&%04X", ctx->video_count - 1, monitor_index ); + sprintf( instance, "DISPLAY\\%s\\%04X&%04X", monitor_id_string, ctx->video_count - 1, monitor_index ); set_reg_ascii_value( ctx->adapter_key, buffer, instance ); hkey = reg_create_key( enum_key, bufferW, asciiz_to_unicode( bufferW, instance ) - sizeof(WCHAR), @@ -1333,7 +1371,11 @@ static void add_monitor( const struct gdi_monitor *monitor, void *param ) sprintf( buffer, "%s\\%04X", guid_devclass_monitorA, output_index ); set_reg_ascii_value( hkey, "Driver", buffer ); set_reg_value( hkey, class_guidW, REG_SZ, guid_devclass_monitorW, sizeof(guid_devclass_monitorW) ); - set_reg_value( hkey, hardware_idW, REG_MULTI_SZ, default_monitorW, sizeof(default_monitorW) ); + + sprintf( buffer, "MONITOR\\%s", monitor_id_string ); + len = asciiz_to_unicode( bufferW, buffer ); + bufferW[len / sizeof(WCHAR)] = 0; + set_reg_value( hkey, hardware_idW, REG_MULTI_SZ, bufferW, len + sizeof(WCHAR) ); if ((subkey = reg_create_key( hkey, device_parametersW, sizeof(device_parametersW), 0, NULL ))) {

1 0

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

17 Feb '23

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

Alistair Leslie-Hughes : msdasql: Use SQLColAttributesW to fetch statement attributes.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: ec9610c46b47afbc71030ada6420fa400e48097a URL: https://gitlab.winehq.org/wine/wine/-/commit/ec9610c46b47afbc71030ada6420fa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 9 09:56:33 2023 +1100 msdasql: Use SQLColAttributesW to fetch statement attributes. We need to use the ODBC v1 function SQLColAttributesW, to ensure that we use the lowest verion available. This ODBC function internally will call SQLColAttribute or SQLColAttributesW depending on what the driver supports. --- dlls/msdasql/session.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 1e6d2660068..588be365b72 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -1029,9 +1029,10 @@ static HRESULT WINAPI rowset_colsinfo_GetColumnInfo(IColumnsInfo *iface, DBORDIN dbcolumn[i].pTypeInfo = NULL; dbcolumn[i].iOrdinal = i+1; - ret = SQLColAttribute(rowset->hstmt, i+1, SQL_DESC_UNSIGNED, NULL, 0, NULL, &length); + ret = SQLColAttributesW (rowset->hstmt, i+1, SQL_DESC_UNSIGNED, NULL, 0, NULL, &length); if (!SQL_SUCCEEDED(ret)) { + dump_sql_diag_records(SQL_HANDLE_STMT, rowset->hstmt); CoTaskMemFree(ptr); CoTaskMemFree(dbcolumn); ERR("Failed to get column %d attribute\n", i+1); @@ -1043,7 +1044,7 @@ static HRESULT WINAPI rowset_colsinfo_GetColumnInfo(IColumnsInfo *iface, DBORDIN dbcolumn[i].dwFlags = DBCOLUMNFLAGS_WRITE; - ret = SQLColAttribute(rowset->hstmt, i+1, SQL_DESC_LENGTH, NULL, 0, NULL, &length); + ret = SQLColAttributesW(rowset->hstmt, i+1, SQL_DESC_LENGTH, NULL, 0, NULL, &length); if (!SQL_SUCCEEDED(ret)) { CoTaskMemFree(ptr); @@ -1062,7 +1063,7 @@ static HRESULT WINAPI rowset_colsinfo_GetColumnInfo(IColumnsInfo *iface, DBORDIN if (is_fixed_length(ColumnDataType)) dbcolumn[i].dwFlags |= DBCOLUMNFLAGS_ISFIXEDLENGTH; - ret = SQLColAttribute(rowset->hstmt, i+1, SQL_DESC_SCALE, NULL, 0, NULL, &length); + ret = SQLColAttributesW(rowset->hstmt, i+1, SQL_DESC_SCALE, NULL, 0, NULL, &length); if (!SQL_SUCCEEDED(ret)) { CoTaskMemFree(ptr); @@ -1074,7 +1075,7 @@ static HRESULT WINAPI rowset_colsinfo_GetColumnInfo(IColumnsInfo *iface, DBORDIN length = 255; dbcolumn[i].bScale = length; - ret = SQLColAttribute(rowset->hstmt, i+1, SQL_DESC_PRECISION, NULL, 0, NULL, &length); + ret = SQLColAttributesW(rowset->hstmt, i+1, SQL_DESC_PRECISION, NULL, 0, NULL, &length); if (!SQL_SUCCEEDED(ret)) { CoTaskMemFree(ptr);

1 0

Brendan Shanks : ntdll: Add a WARN when setting debug registers fails under Rosetta.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: 39655dade3c802557754439451279c5b59b31ce8 URL: https://gitlab.winehq.org/wine/wine/-/commit/39655dade3c802557754439451279c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 16 21:58:26 2023 -0800 ntdll: Add a WARN when setting debug registers fails under Rosetta. --- dlls/ntdll/unix/signal_x86_64.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 13fe7051c66..80d39406ada 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1001,6 +1001,10 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) if (!self) { ret = set_thread_context( handle, context, &self, IMAGE_FILE_MACHINE_AMD64 ); +#ifdef __APPLE__ + if ((flags & CONTEXT_DEBUG_REGISTERS) && (ret == STATUS_UNSUCCESSFUL)) + WARN_(seh)( "Setting debug registers is not supported under Rosetta\n" ); +#endif if (ret || !self) return ret; if (flags & CONTEXT_DEBUG_REGISTERS) {

1 0

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

17 Feb '23

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 17 Feb '23

17 Feb '23

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

← Newer
1
...
24
25
26
27
28
29
30
...
60
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 February 2023