July 2020 - Wine-commits - list.winehq.org

Zhiyi Zhang : winex11.drv: Support virtual desktop display mode enumeration using the new display settings handler interface.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 0b0ac41981006514616abdd4c4b6922cf66be7b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b0ac41981006514616abdd4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jul 22 15:24:41 2020 +0800 winex11.drv: Support virtual desktop display mode enumeration using the new display settings handler interface. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 68 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/settings.c | 25 ++++++++++++++++- dlls/winex11.drv/x11drv.h | 17 ++++++++++++ 3 files changed, 109 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index d3dcf90fb9..72a315e35b 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -168,6 +168,72 @@ static BOOL X11DRV_desktop_get_id( const WCHAR *device_name, ULONG_PTR *id ) return TRUE; } +static void add_desktop_mode( DEVMODEW *mode, DWORD depth, DWORD width, DWORD height ) +{ + mode->dmSize = sizeof(*mode); + mode->dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | + DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY; + mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + mode->dmBitsPerPel = depth; + mode->dmPelsWidth = width; + mode->dmPelsHeight = height; + mode->u2.dmDisplayFlags = 0; + mode->dmDisplayFrequency = 60; +} + +static BOOL X11DRV_desktop_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, UINT *mode_count ) +{ + UINT depth_idx, size_idx, mode_idx = 0; + UINT screen_width, screen_height; + RECT primary_rect; + DEVMODEW *modes; + + primary_rect = get_primary_monitor_rect(); + screen_width = primary_rect.right - primary_rect.left; + screen_height = primary_rect.bottom - primary_rect.top; + + /* Allocate memory for modes in different color depths */ + if (!(modes = heap_calloc( (ARRAY_SIZE(screen_sizes) + 2) * DEPTH_COUNT, sizeof(*modes))) ) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + + for (depth_idx = 0; depth_idx < DEPTH_COUNT; ++depth_idx) + { + for (size_idx = 0; size_idx < ARRAY_SIZE(screen_sizes); ++size_idx) + { + if (screen_sizes[size_idx].width > max_width || + screen_sizes[size_idx].height > max_height) + continue; + + if (screen_sizes[size_idx].width == max_width && + screen_sizes[size_idx].height == max_height) + continue; + + if (screen_sizes[size_idx].width == screen_width && + screen_sizes[size_idx].height == screen_height) + continue; + + add_desktop_mode( &modes[mode_idx++], depths[depth_idx], screen_sizes[size_idx].width, + screen_sizes[size_idx].height ); + } + + add_desktop_mode( &modes[mode_idx++], depths[depth_idx], screen_width, screen_height ); + if (max_width != screen_width || max_height != screen_height) + add_desktop_mode( &modes[mode_idx++], depths[depth_idx], max_width, max_height ); + } + + *new_modes = modes; + *mode_count = mode_idx; + return TRUE; +} + +static void X11DRV_desktop_free_modes( DEVMODEW *modes ) +{ + heap_free( modes ); +} + static BOOL X11DRV_desktop_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) { RECT primary_rect = get_primary_monitor_rect(); @@ -309,6 +375,8 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) settings_handler.name = "Virtual Desktop"; settings_handler.priority = 1000; settings_handler.get_id = X11DRV_desktop_get_id; + settings_handler.get_modes = X11DRV_desktop_get_modes; + settings_handler.free_modes = X11DRV_desktop_free_modes; settings_handler.get_current_mode = X11DRV_desktop_get_current_mode; X11DRV_Settings_SetHandler( &settings_handler ); } diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index e0dee95154..097710fc1c 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -42,6 +42,7 @@ static unsigned int dd_max_modes = 0; */ static const unsigned int depths_24[] = {8, 16, 24}; static const unsigned int depths_32[] = {8, 16, 32}; +const unsigned int *depths; /* pointers to functions that actually do the hard stuff */ static int (*pGetCurrentMode)(void); @@ -158,6 +159,9 @@ static LONG X11DRV_nores_SetCurrentMode(int mode) void X11DRV_Settings_Init(void) { RECT primary = get_host_primary_monitor_rect(); + + depths = screen_bpp == 32 ? depths_32 : depths_24; + X11DRV_Settings_SetHandlers("NoRes", X11DRV_nores_GetCurrentMode, X11DRV_nores_SetCurrentMode, @@ -321,10 +325,12 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo { static const WCHAR dev_name[CCHDEVICENAME] = { 'W','i','n','e',' ','X','1','1',' ','d','r','i','v','e','r',0 }; + DEVMODEW *modes; + UINT mode_count; ULONG_PTR id; /* Use the new interface if it is available */ - if (!handler.name || (n != ENUM_REGISTRY_SETTINGS && n != ENUM_CURRENT_SETTINGS)) + if (!handler.name) goto old_interface; if (n == ENUM_REGISTRY_SETTINGS) @@ -347,6 +353,23 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo goto done; } + if (!handler.get_id(name, &id) || !handler.get_modes(id, flags, &modes, &mode_count)) + { + ERR("Failed to get %s supported display modes.\n", wine_dbgstr_w(name)); + return FALSE; + } + + if (n >= mode_count) + { + WARN("handler:%s device:%s mode index:%#x not found.\n", handler.name, wine_dbgstr_w(name), n); + handler.free_modes(modes); + SetLastError(ERROR_NO_MORE_FILES); + return FALSE; + } + + memcpy(devmode, (BYTE *)modes + (sizeof(*modes) + modes[0].dmDriverExtra) * n, sizeof(*devmode)); + handler.free_modes(modes); + done: /* Set generic fields */ devmode->dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 49059e09b7..b19e0e3e80 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -657,6 +657,9 @@ struct x11drv_mode_info unsigned int refresh_rate; }; +#define DEPTH_COUNT 3 +extern const unsigned int *depths DECLSPEC_HIDDEN; + /* Required functions for changing and enumerating display settings */ struct x11drv_settings_handler { @@ -672,6 +675,20 @@ struct x11drv_settings_handler * Return FALSE if the device can not be found and TRUE on success */ BOOL (*get_id)(const WCHAR *device_name, ULONG_PTR *id); + /* get_modes() will be called to get a list of supported modes of the device of id in modes + * with respect to flags, which could be 0, EDS_RAWMODE or EDS_ROTATEDMODE. If the implementation + * uses dmDriverExtra then every DEVMODEW in the list must have the same dmDriverExtra value + * + * Following fields in DEVMODE must be valid: + * dmSize, dmDriverExtra, dmFields, dmDisplayOrientation, dmBitsPerPel, dmPelsWidth, dmPelsHeight, + * dmDisplayFlags and dmDisplayFrequency + * + * Return FALSE on failure with parameters unchanged and error code set. Return TRUE on success */ + BOOL (*get_modes)(ULONG_PTR id, DWORD flags, DEVMODEW **modes, UINT *mode_count); + + /* free_modes() will be called to free the mode list returned from get_modes() */ + void (*free_modes)(DEVMODEW *modes); + /* get_current_mode() will be called to get the current display mode of the device of id * * Following fields in DEVMODE must be valid:

1 0

Zhiyi Zhang : winex11.drv: Cache display modes for X11DRV_EnumDisplaySettingsEx().
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 679ff720902b8e5d5d750b980084bdcdc9a051ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=679ff720902b8e5d5d750b98… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jul 22 15:24:56 2020 +0800 winex11.drv: Cache display modes for X11DRV_EnumDisplaySettingsEx(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 097710fc1c..8fc8cbd44d 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -130,6 +130,21 @@ unsigned int X11DRV_Settings_GetModeCount(void) /* TODO: Remove the old display settings handler interface once all backends are migrated to the new interface */ static struct x11drv_settings_handler handler; +/* Cached display modes for a device, protected by modes_section */ +static WCHAR cached_device_name[CCHDEVICENAME]; +static DWORD cached_flags; +static DEVMODEW *cached_modes; +static UINT cached_mode_count; + +static CRITICAL_SECTION modes_section; +static CRITICAL_SECTION_DEBUG modes_critsect_debug = +{ + 0, 0, &modes_section, + {&modes_critsect_debug.ProcessLocksList, &modes_critsect_debug.ProcessLocksList}, + 0, 0, {(DWORD_PTR)(__FILE__ ": modes_section")} +}; +static CRITICAL_SECTION modes_section = {&modes_critsect_debug, -1, 0, 0, 0, 0}; + void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *new_handler) { if (new_handler->priority > handler.priority) @@ -353,22 +368,34 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo goto done; } - if (!handler.get_id(name, &id) || !handler.get_modes(id, flags, &modes, &mode_count)) + EnterCriticalSection(&modes_section); + if (n == 0 || lstrcmpiW(cached_device_name, name) || cached_flags != flags) { - ERR("Failed to get %s supported display modes.\n", wine_dbgstr_w(name)); - return FALSE; + if (!handler.get_id(name, &id) || !handler.get_modes(id, flags, &modes, &mode_count)) + { + ERR("Failed to get %s supported display modes.\n", wine_dbgstr_w(name)); + LeaveCriticalSection(&modes_section); + return FALSE; + } + + if (cached_modes) + handler.free_modes(cached_modes); + lstrcpyW(cached_device_name, name); + cached_flags = flags; + cached_modes = modes; + cached_mode_count = mode_count; } - if (n >= mode_count) + if (n >= cached_mode_count) { + LeaveCriticalSection(&modes_section); WARN("handler:%s device:%s mode index:%#x not found.\n", handler.name, wine_dbgstr_w(name), n); - handler.free_modes(modes); SetLastError(ERROR_NO_MORE_FILES); return FALSE; } - memcpy(devmode, (BYTE *)modes + (sizeof(*modes) + modes[0].dmDriverExtra) * n, sizeof(*devmode)); - handler.free_modes(modes); + memcpy(devmode, (BYTE *)cached_modes + (sizeof(*cached_modes) + cached_modes[0].dmDriverExtra) * n, sizeof(*devmode)); + LeaveCriticalSection(&modes_section); done: /* Set generic fields */

1 0

Zhiyi Zhang : winex11.drv: Support setting virtual desktop display mode using the new display settings handler interface.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 6f305dd881e16f77f9eb183684d04b0b8746b769 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f305dd881e16f77f9eb1836… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jul 22 15:25:08 2020 +0800 winex11.drv: Support setting virtual desktop display mode using the new display settings handler interface. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 11 ++++ dlls/winex11.drv/settings.c | 123 +++++++++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/x11drv.h | 6 +++ 3 files changed, 139 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 72a315e35b..ea269d8f2c 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -251,6 +251,16 @@ static BOOL X11DRV_desktop_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) return TRUE; } +static LONG X11DRV_desktop_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) +{ + if (mode->dmFields & DM_BITSPERPEL && mode->dmBitsPerPel != screen_bpp) + WARN("Cannot change screen color depth from %dbits to %dbits!\n", screen_bpp, mode->dmBitsPerPel); + + desktop_width = mode->dmPelsWidth; + desktop_height = mode->dmPelsHeight; + return DISP_CHANGE_SUCCESSFUL; +} + static void query_desktop_work_area( RECT *rc_work ) { static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; @@ -378,6 +388,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) settings_handler.get_modes = X11DRV_desktop_get_modes; settings_handler.free_modes = X11DRV_desktop_free_modes; settings_handler.get_current_mode = X11DRV_desktop_get_current_mode; + settings_handler.set_current_mode = X11DRV_desktop_set_current_mode; X11DRV_Settings_SetHandler( &settings_handler ); } diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 8fc8cbd44d..28c405ae0e 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -30,6 +30,7 @@ #include "winreg.h" #include "wingdi.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(x11settings); @@ -466,6 +467,53 @@ BOOL is_detached_mode(const DEVMODEW *mode) mode->dmPelsHeight == 0; } +/* Get the full display mode with all the necessary fields set. + * Return NULL on failure. Caller should free the returned mode. */ +static DEVMODEW *get_full_mode(ULONG_PTR id, const DEVMODEW *dev_mode) +{ + DEVMODEW *modes, *full_mode, *found_mode = NULL; + UINT mode_count, mode_idx; + + if (!handler.get_modes(id, 0, &modes, &mode_count)) + return NULL; + + for (mode_idx = 0; mode_idx < mode_count; ++mode_idx) + { + found_mode = (DEVMODEW *)((BYTE *)modes + (sizeof(*modes) + modes[0].dmDriverExtra) * mode_idx); + + if (dev_mode->dmFields & DM_BITSPERPEL && found_mode->dmBitsPerPel != dev_mode->dmBitsPerPel) + continue; + if (dev_mode->dmFields & DM_PELSWIDTH && found_mode->dmPelsWidth != dev_mode->dmPelsWidth) + continue; + if (dev_mode->dmFields & DM_PELSHEIGHT && found_mode->dmPelsHeight != dev_mode->dmPelsHeight) + continue; + if (dev_mode->dmFields & DM_DISPLAYFREQUENCY && + dev_mode->dmDisplayFrequency && + found_mode->dmDisplayFrequency && + dev_mode->dmDisplayFrequency != 1 && + dev_mode->dmDisplayFrequency != found_mode->dmDisplayFrequency) + continue; + + break; + } + + if (!found_mode || mode_idx == mode_count) + { + handler.free_modes(modes); + return NULL; + } + + if (!(full_mode = heap_alloc(sizeof(*found_mode) + found_mode->dmDriverExtra))) + { + handler.free_modes(modes); + return NULL; + } + + memcpy(full_mode, found_mode, sizeof(*found_mode) + found_mode->dmDriverExtra); + handler.free_modes(modes); + return full_mode; +} + /*********************************************************************** * ChangeDisplaySettingsEx (X11DRV.@) * @@ -475,9 +523,82 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, { WCHAR primary_adapter[CCHDEVICENAME]; char bpp_buffer[16], freq_buffer[18]; - DEVMODEW default_mode; + DEVMODEW default_mode, *full_mode; + ULONG_PTR id; + LONG ret; DWORD i; + /* Use the new interface if it is available */ + if (!handler.name) + goto old_interface; + + if (!get_primary_adapter(primary_adapter)) + return DISP_CHANGE_FAILED; + + if (!devname && !devmode) + { + default_mode.dmSize = sizeof(default_mode); + if (!EnumDisplaySettingsExW(primary_adapter, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) + { + ERR("Default mode not found for %s!\n", wine_dbgstr_w(primary_adapter)); + return DISP_CHANGE_BADMODE; + } + + devname = primary_adapter; + devmode = &default_mode; + } + + if (!handler.get_id(devname, &id)) + { + ERR("Failed to get %s device id.\n", wine_dbgstr_w(devname)); + return DISP_CHANGE_BADPARAM; + } + + if (is_detached_mode(devmode)) + { + FIXME("Detaching adapters is currently unsupported.\n"); + return DISP_CHANGE_SUCCESSFUL; + } + + if (!(full_mode = get_full_mode(id, devmode))) + { + ERR("Failed to find a valid mode.\n"); + return DISP_CHANGE_BADMODE; + } + + if (flags & CDS_UPDATEREGISTRY && !write_registry_settings(devname, full_mode)) + { + ERR("Failed to write %s display settings to registry.\n", wine_dbgstr_w(devname)); + heap_free(full_mode); + return DISP_CHANGE_NOTUPDATED; + } + + if (lstrcmpiW(primary_adapter, devname)) + { + FIXME("Changing non-primary adapter %s settings is currently unsupported.\n", + wine_dbgstr_w(devname)); + heap_free(full_mode); + return DISP_CHANGE_SUCCESSFUL; + } + + if (flags & (CDS_TEST | CDS_NORESET)) + { + heap_free(full_mode); + return DISP_CHANGE_SUCCESSFUL; + } + + TRACE("handler:%s device:%s position:(%d,%d) resolution:%ux%u frequency:%uHz depth:%ubits " + "orientation:%#x.\n", handler.name, wine_dbgstr_w(devname), full_mode->u1.s2.dmPosition.x, + full_mode->u1.s2.dmPosition.y, full_mode->dmPelsWidth, full_mode->dmPelsHeight, + full_mode->dmDisplayFrequency, full_mode->dmBitsPerPel, full_mode->u1.s2.dmDisplayOrientation); + + ret = handler.set_current_mode(id, full_mode); + if (ret == DISP_CHANGE_SUCCESSFUL) + X11DRV_DisplayDevices_Update(TRUE); + heap_free(full_mode); + return ret; + +old_interface: if (!get_primary_adapter(primary_adapter)) return DISP_CHANGE_FAILED; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index b19e0e3e80..1c6b666227 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -697,6 +697,12 @@ struct x11drv_settings_handler * * Return FALSE on failure with parameters unchanged and error code set. Return TRUE on success */ BOOL (*get_current_mode)(ULONG_PTR id, DEVMODEW *mode); + + /* set_current_mode() will be called to change the display mode of the display device of id. + * mode must be a valid mode from get_modes() with optional fields, such as dmPosition set. + * + * Return DISP_CHANGE_*, same as ChangeDisplaySettingsExW() return values */ + LONG (*set_current_mode)(ULONG_PTR id, DEVMODEW *mode); }; extern void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *handler) DECLSPEC_HIDDEN;

1 0

Zhiyi Zhang : winex11.drv: Remove the old virtual desktop display settings handler.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 2a6de8d7f7d6f5ac018d8e330cfa580fc0c3b9e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a6de8d7f7d6f5ac018d8e33… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jul 22 15:25:21 2020 +0800 winex11.drv: Remove the old virtual desktop display settings handler. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 81 +--------------------------------------------- 1 file changed, 1 insertion(+), 80 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index ea269d8f2c..64f61d21e4 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -35,10 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); -/* data for resolution changing */ -static struct x11drv_mode_info *dd_modes; -static unsigned int dd_mode_count; - static unsigned int max_width; static unsigned int max_height; static unsigned int desktop_width; @@ -90,72 +86,6 @@ BOOL is_virtual_desktop(void) return root_window != DefaultRootWindow( gdi_display ); } -/* create the mode structures */ -static void make_modes(void) -{ - RECT primary_rect = get_primary_monitor_rect(); - unsigned int i; - unsigned int screen_width = primary_rect.right - primary_rect.left; - unsigned int screen_height = primary_rect.bottom - primary_rect.top; - - /* original specified desktop size */ - X11DRV_Settings_AddOneMode(screen_width, screen_height, 0, 60); - for (i=0; i<ARRAY_SIZE(screen_sizes); i++) - { - if ( (screen_sizes[i].width <= max_width) && (screen_sizes[i].height <= max_height) ) - { - if ( ( (screen_sizes[i].width != max_width) || (screen_sizes[i].height != max_height) ) && - ( (screen_sizes[i].width != screen_width) || (screen_sizes[i].height != screen_height) ) ) - { - /* only add them if they are smaller than the root window and unique */ - X11DRV_Settings_AddOneMode(screen_sizes[i].width, screen_sizes[i].height, 0, 60); - } - } - } - if ((max_width != screen_width) || (max_height != screen_height)) - { - /* root window size (if different from desktop window) */ - X11DRV_Settings_AddOneMode(max_width, max_height, 0, 60); - } -} - -static int X11DRV_desktop_GetCurrentMode(void) -{ - unsigned int i; - DWORD dwBpp = screen_bpp; - RECT primary_rect = get_primary_monitor_rect(); - - for (i=0; i<dd_mode_count; i++) - { - if ( (primary_rect.right - primary_rect.left == dd_modes[i].width) && - (primary_rect.bottom - primary_rect.top == dd_modes[i].height) && - (dwBpp == dd_modes[i].bpp)) - return i; - } - ERR("In unknown mode, returning default\n"); - return 0; -} - -static LONG X11DRV_desktop_SetCurrentMode(int mode) -{ - DWORD dwBpp = screen_bpp; - if (dwBpp != dd_modes[mode].bpp) - { - FIXME("Cannot change screen BPP from %d to %d\n", dwBpp, dd_modes[mode].bpp); - /* Ignore the depth mismatch - * - * Some (older) applications require a specific bit depth, this will allow them - * to run. X11drv performs a color depth conversion if needed. - */ - } - TRACE("Resizing Wine desktop window to %dx%d\n", dd_modes[mode].width, dd_modes[mode].height); - - desktop_width = dd_modes[mode].width; - desktop_height = dd_modes[mode].height; - X11DRV_DisplayDevices_Update( TRUE ); - return DISP_CHANGE_SUCCESSFUL; -} - /* Virtual desktop display settings handler */ static BOOL X11DRV_desktop_get_id( const WCHAR *device_name, ULONG_PTR *id ) { @@ -372,16 +302,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) TRACE("Display device functions are now handled by: Virtual Desktop\n"); X11DRV_DisplayDevices_Init( TRUE ); - /* initialize the available resolutions */ - dd_modes = X11DRV_Settings_SetHandlers("desktop", - X11DRV_desktop_GetCurrentMode, - X11DRV_desktop_SetCurrentMode, - ARRAY_SIZE(screen_sizes)+2, 1); - make_modes(); - X11DRV_Settings_AddDepthModes(); - dd_mode_count = X11DRV_Settings_GetModeCount(); - - /* TODO: Remove the old display settings handler once the migration to the new interface is done */ + /* Initialize virtual desktop display settings handler */ settings_handler.name = "Virtual Desktop"; settings_handler.priority = 1000; settings_handler.get_id = X11DRV_desktop_get_id;

1 0

Piotr Caban : msvcrt: Don't depend on additional mantissa bits when rounding.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: b22ffa589145234d23d07602752dacf9f30b4e4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b22ffa589145234d23d07602… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 23 15:38:37 2020 +0200 msvcrt: Don't depend on additional mantissa bits when rounding. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index a2ec9a91ac..802ae5f0af 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -831,12 +831,17 @@ struct fpnum fpnum_parse(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *c e2++; } - /* Check if fractional part is non-zero */ - /* Caution: it's only correct because bnum_to_mant returns more than 53 bits */ - for(i=b->e-4; i>=b->b; i--) { - if (!b->data[bnum_idx(b, b->b)]) continue; - round = FP_ROUND_DOWN; - break; + if(b->e-4 >= b->b && b->data[bnum_idx(b, b->e-4)]) { + if(b->data[bnum_idx(b, b->e-4)] > LIMB_MAX/2) round = FP_ROUND_UP; + else if(b->data[bnum_idx(b, b->e-4)] == LIMB_MAX/2) round = FP_ROUND_EVEN; + else round = FP_ROUND_DOWN; + } + if(round == FP_ROUND_ZERO || round == FP_ROUND_EVEN) { + for(i=b->e-5; i>=b->b; i--) { + if(!b->data[bnum_idx(b, b->b)]) continue; + if(round == FP_ROUND_EVEN) round = FP_ROUND_UP; + else round = FP_ROUND_DOWN; + } } return fpnum(sign, e2, m, round);

1 0

Piotr Caban : msvcrt: Don't use strtold in __STRINGTOLD_L.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: a22adf1893d510660d7eeea5ef290399ce21e8b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a22adf1893d510660d7eeea5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 23 15:38:40 2020 +0200 msvcrt: Don't use strtold in __STRINGTOLD_L. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/bnum.h | 1 + dlls/msvcrt/msvcrt.h | 4 +- dlls/msvcrt/scanf.h | 2 +- dlls/msvcrt/string.c | 190 ++++++++++++++++++++++++++++++++++++++++++++++----- dlls/msvcrt/wcs.c | 2 +- 5 files changed, 179 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a22adf1893d510660d7e…

1 0

Piotr Caban : msvcrt: Add __STRINGTOLD tests.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 4fe481db95350c381f1c2545745afae52f4cefc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fe481db95350c381f1c2545… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 23 15:38:42 2020 +0200 msvcrt: Add __STRINGTOLD tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index ad41ad4d24..8e23f9cffe 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -115,6 +115,8 @@ static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); static size_t (__cdecl *p___strncnt)(const char*, size_t); +int CDECL __STRINGTOLD(_LDOUBLE*, char**, const char*, int); + #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -4230,6 +4232,63 @@ static void test_wcscmp(void) ok(!r, "wcscmp returned %d\n", r); } +static const char* debugstr_ldouble(_LDOUBLE *v) +{ + static char buf[2 * ARRAY_SIZE(v->ld) + 1]; + int i; + + for(i=0; i<ARRAY_SIZE(v->ld); i++) + { + buf[2*i] = v->ld[i] / 16 + '0'; + if(buf[2*i] > '9') buf[2*i] -= 10 + '0' - 'a'; + buf[2*i+1] = v->ld[i] % 16 + '0'; + if(buf[2*i+1] > '9') buf[2*i+1] -= 10 + '0' - 'a'; + } + buf[2 * ARRAY_SIZE(v->ld)] = 0; + return buf; +} + +static void test___STRINGTOLD(void) +{ + static const struct { + const char *str; + int endptr; + int r; + _LDOUBLE v; + BOOL todo; + } tests[] = { + { "0", 1 }, + { "nan", 0, 4 }, + { "inf", 0, 4 }, + { "-0.0", 4, 0, {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80 }} }, + { "1e0", 3, 0, {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0x3f }} }, + { "1.7976931348623158e+308", 23, 0, {{ 0xaf, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x43 }} }, + { "1.7976931348623159e+308", 23, 0, {{ 0xb1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x43 }} }, + { "3.65e-4951", 10, 0, {{ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }} }, + { "1.82e-4951", 10, 0, {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}, TRUE }, + { "1e-99999", 8, 1, {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }} }, + { "1.18e+4932", 10, 0, {{ 0x25, 0x75, 0x06, 0x68, 0x8a, 0xf1, 0xe7, 0xfd, 0xfe, 0x7f }} }, + { "1.19e+4932", 10, 2, {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0x7f }} }, + { "1e+99999", 8, 2, {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0x7f }} }, + }; + + char *endptr; + _LDOUBLE v; + int i, r; + + for(i=0; i<ARRAY_SIZE(tests); i++) + { + errno = 0xdeadbeef; + r = __STRINGTOLD(&v, &endptr, tests[i].str, 0); + todo_wine_if(tests[i].todo) + ok(r == tests[i].r, "%d) r = %d\n", i, r); + ok(endptr == tests[i].str + tests[i].endptr, "%d) endptr = %p, expected %p\n", + i, endptr, tests[i].str+tests[i].endptr); + ok(!memcmp(&v, &tests[i].v, sizeof(v)), "%d) v = %s\n", i, debugstr_ldouble(&v)); + ok(errno == 0xdeadbeef, "%d) errno = %x\n", i, errno); + } +} + START_TEST(string) { char mem[100]; @@ -4380,4 +4439,5 @@ START_TEST(string) test_strstr(); test_iswdigit(); test_wcscmp(); + test___STRINGTOLD(); }

1 0

Piotr Caban : msvcrt: Fix rounding of numbers smaller than minimal subnormal.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 29288c0bc0ea724bf27ffa1e731e4d4b5b45643b URL: https://source.winehq.org/git/wine.git/?a=commit;h=29288c0bc0ea724bf27ffa1e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 23 15:38:46 2020 +0200 msvcrt: Fix rounding of numbers smaller than minimal subnormal. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 28 +++++++++++++++------------- dlls/ucrtbase/tests/string.c | 2 ++ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 5b6d73626a..ab6747db5c 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -413,25 +413,21 @@ int fpnum_double(struct fpnum *fp, double *d) fp->m >>= 1; fp->exp++; } - - /* handle subnormal that falls into regular range due to rounding */ fp->exp += (1 << (EXP_BITS-1)) - 1; - if (!fp->exp && (fp->mod == FP_ROUND_UP || (fp->mod == FP_ROUND_EVEN && fp->m & 1))) - { - if (fp->m + 1 >= (ULONGLONG)1 << MANT_BITS) - { - fp->m++; - fp->m >>= 1; - fp->exp++; - fp->mod = FP_ROUND_DOWN; - } - } /* handle subnormals */ if (fp->exp <= 0) + { + if (fp->m & 1 && fp->mod == FP_ROUND_ZERO) fp->mod = FP_ROUND_EVEN; + else if (fp->m & 1) fp->mod = FP_ROUND_UP; + else if (fp->mod != FP_ROUND_ZERO) fp->mod = FP_ROUND_DOWN; fp->m >>= 1; + } while(fp->m && fp->exp<0) { + if (fp->m & 1 && fp->mod == FP_ROUND_ZERO) fp->mod = FP_ROUND_EVEN; + else if (fp->m & 1) fp->mod = FP_ROUND_UP; + else if (fp->mod != FP_ROUND_ZERO) fp->mod = FP_ROUND_DOWN; fp->m >>= 1; fp->exp++; } @@ -440,7 +436,13 @@ int fpnum_double(struct fpnum *fp, double *d) if (fp->mod == FP_ROUND_UP || (fp->mod == FP_ROUND_EVEN && fp->m & 1)) { fp->m++; - if (fp->m >= (ULONGLONG)1 << MANT_BITS) + + /* handle subnormal that falls into regular range due to rounding */ + if (fp->m == (ULONGLONG)1 << (MANT_BITS - 1)) + { + fp->exp++; + } + else if (fp->m >= (ULONGLONG)1 << MANT_BITS) { fp->exp++; fp->m >>= 1; diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 5857a02773..3a4b8b9f04 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -148,6 +148,8 @@ static void test_strtod(void) test_strtod_str("1.7976931348623158e+308", 1.7976931348623158e+308, 23); test_strtod_str("2.2250738585072014e-308", 2.2250738585072014e-308, 23); test_strtod_str("4.9406564584124654e-324", 4.9406564584124654e-324, 23); + test_strtod_str("2.48e-324", 4.9406564584124654e-324, 9); + test_strtod_str_errno("2.47e-324", 0, 9, ERANGE); } static void test__memicmp(void)

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_WRITE_OUTPUT ioctl.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 5b795b658d14bd85ba6783131c6f42a37cfcce27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b795b658d14bd85ba678313… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 23 17:31:12 2020 +0200 server: Introduce IOCTL_CONDRV_WRITE_OUTPUT ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 11 ++++++ server/console.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++-- server/trace.c | 1 + 3 files changed, 108 insertions(+), 3 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 42ca77d382..add88d8885 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -37,6 +37,7 @@ #define IOCTL_CONDRV_SET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 16, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) /* console output ioctls */ +#define IOCTL_CONDRV_WRITE_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 31, METHOD_BUFFERED, FILE_WRITE_DATA) #define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_READ_PROPERTIES) #define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) #define IOCTL_CONDRV_ACTIVATE CTL_CODE(FILE_DEVICE_CONSOLE, 34, METHOD_BUFFERED, FILE_WRITE_DATA) @@ -82,6 +83,16 @@ struct condrv_input_info_params struct condrv_input_info info; /* input_info */ }; +/* IOCTL_CONDRV_WRITE_OUTPUT */ +struct condrv_write_output_params +{ + unsigned int x; /* destination position */ + unsigned int y; + unsigned int mode; /* char info mode */ + unsigned int width; /* width of output rectangle, 0 for wrapped mode */ + /* followed by an array of data with type depending on mode */ +}; + /* IOCTL_CONDRV_GET_OUTPUT_INFO result */ struct condrv_output_info { diff --git a/server/console.c b/server/console.c index 9f102968a1..9e61987e33 100644 --- a/server/console.c +++ b/server/console.c @@ -1249,7 +1249,85 @@ static struct fd *screen_buffer_get_fd( struct object *obj ) } /* write data into a screen buffer */ -static int write_console_output( struct screen_buffer *screen_buffer, data_size_t size, +static void write_console_output( struct screen_buffer *screen_buffer, const struct condrv_write_output_params *params, + data_size_t size ) +{ + unsigned int i, entry_size, entry_cnt, x, y; + char_info_t *dest; + char *src; + + entry_size = params->mode == CHAR_INFO_MODE_TEXTATTR ? sizeof(char_info_t) : sizeof(WCHAR); + if (size % entry_size) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + if (params->x >= screen_buffer->width) return; + entry_cnt = size / entry_size; + + for (i = 0, src = (char *)(params + 1); i < entry_cnt; i++, src += entry_size) + { + if (params->width) + { + x = params->x + i % params->width; + y = params->y + i / params->width; + if (x >= screen_buffer->width) continue; + } + else + { + x = (params->x + i) % screen_buffer->width; + y = params->y + (params->x + i) / screen_buffer->width; + } + if (y >= screen_buffer->height) break; + + dest = &screen_buffer->data[y * screen_buffer->width + x]; + switch(params->mode) + { + case CHAR_INFO_MODE_TEXT: + dest->ch = *(const WCHAR *)src; + break; + case CHAR_INFO_MODE_ATTR: + dest->attr = *(const unsigned short *)src; + break; + case CHAR_INFO_MODE_TEXTATTR: + *dest = *(const char_info_t *)src; + break; + case CHAR_INFO_MODE_TEXTSTDATTR: + dest->ch = *(const WCHAR *)src; + dest->attr = screen_buffer->attr; + break; + default: + set_error( STATUS_INVALID_PARAMETER ); + return; + } + } + + if (i && screen_buffer == screen_buffer->input->active) + { + struct condrv_renderer_event evt; + evt.event = CONSOLE_RENDERER_UPDATE_EVENT; + memset(&evt.u, 0, sizeof(evt.u)); + evt.u.update.top = params->y; + evt.u.update.bottom = params->width + ? min( params->y + entry_cnt / params->width, screen_buffer->height ) - 1 + : params->y + (params->x + i - 1) / screen_buffer->width; + console_input_events_append( screen_buffer->input, &evt ); + } + + if (get_reply_max_size() == sizeof(SMALL_RECT)) + { + SMALL_RECT region; + region.Left = params->x; + region.Top = params->y; + region.Right = min( params->x + params->width, screen_buffer->width ) - 1; + region.Bottom = min( params->y + entry_cnt / params->width, screen_buffer->height ) - 1; + set_reply_data( &region, sizeof(region) ); + } + else set_reply_data( &i, sizeof(i) ); +} + +/* write data into a screen buffer */ +static int write_console_output_req( struct screen_buffer *screen_buffer, data_size_t size, const void* data, enum char_info_mode mode, int x, int y, int wrap ) { @@ -1660,6 +1738,21 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * screen_buffer->mode = *(unsigned int *)get_req_data(); return 1; + case IOCTL_CONDRV_WRITE_OUTPUT: + if (get_req_data_size() < sizeof(struct condrv_write_output_params) || + (get_reply_max_size() != sizeof(SMALL_RECT) && get_reply_max_size() != sizeof(unsigned int))) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (console_input_is_bare( screen_buffer->input )) + { + set_error( STATUS_OBJECT_TYPE_MISMATCH ); + return 0; + } + write_console_output( screen_buffer, get_req_data(), get_req_data_size() - sizeof(struct condrv_write_output_params) ); + return !get_error(); + case IOCTL_CONDRV_GET_OUTPUT_INFO: { struct condrv_output_info *info; @@ -2140,8 +2233,8 @@ DECL_HANDLER(write_console_output) release_object( screen_buffer ); return; } - reply->written = write_console_output( screen_buffer, get_req_data_size(), get_req_data(), - req->mode, req->x, req->y, req->wrap ); + reply->written = write_console_output_req( screen_buffer, get_req_data_size(), get_req_data(), + req->mode, req->x, req->y, req->wrap ); reply->width = screen_buffer->width; reply->height = screen_buffer->height; release_object( screen_buffer ); diff --git a/server/trace.c b/server/trace.c index 21468abd73..16bcc616a5 100644 --- a/server/trace.c +++ b/server/trace.c @@ -127,6 +127,7 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) CASE(IOCTL_CONDRV_SET_MODE); CASE(IOCTL_CONDRV_SET_OUTPUT_INFO); CASE(IOCTL_CONDRV_WRITE_INPUT); + CASE(IOCTL_CONDRV_WRITE_OUTPUT); CASE(FSCTL_DISMOUNT_VOLUME); CASE(FSCTL_PIPE_DISCONNECT); CASE(FSCTL_PIPE_LISTEN);

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_WRITE_OUTPUT in WriteConsoleOutputW.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 09ab7e8a0c9c96624e4597b6e91cb202a8086ef9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09ab7e8a0c9c96624e4597b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 23 17:31:28 2020 +0200 kernelbase: Use IOCTL_CONDRV_WRITE_OUTPUT in WriteConsoleOutputW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 54 ++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 262db40003..a79644723a 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1486,41 +1486,43 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputA( HANDLE handle, const CHAR_INF BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputW( HANDLE handle, const CHAR_INFO *buffer, COORD size, COORD coord, SMALL_RECT *region ) { - int width, height, y; - BOOL ret = TRUE; + struct condrv_write_output_params *params; + unsigned int width, height, y; + size_t params_size; + BOOL ret; TRACE( "(%p,%p,(%d,%d),(%d,%d),(%d,%dx%d,%d)\n", handle, buffer, size.X, size.Y, coord.X, coord.Y, region->Left, region->Top, region->Right, region->Bottom ); - width = min( region->Right - region->Left + 1, size.X - coord.X ); + if (region->Left > region->Right || region->Top > region->Bottom || size.X <= coord.X || size.Y <= coord.Y) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + width = min( region->Right - region->Left + 1, size.X - coord.X ); height = min( region->Bottom - region->Top + 1, size.Y - coord.Y ); + region->Right = region->Left + width - 1; + region->Bottom = region->Top + height - 1; - if (width > 0 && height > 0) + params_size = sizeof(*params) + width * height * sizeof(*buffer); + if (!(params = HeapAlloc( GetProcessHeap(), 0, params_size ))) { - for (y = 0; y < height; y++) - { - SERVER_START_REQ( write_console_output ) - { - req->handle = console_handle_unmap( handle ); - req->x = region->Left; - req->y = region->Top + y; - req->mode = CHAR_INFO_MODE_TEXTATTR; - req->wrap = FALSE; - wine_server_add_data( req, &buffer[(y + coord.Y) * size.X + coord.X], - width * sizeof(CHAR_INFO)); - if ((ret = !wine_server_call_err( req ))) - { - width = min( width, reply->width - region->Left ); - height = min( height, reply->height - region->Top ); - } - } - SERVER_END_REQ; - if (!ret) break; - } + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; } - region->Bottom = region->Top + height - 1; - region->Right = region->Left + width - 1; + + params->mode = CHAR_INFO_MODE_TEXTATTR; + params->x = region->Left; + params->y = region->Top; + params->width = width; + + for (y = 0; y < height; y++) + memcpy( &((CHAR_INFO *)(params + 1))[y * width], &buffer[(y + coord.Y) * size.X + coord.X], width * sizeof(CHAR_INFO) ); + + ret = console_ioctl( handle, IOCTL_CONDRV_WRITE_OUTPUT, params, params_size, region, sizeof(*region), NULL ); + HeapFree( GetProcessHeap(), 0, params ); return ret; }

1 0