wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Nikolay Sivov : shell32: Simplify conditional expression (PVS-Studio).
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: 5853e7769c4d4e0546f017d21e634a6b22add183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5853e7769c4d4e0546f017d21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 15 12:37:10 2015 +0300 shell32: Simplify conditional expression (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/debughlp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/debughlp.c b/dlls/shell32/debughlp.c index 3d417f8..a7ae616 100644 --- a/dlls/shell32/debughlp.c +++ b/dlls/shell32/debughlp.c @@ -53,7 +53,7 @@ LPCITEMIDLIST _dbg_ILGetNext(LPCITEMIDLIST pidl) static BOOL _dbg_ILIsDesktop(LPCITEMIDLIST pidl) { - return ( !pidl || (pidl && pidl->mkid.cb == 0x00) ); + return ( !pidl || pidl->mkid.cb == 0x00 ); } static

1 0

Nikolay Sivov : oleaut32/tests: Don't use HRESULT codes for BOOL retval ( PVS-Studio).
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: feb607ecf67561ff09322cb420611e25c7a02ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feb607ecf67561ff09322cb42… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 15 12:36:42 2015 +0300 oleaut32/tests: Don't use HRESULT codes for BOOL retval (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 9b05fe7..4ba453c 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -230,7 +230,7 @@ static HRESULT WINAPI RecordInfo_GetFieldNames(IRecordInfo *iface, ULONG *pcName static BOOL WINAPI RecordInfo_IsMatchingType(IRecordInfo *iface, IRecordInfo *info2) { ok(0, "unexpected call\n"); - return E_NOTIMPL; + return FALSE; } static PVOID WINAPI RecordInfo_RecordCreate(IRecordInfo *iface)

1 0

Michael Stefaniuc : user.exe16: Fix a misplaced closing bracket ( PVS-Studio).
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: 7be37c9874a74b508836bf9ddd311fe1e5eba5a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7be37c9874a74b508836bf9dd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 14 21:36:33 2015 +0200 user.exe16: Fix a misplaced closing bracket (PVS-Studio). Previous code was setting ret to 1 for negative return values of vsnprintf; that would fail on glibc 2.0.6 and older. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index d16a1b4..aba797d 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -3244,7 +3244,7 @@ DWORD WINAPI FormatMessage16( argliststart=args+insertnr-1; /* CMF - This makes a BIG assumption about va_list */ - while ((ret = vsnprintf(b, sz, fmtstr, (va_list) argliststart) < 0) || (ret >= sz)) { + while ((ret = vsnprintf(b, sz, fmtstr, (va_list) argliststart)) < 0 || ret >= sz) { sz = (ret == -1 ? sz + 100 : ret + 1); b = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, b, sz); }

1 0

Thomas Faller : ntdll/tests: Fix use of uninitialized value.
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: c96684c3b275ad579a296d46ac76ced64654430d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c96684c3b275ad579a296d46a… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Wed Oct 14 18:13:33 2015 +0200 ntdll/tests: Fix use of uninitialized value. Signed-off-by: Thomas Faller <tfaller1(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 6bd1530..8989760 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -111,7 +111,7 @@ static void testQuery(void) pRtlMultiByteToUnicodeN( bn, sizeof(bn), NULL, test->val, strlen(test->val)+1 ); ok( value.Length == strlen(test->val) * sizeof(WCHAR), "Wrong length %d for %s\n", value.Length, test->var ); - ok((value.Length == strlen(test->val) * sizeof(WCHAR) && memcmp(bv, bn, test->len*sizeof(WCHAR)) == 0) || + ok((value.Length == strlen(test->val) * sizeof(WCHAR) && memcmp(bv, bn, value.Length) == 0) || lstrcmpW(bv, bn) == 0, "Wrong result for %s/%d\n", test->var, test->len); ok(bv[test->len] == '@', "Writing too far away in the buffer for %s/%d\n", test->var, test->len);

1 0

Bernhard Übelacker : taskmgr: Fix changing of debug channels.
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: 74c2989db36246fd8940a38253e8004d7455736e URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c2989db36246fd8940a3825… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Wed Oct 14 19:27:10 2015 +0200 taskmgr: Fix changing of debug channels. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/dbgchnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c index 1049a16..6e2dea0 100644 --- a/programs/taskmgr/dbgchnl.c +++ b/programs/taskmgr/dbgchnl.c @@ -280,7 +280,8 @@ static void DebugChannels_OnNotify(HWND hDlg, LPARAM lParam) HANDLE hProcess; NMITEMACTIVATE* nmia = (NMITEMACTIVATE*)lParam; - hProcess = OpenProcess(PROCESS_VM_OPERATION | PROCESS_VM_READ | PROCESS_VM_WRITE, FALSE, get_selected_pid()); + hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_OPERATION | PROCESS_VM_READ | PROCESS_VM_WRITE, + FALSE, get_selected_pid()); if (!hProcess) return; /* FIXME message box */ lhti.pt = nmia->ptAction; hChannelLV = GetDlgItem(hDlg, IDC_DEBUG_CHANNELS_LIST);

1 0

Bernhard Übelacker : patches: Mention missing Signed-off-by headers in the legend.
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: tools Branch: master Commit: 89509155d229beae4dff01bd412d697468689060 URL: http://source.winehq.org/git/tools.git/?a=commit;h=89509155d229beae4dff01bd… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Thu Oct 15 10:37:56 2015 +0200 patches: Mention missing Signed-off-by headers in the legend. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/update b/patches/update index e084b77..86578d7 100755 --- a/patches/update +++ b/patches/update @@ -66,7 +66,7 @@ my @legend = [ "buildfail", "<ul><li>Syntax error or other compile problem.</li>" . "<li>You forgot to include some changes or new files required for compilation.</li>" . "<li>The patch causes compiler warnings (maintainer mode implies -Werror).</li></ul>" ], - [ "formatting", "<ul><li>The patch author's full name or email address are incorrect or missing.</li>" . + [ "formatting", "<ul><li>The patch author's full name, email address, or Signed-off-by headers are incorrect or missing.</li>" . "<li>Whitespace got mangled in transit.</li>" . "<li>Indentation is messed up (usually from editing with a non-standard tab size).</li>" . "<li>8-bit chars got mangled in transit (usually when sending patches to resource files).</li>" .

1 0

Alexandre Julliard : patches: Expand the sign-off list when the checkmark is clicked.
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: tools Branch: master Commit: f91a28465e6e263798285a664e6bb7f007e40650 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f91a28465e6e263798285a66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 20:49:38 2015 +0900 patches: Expand the sign-off list when the checkmark is clicked. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/patches.css | 1 + patches/update | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/patches/patches.css b/patches/patches.css index 99cc055..091052d 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -141,6 +141,7 @@ tr.odd { background-color: #f8e8e8; } .id, .status, .testbot { text-align: center; } .id, .status, .author { white-space: nowrap; padding: 0 3px; } .checkmark { text-align: center; color:green; } +.signoffextra { color: #A50D0D; border: 1px solid #601919; } .sha1 { white-space: nowrap; font-family: monospace; padding: 2px 12px; } .id :link, .sha1 :link, .subject :link { color: #A50D0D; text-decoration: none; } diff --git a/patches/update b/patches/update index 97ff543..e084b77 100755 --- a/patches/update +++ b/patches/update @@ -96,10 +96,20 @@ sub format_author($) return $str; } +my $js = <<END; +function toggle_display(id) +{ + var e = document.getElementById(id); + var display = e.style.display; + e.style.display = display == "none" ? "" : "none"; +} +END + open INDEX, ">:utf8", "$dest/index.html.new" or die "cannot create $dest/index.html.new"; print INDEX start_html(-title=>"Patches list", -encoding=>"utf-8", + -script=>$js, -style=>{src=>"patches.css"}); print INDEX "<div id=\"logo_glass\"><a href=\"/patches/\"><img src=\"//winehq.org/images/winehq_logo_glass_sm.png\"></a></div>\n"; @@ -219,7 +229,7 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k } if (defined($patch->{"signoff"})) { - printf INDEX "<td class=\"checkmark\"><a title=\"%s\">✓</a></td>", join("\n",@{$patch->{"signoff"}}); + printf INDEX "<td class=\"checkmark\" onclick=\"toggle_display('$file.signoff')\">✓</td>"; } else { @@ -244,6 +254,12 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k print INDEX "<td></td>"; } print INDEX "</tr>\n"; + if (defined($patch->{"signoff"})) + { + printf INDEX "<tr class=\"%s\" id=\"$file.signoff\" style=\"display: none;\" onclick=\"toggle_display('$file.signoff')\">" . + "<td colspan=\"4\" /><td colspan=\"4\" class=\"signoffextra author\">%s</td></tr>\n", + $row & 1 ? "odd" : "even", join("", map { "Signed-off-by: " . escapeHTML($_) . "<br/>"; } @{$patch->{"signoff"}}); + } $row++; } print INDEX "</table></div>\n";

1 0

Alexandre Julliard : patches: Add support for assigned status and reviewer field.
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: tools Branch: master Commit: 444dec78182788388366f864c602817b6e746cbc URL: http://source.winehq.org/git/tools.git/?a=commit;h=444dec78182788388366f864… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 17:47:45 2015 +0900 patches: Add support for assigned status and reviewer field. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/expire | 12 +++++++++++- patches/patches.css | 1 + patches/update | 24 +++++++++++++++++++++--- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/patches/expire b/patches/expire index 0f26d8a..0ff3bc7 100755 --- a/patches/expire +++ b/patches/expire @@ -25,6 +25,7 @@ my %status_expiry = ( "nil" => 30, "pending" => 30, + "assigned" => 30, "applied" => 30, "committed" => 1, "applyfail" => 7, @@ -47,6 +48,7 @@ my %status_descr = ( "nil" => "New", "pending" => "Pending", + "assigned" => "Assigned", "applied" => "Applied", "committed" => "Committed", "applyfail" => "Apply failure", @@ -73,6 +75,11 @@ 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 +you'll receive advice on how to improve it. If you don't hear anything +after a couple of weeks, please resend the patch.", "committed" => "This means that your patch has been approved, and committed to the main git tree. Congratulations!", @@ -271,7 +278,7 @@ been reviewed and its status set to "$status_descr{$status}". $status_explanation{$status} EOF - if ($status ne "committed") + if ($status ne "committed" && $status ne "assigned") { print SENDMAIL <<"EOF"; @@ -306,6 +313,7 @@ foreach my $file (sort readdir DIR) rename "$dir/$file", "$dir/OLD/$file"; rename "$dir/$file.status", "$dir/OLD/$file.status"; rename "$dir/$file.order", "$dir/OLD/$file.order"; + rename "$dir/$file.review", "$dir/OLD/$file.review"; rename "$dir/$file.signoff", "$dir/OLD/$file.signoff"; rename "$dir/$file.testbot", "$dir/OLD/$file.testbot"; rename "$dir/$file.testfail", "$dir/OLD/$file.testfail"; @@ -320,6 +328,7 @@ foreach my $file (sort readdir DIR) unlink "$dir/$file.status"; unlink "$dir/$file.order"; unlink "$dir/$file.signoff"; + unlink "$dir/$file.review"; unlink "$dir/$file.testbot"; unlink "$dir/$file.testfail"; unlink "$dir/OLD/$file.status"; @@ -351,6 +360,7 @@ foreach my $file (sort readdir DIR) unlink "$dir/OLD/$file"; unlink "$dir/OLD/$file.status"; unlink "$dir/OLD/$file.order"; + unlink "$dir/OLD/$file.review"; unlink "$dir/OLD/$file.signoff"; unlink "$dir/OLD/$file.testbot"; unlink "$dir/OLD/$file.testfail"; diff --git a/patches/patches.css b/patches/patches.css index 5706681..99cc055 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -149,6 +149,7 @@ tr.odd { background-color: #f8e8e8; } .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; } .superseded, .superseded :link, .superseded :visited { color: #e08000; } diff --git a/patches/update b/patches/update index fa8fd54..97ff543 100755 --- a/patches/update +++ b/patches/update @@ -25,6 +25,7 @@ my %status_descr = ( "nil" => "New", "pending" => "Pending", + "assigned" => "Assigned", "applied" => "Applied", "committed" => "Committed", "applyfail" => "Apply failure", @@ -46,8 +47,8 @@ my %status_descr = 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>" . - "<li>Waiting for feedback from the main developer in that area.</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>" ], [ "depend", "<ul><li>The patch is part of a series in which a previous patch hasn't been applied. Resend when the dependent patch is fixed.</li></ul>" ], @@ -91,7 +92,7 @@ my %patches; sub format_author($) { my $str = shift; - if ($str =~ /\s*((\"(.*)\")|(.*))\s*<(\S+\@\S+)>/) { return $3 || $4 || $5; } + if ($str =~ /\s*((\"(.*)\")|(.*?))\s*<(\S+\@\S+)>/) { return $3 || $4 || $5; } return $str; } @@ -115,6 +116,7 @@ print INDEX "<table class=\"main\"><tr><th class=\"id\">ID</th>", "<th class=\"status\">Status</th>", "<th class=\"author\">Author</th>", "<th class=\"subject\">Subject</th>", + "<th class=\"author\">Reviewer</th>", "<th class=\"status\">Sign</th>", "<th class=\"status\">Testbot</th>", "<th class=\"status\">Job ID</th></tr>\n"; @@ -154,6 +156,14 @@ foreach my $file (readdir DIR) $patch{"order"} = <ORDER>; close ORDER; } + if (open REVIEW, "<:raw", "$dir/$file.review") + { + $_ = <REVIEW>; + chomp; + utf8::decode($_); + $patch{"review"} = format_author($_); + close REVIEW; + } if (open SIGNOFF, "<:raw", "$dir/$file.signoff") { while (<SIGNOFF>) @@ -199,6 +209,14 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k escapeHTML($patch->{"author"}); printf INDEX "<td class=\"subject\"><a href=\"data/$file\">%s</a></td>", escapeHTML($patch->{"subject"}); + if ($patch->{"review"}) + { + printf INDEX "<td class=\"author\">%s</td>", escapeHTML($patch->{"review"}); + } + else + { + printf INDEX "<td></td>"; + } if (defined($patch->{"signoff"})) { printf INDEX "<td class=\"checkmark\"><a title=\"%s\">✓</a></td>", join("\n",@{$patch->{"signoff"}});

1 0

Alexandre Julliard : patches: More robust utf-8 decoding.
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: tools Branch: master Commit: f612a2f657f40c96f94323af8ec871d469f55a9a URL: http://source.winehq.org/git/tools.git/?a=commit;h=f612a2f657f40c96f94323af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 15:30:12 2015 +0900 patches: More robust utf-8 decoding. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/patches/update b/patches/update index a11d17e..fa8fd54 100755 --- a/patches/update +++ b/patches/update @@ -20,8 +20,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA use CGI qw(:standard); -use open ':utf8'; -binmode STDOUT, ':utf8'; my %status_descr = ( @@ -97,7 +95,7 @@ sub format_author($) return $str; } -open INDEX, "> $dest/index.html.new" or die "cannot create $dest/index.html.new"; +open INDEX, ">:utf8", "$dest/index.html.new" or die "cannot create $dest/index.html.new"; print INDEX start_html(-title=>"Patches list", -encoding=>"utf-8", @@ -126,15 +124,17 @@ foreach my $file (readdir DIR) { next unless $file =~ /^[0-9]+$/; my %patch; - next unless open PATCH, "<$dir/$file"; + next unless open PATCH, "<:raw", "$dir/$file"; while (<PATCH>) { + utf8::decode($_); if (/^Subject: (.*)$/) { $patch{"subject"} = $1; } elsif (/^From: (.*)$/) { $patch{"author"} = format_author($1); } last if (/^$/); } while (<PATCH>) { + utf8::decode($_); if (/^\s*Signed-off-by: (.*)$/) { push @{$patch{"signoff"}}, format_author($1); } last if (/^---$/); } @@ -154,11 +154,12 @@ foreach my $file (readdir DIR) $patch{"order"} = <ORDER>; close ORDER; } - if (open SIGNOFF, "<$dir/$file.signoff") + if (open SIGNOFF, "<:raw", "$dir/$file.signoff") { while (<SIGNOFF>) { chomp; + utf8::decode($_); push @{$patch{"signoff"}}, format_author($_); } close SIGNOFF; @@ -169,10 +170,11 @@ foreach my $file (readdir DIR) if (-f "$dir/$file.testbot") { $patch{"testbot"} = "OK"; - if (open LOG, "<$dir/$file.testbot") + if (open LOG, "<:raw", "$dir/$file.testbot") { while (<LOG>) { + utf8::decode($_); last if /^$/; if (/^Job-ID: (.*)$/) { $patch{"testjob"} = $1; } elsif (/^URL: (.*)$/) { $patch{"testurl"} = $1; }

1 0

André Hentschel : Add WWN 401
by Jeremy Newman 14 Oct '15

14 Oct '15

Module: website Branch: master Commit: ecd2dc3ab5b1e7985f4788c6a586856c357e2f52 URL: http://source.winehq.org/git/website.git/?a=commit;h=ecd2dc3ab5b1e7985f4788… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 14 20:19:15 2015 +0200 Add WWN 401 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2015101401.xml | 10 ++ news/en/2015101401.xml | 10 ++ wwn/en/wn20151014_401.xml | 402 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 422 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=ecd2dc3ab5b1e7985f…

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
75
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 October 2015