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 July 23, 2020

July 23, 2020

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: Migrate the virtual desktop display settings handler to a new interface.
by Alexandre Julliard July 23, 2020

July 23, 2020

Module: wine Branch: master Commit: dd13b274104b561f05873e8acdc4bfd34bbe796e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd13b274104b561f05873e8a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jul 22 15:24:30 2020 +0800 winex11.drv: Migrate the virtual desktop display settings handler to a new interface. The old display settings handler interface can only support one adapter. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 41 ++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/settings.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 27 +++++++++++++++++++++++++ 3 files changed, 116 insertions(+) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index b5894d5e02..d3dcf90fb9 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -2,6 +2,7 @@ * X11DRV desktop window handling * * Copyright 2001 Alexandre Julliard + * Copyright 2020 Zhiyi Zhang for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +23,9 @@ #include <X11/cursorfont.h> #include <X11/Xlib.h> +#define NONAMELESSSTRUCT +#define NONAMELESSUNION + #include "x11drv.h" /* avoid conflict with field names in included win32 headers */ @@ -152,6 +156,35 @@ static LONG X11DRV_desktop_SetCurrentMode(int mode) return DISP_CHANGE_SUCCESSFUL; } +/* Virtual desktop display settings handler */ +static BOOL X11DRV_desktop_get_id( const WCHAR *device_name, ULONG_PTR *id ) +{ + WCHAR primary_adapter[CCHDEVICENAME]; + + if (!get_primary_adapter( primary_adapter ) || lstrcmpiW( primary_adapter, device_name )) + return FALSE; + + *id = 0; + return TRUE; +} + +static BOOL X11DRV_desktop_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) +{ + RECT primary_rect = get_primary_monitor_rect(); + + mode->dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | + DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; + mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + mode->dmBitsPerPel = screen_bpp; + mode->dmPelsWidth = primary_rect.right - primary_rect.left; + mode->dmPelsHeight = primary_rect.bottom - primary_rect.top; + mode->u2.dmDisplayFlags = 0; + mode->dmDisplayFrequency = 60; + mode->u1.s2.dmPosition.x = 0; + mode->u1.s2.dmPosition.y = 0; + return TRUE; +} + 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}; @@ -242,6 +275,7 @@ static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors ) void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) { RECT primary_rect = get_host_primary_monitor_rect(); + struct x11drv_settings_handler settings_handler; root_window = win; managed_mode = FALSE; /* no managed windows in desktop mode */ @@ -270,6 +304,13 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) 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 */ + settings_handler.name = "Virtual Desktop"; + settings_handler.priority = 1000; + settings_handler.get_id = X11DRV_desktop_get_id; + 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 bbbb6fdf0a..e0dee95154 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -2,6 +2,7 @@ * Wine X11drv display settings functions * * Copyright 2003 Alexander James Pasadyn + * Copyright 2020 Zhiyi Zhang for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -125,6 +126,18 @@ unsigned int X11DRV_Settings_GetModeCount(void) return dd_mode_count; } +/* TODO: Remove the old display settings handler interface once all backends are migrated to the new interface */ +static struct x11drv_settings_handler handler; + +void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *new_handler) +{ + if (new_handler->priority > handler.priority) + { + handler = *new_handler; + TRACE("Display settings are now handled by: %s.\n", handler.name); + } +} + /*********************************************************************** * Default handlers if resolution switching is not enabled * @@ -308,7 +321,42 @@ 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 }; + ULONG_PTR id; + + /* Use the new interface if it is available */ + if (!handler.name || (n != ENUM_REGISTRY_SETTINGS && n != ENUM_CURRENT_SETTINGS)) + goto old_interface; + + if (n == ENUM_REGISTRY_SETTINGS) + { + if (!read_registry_settings(name, devmode)) + { + ERR("Failed to get %s registry display settings.\n", wine_dbgstr_w(name)); + return FALSE; + } + goto done; + } + + if (n == ENUM_CURRENT_SETTINGS) + { + if (!handler.get_id(name, &id) || !handler.get_current_mode(id, devmode)) + { + ERR("Failed to get %s current display settings.\n", wine_dbgstr_w(name)); + return FALSE; + } + goto done; + } + +done: + /* Set generic fields */ + devmode->dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); + devmode->dmDriverExtra = 0; + devmode->dmSpecVersion = DM_SPECVERSION; + devmode->dmDriverVersion = DM_SPECVERSION; + lstrcpyW(devmode->dmDeviceName, dev_name); + return TRUE; +old_interface: devmode->dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); devmode->dmSpecVersion = DM_SPECVERSION; devmode->dmDriverVersion = DM_SPECVERSION; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 9bbb48f1ee..49059e09b7 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -657,6 +657,33 @@ struct x11drv_mode_info unsigned int refresh_rate; }; +/* Required functions for changing and enumerating display settings */ +struct x11drv_settings_handler +{ + /* A name to tell what host driver is used */ + const char *name; + + /* Higher priority can override handlers with a lower priority */ + UINT priority; + + /* get_id() will be called to map a device name, e.g., \\.\DISPLAY1 to a driver specific id. + * Following functions use this id to identify the device. + * + * Return FALSE if the device can not be found and TRUE on success */ + BOOL (*get_id)(const WCHAR *device_name, ULONG_PTR *id); + + /* get_current_mode() will be called to get the current display mode of the device of id + * + * Following fields in DEVMODE must be valid: + * dmFields, dmDisplayOrientation, dmBitsPerPel, dmPelsWidth, dmPelsHeight, dmDisplayFlags, + * dmDisplayFrequency and dmPosition + * + * Return FALSE on failure with parameters unchanged and error code set. Return TRUE on success */ + BOOL (*get_current_mode)(ULONG_PTR id, DEVMODEW *mode); +}; + +extern void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *handler) DECLSPEC_HIDDEN; + extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; extern void X11DRV_resize_desktop(BOOL) DECLSPEC_HIDDEN; extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN;

1 0

Zhiyi Zhang : winex11.drv: Allow reporting a virtual desktop mode with the same width or height as the current mode.
by Alexandre Julliard July 23, 2020

July 23, 2020

Module: wine Branch: master Commit: 6436600db5a680d016bc428326d0f67417315ad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6436600db5a680d016bc4283… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jul 22 15:24:14 2020 +0800 winex11.drv: Allow reporting a virtual desktop mode with the same width or height as the current mode. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 5a9e0f59ae..b5894d5e02 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -108,7 +108,7 @@ static void make_modes(void) } } } - if ((max_width != screen_width) && (max_height != screen_height)) + 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);

1 0

Jacek Caban : kernel32/tests: Add more console output tests.
by Alexandre Julliard July 23, 2020

July 23, 2020

Module: wine Branch: master Commit: 716bdfcbfa9563f8dd72dc32076344c04b46e26d URL: https://source.winehq.org/git/wine.git/?a=commit;h=716bdfcbfa9563f8dd72dc32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 23 17:32:23 2020 +0200 kernel32/tests: Add more console output tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 158 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 157 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index dd8cc2c188..6e05fbd4fa 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -640,7 +640,8 @@ static void testScroll(HANDLE hCon, COORD sbSize) clip.Top = H / 2; clip.Bottom = min(H + H / 2, sbSize.Y - 1); - ok(ScrollConsoleScreenBufferA(hCon, &scroll, &clip, dst, &ci), "Scrolling SB\n"); + ret = ScrollConsoleScreenBufferA(hCon, &scroll, &clip, dst, &ci); + ok(ret, "ScrollConsoleScreenBufferA failed: %u\n", GetLastError()); for (c.Y = 0; c.Y < sbSize.Y; c.Y++) { @@ -2046,6 +2047,12 @@ static void test_WriteConsoleOutputCharacterA(HANDLE output_handle) ret = WriteConsoleOutputCharacterA(output_handle, output, 1, origin, &count); ok(ret == TRUE, "Expected WriteConsoleOutputCharacterA to return TRUE, got %d\n", ret); ok(count == 1, "Expected count to be 1, got %u\n", count); + + count = 0xdeadbeef; + origin.X = 200; + ret = WriteConsoleOutputCharacterA(output_handle, output, 0, origin, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputCharacterA to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); } static void test_WriteConsoleOutputCharacterW(HANDLE output_handle) @@ -2130,6 +2137,13 @@ static void test_WriteConsoleOutputCharacterW(HANDLE output_handle) ret = WriteConsoleOutputCharacterW(output_handle, outputW, 1, origin, &count); ok(ret == TRUE, "Expected WriteConsoleOutputCharacterW to return TRUE, got %d\n", ret); ok(count == 1, "Expected count to be 1, got %u\n", count); + + count = 0xdeadbeef; + origin.X = 200; + ret = WriteConsoleOutputCharacterW(output_handle, outputW, 0, origin, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputCharacterW to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + } static void test_WriteConsoleOutputAttribute(HANDLE output_handle) @@ -2213,6 +2227,147 @@ static void test_WriteConsoleOutputAttribute(HANDLE output_handle) ret = WriteConsoleOutputAttribute(output_handle, &attr, 1, origin, &count); ok(ret == TRUE, "Expected WriteConsoleOutputAttribute to return TRUE, got %d\n", ret); ok(count == 1, "Expected count to be 1, got %u\n", count); + + count = 0xdeadbeef; + origin.X = 200; + ret = WriteConsoleOutputAttribute(output_handle, &attr, 0, origin, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputAttribute to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); +} + +static void set_region(SMALL_RECT *region, unsigned int left, unsigned int top, unsigned int right, unsigned int bottom) +{ + region->Left = left; + region->Top = top; + region->Right = right; + region->Bottom = bottom; +} + +#define check_region(a,b,c,d,e) check_region_(__LINE__,a,b,c,d,e) +static void check_region_(unsigned int line, const SMALL_RECT *region, unsigned int left, unsigned int top, unsigned int right, unsigned int bottom) +{ + ok_(__FILE__,line)(region->Left == left, "Left = %u, expected %u\n", region->Left, left); + ok_(__FILE__,line)(region->Top == top, "Top = %u, expected %u\n", region->Top, top); + ok_(__FILE__,line)(region->Right == right, "Right = %u, expected %u\n", region->Right, right); + ok_(__FILE__,line)(region->Bottom == bottom, "Bottom = %u, expected %u\n", region->Bottom, bottom); +} + +static void test_WriteConsoleOutput(HANDLE console) +{ + CONSOLE_SCREEN_BUFFER_INFO info; + CHAR_INFO char_info_buf[2048]; + SMALL_RECT region; + COORD size, coord; + unsigned int i; + BOOL ret; + + for (i = 0; i < ARRAY_SIZE(char_info_buf); i++) + { + char_info_buf[i].Char.UnicodeChar = '0' + i % 10; + char_info_buf[i].Attributes = 0; + } + + ret = GetConsoleScreenBufferInfo(console, &info); + ok(ret, "GetConsoleScreenBufferInfo failed: %u\n", GetLastError()); + + size.X = 23; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 15, 11); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(ret, "WriteConsoleOutputW failed: %u\n", GetLastError()); + check_region(&region, 10, 7, 15, 11); + + size.X = 23; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 200, 7, 15, 211); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "WriteConsoleOutputW returned: %x(%u)\n", ret, GetLastError()); + check_region(&region, 200, 7, 15, 211); + + size.X = 23; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 200, 7, 211, 8); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(ret, "WriteConsoleOutputW failed: %u\n", GetLastError()); + check_region(&region, 200, 7, 211, 8); + + size.X = 23; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 9, 11); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "WriteConsoleOutputW returned: %x(%u)\n", ret, GetLastError()); + check_region(&region, 10, 7, 9, 11); + + size.X = 23; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 11, 6); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "WriteConsoleOutputW returned: %x(%u)\n", ret, GetLastError()); + check_region(&region, 10, 7, 11, 6); + + size.X = 2; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 15, 11); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "WriteConsoleOutputW returned: %x(%u)\n", ret, GetLastError()); + check_region(&region, 10, 7, 15, 11); + + size.X = 23; + size.Y = 3; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 15, 11); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "WriteConsoleOutputW returned: %x(%u)\n", ret, GetLastError()); + check_region(&region, 10, 7, 15, 11); + + size.X = 6; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 15, 11); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(ret, "WriteConsoleOutputW failed: %u\n", GetLastError()); + check_region(&region, 10, 7, 13, 11); + + size.X = 6; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 15, 11); + ret = WriteConsoleOutputW((HANDLE)0xdeadbeef, char_info_buf, size, coord, &region); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "WriteConsoleOutputW returned: %x(%u)\n", ret, GetLastError()); + if (!skip_nt) check_region(&region, 10, 7, 13, 11); + + size.X = 16; + size.Y = 7; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 15, 11); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(ret, "WriteConsoleOutputW failed: %u\n", GetLastError()); + check_region(&region, 10, 7, 15, 10); + + size.X = 16; + size.Y = 7; + coord.X = 2; + coord.Y = 3; + set_region(&region, info.dwSize.X - 2, 7, info.dwSize.X + 2, 7); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(ret, "WriteConsoleOutputW failed: %u\n", GetLastError()); + check_region(&region, info.dwSize.X - 2, 7, info.dwSize.X - 1, 7); } static void test_FillConsoleOutputCharacterA(HANDLE output_handle) @@ -3597,6 +3752,7 @@ START_TEST(console) test_WriteConsoleOutputCharacterA(hConOut); test_WriteConsoleOutputCharacterW(hConOut); test_WriteConsoleOutputAttribute(hConOut); + test_WriteConsoleOutput(hConOut); test_FillConsoleOutputCharacterA(hConOut); test_FillConsoleOutputCharacterW(hConOut); test_FillConsoleOutputAttribute(hConOut);

1 0

Piotr Caban : msvcrt: Don't use strtold in __STRINGTOLD_L.
by Alexandre Julliard July 23, 2020

July 23, 2020

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 July 23, 2020

July 23, 2020

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: Create 64-bit mantissa in fpnum_parse.
by Alexandre Julliard July 23, 2020

July 23, 2020

Module: wine Branch: master Commit: 8fc48e8bc2507ae8123c749a09c0be60a26e397d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fc48e8bc2507ae8123c749a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 23 15:38:34 2020 +0200 msvcrt: Create 64-bit mantissa in fpnum_parse. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/bnum.h | 11 ++--------- dlls/msvcrt/string.c | 31 ++++++++++++++++++++++++++----- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/bnum.h b/dlls/msvcrt/bnum.h index 5cc71c1e68..144db353fe 100644 --- a/dlls/msvcrt/bnum.h +++ b/dlls/msvcrt/bnum.h @@ -28,7 +28,8 @@ static const int p10s[] = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, #define LIMB_MAX 1000000000 /* 10^9 */ #define BNUM_PREC64 128 /* data size needed to store 64-bit double */ -/* bnum represents real number with fixed decimal point (after 2 limbs) */ + +/* bnum represents real number with fixed decimal point */ struct bnum { int b; /* least significant digit position */ int e; /* most significant digit position + 1 */ @@ -41,14 +42,6 @@ static inline int bnum_idx(struct bnum *b, int idx) return idx & (b->size - 1); } -/* Returns integral part of bnum */ -static inline ULONGLONG bnum_to_mant(struct bnum *b) -{ - ULONGLONG ret = (ULONGLONG)b->data[bnum_idx(b, b->e-1)] * LIMB_MAX; - if(b->b != b->e-1) ret += b->data[bnum_idx(b, b->e-2)]; - return ret; -} - /* Returns TRUE if new most significant limb was added */ static inline BOOL bnum_lshift(struct bnum *b, int shift) { diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 5732d511fd..a2ec9a91ac 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -597,6 +597,21 @@ static struct fpnum fpnum_parse16(MSVCRT_wchar_t get(void *ctx), void unget(void } #endif +/* Converts first 3 limbs to ULONGLONG */ +/* Return FALSE on overflow */ +static inline BOOL bnum_to_mant(struct bnum *b, ULONGLONG *m) +{ + if(MSVCRT_UI64_MAX / LIMB_MAX / LIMB_MAX < b->data[bnum_idx(b, b->e-1)]) return FALSE; + *m = (ULONGLONG)b->data[bnum_idx(b, b->e-1)] * LIMB_MAX * LIMB_MAX; + if(b->b == b->e-1) return TRUE; + if(MSVCRT_UI64_MAX - *m < (ULONGLONG)b->data[bnum_idx(b, b->e-2)] * LIMB_MAX) return FALSE; + *m += (ULONGLONG)b->data[bnum_idx(b, b->e-2)] * LIMB_MAX; + if(b->b == b->e-2) return TRUE; + if(MSVCRT_UI64_MAX - *m < b->data[bnum_idx(b, b->e-3)]) return FALSE; + *m += b->data[bnum_idx(b, b->e-3)]; + return TRUE; +} + struct fpnum fpnum_parse(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), void *ctx, MSVCRT_pthreadlocinfo locinfo) { @@ -612,6 +627,7 @@ struct fpnum fpnum_parse(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *c struct bnum *b = (struct bnum*)bnum_data; enum fpmod round = FP_ROUND_ZERO; MSVCRT_wchar_t nch; + ULONGLONG m; nch = get(ctx); if(nch == '-') { @@ -797,28 +813,33 @@ struct fpnum fpnum_parse(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *c if(dp-1 < MSVCRT_DBL_MIN_10_EXP-MSVCRT_DBL_DIG-18) return fpnum(sign, INT_MIN, 1, FP_ROUND_ZERO); - while(dp > 2*LIMB_DIGITS) { + while(dp > 3*LIMB_DIGITS) { if(bnum_rshift(b, 9)) dp -= LIMB_DIGITS; e2 += 9; } - while(dp <= LIMB_DIGITS) { + while(dp <= 2*LIMB_DIGITS) { if(bnum_lshift(b, 29)) dp += LIMB_DIGITS; e2 -= 29; } - while(b->data[bnum_idx(b, b->e-1)] < LIMB_MAX/10) { + /* Make sure most significant mantissa bit will be set */ + while(b->data[bnum_idx(b, b->e-1)] <= 9) { bnum_lshift(b, 1); e2--; } + while(!bnum_to_mant(b, &m)) { + bnum_rshift(b, 1); + 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-3; i>=b->b; i--) { + for(i=b->e-4; i>=b->b; i--) { if (!b->data[bnum_idx(b, b->b)]) continue; round = FP_ROUND_DOWN; break; } - return fpnum(sign, e2, bnum_to_mant(b), round); + return fpnum(sign, e2, m, round); } static MSVCRT_wchar_t strtod_str_get(void *ctx)

1 0

Piotr Caban : msvcrt: Introduce fpnum structure that can be used to represent 64 and 80-bit double.
by Alexandre Julliard July 23, 2020

July 23, 2020

Module: wine Branch: master Commit: 450015781e7ad45a79df01225ee75271563317ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=450015781e7ad45a79df0122… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 23 15:38:28 2020 +0200 msvcrt: Introduce fpnum structure that can be used to represent 64 and 80-bit double. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 19 ++++- dlls/msvcrt/scanf.h | 6 +- dlls/msvcrt/string.c | 212 ++++++++++++++++++++++++++++++--------------------- dlls/msvcrt/wcs.c | 7 +- 4 files changed, 151 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=450015781e7ad45a79df…

1 0

Piotr Caban : msvcrt: Support arbitrary buffer size in bnum.
by Alexandre Julliard July 23, 2020

July 23, 2020

Module: wine Branch: master Commit: 74958219747843c0d260ca76dd046988909fccdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=74958219747843c0d260ca76… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 23 15:38:25 2020 +0200 msvcrt: Support arbitrary buffer size in bnum. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/bnum.h | 51 +++++++++++++++------------ dlls/msvcrt/printf.h | 99 +++++++++++++++++++++++++++------------------------- dlls/msvcrt/string.c | 62 ++++++++++++++++---------------- 3 files changed, 112 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=74958219747843c0d260…

1 0

Piotr Caban : msvcrt: Add __STRINGTOLD_L and _atoldbl_l partial stubs.
by Alexandre Julliard July 23, 2020

July 23, 2020

Module: wine Branch: master Commit: 413e34df586ed172c964e1386ea9136fc8ec6e7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=413e34df586ed172c964e138… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 23 15:38:21 2020 +0200 msvcrt: Add __STRINGTOLD_L and _atoldbl_l partial stubs. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-convert-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr110/msvcr110.spec | 4 +- dlls/msvcr120/msvcr120.spec | 4 +- dlls/msvcr120_app/msvcr120_app.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 52 ++++++++++++++-------- dlls/ucrtbase/ucrtbase.spec | 4 +- 11 files changed, 50 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=413e34df586ed172c964…

1 0