October 2015 - Wine-Commits

Józef Kucia : d3d11: Implement d3d11_immediate_context_ClearRenderTargetView().
by Alexandre Julliard Oct. 15, 2015

Oct. 15, 2015

Module: wine Branch: master Commit: 1b9ce7671e93416d119a8f8cf8af07f33469c021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b9ce7671e93416d119a8f8cf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 14 02:08:15 2015 +0200 d3d11: Implement d3d11_immediate_context_ClearRenderTargetView(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 12 +++++++++++- dlls/d3d11/view.c | 9 +++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index ce4f965..c28359e 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -186,6 +186,7 @@ struct d3d_rendertarget_view HRESULT d3d_rendertarget_view_create(struct d3d_device *device, ID3D11Resource *resource, const D3D11_RENDER_TARGET_VIEW_DESC *desc, struct d3d_rendertarget_view **view) DECLSPEC_HIDDEN; +struct d3d_rendertarget_view *unsafe_impl_from_ID3D11RenderTargetView(ID3D11RenderTargetView *iface) DECLSPEC_HIDDEN; struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) DECLSPEC_HIDDEN; /* ID3D11ShaderResourceView, ID3D10ShaderResourceView */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4c310be..e757169 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -467,8 +467,18 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopyStructureCount(ID3D11D static void STDMETHODCALLTYPE d3d11_immediate_context_ClearRenderTargetView(ID3D11DeviceContext *iface, ID3D11RenderTargetView *render_target_view, const FLOAT color_rgba[4]) { - FIXME("iface %p, render_target_view %p, color_rgba {%.8e %.8e %.8e %.8e} stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_rendertarget_view *view = unsafe_impl_from_ID3D11RenderTargetView(render_target_view); + const struct wined3d_color color = {color_rgba[0], color_rgba[1], color_rgba[2], color_rgba[3]}; + HRESULT hr; + + TRACE("iface %p, render_target_view %p, color_rgba {%.8e %.8e %.8e %.8e}.\n", iface, render_target_view, color_rgba[0], color_rgba[1], color_rgba[2], color_rgba[3]); + + wined3d_mutex_lock(); + if (FAILED(hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, view->wined3d_view, NULL, &color))) + ERR("Failed to clear view, hr %#x.\n", hr); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_ClearUnorderedAccessViewUint(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index ce33749..f3769b5 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1169,6 +1169,15 @@ HRESULT d3d_rendertarget_view_create(struct d3d_device *device, ID3D11Resource * return S_OK; } +struct d3d_rendertarget_view *unsafe_impl_from_ID3D11RenderTargetView(ID3D11RenderTargetView *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_rendertarget_view_vtbl); + + return impl_from_ID3D11RenderTargetView(iface); +} + struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) { if (!iface)

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_DrawInstanced().
by Alexandre Julliard Oct. 15, 2015

Oct. 15, 2015

Module: wine Branch: master Commit: 3b54ec6a344f7d7216eae2204b455770b06eb2c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b54ec6a344f7d7216eae2204… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 14 02:08:16 2015 +0200 d3d11: Implement d3d11_immediate_context_DrawInstanced(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e757169..5f1ab7e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -259,10 +259,17 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstanced(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstanced(ID3D11DeviceContext *iface, UINT instance_vertex_count, UINT instance_count, UINT start_vertex_location, UINT start_instance_location) { - FIXME("iface %p, instance_vertex_count %u, instance_count %u, start_vertex_location %u, " - "start_instance_location %u stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, instance_vertex_count %u, instance_count %u, start_vertex_location %u, " + "start_instance_location %u.\n", iface, instance_vertex_count, instance_count, start_vertex_location, start_instance_location); + + wined3d_mutex_lock(); + wined3d_device_draw_primitive_instanced(device->wined3d_device, start_vertex_location, + instance_vertex_count, start_instance_location, instance_count); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetConstantBuffers(ID3D11DeviceContext *iface,

1 0

Stefan Dösinger : d3d8: Call IDirect3DSwapChain8:: Present in IDirect3DDevice8::Present.
by Alexandre Julliard Oct. 15, 2015

Oct. 15, 2015

Module: wine Branch: master Commit: 20d5be042c577b8dfcca431fa4688cad192196df URL: http://source.winehq.org/git/wine.git/?a=commit;h=20d5be042c577b8dfcca431fa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 14 11:09:55 2015 +0200 d3d8: Call IDirect3DSwapChain8::Present in IDirect3DDevice8::Present. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 4 ++++ dlls/d3d8/device.c | 21 +++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 3069487..9a5de92 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -176,6 +176,10 @@ struct d3d8_device LONG device_state; /* Avoids recursion with nested ReleaseRef to 0 */ BOOL inDestruction; + + /* The d3d8 API supports only one implicit swapchain (no D3DCREATE_ADAPTERGROUP_DEVICE, + * no GetSwapchain, GetBackBuffer doesn't accept a swapchain number). */ + struct d3d8_swapchain *implicit_swapchain; }; HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wined3d *wined3d, UINT adapter, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0648f51..20ce900 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -705,20 +705,17 @@ static HRESULT WINAPI d3d8_device_Present(IDirect3DDevice8 *iface, const RECT *s const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p.\n", iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, dirty_region); - if (device->device_state != D3D8_DEVICE_STATE_OK) - return D3DERR_DEVICELOST; - - wined3d_mutex_lock(); - hr = wined3d_device_present(device->wined3d_device, src_rect, dst_rect, - dst_window_override, dirty_region, 0); - wined3d_mutex_unlock(); - - return hr; + /* Fraps does not hook IDirect3DDevice8::Present regardless of the hotpatch + * attribute. It only hooks IDirect3DSwapChain8::Present. Yet it properly + * shows a framerate on Windows in applications that only call the device + * method, like e.g. the dx8 sdk samples. The conclusion is that native + * calls the swapchain's public method from the device. */ + return IDirect3DSwapChain8_Present(&device->implicit_swapchain->IDirect3DSwapChain8_iface, + src_rect, dst_rect, dst_window_override, dirty_region); } static HRESULT WINAPI d3d8_device_GetBackBuffer(IDirect3DDevice8 *iface, @@ -3114,6 +3111,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) { struct wined3d_swapchain_desc swapchain_desc; + struct wined3d_swapchain *wined3d_swapchain; HRESULT hr; device->IDirect3DDevice8_iface.lpVtbl = &d3d8_device_vtbl; @@ -3200,6 +3198,9 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine goto err; } + wined3d_swapchain = wined3d_device_get_swapchain(device->wined3d_device, 0); + device->implicit_swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); + device->d3d_parent = &parent->IDirect3D8_iface; IDirect3D8_AddRef(device->d3d_parent);

1 0

Stefan Dösinger : wined3d: Remove wined3d_device_present.
by Alexandre Julliard Oct. 15, 2015

Oct. 15, 2015

Module: wine Branch: master Commit: 59ec72879f3b9dd8b37cb4c0bceb133d945040e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ec72879f3b9dd8b37cb4c0b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 14 11:09:56 2015 +0200 wined3d: Remove wined3d_device_present. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_private.h | 3 ++ dlls/d3d9/device.c | 125 ++++++++++++++++++++++++++++++---------------- dlls/wined3d/device.c | 18 ------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 2 - 5 files changed, 86 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59ec72879f3b9dd8b37cb…

1 0

Nikolay Sivov : shlwapi/tests: Fix a couple of prototypes to match implementation (PVS-Studio).
by Alexandre Julliard Oct. 15, 2015

Oct. 15, 2015

Module: wine Branch: master Commit: bef3298e8912aee117761f7cf82e21160d3af92e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bef3298e8912aee117761f7cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 15 13:07:02 2015 +0300 shlwapi/tests: Fix a couple of prototypes to match implementation (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/path.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 84b3f4d..ab4ae47 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -27,8 +27,8 @@ #include "shlwapi.h" #include "wininet.h" -static HRESULT (WINAPI *pPathIsValidCharA)(char,DWORD); -static HRESULT (WINAPI *pPathIsValidCharW)(WCHAR,DWORD); +static BOOL (WINAPI *pPathIsValidCharA)(char,DWORD); +static BOOL (WINAPI *pPathIsValidCharW)(WCHAR,DWORD); static LPWSTR (WINAPI *pPathCombineW)(LPWSTR, LPCWSTR, LPCWSTR); static HRESULT (WINAPI *pPathCreateFromUrlA)(LPCSTR, LPSTR, LPDWORD, DWORD); static HRESULT (WINAPI *pPathCreateFromUrlW)(LPCWSTR, LPWSTR, LPDWORD, DWORD);

1 0

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

Oct. 15, 2015

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: More robust utf-8 decoding.
by Alexandre Julliard Oct. 15, 2015

Oct. 15, 2015

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

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

Oct. 15, 2015

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: Expand the sign-off list when the checkmark is clicked.
by Alexandre Julliard Oct. 15, 2015

Oct. 15, 2015

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

André Hentschel : Fix blockqoutes in WWN 400
by Jeremy Newman Oct. 14, 2015

Oct. 14, 2015

Module: website Branch: master Commit: 725824267cdd32188d86eb5d3ab8fa24a195c5ca URL: http://source.winehq.org/git/website.git/?a=commit;h=725824267cdd32188d86eb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 14 20:19:12 2015 +0200 Fix blockqoutes in WWN 400 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- wwn/en/wn20151004_400.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wwn/en/wn20151004_400.xml b/wwn/en/wn20151004_400.xml index f39e4e9..abe6496 100644 --- a/wwn/en/wn20151004_400.xml +++ b/wwn/en/wn20151004_400.xml @@ -92,6 +92,7 @@ given up in disgust to give us another chance; and if things are still not satisfactory, please send us feedback. This is a work in progress, and we will continue to listen and work on making things better. </pre> +</blockquote> ]]> <p> One of the steps to achive the integration is to adjust our Bugzilla settings. @@ -132,6 +133,7 @@ for more than 1 year can be closed. projects do, and eliminates confusion about the upstream/downstream distinction. </pre> +</blockquote> ]]> <p> For now some things are still not implemented,

1 0