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

[PATCH] user32/edit: Don't set caret position when we don't have focus.
by Alistair Leslie-Hughes Dec. 12, 2018

Dec. 12, 2018

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/user32/edit.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 48c65ea..6f8f412 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1799,9 +1799,14 @@ static LRESULT EDIT_EM_Scroll(EDITSTATE *es, INT action) static void EDIT_SetCaretPos(EDITSTATE *es, INT pos, BOOL after_wrap) { - LRESULT res = EDIT_EM_PosFromChar(es, pos, after_wrap); - TRACE("%d - %dx%d\n", pos, (short)LOWORD(res), (short)HIWORD(res)); - SetCaretPos((short)LOWORD(res), (short)HIWORD(res)); + LRESULT res; + + if (es->flags & EF_FOCUSED) + { + res = EDIT_EM_PosFromChar(es, pos, after_wrap); + TRACE("%d - %dx%d\n", pos, (short)LOWORD(res), (short)HIWORD(res)); + SetCaretPos((short)LOWORD(res), (short)HIWORD(res)); + } } @@ -1870,7 +1875,6 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es) } } - if(es->flags & EF_FOCUSED) EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); } -- 1.9.1

3 2

Re: [PATCH] Add .editorconfig file
by Eberhard Beilharz Dec. 12, 2018

Dec. 12, 2018

Ahh, you're right - I copied the file from another project and changed "tab" to "space" and missed that part! Thanks! Sent an updated patch in a separate email. Eberhard Fabian Maurer <dark.shadow4(a)web.de> wrote on 2018-12-11 at 22:38 +0100: > > According to the official docs, indent_size can not have the value > "space". Is this a typo or did I miss something? > > Regards, > > Fabian Maurer >

1 0

[PATCH] Allow to specify private ld-linux
by probono Dec. 12, 2018

Dec. 12, 2018

This patch allows to tell Wine to use a privately bundled ld-linux.so.2 (and related glibc and other libraries) instead of looking for them in the host system. This greatly simplifies packaging Wine as a self-standing bundle for Linux (e.g., AppDir, AppImage), making it possible to run Wine without installation, even on 64-bit systems on which 32-bit compatibility libraries are not installed. The problem statement has been described in more detail by me in https://www.winehq.org/pipermail/wine-devel/2017-November/119906.html The approach was suggested by Alexandre Julliard in https://www.winehq.org/pipermail/wine-devel/2017-November/119944.html All credit for this patch goes to Hackerl, on whose behalf I am posting. Source: https://github.com/Hackerl/wine/commit/4f7f784.patch Discussion: https://github.com/Hackerl/Wine_Appimage/issues/11 From: Hackerl <490021209(a)qq.com> Signed-off-by: Hackerl <490021209(a)qq.com> --- libs/wine/config.c | 21 ++++++++++++++++++++- loader/preloader.c | 10 +++++++--- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 083e263ee3d..e89c2c63a95 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -562,7 +562,26 @@ static void preloader_exec( char **argv, int use_preloader ) free( new_argv ); free( full_name ); } - execv( argv[0], argv ); + else + { + char * wineloader = getenv("WINELDLIBRARY"); + + if (wineloader == NULL) + execv( argv[0], argv ); + + char **last_arg = argv; + + while (*last_arg) last_arg++; + + char ** new_argv = xmalloc( (last_arg - argv + 2) * sizeof(*argv) ); + memcpy( new_argv + 1, argv, (last_arg - argv + 1) * sizeof(*argv) ); + + new_argv[0] = wineloader; + + execv(wineloader, new_argv); + + free( new_argv ); + } } /* exec a wine internal binary (either the wine loader or the wine server) */ diff --git a/loader/preloader.c b/loader/preloader.c index 13a6ad86b20..55af8383773 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -1255,7 +1255,7 @@ void* wld_start( void **stack ) { long i, *pargc; char **argv, **p; - char *interp, *reserve = NULL; + char *interp = NULL, *reserve = NULL; struct wld_auxv new_av[8], delete_av[3], *av; struct wld_link_map main_binary_map, ld_so_map; struct wine_preload_info **wine_main_preload_info; @@ -1270,8 +1270,11 @@ void* wld_start( void **stack ) /* skip over the environment */ while (*p) { - static const char res[] = "WINEPRELOADRESERVE="; + static const char res[] = "WINEPRELOADRESERVE=", loader[] = "WINELDLIBRARY="; + if (!wld_strncmp( *p, res, sizeof(res)-1 )) reserve = *p + sizeof(res) - 1; + if (!wld_strncmp( *p, loader, sizeof(loader)-1 )) interp = *p + sizeof(loader) - 1; + p++; } @@ -1323,7 +1326,8 @@ void* wld_start( void **stack ) map_so_lib( argv[1], &main_binary_map ); /* load the ELF interpreter */ - interp = (char *)main_binary_map.l_addr + main_binary_map.l_interp; + if (interp == NULL) + interp = (char *)main_binary_map.l_addr + main_binary_map.l_interp; map_so_lib( interp, &ld_so_map ); /* store pointer to the preload info into the appropriate main binary variable */

2 1

[PATCH] winetest: Add GUI to display results of individual tests
by Isira Seneviratne Dec. 11, 2018

Dec. 11, 2018

1 0

[PATCH] imagelist: fix crash with large number of images
by Eberhard Beilharz Dec. 11, 2018

Dec. 11, 2018

1 0

[PATCH] Add .editorconfig file
by Eberhard Beilharz Dec. 11, 2018

Dec. 11, 2018

1 0

[PATCH v2 1/2] winebus.sys: Raise priority of device threads.
by Kai Krakow Dec. 11, 2018

Dec. 11, 2018

This potentially reduces lag and makes the input device initialization faster under CPU load. Signed-off-by: Kai Krakow <kai(a)kaishome.de> --- dlls/winebus.sys/bus_iohid.c | 1 + dlls/winebus.sys/bus_sdl.c | 2 ++ dlls/winebus.sys/bus_udev.c | 9 +++++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 95077ac0be2..b4f7dabb153 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -410,6 +410,7 @@ NTSTATUS WINAPI iohid_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registr return STATUS_UNSUCCESSFUL; } + SetThreadPriority(run_loop_handle, THREAD_PRIORITY_TIME_CRITICAL); return STATUS_SUCCESS; } diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 5cf5dddaf05..41f203f6e36 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -976,6 +976,8 @@ NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_ goto error; } + SetThreadPriority(events[1], THREAD_PRIORITY_TIME_CRITICAL); + result = WaitForMultipleObjects(2, events, FALSE, INFINITE); CloseHandle(events[0]); CloseHandle(events[1]); diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 64b245e630d..10b79dcc6b1 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -795,8 +795,9 @@ static NTSTATUS begin_report_processing(DEVICE_OBJECT *device) close(private->control_pipe[1]); return STATUS_UNSUCCESSFUL; } - else - return STATUS_SUCCESS; + + SetThreadPriority(private->report_thread, THREAD_PRIORITY_TIME_CRITICAL); + return STATUS_SUCCESS; } static NTSTATUS hidraw_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) @@ -1006,6 +1007,8 @@ static NTSTATUS lnxev_begin_report_processing(DEVICE_OBJECT *device) close(private->base.control_pipe[1]); return STATUS_UNSUCCESSFUL; } + + SetThreadPriority(private->base.report_thread, THREAD_PRIORITY_TIME_CRITICAL); return STATUS_SUCCESS; } @@ -1462,6 +1465,8 @@ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry goto error; } + SetThreadPriority(events[1], THREAD_PRIORITY_TIME_CRITICAL); + result = WaitForMultipleObjects(2, events, FALSE, INFINITE); CloseHandle(events[0]); CloseHandle(events[1]); -- 2.19.2

3 5

[PATCH] winetest: Add GUI to display results of individual tests
by Isira Seneviratne Dec. 11, 2018

Dec. 11, 2018

3 2

[PATCH] po: Update Russian translation.
by Nikolay Sivov Dec. 11, 2018

Dec. 11, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/po/ru.po b/po/ru.po index e7c73602e0..b704dc738a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-07-20 09:26+0300\n" +"PO-Revision-Date: 2018-12-11 15:59+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.9\n" +"X-Generator: Poedit 2.2\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -312,25 +312,23 @@ msgstr "Отмена..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "Осталось %1!u! %2" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "Осталось %1!u! %2 и %3!u! %4" #: browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "&Секунды" +msgstr "сек." #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "мин." #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "ч." #: comctl32.rc:68 winefile.rc:157 msgid "Properties for %s" @@ -2453,16 +2451,12 @@ msgstr "" "выполнения экспорта." #: cryptui.rc:456 cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "Выбор хранилища сертификатов" +msgstr "Выбор сертификата" #: cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "Выберите хранилище для импорта сертификата:" +msgstr "Выберите сертификат, который хотите использовать" #: cryptui.rc:30 cryptui.rc:93 msgid "Certificate" @@ -2992,20 +2986,16 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Примечание: закрытый ключ этого сертификата не экспортируемый." #: cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "&Назначения:" +msgstr "Предназначение" #: cryptui.rc:178 shell32.rc:152 msgid "Location" msgstr "Размещение" #: cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "Выбор хранилища сертификатов" +msgstr "Выберите сертификат" #: cryptui.rc:181 winefile.rc:102 winhlp32.rc:110 winhlp32.rc:85 msgid "Not yet implemented" @@ -11106,10 +11096,8 @@ msgid "Error: Invalid option '%c'.\n" msgstr "Ошибка: неверная опция «%c».\n" #: hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "Ошибка: не удалось найти Процесс «%1».\n" +msgstr "Ошибка: не удалось получить имя хоста: %u.\n" #: hostname.rc:33 msgid "" @@ -14262,11 +14250,11 @@ msgstr "Цвет:" #: winecfg.rc:304 msgid "MIME types" -msgstr "" +msgstr "Типы MIME" #: winecfg.rc:305 msgid "Manage file &associations" -msgstr "" +msgstr "Управлять &ассоциациями файлов" #: winecfg.rc:308 msgid "Folders" -- 2.19.2

1 0

[PATCH] user32/scroll: Fix tracking for non-client scrollbars
by Gabriel Ivăncescu Dec. 11, 2018

Dec. 11, 2018

Non-client scrollbars (SB_HORZ and SB_VERT) don't have their client origin at (0,0) because they can have non-client borders. It is necessary to offset by this origin just as it is done for LBUTTONDOWN. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This fixes, for example, SB_VERT scrollbars that have a non-client area above them (like a title bar) so that when moving the mouse after clicking (hot-tracking), they won't jump by the size of the title bar (which is annoying). dlls/user32/scroll.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 95d9761..d611cf0 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1095,15 +1095,17 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) { MSG msg; + RECT rect; if (scrollbar != SB_CTL) { - RECT rect; WIN_GetRectangles( hwnd, COORDS_CLIENT, &rect, NULL ); ScreenToClient( hwnd, &pt ); pt.x -= rect.left; pt.y -= rect.top; } + else + rect.left = rect.top = 0; SCROLL_HandleScrollEvent( hwnd, scrollbar, WM_LBUTTONDOWN, pt ); @@ -1115,8 +1117,8 @@ void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) msg.message == WM_MOUSEMOVE || (msg.message == WM_SYSTIMER && msg.wParam == SCROLL_TIMER)) { - pt.x = (short)LOWORD(msg.lParam); - pt.y = (short)HIWORD(msg.lParam); + pt.x = (short)LOWORD(msg.lParam) - rect.left; + pt.y = (short)HIWORD(msg.lParam) - rect.top; SCROLL_HandleScrollEvent( hwnd, scrollbar, msg.message, pt ); } else -- 2.19.1

2 2

[PATCH] comctl32/tests: Use actual text width for ideal button size tests.
by Nikolay Sivov Dec. 11, 2018

Dec. 11, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- This should fix test failures running on testbot VMs. dlls/comctl32/tests/button.c | 112 ++++++++++++++++++----------------- 1 file changed, 58 insertions(+), 54 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 09ec4a1c0a..ce673af261 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -1421,21 +1421,21 @@ static void test_state(void) static void test_bcm_get_ideal_size(void) { - static const WCHAR text2_w[] = {'t', 'e', 'x', 't', '\n', 't', 'e', 'x', 't', 0}; - static const WCHAR text_w[] = {'t', 'e', 'x', 't', 0}; + static const char *button_text2 = "WWWW\nWWWW"; + static const char *button_text = "WWWW"; static const DWORD imagelist_aligns[] = {BUTTON_IMAGELIST_ALIGN_LEFT, BUTTON_IMAGELIST_ALIGN_RIGHT, BUTTON_IMAGELIST_ALIGN_TOP, BUTTON_IMAGELIST_ALIGN_BOTTOM, BUTTON_IMAGELIST_ALIGN_CENTER}; static const DWORD aligns[] = {0, BS_TOP, BS_LEFT, BS_RIGHT, BS_BOTTOM, BS_CENTER, BS_VCENTER, BS_RIGHTBUTTON, WS_EX_RIGHT}; DWORD default_style = WS_TABSTOP | WS_POPUP | WS_VISIBLE; - LONG client_width = 200, client_height = 200; - LONG width, height, line_count; + const LONG client_width = 400, client_height = 200; + LONG image_width, height, line_count, text_width; + HFONT hfont, prev_font; DWORD style, type; BOOL ret; HWND hwnd; HDC hdc; - HFONT hfont; LOGFONTA lf; TEXTMETRICA tm; SIZE size; @@ -1444,11 +1444,12 @@ static void test_bcm_get_ideal_size(void) HICON hicon; HIMAGELIST himl; BUTTON_IMAGELIST biml = {0}; + RECT rect; INT i, j; /* Check for NULL pointer handling */ - hwnd = CreateWindowW(WC_BUTTONW, text_w, BS_PUSHBUTTON | default_style, 0, 0, client_width, client_height, NULL, - NULL, 0, NULL); + hwnd = CreateWindowA(WC_BUTTONA, button_text, BS_PUSHBUTTON | default_style, 0, 0, client_width, client_height, + NULL, NULL, 0, NULL); ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, 0); ok(!ret, "Expect BCM_GETIDEALSIZE message to return false.\n"); @@ -1458,22 +1459,27 @@ static void test_bcm_get_ideal_size(void) lf.lfHeight = 20; lstrcpyA(lf.lfFaceName, "Tahoma"); hfont = CreateFontIndirectA(&lf); + ok(hfont != NULL, "Failed to create test font.\n"); /* Get tmHeight */ hdc = GetDC(hwnd); + prev_font = SelectObject(hdc, hfont); GetTextMetricsA(hdc, &tm); + SelectObject(hdc, prev_font); + DrawTextA(hdc, button_text, -1, &rect, DT_CALCRECT); + text_width = rect.right - rect.left; ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); - /* XP and 2003 doesn't support command links, getting ideal size with button having only text just return client size on these platforms */ - hwnd = CreateWindowA(WC_BUTTONA, "test", BS_DEFCOMMANDLINK | default_style, 0, 0, client_width, client_height, NULL, + /* XP and 2003 doesn't support command links, getting ideal size with button having only text returns client size on these platforms. */ + hwnd = CreateWindowA(WC_BUTTONA, button_text, BS_DEFCOMMANDLINK | default_style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); ok(hwnd != NULL, "Expect hwnd not NULL\n"); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); ZeroMemory(&size, sizeof(size)); ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); - if (size.cx == client_width && size.cy == client_width) + if (size.cx == client_width && size.cy == client_height) { /* on XP and 2003, buttons with image are not supported */ win_skip("Skipping further tests on XP and 2003\n"); @@ -1482,14 +1488,14 @@ static void test_bcm_get_ideal_size(void) /* Tests for image placements */ /* Prepare bitmap */ - width = 48; + image_width = 48; height = 48; hdc = GetDC(0); - hmask = CreateCompatibleBitmap(hdc, width, height); - hbmp = CreateCompatibleBitmap(hdc, width, height); + hmask = CreateCompatibleBitmap(hdc, image_width, height); + hbmp = CreateCompatibleBitmap(hdc, image_width, height); /* Only bitmap for push button, ideal size should be enough for image and text */ - hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_DEFPUSHBUTTON | BS_BITMAP | default_style, 0, 0, client_width, + hwnd = CreateWindowA(WC_BUTTONA, button_text, BS_DEFPUSHBUTTON | BS_BITMAP | default_style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); ok(hwnd != NULL, "Expect hwnd not NULL\n"); SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hbmp); @@ -1498,9 +1504,9 @@ static void test_bcm_get_ideal_size(void) ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); /* Ideal size contains text rect even show bitmap only */ - ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), - "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, width + 4 * tm.tmMaxCharWidth, size.cy, - max(height, tm.tmHeight)); + ok((size.cx >= image_width + text_width && size.cy >= max(height, tm.tmHeight)), + "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, image_width + text_width, + size.cy, max(height, tm.tmHeight)); DestroyWindow(hwnd); /* Image alignments when button has bitmap and text*/ @@ -1508,7 +1514,7 @@ static void test_bcm_get_ideal_size(void) for (j = 0; j < ARRAY_SIZE(aligns); j++) { style = BS_DEFPUSHBUTTON | default_style | aligns[i] | aligns[j]; - hwnd = CreateWindowA(WC_BUTTONA, "WWWW", style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); + hwnd = CreateWindowA(WC_BUTTONA, button_text, style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); ok(hwnd != NULL, "Expect hwnd not NULL\n"); SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hbmp); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); @@ -1517,25 +1523,25 @@ static void test_bcm_get_ideal_size(void) ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); if (!(style & (BS_CENTER | BS_VCENTER)) || ((style & BS_CENTER) && (style & BS_CENTER) != BS_CENTER) || !(style & BS_VCENTER) || (style & BS_VCENTER) == BS_VCENTER) - ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), + ok((size.cx >= image_width + text_width && size.cy >= max(height, tm.tmHeight)), "Style: 0x%08x expect ideal cx %d >= %d and ideal cy %d >= %d\n", style, size.cx, - width + 4 * tm.tmMaxCharWidth, size.cy, max(height, tm.tmHeight)); + image_width + text_width, size.cy, max(height, tm.tmHeight)); else - ok((size.cx >= max(4 * tm.tmMaxCharWidth, height) && size.cy >= height + tm.tmHeight), + ok((size.cx >= max(text_width, height) && size.cy >= height + tm.tmHeight), "Style: 0x%08x expect ideal cx %d >= %d and ideal cy %d >= %d\n", style, size.cx, - max(4 * tm.tmMaxCharWidth, height), size.cy, height + tm.tmHeight); + max(text_width, height), size.cy, height + tm.tmHeight); DestroyWindow(hwnd); } /* Image list alignments */ - himl = pImageList_Create(width, height, ILC_COLOR, 1, 1); + himl = pImageList_Create(image_width, height, ILC_COLOR, 1, 1); pImageList_Add(himl, hbmp, 0); biml.himl = himl; for (i = 0; i < ARRAY_SIZE(imagelist_aligns); i++) { biml.uAlign = imagelist_aligns[i]; - hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_DEFPUSHBUTTON | default_style, 0, 0, client_width, client_height, - NULL, NULL, 0, NULL); + hwnd = CreateWindowA(WC_BUTTONA, button_text, BS_DEFPUSHBUTTON | default_style, 0, 0, client_width, + client_height, NULL, NULL, 0, NULL); ok(hwnd != NULL, "Expect hwnd not NULL\n"); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); SendMessageA(hwnd, BCM_SETIMAGELIST, 0, (LPARAM)&biml); @@ -1543,16 +1549,16 @@ static void test_bcm_get_ideal_size(void) ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); if (biml.uAlign == BUTTON_IMAGELIST_ALIGN_TOP || biml.uAlign == BUTTON_IMAGELIST_ALIGN_BOTTOM) - ok((size.cx >= max(4 * tm.tmMaxCharWidth, height) && size.cy >= height + tm.tmHeight), + ok((size.cx >= max(text_width, height) && size.cy >= height + tm.tmHeight), "Align:%d expect ideal cx %d >= %d and ideal cy %d >= %d\n", biml.uAlign, size.cx, - max(4 * tm.tmMaxCharWidth, height), size.cy, height + tm.tmHeight); + max(text_width, height), size.cy, height + tm.tmHeight); else if (biml.uAlign == BUTTON_IMAGELIST_ALIGN_LEFT || biml.uAlign == BUTTON_IMAGELIST_ALIGN_RIGHT) - ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), + ok((size.cx >= image_width + text_width && size.cy >= max(height, tm.tmHeight)), "Align:%d expect ideal cx %d >= %d and ideal cy %d >= %d\n", biml.uAlign, size.cx, - width + 4 * tm.tmMaxCharWidth, size.cy, max(height, tm.tmHeight)); + image_width + text_width, size.cy, max(height, tm.tmHeight)); else - ok(size.cx >= width && size.cy >= height, "Align:%d expect ideal cx %d >= %d and ideal cy %d >= %d\n", - biml.uAlign, size.cx, width, size.cy, height); + ok(size.cx >= image_width && size.cy >= height, "Align:%d expect ideal cx %d >= %d and ideal cy %d >= %d\n", + biml.uAlign, size.cx, image_width, size.cy, height); DestroyWindow(hwnd); } @@ -1565,7 +1571,7 @@ static void test_bcm_get_ideal_size(void) hicon = CreateIconIndirect(&icon_info); /* Only icon, ideal size should be enough for image and text */ - hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_DEFPUSHBUTTON | BS_ICON | default_style, 0, 0, client_width, + hwnd = CreateWindowA(WC_BUTTONA, button_text, BS_DEFPUSHBUTTON | BS_ICON | default_style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); ok(hwnd != NULL, "Expect hwnd not NULL\n"); SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hicon); @@ -1574,44 +1580,44 @@ static void test_bcm_get_ideal_size(void) ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); /* Ideal size contains text rect even show icons only */ - ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), - "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, width + 4 * tm.tmMaxCharWidth, size.cy, + ok((size.cx >= image_width + text_width && size.cy >= max(height, tm.tmHeight)), + "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, image_width + text_width, size.cy, max(height, tm.tmHeight)); DestroyWindow(hwnd); /* Show icon and text */ - hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_DEFPUSHBUTTON | default_style, 0, 0, client_width, client_height, NULL, - NULL, 0, NULL); + hwnd = CreateWindowA(WC_BUTTONA, button_text, BS_DEFPUSHBUTTON | default_style, 0, 0, client_width, + client_height, NULL, NULL, 0, NULL); ok(hwnd != NULL, "Expect hwnd not NULL\n"); SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hicon); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); ZeroMemory(&size, sizeof(size)); ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); - ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), - "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, width + 4 * tm.tmMaxCharWidth, size.cy, + ok((size.cx >= image_width + text_width && size.cy >= max(height, tm.tmHeight)), + "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, image_width + text_width, size.cy, max(height, tm.tmHeight)); DestroyWindow(hwnd); /* Checkbox */ /* Both bitmap and text for checkbox, ideal size is only enough for text because it doesn't support image(but not image list)*/ - hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_AUTOCHECKBOX | default_style, 0, 0, client_width, client_height, NULL, - NULL, 0, NULL); + hwnd = CreateWindowA(WC_BUTTONA, button_text, BS_AUTOCHECKBOX | default_style, 0, 0, client_width, client_height, + NULL, NULL, 0, NULL); ok(hwnd != NULL, "Expect hwnd not NULL\n"); SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hbmp); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); ZeroMemory(&size, sizeof(size)); ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); - ok((size.cx <= width + 4 * tm.tmMaxCharWidth && size.cx >= 4 * tm.tmMaxCharWidth - && size.cy <= max(height, tm.tmHeight) && size.cy >= tm.tmHeight), + ok((size.cx <= image_width + text_width && size.cx >= text_width && size.cy <= max(height, tm.tmHeight) + && size.cy >= tm.tmHeight), "Expect ideal cx %d within range (%d, %d ) and ideal cy %d within range (%d, %d )\n", size.cx, - 4 * tm.tmMaxCharWidth, width + 4 * tm.tmMaxCharWidth, size.cy, tm.tmHeight, max(height, tm.tmHeight)); + text_width, image_width + text_width, size.cy, tm.tmHeight, max(height, tm.tmHeight)); DestroyWindow(hwnd); /* Both image list and text for checkbox, ideal size should have enough for image list and text */ biml.uAlign = BUTTON_IMAGELIST_ALIGN_LEFT; - hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_AUTOCHECKBOX | BS_BITMAP | default_style, 0, 0, client_width, + hwnd = CreateWindowA(WC_BUTTONA, button_text, BS_AUTOCHECKBOX | BS_BITMAP | default_style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); ok(hwnd != NULL, "Expect hwnd not NULL\n"); SendMessageA(hwnd, BCM_SETIMAGELIST, 0, (LPARAM)&biml); @@ -1619,13 +1625,13 @@ static void test_bcm_get_ideal_size(void) ZeroMemory(&size, sizeof(size)); ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); - ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), - "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, width + 4 * tm.tmMaxCharWidth, size.cy, + ok((size.cx >= image_width + text_width && size.cy >= max(height, tm.tmHeight)), + "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, image_width + text_width, size.cy, max(height, tm.tmHeight)); DestroyWindow(hwnd); /* Only bitmap for checkbox, ideal size should have enough for image and text */ - hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_AUTOCHECKBOX | BS_BITMAP | default_style, 0, 0, client_width, + hwnd = CreateWindowA(WC_BUTTONA, button_text, BS_AUTOCHECKBOX | BS_BITMAP | default_style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); ok(hwnd != NULL, "Expect hwnd not NULL\n"); SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hbmp); @@ -1633,8 +1639,8 @@ static void test_bcm_get_ideal_size(void) ZeroMemory(&size, sizeof(size)); ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); - ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), - "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, width + 4 * tm.tmMaxCharWidth, size.cy, + ok((size.cx >= image_width + text_width && size.cy >= max(height, tm.tmHeight)), + "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, image_width + text_width, size.cy, max(height, tm.tmHeight)); DestroyWindow(hwnd); @@ -1673,7 +1679,7 @@ static void test_bcm_get_ideal_size(void) style = line_count > 1 ? type | BS_MULTILINE : type; style |= default_style; - hwnd = CreateWindowW(WC_BUTTONW, (line_count == 2 ? text2_w : text_w), style, 0, 0, client_width, + hwnd = CreateWindowA(WC_BUTTONA, (line_count == 2 ? button_text2 : button_text), style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); ok(hwnd != NULL, "Expect hwnd not NULL\n"); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); @@ -1696,11 +1702,9 @@ static void test_bcm_get_ideal_size(void) } else { - width = 0; height = line_count == 2 ? 2 * tm.tmHeight : tm.tmHeight; - ok(size.cx >= width && size.cy >= height, - "Style 0x%08x expect ideal cx %d >= %d and ideal cy %d >= %d\n", style, size.cx, width, size.cy, - height); + ok(size.cx >= 0 && size.cy >= height, "Style 0x%08x expect ideal cx %d >= 0 and ideal cy %d >= %d\n", + style, size.cx, size.cy, height); } DestroyWindow(hwnd); } -- 2.19.2

1 0

[PATCH] cryptui: Avoid an unneeded strlen() call.
by Francois Gouget Dec. 10, 2018

Dec. 10, 2018

--- There is obviously no issue with str being NULL (plus in the two call places right now this parameter cannot actually be NULL). dlls/cryptui/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index a1004192cf6..41938f5177b 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3497,7 +3497,7 @@ static void set_general_cert_properties(HWND hwnd, struct edit_cert_data *data) static void set_cert_string_property(PCCERT_CONTEXT cert, DWORD prop, LPWSTR str) { - if (str && strlenW(str)) + if (str && *str) { CRYPT_DATA_BLOB blob; -- 2.19.2

1 1

[PATCH] winetest: Tweak the wording of an error message.
by Francois Gouget Dec. 10, 2018

Dec. 10, 2018

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Tweaking this error message was suggested in Wine bug 43880 (but is not going to fix that issue). https://bugs.winehq.org/show_bug.cgi?id=43880 programs/winetest/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 56044095f3d..3d6cc660ec8 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1437,7 +1437,7 @@ int main( int argc, char *argv[] ) } if (failures > FAILURES_LIMIT) report( R_WARNING, - "%d tests failed, there's probably something broken with your setup.\n" + "%d tests failed. There is probably something broken with your setup.\n" "You need to address this before submitting results.", failures ); if (build_id[0] && nr_of_skips <= SKIP_LIMIT && failures <= FAILURES_LIMIT && -- 2.19.2

1 0

[PATCH] testbot: Add LibvirtDomain::HasSnapshot().
by Francois Gouget Dec. 10, 2018

Dec. 10, 2018

It is needed by WineRunReconfig.pl. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I forgot that this function is in another unsubmitted patch. This broke the build VM update. So I'm updating it to make sure the patches are tested against the current Wine. testbot/lib/WineTestBot/LibvirtDomain.pm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 8435793615..f1e2c8fcb9 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -176,6 +176,14 @@ sub _GetSnapshot($$) return (_eval_err() || "Snapshot '$SnapshotName' not found", undef, undef); } +sub HasSnapshot($$) +{ + my ($self, $SnapshotName) = @_; + + my ($ErrMessage, $Domain, $Snapshot) = $self->_GetSnapshot($SnapshotName); + return $ErrMessage ? 0 : 1; +} + sub GetSnapshotName($) { my ($self) = @_; -- 2.19.2

1 0

[PATCH 1/2] winebus.sys: Raise priority of device threads.
by Kai Krakow Dec. 10, 2018

Dec. 10, 2018

This potentially reduces lag and makes the input device initialization faster under CPU load. Signed-off-by: Kai Krakow <kai(a)kaishome.de> --- dlls/winebus.sys/bus_iohid.c | 1 + dlls/winebus.sys/bus_sdl.c | 2 ++ dlls/winebus.sys/bus_udev.c | 9 +++++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 95077ac0be2..b4f7dabb153 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -410,6 +410,7 @@ NTSTATUS WINAPI iohid_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registr return STATUS_UNSUCCESSFUL; } + SetThreadPriority(run_loop_handle, THREAD_PRIORITY_TIME_CRITICAL); return STATUS_SUCCESS; } diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 5cf5dddaf05..41f203f6e36 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -976,6 +976,8 @@ NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_ goto error; } + SetThreadPriority(events[1], THREAD_PRIORITY_TIME_CRITICAL); + result = WaitForMultipleObjects(2, events, FALSE, INFINITE); CloseHandle(events[0]); CloseHandle(events[1]); diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 64b245e630d..10b79dcc6b1 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -795,8 +795,9 @@ static NTSTATUS begin_report_processing(DEVICE_OBJECT *device) close(private->control_pipe[1]); return STATUS_UNSUCCESSFUL; } - else - return STATUS_SUCCESS; + + SetThreadPriority(private->report_thread, THREAD_PRIORITY_TIME_CRITICAL); + return STATUS_SUCCESS; } static NTSTATUS hidraw_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) @@ -1006,6 +1007,8 @@ static NTSTATUS lnxev_begin_report_processing(DEVICE_OBJECT *device) close(private->base.control_pipe[1]); return STATUS_UNSUCCESSFUL; } + + SetThreadPriority(private->base.report_thread, THREAD_PRIORITY_TIME_CRITICAL); return STATUS_SUCCESS; } @@ -1462,6 +1465,8 @@ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry goto error; } + SetThreadPriority(events[1], THREAD_PRIORITY_TIME_CRITICAL); + result = WaitForMultipleObjects(2, events, FALSE, INFINITE); CloseHandle(events[0]); CloseHandle(events[1]); -- 2.19.2

2 3

[PATCH 1/3] riched20: Extract handling of VK_RETURN into a method
by Fabian Maurer Dec. 10, 2018

Dec. 10, 2018

This is basically a no-op to make the following fix simpler Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/riched20/editor.c | 322 +++++++++++++++++++++-------------------- 1 file changed, 168 insertions(+), 154 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 99c87bf61d..9142fd917d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2427,6 +2427,171 @@ static void ME_UpdateSelectionLinkAttribute(ME_TextEditor *editor) ME_UpdateLinkAttribute(editor, &start, nChars); } +static INT handle_enter(ME_TextEditor *editor) +{ + BOOL ctrl_is_down = GetKeyState(VK_CONTROL) & 0x8000; + BOOL shift_is_down = GetKeyState(VK_SHIFT) & 0x8000; + + if (editor->bDialogMode) + { + if (ctrl_is_down) + return TRUE; + + if (!(editor->styleFlags & ES_WANTRETURN)) + { + if (editor->hwndParent) + { + DWORD dw; + dw = SendMessageW(editor->hwndParent, DM_GETDEFID, 0, 0); + if (HIWORD(dw) == DC_HASDEFID) + { + HWND hwDefCtrl = GetDlgItem(editor->hwndParent, LOWORD(dw)); + if (hwDefCtrl) + { + SendMessageW(editor->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwDefCtrl, TRUE); + PostMessageW(hwDefCtrl, WM_KEYDOWN, VK_RETURN, 0); + } + } + } + return TRUE; + } + } + + if (editor->styleFlags & ES_MULTILINE) + { + static const WCHAR endl = '\r'; + static const WCHAR endlv10[] = {'\r','\n'}; + ME_Cursor cursor = editor->pCursors[0]; + ME_DisplayItem *para = cursor.pPara; + int from, to; + ME_Style *style, *eop_style; + + if (editor->styleFlags & ES_READONLY) + { + MessageBeep(MB_ICONERROR); + return TRUE; + } + + ME_GetSelectionOfs(editor, &from, &to); + if (editor->nTextLimit > ME_GetTextLength(editor) - (to-from)) + { + if (!editor->bEmulateVersion10) { /* v4.1 */ + if (para->member.para.nFlags & MEPF_ROWEND) { + /* Add a new table row after this row. */ + para = ME_AppendTableRow(editor, para); + para = para->member.para.next_para; + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_CommitUndo(editor); + ME_CheckTablesForCorruption(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + else if (para == editor->pCursors[1].pPara && + cursor.nOffset + cursor.pRun->member.run.nCharOfs == 0 && + para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART && + !para->member.para.prev_para->member.para.nCharOfs) + { + /* Insert a newline before the table. */ + para = para->member.para.prev_para; + para->member.para.nFlags &= ~MEPF_ROWSTART; + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[1] = editor->pCursors[0]; + ME_InsertTextFromCursor(editor, 0, &endl, 1, + editor->pCursors[0].pRun->member.run.style); + para = editor->pBuffer->pFirst->member.para.next_para; + ME_SetDefaultParaFormat(editor, &para->member.para.fmt); + para->member.para.nFlags = 0; + mark_para_rewrap(editor, para); + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[1] = editor->pCursors[0]; + para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; + ME_CommitCoalescingUndo(editor); + ME_CheckTablesForCorruption(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + } else { /* v1.0 - 3.0 */ + ME_DisplayItem *para = cursor.pPara; + if (ME_IsInTable(para)) + { + if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) + { + if (from == to) { + ME_ContinueCoalescingTransaction(editor); + para = ME_AppendTableRow(editor, para); + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_CommitCoalescingUndo(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + } else { + ME_ContinueCoalescingTransaction(editor); + if (cursor.pRun->member.run.nCharOfs + cursor.nOffset == 0 && + !ME_IsInTable(para->member.para.prev_para)) + { + /* Insert newline before table */ + cursor.pRun = ME_FindItemBack(para, diRun); + if (cursor.pRun) { + editor->pCursors[0].pRun = cursor.pRun; + editor->pCursors[0].pPara = para->member.para.prev_para; + } + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_InsertTextFromCursor(editor, 0, &endl, 1, + editor->pCursors[0].pRun->member.run.style); + } else { + editor->pCursors[1] = editor->pCursors[0]; + para = ME_AppendTableRow(editor, para); + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + } + ME_CommitCoalescingUndo(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + } + } + + style = ME_GetInsertStyle(editor, 0); + + /* Normally the new eop style is the insert style, however in a list it is copied from the existing + eop style (this prevents the list label style changing when the new eop is inserted). + No extra ref is taken here on eop_style. */ + if (para->member.para.fmt.wNumbering) + eop_style = para->member.para.eop_run->style; + else + eop_style = style; + ME_ContinueCoalescingTransaction(editor); + if (shift_is_down) + ME_InsertEndRowFromCursor(editor, 0); + else + if (!editor->bEmulateVersion10) + ME_InsertTextFromCursor(editor, 0, &endl, 1, eop_style); + else + ME_InsertTextFromCursor(editor, 0, endlv10, 2, eop_style); + ME_CommitCoalescingUndo(editor); + SetCursor(NULL); + + ME_UpdateSelectionLinkAttribute(editor); + ME_UpdateRepaint(editor, FALSE); + ME_SaveTempStyle(editor, style); /* set the temp insert style for the new para */ + ME_ReleaseStyle(style); + } + return TRUE; + } + return -1; +} + static BOOL ME_KeyDown(ME_TextEditor *editor, WORD nKey) { @@ -2493,161 +2658,10 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) ME_SendRequestResize(editor, FALSE); return TRUE; case VK_RETURN: - if (editor->bDialogMode) { - if (ctrl_is_down) - return TRUE; - - if (!(editor->styleFlags & ES_WANTRETURN)) - { - if (editor->hwndParent) - { - DWORD dw; - dw = SendMessageW(editor->hwndParent, DM_GETDEFID, 0, 0); - if (HIWORD(dw) == DC_HASDEFID) - { - HWND hwDefCtrl = GetDlgItem(editor->hwndParent, LOWORD(dw)); - if (hwDefCtrl) - { - SendMessageW(editor->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwDefCtrl, TRUE); - PostMessageW(hwDefCtrl, WM_KEYDOWN, VK_RETURN, 0); - } - } - } - return TRUE; - } - } - - if (editor->styleFlags & ES_MULTILINE) - { - static const WCHAR endl = '\r'; - static const WCHAR endlv10[] = {'\r','\n'}; - ME_Cursor cursor = editor->pCursors[0]; - ME_DisplayItem *para = cursor.pPara; - int from, to; - ME_Style *style, *eop_style; - - if (editor->styleFlags & ES_READONLY) { - MessageBeep(MB_ICONERROR); - return TRUE; - } - - ME_GetSelectionOfs(editor, &from, &to); - if (editor->nTextLimit > ME_GetTextLength(editor) - (to-from)) - { - if (!editor->bEmulateVersion10) { /* v4.1 */ - if (para->member.para.nFlags & MEPF_ROWEND) { - /* Add a new table row after this row. */ - para = ME_AppendTableRow(editor, para); - para = para->member.para.next_para; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - ME_CommitUndo(editor); - ME_CheckTablesForCorruption(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - else if (para == editor->pCursors[1].pPara && - cursor.nOffset + cursor.pRun->member.run.nCharOfs == 0 && - para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART && - !para->member.para.prev_para->member.para.nCharOfs) - { - /* Insert a newline before the table. */ - para = para->member.para.prev_para; - para->member.para.nFlags &= ~MEPF_ROWSTART; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[1] = editor->pCursors[0]; - ME_InsertTextFromCursor(editor, 0, &endl, 1, - editor->pCursors[0].pRun->member.run.style); - para = editor->pBuffer->pFirst->member.para.next_para; - ME_SetDefaultParaFormat(editor, &para->member.para.fmt); - para->member.para.nFlags = 0; - mark_para_rewrap(editor, para); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[1] = editor->pCursors[0]; - para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; - ME_CommitCoalescingUndo(editor); - ME_CheckTablesForCorruption(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - } else { /* v1.0 - 3.0 */ - ME_DisplayItem *para = cursor.pPara; - if (ME_IsInTable(para)) - { - if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) - { - if (from == to) { - ME_ContinueCoalescingTransaction(editor); - para = ME_AppendTableRow(editor, para); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - ME_CommitCoalescingUndo(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - } else { - ME_ContinueCoalescingTransaction(editor); - if (cursor.pRun->member.run.nCharOfs + cursor.nOffset == 0 && - !ME_IsInTable(para->member.para.prev_para)) - { - /* Insert newline before table */ - cursor.pRun = ME_FindItemBack(para, diRun); - if (cursor.pRun) { - editor->pCursors[0].pRun = cursor.pRun; - editor->pCursors[0].pPara = para->member.para.prev_para; - } - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - ME_InsertTextFromCursor(editor, 0, &endl, 1, - editor->pCursors[0].pRun->member.run.style); - } else { - editor->pCursors[1] = editor->pCursors[0]; - para = ME_AppendTableRow(editor, para); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - } - ME_CommitCoalescingUndo(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - } - } - - style = ME_GetInsertStyle(editor, 0); - - /* Normally the new eop style is the insert style, however in a list it is copied from the existing - eop style (this prevents the list label style changing when the new eop is inserted). - No extra ref is taken here on eop_style. */ - if (para->member.para.fmt.wNumbering) - eop_style = para->member.para.eop_run->style; - else - eop_style = style; - ME_ContinueCoalescingTransaction(editor); - if (shift_is_down) - ME_InsertEndRowFromCursor(editor, 0); - else - if (!editor->bEmulateVersion10) - ME_InsertTextFromCursor(editor, 0, &endl, 1, eop_style); - else - ME_InsertTextFromCursor(editor, 0, endlv10, 2, eop_style); - ME_CommitCoalescingUndo(editor); - SetCursor(NULL); - - ME_UpdateSelectionLinkAttribute(editor); - ME_UpdateRepaint(editor, FALSE); - ME_SaveTempStyle(editor, style); /* set the temp insert style for the new para */ - ME_ReleaseStyle(style); - } - return TRUE; + INT result = handle_enter(editor); + if (result != -1) + return result; } break; case VK_ESCAPE: -- 2.19.2

2 7

[PATCH] testbot/web: Show the mission in the arguments column for Wine VMs.
by Francois Gouget Dec. 10, 2018

Dec. 10, 2018

When handling a patch Wine VMs don't take arguments except for the mission which specifies what they should do. Also a Wine VM may run multiple tasks only differing in their mission. So this helps identify what each task does. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 25 ++++++++++++++++++++++++- testbot/web/WineTestBot.css | 12 ++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 92f9d19721..1f77804be7 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -32,6 +32,7 @@ use URI::Escape; use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::LogUtils; +use WineTestBot::Missions; use WineTestBot::StepsTasks; use WineTestBot::Utils; use WineTestBot::Engine::Notify; @@ -92,7 +93,11 @@ sub GenerateHeaderCell($$$) my ($self, $CollectionBlock, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - if ($PropertyName eq "Ended") + if ($PropertyName eq "CmdLineArg") + { + print "<th>Arguments / <span class='MissionHeader'>Missions</span></th>\n"; + } + elsif ($PropertyName eq "Ended") { print "<th><a class='title' title='Execution ended'>Time</a></th>\n"; } @@ -589,6 +594,24 @@ sub GenerateDataCell($$$$$) $self->SUPER::GenerateDataCell($CollectionBlock, $StepTask, $PropertyDescriptor, $DetailsPage); } } + elsif ($PropertyName eq "CmdLineArg") + { + my $Args = $self->escapeHTML($StepTask->CmdLineArg); + if ($Args eq "" or $StepTask->VM->Type eq "wine") + { + $Args .= "<br>" if ($Args ne ""); + my ($ErrMessage, $Missions) = ParseMissionStatement($StepTask->Missions); + if (defined $ErrMessage) + { + $Args .= "<span class='Mission'>$ErrMessage</span>"; + } + else + { + $Args .= "<span class='Mission'>". $self->escapeHTML(GetTaskMissionDescription($Missions->[0], $StepTask->VM->Type)) ."</span>"; + } + } + print "<td>$Args</td>\n"; + } elsif ($PropertyName eq "Ended") { if (defined $StepTask->Ended) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index df683f863e..1456036c03 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -290,6 +290,18 @@ h2 font-style: italic; } +.MissionHeader +{ + font-size: small; + font-style: italic; +} + +.Mission +{ + font-size: small; + font-style: italic; + color: navy; +} .Screenshot { -- 2.19.2

1 0

[PATCH] testbot: The Job priority is really a niceness field.
by Francois Gouget Dec. 10, 2018

Dec. 10, 2018

Change the display name so it is shown as a niceness to make it clearer that higher values indicate a lower priority. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/index.pl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index e06f5154d7..4f1c191190 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -73,7 +73,11 @@ sub GenerateHeaderCell($$$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - if ($PropertyName eq "Ended") + if ($PropertyName eq "Priority") + { + print "<th><a class='title' title='Higher values indicate a lower priority'>Nice</a></th>\n"; + } + elsif ($PropertyName eq "Ended") { print "<th><a class='title' title='Ended'>Time</a></th>\n"; } -- 2.19.2

1 0

[PATCH] testbot: Sort VMs by name if they have the same role and sort order.
by Francois Gouget Dec. 10, 2018

Dec. 10, 2018

This makes it possible to add all locale VMs with the same SortOrder value and still have them displayed in a meaningful order. This also allows them to retain a meaningful order even as locales are added or removed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/VMs.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 6a08bc1aea..67705474e8 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -748,12 +748,14 @@ sub SortKeysBySortOrder($$) foreach my $Key (@$Keys) { my $Item = $self->GetItem($Key); - $SortOrder{$Key} = [$RoleOrders{$Item->Role} || 0, $Item->SortOrder]; + $SortOrder{$Key} = [$RoleOrders{$Item->Role} || 0, $Item->SortOrder, $Item->Name]; } my @SortedKeys = sort { my ($soa, $sob) = ($SortOrder{$a}, $SortOrder{$b}); - return @$soa[0] <=> @$sob[0] || @$soa[1] <=> @$sob[1]; + return @$soa[0] <=> @$sob[0] || + @$soa[1] <=> @$sob[1] || + @$soa[2] cmp @$sob[2]; } @$Keys; return \@SortedKeys; } -- 2.19.2

1 0

[PATCH] testbot/web: Fix showing the local job / task completion time.
by Francois Gouget Dec. 10, 2018

Dec. 10, 2018

The ShowDateTime() JavaScript call must be on its own line otherwise it's ignored. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 5 +++-- testbot/web/index.pl | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 1f77804be7..3e4f94d008 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -621,8 +621,9 @@ sub GenerateDataCell($$$$$) print "<td><a id='$TagId' class='title' title='", strftime("%Y/%m/%d %H:%M:%S", localtime($StepTask->Ended)), "'>", DurationToString($Duration), "</a>\n"; - print "<script type='text/javascript'></script>\n"; + print "<script type='text/javascript'></script>\n"; print "</td>\n"; } else diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 4f1c191190..39fea3e7a3 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -165,8 +165,9 @@ sub GenerateDataCell($$$$) print "<td><a id='$TagId' class='title' title='", strftime("%Y/%m/%d %H:%M:%S", localtime($Item->Ended)), "'>", DurationToString($Duration), "</a>\n"; - print "<script type='text/javascript'></script>\n"; + print "<script type='text/javascript'></script>\n"; print "</td>\n"; } else -- 2.19.2

1 0

[PATCH] testbot/WineRunReconfig: Don't fail if the idle snapshot does not exist.
by Francois Gouget Dec. 10, 2018

Dec. 10, 2018

This simplifies recovery if an error occurred in a previous run that resulted in the snapshot being deleted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index c903ae3695..11f92c8498 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -458,23 +458,28 @@ FatalTAError(undef, $TAError) if (defined $TAError); if ($NewStatus eq 'completed') { - Debug(Elapsed($Start), " Deleting the old ", $VM->IdleSnapshot, " snapshot\n"); - $ErrMessage = $VM->GetDomain()->RemoveSnapshot(); - if (defined $ErrMessage) + my $Domain = $VM->GetDomain(); + my $IdleSnapshot = $VM->IdleSnapshot; + if ($Domain->HasSnapshot($IdleSnapshot)) { - # It's not clear if the snapshot is still usable. Rather than try to figure - # it out now, let the next task deal with it. - FatalError("Could not remove the ". $VM->IdleSnapshot ." snapshot: $ErrMessage\n", "retry"); + Debug(Elapsed($Start), " Deleting the old $IdleSnapshot snapshot\n"); + $ErrMessage = $Domain->RemoveSnapshot(); + if (defined $ErrMessage) + { + # It's not clear if the snapshot is still usable. Rather than try to + # figure it out now, let the next task deal with it. + FatalError("Could not remove the $IdleSnapshot snapshot: $ErrMessage\n", "retry"); + } } - Debug(Elapsed($Start), " Recreating the ", $VM->IdleSnapshot, " snapshot\n"); - $ErrMessage = $VM->GetDomain()->CreateSnapshot(); + Debug(Elapsed($Start), " Recreating the $IdleSnapshot snapshot\n"); + $ErrMessage = $Domain->CreateSnapshot(); if (defined $ErrMessage) { # Without the snapshot the VM is not usable anymore but FatalError() will # just mark it as 'dirty'. It's only the next time it is used that the # problem will be noticed and that it will be taken offline. - FatalError("Could not recreate the ". $VM->IdleSnapshot ." snapshot: $ErrMessage\n"); + FatalError("Could not recreate the $IdleSnapshot snapshot: $ErrMessage\n"); } } -- 2.19.2

1 0

[PATCH resend 1/6] comctl32/listbox: Handle Mouse Wheel scrolling for multi-column listboxes properly
by Gabriel Ivăncescu Dec. 10, 2018

Dec. 10, 2018

Multi-column listboxes scroll horizontally, so each wheel tick must go an entire page at a time instead of an item at a time. But we have to limit the amount of scrolling in this case to avoid "jumping over" columns, if the window is too small. This matches Windows behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22253 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- These notes apply to all the patches in the series. The calculation has been simplified to just integer arithmetic in all cases, since the division (the only operation with a fractional result) was immediately truncated to integer anyway. Note that the float doesn't help with overflow either. As you can see, it gets assigned to cLineScroll (which is integer) and then gets multiplied back by WHEEL_DELTA, so if the float were to help with overflow, it would overflow on the next line anyway... Anyway, overflow is extremely unlikely (and probably impossible in practice) since WHEEL_DELTA is just 120, and it was already vulnerable to overflow currently. dlls/comctl32/listbox.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index cb645b4..9f56a2f 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2012,9 +2012,11 @@ static LRESULT LISTBOX_HandleHScroll( LB_DESCR *descr, WORD scrollReq, WORD pos static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) { - UINT pulScrollLines = 3; + INT pulScrollLines; + UINT tmp = 3; - SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); + SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &tmp, 0); + pulScrollLines = tmp; /* if scrolling changes direction, ignore left overs */ if ((delta < 0 && descr->wheel_remain < 0) || @@ -2025,10 +2027,21 @@ static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) if (descr->wheel_remain && pulScrollLines) { - int cLineScroll; - pulScrollLines = min((UINT) descr->page_size, pulScrollLines); - cLineScroll = pulScrollLines * (float)descr->wheel_remain / WHEEL_DELTA; - descr->wheel_remain -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + INT cLineScroll; + if (descr->style & LBS_MULTICOLUMN) + { + pulScrollLines = min((UINT)descr->width / descr->column_width, pulScrollLines); + pulScrollLines = max(1U, pulScrollLines); + cLineScroll = (pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (cLineScroll * WHEEL_DELTA) / pulScrollLines; + cLineScroll *= descr->page_size; + } + else + { + pulScrollLines = min((UINT)descr->page_size, pulScrollLines); + cLineScroll = (pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (cLineScroll * WHEEL_DELTA) / pulScrollLines; + } LISTBOX_SetTopItem( descr, descr->top_item - cLineScroll, TRUE ); } return 0; -- 2.19.1

2 8

[PATCH 3/5] wineps.drv: Add stubs for escapes required by Adobe PageMaker.
by Dmitry Timoshkov Dec. 10, 2018

Dec. 10, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/tests/dc.c | 7 ------- dlls/wineps.drv/escape.c | 41 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 3179c97e46..82cf200f4c 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1402,9 +1402,7 @@ static void print_something(HDC hdc) strcpy(buf, "deadbeef"); ret = ExtEscape(hdc, DOWNLOADHEADER, 0, NULL, sizeof(buf), buf ); -todo_wine ok(ret == 1, "DOWNLOADHEADER failed\n"); -todo_wine ok(strcmp(buf, "deadbeef") != 0, "DOWNLOADHEADER failed\n"); strcpy(buf + 2, "\n% ===> after DOWNLOADHEADER <===\n"); @@ -1464,22 +1462,18 @@ static void test_pscript_printer_dc(void) query = DOWNLOADFACE; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "DOWNLOADFACE is not supported\n"); query = OPENCHANNEL; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "OPENCHANNEL is not supported\n"); query = DOWNLOADHEADER; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "DOWNLOADHEADER is not supported\n"); query = CLOSECHANNEL; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "CLOSECHANNEL is not supported\n"); query = POSTSCRIPT_PASSTHROUGH; @@ -1487,7 +1481,6 @@ todo_wine ok(ret == 1, "POSTSCRIPT_PASSTHROUGH is not supported\n"); ret = ExtEscape(hdc, GETFACENAME, 0, NULL, sizeof(buf), buf); -todo_wine ok(ret == 1, "GETFACENAME failed\n"); trace("face name: %s\n", buf); diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 43bbe18bb5..44d790b298 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -97,14 +97,55 @@ INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, case CLIP_TO_PATH: case END_PATH: /*case DRAWPATTERNRECT:*/ + + /* PageMaker checks for it */ + case DOWNLOADHEADER: + + /* PageMaker doesn't check for DOWNLOADFACE and GETFACENAME but + * uses them, they are supposed to be supported by any PS printer. + */ + case DOWNLOADFACE: + + /* PageMaker checks for these as a part of process of detecting + * a "fully compatible" PS printer, but doesn't actually use them. + */ + case OPENCHANNEL: + case CLOSECHANNEL: return TRUE; + /* Windows PS driver reports 0, but still supports this escape */ + case GETFACENAME: + return FALSE; /* suppress the FIXME below */ + default: FIXME("QUERYESCSUPPORT(%d) - not supported.\n", num); return FALSE; } } + case OPENCHANNEL: + FIXME("OPENCHANNEL: stub\n"); + return 1; + + case CLOSECHANNEL: + FIXME("CLOSECHANNEL: stub\n"); + return 1; + + case DOWNLOADHEADER: + FIXME("DOWNLOADHEADER: stub\n"); + /* should return name of the downloaded procset */ + *(char *)out_data = 0; + return 1; + + case GETFACENAME: + FIXME("GETFACENAME: stub\n"); + lstrcpynA(out_data, "Courier", cbOutput); + return 1; + + case DOWNLOADFACE: + FIXME("DOWNLOADFACE: stub\n"); + return 1; + case MFCOMMENT: { FIXME("MFCOMMENT(%p, %d)\n", in_data, cbInput); -- 2.19.2

2 1

[PATCH 2/5] gdi32: Trace full contents of DOCINFO in StartDoc.
by Dmitry Timoshkov Dec. 10, 2018

Dec. 10, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/printdrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index 3cfdc477e6..d2f4076746 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -72,9 +72,9 @@ INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc) INT ret; DC *dc = get_dc_ptr( hdc ); - TRACE("DocName = %s Output = %s Datatype = %s\n", + TRACE("DocName %s, Output %s, Datatype %s, fwType %#x\n", debugstr_w(doc->lpszDocName), debugstr_w(doc->lpszOutput), - debugstr_w(doc->lpszDatatype)); + debugstr_w(doc->lpszDatatype), doc->fwType); if(!dc) return SP_ERROR; -- 2.19.2

2 1

[PATCH 1/5] gdi32/tests: Add a simple test for printing to a PostScript device.
by Dmitry Timoshkov Dec. 10, 2018

Dec. 10, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/tests/dc.c | 124 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 123 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 5eec74a72c..3179c97e46 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -2,7 +2,7 @@ * Unit tests for dc functions * * Copyright (c) 2005 Huw Davies - * Copyright (c) 2005 Dmitry Timoshkov + * Copyright (c) 2005,2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1375,6 +1375,127 @@ static void test_printer_dc(void) DeleteObject( bmp ); } +static void print_something(HDC hdc) +{ + static const char psadobe[10] = "%!PS-Adobe"; + char buf[1024], *p; + char temp_path[MAX_PATH], file_name[MAX_PATH]; + DOCINFOA di; + DWORD ret; + HANDLE hfile; + + GetTempPathA(sizeof(temp_path), temp_path); + GetTempFileNameA(temp_path, "ps", 0, file_name); + + di.cbSize = sizeof(di); + di.lpszDocName = "Let's dance"; + di.lpszOutput = file_name; + di.lpszDatatype = NULL; + di.fwType = 0; + ret = StartDocA(hdc, &di); + ok(ret > 0, "StartDoc failed: %d\n", ret); + + strcpy(buf + 2, "\n% ===> before DOWNLOADHEADER <===\n"); + *(WORD *)buf = strlen(buf + 2); + ret = Escape(hdc, POSTSCRIPT_PASSTHROUGH, 0, buf, NULL); + ok(ret == *(WORD *)buf, "POSTSCRIPT_PASSTHROUGH failed: %d\n", ret); + + strcpy(buf, "deadbeef"); + ret = ExtEscape(hdc, DOWNLOADHEADER, 0, NULL, sizeof(buf), buf ); +todo_wine + ok(ret == 1, "DOWNLOADHEADER failed\n"); +todo_wine + ok(strcmp(buf, "deadbeef") != 0, "DOWNLOADHEADER failed\n"); + + strcpy(buf + 2, "\n% ===> after DOWNLOADHEADER <===\n"); + *(WORD *)buf = strlen(buf + 2); + ret = Escape(hdc, POSTSCRIPT_PASSTHROUGH, 0, buf, NULL); + ok(ret == *(WORD *)buf, "POSTSCRIPT_PASSTHROUGH failed: %d\n", ret); + + ret = EndDoc(hdc); + ok(ret == 1, "EndDoc failed\n"); + + hfile = CreateFileA(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + memset(buf, 0, sizeof(buf)); + ret = ReadFile(hfile, buf, sizeof(buf), &ret, NULL); + ok(ret, "ReadFile failed\n"); + CloseHandle(hfile); + + /* skip the HP PCL language selector */ + buf[sizeof(buf) - 1] = 0; + p = buf; + while (*p) + { + if (!(p[0] == 0x1b && p[1] == '%') && memcmp(p, "@PJL", 4) != 0) + break; + + p = strchr(p, '\n'); + if (!p) break; + + while (*p == '\r' || *p == '\n') p++; + } +todo_wine + ok(p && !memcmp(p, psadobe, sizeof(psadobe)), "wrong signature: %.14s\n", p ? p : buf); + + DeleteFileA(file_name); +} + +static void test_pscript_printer_dc(void) +{ + HDC hdc; + char buf[256]; + DWORD query, ret; + + hdc = create_printer_dc(100, FALSE); + + if (!hdc) return; + + if (!is_postscript_printer(hdc)) + { + skip("Default printer is not a PostScript device\n"); + DeleteDC( hdc ); + return; + } + + query = GETFACENAME; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); + ok(!ret, "GETFACENAME is supported\n"); + + query = DOWNLOADFACE; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); +todo_wine + ok(ret == 1, "DOWNLOADFACE is not supported\n"); + + query = OPENCHANNEL; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); +todo_wine + ok(ret == 1, "OPENCHANNEL is not supported\n"); + + query = DOWNLOADHEADER; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); +todo_wine + ok(ret == 1, "DOWNLOADHEADER is not supported\n"); + + query = CLOSECHANNEL; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); +todo_wine + ok(ret == 1, "CLOSECHANNEL is not supported\n"); + + query = POSTSCRIPT_PASSTHROUGH; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); + ok(ret == 1, "POSTSCRIPT_PASSTHROUGH is not supported\n"); + + ret = ExtEscape(hdc, GETFACENAME, 0, NULL, sizeof(buf), buf); +todo_wine + ok(ret == 1, "GETFACENAME failed\n"); + trace("face name: %s\n", buf); + + print_something(hdc); + + DeleteDC(hdc); +} + START_TEST(dc) { pSetLayout = (void *)GetProcAddress( GetModuleHandleA("gdi32.dll"), "SetLayout"); @@ -1389,4 +1510,5 @@ START_TEST(dc) test_desktop_colorres(); test_gamma(); test_printer_dc(); + test_pscript_printer_dc(); } -- 2.19.2

2 1