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

[PATCH v4 2/3] comctl32/status: Hide size grip when the parent window is maximized.
by Waritnan Sookbuntherng Dec. 10, 2018

Dec. 10, 2018

Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> --- v4: Update test. --- dlls/comctl32/status.c | 6 ++++-- dlls/comctl32/tests/status.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index cb27ee868c..3bf72fa577 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -284,7 +284,8 @@ STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc) SelectObject (hdc, hOldFont); - if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE)) STATUSBAR_DrawSizeGrip (theme, hdc, &rect); return 0; @@ -997,7 +998,8 @@ STATUSBAR_WMGetText (const STATUS_INFO *infoPtr, INT size, LPWSTR buf) static BOOL STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y) { - if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) { + if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE)) { RECT rect; POINT pt; diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 00db9f6737..b7b5fb273e 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -682,7 +682,7 @@ static void test_sizegrip(void) r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); expect(HTNOWHERE, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom - 1)); - todo_wine expect(HTCLIENT, r); + expect(HTCLIENT, r); /* maximized with right-to-left */ SetWindowLongA(hwndStatus, GWL_EXSTYLE, WS_EX_LAYOUTRTL); @@ -705,7 +705,7 @@ static void test_sizegrip(void) r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); expect(HTNOWHERE, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom - 1)); - todo_wine expect(HTCLIENT, r); + expect(HTCLIENT, r); SetWindowLongA(g_hMainWnd, GWL_STYLE, style); DestroyWindow(hwndStatus); -- 2.19.1

1 0

[PATCH v4 3/3] comctl32/status: Checking size grip bounds in x-axis only.
by Waritnan Sookbuntherng Dec. 10, 2018

Dec. 10, 2018

Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> --- v2: Add this commit for checking bounds inclusively. v3: Determine bounds using x-axis only. v4: Update test. --- dlls/comctl32/status.c | 5 +---- dlls/comctl32/tests/status.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 3bf72fa577..6ea7d9e997 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -1009,10 +1009,7 @@ STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y) pt.y = y; ScreenToClient (infoPtr->Self, &pt); - rect.left = rect.right - 13; - rect.top += 2; - - if (PtInRect (&rect, pt)) + if (pt.x >= rect.right - GetSystemMetrics(SM_CXVSCROLL)) { if (GetWindowLongW( infoPtr->Self, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) return HTBOTTOMLEFT; else return HTBOTTOMRIGHT; diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index b7b5fb273e..c7d9989218 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -615,17 +615,17 @@ static void test_sizegrip(void) /* check bounds when not maximized */ r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left - 1, rc.top)); expect(HTCLIENT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom - 1)); expect(HTBOTTOMRIGHT, r); @@ -638,17 +638,17 @@ static void test_sizegrip(void) rc.right = pt.x; r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left + 1, rc.top)); expect(HTCLIENT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom - 1)); expect(HTBOTTOMLEFT, r); -- 2.19.1

1 0

[PATCH v4 1/3] comctl32/tests: Test status bar size grip behavior and bounds.
by Waritnan Sookbuntherng Dec. 10, 2018

Dec. 10, 2018

Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> --- v2: Add tests. v3: Cover more points. v4: Remove unused leftover uxtheme include and remove macros from the test. --- dlls/comctl32/tests/status.c | 126 +++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index d78bd20262..00db9f6737 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -586,6 +586,131 @@ static void test_notify(void) ok(g_got_contextmenu, "WM_RBUTTONUP did not activate the context menu!\n"); } +static void test_sizegrip(void) +{ + HWND hwndStatus; + LONG style; + RECT rc, rcClient; + POINT pt; + int width, r; + + hwndStatus = CreateWindowA(SUBCLASS_NAME, "", WS_CHILD|WS_VISIBLE|SBARS_SIZEGRIP, + 0, 0, 100, 100, g_hMainWnd, NULL, NULL, NULL); + + style = GetWindowLongPtrA(g_hMainWnd, GWL_STYLE); + width = GetSystemMetrics(SM_CXVSCROLL); + + GetClientRect(hwndStatus, &rcClient); + + pt.x = rcClient.right; + pt.y = rcClient.top; + ClientToScreen(hwndStatus, &pt); + rc.left = pt.x - width; + rc.right = pt.x; + rc.top = pt.y; + + pt.y = rcClient.bottom; + ClientToScreen(hwndStatus, &pt); + rc.bottom = pt.y; + + /* check bounds when not maximized */ + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); + todo_wine expect(HTBOTTOMRIGHT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left - 1, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); + todo_wine expect(HTBOTTOMRIGHT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); + todo_wine expect(HTBOTTOMRIGHT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom)); + todo_wine expect(HTBOTTOMRIGHT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); + todo_wine expect(HTBOTTOMRIGHT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom - 1)); + expect(HTBOTTOMRIGHT, r); + + /* not maximized and right-to-left */ + SetWindowLongA(hwndStatus, GWL_EXSTYLE, WS_EX_LAYOUTRTL); + + pt.x = rcClient.right; + ClientToScreen(hwndStatus, &pt); + rc.left = pt.x + width; + rc.right = pt.x; + + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); + todo_wine expect(HTBOTTOMLEFT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left + 1, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); + todo_wine expect(HTBOTTOMLEFT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); + todo_wine expect(HTBOTTOMLEFT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom)); + todo_wine expect(HTBOTTOMLEFT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); + todo_wine expect(HTBOTTOMLEFT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom - 1)); + expect(HTBOTTOMLEFT, r); + + /* maximize with left-to-right */ + SetWindowLongA(g_hMainWnd, GWL_STYLE, style|WS_MAXIMIZE); + SetWindowLongA(hwndStatus, GWL_EXSTYLE, 0); + + GetClientRect(hwndStatus, &rcClient); + + pt.x = rcClient.right; + pt.y = rcClient.top; + ClientToScreen(hwndStatus, &pt); + rc.left = pt.x - width; + rc.right = pt.x; + rc.top = pt.y; + + pt.y = rcClient.bottom; + ClientToScreen(hwndStatus, &pt); + rc.bottom = pt.y; + + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left - 1, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom - 1)); + todo_wine expect(HTCLIENT, r); + + /* maximized with right-to-left */ + SetWindowLongA(hwndStatus, GWL_EXSTYLE, WS_EX_LAYOUTRTL); + + pt.x = rcClient.right; + ClientToScreen(hwndStatus, &pt); + rc.left = pt.x + width; + rc.right = pt.x; + + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left + 1, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom - 1)); + todo_wine expect(HTCLIENT, r); + + SetWindowLongA(g_hMainWnd, GWL_STYLE, style); + DestroyWindow(hwndStatus); +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -620,4 +745,5 @@ START_TEST(status) test_status_ownerdraw(); test_gettext(); test_notify(); + test_sizegrip(); } -- 2.19.1

1 0

[PATCH] riched32: On VK_RETURN don't add newline into text
by Fabian Maurer Dec. 9, 2018

Dec. 9, 2018

This fixes an old regression when VK_RETURN handling was implemented Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=23282 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/riched20/editor.c | 2 -- dlls/riched20/tests/editor.c | 19 +++++++++++++++++++ dlls/riched32/tests/editor.c | 19 +++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 99c87bf61d..a9956d5d2f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2637,8 +2637,6 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) 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); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 035869e134..b3e8c75fa4 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8920,6 +8920,24 @@ static void test_EM_SELECTIONTYPE(void) DestroyWindow(hwnd); } +static void test_VK_RETURN(void) +{ + HWND hwnd_richedit = new_richedit(NULL); + char buffer[100]; + GETTEXTEX gettex = {sizeof(buffer)}; + int len; + + SendMessageW(hwnd_richedit, WM_CHAR, 'T', 0); + SendMessageW(hwnd_richedit, WM_KEYDOWN, VK_RETURN, 0); + SendMessageW(hwnd_richedit, WM_CHAR, 'S', 0); + SendMessageW(hwnd_richedit, WM_KEYDOWN, VK_RETURN, 0); + + len = SendMessageA(hwnd_richedit, EM_GETTEXTEX, &gettex, buffer); + + ok(len == 4, "Got %d\n", len); + ok(strcmp(buffer, "T\rS\r") == 0, "Got %s\n", buffer); +} + START_TEST( editor ) { BOOL ret; @@ -8995,6 +9013,7 @@ START_TEST( editor ) test_eop_char_fmt(); test_para_numbering(); test_EM_SELECTIONTYPE(); + test_VK_RETURN(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging. diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 7751d2b402..8cb28fa773 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -1412,6 +1412,24 @@ static void test_EM_SETSEL(void) DestroyWindow(hwndRichEdit); } +static void test_VK_RETURN(void) +{ + HWND hwnd_richedit = new_richedit(NULL); + char buffer[100]; + GETTEXTEX gettex = {sizeof(buffer)}; + int len; + + SendMessageW(hwnd_richedit, WM_CHAR, 'T', 0); + SendMessageW(hwnd_richedit, WM_KEYDOWN, VK_RETURN, 0); + SendMessageW(hwnd_richedit, WM_CHAR, 'S', 0); + SendMessageW(hwnd_richedit, WM_KEYDOWN, VK_RETURN, 0); + + len = SendMessageA(hwnd_richedit, EM_GETTEXTEX, &gettex, buffer); + + ok(len == 2, "Got %d\n", len); + ok(strcmp(buffer, "TS") == 0, "Got %s\n", buffer); +} + START_TEST( editor ) { MSG msg; @@ -1440,6 +1458,7 @@ START_TEST( editor ) test_enter(); test_EM_EXSETSEL(); test_EM_SETSEL(); + test_VK_RETURN(); /* Set the environment variable WINETEST_RICHED32 to keep windows * responsive and open for 30 seconds. This is useful for debugging. -- 2.19.2

2 2

[PATCH] kernel32: Implement RaiseFailFastException
by André Hentschel Dec. 9, 2018

Dec. 9, 2018

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernel32/except.c | 35 +++++++++++++++++++++++++++++++++++ dlls/kernel32/kernel32.spec | 2 +- include/ntstatus.h | 1 + 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index c4f7fafabb6..ba195d92835 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -413,6 +413,41 @@ static inline BOOL check_resource_write( void *addr ) } +/******************************************************************* + * UnhandledExceptionFilter (KERNEL32.@) + */ +void WINAPI RaiseFailFastException(EXCEPTION_RECORD *record, CONTEXT *context, DWORD flags) +{ + EXCEPTION_RECORD rec; + CONTEXT ctx; + + if (!context) + { + ctx.ContextFlags = CONTEXT_FULL; + NtGetContextThread(GetCurrentThread(), &ctx); + context = &ctx; + } + + if (!record) + { + rec.ExceptionCode = STATUS_FAIL_FAST_EXCEPTION; + rec.ExceptionFlags = 0; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = RaiseFailFastException; + rec.NumberParameters = 0; + record = &rec; + } + + if (!NtCurrentTeb()->Peb->BeingDebugged) + { + EXCEPTION_POINTERS epointers; + + epointers.ExceptionRecord = record; + epointers.ContextRecord = context; + start_debugger_atomic(&epointers); + } +} + /******************************************************************* * UnhandledExceptionFilter (KERNEL32.@) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ae7bc886c51..31be1f59785 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1182,7 +1182,7 @@ @ stdcall QueueUserAPC(ptr long long) @ stdcall QueueUserWorkItem(ptr ptr long) @ stdcall RaiseException(long long long ptr) -# @ stub RaiseFailFastException +@ stdcall RaiseFailFastException(ptr ptr long) @ stdcall ReadConsoleA(long ptr long ptr ptr) @ stdcall ReadConsoleInputA(long ptr long ptr) @ stub ReadConsoleInputExA diff --git a/include/ntstatus.h b/include/ntstatus.h index 735b6c2c41c..d2f08af3283 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -939,6 +939,7 @@ #define STATUS_INVALID_TASK_INDEX ((NTSTATUS) 0xC0000501) #define STATUS_THREAD_ALREADY_IN_TASK ((NTSTATUS) 0xC0000502) #define STATUS_CALLBACK_BYPASS ((NTSTATUS) 0xC0000503) +#define STATUS_FAIL_FAST_EXCEPTION ((NTSTATUS) 0xC0000602) #define STATUS_PORT_CLOSED ((NTSTATUS) 0xC0000700) #define STATUS_MESSAGE_LOST ((NTSTATUS) 0xC0000701) #define STATUS_INVALID_MESSAGE ((NTSTATUS) 0xC0000702) -- 2.17.1

2 1

Wine staging 4.0-rc1 release
by Alistair Leslie-Hughes Dec. 8, 2018

Dec. 8, 2018

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 4.0-rc1 (805 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Upstreamed (Either directly from staging or fixed with a similar patch). * dxgi: Implement setting and querying the gamma value of an output. * gdi32/tests: Add some additional tests for ExtExtOut on a path for an EMF DC. * gdi32: ExtTextOut on a path with bitmap font selected shouldn't fail. * gdi32/tests: Explicitly test BeginPath() return value in the metafile path tests. * gdi32: Improve detection of symbol charset for old truetype fonts. * kernelbase: Add semi-stub for PathCchCombineEx. * ntdll: Add RtlAddGrowableFunctionTable stub. * ntdll: Add RtlGrowFunctionTable stub. * ntdll: Add stub for RtlGetUnloadEventTraceEx. * ntoskrnl.exe: Implement KeWaitForMultipleObjects(). * ntoskrnl.exe: Implement KeInitializeEvent(). * ntoskrnl.exe: Implement KeSetEvent(). * ntoskrnl.exe: Implement KeResetEvent(). * ntoskrnl.exe: Implement KeWaitForSingleObject(). * ntoskrnl.exe: Implement KeClearEvent(). * ntoskrnl.exe: Implement KeInitializeSemaphore(). * ntoskrnl.exe: Implement KeReleaseSemaphore() and waiting on semaphores. * ntoskrnl.exe: Implement KeInitializeMutex(). * ntoskrnl.exe: Implement KeReleaseMutex() and waiting on mutexes. * ntoskrnl.exe: Implement KeWaitForMutexObject(). * ntoskrnl.exe/tests: Add some tests for synchronization functions. * ntoskrnl.exe: Implement KeInitializeTimerEx(). * ntoskrnl.exe: Implement KeSetTimerEx() and waiting on timers. * ntoskrnl.exe: Implement KeCancelTimer(). * ntoskrnl.exe/tests: Add tests for waiting on timers. * ntoskrnl.exe: Implement KeDelayExecutionThread(). * oleaut32: Accept DISP_E_PARAMNOTFOUND for missing optional parameters in ITypeInfo::Invoke implementation. * user32: Move the auto radio button group logic from BM_SETCHECK to WM_LBUTTONUP handler. * user32/tests: Add a message test for group of radio buttons. * user32: Don't force a combobox repaint on WM_SIZE. * user32/tests: Simplify the test for BM_CLICK on autoradio button by using a dialog. * user32/tests: Add a test for navigating a group of buttons using keyboard events. * user32: Add support for navigating a group of radio buttons using a keyboard. * user32/tests: Add a focus test for an empty dialog that returns TRUE in WM_INITDIALOG. * user32: If there is no dialog controls to set focus to then set focus to dialog itself. * windowscodecs: Use V_UI1() instead of V_UNION() to assign a VT_UI1 variant member. * windowscodecs: Limit number of colors in a palette in BMP decoder. * windowscodecs: find_decoder() should return an error it received from the decoder. * windowscodecs: PNG decoder should return WINCODEC_ERR_UNKNOWNIMAGEFORMAT when image loading fails. * windowscodecs: Add registration for GUID_WICPixelFormat32bppGrayFloat pixel format. * windowscodecs: Implement IWICBitmapDecoder::GetMetadataQueryReader in the TIFF decoder. * windowscodecs: Improve stub for IWICBitmapDecoder::GetMetadataQueryReader in the PNG decoder. * windowscodecs/tests: Add some tests for IWICPalette::InitializeFromBitmap. * winhttp: Fix handling of Accept headers. * libs/wine: Do not restrict base address of main thread on 64 bit mac os. * loader: Implement preloader for Mac OS. Added * [45696] shell32: Generate icons from available icons if required. * [46215] user32: File Open Dialog fails to set focus to Filename text box Updated: * ddraw-Rendering_Targets * qwave-QOSCreateHandle * dwrite-FontFallback * winepulse-PulseAudio_Support Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] shell32: Avoid an unneeded strlenW() call.
by Francois Gouget Dec. 8, 2018

Dec. 8, 2018

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Note that command is a buffer and cannot be NULL. dlls/shell32/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index aca02d74888..28f2e36f9a7 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -736,7 +736,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, extension++; if (GetProfileStringW(wExtensions, extension, wszEmpty, command, ARRAY_SIZE(command)) > 0) { - if (strlenW(command) != 0) + if (*command) { strcpyW(lpResult, command); tok = strchrW(lpResult, '^'); /* should be ^.extension? */ -- 2.19.2

2 1

[PATCH] rpcrt4/tests: Make create_server_process() static.
by Francois Gouget Dec. 8, 2018

Dec. 8, 2018

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/rpcrt4/tests/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 587dc45333b..89cf514ea1e 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1973,7 +1973,7 @@ static void test_server_listening(void) ok(status == RPC_S_OK, "RpcStringFree\n"); } -HANDLE create_server_process(void) +static HANDLE create_server_process(void) { SECURITY_ATTRIBUTES sec_attr = { sizeof(sec_attr), NULL, TRUE }; HANDLE ready_event; -- 2.19.2

1 0

[PATCH] user32/tests: Make test_LoadImage_working_directory_run() static.
by Francois Gouget Dec. 8, 2018

Dec. 8, 2018

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/tests/cursoricon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 405856c77b7..323db82bc36 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1203,7 +1203,7 @@ static void create_ico_file(const char *filename, const test_icon_entries_t *tes HeapFree(GetProcessHeap(), 0, buf); } -void test_LoadImage_working_directory_run(char *path) +static void test_LoadImage_working_directory_run(char *path) { DWORD bytes_written; HANDLE handle; -- 2.19.2

1 0

[PATCH] dbghelp: Make symt_get_best_at() static.
by Francois Gouget Dec. 8, 2018

Dec. 8, 2018

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dbghelp/symbol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index c9585c5e714..96a1f8743c4 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -851,7 +851,7 @@ static void symt_get_length(struct module* module, const struct symt* symt, ULON } /* neede by symt_find_nearest */ -int symt_get_best_at(struct module* module, int idx_sorttab) +static int symt_get_best_at(struct module* module, int idx_sorttab) { ULONG64 ref_addr; int idx_sorttab_orig = idx_sorttab; -- 2.19.2

1 0

[PATCH] wined3d: Use NULL instead of casting 0
by Michael Stefaniuc Dec. 7, 2018

Dec. 7, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index d4e7cf5b37..0b54d287f3 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -100,7 +100,7 @@ static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, s GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, query->buffer_object)); /* Read the same value twice. We know we have the result if map_ptr[0] == map_ptr[1]. */ - GL_EXTCALL(glGetQueryObjectui64v(id, GL_QUERY_RESULT, (void *)0)); + GL_EXTCALL(glGetQueryObjectui64v(id, GL_QUERY_RESULT, NULL)); GL_EXTCALL(glGetQueryObjectui64v(id, GL_QUERY_RESULT, (void *)sizeof(query->map_ptr[0]))); GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, 0)); checkGLcall("queue query result"); -- 2.19.2

2 2

[PATCH] ntoskrnl.exe/tests: Use NULL instead of casting 0
by Michael Stefaniuc Dec. 7, 2018

Dec. 7, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 17e54cd508..8f41d39747 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -435,7 +435,7 @@ static void test_sync(void) ok(ret == i - 9, "expected %d, got %d\n", i - 9, ret); } - run_thread(mutex_thread, (void *)0); + run_thread(mutex_thread, NULL); ret = wait_single(&test_mutex, 0); ok(ret == 0, "got %#x\n", ret); @@ -445,7 +445,7 @@ static void test_sync(void) ret = KeReleaseMutex(&test_mutex, 0); ok(ret == 0, "got %#x\n", ret); - run_thread(mutex_thread, (void *)0); + run_thread(mutex_thread, NULL); /* test timers */ KeInitializeTimerEx(&timer, NotificationTimer); -- 2.19.2

3 4

[PATCH] configure: Fix building of the preloader on the Mac using Xcode 10 or later.
by Ken Thomases Dec. 7, 2018

Dec. 7, 2018

The linker that comes with Xcode 10 requires that libSystem be linked for dynamic executables (those using dyld) unless -mmacosx-version-min=10.7 (or earlier) is used. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- This suggests that the future is grim for the approach taken for the Mac preloader. This is a stopgap measure. We've filed a bug with Apple asking that this capability be restored or, failing that, that they provide another way to do the address space reservations we need before system libraries can interfere. The alternative is to revert the Mac preloader implementation. configure.ac | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 08fbc3c..26fc392 100644 --- a/configure.ac +++ b/configure.ac @@ -717,6 +717,7 @@ wine_binary="wine" test "x$enable_win64" != "xyes" || wine_binary="wine64" AC_SUBST(WINELOADER_PROGRAMS,"$wine_binary") libwine_soversion=`expr $libwine_version : '$[[0-9]]*$\..*'` +wine_can_build_preloader=yes case $host_os in cygwin*|mingw32*) @@ -772,9 +773,20 @@ case $host_os in WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7c400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,wine_info.plist" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main], - [WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS"]) - WINE_TRY_CFLAGS([-Wl,-no_pie], - [WINEPRELOADER_LDFLAGS="-Wl,-no_pie $WINEPRELOADER_LDFLAGS"]) + [WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS" + WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -nostartfiles -nodefaultlibs],, + [WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs], + [WINEPRELOADER_LDFLAGS="-mmacosx-version-min=10.7 $WINEPRELOADER_LDFLAGS"], + [wine_can_build_preloader=no])])], + [WINE_TRY_CFLAGS([-nostartfiles -nodefaultlibs],, + [WINE_TRY_CFLAGS([-mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs], + [WINEPRELOADER_LDFLAGS="-mmacosx-version-min=10.7 $WINEPRELOADER_LDFLAGS"], + [wine_can_build_preloader=no])])]) + if test "$wine_can_build_preloader" = "yes" + then + WINE_TRY_CFLAGS([-Wl,-no_pie], + [WINEPRELOADER_LDFLAGS="-Wl,-no_pie $WINEPRELOADER_LDFLAGS"]) + fi if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" then @@ -2110,25 +2122,35 @@ case $build_os in cygwin*|mingw32*) AC_SUBST(TOOLSEXT,".exe") ;; esac +wine_want_preloader=no case $host_os in linux*) case $host_cpu in *i[[3456789]]86*|x86_64*|*aarch64*) - test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/wine-preloader") - WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader" + wine_want_preloader=yes ;; esac ;; darwin*|macosx*) case $host_cpu in *i[[3456789]]86*|x86_64*) - test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/wine-preloader") - WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader" + wine_want_preloader=yes ;; esac ;; esac +if test "$wine_want_preloader" = "yes" +then + if test "$wine_can_build_preloader" = "yes" + then + test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/wine-preloader") + WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader" + else + WINE_WARNING([can't build Wine preloader; many programs won't work]) + fi +fi + dnl **** Check for functions **** ac_save_CFLAGS="$CFLAGS" -- 2.10.2

1 0

[PATCH] shell32: Use SetRect() instead of open coding it
by Michael Stefaniuc Dec. 7, 2018

Dec. 7, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/ebrowser.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 2d5a30aabb..637104c58d 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -314,9 +314,7 @@ static void update_layout(ExplorerBrowserImpl *This) if(navpane_width_actual) { - This->navpane.rc.left = This->navpane.rc.top = 0; - This->navpane.rc.right = navpane_width_actual; - This->navpane.rc.bottom = rc.bottom; + SetRect(&This->navpane.rc, 0, 0, navpane_width_actual, rc.bottom); if(!This->navpane.hwnd_splitter) initialize_navpane(This, This->hwnd_main, &This->navpane.rc); @@ -324,10 +322,8 @@ static void update_layout(ExplorerBrowserImpl *This) else ZeroMemory(&This->navpane.rc, sizeof(RECT)); - This->sv_rc.left = navpane_width_actual; - This->sv_rc.top = 0; - This->sv_rc.right = This->sv_rc.left + shellview_width_actual; - This->sv_rc.bottom = rc.bottom; + SetRect(&This->sv_rc, navpane_width_actual, 0, navpane_width_actual + shellview_width_actual, + rc.bottom); } static void size_panes(ExplorerBrowserImpl *This) -- 2.19.2

1 0

[PATCH] wined3d: Use GL_LINEAR for unsupported filter types.
by Józef Kucia Dec. 7, 2018

Dec. 7, 2018

Linear filtering is a much more appropriate fallback for more advanced filtering types. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41929 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/surface.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 85f94899cd60..3441f018f417 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -169,16 +169,16 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 switch (filter) { - case WINED3D_TEXF_LINEAR: - gl_filter = GL_LINEAR; + case WINED3D_TEXF_NONE: + case WINED3D_TEXF_POINT: + gl_filter = GL_NEAREST; break; default: FIXME("Unsupported filter mode %s (%#x).\n", debug_d3dtexturefiltertype(filter), filter); /* fall through */ - case WINED3D_TEXF_NONE: - case WINED3D_TEXF_POINT: - gl_filter = GL_NEAREST; + case WINED3D_TEXF_LINEAR: + gl_filter = GL_LINEAR; break; } -- 2.19.2

3 3

[PATCH] d3dx9/tests: Use SetRectEmpty() instead of open coding it
by Michael Stefaniuc Dec. 7, 2018

Dec. 7, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/tests/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 91e458bbb8..fa874a5ef5 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -621,7 +621,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ok(height == tests[i].font_height, "Got unexpected height %u.\n", height); } - SetRect(&rect, 0, 0, 0, 0); + SetRectEmpty(&rect); height = ID3DXFont_DrawTextW(font, sprite, testW, size, &rect, DT_LEFT | DT_CALCRECT, 0xffffffff); todo_wine ok(height == tests[i].font_height, "Got unexpected height %u.\n", height); -- 2.19.2

2 1

[PATCH 2/2] secur32: Use VERS-ALL priority string only on recent gnutls versions.
by Jacek Caban Dec. 7, 2018

Dec. 7, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/secur32/schannel_gnutls.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)

1 0

[PATCH 1/2] secur32: Check for supported protocols when loading gnutls.
by Jacek Caban Dec. 7, 2018

Dec. 7, 2018

We mostly need to know if TLS1.3 is supported before attempting to handle it. It's just in gnutls backend now, so it will not be actually enabled yet. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/secur32/schannel_gnutls.c | 38 ++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-)

1 0

[PATCH] crypt32: If there is no optional parameters set rgProvParam to NULL in CRYPT_KEY_PROV_INFO.
by Dmitry Timoshkov Dec. 7, 2018

Dec. 7, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index e591c4dd45..2d4ce8c10c 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -533,14 +533,19 @@ void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info) provNameLen = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); data += provNameLen; - info->rgProvParam = (PCRYPT_KEY_PROV_PARAM)data; - data += info->cProvParam * sizeof(CRYPT_KEY_PROV_PARAM); - - for (i = 0; i < info->cProvParam; i++) + if (info->cProvParam) { - info->rgProvParam[i].pbData = data; - data += info->rgProvParam[i].cbData; + info->rgProvParam = (PCRYPT_KEY_PROV_PARAM)data; + data += info->cProvParam * sizeof(CRYPT_KEY_PROV_PARAM); + + for (i = 0; i < info->cProvParam; i++) + { + info->rgProvParam[i].pbData = data; + data += info->rgProvParam[i].cbData; + } } + else + info->rgProvParam = NULL; } BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, -- 2.19.2

1 0

[PATCH] secur32: Support older version of gnutls
by Alistair Leslie-Hughes Dec. 7, 2018

Dec. 7, 2018

Fixes a regression of 5cc5b102c1b0a66aa63b66f43f2da9a1a9d15ab6 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/secur32/schannel_gnutls.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 0a49421..57e6635 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -166,7 +166,11 @@ DWORD schan_imp_enabled_protocols(void) BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { gnutls_session_t *s = (gnutls_session_t*)session; +#if GNUTLS_VERSION_MAJOR < 3 + char priority[128] = "NORMAL:%LATEST_RECORD_VERSION", *p; +#else char priority[128] = "NORMAL:%LATEST_RECORD_VERSION:-VERS-ALL", *p; +#endif unsigned i; int err = pgnutls_init(s, cred->credential_use == SECPKG_CRED_INBOUND ? GNUTLS_SERVER : GNUTLS_CLIENT); -- 1.9.1

2 1

[PATCH 5/5] wineps.drv: PostScript header should be written by StartDoc instead of StartPage.
by Dmitry Timoshkov Dec. 7, 2018

Dec. 7, 2018

Otherwise a being created file has wrong signature if an application directly injects PostScript code. This patch fixes printing from Adobe PageMaker. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/tests/dc.c | 1 - dlls/wineps.drv/escape.c | 18 ++++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 82cf200f4c..2d9ef1dd88 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1433,7 +1433,6 @@ static void print_something(HDC hdc) 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); diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index db73c057ef..12967223ff 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -412,15 +412,14 @@ INT PSDRV_StartPage( PHYSDEV dev ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + TRACE("%p\n", dev->hdc); + if(!physDev->job.OutOfPage) { FIXME("Already started a page?\n"); return 1; } - if(physDev->job.PageNo++ == 0) { - if(!PSDRV_WriteHeader( dev, physDev->job.doc_name )) - return 0; - } + physDev->job.PageNo++; if(!PSDRV_WriteNewPage( dev )) return 0; @@ -436,6 +435,8 @@ INT PSDRV_EndPage( PHYSDEV dev ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + TRACE("%p\n", dev->hdc); + if(physDev->job.OutOfPage) { FIXME("Already ended a page?\n"); return 1; @@ -498,6 +499,13 @@ INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) ClosePrinter(physDev->job.hprinter); return 0; } + + if (!PSDRV_WriteHeader( dev, doc->lpszDocName )) { + WARN("Failed to write header\n"); + ClosePrinter(physDev->job.hprinter); + return 0; + } + physDev->job.banding = FALSE; physDev->job.OutOfPage = TRUE; physDev->job.PageNo = 0; @@ -516,6 +524,8 @@ INT PSDRV_EndDoc( PHYSDEV dev ) PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); INT ret = 1; + TRACE("%p\n", dev->hdc); + if(!physDev->job.id) { FIXME("hJob == 0. Now what?\n"); return 0; -- 2.19.2

1 0

[PATCH 4/5] wineps.drv: Add support for GETFACENAME and DOWNLOADFACE escapes.
by Dmitry Timoshkov Dec. 7, 2018

Dec. 7, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wineps.drv/download.c | 26 ++++++++++++++++++++++++++ dlls/wineps.drv/escape.c | 21 ++++++++++++++++++--- dlls/wineps.drv/psdrv.h | 1 + 3 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index dc77cf1170..86188d2b55 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -259,6 +259,32 @@ static BOOL is_fake_italic( HDC hdc ) return !(mac_style & 2); } +char *PSDRV_get_download_name(PHYSDEV dev, BOOL vertical) +{ + PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + char *ps_name; + LPOUTLINETEXTMETRICA potm; + DWORD len = GetOutlineTextMetricsA(dev->hdc, 0, NULL); + LOGFONTW lf; + + assert(physDev->font.fontloc == Download); + + if (!GetObjectW(GetCurrentObject(dev->hdc, OBJ_FONT), sizeof(lf), &lf)) + return NULL; + + potm = HeapAlloc(GetProcessHeap(), 0, len); + if (!potm) + return NULL; + + GetOutlineTextMetricsA(dev->hdc, len, potm); + + ps_name = NULL; + get_download_name(dev, potm, &ps_name, vertical); + HeapFree(GetProcessHeap(), 0, potm); + + return ps_name; +} + /**************************************************************************** * PSDRV_WriteSetDownloadFont * diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 44d790b298..db73c057ef 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -138,12 +138,27 @@ INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, return 1; case GETFACENAME: - FIXME("GETFACENAME: stub\n"); - lstrcpynA(out_data, "Courier", cbOutput); + if (physDev->font.fontloc == Download) + { + char *name = PSDRV_get_download_name(dev, physDev->font.set); + if (name) + { + TRACE("font name: %s\n", debugstr_a(name)); + lstrcpynA(out_data, name, cbOutput); + HeapFree(GetProcessHeap(), 0, name); + } + else + lstrcpynA(out_data, "Courier", cbOutput); + } + else + { + TRACE("font name: %s\n", debugstr_a(physDev->font.fontinfo.Builtin.afm->FontName)); + lstrcpynA(out_data, physDev->font.fontinfo.Builtin.afm->FontName, cbOutput); + } return 1; case DOWNLOADFACE: - FIXME("DOWNLOADFACE: stub\n"); + PSDRV_SetFont(dev, physDev->font.set); return 1; case MFCOMMENT: diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 9cbee65ed8..55f345b87f 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -553,6 +553,7 @@ extern BOOL PSDRV_SelectBuiltinFont(PHYSDEV dev, HFONT hfont, extern BOOL PSDRV_WriteSetBuiltinFont(PHYSDEV dev) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteBuiltinGlyphShow(PHYSDEV dev, LPCWSTR str, INT count) DECLSPEC_HIDDEN; +extern char *PSDRV_get_download_name(PHYSDEV dev, BOOL vertical) DECLSPEC_HIDDEN; extern BOOL PSDRV_SelectDownloadFont(PHYSDEV dev) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteSetDownloadFont(PHYSDEV dev, BOOL vertical) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteDownloadGlyphShow(PHYSDEV dev, const WORD *glyphs, UINT count) DECLSPEC_HIDDEN; -- 2.19.2

1 0

[PATCH 2/2] [v2] loader/wine.inf: Add MUI time zone name settings.
by Akihiro Sagawa Dec. 7, 2018

Dec. 7, 2018

In v2, fix broken patch output. This will fix https://bugs.winehq.org/show_bug.cgi?id=42719 after Japanese translation update. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ntdll/tests/time.c | 4 +- loader/wine.inf.in | 198 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 200 insertions(+), 2 deletions(-)

2 1

[PATCH 1/2] [v2] tzres: Add time zone name resource DLL.
by Akihiro Sagawa Dec. 7, 2018

Dec. 7, 2018

In v2, divide the previous patch into two parts. String IDs are based on SHA1 hash so that we can add another zone name without renumbering. I'm preparing a tool which generate these IDs and time zone information. I'll send it later. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- configure | 2 + configure.ac | 1 + dlls/tzres/Makefile.in | 2 + dlls/tzres/tzres.rc | 201 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/tzres/tzres.spec | 1 + 5 files changed, 207 insertions(+) create mode 100644 dlls/tzres/Makefile.in create mode 100644 dlls/tzres/tzres.rc create mode 100644 dlls/tzres/tzres.spec

1 0

[PATCH 9/9] windowscodecs: Add support for converting to 8bppIndexed format to IWICFormatConverter.
by Dmitry Timoshkov Dec. 7, 2018

Dec. 7, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/converter.c | 160 +++++++++++++++++++++++++++++---- 1 file changed, 143 insertions(+), 17 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 6e7bb8e781..8be36e2628 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -76,7 +76,7 @@ typedef struct FormatConverter { const struct pixelformatinfo *dst_format, *src_format; WICBitmapDitherType dither; double alpha_threshold; - WICBitmapPaletteType palette_type; + IWICPalette *palette; CRITICAL_SECTION lock; /* must be held when initialized */ } FormatConverter; @@ -1219,11 +1219,96 @@ static HRESULT copypixels_to_8bppGray(struct FormatConverter *This, const WICRec return hr; } +static UINT rgb_to_palette_index(BYTE r, BYTE g, BYTE b, WICColor *colors, UINT count) +{ + UINT best_diff, best_index, i; + + best_diff = ~0; + best_index = 0; + + for (i = 0; i < count; i++) + { + BYTE pal_r, pal_g, pal_b; + UINT diff_r, diff_g, diff_b, diff; + + pal_r = colors[i] >> 16; + pal_g = colors[i] >> 8; + pal_b = colors[i]; + + diff_r = r - pal_r; + diff_g = g - pal_g; + diff_b = b - pal_b; + + diff = diff_r * diff_r + diff_g * diff_g + diff_b * diff_b; + if (diff == 0) return i; + + if (diff < best_diff) + { + best_diff = diff; + best_index = i; + } + } + + return best_index; +} + +static HRESULT copypixels_to_8bppIndexed(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + HRESULT hr; + BYTE *srcdata; + WICColor colors[256]; + UINT srcstride, srcdatasize, count; + + if (source_format == format_8bppIndexed) + { + if (prc) + return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + + return S_OK; + } + + if (!This->palette) return WINCODEC_ERR_WRONGSTATE; + + hr = IWICPalette_GetColors(This->palette, 256, colors, &count); + if (hr != S_OK) return hr; + if (!count) return WINCODEC_ERR_WRONGSTATE; + + srcstride = 3 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + hr = copypixels_to_24bppBGR(This, prc, srcstride, srcdatasize, srcdata, source_format); + if (SUCCEEDED(hr) && prc) + { + INT x, y; + BYTE *src = srcdata, *dst = pbBuffer; + + for (y = 0; y < prc->Height; y++) + { + BYTE *bgr = src; + + for (x = 0; x < prc->Width; x++) + { + dst[x] = rgb_to_palette_index(bgr[2], bgr[1], bgr[0], colors, count); + bgr += 3; + } + src += srcstride; + dst += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + return hr; +} + static const struct pixelformatinfo supported_formats[] = { {format_1bppIndexed, &GUID_WICPixelFormat1bppIndexed, NULL}, {format_2bppIndexed, &GUID_WICPixelFormat2bppIndexed, NULL}, {format_4bppIndexed, &GUID_WICPixelFormat4bppIndexed, NULL}, - {format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, NULL}, + {format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, copypixels_to_8bppIndexed}, {format_BlackWhite, &GUID_WICPixelFormatBlackWhite, NULL}, {format_2bppGray, &GUID_WICPixelFormat2bppGray, NULL}, {format_4bppGray, &GUID_WICPixelFormat4bppGray, NULL}, @@ -1300,6 +1385,7 @@ static ULONG WINAPI FormatConverter_Release(IWICFormatConverter *iface) This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); if (This->source) IWICBitmapSource_Release(This->source); + if (This->palette) IWICPalette_Release(This->palette); HeapFree(GetProcessHeap(), 0, This); } @@ -1348,10 +1434,16 @@ static HRESULT WINAPI FormatConverter_GetResolution(IWICFormatConverter *iface, } static HRESULT WINAPI FormatConverter_CopyPalette(IWICFormatConverter *iface, - IWICPalette *pIPalette) + IWICPalette *palette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + FormatConverter *This = impl_from_IWICFormatConverter(iface); + + TRACE("(%p,%p)\n", iface, palette); + + if (!palette) return E_INVALIDARG; + if (!This->palette) return WINCODEC_ERR_WRONGSTATE; + + return IWICPalette_InitializeFromPalette(palette, This->palette); } static HRESULT WINAPI FormatConverter_CopyPixels(IWICFormatConverter *iface, @@ -1384,19 +1476,52 @@ static HRESULT WINAPI FormatConverter_CopyPixels(IWICFormatConverter *iface, } static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, - IWICBitmapSource *pISource, REFWICPixelFormatGUID dstFormat, WICBitmapDitherType dither, - IWICPalette *pIPalette, double alphaThresholdPercent, WICBitmapPaletteType paletteTranslate) + IWICBitmapSource *source, REFWICPixelFormatGUID dstFormat, WICBitmapDitherType dither, + IWICPalette *palette, double alpha_threshold, WICBitmapPaletteType palette_type) { FormatConverter *This = impl_from_IWICFormatConverter(iface); const struct pixelformatinfo *srcinfo, *dstinfo; - static INT fixme=0; GUID srcFormat; - HRESULT res=S_OK; + HRESULT res; + + TRACE("(%p,%p,%s,%u,%p,%0.3f,%u)\n", iface, source, debugstr_guid(dstFormat), + dither, palette, alpha_threshold, palette_type); + + if (!palette) + { + res = PaletteImpl_Create(&palette); + if (res != S_OK) return res; + + switch (palette_type) + { + case WICBitmapPaletteTypeCustom: + IWICPalette_Release(palette); + palette = NULL; + res = S_OK; + break; + + case WICBitmapPaletteTypeMedianCut: + { + UINT bpp; + res = get_pixelformat_bpp(dstFormat, &bpp); + if (res == S_OK && bpp <= 8) + res = IWICPalette_InitializeFromBitmap(palette, source, 1 << bpp, FALSE); + break; + } - TRACE("(%p,%p,%s,%u,%p,%0.1f,%u)\n", iface, pISource, debugstr_guid(dstFormat), - dither, pIPalette, alphaThresholdPercent, paletteTranslate); + default: + res = IWICPalette_InitializePredefined(palette, palette_type, FALSE); + break; + } - if (pIPalette && !fixme++) FIXME("ignoring palette\n"); + if (res != S_OK) + { + IWICPalette_Release(palette); + return res; + } + } + else + IWICPalette_AddRef(palette); EnterCriticalSection(&This->lock); @@ -1406,7 +1531,7 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, goto end; } - res = IWICBitmapSource_GetPixelFormat(pISource, &srcFormat); + res = IWICBitmapSource_GetPixelFormat(source, &srcFormat); if (FAILED(res)) goto end; srcinfo = get_formatinfo(&srcFormat); @@ -1427,13 +1552,13 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, if (dstinfo->copy_function) { - IWICBitmapSource_AddRef(pISource); + IWICBitmapSource_AddRef(source); This->src_format = srcinfo; This->dst_format = dstinfo; This->dither = dither; - This->alpha_threshold = alphaThresholdPercent; - This->palette_type = paletteTranslate; - This->source = pISource; + This->alpha_threshold = alpha_threshold; + This->palette = palette; + This->source = source; } else { @@ -1512,6 +1637,7 @@ HRESULT FormatConverter_CreateInstance(REFIID iid, void** ppv) This->IWICFormatConverter_iface.lpVtbl = &FormatConverter_Vtbl; This->ref = 1; This->source = NULL; + This->palette = NULL; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FormatConverter.lock"); -- 2.19.2

1 0

[PATCH 8/9] gdiplus/tests: Add some tests for GdipInitializePalette.
by Dmitry Timoshkov Dec. 7, 2018

Dec. 7, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdiplus/tests/image.c | 146 +++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index b31f32e1fa..2ec8cf57eb 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -34,6 +34,8 @@ static GpStatus (WINAPI *pGdipBitmapGetHistogramSize)(HistogramFormat,UINT*); static GpStatus (WINAPI *pGdipBitmapGetHistogram)(GpBitmap*,HistogramFormat,UINT,UINT*,UINT*,UINT*,UINT*); static GpStatus (WINAPI *pGdipImageSetAbort)(GpImage*,GdiplusAbort*); +static GpStatus (WINGDIPAPI *pGdipInitializePalette)(ColorPalette*,PaletteType,INT,BOOL,GpBitmap*); + #define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (UINT)(expected), (UINT)(got)) #define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got)) @@ -5339,6 +5341,149 @@ static void test_GdipLoadImageFromStream(void) IStream_Release(stream); } +static BYTE *init_bitmap(UINT *width, UINT *height, UINT *stride) +{ + BYTE *src; + UINT i, j, scale; + + *width = 256; + *height = 256; + *stride = (*width * 3 + 3) & ~3; + trace("width %d, height %d, stride %d\n", *width, *height, *stride); + + src = HeapAlloc(GetProcessHeap(), 0, *stride * *height); + + scale = 256 / *width; + if (!scale) scale = 1; + + for (i = 0; i < *height; i++) + { + for (j = 0; j < *width; j++) + { + src[i * *stride + j*3 + 0] = scale * i; + src[i * *stride + j*3 + 1] = scale * (255 - (i+j)/2); + src[i * *stride + j*3 + 2] = scale * j; + } + } + + return src; +} + +static void test_GdipInitializePalette(void) +{ + GpStatus status; + BYTE *data; + GpBitmap *bitmap; + ColorPalette *palette; + UINT width, height, stride; + + pGdipInitializePalette = (void *)GetProcAddress(GetModuleHandleA("gdiplus.dll"), "GdipInitializePalette"); + if (!pGdipInitializePalette) + { + win_skip("GdipInitializePalette is not supported on this platform\n"); + return; + } + + data = init_bitmap(&width, &height, &stride); + + status = GdipCreateBitmapFromScan0(width, height, stride, PixelFormat24bppRGB, data, &bitmap); + expect(Ok, status); + + palette = GdipAlloc(sizeof(*palette) + sizeof(ARGB) * 255); + + palette->Flags = 0; + palette->Count = 15; + status = pGdipInitializePalette(palette, PaletteTypeOptimal, 16, FALSE, bitmap); + expect(GenericError, status); + + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeOptimal, 16, FALSE, NULL); + expect(InvalidParameter, status); + + memset(palette->Entries, 0x11, sizeof(ARGB) * 256); + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeCustom, 16, FALSE, NULL); + expect(Ok, status); + expect(0, palette->Flags); + expect(256, palette->Count); + expect(0x11111111, palette->Entries[0]); + expect(0x11111111, palette->Entries[128]); + expect(0x11111111, palette->Entries[255]); + + memset(palette->Entries, 0x11, sizeof(ARGB) * 256); + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeFixedBW, 0, FALSE, bitmap); + expect(Ok, status); +todo_wine + expect(0x200, palette->Flags); + expect(2, palette->Count); + expect(0xff000000, palette->Entries[0]); + expect(0xffffffff, palette->Entries[1]); + + memset(palette->Entries, 0x11, sizeof(ARGB) * 256); + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeFixedHalftone8, 1, FALSE, NULL); + expect(Ok, status); +todo_wine + expect(0x300, palette->Flags); + expect(16, palette->Count); + expect(0xff000000, palette->Entries[0]); + expect(0xffc0c0c0, palette->Entries[8]); + expect(0xff008080, palette->Entries[15]); + + memset(palette->Entries, 0x11, sizeof(ARGB) * 256); + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeFixedHalftone8, 1, FALSE, bitmap); + expect(Ok, status); +todo_wine + expect(0x300, palette->Flags); + expect(16, palette->Count); + expect(0xff000000, palette->Entries[0]); + expect(0xffc0c0c0, palette->Entries[8]); + expect(0xff008080, palette->Entries[15]); + + memset(palette->Entries, 0x11, sizeof(ARGB) * 256); + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeFixedHalftone252, 1, FALSE, bitmap); + expect(Ok, status); +todo_wine + expect(0x800, palette->Flags); + expect(252, palette->Count); + expect(0xff000000, palette->Entries[0]); + expect(0xff990066, palette->Entries[128]); + expect(0xffffffff, palette->Entries[251]); + + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeOptimal, 1, FALSE, bitmap); + expect(InvalidParameter, status); + + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeOptimal, 2, FALSE, bitmap); + expect(Ok, status); + expect(0, palette->Flags); + expect(2, palette->Count); + + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeOptimal, 16, FALSE, bitmap); + expect(Ok, status); + expect(0, palette->Flags); + expect(16, palette->Count); + + /* passing invalid enumeration palette type crashes under most Windows versions */ + + GdipFree(palette); + GdipDisposeImage((GpImage *)bitmap); +} + START_TEST(image) { HMODULE mod = GetModuleHandleA("gdiplus.dll"); @@ -5363,6 +5508,7 @@ START_TEST(image) pGdipBitmapGetHistogram = (void*)GetProcAddress(mod, "GdipBitmapGetHistogram"); pGdipImageSetAbort = (void*)GetProcAddress(mod, "GdipImageSetAbort"); + test_GdipInitializePalette(); test_png_color_formats(); test_supported_encoders(); test_CloneBitmapArea(); -- 2.19.2

1 0

[PATCH 7/9] gdiplus: Implement GdipInitializePalette.
by Dmitry Timoshkov Dec. 7, 2018

Dec. 7, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 108 ++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 110 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e0cf6d5d34..ed9d50c058 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -615,7 +615,7 @@ 615 stub GdipGetEffectParameterSize 616 stub GdipGetEffectParameters 617 stdcall GdipSetEffectParameters(ptr ptr long) -618 stub GdipInitializePalette +618 stdcall GdipInitializePalette(ptr long long long ptr) 619 stdcall GdipBitmapCreateApplyEffect(ptr long ptr ptr ptr ptr long ptr ptr) 620 stdcall GdipBitmapApplyEffect(ptr ptr ptr long ptr ptr) 621 stdcall GdipBitmapGetHistogram(ptr long long ptr ptr ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 2e844cfcc5..8bd723f031 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -5636,3 +5636,111 @@ GpStatus WINGDIPAPI GdipBitmapGetHistogramSize(HistogramFormat format, UINT *num *num_of_entries = 256; return Ok; } + +static GpStatus create_optimal_palette(ColorPalette *palette, INT desired, + BOOL transparent, GpBitmap *bitmap) +{ + GpStatus status; + BitmapData data; + HRESULT hr; + IWICImagingFactory *factory; + IWICPalette *wic_palette; + + if (!bitmap) return InvalidParameter; + if (palette->Count < desired) return GenericError; + + status = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, PixelFormat24bppRGB, &data); + if (status != Ok) return status; + + hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); + if (hr != S_OK) + { + GdipBitmapUnlockBits(bitmap, &data); + return hresult_to_status(hr); + } + + hr = IWICImagingFactory_CreatePalette(factory, &wic_palette); + if (hr == S_OK) + { + IWICBitmap *bitmap; + + /* PixelFormat24bppRGB actually stores the bitmap bits as BGR. */ + hr = IWICImagingFactory_CreateBitmapFromMemory(factory, data.Width, data.Height, + &GUID_WICPixelFormat24bppBGR, data.Stride, data.Stride * data.Width, data.Scan0, &bitmap); + if (hr == S_OK) + { + hr = IWICPalette_InitializeFromBitmap(wic_palette, (IWICBitmapSource *)bitmap, desired, transparent); + if (hr == S_OK) + { + palette->Flags = 0; + IWICPalette_GetColorCount(wic_palette, &palette->Count); + IWICPalette_GetColors(wic_palette, palette->Count, palette->Entries, &palette->Count); + } + + IWICBitmap_Release(bitmap); + } + + IWICPalette_Release(wic_palette); + } + + IWICImagingFactory_Release(factory); + GdipBitmapUnlockBits(bitmap, &data); + + return hresult_to_status(hr); +} + +/***************************************************************************** + * GdipInitializePalette [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipInitializePalette(ColorPalette *palette, + PaletteType type, INT desired, BOOL transparent, GpBitmap *bitmap) +{ + TRACE("(%p,%d,%d,%d,%p)\n", palette, type, desired, transparent, bitmap); + + if (!palette) return InvalidParameter; + + switch (type) + { + case PaletteTypeCustom: + return Ok; + + case PaletteTypeOptimal: + return create_optimal_palette(palette, desired, transparent, bitmap); + + /* WIC palette type enumeration matches these gdiplus enums */ + case PaletteTypeFixedBW: + case PaletteTypeFixedHalftone8: + case PaletteTypeFixedHalftone27: + case PaletteTypeFixedHalftone64: + case PaletteTypeFixedHalftone125: + case PaletteTypeFixedHalftone216: + case PaletteTypeFixedHalftone252: + case PaletteTypeFixedHalftone256: + { + ColorPalette *wic_palette; + GpStatus status = Ok; + + wic_palette = get_palette(NULL, type); + if (!wic_palette) return OutOfMemory; + + if (palette->Count >= wic_palette->Count) + { + palette->Flags = wic_palette->Flags; + palette->Count = wic_palette->Count; + memcpy(palette->Entries, wic_palette->Entries, wic_palette->Count * sizeof(wic_palette->Entries[0])); + } + else + status = GenericError; + + heap_free(wic_palette); + + return status; + } + + default: + FIXME("unknown palette type %d\n", type); + break; + } + + return InvalidParameter; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ad944d6a34..57fa6c64f2 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -266,6 +266,7 @@ GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics*,ARGB); GpStatus WINGDIPAPI GdipGraphicsSetAbort(GpGraphics*,GdiplusAbort*); GpStatus WINGDIPAPI GdipGetVisibleClipBounds(GpGraphics*,GpRectF*); GpStatus WINGDIPAPI GdipGetVisibleClipBoundsI(GpGraphics*,GpRect*); +GpStatus WINGDIPAPI GdipInitializePalette(ColorPalette*,PaletteType,INT,BOOL,GpBitmap*); GpStatus WINGDIPAPI GdipIsClipEmpty(GpGraphics*, BOOL*); GpStatus WINGDIPAPI GdipIsVisiblePoint(GpGraphics*,REAL,REAL,BOOL*); GpStatus WINGDIPAPI GdipIsVisiblePointI(GpGraphics*,INT,INT,BOOL*); -- 2.19.2

1 0

[PATCH 6/9] windowscodecs: Implement IWICPalette::InitializeFromBitmap.
by Dmitry Timoshkov Dec. 7, 2018

Dec. 7, 2018

Based on median cut implementation created by Sebastian Lackner. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/palette.c | 279 ++++++++++++++++++++++++++++- dlls/windowscodecs/tests/palette.c | 21 +-- 2 files changed, 275 insertions(+), 25 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 89ec9ead11..1c1e85834b 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -1,6 +1,7 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers - * Copyright 2012 Dmitry Timoshkov + * Copyright 2012,2016 Dmitry Timoshkov + * Copyright 2016 Sebastian Lackner * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -446,11 +447,279 @@ static HRESULT WINAPI PaletteImpl_InitializeCustom(IWICPalette *iface, return S_OK; } -static HRESULT WINAPI PaletteImpl_InitializeFromBitmap(IWICPalette *iface, - IWICBitmapSource *pISurface, UINT colorCount, BOOL fAddTransparentColor) +#define R_COUNT (1 << 5) +#define R_SHIFT (8 - 5) +#define R_SCALE 2 + +#define G_COUNT (1 << 6) +#define G_SHIFT (8 - 6) +#define G_SCALE 3 + +#define B_COUNT (1 << 5) +#define B_SHIFT (8 - 5) +#define B_SCALE 1 + +struct histogram +{ + unsigned int data[R_COUNT][G_COUNT][B_COUNT]; +}; + +struct box +{ + int r_min, r_max; + int g_min, g_max; + int b_min, b_max; + unsigned int count; + unsigned int score; +}; + +/* count nonzero elements in the histogram range [r_min, r_max] x [g_min, g_max] x [b_min, b_max] */ +static inline unsigned int histogram_count(struct histogram *h, int r_min, int r_max, + int g_min, int g_max, int b_min, int b_max) +{ + unsigned int count = 0; + int r, g, b; + for (r = r_min; r <= r_max; r++) + for (g = g_min; g <= g_max; g++) + for (b = b_min; b <= b_max; b++) + if (h->data[r][g][b] != 0) count++; + return count; +} + +/* compute weighted average color in the range [r_min, r_max] x [g_min, g_max] x [b_min, b_max] */ +static unsigned int histogram_color(struct histogram *h, int r_min, int r_max, + int g_min, int g_max, int b_min, int b_max) +{ + unsigned long long r_sum = 0, g_sum = 0, b_sum = 0; + unsigned int tmp, count = 0; + int r, g, b; + + for (r = r_min; r <= r_max; r++) + for (g = g_min; g <= g_max; g++) + for (b = b_min; b <= b_max; b++) + { + if (!(tmp = h->data[r][g][b])) continue; + r_sum += ((r << R_SHIFT) + ((1 << R_SHIFT) / 2)) * tmp; + g_sum += ((g << G_SHIFT) + ((1 << G_SHIFT) / 2)) * tmp; + b_sum += ((b << B_SHIFT) + ((1 << B_SHIFT) / 2)) * tmp; + count += tmp; + } + + return ((b_sum + (count / 2)) / count) | + ((g_sum + (count / 2)) / count) << 8 | + ((r_sum + (count / 2)) / count) << 16 | 0xff000000; +} + +/* same as histogram_count */ +static inline unsigned int box_count(struct histogram *h, struct box *b) +{ + return histogram_count(h, b->r_min, b->r_max, b->g_min, b->g_max, b->b_min, b->b_max); +} + +/* same as histogram_color */ +static inline unsigned int box_color(struct histogram *h, struct box *b) +{ + return histogram_color(h, b->r_min, b->r_max, b->g_min, b->g_max, b->b_min, b->b_max); +} + +/* compute score used to determine best split (also called "volume") */ +static inline unsigned int box_score(struct box *b) +{ + unsigned int tmp, sum = 0; + tmp = ((b->r_max - b->r_min) << R_SHIFT) * R_SCALE; sum += tmp * tmp; + tmp = ((b->g_max - b->g_min) << G_SHIFT) * G_SCALE; sum += tmp * tmp; + tmp = ((b->b_max - b->b_min) << B_SHIFT) * B_SCALE; sum += tmp * tmp; + return sum; +} + +/* attempt to shrink a box */ +static void shrink_box(struct histogram *h, struct box *b) +{ + int i; + for (i = b->r_min; i <= b->r_max; i++) + if (histogram_count(h, i, i, b->g_min, b->g_max, b->b_min, b->b_max)) { b->r_min = i; break; } + for (i = b->r_max; i >= b->r_min; i--) + if (histogram_count(h, i, i, b->g_min, b->g_max, b->b_min, b->b_max)) { b->r_max = i; break; } + for (i = b->g_min; i <= b->g_max; i++) + if (histogram_count(h, b->r_min, b->r_max, i, i, b->b_min, b->b_max)) { b->g_min = i; break; } + for (i = b->g_max; i >= b->g_min; i--) + if (histogram_count(h, b->r_min, b->r_max, i, i, b->b_min, b->b_max)) { b->g_max = i; break; } + for (i = b->b_min; i <= b->b_max; i++) + if (histogram_count(h, b->r_min, b->r_max, b->g_min, b->g_max, i, i)) { b->b_min = i; break; } + for (i = b->b_max; i >= b->b_min; i--) + if (histogram_count(h, b->r_min, b->r_max, b->g_min, b->g_max, i, i)) { b->b_max = i; break; } + b->count = box_count(h, b); + b->score = box_score(b); +} + +/* helper for split_box */ +static inline void set_avg(int *min, int *max) +{ + int avg = (*min + *max) / 2; + *min = avg + 1; + *max = avg; +} + +/* split a box based on the best axis */ +static void split_box(struct histogram *h, struct box *b1, struct box *b2) +{ + int r = ((b1->r_max - b1->r_min) << R_SHIFT) * R_SCALE; + int g = ((b1->g_max - b1->g_min) << G_SHIFT) * G_SCALE; + int b = ((b1->b_max - b1->b_min) << B_SHIFT) * B_SCALE; + + *b2 = *b1; + + if (r > g) + { + if (b > r) set_avg(&b1->b_min, &b2->b_max); + else set_avg(&b1->r_min, &b2->r_max); + } + else + { + if (b > g) set_avg(&b1->b_min, &b2->b_max); + else set_avg(&b1->g_min, &b2->g_max); + } + + shrink_box(h, b1); + shrink_box(h, b2); +} + +/* find box suitable for split based on count */ +static struct box *find_box_max_count(struct box *b, int count) +{ + struct box *best = NULL; + for (; count--; b++) + if (b->score && (!best || b->count > best->count)) best = b; + return best; +} + +/* find box suitable for split based on score */ +static struct box *find_box_max_score(struct box *b, int count) +{ + struct box *best = NULL; + for (; count--; b++) + if (b->score && (!best || b->score > best->score)) best = b; + return best; +} + +/* compute color map with at most 'desired' colors + * image must be in 24bpp BGR format and colors are returned in 0xAARRGGBB format */ +static int median_cut(unsigned char *image, unsigned int width, unsigned int height, + unsigned int stride, int desired, unsigned int *colors) +{ + struct box boxes[256]; + struct histogram *h; + unsigned int x, y; + unsigned char *p; + struct box *b1, *b2; + int numboxes, i; + + if (!(h = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*h)))) + return 0; + + for (y = 0; y < height; y++) + for (x = 0, p = image + y * stride; x < width; x++, p += 3) + h->data[p[2] >> R_SHIFT][p[1] >> G_SHIFT][p[0] >> B_SHIFT]++; + + numboxes = 1; + boxes[0].r_min = 0; boxes[0].r_max = R_COUNT - 1; + boxes[0].g_min = 0; boxes[0].g_max = G_COUNT - 1; + boxes[0].b_min = 0; boxes[0].b_max = B_COUNT - 1; + shrink_box(h, &boxes[0]); + + while (numboxes <= desired / 2) + { + if (!(b1 = find_box_max_count(boxes, numboxes))) break; + b2 = &boxes[numboxes++]; + split_box(h, b1, b2); + } + while (numboxes < desired) + { + if (!(b1 = find_box_max_score(boxes, numboxes))) break; + b2 = &boxes[numboxes++]; + split_box(h, b1, b2); + } + + for (i = 0; i < numboxes; i++) + colors[i] = box_color(h, &boxes[i]); + + HeapFree(GetProcessHeap(), 0, h); + return numboxes; +} + + +static HRESULT WINAPI PaletteImpl_InitializeFromBitmap(IWICPalette *palette, + IWICBitmapSource *source, UINT desired, BOOL add_transparent) { - FIXME("(%p,%p,%u,%i): stub\n", iface, pISurface, colorCount, fAddTransparentColor); - return E_NOTIMPL; + IWICImagingFactory *factory = NULL; + IWICBitmap *rgb24_bitmap = NULL; + IWICBitmapSource *rgb24_source; + IWICBitmapLock *lock = NULL; + WICPixelFormatGUID format; + HRESULT hr; + UINT width, height, stride, size, actual_number_of_colors; + BYTE *src; + WICColor colors[256]; + + TRACE("(%p,%p,%u,%d)\n", palette, source, desired, add_transparent); + + if (!source || desired < 2 || desired > 256) + return E_INVALIDARG; + + hr = IWICBitmapSource_GetPixelFormat(source, &format); + if (hr != S_OK) return hr; + + /* For interoperability with gdiplus where PixelFormat24bppRGB actully stored + * as BGR (and there is no a corresponding RGB format) we have to use 24bppBGR + * to avoid format conversions. + */ + if (!IsEqualGUID(&format, &GUID_WICPixelFormat24bppBGR)) + { + hr = WICConvertBitmapSource(&GUID_WICPixelFormat24bppBGR, source, &rgb24_source); + if (hr != S_OK) return hr; + } + else + rgb24_source = source; + + hr = ImagingFactory_CreateInstance(&IID_IWICImagingFactory, (void **)&factory); + if (hr != S_OK) goto fail; + + hr = IWICImagingFactory_CreateBitmapFromSource(factory, rgb24_source, WICBitmapCacheOnLoad, &rgb24_bitmap); + if (hr != S_OK) goto fail; + + hr = IWICBitmap_Lock(rgb24_bitmap, NULL, WICBitmapLockRead, &lock); + if (hr != S_OK) goto fail; + + IWICBitmapLock_GetSize(lock, &width, &height); + IWICBitmapLock_GetStride(lock, &stride); + IWICBitmapLock_GetDataPointer(lock, &size, &src); + + actual_number_of_colors = median_cut(src, width, height, stride, add_transparent ? desired - 1 : desired, colors); + TRACE("actual number of colors: %u\n", actual_number_of_colors); + + if (actual_number_of_colors) + { + if (add_transparent) colors[actual_number_of_colors++] = 0; + + hr = IWICPalette_InitializeCustom(palette, colors, actual_number_of_colors); + } + else + hr = E_OUTOFMEMORY; + +fail: + if (lock) + IWICBitmapLock_Release(lock); + + if (rgb24_bitmap) + IWICBitmap_Release(rgb24_bitmap); + + if (factory) + IWICImagingFactory_Release(factory); + + if (rgb24_source != source) + IWICBitmapSource_Release(rgb24_source); + + return hr; } static HRESULT WINAPI PaletteImpl_InitializeFromPalette(IWICPalette *iface, diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 3b9f68535b..5bb25fa427 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -577,48 +577,34 @@ static void test_palette_from_bitmap(void) ok(hr == S_OK, "CreatePalette error %#x\n", hr); hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 0, FALSE); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 1, FALSE); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 257, FALSE); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICPalette_InitializeFromBitmap(palette, NULL, 16, FALSE); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 2, FALSE); -todo_wine ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); -if (hr == S_OK) -{ + count = 0; hr = IWICPalette_GetColorCount(palette, &count); ok(hr == S_OK, "GetColorCount error %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); -} hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 2, TRUE); -todo_wine ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); -if (hr == S_OK) -{ count = 0; hr = IWICPalette_GetColorCount(palette, &count); ok(hr == S_OK, "GetColorCount error %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); -} /* without trasparent color */ hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 16, FALSE); -todo_wine ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); -if (hr == S_OK) -{ type = -1; hr = IWICPalette_GetType(palette, &type); ok(hr == S_OK, "GetType error %#x\n", hr); @@ -632,14 +618,10 @@ if (hr == S_OK) ok(hr == S_OK, "GetColors error %#x\n", hr); ok(ret == count, "expected %u, got %u\n", count, ret); ok(color[count - 1] != 0, "expected !0, got %08x\n", color[count - 1]); -} /* with trasparent color */ hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 16, TRUE); -todo_wine ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); -if (hr == S_OK) -{ type = -1; hr = IWICPalette_GetType(palette, &type); ok(hr == S_OK, "GetType error %#x\n", hr); @@ -653,7 +635,6 @@ if (hr == S_OK) ok(hr == S_OK, "GetColors error %#x\n", hr); ok(ret == count, "expected %u, got %u\n", count, ret); ok(color[count - 1] == 0, "expected 0, got %08x\n", color[count - 1]); -} IWICPalette_Release(palette); IWICBitmap_Release(bitmap); -- 2.19.2

1 0

[PATCH 5/9] windowscodecs/tests: Add some tests for IWICPalette::InitializeFromBitmap.
by Dmitry Timoshkov Dec. 7, 2018

Dec. 7, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/palette.c | 158 ++++++++++++++++++++++++++--- 1 file changed, 143 insertions(+), 15 deletions(-) diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 27bf7c80d1..3b9f68535b 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -1,6 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers - * Copyright 2012 Dmitry Timoshkov + * Copyright 2012,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 @@ -27,9 +27,10 @@ #include "wincodec.h" #include "wine/test.h" +static IWICImagingFactory *factory; + static void test_custom_palette(void) { - IWICImagingFactory *factory; IWICPalette *palette, *palette2; HRESULT hr; WICBitmapPaletteType type=0xffffffff; @@ -38,11 +39,6 @@ static void test_custom_palette(void) WICColor colors[4]; BOOL boolresult; - hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICImagingFactory, (void**)&factory); - ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); - if (FAILED(hr)) return; - hr = IWICImagingFactory_CreatePalette(factory, &palette); ok(SUCCEEDED(hr), "CreatePalette failed, hr=%x\n", hr); if (SUCCEEDED(hr)) @@ -207,8 +203,6 @@ static void test_custom_palette(void) IWICPalette_Release(palette2); IWICPalette_Release(palette); } - - IWICImagingFactory_Release(factory); } static void generate_gray16_palette(DWORD *entries, UINT count) @@ -451,7 +445,6 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedHalftone256, 0, 0, 256, { 0 } }, { WICBitmapPaletteTypeFixedHalftone256, 0, 0, 256, { 0 }, 1 } }; - IWICImagingFactory *factory; IWICPalette *palette; HRESULT hr; WICBitmapPaletteType type; @@ -459,10 +452,6 @@ static void test_predefined_palette(void) BOOL bret; WICColor color[256]; - hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICImagingFactory, (void **)&factory); - ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); - hr = IWICImagingFactory_CreatePalette(factory, &palette); ok(hr == S_OK, "CreatePalette error %#x\n", hr); hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeCustom, FALSE); @@ -538,16 +527,155 @@ static void test_predefined_palette(void) IWICPalette_Release(palette); } +} - IWICImagingFactory_Release(factory); +static BYTE *init_bitmap(UINT *width, UINT *height, UINT *stride) +{ + BYTE *src; + UINT i, j, scale; + + *width = 256; + *height = 256; + *stride = (*width * 3 + 3) & ~3; + trace("width %d, height %d, stride %d\n", *width, *height, *stride); + + src = HeapAlloc(GetProcessHeap(), 0, *stride * *height); + + scale = 256 / *width; + if (!scale) scale = 1; + + for (i = 0; i < *height; i++) + { + for (j = 0; j < *width; j++) + { + src[i * *stride + j*3 + 0] = scale * i; + src[i * *stride + j*3 + 1] = scale * (255 - (i+j)/2); + src[i * *stride + j*3 + 2] = scale * j; + } + } + + return src; +} + +static void test_palette_from_bitmap(void) +{ + HRESULT hr; + BYTE *data; + IWICBitmap *bitmap; + IWICPalette *palette; + WICBitmapPaletteType type; + UINT width, height, stride, count, ret; + WICColor color[257]; + + data = init_bitmap(&width, &height, &stride); + + hr = IWICImagingFactory_CreateBitmapFromMemory(factory, width, height, &GUID_WICPixelFormat24bppRGB, + stride, stride * height, data, &bitmap); + ok(hr == S_OK, "CreateBitmapFromMemory error %#x\n", hr); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + + hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 0, FALSE); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 1, FALSE); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 257, FALSE); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICPalette_InitializeFromBitmap(palette, NULL, 16, FALSE); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 2, FALSE); +todo_wine + ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); +if (hr == S_OK) +{ + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 2, "expected 2, got %u\n", count); +} + + hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 2, TRUE); +todo_wine + ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); +if (hr == S_OK) +{ + count = 0; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 2, "expected 2, got %u\n", count); +} + + /* without trasparent color */ + hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 16, FALSE); +todo_wine + ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); +if (hr == S_OK) +{ + type = -1; + hr = IWICPalette_GetType(palette, &type); + ok(hr == S_OK, "GetType error %#x\n", hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %#x\n", type); + count = 0; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 16, "expected 16, got %u\n", count); + memset(color, 0, sizeof(color)); + hr = IWICPalette_GetColors(palette, count, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[count - 1] != 0, "expected !0, got %08x\n", color[count - 1]); +} + + /* with trasparent color */ + hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 16, TRUE); +todo_wine + ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); +if (hr == S_OK) +{ + type = -1; + hr = IWICPalette_GetType(palette, &type); + ok(hr == S_OK, "GetType error %#x\n", hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %#x\n", type); + count = 0; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 16, "expected 16, got %u\n", count); + memset(color, 0xff, sizeof(color)); + hr = IWICPalette_GetColors(palette, count, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[count - 1] == 0, "expected 0, got %08x\n", color[count - 1]); +} + + IWICPalette_Release(palette); + IWICBitmap_Release(bitmap); + + HeapFree(GetProcessHeap(), 0, data); } START_TEST(palette) { + HRESULT hr; + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + test_custom_palette(); test_predefined_palette(); + test_palette_from_bitmap(); + + IWICImagingFactory_Release(factory); CoUninitialize(); } -- 2.19.2

1 0

[PATCH 4/9] windowscodecs: Implement IWICBitmapDecoder::GetMetadataQueryReader in the JPEG encoder.
by Dmitry Timoshkov Dec. 7, 2018

Dec. 7, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/jpegformat.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index a060d569f8..54f77a7220 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -412,10 +412,14 @@ static HRESULT WINAPI JpegDecoder_CopyPalette(IWICBitmapDecoder *iface, } static HRESULT WINAPI JpegDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, - IWICMetadataQueryReader **ppIMetadataQueryReader) + IWICMetadataQueryReader **reader) { - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, reader); + + if (!reader) return E_INVALIDARG; + + *reader = NULL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI JpegDecoder_GetPreview(IWICBitmapDecoder *iface, -- 2.19.2

1 0

[PATCH 3/9] windowscodecs: Implement IWICBitmapDecoder::GetMetadataQueryReader in the PNG decoder.
by Dmitry Timoshkov Dec. 7, 2018

Dec. 7, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/pngformat.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 786d8360e0..7050c95121 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -842,10 +842,14 @@ static HRESULT WINAPI PngDecoder_CopyPalette(IWICBitmapDecoder *iface, } static HRESULT WINAPI PngDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, - IWICMetadataQueryReader **ppIMetadataQueryReader) + IWICMetadataQueryReader **reader) { - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, reader); + + if (!reader) return E_INVALIDARG; + + *reader = NULL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI PngDecoder_GetPreview(IWICBitmapDecoder *iface, -- 2.19.2

1 0

[PATCH 2/9] windowscodecs: Implement IWICBitmapDecoder::GetMetadataQueryReader in the TIFF decoder.
by Dmitry Timoshkov Dec. 7, 2018

Dec. 7, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tiffformat.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 95a39cdbfb..93af5594a7 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -694,8 +694,12 @@ static HRESULT WINAPI TiffDecoder_CopyPalette(IWICBitmapDecoder *iface, static HRESULT WINAPI TiffDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, IWICMetadataQueryReader **ppIMetadataQueryReader) { - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader); + + if (!ppIMetadataQueryReader) return E_INVALIDARG; + + *ppIMetadataQueryReader = NULL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI TiffDecoder_GetPreview(IWICBitmapDecoder *iface, -- 2.19.2

1 0

[PATCH 1/9] windowscodecs: Add registration for GUID_WICPixelFormat32bppGrayFloat pixel format.
by Dmitry Timoshkov Dec. 7, 2018

Dec. 7, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/regsvr.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 7b0fbf8089..9a580c67c5 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1736,6 +1736,8 @@ static BYTE const channel_mask_16bit2[] = { 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, static BYTE const channel_mask_16bit3[] = { 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00 }; static BYTE const channel_mask_16bit4[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff }; +static BYTE const channel_mask_32bit[] = { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }; + static BYTE const channel_mask_5bit[] = { 0x1f, 0x00 }; static BYTE const channel_mask_5bit2[] = { 0xe0, 0x03 }; static BYTE const channel_mask_5bit3[] = { 0x00, 0x7c }; @@ -1752,6 +1754,8 @@ static BYTE const * const channel_masks_8bit[] = { channel_mask_8bit, static BYTE const * const channel_masks_16bit[] = { channel_mask_16bit, channel_mask_16bit2, channel_mask_16bit3, channel_mask_16bit4}; +static BYTE const * const channel_masks_32bit[] = { channel_mask_32bit }; + static BYTE const * const channel_masks_BGRA5551[] = { channel_mask_5bit, channel_mask_5bit2, channel_mask_5bit3, channel_mask_5bit4 }; @@ -1946,6 +1950,17 @@ static struct regsvr_pixelformat const pixelformat_list[] = { WICPixelFormatNumericRepresentationUnsignedInteger, 1 }, + { &GUID_WICPixelFormat32bppGrayFloat, + "The Wine Project", + "32bpp GrayFloat", + NULL, /* no version */ + &GUID_VendorMicrosoft, + 32, /* bitsperpixel */ + 1, /* channel count */ + channel_masks_32bit, + WICPixelFormatNumericRepresentationFloat, + 1 + }, { &GUID_WICPixelFormat48bppRGB, "The Wine Project", "48bpp RGB", -- 2.19.2

1 0

Pointers to develop direct hardware access
by Peter Cost Dec. 6, 2018

Dec. 6, 2018

I'm new to wine and tried to get the Sonic core Scope software to work under wine. The problem I ran into is that there is no support for the used PCI hardware. (Sonic core/Creamware Scope PCI card) I researched the net and found that wine does not support hardware that does not have a proper Linux driver. Found a reference to ReactOS but a test with that ended in the well known blue screen. So I'm looking into making this possible myself but need some pointers on where to start. My thought on this is to create some layer between the actual hardware and wine running the Scope driver. Tried to fool the system by adding the PCI enumerations for this card to the wine registry, but the driver installer still says no hardware found. I have the Scope hardware and the windows software. (Currently using windows xp 32bit) I'm a reasonable skilled programmer with many years of experience in both the hardware and the software world. Thanks for any pointers

2 1

Using zlib.h in test / license header
by Andreas Maier Dec. 6, 2018

Dec. 6, 2018

Hello, i've ported a test from the ReactOS-Project to wine. The PatchBot-test failed because there is no zlib.h. The test includes 2 zlib-compressed pdb-files. They are needed for the test. PatchBot-Log: https://testbot.winehq.org/JobDetails.pl?Key=45310#k101 Isn't it possible to use zlib.h for tests or did i something wrong? Btw.: (Maybe a silly question ..) Is it possible to keep the original license header of this file (from reactos-project)? /Andy

2 2

[PATCH] secur32: Use -VERS-ALL gnutls priority string to disable not enabled protocols.
by Jacek Caban Dec. 6, 2018

Dec. 6, 2018

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46161 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/secur32/schannel_gnutls.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[PATCH] schannel.h: Add DTLS defines.
by Jacek Caban Dec. 6, 2018

Dec. 6, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/schannel.h | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)

1 0

[PATCH] loader: Check if the preloader overlaps the reserved range on the Mac.
by Ken Thomases Dec. 6, 2018

Dec. 6, 2018

Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- loader/preloader_mac.c | 48 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 1d88062..83d24af 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -48,6 +48,7 @@ #ifdef HAVE_MACH_O_LOADER_H #include <mach/thread_status.h> #include <mach-o/loader.h> +#include <mach-o/ldsyms.h> #endif #include "main.h" @@ -98,6 +99,8 @@ void __stack_chk_fail(void) { return; } static const size_t page_size = 0x1000; static const size_t page_mask = 0xfff; #define target_mach_header mach_header +#define target_segment_command segment_command +#define TARGET_LC_SEGMENT LC_SEGMENT #define target_thread_state_t i386_thread_state_t #ifdef __DARWIN_UNIX03 #define target_thread_ip(x) (x)->__eip @@ -184,6 +187,8 @@ __ASM_GLOBAL_FUNC( start, static const size_t page_size = 0x1000; static const size_t page_mask = 0xfff; #define target_mach_header mach_header_64 +#define target_segment_command segment_command_64 +#define TARGET_LC_SEGMENT LC_SEGMENT_64 #define target_thread_state_t x86_thread_state64_t #ifdef __DARWIN_UNIX03 #define target_thread_ip(x) (x)->__rip @@ -376,6 +381,36 @@ static __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char wld_exit(1); } +static int preloader_overlaps_range( const void *start, const void *end ) +{ + intptr_t slide = p_dyld_get_image_slide(&_mh_execute_header); + struct load_command *cmd = (struct load_command*)(&_mh_execute_header + 1); + int i; + + for (i = 0; i < _mh_execute_header.ncmds; ++i) + { + if (cmd->cmd == TARGET_LC_SEGMENT) + { + struct target_segment_command *seg = (struct target_segment_command*)cmd; + const void *seg_start = (const void*)(seg->vmaddr + slide); + const void *seg_end = (const char*)seg_start + seg->vmsize; + + if (end > seg_start && start <= seg_end) + { + char segname[sizeof(seg->segname) + 1]; + memcpy(segname, seg->segname, sizeof(seg->segname)); + segname[sizeof(segname) - 1] = 0; + wld_printf( "WINEPRELOADRESERVE range %p-%p overlaps preloader %s segment %p-%p\n", + start, end, segname, seg_start, seg_end ); + return 1; + } + } + cmd = (struct load_command*)((char*)cmd + cmd->cmdsize); + } + + return 0; +} + /* * preload_reserve * @@ -406,7 +441,8 @@ static void preload_reserve( const char *str ) else if (result) goto error; /* single value '0' is allowed */ /* sanity checks */ - if (end <= start) start = end = NULL; + if (end <= start || preloader_overlaps_range(start, end)) + start = end = NULL; /* check for overlap with low memory areas */ for (i = 0; preload_info[i].size; i++) @@ -562,6 +598,11 @@ void *wld_start( void *stack, int *is_unix_thread ) p++; } + LOAD_POSIX_DYLD_FUNC( dlopen ); + LOAD_POSIX_DYLD_FUNC( dlsym ); + LOAD_POSIX_DYLD_FUNC( dladdr ); + LOAD_MACHO_DYLD_FUNC( _dyld_get_image_slide ); + /* reserve memory that Wine needs */ if (reserve) preload_reserve( reserve ); for (i = 0; preload_info[i].size; i++) @@ -576,11 +617,6 @@ void *wld_start( void *stack, int *is_unix_thread ) if (!map_region( &builtin_dlls )) builtin_dlls.size = 0; - LOAD_POSIX_DYLD_FUNC( dlopen ); - LOAD_POSIX_DYLD_FUNC( dlsym ); - LOAD_POSIX_DYLD_FUNC( dladdr ); - LOAD_MACHO_DYLD_FUNC( _dyld_get_image_slide ); - /* load the main binary */ if (!(mod = pdlopen( argv[1], RTLD_NOW ))) fatal_error( "%s: could not load binary\n", argv[1] ); -- 2.10.2

3 5

[PATCH 3/3] tzres: Add time zone name resource DLL and use it.
by Akihiro Sagawa Dec. 6, 2018

Dec. 6, 2018

This will fix https://bugs.winehq.org/show_bug.cgi?id=42719 after Japanese translation update. String IDs are based on SHA1 hash so that we can add another zone name without renumbering. I'm preparing a tool which generate these IDs and time zone information. I'll send it later. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- configure | 2 + configure.ac | 1 + dlls/ntdll/tests/time.c | 4 +- dlls/tzres/Makefile.in | 2 + dlls/tzres/tzres.rc | 201 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/tzres/tzres.spec | 1 + loader/wine.inf.in | 198 +++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 407 insertions(+), 2 deletions(-) create mode 100644 dlls/tzres/Makefile.in create mode 100644 dlls/tzres/tzres.rc create mode 100644 dlls/tzres/tzres.spec

2 1

[PATCH 2/3] [v2] kernel32: Resolve an MUI time zone name.
by Akihiro Sagawa Dec. 6, 2018

Dec. 6, 2018

In v2, use RegLoadMUIString as suggested. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/time.c | 54 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 11 deletions(-)

1 0

[PATCH 1/3] ntdll: Use an MUI time zone name if available.
by Akihiro Sagawa Dec. 6, 2018

Dec. 6, 2018

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ntdll/time.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)

1 0

[PATCH 6/7] kernel32: Resolve an indirect string in time zone names.
by Akihiro Sagawa Dec. 6, 2018

Dec. 6, 2018

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/kernel_private.h | 2 + dlls/kernel32/resource.c | 96 ++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/time.c | 28 ++++++++++++ 3 files changed, 126 insertions(+)

2 4

[PATCH] wine_call_on_stack:Avoid missing semi-colon in the declaration.
by Denil Verghese Dec. 6, 2018

Dec. 6, 2018

A missing semi-colon is added. Signed-off-by: Denil Verghese <denilverghese(a)gmail.com> --- libs/wine/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index d5ce07aceb..29e9091789 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -126,7 +126,7 @@ __declspec(naked) int wine_call_on_stack( int (*func)(void *), void *arg, void * __asm call [ecx]; __asm mov esp, esi; __asm pop esi; - __asm pop ebp + __asm pop ebp; __asm ret; } #elif defined(__x86_64__) && defined(__GNUC__) -- 2.16.2.windows.1

1 0

[PATCH 8/8] windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in PNG encoder.
by Dmitry Timoshkov Dec. 6, 2018

Dec. 6, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/pngformat.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index c0e5a59cf9..786d8360e0 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1979,11 +1979,22 @@ static HRESULT WINAPI PngEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GU return S_OK; } -static HRESULT WINAPI PngEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, - IWICBitmapEncoderInfo **ppIEncoderInfo) +static HRESULT WINAPI PngEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { - FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); - return E_NOTIMPL; + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICPngEncoder, &comp_info); + if (hr == S_OK) + { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; } static HRESULT WINAPI PngEncoder_SetColorContexts(IWICBitmapEncoder *iface, -- 2.19.2

1 0

[PATCH 7/8] windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in TIFF encoder.
by Dmitry Timoshkov Dec. 6, 2018

Dec. 6, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tiffformat.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 01d62d925d..95a39cdbfb 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1921,11 +1921,22 @@ static HRESULT WINAPI TiffEncoder_GetContainerFormat(IWICBitmapEncoder *iface, return S_OK; } -static HRESULT WINAPI TiffEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, - IWICBitmapEncoderInfo **ppIEncoderInfo) +static HRESULT WINAPI TiffEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { - FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); - return E_NOTIMPL; + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICTiffEncoder, &comp_info); + if (hr == S_OK) + { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; } static HRESULT WINAPI TiffEncoder_SetColorContexts(IWICBitmapEncoder *iface, -- 2.19.2

1 0

[PATCH 6/8] windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in JPEG encoder.
by Dmitry Timoshkov Dec. 6, 2018

Dec. 6, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/jpegformat.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 451d725eb8..a060d569f8 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1392,11 +1392,22 @@ static HRESULT WINAPI JpegEncoder_GetContainerFormat(IWICBitmapEncoder *iface, G return S_OK; } -static HRESULT WINAPI JpegEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, - IWICBitmapEncoderInfo **ppIEncoderInfo) +static HRESULT WINAPI JpegEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { - FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); - return E_NOTIMPL; + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICJpegEncoder, &comp_info); + if (hr == S_OK) + { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; } static HRESULT WINAPI JpegEncoder_SetColorContexts(IWICBitmapEncoder *iface, -- 2.19.2

1 0

[PATCH 5/8] windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in BMP encoder.
by Dmitry Timoshkov Dec. 6, 2018

Dec. 6, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/bmpencode.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 8e2bbe8091..3b77517a8d 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -510,11 +510,22 @@ static HRESULT WINAPI BmpEncoder_GetContainerFormat(IWICBitmapEncoder *iface, return S_OK; } -static HRESULT WINAPI BmpEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, - IWICBitmapEncoderInfo **ppIEncoderInfo) +static HRESULT WINAPI BmpEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { - FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); - return E_NOTIMPL; + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICBmpEncoder, &comp_info); + if (hr == S_OK) + { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; } static HRESULT WINAPI BmpEncoder_SetColorContexts(IWICBitmapEncoder *iface, -- 2.19.2

1 0

[PATCH 4/8] windowscodecs: Implement IWICBitmapEncoderInfo::GetFileExtensions.
by Dmitry Timoshkov Dec. 6, 2018

Dec. 6, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/info.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 86707e1253..d0c2c690ca 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -898,8 +898,12 @@ static HRESULT WINAPI BitmapEncoderInfo_GetMimeTypes(IWICBitmapEncoderInfo *ifac static HRESULT WINAPI BitmapEncoderInfo_GetFileExtensions(IWICBitmapEncoderInfo *iface, UINT cchFileExtensions, WCHAR *wzFileExtensions, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchFileExtensions, wzFileExtensions, pcchActual); - return E_NOTIMPL; + BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchFileExtensions, wzFileExtensions, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, fileextensions_valuename, + cchFileExtensions, wzFileExtensions, pcchActual); } static HRESULT WINAPI BitmapEncoderInfo_DoesSupportAnimation(IWICBitmapEncoderInfo *iface, -- 2.19.2

1 0

[PATCH 3/8] windowscodecs: Add support for palette image formats to BMP encoder.
by Dmitry Timoshkov Dec. 6, 2018

Dec. 6, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/bmpencode.c | 47 ++++++++++++++++++++++------ dlls/windowscodecs/info.c | 8 ++++- dlls/windowscodecs/regsvr.c | 4 +++ dlls/windowscodecs/tests/converter.c | 11 +++++-- 4 files changed, 57 insertions(+), 13 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index b8783a499e..8e2bbe8091 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 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 @@ -37,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); struct bmp_pixelformat { const WICPixelFormatGUID *guid; UINT bpp; + UINT colors; /* palette size */ DWORD compression; DWORD redmask; DWORD greenmask; @@ -45,13 +47,18 @@ struct bmp_pixelformat { }; static const struct bmp_pixelformat formats[] = { - {&GUID_WICPixelFormat24bppBGR, 24, BI_RGB}, - {&GUID_WICPixelFormat16bppBGR555, 16, BI_RGB}, - {&GUID_WICPixelFormat16bppBGR565, 16, BI_BITFIELDS, 0xf800, 0x7e0, 0x1f, 0}, - {&GUID_WICPixelFormat32bppBGR, 32, BI_RGB}, + {&GUID_WICPixelFormat24bppBGR, 24, 0, BI_RGB}, + {&GUID_WICPixelFormatBlackWhite, 1, 2, BI_RGB}, + {&GUID_WICPixelFormat1bppIndexed, 1, 2, BI_RGB}, + {&GUID_WICPixelFormat2bppIndexed, 2, 4, BI_RGB}, + {&GUID_WICPixelFormat4bppIndexed, 4, 16, BI_RGB}, + {&GUID_WICPixelFormat8bppIndexed, 8, 256, BI_RGB}, + {&GUID_WICPixelFormat16bppBGR555, 16, 0, BI_RGB}, + {&GUID_WICPixelFormat16bppBGR565, 16, 0, BI_BITFIELDS, 0xf800, 0x7e0, 0x1f, 0}, + {&GUID_WICPixelFormat32bppBGR, 32, 0, BI_RGB}, #if 0 /* Windows doesn't seem to support this one. */ - {&GUID_WICPixelFormat32bppBGRA, 32, BI_BITFIELDS, 0xff0000, 0xff00, 0xff, 0xff000000}, + {&GUID_WICPixelFormat32bppBGRA, 32, 0, BI_BITFIELDS, 0xff0000, 0xff00, 0xff, 0xff000000}, #endif {NULL} }; @@ -182,9 +189,14 @@ static HRESULT WINAPI BmpFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface if (!This->initialized || This->bits) return WINCODEC_ERR_WRONGSTATE; + if (IsEqualGUID(pPixelFormat, &GUID_WICPixelFormatBlackWhite)) + *pPixelFormat = GUID_WICPixelFormat1bppIndexed; + else if (IsEqualGUID(pPixelFormat, &GUID_WICPixelFormat2bppIndexed)) + *pPixelFormat = GUID_WICPixelFormat4bppIndexed; + for (i=0; formats[i].guid; i++) { - if (memcmp(formats[i].guid, pPixelFormat, sizeof(GUID)) == 0) + if (IsEqualGUID(formats[i].guid, pPixelFormat)) break; } @@ -207,6 +219,7 @@ static HRESULT WINAPI BmpFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, IWICPalette *palette) { BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + HRESULT hr; TRACE("(%p,%p)\n", iface, palette); @@ -215,7 +228,14 @@ static HRESULT WINAPI BmpFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; - return IWICPalette_GetColors(palette, 256, This->palette, &This->colors); + hr = IWICPalette_GetColors(palette, 256, This->palette, &This->colors); + if (hr == S_OK) + { + UINT i; + for (i = 0; i < This->colors; i++) + This->palette[i] |= 0xff000000; /* BMP palette has no alpha */ + } + return hr; } static HRESULT WINAPI BmpFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, @@ -330,8 +350,8 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) bih.bV5SizeImage = This->stride*This->height; bih.bV5XPelsPerMeter = (This->xres+0.0127) / 0.0254; bih.bV5YPelsPerMeter = (This->yres+0.0127) / 0.0254; - bih.bV5ClrUsed = 0; - bih.bV5ClrImportant = 0; + bih.bV5ClrUsed = (This->format->bpp <= 8) ? This->colors : 0; + bih.bV5ClrImportant = bih.bV5ClrUsed; if (This->format->compression == BI_BITFIELDS) { @@ -348,6 +368,7 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) bfh.bfSize = sizeof(BITMAPFILEHEADER) + info_size + bih.bV5SizeImage; bfh.bfOffBits = sizeof(BITMAPFILEHEADER) + info_size; + bfh.bfOffBits += bih.bV5ClrUsed * sizeof(WICColor); pos.QuadPart = 0; hr = IStream_Seek(This->stream, pos, STREAM_SEEK_SET, NULL); @@ -361,6 +382,14 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) if (FAILED(hr)) return hr; if (byteswritten != info_size) return E_FAIL; + /* write the palette */ + if (This->format->colors) + { + hr = IStream_Write(This->stream, This->palette, This->colors * sizeof(WICColor), &byteswritten); + if (FAILED(hr)) return hr; + if (byteswritten != This->colors * sizeof(WICColor)) return E_FAIL; + } + hr = IStream_Write(This->stream, This->bits, bih.bV5SizeImage, &byteswritten); if (FAILED(hr)) return hr; if (byteswritten != bih.bV5SizeImage) return E_FAIL; diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index e131107e99..86707e1253 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -2461,6 +2461,12 @@ HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnkn return hr; } +static BOOL is_1bpp_format(const WICPixelFormatGUID *format) +{ + return IsEqualGUID(format, &GUID_WICPixelFormatBlackWhite) || + IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed); +} + HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitmapSource *pISrc, IWICBitmapSource **ppIDst) { HRESULT res; @@ -2476,7 +2482,7 @@ HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitma res = IWICBitmapSource_GetPixelFormat(pISrc, &srcFormat); if (FAILED(res)) return res; - if (IsEqualGUID(&srcFormat, dstFormat)) + if (IsEqualGUID(&srcFormat, dstFormat) || (is_1bpp_format(&srcFormat) && is_1bpp_format(dstFormat))) { IWICBitmapSource_AddRef(pISrc); *ppIDst = pISrc; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index ca02ff98f8..7b0fbf8089 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1347,6 +1347,10 @@ static GUID const * const bmp_encode_formats[] = { &GUID_WICPixelFormat16bppBGR565, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGR, + &GUID_WICPixelFormatBlackWhite, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat4bppIndexed, + &GUID_WICPixelFormat8bppIndexed, NULL }; diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 44a2c08147..8e0fb7759b 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -804,6 +804,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) if (IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed)) { + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 32, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -814,6 +816,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) { + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 8, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -824,6 +828,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) { + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -834,6 +840,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat32bppBGR)) { + ok(bfh.bfOffBits == 0x0036, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -1492,8 +1500,6 @@ START_TEST(converter) test_encoder(&testdata_24bppBGR, &CLSID_WICPngEncoder, &testdata_24bppBGR, &CLSID_WICPngDecoder, "PNG encoder 24bppBGR"); -if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in Wine */ -{ test_encoder(&testdata_BlackWhite, &CLSID_WICBmpEncoder, &testdata_1bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder BlackWhite"); test_encoder(&testdata_1bppIndexed, &CLSID_WICBmpEncoder, @@ -1504,7 +1510,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in &testdata_4bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICBmpEncoder, &testdata_8bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 8bppIndexed"); -} test_encoder(&testdata_32bppBGR, &CLSID_WICBmpEncoder, &testdata_32bppBGR, &CLSID_WICBmpDecoder, "BMP encoder 32bppBGR"); -- 2.19.2

1 0

[PATCH 2/8] windowscodecs: Add support for palette image formats to TIFF encoder.
by Dmitry Timoshkov Dec. 6, 2018

Dec. 6, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/main.c | 2 +- dlls/windowscodecs/regsvr.c | 5 +++++ dlls/windowscodecs/tests/converter.c | 3 --- dlls/windowscodecs/tiffformat.c | 32 ++++++++++++++++++++++++++-- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 6f781b812b..7650c755ba 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -182,7 +182,7 @@ HRESULT write_source(IWICBitmapFrameEncode *iface, if (FAILED(hr)) { ERR("Failed to convert source, target format %s, %#x\n", debugstr_guid(format), hr); - return hr; + return E_NOTIMPL; } stride = (bpp * width + 7)/8; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 3f53591552..ca02ff98f8 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1211,6 +1211,8 @@ static GUID const * const tiff_decode_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat24bppBGR, @@ -1370,6 +1372,9 @@ static GUID const * const tiff_encode_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat4bppIndexed, + &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat32bppPBGRA, diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index df3cf3be30..44a2c08147 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -1510,8 +1510,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in test_encoder(&testdata_BlackWhite, &CLSID_WICTiffEncoder, &testdata_BlackWhite, &CLSID_WICTiffDecoder, "TIFF encoder BlackWhite"); -if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in Wine */ -{ test_encoder(&testdata_1bppIndexed, &CLSID_WICTiffEncoder, &testdata_1bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 1bppIndexed"); test_encoder(&testdata_2bppIndexed, &CLSID_WICTiffEncoder, @@ -1520,7 +1518,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in &testdata_4bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICTiffEncoder, &testdata_8bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 8bppIndexed"); -} test_encoder(&testdata_24bppBGR, &CLSID_WICTiffEncoder, &testdata_24bppBGR, &CLSID_WICTiffDecoder, "TIFF encoder 24bppBGR"); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 81c6394a52..01d62d925d 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1,5 +1,6 @@ /* * Copyright 2010 Vincent Povirk for CodeWeavers + * Copyright 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 @@ -461,6 +462,12 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) decode_info->bpp = bps; switch (bps) { + case 1: + decode_info->format = &GUID_WICPixelFormat1bppIndexed; + break; + case 2: + decode_info->format = &GUID_WICPixelFormat2bppIndexed; + break; case 4: decode_info->format = &GUID_WICPixelFormat4bppIndexed; break; @@ -469,7 +476,7 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) break; default: FIXME("unhandled indexed bit count %u\n", bps); - return E_FAIL; + return E_NOTIMPL; } break; case 4: /* Transparency mask */ @@ -1408,6 +1415,9 @@ static const struct tiff_encode_format formats[] = { {&GUID_WICPixelFormat48bppRGB, 2, 16, 3, 48, 0, 0, 0}, {&GUID_WICPixelFormat64bppRGBA, 2, 16, 4, 64, 1, 2, 0}, {&GUID_WICPixelFormat64bppPRGBA, 2, 16, 4, 64, 1, 1, 0}, + {&GUID_WICPixelFormat1bppIndexed, 3, 1, 1, 1, 0, 0, 0}, + {&GUID_WICPixelFormat4bppIndexed, 3, 4, 1, 4, 0, 0, 0}, + {&GUID_WICPixelFormat8bppIndexed, 3, 8, 1, 8, 0, 0, 0}, {0} }; @@ -1579,9 +1589,12 @@ static HRESULT WINAPI TiffFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *ifac return WINCODEC_ERR_WRONGSTATE; } + if (IsEqualGUID(pPixelFormat, &GUID_WICPixelFormat2bppIndexed)) + *pPixelFormat = GUID_WICPixelFormat4bppIndexed; + for (i=0; formats[i].guid; i++) { - if (memcmp(formats[i].guid, pPixelFormat, sizeof(GUID)) == 0) + if (IsEqualGUID(formats[i].guid, pPixelFormat)) break; } @@ -1690,6 +1703,21 @@ static HRESULT WINAPI TiffFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, pTIFFSetField(This->parent->tiff, TIFFTAG_YRESOLUTION, (float)This->yres); } + if (This->format->bpp <= 8 && This->colors && !IsEqualGUID(This->format->guid, &GUID_WICPixelFormatBlackWhite)) + { + uint16 red[256], green[256], blue[256]; + UINT i; + + for (i = 0; i < This->colors; i++) + { + red[i] = (This->palette[i] >> 8) & 0xff00; + green[i] = This->palette[i] & 0xff00; + blue[i] = (This->palette[i] << 8) & 0xff00; + } + + pTIFFSetField(This->parent->tiff, TIFFTAG_COLORMAP, red, green, blue); + } + This->info_written = TRUE; } -- 2.19.2

1 0

[PATCH 1/8] windowscodecs/tests: Add tests for encoding 2bpp/4bpp images with a palette. (v3)
by Dmitry Timoshkov Dec. 6, 2018

Dec. 6, 2018

v2: Fix test failures under Windows. v3: Don't mark 2bpp tests as broken. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/converter.c | 323 ++++++++++++++++++++++----- 1 file changed, 267 insertions(+), 56 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 1e557a7fb8..df3cf3be30 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -316,6 +316,20 @@ static const struct bitmap_data testdata_BlackWhite = { static const struct bitmap_data testdata_1bppIndexed = { &GUID_WICPixelFormat1bppIndexed, 1, bits_1bpp, 32, 2, 96.0, 96.0}; +/* some encoders (like BMP) require data to be 4-bytes aligned */ +static const BYTE bits_2bpp[] = { + 0x55,0x55,0x55,0x55, + 0xaa,0xaa,0xaa,0xaa}; +static const struct bitmap_data testdata_2bppIndexed = { + &GUID_WICPixelFormat2bppIndexed, 2, bits_2bpp, 16, 2, 96.0, 96.0}; + +/* some encoders (like BMP) require data to be 4-bytes aligned */ +static const BYTE bits_4bpp[] = { + 0x55,0x55,0x55,0x55, + 0xaa,0xaa,0xaa,0xaa}; +static const struct bitmap_data testdata_4bppIndexed = { + &GUID_WICPixelFormat4bppIndexed, 4, bits_4bpp, 8, 2, 96.0, 96.0}; + static const BYTE bits_8bpp[] = { 0,1,2,3, 4,5,6,7}; @@ -632,64 +646,204 @@ static void test_encoder_properties(const CLSID* clsid_encoder, IPropertyBag2 *o } } -static void check_bmp_format(IStream *stream, const struct bitmap_data *data) +static void load_stream(IUnknown *reader, IStream *stream) { - BITMAPFILEHEADER bfh; - BITMAPINFOHEADER bih; HRESULT hr; - ULONG len; + IWICPersistStream *persist; +#ifdef WORDS_BIGENDIAN + DWORD persist_options = WICPersistOptionBigEndian; +#else + DWORD persist_options = WICPersistOptionLittleEndian; +#endif - hr = IStream_Read(stream, &bfh, sizeof(bfh), &len); - ok(hr == S_OK, "Failed to read file header, hr %#x.\n", hr); + hr = IUnknown_QueryInterface(reader, &IID_IWICPersistStream, (void **)&persist); + ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); - hr = IStream_Read(stream, &bih, sizeof(bih), &len); - ok(hr == S_OK, "Failed to read file header, hr %#x.\n", hr); + hr = IWICPersistStream_LoadEx(persist, stream, NULL, persist_options); + ok(hr == S_OK, "LoadEx failed, hr=%x\n", hr); - ok(bfh.bfType == 0x4d42, "Unexpected header type, %#x.\n", bfh.bfType); - ok(bfh.bfSize != 0, "Unexpected bitmap size %d.\n", bfh.bfSize); - ok(bfh.bfReserved1 == 0, "Unexpected bfReserved1 field.\n"); - ok(bfh.bfReserved2 == 0, "Unexpected bfReserved2 field.\n"); + IWICPersistStream_Release(persist); +} - if (IsEqualGUID(data->format, &GUID_WICPixelFormat1bppIndexed) - || IsEqualGUID(data->format, &GUID_WICPixelFormat8bppIndexed)) +static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) +{ + HRESULT hr; + IWICMetadataReader *reader; + PROPVARIANT id, value; + struct + { + USHORT byte_order; + USHORT version; + ULONG dir_offset; + } tiff; + LARGE_INTEGER pos; + UINT count, i; + int width, height, bps, photo, samples, colormap; + struct { - /* TODO: test with actual palette size */ - ok(bfh.bfOffBits > sizeof(bfh) + sizeof(bih), "Unexpected data offset %d, format %s.\n", - bfh.bfOffBits, wine_dbgstr_guid(data->format)); + int id, *value; + } tag[] = + { + { 0x100, &width }, { 0x101, &height }, { 0x102, &bps }, + { 0x106, &photo }, { 0x115, &samples }, { 0x140, &colormap } + }; + + memset(&tiff, 0, sizeof(tiff)); + hr = IStream_Read(stream, &tiff, sizeof(tiff), NULL); + ok(hr == S_OK, "IStream_Read error %#x\n", hr); + ok(tiff.byte_order == MAKEWORD('I','I') || tiff.byte_order == MAKEWORD('M','M'), + "wrong TIFF byte order mark %02x\n", tiff.byte_order); + ok(tiff.version == 42, "wrong TIFF version %u\n", tiff.version); + + pos.QuadPart = tiff.dir_offset; + hr = IStream_Seek(stream, pos, SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek error %#x\n", hr); + + hr = CoCreateInstance(&CLSID_WICIfdMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void **)&reader); + ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + + load_stream((IUnknown *)reader, stream); + + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount error %#x\n", hr); + ok(count != 0, "wrong count %u\n", count); + + for (i = 0; i < sizeof(tag)/sizeof(tag[0]); i++) + { + PropVariantInit(&id); + PropVariantInit(&value); + + id.vt = VT_UI2; + U(id).uiVal = tag[i].id; + hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); + ok(hr == S_OK || (tag[i].id == 0x140 && hr == WINCODEC_ERR_PROPERTYNOTFOUND), + "GetValue(%04x) error %#x\n", tag[i].id, hr); + if (hr == S_OK) + { + ok(value.vt == VT_UI2 || value.vt == VT_UI4 || value.vt == (VT_UI2 | VT_VECTOR), "wrong vt: %d\n", value.vt); + tag[i].value[0] = U(value).uiVal; + } + else + tag[i].value[0] = -1; } - else - ok(bfh.bfOffBits == sizeof(bfh) + sizeof(bih), "Unexpected data offset %d, format %s.\n", - bfh.bfOffBits, wine_dbgstr_guid(data->format)); - - ok(bih.biSize == sizeof(bih), "Unexpected header size %d.\n", bih.biSize); - ok(bih.biWidth == data->width, "Unexpected bitmap width %d.\n", bih.biWidth); - ok(bih.biHeight == data->height, "Unexpected bitmap height %d.\n", bih.biHeight); - ok(bih.biPlanes == 1, "Unexpected planes count %d.\n", bih.biPlanes); - - if (IsEqualGUID(data->format, &GUID_WICPixelFormat1bppIndexed)) - ok(bih.biBitCount == 1, "Unexpected bit count %u, format %s.\n", bih.biBitCount, - wine_dbgstr_guid(data->format)); - else if (IsEqualGUID(data->format, &GUID_WICPixelFormat8bppIndexed)) - ok(bih.biBitCount == 8, "Unexpected bit count %u, format %s.\n", bih.biBitCount, - wine_dbgstr_guid(data->format)); - else if (IsEqualGUID(data->format, &GUID_WICPixelFormat32bppBGR)) - ok(bih.biBitCount == 32, "Unexpected bit count %u, format %s.\n", bih.biBitCount, - wine_dbgstr_guid(data->format)); - - ok(bih.biCompression == BI_RGB, "Unexpected compression mode %u.\n", bih.biCompression); -todo_wine - ok(bih.biSizeImage == 0, "Unexpected image size %d.\n", bih.biSizeImage); - ok(bih.biXPelsPerMeter == 3780 || broken(bih.biXPelsPerMeter == 0) /* XP */, "Unexpected horz resolution %d.\n", - bih.biXPelsPerMeter); - ok(bih.biYPelsPerMeter == 3780 || broken(bih.biYPelsPerMeter == 0) /* XP */, "Unexpected vert resolution %d.\n", - bih.biYPelsPerMeter); - /* FIXME: test actual data */ + IWICMetadataReader_Release(reader); + + if (IsEqualGUID(format, &GUID_WICPixelFormatBlackWhite)) + { + ok(width == 32, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 1, "wrong bps %d\n", bps); + ok(photo == 1, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == -1, "wrong colormap %d\n", colormap); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed)) + { + ok(width == 32, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 1, "wrong bps %d\n", bps); + ok(photo == 3, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == 6, "wrong colormap %d\n", colormap); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) + { + ok(width == 8, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 4, "wrong bps %d\n", bps); + ok(photo == 3, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == 48, "wrong colormap %d\n", colormap); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) + { + ok(width == 4, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 8, "wrong bps %d\n", bps); + ok(photo == 3, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == 768, "wrong colormap %d\n", colormap); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat24bppBGR)) + { + ok(width == 4, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 3, "wrong bps %d\n", bps); + ok(photo == 2, "wrong photometric %d\n", photo); + ok(samples == 3, "wrong samples %d\n", samples); + ok(colormap == -1, "wrong colormap %d\n", colormap); + } + else + ok(0, "unknown TIFF pixel format %s\n", wine_dbgstr_guid(format)); } -static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) +static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) { - /* FIXME */ + HRESULT hr; + BITMAPFILEHEADER bfh; + BITMAPV5HEADER bih; + + memset(&bfh, 0, sizeof(bfh)); + hr = IStream_Read(stream, &bfh, sizeof(bfh), NULL); + ok(hr == S_OK, "IStream_Read error %#x\n", hr); + + ok(bfh.bfType == 0x4d42, "wrong BMP signature %02x\n", bfh.bfType); + ok(bfh.bfReserved1 == 0, "wrong bfReserved1 %02x\n", bfh.bfReserved1); + ok(bfh.bfReserved2 == 0, "wrong bfReserved2 %02x\n", bfh.bfReserved2); + + memset(&bih, 0, sizeof(bih)); + hr = IStream_Read(stream, &bih, sizeof(bih), NULL); + ok(hr == S_OK, "IStream_Read error %#x\n", hr); + + if (IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed)) + { + ok(bih.bV5Width == 32, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 1, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 256, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 256, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) + { + ok(bih.bV5Width == 8, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 4, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 256, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 256, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) + { + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 8, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 256, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 256, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat32bppBGR)) + { + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 32, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 0, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 0, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else + ok(0, "unknown BMP pixel format %s\n", wine_dbgstr_guid(format)); } static unsigned be_uint(unsigned val) @@ -746,6 +900,28 @@ static void check_png_format(IStream *stream, const WICPixelFormatGUID *format) ok(png.filter == 0, "wrong filter %d\n", png.filter); ok(png.interlace == 0, "wrong interlace %d\n", png.interlace); } + else if (IsEqualGUID(format, &GUID_WICPixelFormat2bppIndexed)) + { + ok(be_uint(png.width) == 16, "wrong width %u\n", be_uint(png.width)); + ok(be_uint(png.height) == 2, "wrong height %u\n", be_uint(png.height)); + + ok(png.bit_depth == 2, "wrong bit_depth %d\n", png.bit_depth); + ok(png.color_type == 3, "wrong color_type %d\n", png.color_type); + ok(png.compression == 0, "wrong compression %d\n", png.compression); + ok(png.filter == 0, "wrong filter %d\n", png.filter); + ok(png.interlace == 0, "wrong interlace %d\n", png.interlace); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) + { + ok(be_uint(png.width) == 8, "wrong width %u\n", be_uint(png.width)); + ok(be_uint(png.height) == 2, "wrong height %u\n", be_uint(png.height)); + + ok(png.bit_depth == 4, "wrong bit_depth %d\n", png.bit_depth); + ok(png.color_type == 3, "wrong color_type %d\n", png.color_type); + ok(png.compression == 0, "wrong compression %d\n", png.compression); + ok(png.filter == 0, "wrong filter %d\n", png.filter); + ok(png.interlace == 0, "wrong interlace %d\n", png.interlace); + } else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) { ok(be_uint(png.width) == 4, "wrong width %u\n", be_uint(png.width)); @@ -772,7 +948,7 @@ static void check_png_format(IStream *stream, const WICPixelFormatGUID *format) ok(0, "unknown PNG pixel format %s\n", wine_dbgstr_guid(format)); } -static void check_bitmap_format(IStream *stream, const CLSID *encoder, const struct bitmap_data *dst) +static void check_bitmap_format(IStream *stream, const CLSID *encoder, const WICPixelFormatGUID *format) { HRESULT hr; LARGE_INTEGER pos; @@ -782,11 +958,11 @@ static void check_bitmap_format(IStream *stream, const CLSID *encoder, const str ok(hr == S_OK, "IStream_Seek error %#x\n", hr); if (IsEqualGUID(encoder, &CLSID_WICPngEncoder)) - check_png_format(stream, dst->format); + check_png_format(stream, format); else if (IsEqualGUID(encoder, &CLSID_WICBmpEncoder)) - check_bmp_format(stream, dst); + check_bmp_format(stream, format); else if (IsEqualGUID(encoder, &CLSID_WICTiffEncoder)) - check_tiff_format(stream, dst->format); + check_tiff_format(stream, format); else ok(0, "unknown encoder %s\n", wine_dbgstr_guid(encoder)); @@ -979,8 +1155,10 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls memcpy(&pixelformat, srcs[i]->format, sizeof(GUID)); hr = IWICBitmapFrameEncode_SetPixelFormat(frameencode, &pixelformat); ok(SUCCEEDED(hr), "SetPixelFormat failed, hr=%x\n", hr); - ok(IsEqualGUID(&pixelformat, dsts[i]->format), "SetPixelFormat changed the format to %s (%s)\n", - wine_dbgstr_guid(&pixelformat), name); + ok(IsEqualGUID(&pixelformat, dsts[i]->format) || + (IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder) && srcs[i]->bpp == 2 && IsEqualGUID(&pixelformat, &GUID_WICPixelFormat4bppIndexed)) || + (IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && srcs[i]->bpp == 2 && IsEqualGUID(&pixelformat, &GUID_WICPixelFormat4bppIndexed)), + "SetPixelFormat changed the format to %s (%s)\n", wine_dbgstr_guid(&pixelformat), name); hr = IWICBitmapFrameEncode_SetSize(frameencode, srcs[i]->width, srcs[i]->height); ok(SUCCEEDED(hr), "SetSize failed, hr=%x\n", hr); @@ -1015,6 +1193,8 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(SUCCEEDED(hr), "WriteSource(%dx%d) failed, hr=%x (%s)\n", rc->Width, rc->Height, hr, name); else ok(hr == S_OK || + (hr == E_NOTIMPL && IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && srcs[i]->bpp == 2) || + (hr == E_NOTIMPL && IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder) && srcs[i]->bpp == 2) || broken(hr == E_INVALIDARG && IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && IsEqualGUID(srcs[i]->format, &GUID_WICPixelFormatBlackWhite)) /* XP */, "WriteSource(NULL) failed, hr=%x (%s)\n", hr, name); } @@ -1046,7 +1226,7 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = IWICBitmapEncoder_Commit(encoder); ok(SUCCEEDED(hr), "Commit failed, hr=%x\n", hr); - check_bitmap_format(stream, clsid_encoder, dsts[0]); + check_bitmap_format(stream, clsid_encoder, dsts[0]->format); } if (SUCCEEDED(hr)) @@ -1106,7 +1286,12 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(ret == count, "expected %u, got %u\n", count, ret); if (IsEqualGUID(clsid_decoder, &CLSID_WICPngDecoder)) { - ok(count == 256 || count == 2 /* newer libpng versions */, "expected 256, got %u (%s)\n", count, name); + /* Newer libpng versions don't accept larger palettes than the declared + * bit depth, so we need to generate the palette of the correct length. + */ + ok(count == 256 || (dsts[i]->bpp == 1 && count == 2) || + (dsts[i]->bpp == 2 && count == 4) || (dsts[i]->bpp == 4 && count == 16), + "expected 256, got %u (%s)\n", count, name); ok(colors[0] == 0x11111111, "got %08x (%s)\n", colors[0], name); ok(colors[1] == 0x22222222, "got %08x (%s)\n", colors[1], name); @@ -1114,8 +1299,11 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls { ok(colors[2] == 0x33333333, "got %08x (%s)\n", colors[2], name); ok(colors[3] == 0x44444444, "got %08x (%s)\n", colors[3], name); - ok(colors[4] == 0x55555555, "got %08x (%s)\n", colors[4], name); - ok(colors[5] == 0, "got %08x (%s)\n", colors[5], name); + if (count > 4) + { + ok(colors[4] == 0x55555555, "got %08x (%s)\n", colors[4], name); + ok(colors[5] == 0, "got %08x (%s)\n", colors[5], name); + } } } else if (IsEqualGUID(clsid_decoder, &CLSID_WICBmpDecoder) || @@ -1133,6 +1321,17 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(colors[4] == 0xff555555, "got %08x (%s)\n", colors[4], name); ok(colors[5] == 0xff000000, "got %08x (%s)\n", colors[5], name); } + else if (IsEqualGUID(dsts[i]->format, &GUID_WICPixelFormat4bppIndexed)) + { + ok(count == 16, "expected 16, got %u (%s)\n", count, name); + + ok(colors[0] == 0xff111111, "got %08x (%s)\n", colors[0], name); + ok(colors[1] == 0xff222222, "got %08x (%s)\n", colors[1], name); + ok(colors[2] == 0xff333333, "got %08x (%s)\n", colors[2], name); + ok(colors[3] == 0xff444444, "got %08x (%s)\n", colors[3], name); + ok(colors[4] == 0xff555555, "got %08x (%s)\n", colors[4], name); + ok(colors[5] == 0xff000000, "got %08x (%s)\n", colors[5], name); + } else { ok(count == 2, "expected 2, got %u (%s)\n", count, name); @@ -1284,6 +1483,10 @@ START_TEST(converter) &testdata_BlackWhite, &CLSID_WICPngDecoder, "PNG encoder BlackWhite"); test_encoder(&testdata_1bppIndexed, &CLSID_WICPngEncoder, &testdata_1bppIndexed, &CLSID_WICPngDecoder, "PNG encoder 1bppIndexed"); + test_encoder(&testdata_2bppIndexed, &CLSID_WICPngEncoder, + &testdata_2bppIndexed, &CLSID_WICPngDecoder, "PNG encoder 2bppIndexed"); + test_encoder(&testdata_4bppIndexed, &CLSID_WICPngEncoder, + &testdata_4bppIndexed, &CLSID_WICPngDecoder, "PNG encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICPngEncoder, &testdata_8bppIndexed, &CLSID_WICPngDecoder, "PNG encoder 8bppIndexed"); test_encoder(&testdata_24bppBGR, &CLSID_WICPngEncoder, @@ -1295,6 +1498,10 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in &testdata_1bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder BlackWhite"); test_encoder(&testdata_1bppIndexed, &CLSID_WICBmpEncoder, &testdata_1bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 1bppIndexed"); + test_encoder(&testdata_2bppIndexed, &CLSID_WICBmpEncoder, + &testdata_4bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 2bppIndexed"); + test_encoder(&testdata_4bppIndexed, &CLSID_WICBmpEncoder, + &testdata_4bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICBmpEncoder, &testdata_8bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 8bppIndexed"); } @@ -1307,6 +1514,10 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in { test_encoder(&testdata_1bppIndexed, &CLSID_WICTiffEncoder, &testdata_1bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 1bppIndexed"); + test_encoder(&testdata_2bppIndexed, &CLSID_WICTiffEncoder, + &testdata_4bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 2bppIndexed"); + test_encoder(&testdata_4bppIndexed, &CLSID_WICTiffEncoder, + &testdata_4bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICTiffEncoder, &testdata_8bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 8bppIndexed"); } -- 2.19.2

1 0

[PATCH 3/3] mpr: Implement support for deleting persistent connections.
by Pierre Schweitzer Dec. 6, 2018

Dec. 6, 2018

-- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

1 0

[PATCH] shlwapi: Remove unused fields.
by Nikolay Sivov Dec. 5, 2018

Dec. 5, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/regstream.c | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 31df82aa8d..decc1f666d 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -39,16 +39,10 @@ typedef struct { IStream IStream_iface; LONG ref; - HKEY hKey; LPBYTE pbBuffer; DWORD dwLength; DWORD dwPos; DWORD dwMode; - union { - LPSTR keyNameA; - LPWSTR keyNameW; - }u; - BOOL bUnicode; } ISHRegStream; static inline ISHRegStream *impl_from_IStream(IStream *iface) @@ -105,35 +99,6 @@ static ULONG WINAPI IStream_fnRelease(IStream *iface) if (!refCount) { - TRACE(" destroying SHReg IStream (%p)\n",This); - - if (This->hKey) - { - /* write back data in REG_BINARY */ - if (This->dwMode == STGM_READWRITE || This->dwMode == STGM_WRITE) - { - if (This->dwLength) - { - if (This->bUnicode) - RegSetValueExW(This->hKey, This->u.keyNameW, 0, REG_BINARY, - (const BYTE *) This->pbBuffer, This->dwLength); - else - RegSetValueExA(This->hKey, This->u.keyNameA, 0, REG_BINARY, - (const BYTE *) This->pbBuffer, This->dwLength); - } - else - { - if (This->bUnicode) - RegDeleteValueW(This->hKey, This->u.keyNameW); - else - RegDeleteValueA(This->hKey, This->u.keyNameA); - } - } - - RegCloseKey(This->hKey); - } - - HeapFree(GetProcessHeap(),0,This->u.keyNameA); HeapFree(GetProcessHeap(),0,This->pbBuffer); HeapFree(GetProcessHeap(),0,This); return 0; @@ -384,13 +349,10 @@ static ISHRegStream *IStream_Create(HKEY hKey, LPBYTE pbBuffer, DWORD dwLength) { regStream->IStream_iface.lpVtbl = &rstvt; regStream->ref = 1; - regStream->hKey = hKey; regStream->pbBuffer = pbBuffer; regStream->dwLength = dwLength; regStream->dwPos = 0; regStream->dwMode = STGM_READWRITE; - regStream->u.keyNameA = NULL; - regStream->bUnicode = FALSE; } TRACE ("Returning %p\n", regStream); return regStream; -- 2.19.2

1 0

[PATCH] setupapi: Always return device info from SetupDiGetDeviceInterfaceDetail() if requested.
by Zebediah Figura Dec. 5, 2018

Dec. 5, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 14 ++++++++------ dlls/setupapi/tests/devinst.c | 7 +++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index c1e1251cdc..fbc8900229 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2653,9 +2653,6 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO devinfo, SP_DEVICE_INTERFA else DeviceInterfaceDetailData->DevicePath[0] = '\0'; - if (device_data && device_data->cbSize == sizeof(SP_DEVINFO_DATA)) - copy_device_data(device_data, iface->device); - ret = TRUE; } else @@ -2664,6 +2661,10 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO devinfo, SP_DEVICE_INTERFA *RequiredSize = bytesNeeded; SetLastError(ERROR_INSUFFICIENT_BUFFER); } + + if (device_data && device_data->cbSize == sizeof(SP_DEVINFO_DATA)) + copy_device_data(device_data, iface->device); + return ret; } @@ -2708,9 +2709,6 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO devinfo, SP_DEVICE_INTERFA else DeviceInterfaceDetailData->DevicePath[0] = '\0'; - if (device_data && device_data->cbSize == sizeof(SP_DEVINFO_DATA)) - copy_device_data(device_data, iface->device); - ret = TRUE; } else @@ -2719,6 +2717,10 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO devinfo, SP_DEVICE_INTERFA *RequiredSize = bytesNeeded; SetLastError(ERROR_INSUFFICIENT_BUFFER); } + + if (device_data && device_data->cbSize == sizeof(SP_DEVINFO_DATA)) + copy_device_data(device_data, iface->device); + return ret; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index b73af781d1..886957fe19 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -764,6 +764,13 @@ static void test_device_iface_detail(void) ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got unexpected error %#x.\n", GetLastError()); ok(size == expectedsize, "Got unexpected size %d.\n", size); + memset(&device, 0, sizeof(device)); + device.cbSize = sizeof(device); + ret = SetupDiGetDeviceInterfaceDetailW(set, &iface, NULL, 0, &size, &device); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + ok(IsEqualGUID(&device.ClassGuid, &guid), "Got unexpected class %s.\n", wine_dbgstr_guid(&device.ClassGuid)); + heap_free(detail); SetupDiDestroyDeviceInfoList(set); } -- 2.14.1

1 0

[PATCH] setupapi: Use strtoulW().
by Zebediah Figura Dec. 5, 2018

Dec. 5, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5685dc3bff..38da640878 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1412,29 +1412,6 @@ BOOL WINAPI SetupDiCreateDeviceInfoA(HDEVINFO DeviceInfoSet, const char *name, return ret; } -static DWORD SETUPDI_DevNameToDevID(LPCWSTR devName) -{ - LPCWSTR ptr; - int devNameLen = lstrlenW(devName); - DWORD devInst = 0; - BOOL valid = TRUE; - - TRACE("%s\n", debugstr_w(devName)); - for (ptr = devName; valid && *ptr && ptr - devName < devNameLen; ) - { - if (isdigitW(*ptr)) - { - devInst *= 10; - devInst |= *ptr - '0'; - ptr++; - } - else - valid = FALSE; - } - TRACE("%d\n", valid ? devInst : 0xffffffff); - return valid ? devInst : 0xffffffff; -} - /*********************************************************************** * SetupDiCreateDeviceInfoW (SETUPAPI.@) */ @@ -1483,14 +1460,16 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const LIST_FOR_EACH_ENTRY(device, &set->devices, struct device, entry) { const WCHAR *instance_str = strrchrW(device->instanceId, '\\'); + WCHAR *endptr; if (instance_str) instance_str++; else instance_str = device->instanceId; - instance_id = SETUPDI_DevNameToDevID(instance_str); - if (instance_id != 0xffffffff && instance_id > highest_id) - highest_id = instance_id; + + instance_id = strtoulW(instance_str, &endptr, 10); + if (*instance_str && !*endptr) + highest_id = max(highest_id, instance_id); } if (snprintfW(id, ARRAY_SIZE(id), formatW, name, highest_id + 1) == -1) -- 2.14.1

1 0

[PATCH] testbot/TestAgent: Don't append a '\0' when sending data.
by Francois Gouget Dec. 5, 2018

Dec. 5, 2018

_SendString() is used to both send data, typically the content of files, and perl strings. In the first case $Type is 'd', and in the latter 's' and a trailing '\0' is added to match the C convention. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 8957b9f829..a128e347e4 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -791,10 +791,12 @@ sub _SendUInt64($$$) sub _SendString($$$;$) { my ($self, $Name, $Str, $Type) = @_; + $Type ||= 's'; + debug(" SendString('$Name', '$Str', '$Type')\n"); - debug(" SendString('$Name', '$Str')\n"); - $Str .= "\0"; - return $self->_SendEntryHeader($Name, $Type || 's', length($Str)) && + # Add a trailing '\0' to strings to match the C convention. + $Str .= "\0" if ($Type eq 's'); + return $self->_SendEntryHeader($Name, $Type, length($Str)) && $self->_SendRawData($Name, $Str); } -- 2.19.2

1 0

[PATCH] Add ext-ms-win-ntuser-misc-l1-2-0
by Alistair Leslie-Hughes Dec. 5, 2018

Dec. 5, 2018

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure | 17 ++------ configure.ac | 1 + dlls/ext-ms-win-ntuser-misc-l1-2-0/Makefile.in | 2 + .../ext-ms-win-ntuser-misc-l1-2-0.spec | 48 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 56 insertions(+), 13 deletions(-) create mode 100755 dlls/ext-ms-win-ntuser-misc-l1-2-0/Makefile.in create mode 100644 dlls/ext-ms-win-ntuser-misc-l1-2-0/ext-ms-win-ntuser-misc-l1-2-0.spec diff --git a/configure b/configure index 99adcfb..f3c7678 100755 --- a/configure +++ b/configure @@ -1272,6 +1271,7 @@ enable_ext_ms_win_ntuser_draw_l1_1_0 enable_ext_ms_win_ntuser_gui_l1_3_0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 enable_ext_ms_win_ntuser_message_l1_1_1 +enable_ext_ms_win_ntuser_misc_l1_2_0 enable_ext_ms_win_ntuser_misc_l1_5_1 enable_ext_ms_win_ntuser_mouse_l1_1_0 enable_ext_ms_win_ntuser_private_l1_1_1 @@ -19461,6 +19451,7 @@ wine_fn_config_makefile dlls/ext-ms-win-ntuser-draw-l1-1-0 enable_ext_ms_win_ntu wine_fn_config_makefile dlls/ext-ms-win-ntuser-gui-l1-3-0 enable_ext_ms_win_ntuser_gui_l1_3_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-keyboard-l1-3-0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-misc-l1-2-0 enable_ext_ms_win_ntuser_misc_l1_2_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-misc-l1-5-1 enable_ext_ms_win_ntuser_misc_l1_5_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-mouse-l1-1-0 enable_ext_ms_win_ntuser_mouse_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_private_l1_1_1 diff --git a/configure.ac b/configure.ac index 187101f..d9fe858 100644 --- a/configure.ac +++ b/configure.ac @@ -3301,6 +3301,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-gui-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-keyboard-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-misc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-misc-l1-5-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-mouse-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-private-l1-1-1) diff --git a/dlls/ext-ms-win-ntuser-misc-l1-2-0/Makefile.in b/dlls/ext-ms-win-ntuser-misc-l1-2-0/Makefile.in new file mode 100755 index 0000000..6424097 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-misc-l1-2-0/Makefile.in @@ -0,0 +1,2 @@ +MODULE = ext-ms-win-ntuser-misc-l1-2-0.dll + diff --git a/dlls/ext-ms-win-ntuser-misc-l1-2-0/ext-ms-win-ntuser-misc-l1-2-0.spec b/dlls/ext-ms-win-ntuser-misc-l1-2-0/ext-ms-win-ntuser-misc-l1-2-0.spec new file mode 100644 index 0000000..917984a --- /dev/null +++ b/dlls/ext-ms-win-ntuser-misc-l1-2-0/ext-ms-win-ntuser-misc-l1-2-0.spec @@ -0,0 +1,48 @@ +@ stdcall AttachThreadInput(long long long) user32.AttachThreadInput +@ stdcall CloseClipboard() user32.CloseClipboard +@ stub CloseGestureInfoHandle +@ stdcall DrawTextExW(long wstr long ptr long ptr) user32.DrawTextExW +@ stdcall DrawTextW(long wstr long ptr long) user32.DrawTextW +@ stdcall EmptyClipboard() user32.EmptyClipboard +@ stdcall EnableScrollBar(long long long) user32.EnableScrollBar +@ stdcall ExitWindowsEx(long long) user32.ExitWindowsEx +@ stdcall GetClipboardData(long) user32.GetClipboardData +@ stdcall GetClipboardFormatNameW(long ptr long) user32.GetClipboardFormatNameW +@ stdcall GetClipboardOwner() user32.GetClipboardOwner +@ stdcall GetGestureConfig(long long long ptr ptr long) user32.GetGestureConfig +@ stdcall GetGestureInfo(long ptr) user32.GetGestureInfo +@ stdcall GetGuiResources(long long) user32.GetGuiResources +@ stdcall GetRawInputData(ptr long ptr ptr long) user32.GetRawInputData +@ stdcall GetRawInputDeviceInfoW(ptr long ptr ptr) user32.GetRawInputDeviceInfoW +@ stdcall GetRawInputDeviceList(ptr ptr long) user32.GetRawInputDeviceList +@ stdcall GetScrollBarInfo(long long ptr) user32.GetScrollBarInfo +@ stdcall GetScrollInfo(long long ptr) user32.GetScrollInfo +@ stdcall GetScrollPos(long long) user32.GetScrollPos +@ stdcall GetTouchInputInfo(long long ptr long) user32.GetTouchInputInfo +@ stdcall GetUserObjectSecurity(long ptr ptr long ptr) user32.GetUserObjectSecurity +@ stub GetWindowFeedbackSetting +@ stdcall IsClipboardFormatAvailable(long) user32.IsClipboardFormatAvailable +@ stdcall IsTouchWindow(long ptr) user32.IsTouchWindow +@ stdcall KillTimer(long long) user32.KillTimer +@ stdcall MessageBeep(long) user32.MessageBeep +@ stdcall OpenClipboard(long) user32.OpenClipboard +@ stdcall RegisterClipboardFormatA(str) user32.RegisterClipboardFormatA +@ stdcall RegisterClipboardFormatW(wstr) user32.RegisterClipboardFormatW +@ stdcall RegisterDeviceNotificationW(long ptr long) user32.RegisterDeviceNotificationW +@ stdcall RegisterRawInputDevices(ptr long long) user32.RegisterRawInputDevices +@ stdcall ScrollWindowEx(long long long ptr ptr long ptr long) user32.ScrollWindowEx +@ stdcall SetClipboardData(long long) user32.SetClipboardData +@ stdcall SetCoalescableTimer(long long long ptr long) user32.SetCoalescableTimer +@ stdcall SetScrollInfo(long long ptr long) user32.SetScrollInfo +@ stdcall SetScrollPos(long long long long) user32.SetScrollPos +@ stdcall SetScrollRange(long long long long long) user32.SetScrollRange +@ stdcall SetTimer(long long long ptr) user32.SetTimer +@ stdcall SetUserObjectSecurity(long ptr ptr) user32.SetUserObjectSecurity +@ stub SetWindowFeedbackSetting +@ stdcall ShowScrollBar(long long long) user32.ShowScrollBar +@ stdcall ShutdownBlockReasonCreate(long wstr) user32.ShutdownBlockReasonCreate +@ stdcall ShutdownBlockReasonDestroy(long) user32.ShutdownBlockReasonDestroy +@ stdcall TabbedTextOutW(long long long wstr long long ptr long) user32.TabbedTextOutW +@ stdcall UnregisterDeviceNotification(long) user32.UnregisterDeviceNotification +@ stdcall WaitForInputIdle(long long) user32.WaitForInputIdle +@ stdcall WinHelpW(long wstr long long) user32.WinHelpW diff --git a/tools/make_specfiles b/tools/make_specfiles index 2b38aed..edc317d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -384,6 +384,7 @@ my @dll_groups = "ext-ms-win-ntuser-gui-l1-3-0", "ext-ms-win-ntuser-keyboard-l1-3-0", "ext-ms-win-ntuser-message-l1-1-1", + "ext-ms-win-ntuser-misc-l1-2-0", "ext-ms-win-ntuser-misc-l1-5-1", "ext-ms-win-ntuser-mouse-l1-1-0", "ext-ms-win-ntuser-private-l1-1-1", -- 1.9.1

1 0

[PATCH v2 1/3] loader: Fix building of the preloader on Mac.
by Ken Thomases Dec. 5, 2018

Dec. 5, 2018

Don't reference the Linux-specific variables preloader_start and preloader_end in the shared code. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- v2: Avoid a platform #ifdef in the shared code Set up infrastructure for eventual implementation of overlap check on Mac loader/preloader.c | 19 ++++++++++++------- loader/preloader.h | 1 + loader/preloader_mac.c | 5 +++++ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 3b1f5ad..9f2fbc3 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -1049,6 +1049,17 @@ static int is_in_preload_range( const struct wld_auxv *av, int type ) return 0; } +int preloader_overlaps_range( const void *start, const void *end ) +{ + if ((char *)end > preloader_start && (char *)start <= preloader_end) + { + wld_printf( "WINEPRELOADRESERVE range %p-%p overlaps preloader %p-%p\n", + start, end, preloader_start, preloader_end ); + return 1; + } + return 0; +} + /* set the process name if supported */ static void set_process_name( int argc, char *argv[] ) { @@ -1316,14 +1327,8 @@ void preload_reserve( const char *str, struct wine_preload_info *preload_info, s else if (result) goto error; /* single value '0' is allowed */ /* sanity checks */ - if (end <= start) start = end = NULL; - else if ((char *)end > preloader_start && - (char *)start <= preloader_end) - { - wld_printf( "WINEPRELOADRESERVE range %p-%p overlaps preloader %p-%p\n", - start, end, preloader_start, preloader_end ); + if (end <= start || preloader_overlaps_range(start, end)) start = end = NULL; - } /* check for overlap with low memory areas */ for (i = 0; preload_info[i].size; i++) diff --git a/loader/preloader.h b/loader/preloader.h index 2c2262e..b944a09 100644 --- a/loader/preloader.h +++ b/loader/preloader.h @@ -51,6 +51,7 @@ extern __attribute__((format(printf,1,2))) void wld_printf(const char *fmt, ... extern __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char *fmt, ... ); extern void preload_reserve( const char *str, struct wine_preload_info *preload_info, size_t page_mask ); +extern int preloader_overlaps_range( const void *start, const void *end ); /* remove a range from the preload list */ static inline void remove_preload_range( int i, struct wine_preload_info *preload_info ) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index d008270..5e9f9fc 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -374,6 +374,11 @@ static int map_region( struct wine_preload_info *info ) return 0; } +int preloader_overlaps_range( const void *start, const void *end ) +{ + return 0; +} + static inline void get_dyld_func( const char *name, void **func ) { _dyld_func_lookup( name, func ); -- 2.10.2

1 2

[PATCH v3 1/3] comctl32/tests: Test status bar size grip behavior and bounds.
by Waritnan Sookbuntherng Dec. 5, 2018

Dec. 5, 2018

Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> --- v2: Add tests. v3: Cover more points. --- dlls/comctl32/tests/status.c | 85 ++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index d78bd20262..074e637801 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -20,6 +20,7 @@ #include <windows.h> #include <commctrl.h> +#include <uxtheme.h> #include "wine/test.h" @@ -586,6 +587,89 @@ static void test_notify(void) ok(g_got_contextmenu, "WM_RBUTTONUP did not activate the context menu!\n"); } +static void test_sizegrip(void) +{ + HWND hwndStatus; + LONG style; + RECT rcClient, rcGripper; + POINT pt; + int width, r; + + hwndStatus = CreateWindowA(SUBCLASS_NAME, "", WS_CHILD|WS_VISIBLE|SBARS_SIZEGRIP, + 0, 0, 100, 100, g_hMainWnd, NULL, NULL, NULL); + + style = GetWindowLongPtrA(g_hMainWnd, GWL_STYLE); + GetClientRect(hwndStatus, &rcClient); + + width = GetSystemMetrics(SM_CXVSCROLL); + + rcGripper = rcClient; + rcGripper.left = rcClient.right - width; + +#define SETWNDLONG(MAXIMIZE, RTL) \ + do \ + { \ + SetWindowLongA(g_hMainWnd, GWL_STYLE, (MAXIMIZE) ? style|WS_MAXIMIZE : style); \ + SetWindowLongA(hwndStatus, GWL_EXSTYLE, (RTL) ? WS_EX_LAYOUTRTL : 0); \ + } while (0) + +#define TEST_NCHITTEST(X, Y, EXPECT) \ + do \ + { \ + pt.x = (X); \ + pt.y = (Y); \ + ClientToScreen(hwndStatus, &pt); \ + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(pt.x, pt.y)); \ + ok((EXPECT) == r, "expect WM_NCHITTEST " #EXPECT " got %#x\n", r); \ + } while (0) + + /* check bounds when not maximized */ + SETWNDLONG(FALSE, FALSE); + todo_wine TEST_NCHITTEST(rcGripper.left, rcGripper.top, HTBOTTOMRIGHT); + TEST_NCHITTEST(rcGripper.left - 1, rcGripper.top, HTCLIENT); + todo_wine TEST_NCHITTEST(rcGripper.left, rcGripper.top - 1, HTBOTTOMRIGHT); + todo_wine TEST_NCHITTEST(rcGripper.right, rcGripper.bottom, HTBOTTOMRIGHT); + todo_wine TEST_NCHITTEST(rcGripper.right + 1, rcGripper.bottom, HTBOTTOMRIGHT); + todo_wine TEST_NCHITTEST(rcGripper.right, rcGripper.bottom + 1, HTBOTTOMRIGHT); + TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTBOTTOMRIGHT); + + /* maximized */ + SETWNDLONG(TRUE, FALSE); + TEST_NCHITTEST(rcGripper.left, rcGripper.top, HTCLIENT); + TEST_NCHITTEST(rcGripper.left - 1, rcGripper.top, HTCLIENT); + TEST_NCHITTEST(rcGripper.left, rcGripper.top - 1, HTNOWHERE); + TEST_NCHITTEST(rcGripper.right, rcGripper.bottom, HTNOWHERE); + TEST_NCHITTEST(rcGripper.right + 1, rcGripper.bottom, HTNOWHERE); + TEST_NCHITTEST(rcGripper.right, rcGripper.bottom + 1, HTNOWHERE); + todo_wine TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTCLIENT); + + /* not maximized and right-to-left */ + SETWNDLONG(FALSE, TRUE); + todo_wine TEST_NCHITTEST(rcGripper.left, rcGripper.top, HTBOTTOMLEFT); + TEST_NCHITTEST(rcGripper.left - 1, rcGripper.top, HTCLIENT); + todo_wine TEST_NCHITTEST(rcGripper.left, rcGripper.top - 1, HTBOTTOMLEFT); + todo_wine TEST_NCHITTEST(rcGripper.right, rcGripper.bottom, HTBOTTOMLEFT); + todo_wine TEST_NCHITTEST(rcGripper.right + 1, rcGripper.bottom, HTBOTTOMLEFT); + todo_wine TEST_NCHITTEST(rcGripper.right, rcGripper.bottom + 1, HTBOTTOMLEFT); + TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTBOTTOMLEFT); + + /* maximized with right-to-left */ + SETWNDLONG(TRUE, TRUE); + TEST_NCHITTEST(rcGripper.left, rcGripper.top, HTCLIENT); + TEST_NCHITTEST(rcGripper.left - 1, rcGripper.top, HTCLIENT); + TEST_NCHITTEST(rcGripper.left, rcGripper.top - 1, HTNOWHERE); + TEST_NCHITTEST(rcGripper.right, rcGripper.bottom, HTNOWHERE); + TEST_NCHITTEST(rcGripper.right + 1, rcGripper.bottom, HTNOWHERE); + TEST_NCHITTEST(rcGripper.right, rcGripper.bottom + 1, HTNOWHERE); + todo_wine TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTCLIENT); + +#undef TEST_NCHITTEST +#undef SETWNDLONG + + SetWindowLongA(g_hMainWnd, GWL_STYLE, style); + DestroyWindow(hwndStatus); +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -620,4 +704,5 @@ START_TEST(status) test_status_ownerdraw(); test_gettext(); test_notify(); + test_sizegrip(); } -- 2.19.1

2 1

[PATCH 2/9] windowscodecs: Add support for palette image formats to TIFF encoder.
by Dmitry Timoshkov Dec. 5, 2018

Dec. 5, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/regsvr.c | 6 ++++++ dlls/windowscodecs/tests/converter.c | 18 ++++++++++++------ dlls/windowscodecs/tiffformat.c | 26 ++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 3f53591552..05c8f03a3d 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1211,6 +1211,8 @@ static GUID const * const tiff_decode_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat24bppBGR, @@ -1370,6 +1372,10 @@ static GUID const * const tiff_encode_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, + &GUID_WICPixelFormat4bppIndexed, + &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat32bppPBGRA, diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 8072064b48..13c50d7dff 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -752,13 +752,13 @@ static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat2bppIndexed)) { - ok(width == 32, "wrong width %u\n", width); + ok(width == 16, "wrong width %u\n", width); ok(height == 2, "wrong height %u\n", height); - ok(bps == 1, "wrong bps %d\n", bps); + ok(bps == 2, "wrong bps %d\n", bps); ok(photo == 3, "wrong photometric %d\n", photo); ok(samples == 1, "wrong samples %d\n", samples); - ok(colormap == 6, "wrong colormap %d\n", colormap); + ok(colormap == 12, "wrong colormap %d\n", colormap); } else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) { @@ -1341,6 +1341,15 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(colors[4] == 0xff555555, "got %08x (%s)\n", colors[4], name); ok(colors[5] == 0xff000000, "got %08x (%s)\n", colors[5], name); } + else if (IsEqualGUID(dsts[i]->format, &GUID_WICPixelFormat2bppIndexed)) + { + ok(count == 4, "expected 4, got %u (%s)\n", count, name); + + ok(colors[0] == 0xff111111, "got %08x (%s)\n", colors[0], name); + ok(colors[1] == 0xff222222, "got %08x (%s)\n", colors[1], name); + ok(colors[2] == 0xff333333, "got %08x (%s)\n", colors[2], name); + ok(colors[3] == 0xff444444, "got %08x (%s)\n", colors[3], name); + } else if (IsEqualGUID(dsts[i]->format, &GUID_WICPixelFormat4bppIndexed)) { ok(count == 16, "expected 16, got %u (%s)\n", count, name); @@ -1530,8 +1539,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in test_encoder(&testdata_BlackWhite, &CLSID_WICTiffEncoder, &testdata_BlackWhite, &CLSID_WICTiffDecoder, "TIFF encoder BlackWhite"); -if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in Wine */ -{ test_encoder(&testdata_1bppIndexed, &CLSID_WICTiffEncoder, &testdata_1bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 1bppIndexed"); test_encoder(&testdata_2bppIndexed, &CLSID_WICTiffEncoder, @@ -1540,7 +1547,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in &testdata_4bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICTiffEncoder, &testdata_8bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 8bppIndexed"); -} test_encoder(&testdata_24bppBGR, &CLSID_WICTiffEncoder, &testdata_24bppBGR, &CLSID_WICTiffDecoder, "TIFF encoder 24bppBGR"); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 81c6394a52..62476a9bb9 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1,5 +1,6 @@ /* * Copyright 2010 Vincent Povirk for CodeWeavers + * Copyright 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 @@ -461,6 +462,12 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) decode_info->bpp = bps; switch (bps) { + case 1: + decode_info->format = &GUID_WICPixelFormat1bppIndexed; + break; + case 2: + decode_info->format = &GUID_WICPixelFormat2bppIndexed; + break; case 4: decode_info->format = &GUID_WICPixelFormat4bppIndexed; break; @@ -1408,6 +1415,10 @@ static const struct tiff_encode_format formats[] = { {&GUID_WICPixelFormat48bppRGB, 2, 16, 3, 48, 0, 0, 0}, {&GUID_WICPixelFormat64bppRGBA, 2, 16, 4, 64, 1, 2, 0}, {&GUID_WICPixelFormat64bppPRGBA, 2, 16, 4, 64, 1, 1, 0}, + {&GUID_WICPixelFormat1bppIndexed, 3, 1, 1, 1, 0, 0, 0}, + {&GUID_WICPixelFormat2bppIndexed, 3, 2, 1, 2, 0, 0, 0}, + {&GUID_WICPixelFormat4bppIndexed, 3, 4, 1, 4, 0, 0, 0}, + {&GUID_WICPixelFormat8bppIndexed, 3, 8, 1, 8, 0, 0, 0}, {0} }; @@ -1690,6 +1701,21 @@ static HRESULT WINAPI TiffFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, pTIFFSetField(This->parent->tiff, TIFFTAG_YRESOLUTION, (float)This->yres); } + if (This->format->bpp <= 8 && This->colors && !IsEqualGUID(This->format->guid, &GUID_WICPixelFormatBlackWhite)) + { + uint16 red[256], green[256], blue[256]; + UINT i; + + for (i = 0; i < This->colors; i++) + { + red[i] = (This->palette[i] >> 8) & 0xff00; + green[i] = This->palette[i] & 0xff00; + blue[i] = (This->palette[i] << 8) & 0xff00; + } + + pTIFFSetField(This->parent->tiff, TIFFTAG_COLORMAP, red, green, blue); + } + This->info_written = TRUE; } -- 2.17.1

2 6

[PATCH] jscript: Add Array.prototype.forEach implementation.
by Jacek Caban Dec. 5, 2018

Dec. 5, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/array.c | 45 ++++++++++++++++++++++++++++++- dlls/mshtml/tests/documentmode.js | 1 + dlls/mshtml/tests/es5.js | 24 ++++++++++++++++- 3 files changed, 68 insertions(+), 2 deletions(-)

1 0

IMFSourceReader ReadSample Implementation
by Ahmed Elsayed Dec. 5, 2018

Dec. 5, 2018

Could you please add "IMFSourceReader ReadSample Implementation" to the list of things that need to be done in Wine 4.0? Applications affected by This bug:Danganronpa V3: Killing Harmony Resident Evil 7: Biohazard For more info: https://bugs.winehq.org/show_bug.cgi?id=43814 https://bugs.winehq.org/show_bug.cgi?id=46133 Ahmed Elsayed ahmed.com(a)aol.com

2 1

[PATCH] ntoskrnl.exe: Drop the WINE_ prefix from debug functions
by Michael Stefaniuc Dec. 5, 2018

Dec. 5, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2b3b2ec0ef..aea7d4446c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3323,8 +3323,7 @@ static HMODULE load_driver_module( const WCHAR *name ) if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) { - WINE_TRACE( "%s: relocating from %p to %p\n", - wine_dbgstr_w(name), (char *)module - delta, module ); + TRACE( "%s: relocating from %p to %p\n", wine_dbgstr_w(name), (char *)module - delta, module ); end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); while (rel < end && rel->SizeOfBlock) { @@ -3379,7 +3378,7 @@ static HMODULE load_driver( const WCHAR *driver_name, const UNICODE_STRING *keyn if (RegOpenKeyW( HKEY_LOCAL_MACHINE, keyname->Buffer + 18 /* skip \registry\machine */, &driver_hkey )) { - WINE_ERR( "cannot open key %s, err=%u\n", wine_dbgstr_w(keyname->Buffer), GetLastError() ); + ERR( "cannot open key %s, err=%u\n", wine_dbgstr_w(keyname->Buffer), GetLastError() ); return NULL; } @@ -3435,7 +3434,7 @@ static HMODULE load_driver( const WCHAR *driver_name, const UNICODE_STRING *keyn } RegCloseKey( driver_hkey ); - WINE_TRACE( "loading driver %s\n", wine_dbgstr_w(str) ); + TRACE( "loading driver %s\n", wine_dbgstr_w(str) ); module = load_driver_module( str ); HeapFree( GetProcessHeap(), 0, path ); @@ -3473,12 +3472,12 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING TRACE_(relay)( "\1Ret driver init %p (obj=%p,str=%s) retval=%08x\n", driver_object->DriverInit, driver_object, wine_dbgstr_w(keyname->Buffer), status ); - WINE_TRACE( "init done for %s obj %p\n", wine_dbgstr_w(driver_name), driver_object ); - WINE_TRACE( "- DriverInit = %p\n", driver_object->DriverInit ); - WINE_TRACE( "- DriverStartIo = %p\n", driver_object->DriverStartIo ); - WINE_TRACE( "- DriverUnload = %p\n", driver_object->DriverUnload ); + TRACE( "init done for %s obj %p\n", wine_dbgstr_w(driver_name), driver_object ); + TRACE( "- DriverInit = %p\n", driver_object->DriverInit ); + TRACE( "- DriverStartIo = %p\n", driver_object->DriverStartIo ); + TRACE( "- DriverUnload = %p\n", driver_object->DriverUnload ); for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) - WINE_TRACE( "- MajorFunction[%d] = %p\n", i, driver_object->MajorFunction[i] ); + TRACE( "- MajorFunction[%d] = %p\n", i, driver_object->MajorFunction[i] ); return status; } -- 2.19.2

1 0

[PATCH] shcore: Print the debugstr instead of the pointer to it
by Michael Stefaniuc Dec. 5, 2018

Dec. 5, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shcore/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index c5b98569e2..a544f27006 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -2285,7 +2285,7 @@ DWORD WINAPI SHSetValueA(HKEY hkey, const char *subkey, const char *value, */ DWORD WINAPI SHRegSetPathA(HKEY hkey, const char *subkey, const char *value, const char *path, DWORD flags) { - FIXME("(%p, %s, %s, %p, %#x) - semi-stub\n", hkey, debugstr_a(subkey), + FIXME("(%p, %s, %s, %s, %#x) - semi-stub\n", hkey, debugstr_a(subkey), debugstr_a(value), debugstr_a(path), flags); /* FIXME: PathUnExpandEnvStringsA() */ -- 2.19.2

1 0

[PATCH] winepulse.drv: Avoid unnecessary use of ceil function
by Alex Henrie Dec. 5, 2018

Dec. 5, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/winepulse.drv/mmdevdrv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 8d57f1a45a..0823af6341 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -28,7 +28,6 @@ #include <stdarg.h> #include <unistd.h> -#include <math.h> #include <stdio.h> #include <errno.h> @@ -1400,7 +1399,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, period_bytes = pa_frame_size(&This->ss) * MulDiv(period, This->ss.rate, 10000000); if (duration < 20000000) - This->bufsize_frames = ceil((duration / 10000000.) * fmt->nSamplesPerSec); + This->bufsize_frames = (duration * fmt->nSamplesPerSec + 9999999) / 10000000; else This->bufsize_frames = 2 * fmt->nSamplesPerSec; This->bufsize_bytes = This->bufsize_frames * pa_frame_size(&This->ss); -- 2.19.2

2 2

[PATCH 7/7] tzres: Add time zone name resource DLL and use it.
by Akihiro Sagawa Dec. 5, 2018

Dec. 5, 2018

This will fix https://bugs.winehq.org/show_bug.cgi?id=42719 after Japanese translation update. String IDs are based on SHA1 hash so that we can add another zone name without changing existing IDs. I'm preparing a tool which generate these IDs and time zone information. I'll send it later. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- configure | 2 + configure.ac | 1 + dlls/ntdll/tests/time.c | 4 +- dlls/tzres/Makefile.in | 2 + dlls/tzres/tzres.rc | 201 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/tzres/tzres.spec | 1 + loader/wine.inf.in | 198 +++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 407 insertions(+), 2 deletions(-) create mode 100644 dlls/tzres/Makefile.in create mode 100644 dlls/tzres/tzres.rc create mode 100644 dlls/tzres/tzres.spec

2 1

[PATCH 5/7] kernel32: Use an indirect time zone name in GetTimeZoneInformationForYear.
by Akihiro Sagawa Dec. 5, 2018

Dec. 5, 2018

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/time.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)

2 1

[PATCH 4/7] ntdll: Use an indirect time zone name if available.
by Akihiro Sagawa Dec. 5, 2018

Dec. 5, 2018

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ntdll/time.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)

1 0

[PATCH 3/7] loader/wine.inf: Update display names as seen in mapping tables.
by Akihiro Sagawa Dec. 5, 2018

Dec. 5, 2018

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- loader/wine.inf.in | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)

1 0

[PATCH 2/7] loader/wine.inf: Remove non-standard Chile Standard Time.
by Akihiro Sagawa Dec. 5, 2018

Dec. 5, 2018

Use Pacific SA Standard Time, instead. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- loader/wine.inf.in | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)

1 0

[PATCH 1/7] loader/wine.inf: Remove obsolete time zone entries.
by Akihiro Sagawa Dec. 5, 2018

Dec. 5, 2018

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- loader/wine.inf.in | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)

1 0

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

Dec. 5, 2018

1 0

[PATCH] testbot/web: Show the job and task run time.
by Francois Gouget Dec. 5, 2018

Dec. 5, 2018

The run time is shown instead of the end time, though the latter is still visible as a tooltip. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Knowing how long a test took, particularly for individual tasks, seems more useful and meaningful than knowing when it ended (even if you can derive the former from the latter by doing enough math in your head). .../lib/ObjectModel/CGI/CollectionBlock.pm | 19 +++++++--- testbot/web/JobDetails.pl | 35 +++++++++++++++++++ testbot/web/index.pl | 35 +++++++++++++++++++ 3 files changed, 84 insertions(+), 5 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 105280e30e..f9e590c808 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -81,12 +81,21 @@ function Pad2(n) { return n < 10 ? '0' + n : n; } -function ShowDateTime(Sec1970) + +function ShowDateTime(Sec1970, Id, Attr) { var Dt = new Date(Sec1970 * 1000); - document.write(Dt.getFullYear() + '/' + Pad2(Dt.getMonth() + 1) + '/' + - Pad2(Dt.getDate()) + ' ' + Pad2(Dt.getHours()) + ':' + - Pad2(Dt.getMinutes()) + ':' + Pad2(Dt.getSeconds())); + var Pretty = Dt.getFullYear() + '/' + Pad2(Dt.getMonth() + 1) + '/' + + Pad2(Dt.getDate()) + ' ' + Pad2(Dt.getHours()) + ':' + + Pad2(Dt.getMinutes()) + ':' + Pad2(Dt.getSeconds()) + if (Id != null) + { + document.getElementById(Id).setAttribute(Attr || "title", Pretty); + } + else + { + document.write(Pretty); + } } //--></script> EOF @@ -450,7 +459,7 @@ sub GetDisplayValue($$$) { if (defined($Value)) { -$Value = + $Value = "<noscript><div>" . strftime("%Y/%m/%d %H:%M:%S", localtime($Value)) . "</div></noscript>\n" . "<script type='text/javascript'></script>\n"; + print "</td>\n"; + } + else + { + print "<td> </td>\n"; + } + } else { $self->SUPER::GenerateDataCell($CollectionBlock, $StepTask, $PropertyDescriptor, $DetailsPage); diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 37b41eae8a..99d7b70bfd 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -24,10 +24,12 @@ package JobStatusBlock; use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); +use POSIX qw(strftime); use URI::Escape; use WineTestBot::Branches; use WineTestBot::Users; +use WineTestBot::Utils; @@ -66,6 +68,21 @@ sub DisplayProperty($$) return $self->SUPER::DisplayProperty($PropertyDescriptor); } +sub GenerateHeaderCell($$$) +{ + my ($self, $PropertyDescriptor) = @_; + + my $PropertyName = $PropertyDescriptor->GetName() + if ($PropertyName eq "Ended") + { + print "<th><a class='title' title='Ended'>Time</a></th>\n"; + } + else + { + return $self->SUPER::GenerateHeaderCell($PropertyDescriptor); + } +} + sub GetDisplayValue($$$) { my ($self, $Item, $PropertyDescriptor) = @_; @@ -135,6 +152,24 @@ sub GenerateDataCell($$$$) } print "</a></td>\n"; } + elsif ($PropertyName eq "Ended") + { + if (defined $Item->Ended) + { + my $Duration = $Item->Ended - $Item->Submitted; + my $TagId = "E". $Item->Id; + 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 "</td>\n"; + } + else + { + print "<td> </td>\n"; + } + } else { $self->SUPER::GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); -- 2.19.2

1 0

[PATCH 1/2] dwmapi: return DWM_E_COMPOSITIONDISABLED instead of E_NOTIMPL in DwmGetTransportAttributes
by Louis Lenders Dec. 5, 2018

Dec. 5, 2018

This versioh is with tests; Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/dwmapi/dwmapi_main.c | 2 +- include/winerror.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index c1ee067122..eb06d15507 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -146,7 +146,7 @@ HRESULT WINAPI DwmGetTransportAttributes(BOOL *pfIsRemoting, BOOL *pfIsConnected { FIXME("(%p, %p, %p) stub\n", pfIsRemoting, pfIsConnected, pDwGeneration); - return E_NOTIMPL; + return DWM_E_COMPOSITIONDISABLED; } /********************************************************************** diff --git a/include/winerror.h b/include/winerror.h index d78c91e84e..a97b405c34 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3090,6 +3090,8 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define WININET_E_LOGIN_FAILURE_DISPLAY_ENTITY_BODY _HRESULT_TYPEDEF_(0x80072f8e) #define WININET_E_DECODING_FAILED _HRESULT_TYPEDEF_(0x80072f8f) +#define DWM_E_COMPOSITIONDISABLED _HRESULT_TYPEDEF_(0x80263001) + #define D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS _HRESULT_TYPEDEF_(0x887c0001) #define D3D11_ERROR_FILE_NOT_FOUND _HRESULT_TYPEDEF_(0x887c0002) #define D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS _HRESULT_TYPEDEF_(0x887c0003) -- 2.17.1

1 1

[PATCH] dwmapi: return DWM_E_COMPOSITIONDISABLED instead of E_NOTIMPL in DwmGetTransportAttributes
by Louis Lenders Dec. 5, 2018

Dec. 5, 2018

Fixes crash in Valil.Chess.WinFX See https://www.winehq.org/pipermail/wine-bugs/2018-December/504413.html On my windows 7 laptop it returns DWM_E_COMPOSITIONDISABLED if I disble the DWM service via services.msc. I` ll send a test hereafter but unsure how useful it is, because the testbots (wvista and win7) don`t return DWM_E_COMPOSITIONDISABLED; Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/dwmapi/dwmapi_main.c | 2 +- include/winerror.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index c1ee067122..eb06d15507 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -146,7 +146,7 @@ HRESULT WINAPI DwmGetTransportAttributes(BOOL *pfIsRemoting, BOOL *pfIsConnected { FIXME("(%p, %p, %p) stub\n", pfIsRemoting, pfIsConnected, pDwGeneration); - return E_NOTIMPL; + return DWM_E_COMPOSITIONDISABLED; } /********************************************************************** diff --git a/include/winerror.h b/include/winerror.h index d78c91e84e..a97b405c34 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3090,6 +3090,8 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define WININET_E_LOGIN_FAILURE_DISPLAY_ENTITY_BODY _HRESULT_TYPEDEF_(0x80072f8e) #define WININET_E_DECODING_FAILED _HRESULT_TYPEDEF_(0x80072f8f) +#define DWM_E_COMPOSITIONDISABLED _HRESULT_TYPEDEF_(0x80263001) + #define D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS _HRESULT_TYPEDEF_(0x887c0001) #define D3D11_ERROR_FILE_NOT_FOUND _HRESULT_TYPEDEF_(0x887c0002) #define D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS _HRESULT_TYPEDEF_(0x887c0003) -- 2.17.1

1 0