February 2018 - Wine-Commits

Francois Gouget : testbot: Make the job scheduler more extensible.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: tools Branch: master Commit: 66723015efdc15538bbb8c01ea91543f68893627 URL: https://source.winehq.org/git/tools.git/?a=commit;h=66723015efdc15538bbb8c0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 19 04:25:04 2018 +0100 testbot: Make the job scheduler more extensible. - The new scheduler splits the work into smaller steps: assessing the current situation, starting tasks on idle VMs and building a list of needed VMs, reverting the VMs, powering off the remaining VMs, updating the activity records. Each part can be analyzed independently. It uses the $Sched structure to pass information between these functions. - Sometimes a VM that no Task needs must be powered off in order to be able to prepare a VM that is needed. The job of picking which VM to sacrifice is now delegated to _SacrificeVM(). - The scheduler used to handle each VM host independently. As a result it was unable to prepare a VM for the 'next step' if that VM was on another VM host. The lack of a global picture also made many other extensions impossible. The new scheduler handles scheduling on all VM hosts at the same time, thus solving this issue. - This and other improvements mean the scheduler no longer needs to loop over the jobs and tasks multiple times. - In order to respect the per-VM-host limits the scheduler stores the host-related counters and limits in the $Sched->{hosts} table. - The scheduler also used to build multiple lists of VMs to revert depending on whether they were needed now, for the next step, or for future jobs. The new scheduler builds a single prioritised list of VMs to revert which can be handled in one go. It also keeps more information so it can better decide which VM to prepare next. - The scheduler can now also prepare VMs for the 'next step' earlier, thus making it more likely they will be ready in time. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 914 ++++++++++++++++++++++++++++------------ 1 file changed, 637 insertions(+), 277 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=66723015efdc15538bb…

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.13.
by Alexandre Julliard Feb. 17, 2018

Feb. 17, 2018

Module: bugzilla Branch: master Commit: e1a085af1689c07fb06f145d16d5624222691a72 URL: https://source.winehq.org/git/bugzilla.git/?a=commit;h=e1a085af1689c07fb06f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 16:00:03 2018 +0100 Import of upstream bugzilla release 4.4.13. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Bugzilla/CGI.pm | 64 +++++++++++++++++++++++ Bugzilla/Constants.pm | 2 +- Bugzilla/DB/Sqlite.pm | 1 + attachment.cgi | 1 + docs/bugzilla.ent.tmpl | 6 +-- taskgraph.json | 42 ++++++++------- template/en/default/pages/release-notes.html.tmpl | 14 +++++ 7 files changed, 106 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=e1a085af1689c07f…

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard Feb. 17, 2018

Feb. 17, 2018

Module: bugzilla Branch: master Commit: 68fa9518d63526c152bc72a6c3365e32dfdc866d URL: https://source.winehq.org/git/bugzilla.git/?a=commit;h=68fa9518d63526c152bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 16:00:54 2018 +0100 Merge branch 'upstream'. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> ---

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.13.
by Alexandre Julliard Feb. 17, 2018

Feb. 17, 2018

Module: bugzilla Branch: upstream Commit: e1a085af1689c07fb06f145d16d5624222691a72 URL: https://source.winehq.org/git/bugzilla.git/?a=commit;h=e1a085af1689c07fb06f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 16:00:03 2018 +0100 Import of upstream bugzilla release 4.4.13. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Bugzilla/CGI.pm | 64 +++++++++++++++++++++++ Bugzilla/Constants.pm | 2 +- Bugzilla/DB/Sqlite.pm | 1 + attachment.cgi | 1 + docs/bugzilla.ent.tmpl | 6 +-- taskgraph.json | 42 ++++++++------- template/en/default/pages/release-notes.html.tmpl | 14 +++++ 7 files changed, 106 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=e1a085af1689c07f…

1 0

Alexandre Julliard : Wine release 3.2
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: website Branch: master Commit: 924b7c93d971d4de6bc4eeb1ec796e4ea0064ce9 URL: https://source.winehq.org/git/website.git/?a=commit;h=924b7c93d971d4de6bc4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 16 20:41:49 2018 +0100 Wine release 3.2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018021601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2018021601.xml b/news/en/2018021601.xml new file mode 100644 index 0000000..120bf20 --- /dev/null +++ b/news/en/2018021601.xml @@ -0,0 +1,17 @@ +<news> +<date>February 16, 2018</date> +<title>Wine 3.2 Released</title> +<body> + The Wine development release 3.2 is now available. + <a href="{$root}/announce/3.2">What's new</a> in this release: +<ul> + <li>Separate implementation of USER controls for ComCtl32 v6.</li> + <li>Multisample texture support in Direct3D.</li> + <li>Support for HID gamepads.</li> + <li>More event support in MSHTML.</li> + <li>Obsolete DOS code removed.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.2.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alex Henrie : setupapi/tests: Drop install test workarounds for Windows <= 2000.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 02acc6514a376ef6ffefa6a132066c4fb8d8c40c URL: https://source.winehq.org/git/wine.git/?a=commit;h=02acc6514a376ef6ffefa6a1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Feb 16 08:41:15 2018 -0700 setupapi/tests: Drop install test workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/Makefile.in | 2 +- dlls/setupapi/tests/install.c | 182 ++++++++++------------------------------ 2 files changed, 46 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02acc6514a376ef6ffef…

1 0

Alexandre Julliard : Release 3.2.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 2936f3f9bb9dc01c595498a821d6adb6775b62cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2936f3f9bb9dc01c595498a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 16 20:37:35 2018 +0100 Release 3.2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 906 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 5 files changed, 456 insertions(+), 472 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2936f3f9bb9dc01c5954…

1 0

Tag wine-3.2 : Alexandre Julliard : Release 3.2
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: refs/tags/wine-3.2 Tag: 3605adb9657cb21c1f5f63338d7baba16eb5e625 URL: https://source.winehq.org/git/wine.git/?a=tag;h=3605adb9657cb21c1f5f63338d7… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 16 20:37:35 2018 +0100 Release 3.2

1 0

Nikolay Sivov : comctl32/edit: Force update on focus change.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: dadea2d11d78c73ce918d0c130db6dd32d06e6ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=dadea2d11d78c73ce918d0c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 16 14:19:00 2018 +0300 comctl32/edit: Force update on focus change. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 63 ++++++++++---------- dlls/comctl32/tests/edit.c | 139 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+), 31 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 67d77da..10ff5fb 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3382,16 +3382,23 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) * WM_KILLFOCUS * */ -static LRESULT EDIT_WM_KillFocus(EDITSTATE *es) +static LRESULT EDIT_WM_KillFocus(HTHEME theme, EDITSTATE *es) { - es->flags &= ~EF_FOCUSED; - DestroyCaret(); - if(!(es->style & ES_NOHIDESEL)) - EDIT_InvalidateText(es, es->selection_start, es->selection_end); - EDIT_NOTIFY_PARENT(es, EN_KILLFOCUS); - /* throw away left over scroll when we lose focus */ - es->wheelDeltaRemainder = 0; - return 0; + UINT flags = RDW_INVALIDATE | RDW_UPDATENOW; + + es->flags &= ~EF_FOCUSED; + DestroyCaret(); + if (!(es->style & ES_NOHIDESEL)) + EDIT_InvalidateText(es, es->selection_start, es->selection_end); + EDIT_NOTIFY_PARENT(es, EN_KILLFOCUS); + /* Throw away left over scroll when we lose focus */ + es->wheelDeltaRemainder = 0; + + if (theme) + flags |= RDW_FRAME; + + RedrawWindow(es->hwndSelf, NULL, NULL, flags); + return 0; } @@ -3656,26 +3663,24 @@ static void EDIT_WM_NCPaint(HWND hwnd, HRGN region) * WM_SETFOCUS * */ -static void EDIT_WM_SetFocus(EDITSTATE *es) +static void EDIT_WM_SetFocus(HTHEME theme, EDITSTATE *es) { - es->flags |= EF_FOCUSED; + UINT flags = RDW_INVALIDATE | RDW_UPDATENOW; - if (!(es->style & ES_NOHIDESEL)) - EDIT_InvalidateText(es, es->selection_start, es->selection_end); + es->flags |= EF_FOCUSED; - /* single line edit updates itself */ - if (IsWindowVisible(es->hwndSelf) && !(es->style & ES_MULTILINE)) - { - HDC hdc = GetDC(es->hwndSelf); - EDIT_WM_Paint(es, hdc); - ReleaseDC(es->hwndSelf, hdc); - } + if (!(es->style & ES_NOHIDESEL)) + EDIT_InvalidateText(es, es->selection_start, es->selection_end); - CreateCaret(es->hwndSelf, 0, 1, es->line_height); - EDIT_SetCaretPos(es, es->selection_end, - es->flags & EF_AFTER_WRAP); - ShowCaret(es->hwndSelf); - EDIT_NOTIFY_PARENT(es, EN_SETFOCUS); + CreateCaret(es->hwndSelf, 0, 1, es->line_height); + EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); + ShowCaret(es->hwndSelf); + EDIT_NOTIFY_PARENT(es, EN_SETFOCUS); + + if (theme) + flags |= RDW_FRAME | RDW_ERASE; + + RedrawWindow(es->hwndSelf, NULL, NULL, flags); } @@ -4827,9 +4832,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; case WM_KILLFOCUS: - result = EDIT_WM_KillFocus(es); - if (theme) - RedrawWindow(hwnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); + result = EDIT_WM_KillFocus(theme, es); break; case WM_LBUTTONDBLCLK: @@ -4866,9 +4869,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; case WM_SETFOCUS: - EDIT_WM_SetFocus(es); - if (theme) - RedrawWindow(hwnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); + EDIT_WM_SetFocus(theme, es); break; case WM_SETFONT: diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 41eb585..7e9e7e7 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -23,6 +23,7 @@ #include "wine/test.h" #include "v6util.h" +#include "msg.h" #ifndef ES_COMBO #define ES_COMBO 0x200 @@ -32,6 +33,20 @@ #define ID_EDITTEST2 99 #define MAXLEN 200 +enum seq_index +{ + COMBINED_SEQ_INDEX = 0, + NUM_MSG_SEQUENCES, +}; + +enum msg_id +{ + PARENT_ID, + EDIT_ID, +}; + +static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; + struct edit_notify { int en_change, en_maxtext, en_update; }; @@ -865,6 +880,66 @@ static LRESULT CALLBACK edit3_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPAR return DefWindowProcA(hWnd, msg, wParam, lParam); } +static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter = 0; + struct message msg = { 0 }; + LRESULT ret; + + msg.message = message; + msg.flags = sent|wparam|id; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.id = PARENT_ID; + + if (message != WM_IME_SETCONTEXT && + message != WM_IME_NOTIFY && + message != WM_GETICON && + message != WM_DWMNCRENDERINGCHANGED && + message != WM_GETMINMAXINFO && + message != WM_PAINT && + message != WM_CTLCOLOREDIT && + message < 0xc000) + { + add_message(sequences, COMBINED_SEQ_INDEX, &msg); + } + + defwndproc_counter++; + ret = DefWindowProcA(hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + +static LRESULT CALLBACK edit_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + static LONG defwndproc_counter = 0; + struct message msg = { 0 }; + LRESULT ret; + + msg.message = message; + msg.flags = sent|wparam|id; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.id = EDIT_ID; + + if (message != WM_IME_SETCONTEXT && + message != WM_IME_NOTIFY) + { + add_message(sequences, COMBINED_SEQ_INDEX, &msg); + } + + defwndproc_counter++; + if (IsWindowUnicode(hwnd)) + ret = CallWindowProcW(oldproc, hwnd, message, wParam, lParam); + else + ret = CallWindowProcA(oldproc, hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + /* Test behaviour of WM_SETTEXT, WM_REPLACESEL and notifications sent in response * to these messages. */ @@ -2365,6 +2440,7 @@ static BOOL register_classes(void) WNDCLASSA test3; WNDCLASSA test4; WNDCLASSA text_position; + WNDCLASSA wc; test2.style = 0; test2.lpfnWndProc = ET2_WndProc; @@ -2414,6 +2490,12 @@ static BOOL register_classes(void) text_position.lpfnWndProc = DefWindowProcA; if (!RegisterClassA(&text_position)) return FALSE; + memset(&wc, 0, sizeof(wc)); + wc.lpfnWndProc = parent_wnd_proc; + wc.hInstance = GetModuleHandleA(NULL); + wc.lpszClassName = "ParentWnd"; + if (!RegisterClassA(&wc)) return FALSE; + return TRUE; } @@ -2958,6 +3040,60 @@ static void test_wordbreak_proc(void) DestroyWindow(hwnd); } +static const struct message setfocus_combined_seq[] = +{ + { WM_KILLFOCUS, sent|id, 0, 0, PARENT_ID }, + { WM_SETFOCUS, sent|id, 0, 0, EDIT_ID }, + { WM_COMMAND, sent|wparam|id, MAKEWPARAM(1, EN_SETFOCUS), 0, PARENT_ID }, + { WM_PAINT, sent|id, 0, 0, EDIT_ID }, + { WM_NCPAINT, sent|id|defwinproc|optional, 0, 0, EDIT_ID }, + { WM_ERASEBKGND, sent|id|defwinproc|optional, 0, 0, EDIT_ID }, + { 0 } +}; + +static const struct message killfocus_combined_seq[] = +{ + { WM_KILLFOCUS, sent|id, 0, 0, EDIT_ID }, + { WM_COMMAND, sent|wparam|id, MAKEWPARAM(1, EN_KILLFOCUS), 0, PARENT_ID }, + { WM_SETFOCUS, sent|id, 0, 0, PARENT_ID }, + { WM_PAINT, sent|id, 0, 0, EDIT_ID }, + { WM_NCPAINT, sent|id|defwinproc|optional, 0, 0, EDIT_ID }, + { 0 } +}; + +static void test_change_focus(void) +{ + HWND hwnd, parent_wnd; + WNDPROC oldproc; + MSG msg; + + parent_wnd = CreateWindowA("ParentWnd", "", WS_OVERLAPPEDWINDOW, + 0, 0, 200, 200, NULL, NULL, GetModuleHandleA(NULL), NULL); + ok(parent_wnd != NULL, "Failed to create control parent.\n"); + SetWindowPos(parent_wnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + ShowWindow(parent_wnd, SW_SHOW); + + hwnd = CreateWindowExA(0, WC_EDITA, "Test", WS_CHILD | WS_VISIBLE, 0, 0, 100, 100, + parent_wnd, (HMENU)1, GetModuleHandleA(NULL), NULL); + ok(hwnd != NULL, "Failed to create Edit control.\n"); + + oldproc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)edit_subclass_proc); + SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); + + SetFocus(parent_wnd); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SetFocus(hwnd); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(sequences, COMBINED_SEQ_INDEX, setfocus_combined_seq, "Set focus", TRUE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SetFocus(parent_wnd); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(sequences, COMBINED_SEQ_INDEX, killfocus_combined_seq, "Kill focus", TRUE); + + DestroyWindow(hwnd); +} + START_TEST(edit) { ULONG_PTR ctx_cookie; @@ -2967,6 +3103,8 @@ START_TEST(edit) if (!load_v6_module(&ctx_cookie, &hCtx)) return; + init_msg_sequences(sequences, NUM_MSG_SEQUENCES); + hinst = GetModuleHandleA(NULL); b = register_classes(); ok(b, "Failed to register test classes.\n"); @@ -2999,6 +3137,7 @@ START_TEST(edit) test_paste(); test_EM_GETLINE(); test_wordbreak_proc(); + test_change_focus(); UnregisterWindowClasses();

1 0

Józef Kucia : d3d10core/tests: Add test for alpha to coverage.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 6062a51108d2cf4c6b91081002a67903941bf9a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6062a51108d2cf4c6b910810… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 16 15:13:29 2018 +0100 d3d10core/tests: Add test for alpha to coverage. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 219 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 219 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6062a51108d2cf4c6b91…

1 0