January 2018 - Wine-commits

Francois Gouget : testbot: Show the generation time of the job index page.
by Alexandre Julliard 03 Jan '18

03 Jan '18

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

Francois Gouget : testbot: Clarify a TestBot error message.
by Alexandre Julliard 03 Jan '18

03 Jan '18

Module: tools Branch: master Commit: 2c9f9dd1a64faeaa6dc603f4c1b0def553fb7635 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2c9f9dd1a64faeaa6dc603f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 3 12:48:13 2018 +0100 testbot: Clarify a TestBot error message. TestBot users want to know that it's a TestBot process that crashed rather than their test executable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Tasks.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 1f91d26..e0b5192 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -163,7 +163,7 @@ sub UpdateStatus($$) my $TaskDir = $self->CreateDir(); if (open TASKLOG, ">>$TaskDir/err") { - print TASKLOG "Child process died unexpectedly\n"; + print TASKLOG "TestBot process died unexpectedly\n"; close TASKLOG; } umask($OldUMask);

1 0

Rosanne DiMesio : Show additional application links
by Jeremy Newman 03 Jan '18

03 Jan '18

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 02 Jan '18

02 Jan '18

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

Michael Stefaniuc : Release 2.0.4
by Alexandre Julliard 02 Jan '18

02 Jan '18

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

Tag wine-2.0.4 : Alexandre Julliard : Release 2.0.4
by Alexandre Julliard 02 Jan '18

02 Jan '18

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

Alexandre Julliard : wineconsole: Remove duplicate line feeds.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: cd0991d35453aefbf694e2dac4e59f0ad4bddf90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd0991d35453aefbf694e2da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 17 22:20:51 2017 +0200 wineconsole: Remove duplicate line feeds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 03e438dbf5e8f1ac9da5bf31ff3a356ff9acf899) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/wineconsole/user.c | 2 +- programs/wineconsole/wineconsole.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index fe1cf46..03d0ea1 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -559,7 +559,7 @@ static void WCUSER_SetFontPmt(struct inner_data* data, const WCHAR* font, EnumFontFamiliesW(PRIVATE(data)->hMemDC, NULL, get_first_font_enum, (LPARAM)&fc); if (fc.done) return; } - WINECON_Fatal("Couldn't find a decent font, aborting\n"); + WINECON_Fatal("Couldn't find a decent font, aborting"); } /****************************************************************** diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index d1d38be..9e3afb1 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -340,7 +340,7 @@ void WINECON_GrabChanges(struct inner_data* data) data->cells = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data->cells, data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); - if (!data->cells) WINECON_Fatal("OOM\n"); + if (!data->cells) WINECON_Fatal("OOM"); data->fnResizeScreenBuffer(data); data->fnComputePositions(data); }

1 0

Huw Davies : winefile: Initialize length before calling GetWindowPlacement ().
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 1435d76506a07789fc049615c8770792a8e1e4f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1435d76506a07789fc049615… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 30 10:29:15 2017 +0000 winefile: Initialize length before calling GetWindowPlacement(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2b8a38169bf719225012e66a2409ffba8966f546) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winefile/winefile.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 27079bb..044a399 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -1923,6 +1923,7 @@ static void frame_get_clientspace(HWND hwnd, PRECT prect) else { WINDOWPLACEMENT wp; + wp.length = sizeof(wp); GetWindowPlacement(hwnd, &wp); prect->left = prect->top = 0;

1 0

André Hentschel : ntdll: Bump Win 10 version to 15063.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 05e53259456c1672ef1d2bbdb3c9ee119183a8d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05e53259456c1672ef1d2bbd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 8 16:15:43 2017 +0200 ntdll: Bump Win 10 version to 15063. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 72aecacf94d93fa640de761d2866490276fe07d5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/version.c | 2 +- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 06f9827..c06aef6 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -185,7 +185,7 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }, /* WIN10 */ { - sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x3839, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x3AD7, VER_PLATFORM_WIN32_NT, {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index f674824..402ec16 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -48,7 +48,7 @@ static const struct const char *szProductType; } win_versions[] = { - { "win10", "Windows 10", 10, 0, 0x3839,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, + { "win10", "Windows 10", 10, 0, 0x3AD7,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"},

1 0

Fabian Maurer : winecfg: Remove processorArchitecture from manifest.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: c4a470ef338daab8a5af6ec6ac31a727a344e8a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4a470ef338daab8a5af6ec6… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Sep 2 01:19:39 2017 +0200 winecfg: Remove processorArchitecture from manifest. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 685bdb2614503f7df7658000c46a5acaff11eb6e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winecfg/winecfg.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/winecfg.manifest b/programs/winecfg/winecfg.manifest index a7e4d88..9008877 100644 --- a/programs/winecfg/winecfg.manifest +++ b/programs/winecfg/winecfg.manifest @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> -<assemblyIdentity type="win32" name="Wine.Winecfg" version="0.0.0.0" processorArchitecture=""/> +<assemblyIdentity type="win32" name="Wine.Winecfg" version="0.0.0.0"/> <dependency> <dependentAssembly> <assemblyIdentity

1 0