February 2016 - Wine-commits

Nikolay Sivov : comctl32/tests: Separate individual Trackbar tests from each other.
by Alexandre Julliard 03 Feb '16

03 Feb '16

Module: wine Branch: stable Commit: fb648022d8f0982054da38787a1b78817efd5d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb648022d8f0982054da38787… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 8 15:47:07 2016 +0300 comctl32/tests: Separate individual Trackbar tests from each other. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1fce80024bab34a0828cb8f04c69819d3452ade9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 202 ++++++++++++++++++++++++++++------------- 1 file changed, 138 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb648022d8f0982054da3…

1 0

Nikolay Sivov : comctl32/trackbar: Update thumb immediately on TBM_SETPOS.
by Alexandre Julliard 03 Feb '16

03 Feb '16

Module: wine Branch: stable Commit: 5b23a4396411d29371f7b84968407a01ab92c5ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b23a4396411d29371f7b8496… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 9 23:45:20 2016 +0300 comctl32/trackbar: Update thumb immediately on TBM_SETPOS. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a65ddbf153b8865e0565bf210e637bf2b0053196) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 49 ++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/trackbar.c | 7 ++++-- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index e496572..7c04d15 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -32,6 +32,16 @@ static const DWORD defaultstyle = WS_VISIBLE | TBS_TOOLTIPS | TBS_ENABLESELRANGE | TBS_FIXEDLENGTH | TBS_AUTOTICKS; static HWND hWndParent; +static LRESULT WINAPI trackbar_no_wmpaint_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + + if (message == WM_PAINT) + return 0; + + return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); +} + static struct msg_sequence *sequences[NUM_MSG_SEQUENCE]; static const struct message empty_seq[] = { @@ -465,6 +475,15 @@ static HWND create_trackbar(DWORD style, HWND parent){ return hWndTrack; } +static HWND create_trackbar2(DWORD style, HWND parent) +{ + RECT rect; + GetClientRect(parent, &rect); + return CreateWindowA(TRACKBAR_CLASSA, "Trackbar Control", style, + rect.right, rect.bottom, 100, 50, + parent, NULL, GetModuleHandleA(NULL), NULL); +} + /* test functions for setters, getters, and sequences */ static void test_trackbar_buddy(void) @@ -595,6 +614,8 @@ static void test_page_size(void) static void test_position(void) { HWND hWndTrackbar; + RECT rect, rect2; + WNDPROC oldproc; int r; hWndTrackbar = create_trackbar(defaultstyle, hWndParent); @@ -626,6 +647,34 @@ static void test_position(void) ok_sequence(sequences, PARENT_SEQ_INDEX, parent_position_test_seq, "parent position test sequence", TRUE); DestroyWindow(hWndTrackbar); + + hWndTrackbar = create_trackbar2(defaultstyle, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + + /* subclassing procedure blocks WM_PAINT */ + oldproc = (WNDPROC)SetWindowLongPtrA(hWndTrackbar, GWLP_WNDPROC, (LONG_PTR)trackbar_no_wmpaint_proc); + SetWindowLongPtrA(hWndTrackbar, GWLP_USERDATA, (LONG_PTR)oldproc); + + memset(&rect, 0, sizeof(rect)); + memset(&rect2, 0, sizeof(rect2)); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + + /* without repaint */ + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 25); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 25, "got %d\n", r); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect2); + ok(rect.left == rect2.left, "got %d\n", rect.left); + + /* with repaint */ + SendMessageA(hWndTrackbar, TBM_SETPOS, TRUE, 30); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 30, "got %d\n", r); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect2); + ok(rect.left != rect2.left, "got %d\n", rect.left); + + DestroyWindow(hWndTrackbar); } static void test_range(void) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 6d092a3..c0f58db 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1229,9 +1229,12 @@ TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition) if (infoPtr->lPos > infoPtr->lRangeMax) infoPtr->lPos = infoPtr->lRangeMax; - infoPtr->flags |= TB_THUMBPOSCHANGED; - if (fPosition && oldPos != lPosition) TRACKBAR_InvalidateThumbMove(infoPtr, oldPos, lPosition); + if (fPosition && oldPos != lPosition) + { + TRACKBAR_UpdateThumb(infoPtr); + TRACKBAR_InvalidateThumbMove(infoPtr, oldPos, lPosition); + } return 0; }

1 0

Nikolay Sivov : comctl32/trackbar: Update thumb immediately on key press.
by Alexandre Julliard 03 Feb '16

03 Feb '16

Module: wine Branch: stable Commit: 8e52af656a08aed4d8a11f78a783a9deeac11389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e52af656a08aed4d8a11f78a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 18 19:43:57 2016 +1100 comctl32/trackbar: Update thumb immediately on key press. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 88ea4c520b9c4a810bf88b7053d36f7151272943) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 9 ++++++++- dlls/comctl32/trackbar.c | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 7c04d15..adb1b12 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -672,7 +672,14 @@ static void test_position(void) r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); ok(r == 30, "got %d\n", r); SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect2); - ok(rect.left != rect2.left, "got %d\n", rect.left); + ok(rect.left != rect2.left, "got %d, expected %d\n", rect2.left, rect.left); + + /* now move it with keys */ + SendMessageA(hWndTrackbar, WM_KEYDOWN, VK_END, 0); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 100, "got %d\n", r); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + ok(rect.left != rect2.left, "got %d, expected %d\n", rect.left, rect2.left); DestroyWindow(hWndTrackbar); } diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index c0f58db..87d955c 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1821,7 +1821,7 @@ TRACKBAR_KeyDown (TRACKBAR_INFO *infoPtr, INT nVirtKey) } if (pos != infoPtr->lPos) { - infoPtr->flags |=TB_THUMBPOSCHANGED; + TRACKBAR_UpdateThumb (infoPtr); TRACKBAR_InvalidateThumbMove (infoPtr, pos, infoPtr->lPos); }

1 0

Michael Stefaniuc : Release 1.8.1
by Alexandre Julliard 03 Feb '16

03 Feb '16

Module: wine Branch: stable Commit: 84cae8c3ea2614fce65d5d499159de9d530444ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=84cae8c3ea2614fce65d5d499… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 2 16:06:26 2016 +0100 Release 1.8.1 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 504 +++++++++++--------------------------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +-- 4 files changed, 102 insertions(+), 424 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84cae8c3ea2614fce65d5…

1 0

Tag wine-1.8.1 : Alexandre Julliard : Release 1.8.1
by Alexandre Julliard 03 Feb '16

03 Feb '16

Module: wine Branch: refs/tags/wine-1.8.1 Tag: 3bf7f95de211184b2f773d727dbf09002d916f58 URL: http://source.winehq.org/git/wine.git/?a=tag;h=3bf7f95de211184b2f773d727dbf… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 22:37:54 2016 +0900 Release 1.8.1

1 0

Alexandre Julliard : Update copyright info for 2016.
by Alexandre Julliard 03 Feb '16

03 Feb '16

Module: wine Branch: stable Commit: aa309dcd59e0f41c597b068ad7ffdf866faa6101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa309dcd59e0f41c597b068ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 3 20:08:27 2016 +0100 Update copyright info for 2016. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f6998ea4ced8b2051df64dd81242416d903a90d7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- LICENSE | 2 +- dlls/opengl32/version.rc | 2 +- include/wine/wine_common_ver.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 6dbf8c0..c35515e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2015 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2016 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/dlls/opengl32/version.rc b/dlls/opengl32/version.rc index 6fd4ff9..8dbb85b 100644 --- a/dlls/opengl32/version.rc +++ b/dlls/opengl32/version.rc @@ -20,7 +20,7 @@ #define WINE_FILENAME_STR "opengl32.dll" #define WINE_FILEVERSION 5,1,2600,2082 #define WINE_FILEVERSION_STR "5.1.2600.2082" -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2015 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2016 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ #define WINE_PRODUCTVERSION 5,1,2600,2082 #define WINE_PRODUCTVERSION_STR "5.1" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index cae5408..fcf1385 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -74,7 +74,7 @@ never complain. #endif #ifndef WINE_LEGALCOPYRIGHT -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2015 the Wine project authors (see the file AUTHORS for a complete list)" +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2016 the Wine project authors (see the file AUTHORS for a complete list)" #endif #ifndef WINE_PRODUCTVERSION

1 0

Alex Henrie : maintainers: Add Wine Staging maintainers.
by Alexandre Julliard 03 Feb '16

03 Feb '16

Module: wine Branch: stable Commit: 88aec6c81624bf5e8558497fcab1cd9ac716b887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88aec6c81624bf5e8558497fc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 31 17:59:15 2015 +0100 maintainers: Add Wine Staging maintainers. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 18698993330d9a2755d3db635ea3b5d312ddca10) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index a32c686..6054e57 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -266,3 +266,9 @@ F: */ Stable Branch M: Michael Stefaniuc <mstefani(a)winehq.org> W: http://wiki.winehq.org/StableRules + +Staging Branch +M: Sebastian Lackner <sebastian(a)fds-team.de> +M: Michael Müller <michael(a)fds-team.de> +P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> +W: https://wine-staging.com/

1 0

Frédéric Delanoy : loader: Update French translation of wine manpage.
by Alexandre Julliard 03 Feb '16

03 Feb '16

Module: wine Branch: stable Commit: b9ab74e46d0b82f1ee9dbf06b974708a1b0a59a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9ab74e46d0b82f1ee9dbf06b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Dec 27 01:40:48 2015 +0100 loader: Update French translation of wine manpage. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 64935d61d9d0d5f789f26260d52ccf96f1a24840) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.fr.UTF-8.man.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/wine.fr.UTF-8.man.in b/loader/wine.fr.UTF-8.man.in index 2d4c543..c2a2ae6 100644 --- a/loader/wine.fr.UTF-8.man.in +++ b/loader/wine.fr.UTF-8.man.in @@ -24,11 +24,11 @@ Pour déboguer wine, utilisez plutôt Pour exécuter des applications en ligne de commande (programmes Windows console), préférez .BR wineconsole . -Cela permet d'afficher la sortie dans une fenêtre séparée (nécessite X11). +Cela permet d'afficher la sortie dans une fenêtre séparée. Si vous n'utilisez pas .B wineconsole pour les programmes en ligne de commande, le support console sera très limité et votre -programme peut ne pas fonctionner correctement. +programme pourrait ne pas fonctionner correctement. .PP Lorsque wine est invoqué avec .B --help

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 03 Feb '16

03 Feb '16

Module: wine Branch: stable Commit: 1a74fdd36e68b5e25d79e411bc1eaac930edf0d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a74fdd36e68b5e25d79e411b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 26 15:08:13 2015 +0100 po: Update French translation. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c7a0af4830c0aedfe9c0130ca4126dfe0a5cb984) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- po/fr.po | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/po/fr.po b/po/fr.po index 52ee555..cb46cf1 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-10-03 11:45+0100\n" +"PO-Revision-Date: 2015-12-26 15:07+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: French\n" "Language: fr\n" @@ -8628,58 +8628,44 @@ msgid "Wine" msgstr "Wine" #: winemac.rc:33 -#, fuzzy -#| msgid "Hide" msgid "Hide %@" -msgstr "Cacher" +msgstr "Cacher %@" #: winemac.rc:35 -#, fuzzy -#| msgid "Other" msgid "Hide Others" -msgstr "Autre" +msgstr "Cacher les autres" #: winemac.rc:36 -#, fuzzy -#| msgid "Show" msgid "Show All" -msgstr "Afficher" +msgstr "Tout afficher" #: winemac.rc:37 msgid "Quit %@" -msgstr "" +msgstr "Quitter %@" #: winemac.rc:38 msgid "Quit" -msgstr "" +msgstr "Quitter" #: winemac.rc:40 -#, fuzzy -#| msgid "&Window" msgid "Window" -msgstr "&Fenêtre" +msgstr "Fenêtre" #: winemac.rc:41 -#, fuzzy -#| msgid "&Minimize" msgid "Minimize" -msgstr "&Réduire" +msgstr "Réduire" #: winemac.rc:42 -#, fuzzy -#| msgid "Zoom in" msgid "Zoom" -msgstr "Zoom avant" +msgstr "Zoom" #: winemac.rc:43 msgid "Enter Full Screen" -msgstr "" +msgstr "Plein écran" #: winemac.rc:44 -#, fuzzy -#| msgid "&Bring To Front" msgid "Bring All to Front" -msgstr "Toujours &visible" +msgstr "Tout amener à l'avant-plan" #: wineps.rc:31 msgid "Paper Si&ze:" @@ -13113,7 +13099,7 @@ msgstr "" "\n" "Options :\n" " --help\t Afficher ces informations.\n" -" --list\t Lister toutes les applications installées dans ce préfix " +" --list\t Lister toutes les applications installées dans ce préfixe " "Wine.\n" " --remove {GUID} Désinstaller l'application spécifiée.\n" "\t\t Utilisez « --list » pour déterminer le GUID de l'application.\n"

1 0

Jactry Zeng : po: Update Simplified Chinese translation.
by Alexandre Julliard 03 Feb '16

03 Feb '16

Module: wine Branch: stable Commit: f74d481c12a77e2e1e2c0450ceae7500639743a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f74d481c12a77e2e1e2c0450c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Jan 4 10:25:32 2016 +0800 po: Update Simplified Chinese translation. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f157192513c5b523a5366e8cedfc6b7d3b986140) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- po/zh_CN.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 9ed9e73..5e05a07 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12509,11 +12509,11 @@ msgstr "Windows 注册信息" #: winecfg.rc:144 msgid "&Owner:" -msgstr "姓名：" +msgstr "姓名(&O)：" #: winecfg.rc:146 msgid "Organi&zation:" -msgstr "组织(_Z)：" +msgstr "组织(&Z)：" #: winecfg.rc:154 msgid "Application settings"

1 0