wine-commits November 2017

wine-commits@winehq.org

2 participants
436 discussions

Zhiyi Zhang : kernel32/nls: Add LOCALE_SPARENT entries.
by Alexandre Julliard 10 Nov '17

10 Nov '17

1 0

Zebediah Figura : quartz/tests: Add test AVI and MPG files.
by Alexandre Julliard 10 Nov '17

10 Nov '17

Module: wine Branch: master Commit: 86c3d7293b721f99bd5e67c18fcbc926b23c85f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86c3d7293b721f99bd5e67c18… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 9 19:09:53 2017 -0600 quartz/tests: Add test AVI and MPG files. Generated with ffmpeg using the following commands: ffmpeg -f lavfi -i smptebars -t 1 -r 1 -f avi -vcodec rawvideo -pix_fmt yuv420p -vf scale=32x24 test.avi ffmpeg -f lavfi -i smptebars -f lavfi -i "sine=frequency=1000" -t 0.04 -r 25 -f mpeg -vcodec mpeg1video -vf scale=32x24 -acodec mp2 test.mpg Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 3 +++ dlls/quartz/tests/avisplitter.c | 44 ++++++++++++++++++++++++++++++------ dlls/quartz/tests/filtergraph.c | 48 +++++++++++++++++++++++++++++++++++----- dlls/quartz/tests/rsrc.rc | 27 ++++++++++++++++++++++ dlls/quartz/tests/test.avi | Bin 0 -> 6938 bytes dlls/quartz/tests/test.mpg | Bin 0 -> 6144 bytes 6 files changed, 110 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index ebded4b..2ff1b47 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -13,3 +13,6 @@ C_SRCS = \ videorenderer.c IDL_SRCS = fil_data.idl + +RC_SRCS = \ + rsrc.rc diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 874036d..23167b5 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -270,8 +270,32 @@ static void test_filesourcefilter(void) } } -static const WCHAR wfile[] = {'t','e','s','t','.','a','v','i',0}; -static const char afile[] = "test.avi"; +static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0}; + +static WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", wine_dbgstr_w(pathW), + GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); + + return pathW; +} static void test_filter_graph(void) { @@ -286,11 +310,14 @@ static void test_filter_graph(void) DWORD readbytes; FILTER_STATE state; - file = CreateFileW(wfile, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, + WCHAR *filename = load_resource(avifile); + + file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); if (file == INVALID_HANDLE_VALUE) { - skip("Could not read test file \"%s\", skipping test\n", afile); + skip("Could not read test file \"%s\", skipping test\n", wine_dbgstr_w(filename)); + DeleteFileW(filename); return; } @@ -301,7 +328,8 @@ static void test_filter_graph(void) if (strncmp(buffer, "RIFF", 4) || strcmp(buffer + 8, "AVI ")) { skip("%s is not an avi riff file, not doing the avi splitter test\n", - afile); + wine_dbgstr_w(filename)); + DeleteFileW(filename); return; } @@ -331,10 +359,10 @@ static void test_filter_graph(void) if (hr != S_OK) goto fail; - hr = IFileSourceFilter_Load(pfile, wfile, NULL); + hr = IFileSourceFilter_Load(pfile, filename, NULL); if (hr != S_OK) { - trace("Could not load file\n"); + trace("Could not load file: %08x\n", hr); goto fail; } @@ -509,6 +537,8 @@ fail: IBaseFilter_Release(pavi); if (pfile) IFileSourceFilter_Release(pfile); + + DeleteFileW(filename); } START_TEST(avisplitter) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f9c95ae..e66dc40 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -42,6 +42,31 @@ typedef struct TestFilterImpl static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0}; static const WCHAR mpegfile[] = {'t','e','s','t','.','m','p','g',0}; +static WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", wine_dbgstr_w(pathW), + GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); + + return pathW; +} + static IGraphBuilder *pgraph; static int createfiltergraph(void) @@ -355,26 +380,39 @@ static void test_render_run(const WCHAR *file) HANDLE h; HRESULT hr; - h = CreateFileW(file, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + WCHAR *filename = load_resource(file); + + h = CreateFileW(filename, 0, 0, NULL, OPEN_EXISTING, 0, NULL); if (h == INVALID_HANDLE_VALUE) { skip("Could not read test file %s, skipping test\n", wine_dbgstr_w(file)); + DeleteFileW(filename); return; } CloseHandle(h); if (!createfiltergraph()) + { + DeleteFileW(filename); return; + } - hr = IGraphBuilder_RenderFile(pgraph, file, NULL); - ok(hr == S_OK, "RenderFile returned: %x\n", hr); - rungraph(); + hr = IGraphBuilder_RenderFile(pgraph, filename, NULL); + if (hr == VFW_E_CANNOT_RENDER) + skip("%s: codec not supported; skipping test\n", wine_dbgstr_w(file)); + else + { + ok(hr == S_OK || hr == VFW_S_AUDIO_NOT_RENDERED, "RenderFile failed: %x\n", hr); + rungraph(); + } releasefiltergraph(); /* check reference leaks */ - h = CreateFileW(file, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + h = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); ok(h != INVALID_HANDLE_VALUE, "CreateFile failed: err=%d\n", GetLastError()); CloseHandle(h); + + DeleteFileW(filename); } static DWORD WINAPI call_RenderFile_multithread(LPVOID lParam) diff --git a/dlls/quartz/tests/rsrc.rc b/dlls/quartz/tests/rsrc.rc new file mode 100644 index 0000000..9bea5be --- /dev/null +++ b/dlls/quartz/tests/rsrc.rc @@ -0,0 +1,27 @@ +/* + * Resource file for quartz tests. + * + * Copyright 2017 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* @makedep: test.avi */ +test.avi RCDATA "test.avi" + +/* @makedep: test.mpg */ +test.mpg RCDATA "test.mpg" diff --git a/dlls/quartz/tests/test.avi b/dlls/quartz/tests/test.avi new file mode 100644 index 0000000..bec304d Binary files /dev/null and b/dlls/quartz/tests/test.avi differ diff --git a/dlls/quartz/tests/test.mpg b/dlls/quartz/tests/test.mpg new file mode 100644 index 0000000..7fe379a Binary files /dev/null and b/dlls/quartz/tests/test.mpg differ

1 0

Zebediah Figura : quartz/tests: Skip tests if CLSID_NullRenderer is not available.
by Alexandre Julliard 10 Nov '17

10 Nov '17

Module: wine Branch: master Commit: a49aa45c2b1bbf64fa15541d034e73737acf637f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a49aa45c2b1bbf64fa15541d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 9 19:09:52 2017 -0600 quartz/tests: Skip tests if CLSID_NullRenderer is not available. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplitter.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 29782a9..874036d 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -387,9 +387,12 @@ static void test_filter_graph(void) hr = CoCreateInstance(&CLSID_NullRenderer, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&pnull); - ok(hr == S_OK, "Could not create null renderer: %08x\n", hr); - if (hr != S_OK) + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("Null renderer not registered, skipping\n"); break; + } + ok(hr == S_OK, "Could not create null renderer: %08x\n", hr); IBaseFilter_EnumPins(pnull, &nullenum); IEnumPins_Next(nullenum, 1, &nullpin, NULL);

1 0

Matteo Bruni : d3dx10: Fix tracing of shader source data.
by Alexandre Julliard 10 Nov '17

10 Nov '17

Module: wine Branch: master Commit: e9e4805d923edf71bf28ffe3e6f2fae4b062cec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e4805d923edf71bf28ffe3e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 10 00:58:43 2017 +0100 d3dx10: Fix tracing of shader source data. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_33/d3dx10_33.spec | 4 ++-- dlls/d3dx10_34/d3dx10_34.spec | 4 ++-- dlls/d3dx10_35/d3dx10_35.spec | 4 ++-- dlls/d3dx10_36/d3dx10_36.spec | 4 ++-- dlls/d3dx10_37/d3dx10_37.spec | 4 ++-- dlls/d3dx10_38/d3dx10_38.spec | 4 ++-- dlls/d3dx10_39/d3dx10_39.spec | 4 ++-- dlls/d3dx10_40/d3dx10_40.spec | 4 ++-- dlls/d3dx10_41/d3dx10_41.spec | 4 ++-- dlls/d3dx10_42/d3dx10_42.spec | 4 ++-- dlls/d3dx10_43/async.c | 7 ++++--- dlls/d3dx10_43/d3dx10_43.spec | 4 ++-- 12 files changed, 26 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9e4805d923edf71bf28f…

1 0

Matteo Bruni : d3dx10: Remove redundant header include.
by Alexandre Julliard 10 Nov '17

10 Nov '17

Module: wine Branch: master Commit: e35e3a50a840451bd7852096282249a5656b3921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35e3a50a840451bd78520962… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 9 23:30:19 2017 +0100 d3dx10: Remove redundant header include. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/async.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index c910b4a..25df663 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -20,7 +20,6 @@ #include "wine/port.h" #include "d3d10_1.h" #include "d3dx10.h" -#include "d3dx10core.h" #include "d3dcompiler.h" #include "wine/debug.h"

1 0

Alexandre Julliard : testbot: Update documentation to point to wine-devel instead of wine-patches.
by Alexandre Julliard 10 Nov '17

10 Nov '17

Module: tools Branch: master Commit: bc7d2a84263d536c8c0ba0d6f3c4580ff837c5aa URL: http://source.winehq.org/git/tools.git/?a=commit;h=bc7d2a84263d536c8c0ba0d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 16:38:34 2017 +0100 testbot: Update documentation to point to wine-devel instead of wine-patches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/README | 2 +- testbot/bin/WinePatchesMLSubmit.pl | 2 +- testbot/doc/INSTALL.txt | 11 +++++------ testbot/lib/WineTestBot/Config.pm | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/testbot/README b/testbot/README index 3977c5d..8475abe 100644 --- a/testbot/README +++ b/testbot/README @@ -21,7 +21,7 @@ Windows machines. There are three ways this can happen: * Registered users can submit patches and binaries using the web site and have them run on the set of Windows machines of their choosing. -* Conformance test patches sent to the wine-patches mailing list are +* Conformance test patches sent to the wine-devel mailing list are run on the default set of Windows machines. Any failure is reported to the patch author and to the wine-devel mailing list. diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index 6dc39e8..65fe848 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -Tw # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # -# This script expects to receive a wine-patches email on stdin and submits it +# This script expects to receive a wine-devel email on stdin and submits it # to WineTestBot for testing. It is meant to be called from a tool such as # procmail. # diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 0b95656..9947150 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -89,17 +89,16 @@ Setup for Winetest updates: */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl 32 */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl 64 -Setup for wine-patches: +Setup for wine-devel: - A proper WineTestBot system should integrate with Wine's patches site. - An alternative is to interface directly with wine-patches as described in + An alternative is to interface directly with wine-devel as described in this section. - Arrange for the WinePatchesMLSubmit.pl script to be fed the - wine-patches emails. One way to do so would be to subscribe the - winehq user to the wine-patches mailing list and to then add the + wine-devel emails. One way to do so would be to subscribe the + winehq user to the wine-devel mailing list and to then add the following lines to the .procmailrc file: :0c: - * ^List-Id: Wine Patch Submissions - * ^TO wine-patches + * ^List-Id:.*wine-devel\.winehq\.org | $HOME/tools/testbot/bin/WinePatchesMLSubmit.pl - Or if you have a set of patches to test in the mbox format you can test with: diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 4f38633..b0492a3 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -96,7 +96,7 @@ $BuildTimeout = 5 * 60; $ReconfigTimeout = 45 * 60; $ProjectName = "Wine"; -$PatchesMailingList = "wine-patches"; +$PatchesMailingList = "wine-devel"; $LDAPServer = undef; $LDAPBindDN = undef;

1 0

Alexandre Julliard : patches: Update documentation to point to wine-devel instead of wine-patches.
by Alexandre Julliard 10 Nov '17

10 Nov '17

Module: tools Branch: master Commit: 2ac3b11f32c5db5128d893e907bb424a2fc29015 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2ac3b11f32c5db5128d893e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 16:38:21 2017 +0100 patches: Update documentation to point to wine-devel instead of wine-patches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/doc/INSTALL.txt | 13 +++++-------- patches/expire | 2 +- patches/filter | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/patches/doc/INSTALL.txt b/patches/doc/INSTALL.txt index c1570ac..e1ef2b8 100644 --- a/patches/doc/INSTALL.txt +++ b/patches/doc/INSTALL.txt @@ -37,14 +37,13 @@ Apache setup: - Create the $HOME/opt/source/patches directory and copy patches.css there: mkdir $HOME/opt/source/patches cp patches.css $HOME/opt/source/patches -- Create the $HOME/patches and $HOME/patches/OLD directories where the patch - data will live: - mkdir -p $HOME/patches/OLD -- Arrange for the filter script to be fed the wine-patches emails. One way to - do so would be to subscribe the winehq user to the wine-patches mailing list +- Create the $HOME/patches directory where the patch data will live: + mkdir -p $HOME/patches +- Arrange for the filter script to be fed the wine-devel emails. One way to + do so would be to subscribe the winehq user to the wine-devel mailing list and to then add the following lines to the .procmailrc file: :0 - * ^List-Id: Wine Patch Submissions + * ^List-Id:.*wine-devel\.winehq\.org { :0 hbfw | $HOME/tools/patches/filter @@ -55,8 +54,6 @@ Apache setup: formail -ds procmail <mbox-file - Run update regularly to update the website: */5 * * * * $HOME/tools/patches/update -- Run expire regularly to delete old patches: - 0 0 * * * $HOME/tools/patches/expire -v $HOME/patches For integration with the WineTestBot, see the corresponding section in the WineTestBot documentation. diff --git a/patches/expire b/patches/expire index 305e7e5..513a5b1 100755 --- a/patches/expire +++ b/patches/expire @@ -345,7 +345,7 @@ asked to review the following Wine $patch_str: $patch_urls If you think that a patch is correct and can be committed, please send -a mail to wine-patches with your Signed-off-by header, as a reply to +a mail to wine-devel with your Signed-off-by header, as a reply to the original patch email. If you find some issues in a patch, please send a mail to the patch diff --git a/patches/filter b/patches/filter index 62e2a0d..7074d96 100755 --- a/patches/filter +++ b/patches/filter @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # -# Reformat a wine-patches email so it can be put in a file that the patches +# Reformat a wine-devel email so it can be put in a file that the patches # site can link to. In particular this means only keeping the relevant # header fields and decoding / decompressing the patch. #

1 0

Alexandre Julliard : patches: Support showing/ hiding multiple replies per patch.
by Alexandre Julliard 10 Nov '17

10 Nov '17

Module: tools Branch: master Commit: e00b03b02ad97d4c6686bdbc785c30ac90ee1a90 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e00b03b02ad97d4c6686bdbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 9 16:44:18 2017 +0100 patches: Support showing/hiding multiple replies per patch. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/patches/update b/patches/update index 5e82927..963a5db 100755 --- a/patches/update +++ b/patches/update @@ -104,9 +104,12 @@ sub uniq my $js = <<END; function toggle_display(id) { - var e = document.getElementById(id); - var display = e.style.display; - e.style.display = display == "none" ? "" : "none"; + var elems = document.getElementById('main_table').getElementsByClassName(id); + for (i = 0; i < elems.length; i++) + { + var display = elems[i].style.display; + elems[i].style.display = display == "none" ? "" : "none"; + } } END @@ -313,17 +316,17 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k print INDEX "</tr>\n"; if (@signoff) { - printf INDEX "<tr class=\"%s\" id=\"$file.signoff\" style=\"display: none;\" onclick=\"toggle_display('$file.signoff')\">" . + printf INDEX "<tr class=\"%s $file.signoff\" id=\"$file.signoff\" style=\"display: none;\" onclick=\"toggle_display('$file.signoff')\">" . "<td colspan=\"5\" /><td colspan=\"4\" class=\"signoffextra author\">%s</td></tr>\n", $row & 1 ? "odd" : "even", join("", map { "Signed-off-by: " . escapeHTML($_) . "<br/>"; } @signoff ); } foreach my $child (@{$patch->{"children"}}) { - printf INDEX "<tr class=\"%s\" id=\"$file.reply\" style=\"display: none;\" onclick=\"toggle_display('$file.reply')\">" . + printf INDEX "<tr class=\"%s\ $file.reply\" id=\"%s\" style=\"display: none;\" onclick=\"toggle_display('$file.reply')\">" . "<td colspan=\"2\" /><td colspan=\"2\" class=\"reply author\"><span class=\"indent\" />%s</td> " . "<td class=\"reply author\"><span class=\"indent\" /><a href=\"data/%s\">%s</a></td> " . "<td colspan=\"4\" /></tr>\n", - $row & 1 ? "odd" : "even", escapeHTML($child->{"author"}), $child->{"id"}, escapeHTML($child->{"subject"}); + $row & 1 ? "odd" : "even", $child->{"id"}, escapeHTML($child->{"author"}), $child->{"id"}, escapeHTML($child->{"subject"}); } $row++; }

1 0

Alexandre Julliard : patches: Remove some no longer used patch states.
by Alexandre Julliard 10 Nov '17

10 Nov '17

Module: tools Branch: master Commit: d84c6603d7bf9db05318d2c17db6ff9529cb92f8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d84c6603d7bf9db05318d2c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 21:08:25 2017 +0100 patches: Remove some no longer used patch states. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/expire | 15 ++------------- patches/patches.css | 2 -- patches/update | 5 ----- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/patches/expire b/patches/expire index 4dd8a1a..305e7e5 100755 --- a/patches/expire +++ b/patches/expire @@ -24,7 +24,6 @@ my %status_expiry = ( "nil" => 30, - "pending" => 30, "assigned" => 30, "applied" => 30, "committed" => 1, @@ -35,12 +34,11 @@ my %status_expiry = "formatting" => 7, "other" => 7, "nopatch" => 3, - "reply" => 7, + "reply" => 1, "rejected" => 7, "split" => 7, "depend" => 7, "sequence" => 7, - "signoff" => 1, "superseded" => 1, "testcase" => 7, "testfail" => 7, @@ -49,7 +47,6 @@ my %status_expiry = my %status_descr = ( "nil" => "New", - "pending" => "Pending", "assigned" => "Assigned", "applied" => "Applied", "committed" => "Committed", @@ -65,7 +62,6 @@ my %status_descr = "split" => "Needs splitting", "depend" => "Dependency", "sequence" => "Bad sequence", - "signoff" => "Sign-off", "superseded" => "Superseded", "testcase" => "Needs tests", "testfail" => "Test failure", @@ -73,12 +69,6 @@ my %status_descr = my %status_explanation = ( - "pending" => -"This means that the patch is not necessarily wrong, but its -correctness is not obvious. You should either write a test case -demonstrating that it is correct, try to fix the problem in a more -straightforward way, or better explain why you are doing things this -way.", "assigned" => "This means that the patch has been assigned to a reviewer. If the reviewer signs off on the patch, it will be committed, otherwise @@ -142,7 +132,6 @@ to enable the Testbot to figure it out.", the patch is correct.", # No notifications are sent for the following: # "nil" -# "signoff" # "reply" # "superseded" # "testfail" @@ -213,7 +202,7 @@ sub get_patch_state($) { $status = <STATUS>; chomp $status; - $mtime = (stat STATUS)[9] unless ($status eq "nil" || $status eq "pending"); + $mtime = (stat STATUS)[9] unless $status eq "nil"; close STATUS; } $mtime ||= (stat "$dir/$file")[9]; diff --git a/patches/patches.css b/patches/patches.css index f7bb560..24e8f37 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -153,7 +153,6 @@ tr.odd { background-color: #f8e8e8; } .id :hover, .sha1 :hover, .subject :hover { color: #FF6666; text-decoration: underline; } .nil, .nil :link, .nil :visited { color: blue; font-weight: bold; } -.pending, .pending :link, .pending :visited { color: blue; } .assigned, .assigned :link, .assigned :visited { color: blue; } .committed, .committed :link, .committed :visited { color: green; } .depend, .depend :link, .depend :visited { color: #e08000; } @@ -161,7 +160,6 @@ tr.odd { background-color: #f8e8e8; } .sequence, .sequence :link, .sequence :visited { color: #e08000; } .deferred, .deferred :link, .deferred :visited { color: #e08000; } .testcase, .testcase :link, .testcase :visited { color: #e08000; } -.signoff, .signoff :link, .signoff :visited { color: #e08000; } .reply, .reply :link, .reply :visited { color: #e08000; } .other, .other :link, .other :visited { color: #e08000; } .applyfail, .applyfail :link, .applyfail :visited { color: red; } diff --git a/patches/update b/patches/update index ca4d2e5..5e82927 100755 --- a/patches/update +++ b/patches/update @@ -24,7 +24,6 @@ use CGI qw(:standard); my %status_descr = ( "nil" => "New", - "pending" => "Pending", "assigned" => "Assigned", "applied" => "Applied", "committed" => "Committed", @@ -42,14 +41,12 @@ my %status_descr = "sequence" => "Bad sequence", "testcase" => "Needs tests", "testfail" => "Test failure", - "signoff" => "Sign-off", "reply" => "Reply", ); my @legend = ( [ "nil", "<ul><li>Patch not even looked at yet, there's still hope...</li></ul>" ], - [ "pending", "<ul><li>The patch is not obviously correct at first glance. Making a more convincing argument, preferably in the form of a test case, may help.</li></ul>" ], [ "assigned", "<ul><li>Waiting for sign-off or feedback from the assigned reviewer. If you don't hear anything after a couple of weeks, please resend the patch.</li></ul>" ], [ "committed", "<ul><li>You have done everything right; congratulations!</li>" . "<li>You screwed up but AJ missed it, send a fix before someone notices ;-)</li></ul>" ], @@ -59,8 +56,6 @@ my @legend = "<li>Someone else fixed the problem already.</li></ul>" ], [ "testcase", "<ul><li>You need to write some test cases demonstrating that the patch is correct.</li></ul>" ], [ "deferred", "<ul><li>The patch is deferred because of code freeze for an upcoming release. Either resend after the release, make the patch less intrusive, or make a convincing argument that it needs to be included in the release.</li></ul>" ], - [ "signoff", "<ul><li>This is a Signed-off-by reply to another patch.</li></ul>" ], - [ "reply", "<ul><li>The mail is a reply to another patch.</li></ul>" ], [ "other", "<ul><li>The patch belongs to another WineHQ project (website, appdb, etc.) and will be applied by the respective maintainer.</li></ul>" ], [ "applyfail", "<ul><li>The patch got mangled in transit.</li>" . "<li>It's not relative to the latest git.</li>" .

1 0

Alexandre Julliard : patches: Also use References: header to build mail threads.
by Alexandre Julliard 10 Nov '17

10 Nov '17

Module: tools Branch: master Commit: 4e6b4b09d261b86ad0b0768849806294c8292e14 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4e6b4b09d261b86ad0b07688… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 9 12:32:44 2017 +0100 patches: Also use References: header to build mail threads. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 48 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/patches/update b/patches/update index e4ede03..ca4d2e5 100755 --- a/patches/update +++ b/patches/update @@ -154,6 +154,7 @@ foreach my $file (readdir DIR) elsif (/^From: (.*)$/) { $patch{"author"} = format_author($1); } elsif (/^Message-Id: (.*)$/) { $patch{"msgid"} = $1; } elsif (/^In-Reply-To: (.*)$/) { $patch{"reply"} = $1; } + elsif (/^References: (.*)$/) { @{$patch{"refs"}} = split /\s+/, $1; } last if (/^$/); } while (<PATCH>) @@ -225,24 +226,35 @@ closedir DIR; # build mail threads -foreach my $file (sort keys %patches) +sub assign_parent($); +sub assign_parent($) { - my $patch = $patches{$file}; - next if defined $patch->{"has_patch"}; - next unless defined $patch->{"reply"}; - next unless defined $messages{$patch->{"reply"}}; - my $parent = $messages{$patch->{"reply"}}; - # find top parent - while (!defined($parent->{"has_patch"}) && defined($parent->{"reply"})) + my $patch = shift; + + if (defined($patch->{"parent"})) { return $patch->{"parent"}; } + + return $patch if defined $patch->{"has_patch"}; + return $patch unless defined $patch->{"reply"}; + + foreach ($patch->{"reply"}, @{$patch->{"refs"}}) { - $parent = $messages{$parent->{"reply"}}; + next unless defined $messages{$_}; + my $parent = assign_parent( $messages{$_} ); + next unless $parent; + # add it to the parent's children + $patch->{"parent"} = $parent; + push @{$parent->{"children"}}, $patch; + push @{$parent->{"signoff"}}, @{$patch->{"signoff"}} if $patch->{"signoff"}; + return $parent; } - next unless defined $parent; - # add it to the parent's children and remove it from the list - $patch->{"parent"} = $parent; - push @{$parent->{"children"}}, $patch; - push @{$parent->{"signoff"}}, @{$patch->{"signoff"}} if $patch->{"signoff"}; - delete $patches{$file}; + return undef; +} + +foreach my $file (sort keys %patches) +{ + assign_parent( $patches{$file} ); + # remove patches that have a parent + delete $patches{$file} if $patches{$file}->{"parent"}; } my $row = 0; @@ -250,6 +262,12 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k { my $patch = $patches{$file}; + if (!defined $patch->{"has_patch"}) # skip non-patches + { + next if $patch->{"status"} eq "reply"; + next unless $patch->{"subject"} =~ /\[.*PATCH.*\]/; + } + printf INDEX "<tr class=\"%s %s\"><td class=\"id\">%s</td><td class=\"status\"><a href=\"#legend\">%s</a></td>", $row & 1 ? "odd" : "even", $patch->{"status"}, $file, $status_descr{$patch->{"status"}} || $patch->{"status"}; if (defined $patch->{"children"})

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2017