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 12 Dec '18

12 Dec '18

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 12 Dec '18

12 Dec '18

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 12 Dec '18

12 Dec '18

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 12 Dec '18

12 Dec '18

1 0

[PATCH] imagelist: fix crash with large number of images
by Eberhard Beilharz 11 Dec '18

11 Dec '18

1 0

[PATCH] Add .editorconfig file
by Eberhard Beilharz 11 Dec '18

11 Dec '18

1 0

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

11 Dec '18

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 11 Dec '18

11 Dec '18

3 2

[PATCH] po: Update Russian translation.
by Nikolay Sivov 11 Dec '18

11 Dec '18

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 11 Dec '18

11 Dec '18

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