January 2018 - Wine-Commits

Francois Gouget : testbot/web: Fix display of time.count statistics.
by Alexandre Julliard Jan. 3, 2018

Jan. 3, 2018

Module: tools Branch: master Commit: 0be6b85a1f50e3728b6e6df9cbda25c9483d5724 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0be6b85a1f50e3728b6e6df… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 3 12:45:58 2018 +0100 testbot/web: Fix display of time.count statistics. This fixes the 'Task count' statistic. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Stats.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 424d33e..d9f4381 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -122,7 +122,7 @@ sub _GetStatStr($$;$$) return "n/a" if (!$AllStats->{elapsed}); return sprintf('%.1f%', 100 * $Value / $AllStats->{elapsed}); } - if ($StatKey =~ /(?:\belapsed|\.time)\b/) + if ($StatKey =~ /(?:\belapsed|\.time(?!\.count))/) { return _GetDuration($Value, $Flags & $NO_TIME); }

1 0

Francois Gouget : testbot: Show the generation time of the job index page.
by Alexandre Julliard Jan. 3, 2018

Jan. 3, 2018

Module: tools Branch: master Commit: 964e97a77b786802856a043959ee5f431c990d9c URL: https://source.winehq.org/git/tools.git/?a=commit;h=964e97a77b786802856a043… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 3 12:48:06 2018 +0100 testbot: Show the generation time of the job index page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index deacf90..427d7f6 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -189,6 +189,7 @@ use ObjectModel::CGI::Page; use WineTestBot::Config; use WineTestBot::Engine::Notify; use WineTestBot::Jobs; +use WineTestBot::Log; use WineTestBot::VMs; @StatusPage::ISA = qw(ObjectModel::CGI::Page); @@ -197,6 +198,7 @@ sub _initialize($$$) { my ($self, $Request, $RequiredRole) = @_; + $self->{start} = Time(); $self->SUPER::_initialize($Request, $RequiredRole); } @@ -297,6 +299,8 @@ EOF my $VMsCollectionBlock = new VMStatusBlock(CreateVMs(), $self); $VMsCollectionBlock->GenerateList(); print "</div>\n"; + + print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; } package main;

1 0

Rosanne DiMesio : Show additional application links
by Jeremy Newman Jan. 3, 2018

Jan. 3, 2018

Module: appdb Branch: master Commit: 5f46a0337ee09b2cf6bde53639b325cae363ae55 URL: https://source.winehq.org/git/appdb.git/?a=commit;h=5f46a0337ee09b2cf6bde53… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu Dec 28 12:44:22 2017 -0600 Show additional application links Fixes bug 44186. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/application.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/application.php b/include/application.php index f6c90b8..320ad5a 100644 --- a/include/application.php +++ b/include/application.php @@ -895,6 +895,11 @@ class Application { </div> EOT; + // URLs + if($sUrls = url::display(NULL, $this->iAppId)) + { + echo $sUrls; + } echo "<p>For more details and user comments, view the versions of this application</p>\n"; // display versions

1 0

Alexandre Julliard : Wine release 2.0.4
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: website Branch: master Commit: 7ad973723dbc0b996c623e1ad8d142c1749be573 URL: https://source.winehq.org/git/website.git/?a=commit;h=7ad973723dbc0b996c623… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 2 22:01:38 2018 +0100 Wine release 2.0.4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018010201.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/en/2018010201.xml b/news/en/2018010201.xml new file mode 100644 index 0000000..9f86ab7 --- /dev/null +++ b/news/en/2018010201.xml @@ -0,0 +1,14 @@ +<news> +<date>January 2, 2018</date> +<title>Wine 2.0.4 Released</title> +<body> +<p> The Wine maintenance release 2.0.4 is now available.</p> +<p> <a href="{$root}/announce/2.0.4">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> + <li>Updates to the National Language Support files</li> + <li>Documentation updates</li> +</ul> +<p>The source is <a href="//dl.winehq.org/wine/source/2.0/wine-2.0.4.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>. +</p></body></news>

1 0

Tag wine-2.0.4 : Alexandre Julliard : Release 2.0.4
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: refs/tags/wine-2.0.4 Tag: 1cd27749df425ba78729a245f819ce2c7b9f8bd8 URL: https://source.winehq.org/git/wine.git/?a=tag;h=1cd27749df425ba78729a245f81… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 2 21:58:13 2018 +0100 Release 2.0.4

1 0

Michael Stefaniuc : Release 2.0.4
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 52280940a41ad60b8b7536b76cf461d886cb8a29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52280940a41ad60b8b7536b7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 21 21:34:59 2017 +0100 Release 2.0.4 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 350 +++++++++++++++++++++++++++++++++++--------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 ++-- 4 files changed, 211 insertions(+), 163 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=52280940a41ad60b8b75…

1 0

Piotr Caban : msvcr120: Fix exception object refcounting in __ExceptionPtrAssign.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 1e8ac900d2de9da2b6621da9dcd515acc75856a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e8ac900d2de9da2b6621da9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 13 19:15:06 2017 +0200 msvcr120: Fix exception object refcounting in __ExceptionPtrAssign. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ab313dd3beb7e495b36f8320ffc2354b9c854d51) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/cpp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 4d0d9b5..1277b40 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1355,7 +1355,12 @@ void __cdecl __ExceptionPtrAssign(exception_ptr *ep, const exception_ptr *assign TRACE("(%p %p)\n", ep, assign); /* don't destroy object stored in ep */ + if (ep->ref) + InterlockedDecrement(ep->ref); + *ep = *assign; + if (ep->ref) + InterlockedIncrement(ep->ref); } /*********************************************************************

1 0

Alexandre Julliard : explorer: Don' t forward the system tray to the display driver in desktop mode.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: d20d9b7fa9881cfc340f4adb6f42efbaf51d0c57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d20d9b7fa9881cfc340f4adb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 17:20:33 2017 +0200 explorer: Don't forward the system tray to the display driver in desktop mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 082e4981631189c5903f838a0bc23e137c1cce17) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/explorer/systray.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index ddfd67d..9e58ad4 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -565,7 +565,7 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) buffer, buffer + cbMaskBits); } - /* try forward to x11drv first */ + /* try forwarding to the display driver first */ if (cds->dwData == NIM_ADD || !(icon = get_icon( nid.hWnd, nid.uID ))) { if (wine_notify_icon && ((ret = wine_notify_icon( cds->dwData, &nid )) != -1)) @@ -901,7 +901,7 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab WNDCLASSEXW class; static const WCHAR classname[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; - wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); + if (using_root) wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); icon_cx = GetSystemMetrics( SM_CXSMICON ) + 2*ICON_BORDER; icon_cy = GetSystemMetrics( SM_CYSMICON ) + 2*ICON_BORDER;

1 0

Andrey Semakin : winemine: Mine random placing fix.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 9b366eef9e44d120eea9be349da983800b466959 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b366eef9e44d120eea9be34… Author: Andrey Semakin <and-semakin(a)ya.ru> Date: Sun Feb 12 12:50:04 2017 +0500 winemine: Mine random placing fix. Signed-off-by: Andrey Semakin <and-semakin(a)ya.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9b90266cfbc0a52f0217eecea8c5c89327b844df) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winemine/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 71ff75e..da47359 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -343,8 +343,8 @@ static void PlaceMines ( BOARD *p_board, int selected_col, int selected_row ) /* create mines */ i = 0; while( (unsigned) i < p_board->mines ) { - col = (int) (p_board->cols * (float) rand() / RAND_MAX + 1); - row = (int) (p_board->rows * (float) rand() / RAND_MAX + 1); + col = rand() % p_board->cols + 1; + row = rand() % p_board->rows + 1; if( !p_board->box[col][row].IsMine ) { i++;

1 0

Andrey Semakin : winemine: Added Shift+LClick hotkey to uncover multiple cells.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: cd2e5588d0319a8cf351b9e3983005858a6c7ef1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd2e5588d0319a8cf351b9e3… Author: Andrey Semakin <and-semakin(a)ya.ru> Date: Tue Feb 14 21:44:42 2017 +0500 winemine: Added Shift+LClick hotkey to uncover multiple cells. Signed-off-by: Andrey Semakin <and-semakin(a)ya.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ca8f056da1f5eecd7d10cafde4fe5fc62d3185de) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winemine/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index da47359..27fc159 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -884,7 +884,7 @@ static LRESULT WINAPI MainProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara case WM_LBUTTONDOWN: WINE_TRACE("WM_LBUTTONDOWN\n"); - if( wParam & MK_RBUTTON ) + if( wParam & ( MK_RBUTTON | MK_SHIFT ) ) msg = WM_MBUTTONDOWN; TestBoard( hWnd, &board, (short)LOWORD(lParam), (short)HIWORD(lParam), msg ); SetCapture( hWnd ); @@ -892,7 +892,7 @@ static LRESULT WINAPI MainProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara case WM_LBUTTONUP: WINE_TRACE("WM_LBUTTONUP\n"); - if( wParam & MK_RBUTTON ) + if( wParam & ( MK_RBUTTON | MK_SHIFT ) ) msg = WM_MBUTTONUP; TestBoard( hWnd, &board, (short)LOWORD(lParam), (short)HIWORD(lParam), msg ); ReleaseCapture();

1 0