October 2017 - Wine-commits

Francois Gouget : testbot: Power off Libvirt domains in one operation.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: tools Branch: master Commit: ccf23fd22fa8491a6abf026a989c855669cac2d8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ccf23fd22fa8491a6abf026a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 19 14:54:41 2017 +0200 testbot: Power off Libvirt domains in one operation. When all goes well. In case of trouble use get_state() to check if the virtual machine is powered off anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LibvirtDomain.pm | 48 +++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index f8caffa..9ca98eb 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -253,6 +253,23 @@ sub IsPoweredOn($) return ($State == Sys::Virt::Domain::STATE_RUNNING); } +sub _GetStateName($) +{ + my ($State) = @_; + + my %StateNames = { + Sys::Virt::Domain::STATE_NOSTATE => "no state", + Sys::Virt::Domain::STATE_RUNNING => "running", + Sys::Virt::Domain::STATE_BLOCKED => "blocked", + Sys::Virt::Domain::STATE_PAUSED => "paused", + Sys::Virt::Domain::STATE_SHUTDOWN => "shutdown", + Sys::Virt::Domain::STATE_SHUTOFF => "shutoff", + Sys::Virt::Domain::STATE_CRASHED => "crashed", + Sys::Virt::Domain::STATE_PMSUSPENDED => "pmsuspended", + }; + return $StateNames{$State} || "unknown"; +} + sub PowerOff($) { my ($self) = @_; @@ -260,21 +277,26 @@ sub PowerOff($) my ($ErrMessage, $Domain) = $self->_GetDomain(); return $ErrMessage if (defined $ErrMessage); - if ($self->IsPoweredOn()) + eval { $Domain->destroy() }; + return undef if (!$@); # Success + $ErrMessage = _eval_err(); + + # destroy() sets $@->code to Sys::Virt::Error::ERR_OPERATION_INVALID (55) + # if the domain was already off. But this could happen for other reasons so + # just check the domain state. + my ($State, $_Reason); + eval { ($State, $_Reason) = $Domain->get_state() }; + if ($@) { - eval { $Domain->destroy() }; - if ($@) - { - $ErrMessage = _eval_err(); - } - elsif ($self->IsPoweredOn()) - { - $ErrMessage = "The VM is still active"; - } + # Only return the initial error + return $self->_Reset("Could not power off ". $self->{VM}->Name .": $ErrMessage"); } - - return undef if (!defined $ErrMessage); - return $self->_Reset("Could not power off ". $self->{VM}->Name .": $ErrMessage"); + if ($State == Sys::Virt::Domain::STATE_SHUTOFF) + { + # This is what we wanted so ignore past errors + return undef; + } + return $self->_Reset($self->{VM}->Name ." is not off (". _GetStateName($State) ."): $ErrMessage"); } my %_StreamData;

1 0

Józef Kucia : wined3d: Get rid of unneeded includes.
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: c11251c188a402e168d48053f856c61542452259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c11251c188a402e168d48053f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 19 10:07:28 2017 +0200 wined3d: Get rid of unneeded includes. math.h is included in wined3d_private.h 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/wined3d/arb_program_shader.c | 1 - dlls/wined3d/ati_fragment_shader.c | 1 - dlls/wined3d/drawprim.c | 3 --- dlls/wined3d/nvidia_texture_shader.c | 1 - dlls/wined3d/shader.c | 1 - 5 files changed, 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 04c0d70..80c7354 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -30,7 +30,6 @@ #include "config.h" #include "wine/port.h" -#include <math.h> #include <stdio.h> #include "wined3d_private.h" diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 0fca3e6..2fd94bc 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -21,7 +21,6 @@ #include "config.h" #include "wine/port.h" -#include <math.h> #include <stdio.h> #include "wined3d_private.h" diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 235f87b..41eabba 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -33,9 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(d3d); -#include <stdio.h> -#include <math.h> - /* Context activation is done by the caller. */ static void draw_primitive_arrays(struct wined3d_context *context, const struct wined3d_state *state, const void *idx_data, unsigned int idx_size, int base_vertex_idx, unsigned int start_idx, diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 9d3a3a1..0baa414 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -22,7 +22,6 @@ #include "config.h" #include "wine/port.h" -#include <math.h> #include <stdio.h> #include "wined3d_private.h" diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f80467b..215f83b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -25,7 +25,6 @@ #include "config.h" #include "wine/port.h" -#include <math.h> #include <stdio.h> #include <string.h>

1 0

Józef Kucia : wined3d: Use ARRAY_SIZE().
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: 7f8e30bd1a1cfbe7ecf7ec7d358beba126adaeb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f8e30bd1a1cfbe7ecf7ec7d3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 19 10:07:29 2017 +0200 wined3d: Use ARRAY_SIZE(). 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/wined3d/context.c | 2 +- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/directx.c | 27 ++++++++++++--------------- dlls/wined3d/shader_sm4.c | 4 ++-- dlls/wined3d/state.c | 2 +- dlls/wined3d/stateblock.c | 12 ++++++------ dlls/wined3d/surface.c | 2 +- 7 files changed, 27 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f8e30bd1a1cfbe7ecf7e…

1 0

Stefan Dösinger : d3d9/tests: Make test_reset more resilient against DPI scaling.
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: 975a686aa0ef178447216c8ab2e2c945e145832e URL: http://source.winehq.org/git/wine.git/?a=commit;h=975a686aa0ef178447216c8ab… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 19 10:09:20 2017 +0200 d3d9/tests: Make test_reset more resilient against DPI scaling. 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/tests/d3d9ex.c | 53 ++++++++++++++++++++++++++++++++---------------- dlls/d3d9/tests/device.c | 23 ++++++++++++++------- 2 files changed, 51 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=975a686aa0ef178447216…

1 0

Stefan Dösinger : d3d8/tests: Make test_reset more resilient against DPI scaling.
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: 1acef2b93d980710966afb331e1eb9e0bac12472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1acef2b93d980710966afb331… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 19 10:09:21 2017 +0200 d3d8/tests: Make test_reset more resilient against DPI scaling. 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/tests/device.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b35de66..9cebd17 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1312,7 +1312,7 @@ static void test_reset(void) UINT mode_count = 0; DEVMODEW devmode; IDirect3D8 *d3d8; - RECT winrect; + RECT winrect, client_rect; D3DVIEWPORT8 vp; D3DCAPS8 caps; DWORD shader; @@ -1579,6 +1579,9 @@ static void test_reset(void) SWP_NOMOVE|SWP_NOZORDER), "SetWindowPos failed\n"); + /* Windows 10 gives us a different size than we requested with some DPI scaling settings (e.g. 172%). */ + GetClientRect(window, &client_rect); + memset(&d3dpp, 0, sizeof(d3dpp)); d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = TRUE; @@ -1614,8 +1617,10 @@ static void test_reset(void) { ok(vp.X == 0, "D3DVIEWPORT->X = %u, expected 0.\n", vp.X); ok(vp.Y == 0, "D3DVIEWPORT->Y = %u, expected 0.\n", vp.Y); - ok(vp.Width == 200, "D3DVIEWPORT->Width = %u, expected 200.\n", vp.Width); - ok(vp.Height == 150, "D3DVIEWPORT->Height = %u, expected 150.\n", vp.Height); + ok(vp.Width == client_rect.right, "D3DVIEWPORT->Width = %d, expected %d\n", + vp.Width, client_rect.right); + ok(vp.Height == client_rect.bottom, "D3DVIEWPORT->Height = %d, expected %d\n", + vp.Height, client_rect.bottom); ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %.8e, expected 0.\n", vp.MinZ); ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %.8e, expected 1.\n", vp.MaxZ); } @@ -1627,8 +1632,10 @@ static void test_reset(void) ok(surface_desc.Format == d3ddm.Format, "Got unexpected Format %#x, expected %#x.\n", surface_desc.Format, d3ddm.Format); ok(!surface_desc.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); - ok(surface_desc.Width == 200, "Back buffer width is %u, expected 200.\n", surface_desc.Width); - ok(surface_desc.Height == 150, "Back buffer height is %u, expected 150.\n", surface_desc.Height); + ok(surface_desc.Width == client_rect.right, + "Back buffer width is %u, expected %d.\n", surface_desc.Width, client_rect.right); + ok(surface_desc.Height == client_rect.bottom, + "Back buffer height is %u, expected %d.\n", surface_desc.Height, client_rect.bottom); IDirect3DSurface8_Release(surface); memset(&d3dpp, 0, sizeof(d3dpp));

1 0

Stefan Dösinger : d3d9/tests: Windows 10 15.07 doesn' t detect external mode changes.
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: eb7c1fd62eaac3847c86c855806f9d78c1c9a3a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7c1fd62eaac3847c86c8558… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 19 10:09:22 2017 +0200 d3d9/tests: Windows 10 15.07 doesn't detect external mode changes. 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/tests/d3d9ex.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 59a1daf..9dd3553 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2843,11 +2843,13 @@ static void test_wndproc(void) change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x, i=%u.\n", change_ret, i); - /* Native needs a present call to pick up the mode change. */ + /* Native needs a present call to pick up the mode change. Windows 10 15.07 never picks up the mode change + * in these calls and returns S_OK. This is a regression from Windows 8 and has been fixed in later Win10 + * builds. */ hr = IDirect3DDevice9Ex_Present(device, NULL, NULL, NULL, NULL); - todo_wine ok(hr == S_PRESENT_MODE_CHANGED, "Got unexpected hr %#x, i=%u.\n", hr, i); + todo_wine ok(hr == S_PRESENT_MODE_CHANGED || broken(hr == S_OK), "Got unexpected hr %#x, i=%u.\n", hr, i); hr = IDirect3DDevice9Ex_CheckDeviceState(device, device_window); - todo_wine ok(hr == S_PRESENT_MODE_CHANGED, "Got unexpected hr %#x, i=%u.\n", hr, i); + todo_wine ok(hr == S_PRESENT_MODE_CHANGED || broken(hr == S_OK), "Got unexpected hr %#x, i=%u.\n", hr, i); expect_messages = tests[i].focus_loss_messages; /* SetForegroundWindow is a poor replacement for the user pressing alt-tab or

1 0

Alex Henrie : winmm/tests: Give play from 0 to 0 more time to finish.
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: 05111a34d5e1649b1c185d11e8f4fc2de6a24c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=05111a34d5e1649b1c185d11e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 17 23:29:11 2017 -0600 winmm/tests: Give play from 0 to 0 more time to finish. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 52790c8..7c8aee8 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -848,7 +848,7 @@ static void test_playWAVE(HWND hwnd) err = mciSendStringA("play mysound from 250 to 0", NULL, 0, NULL); ok(err==MCIERR_OUTOFRANGE,"mci play from 250 to 0 returned %s\n", dbg_mcierr(err)); - Sleep(50); /* Give play from 0 to 0 time to finish. */ + Sleep(100); /* Give play from 0 to 0 time to finish. */ todo_wine test_notification(hwnd, "play from 0 to 0", MCI_NOTIFY_SUCCESSFUL); err = mciSendStringA("status mysound mode", buf, sizeof(buf), hwnd);

1 0

Alexandre Julliard : buildimage: Convert the XML parser to use XML:: LibXML.
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: 9e0c990be1838c5a1402babbb96d0f6cc592b1b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e0c990be1838c5a1402babbb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 19 16:51:39 2017 +0200 buildimage: Convert the XML parser to use XML::LibXML. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/buildimage | 168 ++++++++++++++++++++++++------------------------------- 1 file changed, 73 insertions(+), 95 deletions(-) diff --git a/tools/buildimage b/tools/buildimage index 74519fd..7075bc9 100755 --- a/tools/buildimage +++ b/tools/buildimage @@ -20,7 +20,7 @@ use strict; use warnings; -use XML::Parser; +use XML::LibXML; use MIME::Base64; use File::Copy; @@ -58,6 +58,13 @@ $SIG{"HUP"} = "cleanup"; $SIG{"TERM"} = "cleanup"; $SIG{"__DIE__"} = "cleanup"; +my %label = +( + 'ico' => 'icon:(\d*)-(\d*)', + 'cur' => 'cursor:(\d*)-(\d*)', + 'bmp' => 'bitmap:(\d*)-(\d*)', +); + # run a shell command and die on error sub shell(@) { @@ -65,120 +72,91 @@ sub shell(@) system(@args) == 0 or die "@args failed: $?"; } -sub svg_element_start +# add an image to the icon/cursor +sub add_image($$) { - my($expat, $element, %attr) = @_; + my ($file, $size) = @_; + + if (defined $hotspot[$size]) + { + my @coords = @{$hotspot[$size]}; + push @icotool_args, "--hotspot-x=$coords[0]", "--hotspot-y=$coords[1]"; + } + push @icotool_args, $size >= 128 ? "--raw=$file" : $file; + push @pngFiles, $file; +} - # Parse the id for icon/bitmap render directives - my $id = $attr{'id'}; - return unless defined($id); +# Render the SVG image +my @rsvgCmd; +push(@rsvgCmd, $rsvg); +push(@rsvgCmd, $svgFileName); +push(@rsvgCmd, "-o") if ($rsvg eq "rsvg-convert"); +push(@rsvgCmd, $renderedSVGFileName); +shell @rsvgCmd; - my $size = 0; - my $depth = 0; - my $width = 0; - my $height = 0; +# Render the images in the SVG +my $xml = XML::LibXML->load_xml( location => $svgFileName ); +my $xc = XML::LibXML::XPathContext->new($xml); +$xc->registerNs('x', 'http://www.w3.org/2000/svg'); - if ($id =~ /hotspot:(\d*)/) +if ($ext eq "bmp") +{ + foreach my $element ($xc->findnodes("/x:svg")) { - $hotspot[$1] = [ $attr{x}, $attr{y} ]; - return; + next unless $element->{id} =~ /bitmap:(\d*)-(\d*)/; + my $size = $1; + my $depth = $2; + if ($depth == 24) { + shell $convert, $renderedSVGFileName, "+matte", $outFileName; + } else { + shell $convert, $renderedSVGFileName, $outFileName; + } + cleanup(); + exit(0); } +} - if($ext eq "ico") { - return unless $id =~ /icon:(\d*)-(\d*)/; - $size = $1; - $depth = $2; - } elsif($ext eq "cur") { - return unless $id =~ /cursor:(\d*)-(\d*)/; - $size = $1; - $depth = $2; - } elsif($ext eq "bmp") { - return unless $id =~ /bitmap:(\d*)-(\d*)/; - $size = $1; - $depth = $2; +# fetch hotspot rectangles for the various sizes + +if ($ext eq "cur") +{ + foreach my $element ($xc->findnodes("/x:svg/x:rect")) + { + next unless $element->{id} =~ /hotspot:(\d*)/; + $hotspot[$1] = [ $element->{x}, $element->{y} ]; } +} - return unless defined($size) and defined($depth); +# extract rectangles from the rendered svg +foreach my $element ($xc->findnodes("/x:svg/*[\@id]")) +{ + next unless $element->{id} =~ /$label{$ext}/; + my $size = $1; + my $depth = $2; warn "Unexpected depth" unless $depth == 1 or $depth == 4 or $depth == 8 or $depth == 24 or $depth == 32; - my $pngFileName = "$outName-$size-$depth.png"; - - if($element eq "svg") { - - if ($ext eq "bmp") { - if ($depth == 24) { - shell $convert, $renderedSVGFileName, "+matte", $outFileName; - } else { - shell $convert, $renderedSVGFileName, $outFileName; - } - cleanup(); - exit(0); - } + my $file = "$outName-$size-$depth.png"; - # The whole file is tagged - $pngFileName = $renderedSVGFileName; - - } elsif($element eq "rect") { - - # Extract SVG vector images - my $x = $attr{'x'}; - my $y = $attr{'y'}; - $width = $attr{'width'}; - $height = $attr{'height'}; - - if(defined($x) and defined($y)) { - if($x =~ /\d*/ and $y =~ /\d*/) { - shell $convert, $renderedSVGFileName, "-crop", "${width}x${height}+$x+$y", "-depth", $depth, $pngFileName; - } - } - } elsif($element eq "image" ) { - - # Extract Base64 encoded PNG data to files - my $xlinkHref = $attr{'xlink:href'}; - if(defined($xlinkHref)) { - $xlinkHref =~ /data:image\/png;base64(.*)/; - my $imageEncodedData = $1; - if(defined $imageEncodedData) { - open(FILE, '>' . $pngFileName) or die "$!"; - print FILE decode_base64($imageEncodedData); - close FILE; - } - } - } else { - return; - } - - if (defined $hotspot[$size]) + my $x = $element->{x}; + my $y = $element->{y}; + my $width = $element->{width}; + my $height = $element->{height}; + if ($element->{'xlink:href'}) { - my @coords = @{$hotspot[$size]}; - push @icotool_args, "--hotspot-x=$coords[0]", "--hotspot-y=$coords[1]"; - } - - if ($width >= 128 && $height >= 128) - { - push @icotool_args, "--raw=$pngFileName"; + # extract base64-encoded png image + (my $data = $element->{'xlink:href'}) =~ s/data:image\/png;base64//; + open FILE, ">$file" or die "$!"; + print FILE decode_base64($data); + close FILE; } else { - push @icotool_args, $pngFileName; + shell $convert, $renderedSVGFileName, "-crop", "${width}x${height}+$x+$y", "-depth", $depth, $file; } - push @pngFiles, $pngFileName; + add_image( $file, $size ); } -# Render the SVG image -my @rsvgCmd; -push(@rsvgCmd, $rsvg); -push(@rsvgCmd, $svgFileName); -push(@rsvgCmd, "-o") if ($rsvg eq "rsvg-convert"); -push(@rsvgCmd, $renderedSVGFileName); -shell @rsvgCmd; - -# Render the images in the SVG -my $parser = new XML::Parser( - Handlers => {Start => \&svg_element_start}); -$parser->parsefile("$svgFileName"); - die "no render directive found in $svgFileName" unless @pngFiles; shell @icotool_args;

1 0

Jacek Caban : mshtml: Use event target vtbl to construct target chain in fire_event_obj.
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: 57b830526b68c28cba9792e2c489bee45680ad87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57b830526b68c28cba9792e2c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 19 17:01:33 2017 +0200 mshtml: Use event target vtbl to construct target chain in fire_event_obj. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 10 ++++ dlls/mshtml/htmlelem.c | 24 +++++++++- dlls/mshtml/htmlevent.c | 119 +++++++++++++++++++---------------------------- dlls/mshtml/htmlevent.h | 3 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 10 ++-- dlls/mshtml/persist.c | 4 +- dlls/mshtml/script.c | 4 +- 9 files changed, 94 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57b830526b68c28cba979…

1 0

Jacek Caban : mshtml: Use event target vtbl to set current window event in fire_event_obj.
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: 6dc67c4234a93f49a64ea05a7acca4dc31323947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dc67c4234a93f49a64ea05a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 19 17:01:43 2017 +0200 mshtml: Use event target vtbl to set current window event in fire_event_obj. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 9 ++++++++- dlls/mshtml/htmlelem.c | 9 ++++++++- dlls/mshtml/htmlevent.c | 37 ++++++++++++++++--------------------- dlls/mshtml/htmlevent.h | 3 +++ dlls/mshtml/htmlwindow.c | 26 +++++++++++++++++++++++++- 5 files changed, 60 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 6624257..622ceea 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5048,6 +5048,12 @@ static ConnectionPointContainer *HTMLDocumentNode_get_cp_container(DispatchEx *d return container; } +static IHTMLEventObj *HTMLDocumentNode_set_current_event(DispatchEx *dispex, IHTMLEventObj *event) +{ + HTMLDocumentNode *This = impl_from_DispatchEx(dispex); + return default_set_current_event(This->window, event); +} + static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { { NULL, @@ -5059,7 +5065,8 @@ static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { HTMLDocumentNode_bind_event, HTMLDocumentNode_get_parent_event_target, NULL, - HTMLDocumentNode_get_cp_container + HTMLDocumentNode_get_cp_container, + HTMLDocumentNode_set_current_event }; static const NodeImplVtbl HTMLDocumentFragmentImplVtbl = { diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index f7cdcf4..8aab4c4 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5384,6 +5384,12 @@ static ConnectionPointContainer *HTMLElement_get_cp_container(DispatchEx *dispex return &This->cp_container; } +static IHTMLEventObj *HTMLElement_set_current_event(DispatchEx *dispex, IHTMLEventObj *event) +{ + HTMLElement *This = impl_from_DispatchEx(dispex); + return default_set_current_event(This->node.doc->window, event); +} + void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { static const DISPID elem2_ie11_blacklist[] = {DISPID_IHTMLELEMENT2_DOSCROLL, DISPID_UNKNOWN}; @@ -5417,7 +5423,8 @@ static event_target_vtbl_t HTMLElement_event_target_vtbl = { HTMLElement_bind_event, HTMLElement_get_parent_event_target, HTMLElement_handle_event_default, - HTMLElement_get_cp_container + HTMLElement_get_cp_container, + HTMLElement_set_current_event }; static dispex_static_data_t HTMLElement_dispex = { diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 7769932..6f81a89 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1063,29 +1063,17 @@ void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, eve } } -static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *event_obj, EventTarget *event_target) +static void fire_event_obj(EventTarget *event_target, eventid_t eid, HTMLEventObj *event_obj) { EventTarget *target_chain_buf[8], **target_chain = target_chain_buf; unsigned chain_cnt, chain_buf_size, i; - IHTMLEventObj *prev_event; - const event_target_vtbl_t *vtbl; + const event_target_vtbl_t *vtbl, *target_vtbl; + IHTMLEventObj *prev_event = NULL; BOOL prevent_default = FALSE; - HTMLInnerWindow *window; EventTarget *iter; HRESULT hres; - TRACE("(%p) %s\n", doc, debugstr_w(event_info[eid].name)); - - window = doc->window; - if(!window) { - WARN("NULL window\n"); - return; - } - - htmldoc_addref(&doc->basedoc); - - prev_event = window->event; - window->event = event_obj ? &event_obj->IHTMLEventObj_iface : NULL; + TRACE("(%p) %s\n", event_target, debugstr_w(event_info[eid].name)); iter = event_target; IDispatchEx_AddRef(&event_target->dispex.IDispatchEx_iface); @@ -1117,15 +1105,24 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e iter = vtbl->get_parent_event_target(&iter->dispex); } while(iter); + target_vtbl = dispex_get_vtbl(&event_target->dispex); + if(target_vtbl && target_vtbl->set_current_event) + prev_event = target_vtbl->set_current_event(&event_target->dispex, event_obj ? &event_obj->IHTMLEventObj_iface : NULL); + for(i = 0; i < chain_cnt; i++) { call_event_handlers(event_obj, target_chain[i], eid); if(!(event_info[eid].flags & EVENT_BUBBLES) || (event_obj && event_obj->cancel_bubble)) break; } + if(target_vtbl && target_vtbl->set_current_event) { + prev_event = target_vtbl->set_current_event(&event_target->dispex, prev_event); + if(prev_event) + IHTMLEventObj_Release(prev_event); + } + if(event_obj && event_obj->prevent_default) prevent_default = TRUE; - window->event = prev_event; if(event_info[eid].flags & EVENT_HASDEFAULTHANDLERS) { for(i = 0; !prevent_default && i < chain_cnt; i++) { @@ -1147,8 +1144,6 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e TRACE("calling PreventDefault\n"); nsIDOMEvent_PreventDefault(event_obj->nsevent); } - - htmldoc_release(&doc->basedoc); } void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, EventTarget *target, nsIDOMEvent *nsevent) @@ -1168,7 +1163,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, EventTarge } } - fire_event_obj(doc, eid, event_obj, target); + fire_event_obj(target, eid, event_obj); if(event_obj) IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); @@ -1213,7 +1208,7 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even if(event_obj) { hres = set_event_info(event_obj, &node->event_target, eid, node->doc, NULL); if(SUCCEEDED(hres)) - fire_event_obj(node->doc, eid, event_obj, &node->event_target); + fire_event_obj(&node->event_target, eid, event_obj); IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); if(FAILED(hres)) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index efe707f..d3ddded 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -86,8 +86,11 @@ typedef struct { EventTarget *(*get_parent_event_target)(DispatchEx*); HRESULT (*handle_event_default)(DispatchEx*,eventid_t,nsIDOMEvent*,BOOL*); ConnectionPointContainer *(*get_cp_container)(DispatchEx*); + IHTMLEventObj *(*set_current_event)(DispatchEx*,IHTMLEventObj*); } event_target_vtbl_t; +IHTMLEventObj *default_set_current_event(HTMLInnerWindow*,IHTMLEventObj*) DECLSPEC_HIDDEN; + static inline EventTarget *get_node_event_prop_target(HTMLDOMNode *node, eventid_t eid) { return node->vtbl->get_event_prop_target ? node->vtbl->get_event_prop_target(node, eid) : &node->event_target; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index f9fd047..df181d6 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1241,6 +1241,20 @@ static HRESULT WINAPI HTMLWindow2_get_document(IHTMLWindow2 *iface, IHTMLDocumen return S_OK; } +IHTMLEventObj *default_set_current_event(HTMLInnerWindow *window, IHTMLEventObj *event_obj) +{ + IHTMLEventObj *prev_event = NULL; + + if(window) { + if(event_obj) + IHTMLEventObj_AddRef(event_obj); + prev_event = window->event; + window->event = event_obj; + } + + return prev_event; +} + static HRESULT WINAPI HTMLWindow2_get_event(IHTMLWindow2 *iface, IHTMLEventObj **p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); @@ -3006,6 +3020,12 @@ static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compa dispex_info_add_interface(info, IHTMLWindow5_tid, NULL); } +static IHTMLEventObj *HTMLWindow_set_current_event(DispatchEx *dispex, IHTMLEventObj *event) +{ + HTMLInnerWindow *This = impl_from_DispatchEx(dispex); + return default_set_current_event(This, event); +} + static const event_target_vtbl_t HTMLWindow_event_target_vtbl = { { NULL, @@ -3014,7 +3034,11 @@ static const event_target_vtbl_t HTMLWindow_event_target_vtbl = { NULL, NULL }, - HTMLWindow_bind_event + HTMLWindow_bind_event, + NULL, + NULL, + NULL, + HTMLWindow_set_current_event }; static const tid_t HTMLWindow_iface_tids[] = {

1 0