July 2017 - Wine-commits - list.winehq.org

Alexandre Julliard : tools: Add support for generating cursor files from SVG.
by Alexandre Julliard 14 Jul '17

14 Jul '17

Module: wine Branch: master Commit: 8e45a6ecbfbb54c4b0cedd1dc34694d26dd5f488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e45a6ecbfbb54c4b0cedd1dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 11:58:54 2017 +0200 tools: Add support for generating cursor files from SVG. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/buildimage | 70 ++++++++++++++++++++++++++------------------------------ tools/makedep.c | 15 ++++++++---- 2 files changed, 43 insertions(+), 42 deletions(-) diff --git a/tools/buildimage b/tools/buildimage index 0a7e466..fd6661e 100755 --- a/tools/buildimage +++ b/tools/buildimage @@ -34,23 +34,22 @@ die "Cannot open output file" unless defined($outFileName); $outFileName =~ m/(.*)\.(.*)/; my $outName = $1; my $ext = lc($2); -die "Only BMP and ICO outputs are supported" unless $ext eq "bmp" or $ext eq "ico"; +die "Only BMP, ICO and CUR outputs are supported" unless $ext eq "bmp" or $ext eq "ico" or $ext eq "cur"; my $renderedSVGFileName = "$svgFileName.png"; my @pngFiles; -my @pngFilesRaw; # Get the programs from the environment variables my $convert = $ENV{"CONVERT"} || "convert"; my $rsvg = $ENV{"RSVG"} || "rsvg"; -my $icotool = $ENV{"ICOTOOL"} || "icotool"; +my @icotool_args = ($ENV{"ICOTOOL"} || "icotool", "--create", + $ext eq "cur" ? "--cursor" : "--icon", "-o", $outFileName); # Be ready to abort sub cleanup() { unlink $renderedSVGFileName; unlink $_ foreach(@pngFiles); - unlink $_ foreach(@pngFilesRaw); } $SIG{"INT"} = "cleanup"; @@ -78,10 +77,20 @@ sub svg_element_start my $width = 0; my $height = 0; + if ($id eq "hotspot") + { + push @icotool_args, "--hotspot-x=$attr{x}", "--hotspot-y=$attr{y}"; + return; + } + 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; @@ -90,14 +99,24 @@ sub svg_element_start return unless defined($size) and defined($depth); - warn "Unexpected icon depth" unless - $depth == 4 or $depth == 8 or $depth == 24 or $depth == 32; + 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); + } + # The whole file is tagged - copy($renderedSVGFileName, $pngFileName) or die "File could not be copied"; + $pngFileName = $renderedSVGFileName; } elsif($element eq "rect") { @@ -109,10 +128,9 @@ sub svg_element_start if(defined($x) and defined($y)) { if($x =~ /\d*/ and $y =~ /\d*/) { - shell $convert, $renderedSVGFileName, "-crop", "${width}x${height}+$x+$y", $pngFileName; + shell $convert, $renderedSVGFileName, "-crop", "${width}x${height}+$x+$y", "-depth", $depth, $pngFileName; } } - } elsif($element eq "image" ) { # Extract Base64 encoded PNG data to files @@ -132,12 +150,13 @@ sub svg_element_start if ($width >= 128 && $height >= 128) { - push(@pngFilesRaw, $pngFileName); + push @icotool_args, "--raw=$pngFileName"; } else { - push(@pngFiles, $pngFileName); + push @icotool_args, $pngFileName; } + push @pngFiles, $pngFileName; } # Render the SVG image @@ -153,34 +172,9 @@ my $parser = new XML::Parser( Handlers => {Start => \&svg_element_start}); $parser->parsefile("$svgFileName"); -# If no render directives were found, take the full image as-is -unless (@pngFiles || @pngFilesRaw) { - my $pngFileName = "bmp$renderedSVGFileName"; - copy($renderedSVGFileName, $pngFileName) or die "File could not be copied"; - push(@pngFiles, $pngFileName); -} - -# Combine the renderings into the output file -if($ext eq "ico") { - - # Place images into the ICO - shell $icotool, "-c", "-o", $outFileName, @pngFiles, map { "--raw=$_"; } @pngFilesRaw; - -} elsif($ext eq "bmp") { - - # Only the first image becomes the final BMP - my $pngFile = $pngFiles[0]; - $pngFile =~ /.*-\d*-(\d*)\.png/; - my $depth = $1; +die "no render directive found in $svgFileName" unless @pngFiles; - # Convert it into a bmp - if($depth == 24) { - shell $convert, "png:$pngFile", "+matte", $outFileName; - } else { - shell $convert, "png:$pngFile", $outFileName; - } - -} +shell @icotool_args; # Delete the intermediate images cleanup(); diff --git a/tools/makedep.c b/tools/makedep.c index fe670af..296356b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2600,10 +2600,17 @@ static struct strarray output_sources( const struct makefile *make ) { if (convert && rsvg && icotool && !make->src_dir) { - output( "%s.ico %s.bmp: %s\n", - src_dir_path( make, obj ), src_dir_path( make, obj ), source->filename ); - output( "\tCONVERT=\"%s\" ICOTOOL=\"%s\" RSVG=\"%s\" %s %s $@\n", convert, icotool, rsvg, - top_src_dir_path( make, "tools/buildimage" ), source->filename ); + static const char * const images[] = { "bmp", "cur", "ico", NULL }; + + for (i = 0; images[i]; i++) + if (find_include_file( make, strmake( "%s.%s", obj, images[i] ))) break; + + if (images[i]) + { + output( "%s.%s: %s\n", src_dir_path( make, obj ), images[i], source->filename ); + output( "\tCONVERT=\"%s\" ICOTOOL=\"%s\" RSVG=\"%s\" %s %s $@\n", convert, icotool, rsvg, + top_src_dir_path( make, "tools/buildimage" ), source->filename ); + } } } else if (!strcmp( ext, "po" )) /* po file */

1 0

Alexandre Julliard : user32: New high resolution cursors generated from SVG.
by Alexandre Julliard 14 Jul '17

14 Jul '17

Module: wine Branch: master Commit: 32ccc0b9e0f1536655b7fca6e68823e1bf05374a URL: http://source.winehq.org/git/wine.git/?a=commit;h=32ccc0b9e0f1536655b7fca6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 12:46:45 2017 +0200 user32: New high resolution cursors generated from SVG. Based on a cursor set published by Ludvig Hummel under the X11 license. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/Makefile.in | 16 ++ dlls/user32/resources/ocr_appstarting.cur | Bin 326 -> 33134 bytes dlls/user32/resources/ocr_appstarting.svg | 411 ++++++++++++++++++++++++++++++ dlls/user32/resources/ocr_cross.cur | Bin 326 -> 33134 bytes dlls/user32/resources/ocr_cross.svg | 184 +++++++++++++ dlls/user32/resources/ocr_hand.cur | Bin 326 -> 33134 bytes dlls/user32/resources/ocr_hand.svg | 190 ++++++++++++++ dlls/user32/resources/ocr_help.cur | Bin 326 -> 33134 bytes dlls/user32/resources/ocr_help.svg | 293 +++++++++++++++++++++ dlls/user32/resources/ocr_ibeam.cur | Bin 326 -> 33134 bytes dlls/user32/resources/ocr_ibeam.svg | 172 +++++++++++++ dlls/user32/resources/ocr_no.cur | Bin 326 -> 33134 bytes dlls/user32/resources/ocr_no.svg | 182 +++++++++++++ dlls/user32/resources/ocr_normal.cur | Bin 326 -> 33134 bytes dlls/user32/resources/ocr_normal.svg | 199 +++++++++++++++ dlls/user32/resources/ocr_pen.cur | Bin 326 -> 33134 bytes dlls/user32/resources/ocr_pen.svg | 260 +++++++++++++++++++ dlls/user32/resources/ocr_size.cur | Bin 326 -> 33134 bytes dlls/user32/resources/ocr_size.svg | 165 ++++++++++++ dlls/user32/resources/ocr_sizeall.cur | Bin 326 -> 35374 bytes dlls/user32/resources/ocr_sizeall.svg | 204 +++++++++++++++ dlls/user32/resources/ocr_sizenesw.cur | Bin 326 -> 33134 bytes dlls/user32/resources/ocr_sizenesw.svg | 189 ++++++++++++++ dlls/user32/resources/ocr_sizens.cur | Bin 326 -> 33134 bytes dlls/user32/resources/ocr_sizens.svg | 182 +++++++++++++ dlls/user32/resources/ocr_sizenwse.cur | Bin 326 -> 33134 bytes dlls/user32/resources/ocr_sizenwse.svg | 193 ++++++++++++++ dlls/user32/resources/ocr_sizewe.cur | Bin 326 -> 33134 bytes dlls/user32/resources/ocr_sizewe.svg | 179 +++++++++++++ dlls/user32/resources/ocr_up.cur | Bin 326 -> 33134 bytes dlls/user32/resources/ocr_up.svg | 181 +++++++++++++ dlls/user32/resources/ocr_wait.cur | Bin 326 -> 33134 bytes dlls/user32/resources/ocr_wait.svg | 327 ++++++++++++++++++++++++ 33 files changed, 3527 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32ccc0b9e0f1536655b7f…

1 0

Alexandre Julliard : comctl32: New high resolution cursors generated from SVG.
by Alexandre Julliard 14 Jul '17

14 Jul '17

Module: wine Branch: master Commit: d6fdbae1bc5e425edb949e0d7d096244824f9ad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6fdbae1bc5e425edb949e0d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 13:11:23 2017 +0200 comctl32: New high resolution cursors generated from SVG. Based on a cursor set published by Ludvig Hummel under the X11 license. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 6 +- dlls/comctl32/idc_copy.cur | Bin 326 -> 33134 bytes dlls/comctl32/idc_copy.svg | 212 +++++++++++++++++++++++++++++++ dlls/comctl32/idc_divider.cur | Bin 326 -> 33134 bytes dlls/comctl32/idc_divider.svg | 186 +++++++++++++++++++++++++++ dlls/comctl32/idc_divideropen.cur | Bin 326 -> 33134 bytes dlls/comctl32/idc_divideropen.svg | 210 +++++++++++++++++++++++++++++++ dlls/comctl32/idc_movebutton.cur | Bin 326 -> 33134 bytes dlls/comctl32/idc_movebutton.svg | 259 ++++++++++++++++++++++++++++++++++++++ 9 files changed, 872 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6fdbae1bc5e425edb949…

1 0

Alexandre Julliard : ole32: New high resolution cursors generated from SVG.
by Alexandre Julliard 14 Jul '17

14 Jul '17

Module: wine Branch: master Commit: 3b4492765ab0615f52b7b4f5104f76ad1187b3e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b4492765ab0615f52b7b4f51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 13:11:39 2017 +0200 ole32: New high resolution cursors generated from SVG. Based on a cursor set published by Ludvig Hummel under the X11 license. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/Makefile.in | 6 + dlls/ole32/drag_copy.cur | Bin 326 -> 33134 bytes dlls/ole32/drag_copy.svg | 284 ++++++++++++++++++++++++++++++++++++++++ dlls/ole32/drag_link.cur | Bin 326 -> 33134 bytes dlls/ole32/drag_link.svg | 278 +++++++++++++++++++++++++++++++++++++++ dlls/ole32/drag_move.cur | Bin 326 -> 33134 bytes dlls/ole32/drag_move.svg | 254 ++++++++++++++++++++++++++++++++++++ dlls/ole32/nodrop.cur | Bin 326 -> 33134 bytes dlls/ole32/nodrop.svg | 328 +++++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 1150 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b4492765ab0615f52b7b…

1 0

Alexandre Julliard : riched20: New high resolution cursor generated from SVG.
by Alexandre Julliard 14 Jul '17

14 Jul '17

Module: wine Branch: master Commit: 2d91663f7a86c9df69b1388c3b32023c1442ec48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d91663f7a86c9df69b1388c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 13:12:04 2017 +0200 riched20: New high resolution cursor generated from SVG. Based on a cursor set published by Ludvig Hummel under the X11 license. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/Makefile.in | 3 + dlls/riched20/ocr_reverse.cur | Bin 326 -> 33134 bytes dlls/riched20/ocr_reverse.svg | 189 ++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/version.rc | 1 + 4 files changed, 193 insertions(+) diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in index be57b41..8f8aeee 100644 --- a/dlls/riched20/Makefile.in +++ b/dlls/riched20/Makefile.in @@ -28,3 +28,6 @@ RC_SRCS = version.rc IDL_SRCS = \ riched_tom.idl + +SVG_SRCS = \ + ocr_reverse.svg diff --git a/dlls/riched20/ocr_reverse.cur b/dlls/riched20/ocr_reverse.cur index 179774c..f6b5ca2 100644 Binary files a/dlls/riched20/ocr_reverse.cur and b/dlls/riched20/ocr_reverse.cur differ diff --git a/dlls/riched20/ocr_reverse.svg b/dlls/riched20/ocr_reverse.svg new file mode 100644 index 0000000..a6a356a --- /dev/null +++ b/dlls/riched20/ocr_reverse.svg @@ -0,0 +1,189 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg2" + height="64" + width="288" + version="1.1" + sodipodi:docname="ocr_reverse.svg" + inkscape:version="0.92.1 r15371"> + <defs + id="defs5074" /> + <metadata + id="metadata5130"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1777" + inkscape:window-height="1091" + id="namedview5128" + showgrid="false" + inkscape:zoom="1" + inkscape:cx="-103.00001" + inkscape:cy="32.000011" + inkscape:window-x="43" + inkscape:window-y="27" + inkscape:window-maximized="0" + inkscape:current-layer="svg2" /> + <rect + id="cursor:64-32" + height="64" + width="64" + y="0" + x="0" + style="fill:none" /> + <rect + id="cursor:48-32" + height="48" + width="48" + y="16" + x="64" + style="fill:none" /> + <rect + id="cursor:32-32" + height="32" + width="32" + y="32" + x="112" + style="fill:none" /> + <rect + id="hotspot" + height="1" + width="1" + y="0" + x="13" + style="fill:none" /> + <g + id="g4928" + transform="matrix(1.9642525,0,0,1.9642525,-194.7906,458.0998)"> + <path + sodipodi:type="inkscape:offset" + inkscape:radius="0" + inkscape:original="M 22.023438 743.13867 L 24.535156 762.16992 L 27.591797 756.31836 L 31.871094 763.69141 C 32.590378 764.93081 36.313733 762.69303 35.556641 761.47656 L 31.050781 754.23828 L 37.654297 754.2832 L 22.023438 743.13867 z " + xlink:href="#path7371" + style="display:inline;opacity:0.13600003;fill:#000000;stroke:#000000;stroke-width:1.40831447;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" + id="path6044" + inkscape:href="#path7371" + d="m 22.023438,743.13867 2.511718,19.03125 3.056641,-5.85156 4.279297,7.37305 c 0.719284,1.2394 4.442639,-0.99838 3.685547,-2.21485 l -4.50586,-7.23828 6.603516,0.0449 z" + transform="matrix(-0.91499598,0.11480473,0.1150337,0.91682096,48.848195,-913.69159)" /> + <path + style="display:inline;opacity:1;fill:#ffffff;stroke:#000000;stroke-width:1.39999998;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" + inkscape:transform-center-y="-3.2019766" + d="m 99.867659,-220.50653 6.036251,-0.79869 -3.28917,7.15307 c -0.55281,1.20222 3.11,2.8265 3.62558,1.60767 l 3.06789,-7.25104 3.47063,5.01422 0.10905,-17.73718 z" + id="path6046-3" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccsscccc" + inkscape:transform-center-x="0.59406761" /> + </g> + <g + transform="matrix(1.4731894,0,0,1.4731894,-82.09295,359.57486)" + id="g5495"> + <path + transform="matrix(-0.91499598,0.11480473,0.1150337,0.91682096,48.848195,-913.69159)" + d="m 22.023438,743.13867 2.511718,19.03125 3.056641,-5.85156 4.279297,7.37305 c 0.719284,1.2394 4.442639,-0.99838 3.685547,-2.21485 l -4.50586,-7.23828 6.603516,0.0449 z" + inkscape:href="#path7371" + id="path5491" + style="display:inline;opacity:0.13600003;fill:#000000;stroke:#000000;stroke-width:1.40831447;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" + xlink:href="#path7371" + inkscape:original="M 22.023438 743.13867 L 24.535156 762.16992 L 27.591797 756.31836 L 31.871094 763.69141 C 32.590378 764.93081 36.313733 762.69303 35.556641 761.47656 L 31.050781 754.23828 L 37.654297 754.2832 L 22.023438 743.13867 z " + inkscape:radius="0" + sodipodi:type="inkscape:offset" /> + <path + inkscape:transform-center-x="0.59406761" + sodipodi:nodetypes="ccsscccc" + inkscape:connector-curvature="0" + id="path5493" + d="m 99.867659,-220.50653 6.036251,-0.79869 -3.28917,7.15307 c -0.55281,1.20222 3.11,2.8265 3.62558,1.60767 l 3.06789,-7.25104 3.47063,5.01422 0.10905,-17.73718 z" + inkscape:transform-center-y="-3.2019766" + style="display:inline;opacity:1;fill:#ffffff;stroke:#000000;stroke-width:1.39999998;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> + </g> + <g + transform="matrix(0.98212626,0,0,0.98212626,14.604701,261.0499)" + id="g5501"> + <path + transform="matrix(-0.91499598,0.11480473,0.1150337,0.91682096,48.848195,-913.69159)" + d="m 22.023438,743.13867 2.511718,19.03125 3.056641,-5.85156 4.279297,7.37305 c 0.719284,1.2394 4.442639,-0.99838 3.685547,-2.21485 l -4.50586,-7.23828 6.603516,0.0449 z" + inkscape:href="#path7371" + id="path5497" + style="display:inline;opacity:0.13600003;fill:#000000;stroke:#000000;stroke-width:1.40831447;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" + xlink:href="#path7371" + inkscape:original="M 22.023438 743.13867 L 24.535156 762.16992 L 27.591797 756.31836 L 31.871094 763.69141 C 32.590378 764.93081 36.313733 762.69303 35.556641 761.47656 L 31.050781 754.23828 L 37.654297 754.2832 L 22.023438 743.13867 z " + inkscape:radius="0" + sodipodi:type="inkscape:offset" /> + <path + inkscape:transform-center-x="0.59406761" + sodipodi:nodetypes="ccsscccc" + inkscape:connector-curvature="0" + id="path5499" + d="m 99.867659,-220.50653 6.036251,-0.79869 -3.28917,7.15307 c -0.55281,1.20222 3.11,2.8265 3.62558,1.60767 l 3.06789,-7.25104 3.47063,5.01422 0.10905,-17.73718 z" + inkscape:transform-center-y="-3.2019766" + style="display:inline;opacity:1;fill:#ffffff;stroke:#000000;stroke-width:1.39999998;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> + </g> + <image + y="0" + x="144" + id="cursor:64-1" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAQAAAAAYLlVAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAA +DsQAAA7EAZUrDhsAAAAHdElNRQfhBwoQMzriEEEBAAAA8UlEQVRo3u2XQRLEIAgEhdr/f9m9bWJW +I1jMcGFOuaS6gZTB1s7SW1A0F38mEIg/EQjF+wWC8V6BcLxPAID3CHSMhebirQIdNwPNxVsEoPi9 +ABi/E4Dj3wUI+DcBCn4tQMKvBGj4uQARPxOg4v8FyPinAB0/CiTg7wIp+EsgCd/aZ+QKegObdmBB +EpIAv+uPEcjqLOxDN7IWkt8whCjQ55+gZHVAoApqrR+loMb65Xog/A2ZB4Ma64cpqH3+GAV11A9R +UFf9AAV11h+uoIfvCUxA9vWHRmZLKXMpkNW9gLWTyMvVjLMSVSqVSqVSqVSy8wXPKj881pbRsAAA +AABJRU5ErkJggg== +" + preserveAspectRatio="none" + height="64" + width="64" /> + <image + y="16" + x="208" + id="cursor:48-1" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAQAAAD9CzEMAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAA +DsQAAA7EAZUrDhsAAAAHdElNRQfhBwoQNQx78HMeAAAAsElEQVRYw+2UOw7EMAgFedbe/8qkiKL4 +m0TroeM17mbANph9iZvbnymf8Bspsfh3wSb+TeD7jhKLfxIg+LUAwq8EGH4uAPEzAYofBTC+F+D4 +VhCArwUh+FsQhL8EYXiz300Wt0KbDmIKrzpQ/1EvowJ2UUdUxKrwBi5+0PqI7aCt/zxETvJQvNA3 +8Nm1CFwVi8sX1IGveQK/6QIpQCBsuOaVOTzCQwd06ZlMJpPJVDkAHLAuLKz26WIAAAAASUVORK5C +YII= +" + preserveAspectRatio="none" + height="48" + width="48" /> + <image + y="32" + x="256" + id="cursor:32-1" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAA +DsQAAA7EAZUrDhsAAAAHdElNRQfhBwoQNjhxadRoAAAAeElEQVRIx+2Tyw6AIAwEdxv//5frgRiq +UkOXo8x9hlcBMhyOCSzVJ7FM94VAQR8FSvo7UNSfgbJ+Dwh6DEh6D4j6FZD1FljQgaO5rE5wCLBf +Y9MpDlKwqM2BB5nKM4YNcD5ho/UrW3j/RtYSFj2OU58QyRk2m59xAqonIRyk5cnGAAAAAElFTkSu +QmCC +" + preserveAspectRatio="none" + height="32" + width="32" /> +</svg> diff --git a/dlls/riched20/version.rc b/dlls/riched20/version.rc index ff2a2ba..4674371 100644 --- a/dlls/riched20/version.rc +++ b/dlls/riched20/version.rc @@ -27,4 +27,5 @@ #include "res.h" +/* @makedep: ocr_reverse.cur */ OCR_REVERSE CURSOR ocr_reverse.cur

1 0

Alexandre Julliard : wordpad: New high resolution cursor generated from SVG.
by Alexandre Julliard 14 Jul '17

14 Jul '17

Module: wine Branch: master Commit: 756fdd029c6587a0be99042485d674ca0850de14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=756fdd029c6587a0be9904248… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 13:12:27 2017 +0200 wordpad: New high resolution cursor generated from SVG. Based on a cursor set published by Ludvig Hummel under the X11 license. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/Makefile.in | 3 +- programs/wordpad/zoom.cur | Bin 766 -> 33134 bytes programs/wordpad/zoom.svg | 246 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 248 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=756fdd029c6587a0be990…

1 0

Alex Henrie : msvcr120: Add erfc.
by Alexandre Julliard 14 Jul '17

14 Jul '17

Module: wine Branch: master Commit: 26163f5cdfbb51795f0803ea525a7aead142232a URL: http://source.winehq.org/git/wine.git/?a=commit;h=26163f5cdfbb51795f0803ea5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 13 23:14:19 2017 -0600 msvcr120: Add erfc. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ .../api-ms-win-crt-math-l1-1-0.spec | 6 ++-- dlls/msvcr120/msvcr120.spec | 6 ++-- dlls/msvcr120_app/msvcr120_app.spec | 6 ++-- dlls/msvcrt/math.c | 32 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 ++-- include/config.h.in | 6 ++++ 8 files changed, 54 insertions(+), 12 deletions(-) diff --git a/configure b/configure index f334749..c6e24d0 100755 --- a/configure +++ b/configure @@ -17416,6 +17416,8 @@ for ac_func in \ cbrt \ cbrtf \ erf \ + erfc \ + erfcf \ erff \ exp2 \ exp2f \ diff --git a/configure.ac b/configure.ac index bae5ba0..5bee74a 100644 --- a/configure.ac +++ b/configure.ac @@ -2603,6 +2603,8 @@ AC_CHECK_FUNCS(\ cbrt \ cbrtf \ erf \ + erfc \ + erfcf \ erff \ exp2 \ exp2f \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index fb5c350..a1668bb 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -221,9 +221,9 @@ @ stub ctanhl @ stub ctanl @ cdecl erf(double) ucrtbase.erf -@ stub erfc -@ stub erfcf -@ stub erfcl +@ cdecl erfc(double) ucrtbase.erfc +@ cdecl erfcf(float) ucrtbase.erfcf +@ cdecl erfcl(double) ucrtbase.erfcl @ cdecl erff(float) ucrtbase.erff @ cdecl erfl(double) ucrtbase.erfl @ cdecl exp(double) ucrtbase.exp diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 323d5f4..d44812a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2123,9 +2123,9 @@ @ stub ctanl @ cdecl -ret64 div(long long) MSVCRT_div @ cdecl erf(double) MSVCR120_erf -@ stub erfc -@ stub erfcf -@ stub erfcl +@ cdecl erfc(double) MSVCR120_erfc +@ cdecl erfcf(float) MSVCR120_erfcf +@ cdecl erfcl(double) MSVCR120_erfcl @ cdecl erff(float) MSVCR120_erff @ cdecl erfl(double) MSVCR120_erfl @ cdecl exit(long) MSVCRT_exit diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 73101c7..8c3ecfd 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1789,9 +1789,9 @@ @ stub ctanl @ cdecl -ret64 div(long long) msvcr120.div @ cdecl erf(double) msvcr120.erf -@ stub erfc -@ stub erfcf -@ stub erfcl +@ cdecl erfc(double) msvcr120.erfc +@ cdecl erfcf(float) msvcr120.erfcf +@ cdecl erfcl(double) msvcr120.erfcl @ cdecl erff(float) msvcr120.erff @ cdecl erfl(double) msvcr120.erfl @ cdecl exit(long) msvcr120.exit diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 9eed9b8..89c45c7 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2773,6 +2773,38 @@ LDOUBLE CDECL MSVCR120_erfl(LDOUBLE x) } /********************************************************************* + * erfc (MSVCR120.@) + */ +double CDECL MSVCR120_erfc(double x) +{ +#ifdef HAVE_ERFC + return erfc(x); +#else + return 1 - MSVCR120_erf(x); +#endif +} + +/********************************************************************* + * erfcf (MSVCR120.@) + */ +float CDECL MSVCR120_erfcf(float x) +{ +#ifdef HAVE_ERFCF + return erfcf(x); +#else + return MSVCR120_erfc(x); +#endif +} + +/********************************************************************* + * erfcl (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_erfcl(LDOUBLE x) +{ + return MSVCR120_erfc(x); +} + +/********************************************************************* * fmaxf (MSVCR120.@) */ float CDECL MSVCR120_fmaxf(float x, float y) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index aacf361..017f086 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2266,9 +2266,9 @@ @ stub ctanl @ cdecl -ret64 div(long long) MSVCRT_div @ cdecl erf(double) MSVCR120_erf -@ stub erfc -@ stub erfcf -@ stub erfcl +@ cdecl erfc(double) MSVCR120_erfc +@ cdecl erfcf(float) MSVCR120_erfcf +@ cdecl erfcl(double) MSVCR120_erfcl @ cdecl erff(float) MSVCR120_erff @ cdecl erfl(double) MSVCR120_erfl @ cdecl exit(long) MSVCRT_exit diff --git a/include/config.h.in b/include/config.h.in index 2e909fd..e5b6465 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -141,6 +141,12 @@ /* Define to 1 if you have the `erf' function. */ #undef HAVE_ERF +/* Define to 1 if you have the `erfc' function. */ +#undef HAVE_ERFC + +/* Define to 1 if you have the `erfcf' function. */ +#undef HAVE_ERFCF + /* Define to 1 if you have the `erff' function. */ #undef HAVE_ERFF

1 0

Alex Henrie : msvcr120: Add expm1.
by Alexandre Julliard 14 Jul '17

14 Jul '17

Module: wine Branch: master Commit: 79715cce88ef372eb56374f14c4771b748029105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79715cce88ef372eb56374f14… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 13 23:14:20 2017 -0600 msvcr120: Add expm1. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ .../api-ms-win-crt-math-l1-1-0.spec | 6 ++-- dlls/msvcr120/msvcr120.spec | 6 ++-- dlls/msvcr120_app/msvcr120_app.spec | 6 ++-- dlls/msvcrt/math.c | 36 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 ++-- include/config.h.in | 6 ++++ 8 files changed, 58 insertions(+), 12 deletions(-) diff --git a/configure b/configure index c6e24d0..f1b9549 100755 --- a/configure +++ b/configure @@ -17421,6 +17421,8 @@ for ac_func in \ erff \ exp2 \ exp2f \ + expm1 \ + expm1f \ lgamma \ lgammaf \ llrint \ diff --git a/configure.ac b/configure.ac index 5bee74a..0362826 100644 --- a/configure.ac +++ b/configure.ac @@ -2608,6 +2608,8 @@ AC_CHECK_FUNCS(\ erff \ exp2 \ exp2f \ + expm1 \ + expm1f \ lgamma \ lgammaf \ llrint \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index a1668bb..9ed215f 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -231,9 +231,9 @@ @ cdecl exp2f(float) ucrtbase.exp2f @ cdecl exp2l(double) ucrtbase.exp2l @ cdecl -arch=arm,x86_64 expf(float) ucrtbase.expf -@ stub expm1 -@ stub expm1f -@ stub expm1l +@ cdecl expm1(double) ucrtbase.expm1 +@ cdecl expm1f(float) ucrtbase.expm1f +@ cdecl expm1l(double) ucrtbase.expm1l @ cdecl fabs(double) ucrtbase.fabs @ cdecl -arch=arm fabsf(float) ucrtbase.fabsf @ stub fdim diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d44812a..407c86c 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2134,9 +2134,9 @@ @ cdecl exp2f(float) MSVCR120_exp2f @ cdecl exp2l(double) MSVCR120_exp2l @ cdecl -arch=arm,x86_64 expf(float) MSVCRT_expf -@ stub expm1 -@ stub expm1f -@ stub expm1l +@ cdecl expm1(double) MSVCR120_expm1 +@ cdecl expm1f(float) MSVCR120_expm1f +@ cdecl expm1l(double) MSVCR120_expm1l @ cdecl fabs(double) MSVCRT_fabs @ cdecl -arch=arm,x86_64 fabsf(float) MSVCRT_fabsf @ cdecl fclose(ptr) MSVCRT_fclose diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 8c3ecfd..8858f43 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1800,9 +1800,9 @@ @ cdecl exp2f(float) msvcr120.exp2f @ cdecl exp2l(double) msvcr120.exp2l @ cdecl -arch=arm,x86_64 expf(float) msvcr120.expf -@ stub expm1 -@ stub expm1f -@ stub expm1l +@ cdecl expm1(double) msvcr120.expm1 +@ cdecl expm1f(float) msvcr120.expm1f +@ cdecl expm1l(double) msvcr120.expm1l @ cdecl fabs(double) msvcr120.fabs @ cdecl -arch=arm,x86_64 fabsf(float) msvcr120.fabsf @ cdecl fclose(ptr) msvcr120.fclose diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 89c45c7..ec8e38b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2412,6 +2412,42 @@ LDOUBLE CDECL MSVCR120_exp2l(LDOUBLE x) } /********************************************************************* + * expm1 (MSVCR120.@) + */ +double CDECL MSVCR120_expm1(double x) +{ +#ifdef HAVE_EXPM1 + double ret = expm1(x); +#else + double ret = exp(x) - 1; +#endif + if (!isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +} + +/********************************************************************* + * expm1f (MSVCR120.@) + */ +float CDECL MSVCR120_expm1f(float x) +{ +#ifdef HAVE_EXPM1F + double ret = expm1f(x); +#else + double ret = exp(x) - 1; +#endif + if (!isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +} + +/********************************************************************* + * expm1l (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_expm1l(LDOUBLE x) +{ + return MSVCR120_expm1(x); +} + +/********************************************************************* * log2 (MSVCR120.@) */ double CDECL MSVCR120_log2(double x) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 017f086..0d799fd 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2277,9 +2277,9 @@ @ cdecl exp2f(float) MSVCR120_exp2f @ cdecl exp2l(double) MSVCR120_exp2l @ cdecl -arch=arm,x86_64 expf(float) MSVCRT_expf -@ stub expm1 -@ stub expm1f -@ stub expm1l +@ cdecl expm1(double) MSVCR120_expm1 +@ cdecl expm1f(float) MSVCR120_expm1f +@ cdecl expm1l(double) MSVCR120_expm1l @ cdecl fabs(double) MSVCRT_fabs @ cdecl -arch=arm fabsf(float) MSVCRT_fabsf @ cdecl fclose(ptr) MSVCRT_fclose diff --git a/include/config.h.in b/include/config.h.in index e5b6465..5ab518c 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -156,6 +156,12 @@ /* Define to 1 if you have the `exp2f' function. */ #undef HAVE_EXP2F +/* Define to 1 if you have the `expm1' function. */ +#undef HAVE_EXPM1 + +/* Define to 1 if you have the `expm1f' function. */ +#undef HAVE_EXPM1F + /* Define to 1 if you have the `fallocate' function. */ #undef HAVE_FALLOCATE

1 0

Jacek Caban : winhttp: Use notification flags to explicitly mark notifications that should signal an event.
by Alexandre Julliard 14 Jul '17

14 Jul '17

Module: wine Branch: master Commit: 8c9df5b774beb58f1bb4b44fc43ddb1cb405a000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c9df5b774beb58f1bb4b44fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 14 15:43:45 2017 +0200 winhttp: Use notification flags to explicitly mark notifications that should signal an event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/notification.c | 53 ++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 3af35cf..dc36b88 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -52,6 +52,7 @@ struct notification #define NF_ALLOW 0x0001 /* notification may or may not happen */ #define NF_WINE_ALLOW 0x0002 /* wine sends notification when it should not */ +#define NF_SIGNAL 0x0004 /* signal wait handle when notified */ struct info { @@ -88,9 +89,8 @@ static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DW function_ok = (info->test[info->index].function == info->function); ok(status_ok, "%u: expected status 0x%08x got 0x%08x\n", info->line, info->test[info->index].status, status); ok(function_ok, "%u: expected function %u got %u\n", info->line, info->test[info->index].function, info->function); - if (status_ok && function_ok) info->index++; - if (status & (WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS | WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING)) + if (status_ok && function_ok && info->test[info->index++].flags & NF_SIGNAL) { SetEvent( info->wait ); } @@ -110,7 +110,7 @@ static const struct notification cache_test[] = { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, NF_WINE_ALLOW }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, NF_WINE_ALLOW }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL }, { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, NF_WINE_ALLOW }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, NF_WINE_ALLOW }, @@ -121,8 +121,8 @@ static const struct notification cache_test[] = { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, NF_WINE_ALLOW }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, NF_WINE_ALLOW }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL }, { winhttp_connect, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, NF_WINE_ALLOW }, @@ -135,7 +135,7 @@ static const struct notification cache_test[] = { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, NF_WINE_ALLOW }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, NF_WINE_ALLOW }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL }, { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, NF_WINE_ALLOW }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, NF_WINE_ALLOW }, @@ -146,12 +146,13 @@ static const struct notification cache_test[] = { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, NF_WINE_ALLOW }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, NF_WINE_ALLOW }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING } + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL } }; static void setup_test( struct info *info, enum api function, unsigned int line ) { + if (info->wait) ResetEvent( info->wait ); info->function = function; info->line = line; while (info->index < info->count && info->test[info->index].function != function @@ -251,11 +252,9 @@ static void test_connection_cache( void ) ResetEvent( info.wait ); setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); - WaitForSingleObject( info.wait, INFINITE ); - - setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); + WaitForSingleObject( info.wait, INFINITE ); if (unload) { @@ -263,12 +262,13 @@ static void test_connection_cache( void ) ok(status == WAIT_TIMEOUT, "got %08x\n", status); } + setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( ses ); + WaitForSingleObject( info.wait, INFINITE ); - Sleep(2000); /* make sure connection is evicted from cache */ if (unload) { - status = WaitForSingleObject( event, 0 ); + status = WaitForSingleObject( event, 100 ); ok(status == WAIT_OBJECT_0, "got %08x\n", status); } @@ -351,9 +351,8 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_close_handle, __LINE__ ); done: WinHttpCloseHandle( req ); - WaitForSingleObject( info.wait, INFINITE ); WinHttpCloseHandle( con ); - CloseHandle( info.wait ); + WaitForSingleObject( info.wait, INFINITE ); if (unload) { @@ -361,12 +360,14 @@ done: ok(status == WAIT_TIMEOUT, "got %08x\n", status); } + setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( ses ); + WaitForSingleObject( info.wait, INFINITE ); + CloseHandle( info.wait ); - Sleep(2000); /* make sure connection is evicted from cache */ if (unload) { - status = WaitForSingleObject( event, 0 ); + status = WaitForSingleObject( event, 100 ); ok(status == WAIT_OBJECT_0, "got %08x\n", status); } @@ -398,7 +399,7 @@ static const struct notification redirect_test[] = { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, NF_WINE_ALLOW }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING } + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL } }; static void test_redirect( void ) @@ -411,7 +412,7 @@ static void test_redirect( void ) info.test = redirect_test; info.count = sizeof(redirect_test) / sizeof(redirect_test[0]); info.index = 0; - info.wait = NULL; + info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); ses = WinHttpOpen( user_agent, 0, NULL, NULL, 0 ); ok(ses != NULL, "failed to open session %u\n", GetLastError()); @@ -453,6 +454,8 @@ done: WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); + WaitForSingleObject( info.wait, INFINITE ); + CloseHandle( info.wait ); } static const struct notification async_test[] = @@ -465,19 +468,19 @@ static const struct notification async_test[] = { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, NF_WINE_ALLOW }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE, NF_SIGNAL }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE }, - { winhttp_query_data, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE, NF_SIGNAL }, + { winhttp_query_data, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, NF_SIGNAL }, { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NF_ALLOW }, { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, NF_ALLOW }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_READ_COMPLETE }, + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SIGNAL }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, NF_WINE_ALLOW }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, NF_WINE_ALLOW }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING } + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL } }; static void test_async( void ) @@ -581,7 +584,6 @@ static void test_async( void ) setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); - WaitForSingleObject( info.wait, INFINITE ); WinHttpCloseHandle( con ); if (unload) @@ -590,7 +592,6 @@ static void test_async( void ) ok(status == WAIT_TIMEOUT, "got %08x\n", status); } WinHttpCloseHandle( ses ); - WaitForSingleObject( info.wait, INFINITE ); if (unload)

1 0

Jacek Caban : winhttp/tests: Make sure that all notifications were called before the end of a test.
by Alexandre Julliard 14 Jul '17

14 Jul '17

Module: wine Branch: master Commit: 4620bcf8062545306adfba8f564c4c9a172ac2b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4620bcf8062545306adfba8f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 14 15:43:52 2017 +0200 winhttp/tests: Make sure that all notifications were called before the end of a test. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/notification.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index dc36b88..e9de152 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -163,6 +163,12 @@ static void setup_test( struct info *info, enum api function, unsigned int line info->test[info->index].function, function); } +static void end_test( struct info *info, unsigned int line ) +{ + ok_(__FILE__,line)(info->index == info->count, "some notifications were missing: %x\n", + info->test[info->index].status); +} + static void test_connection_cache( void ) { HANDLE ses, con, req, event; @@ -364,6 +370,7 @@ done: WinHttpCloseHandle( ses ); WaitForSingleObject( info.wait, INFINITE ); CloseHandle( info.wait ); + end_test( &info, __LINE__ ); if (unload) { @@ -456,6 +463,7 @@ done: WinHttpCloseHandle( ses ); WaitForSingleObject( info.wait, INFINITE ); CloseHandle( info.wait ); + end_test( &info, __LINE__ ); } static const struct notification async_test[] = @@ -593,6 +601,7 @@ static void test_async( void ) } WinHttpCloseHandle( ses ); WaitForSingleObject( info.wait, INFINITE ); + end_test( &info, __LINE__ ); if (unload) {

1 0