April 2010 - Wine-Commits - list.winehq.org

Nikolay Sivov : shell32: Add stub shell folder for CLSID_Printers.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: da32b078b7843b340ee9334038ed211c1289d4a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da32b078b7843b340ee933403… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 6 11:55:10 2010 +0400 shell32: Add stub shell folder for CLSID_Printers. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/shell32_main.h | 1 + dlls/shell32/shellole.c | 24 ++-- dlls/shell32/shfldr_printers.c | 317 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 331 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da32b078b7843b340ee93…

1 0

Joel Holdsworth : user32: Replaced oic_winlogo. ico with Tango compliant icon.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 3b1b1863e45bfa71ebd4976ac14a5e97f47a376e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b1b1863e45bfa71ebd4976ac… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Mon Apr 5 11:15:32 2010 +0100 user32: Replaced oic_winlogo.ico with Tango compliant icon. --- dlls/user32/resources/oic_winlogo.ico | Bin 15086 -> 25214 bytes dlls/user32/resources/oic_winlogo.svg | 581 +++++++++++---------------------- 2 files changed, 195 insertions(+), 386 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b1b1863e45bfa71ebd49…

1 0

Joel Holdsworth : tools: Installed new icon build script.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: e02de775086c7ad1a3fa359300a9192cd18e87b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02de775086c7ad1a3fa35930… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Mon Apr 5 11:15:08 2010 +0100 tools: Installed new icon build script. --- Make.rules.in | 7 +-- tools/buildicon | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+), 5 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 654dbc3..77cf558 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -64,6 +64,7 @@ TARGETFLAGS = @TARGETFLAGS@ WINEBUILDFLAGS = $(TARGETFLAGS) $(DLLFLAGS) MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755 WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check +BUILDICON = $(TOPSRCDIR)/tools/buildicon C2MAN = $(TOPSRCDIR)/tools/c2man.pl RUNTEST = $(TOPSRCDIR)/tools/runtest WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT) @@ -190,11 +191,7 @@ filter: dummy LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $< >$@ || ($(RM) $@ && false) .svg.ico: - $(RSVG) -w 16 -h 16 -f png $< $*-16.png - $(RSVG) -w 32 -h 32 -f png $< $*-32.png - $(RSVG) -w 48 -h 48 -f png $< $*-48.png - $(ICOTOOL) -c -o $@ $*-16.png $*-32.png $*-48.png - $(RM) $*-16.png $*-32.png $*-48.png + CONVERT="$(CONVERT)" ICOTOOL="$(ICOTOOL)" RSVG="$(RSVG)" $(BUILDICON) $< $@ # Rules for IDL files diff --git a/tools/buildicon b/tools/buildicon new file mode 100755 index 0000000..2f91f4b --- /dev/null +++ b/tools/buildicon @@ -0,0 +1,129 @@ +#! /usr/bin/perl -w +# +# Render SVG files containing multiple images +# +# Copyright (C) 2010 Joel Holdsworth +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; +use warnings; +use XML::Parser; +use MIME::Base64; + +# Parse the parameters +my $svgFileName = $ARGV[0]; +my $icoFileName = $ARGV[1]; +die "Cannot open SVG file" unless defined($svgFileName); +die "Cannot open ICO file" unless defined($icoFileName); + +my $renderedSVGFileName = "$svgFileName.ico"; +$icoFileName =~ m/(.*)\.ico/; +my $icoName = $1; + +my @pngFiles; + +# Get the programs from the environment variables +my $convert = $ENV{"CONVERT"}; +$convert = "convert" if $convert eq ""; +my $rsvg = $ENV{"RSVG"}; +$rsvg = "rsvg" if $rsvg eq ""; +my $icotool = $ENV{"ICOTOOL"}; +$icotool = "icotool" if $icotool eq ""; + +sub svg_element_start +{ + my($expat, $element, %attr) = @_; + + # Parse the id for icon format + my $id = $attr{'id'}; + return unless defined($id); + return unless $id =~ /icon:(\d*)-(\d*)/; + my $size = $1; + my $depth = $2; + return unless defined($size) and defined($depth); + + warn "Unexpected icon depth" unless + $depth == 4 or $depth == 8 or $depth == 32; + my $pngFileName = "$icoName-$size-$depth.png"; + + if($element eq "rect") { + + # Extract SVG vector images + my $x = $attr{'x'}; + my $y = $attr{'y'}; + + if(defined($x) and defined($x)) { + if($x =~ /\d*/ and $y =~ /\d*/) { + system "$convert $renderedSVGFileName -crop '$size x$size+$x+$y' $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; + } + + push(@pngFiles, $pngFileName); +} + +sub resize_image +{ + # Use ImageMagick to stretch the image + my($size) = @_; + my $pngFileName = "$icoName-$size.png"; + system "$convert $renderedSVGFileName -resize '$size x$size' $pngFileName"; + push(@pngFiles, $pngFileName); +} + +sub fallback_render +{ + resize_image(16); + resize_image(32); + resize_image(48); +} + +# Render the SVG image +system 'rsvg', $svgFileName, $renderedSVGFileName; + +# Render the images in the SVG +my $parser = new XML::Parser( + Handlers => {Start => \&svg_element_start}); +$parser->parsefile("$svgFileName"); + +# If no render directives were found, this is an old-style icon +# which should be rendered with the old build rule +fallback_render unless(@pngFiles); + +# Combine them into an ICO file +my $icotoolCommand = "$icotool -c -o $icoFileName"; +$icotoolCommand .= " $_" foreach(@pngFiles); +system $icotoolCommand; + +# Delete the intermediate images +unlink $renderedSVGFileName; +unlink $_ foreach(@pngFiles);

1 0

Joel Holdsworth : configure: Maintainer mode requires imagemagick.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 476a2bee645df5e53126779704838be6d62f987c URL: http://source.winehq.org/git/wine.git/?a=commit;h=476a2bee645df5e5312677970… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Mon Apr 5 11:15:03 2010 +0100 configure: Maintainer mode requires imagemagick. --- Make.rules.in | 1 + configure | 45 +++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 ++ 3 files changed, 48 insertions(+), 0 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index f658412..654dbc3 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -48,6 +48,7 @@ LINT = @LINT@ LINTFLAGS = @LINTFLAGS@ FONTFORGE = @FONTFORGE@ RSVG = @RSVG@ +CONVERT = @CONVERT@ ICOTOOL = @ICOTOOL@ CROSSCC = @CROSSCC@ CROSSTARGET = @CROSSTARGET@ diff --git a/configure b/configure index f8968ba..07f7df5 100755 --- a/configure +++ b/configure @@ -671,6 +671,7 @@ OPENGL_LIBS XLIB PRELINK ICOTOOL +CONVERT RSVG PKG_CONFIG FONTFORGE @@ -5020,6 +5021,49 @@ fi done test -n "$RSVG" || RSVG="false" +for ac_prog in convert +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CONVERT+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CONVERT"; then + ac_cv_prog_CONVERT="$CONVERT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CONVERT="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CONVERT=$ac_cv_prog_CONVERT +if test -n "$CONVERT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONVERT" >&5 +$as_echo "$CONVERT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CONVERT" && break +done +test -n "$CONVERT" || CONVERT="false" + for ac_prog in icotool do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -5068,6 +5112,7 @@ if test "${enable_maintainer_mode+set}" = set then if test "$FONTFORGE" = "false"; then as_fn_append wine_warnings "|fontforge is missing, fonts can't be rebuilt."; fi if test "$RSVG" = "false"; then as_fn_append wine_warnings "|rsvg is missing, icons can't be rebuilt."; fi + if test "$CONVERT" = "false"; then as_fn_append wine_warnings "|imagemagick is missing, icons can't be rebuilt."; fi if test "$ICOTOOL" = false then diff --git a/configure.ac b/configure.ac index 7500828..7650ffa 100644 --- a/configure.ac +++ b/configure.ac @@ -281,12 +281,14 @@ dnl Check for various programs AC_CHECK_PROGS(FONTFORGE, fontforge, false) AC_CHECK_PROGS(PKG_CONFIG, pkg-config, false) AC_CHECK_PROGS(RSVG, rsvg, false) +AC_CHECK_PROGS(CONVERT, convert, false) AC_CHECK_PROGS(ICOTOOL, icotool, false) if test "${enable_maintainer_mode+set}" = set then if test "$FONTFORGE" = "false"; then WINE_WARNING([fontforge is missing, fonts can't be rebuilt.]); fi if test "$RSVG" = "false"; then WINE_WARNING([rsvg is missing, icons can't be rebuilt.]); fi + if test "$CONVERT" = "false"; then WINE_WARNING([imagemagick is missing, icons can't be rebuilt.]); fi dnl Check the icotool version if test "$ICOTOOL" = false

1 0

Joel Holdsworth : configure: Maintainer mode requires icotool v0.29. 0 or newer.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 425f138402bd61c69ddd48c1ebb4d1dd4549ca6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=425f138402bd61c69ddd48c1e… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Mon Apr 5 11:14:47 2010 +0100 configure: Maintainer mode requires icotool v0.29.0 or newer. --- configure | 29 ++++++++++++++++++++++++++++- configure.ac | 27 ++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 6a32ba5..f8968ba 100755 --- a/configure +++ b/configure @@ -5068,7 +5068,34 @@ if test "${enable_maintainer_mode+set}" = set then if test "$FONTFORGE" = "false"; then as_fn_append wine_warnings "|fontforge is missing, fonts can't be rebuilt."; fi if test "$RSVG" = "false"; then as_fn_append wine_warnings "|rsvg is missing, icons can't be rebuilt."; fi - if test "$ICOTOOL" = "false"; then as_fn_append wine_warnings "|icotool is missing, icons can't be rebuilt."; fi + + if test "$ICOTOOL" = false + then + as_fn_append wine_warnings "|icotool is missing, icons can't be rebuilt." + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for recent enough icotool" >&5 +$as_echo_n "checking for recent enough icotool... " >&6; } + icotool_version=`icotool --version | head -n1` + if test "x$icotool_version" != "x" + then + icotool_version_major=`expr "$icotool_version" : '.* $[0-9]*$.[0-9]*'` + icotool_version_minor=`expr "$icotool_version" : '.* [0-9]*.$[0-9]*$'` + if test "$icotool_version_major" -eq 0 -a "$icotool_version_minor" -lt 29 + then + ICOTOOL=false + as_fn_append wine_warnings "|icotool version 0.29.0 or newer is needed to rebuild icons." + fi + fi + if test "$ICOTOOL" = false + then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no ($icotool_version_major.$icotool_version_minor)" >&5 +$as_echo "no ($icotool_version_major.$icotool_version_minor)" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($icotool_version_major.$icotool_version_minor)" >&5 +$as_echo "yes ($icotool_version_major.$icotool_version_minor)" >&6; } + fi + fi + fi case $host_cpu in diff --git a/configure.ac b/configure.ac index 2a9c3d3..7500828 100644 --- a/configure.ac +++ b/configure.ac @@ -287,7 +287,32 @@ if test "${enable_maintainer_mode+set}" = set then if test "$FONTFORGE" = "false"; then WINE_WARNING([fontforge is missing, fonts can't be rebuilt.]); fi if test "$RSVG" = "false"; then WINE_WARNING([rsvg is missing, icons can't be rebuilt.]); fi - if test "$ICOTOOL" = "false"; then WINE_WARNING([icotool is missing, icons can't be rebuilt.]); fi + + dnl Check the icotool version + if test "$ICOTOOL" = false + then + WINE_WARNING([icotool is missing, icons can't be rebuilt.]) + else + AC_MSG_CHECKING([for recent enough icotool]) + icotool_version=`icotool --version | head -n1` + if test "x$icotool_version" != "x" + then + icotool_version_major=`expr "$icotool_version" : '.* $[[0-9]]*$.[[0-9]]*'` + icotool_version_minor=`expr "$icotool_version" : '.* [[0-9]]*.$[[0-9]]*$'` + if test "$icotool_version_major" -eq 0 -a "$icotool_version_minor" -lt 29 + then + ICOTOOL=false + WINE_WARNING([icotool version 0.29.0 or newer is needed to rebuild icons.]) + fi + fi + if test "$ICOTOOL" = false + then + AC_MSG_RESULT([no ($icotool_version_major.$icotool_version_minor)]) + else + AC_MSG_RESULT([yes ($icotool_version_major.$icotool_version_minor)]) + fi + fi + fi case $host_cpu in

1 0

Henri Verbeet : ddraw: Fix and clarify texture filter state mappings.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: f97a9e3c0f35156193d1a001501b1ca0f0588a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f97a9e3c0f35156193d1a0015… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 5 21:10:17 2010 +0200 ddraw: Fix and clarify texture filter state mappings. --- dlls/ddraw/device.c | 89 ++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 74 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f70fdba..aba7bdc 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2409,22 +2409,60 @@ IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface, case D3DRENDERSTATE_TEXTUREMIN: { WINED3DTEXTUREFILTERTYPE tex_min; + WINED3DTEXTUREFILTERTYPE tex_mip; hr = IWineD3DDevice_GetSamplerState(This->wineD3DDevice, - 0, WINED3DSAMP_MINFILTER, - &tex_min); + 0, WINED3DSAMP_MINFILTER, &tex_min); + if (FAILED(hr)) + { + LeaveCriticalSection(&ddraw_cs); + return hr; + } + hr = IWineD3DDevice_GetSamplerState(This->wineD3DDevice, + 0, WINED3DSAMP_MIPFILTER, &tex_mip); switch (tex_min) { case WINED3DTEXF_POINT: - *Value = D3DFILTER_NEAREST; + switch (tex_mip) + { + case WINED3DTEXF_NONE: + *Value = D3DFILTER_NEAREST; + break; + case WINED3DTEXF_POINT: + *Value = D3DFILTER_MIPNEAREST; + break; + case WINED3DTEXF_LINEAR: + *Value = D3DFILTER_LINEARMIPNEAREST; + break; + default: + ERR("Unhandled mip filter %#x.\n", tex_mip); + *Value = D3DFILTER_NEAREST; + break; + } break; case WINED3DTEXF_LINEAR: - *Value = D3DFILTER_LINEAR; + switch (tex_mip) + { + case WINED3DTEXF_NONE: + *Value = D3DFILTER_LINEAR; + break; + case WINED3DTEXF_POINT: + *Value = D3DFILTER_MIPLINEAR; + break; + case WINED3DTEXF_LINEAR: + *Value = D3DFILTER_LINEARMIPLINEAR; + break; + default: + ERR("Unhandled mip filter %#x.\n", tex_mip); + *Value = D3DFILTER_LINEAR; + break; + } break; default: - ERR("Unhandled texture mag %d !\n",tex_min); - *Value = 0; + ERR("Unhandled texture min filter %#x.\n",tex_min); + *Value = D3DFILTER_NEAREST; + break; } break; } @@ -2652,22 +2690,39 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface, /* Some render states need special care */ switch(RenderStateType) { + /* + * The ddraw texture filter mapping works like this: + * D3DFILTER_NEAREST Point min/mag, no mip + * D3DFILTER_MIPNEAREST Point min/mag, point mip + * D3DFILTER_LINEARMIPNEAREST: Point min/mag, linear mip + * + * D3DFILTER_LINEAR Linear min/mag, no mip + * D3DFILTER_MIPLINEAR Linear min/mag, point mip + * D3DFILTER_LINEARMIPLINEAR Linear min/mag, linear mip + * + * This is the opposite of the GL naming convention, + * D3DFILTER_LINEARMIPNEAREST corresponds to GL_NEAREST_MIPMAP_LINEAR. + */ case D3DRENDERSTATE_TEXTUREMAG: { - WINED3DTEXTUREFILTERTYPE tex_mag = WINED3DTEXF_POINT; + WINED3DTEXTUREFILTERTYPE tex_mag; - switch ((D3DTEXTUREFILTER) Value) + switch (Value) { case D3DFILTER_NEAREST: + case D3DFILTER_MIPNEAREST: case D3DFILTER_LINEARMIPNEAREST: tex_mag = WINED3DTEXF_POINT; break; case D3DFILTER_LINEAR: + case D3DFILTER_MIPLINEAR: case D3DFILTER_LINEARMIPLINEAR: tex_mag = WINED3DTEXF_LINEAR; break; default: + tex_mag = WINED3DTEXF_POINT; ERR("Unhandled texture mag %d !\n",Value); + break; } hr = IWineD3DDevice_SetSamplerState(This->wineD3DDevice, @@ -2678,24 +2733,26 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface, case D3DRENDERSTATE_TEXTUREMIN: { - WINED3DTEXTUREFILTERTYPE tex_min = WINED3DTEXF_POINT; - WINED3DTEXTUREFILTERTYPE tex_mip = WINED3DTEXF_NONE; + WINED3DTEXTUREFILTERTYPE tex_min; + WINED3DTEXTUREFILTERTYPE tex_mip; switch ((D3DTEXTUREFILTER) Value) { case D3DFILTER_NEAREST: tex_min = WINED3DTEXF_POINT; + tex_mip = WINED3DTEXF_NONE; break; case D3DFILTER_LINEAR: tex_min = WINED3DTEXF_LINEAR; + tex_mip = WINED3DTEXF_NONE; break; case D3DFILTER_MIPNEAREST: tex_min = WINED3DTEXF_POINT; tex_mip = WINED3DTEXF_POINT; break; case D3DFILTER_MIPLINEAR: - tex_min = WINED3DTEXF_POINT; - tex_mip = WINED3DTEXF_LINEAR; + tex_min = WINED3DTEXF_LINEAR; + tex_mip = WINED3DTEXF_POINT; break; case D3DFILTER_LINEARMIPNEAREST: tex_min = WINED3DTEXF_POINT; @@ -2708,11 +2765,13 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface, default: ERR("Unhandled texture min %d !\n",Value); + tex_min = WINED3DTEXF_POINT; + tex_mip = WINED3DTEXF_NONE; + break; } - IWineD3DDevice_SetSamplerState(This->wineD3DDevice, - 0, WINED3DSAMP_MIPFILTER, - tex_mip); + IWineD3DDevice_SetSamplerState(This->wineD3DDevice, + 0, WINED3DSAMP_MIPFILTER, tex_mip); hr = IWineD3DDevice_SetSamplerState(This->wineD3DDevice, 0, WINED3DSAMP_MINFILTER, tex_min);

1 0

Henri Verbeet : wined3d: Don't use GLSL if the supported version isn' t at least 1.20.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 2381c9529dd8c754590123ee03e82309c640b59f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2381c9529dd8c754590123ee0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 5 21:10:15 2010 +0200 wined3d: Don't use GLSL if the supported version isn't at least 1.20. --- dlls/wined3d/directx.c | 8 +++++++- dlls/wined3d/utils.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 253ec4a..581d6c7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -24,6 +24,7 @@ */ #include "config.h" +#include <stdio.h> #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); @@ -31,7 +32,6 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_caps); #define GLINFO_LOCATION (*gl_info) #define WINE_DEFAULT_VIDMEM (64 * 1024 * 1024) -#define MAKEDWORD_VERSION(maj, min) ((maj & 0xffff) << 16) | (min & 0xffff) /* The d3d device ID */ static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } }; @@ -2414,7 +2414,13 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) if (gl_info->supported[ARB_SHADING_LANGUAGE_100]) { const char *str = (const char *)glGetString(GL_SHADING_LANGUAGE_VERSION_ARB); + unsigned int major, minor; + TRACE_(d3d_caps)("GLSL version string: %s.\n", debugstr_a(str)); + + /* The format of the GLSL version string is "major.minor[.release] [vendor info]". */ + sscanf(str, "%u.%u", &major, &minor); + gl_info->glsl_version = MAKEDWORD_VERSION(major, minor); } if (gl_info->supported[NV_LIGHT_MAX_EXPONENT]) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9a37a35..65f4761 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2766,8 +2766,10 @@ UINT wined3d_log2i(UINT32 x) * and the user preferences in wined3d_settings. */ void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_selected, int *vs_selected) { + BOOL glsl = wined3d_settings.glslRequested && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 20); + if (wined3d_settings.vs_mode == VS_NONE) *vs_selected = SHADER_NONE; - else if (gl_info->supported[ARB_VERTEX_SHADER] && wined3d_settings.glslRequested) + else if (gl_info->supported[ARB_VERTEX_SHADER] && glsl) { /* Geforce4 cards support GLSL but for vertex shaders only. Further its reported GLSL caps are * wrong. This combined with the fact that glsl won't offer more features or performance, use ARB @@ -2779,7 +2781,7 @@ void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_selected, else *vs_selected = SHADER_NONE; if (wined3d_settings.ps_mode == PS_NONE) *ps_selected = SHADER_NONE; - else if (gl_info->supported[ARB_FRAGMENT_SHADER] && wined3d_settings.glslRequested) *ps_selected = SHADER_GLSL; + else if (gl_info->supported[ARB_FRAGMENT_SHADER] && glsl) *ps_selected = SHADER_GLSL; else if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) *ps_selected = SHADER_ARB; else if (gl_info->supported[ATI_FRAGMENT_SHADER]) *ps_selected = SHADER_ATI; else *ps_selected = SHADER_NONE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 726281d..5d1a8c6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1418,6 +1418,7 @@ struct wined3d_gl_limits struct wined3d_gl_info { + DWORD glsl_version; UINT vidmem; struct wined3d_gl_limits limits; DWORD reserved_glsl_constants; @@ -3034,4 +3035,6 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) +#define MAKEDWORD_VERSION(maj, min) (((maj & 0xffff) << 16) | (min & 0xffff)) + #endif

1 0

Henri Verbeet : d3d8/tests: Use color_match() in test_rcp_rsq().
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 60a3625328e8fd4ba06445877cf4dd42c14af92a URL: http://source.winehq.org/git/wine.git/?a=commit;h=60a3625328e8fd4ba06445877… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 5 21:10:13 2010 +0200 d3d8/tests: Use color_match() in test_rcp_rsq(). --- dlls/d3d8/tests/visual.c | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 0ea1bd2..1527176 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -534,7 +534,6 @@ static void test_rcp_rsq(IDirect3DDevice8 *device) HRESULT hr; DWORD shader; DWORD color; - unsigned char c1, c2, c3; float constant[4] = {1.0, 1.0, 1.0, 2.0}; static const float quad[][3] = { @@ -598,12 +597,8 @@ static void test_rcp_rsq(IDirect3DDevice8 *device) } color = getPixelColor(device, 320, 240); - c1 = (color & 0x00ff0000 )>> 16; - c2 = (color & 0x0000ff00 )>> 8; - c3 = (color & 0x000000ff )>> 0; - ok(c1 == c2 && c2 == c3, "Color components differ: c1 = %02x, c2 = %02x, c3 = %02x\n", - c1, c2, c3); - ok(c1 >= 0x7c && c1 <= 0x84, "Color component value is %02x\n", c1); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x80, 0x80, 0x80), 4), + "RCP test returned color 0x%08x, expected 0x00808080.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (%#08x)\n", hr); @@ -632,12 +627,8 @@ static void test_rcp_rsq(IDirect3DDevice8 *device) } color = getPixelColor(device, 320, 240); - c1 = (color & 0x00ff0000 )>> 16; - c2 = (color & 0x0000ff00 )>> 8; - c3 = (color & 0x000000ff )>> 0; - ok(c1 == c2 && c2 == c3, "Color components differ: c1 = %02x, c2 = %02x, c3 = %02x\n", - c1, c2, c3); - ok(c1 >= 0xb0 && c1 <= 0xb8, "Color component value is %02x\n", c1); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xb4, 0xb4, 0xb4), 4), + "RSQ test returned color 0x%08x, expected 0x00b4b4b4.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (%#08x)\n", hr);

1 0

Jacek Caban : mshtml: Fixed nsIHttpChannel:: GetRequestSucceeded implementation.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 7d80003205a9feaa24849a8fcc8f374e7ffba2ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d80003205a9feaa24849a8fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 5 20:20:59 2010 +0200 mshtml: Fixed nsIHttpChannel::GetRequestSucceeded implementation. --- dlls/mshtml/nsio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 2e514b1..0c8e457 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1067,7 +1067,7 @@ static nsresult NSAPI nsChannel_GetRequestSucceeded(nsIHttpChannel *iface, if(!This->response_status) return NS_ERROR_NOT_AVAILABLE; - *aRequestSucceeded = (This->response_status < 400); + *aRequestSucceeded = This->response_status/100 == 2; return NS_OK; }

1 0

Alex Villacís Lasso : oledb32: Added tests for DBTYPE_BYTES to DBTYPE_WSTR/DBTYPE_STR marked as todo_wine .
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: ec7e297987d0341a81884d856f3a59999c0617b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec7e297987d0341a81884d856… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 5 11:45:20 2010 -0500 oledb32: Added tests for DBTYPE_BYTES to DBTYPE_WSTR/DBTYPE_STR marked as todo_wine. --- dlls/oledb32/tests/convert.c | 161 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 161 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index e6da6de..77872b7 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -926,6 +926,8 @@ static void test_converttowstr(void) static const WCHAR guid_str[] = { '{','0','C','7','3','3','A','8','D','-','2','A','1','C','-','1','1','C','E','-', 'A','D','E','5','-','0','0','A','A','0','0','4','4','7','7','3','D','}',0}; + static const WCHAR hexunpacked_w[] = {'5','7','0','0','6','9','0','0','6','E','0','0','6','5','0','0','0','0','0','0', 0 }; + static const WCHAR hexpacked_w[] = {'W','i','n','e', 0 }; BSTR b; hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); @@ -1278,6 +1280,91 @@ static void test_converttowstr(void) ok(dst_len == 4, "got %d\n", dst_len); ok(!lstrcmpW(ten, dst), "got %s\n", wine_dbgstr_w(dst)); + + + /* DBTYPE_BYTES to DBTYPE_*STR unpacks binary data into a hex string */ + memcpy(src, hexpacked_w, sizeof(hexpacked_w)); + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_WSTR, sizeof(hexpacked_w), &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + todo_wine { + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(hexpacked_w) * 4, "got %d\n", dst_len); + ok(!lstrcmpW(hexunpacked_w, dst), "got %s\n", wine_dbgstr_w(dst)); + } + ok(dst[sizeof(hexpacked_w)/sizeof(WCHAR) * 4 + 1] == 0xcccc, "clobbered buffer\n"); + + memcpy(src, hexpacked_w, sizeof(hexpacked_w)); + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_WSTR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + todo_wine { + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + } + ok(dst_len == 0, "got %d\n", dst_len); + todo_wine ok(dst[0] == 0, "not null terminated\n"); + ok(dst[1] == 0xcccc, "clobbered buffer\n"); + + memcpy(src, hexpacked_w, sizeof(hexpacked_w)); + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_WSTR, 4, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + todo_wine { + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 2 * sizeof(WCHAR) * 4, "got %d\n", dst_len); + ok(!memcmp(hexunpacked_w, dst, 2 * sizeof(WCHAR) * 4 ), "got %s\n", wine_dbgstr_w(dst)); + ok(dst[2 * 4] == 0, "not null terminated\n"); + } + ok(dst[2 * 4 + 1] == 0xcccc, "clobbered buffer\n"); + + memcpy(src, hexpacked_w, sizeof(hexpacked_w)); + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_WSTR, sizeof(hexpacked_w), &dst_len, src, dst, 2 * sizeof(WCHAR) * 4 + sizeof(WCHAR), 0, &dst_status, 0, 0, 0); + todo_wine { + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == sizeof(hexpacked_w) * 4, "got %d\n", dst_len); + ok(!memcmp(hexunpacked_w, dst, 2 * sizeof(WCHAR) * 4 ), "got %s\n", wine_dbgstr_w(dst)); + ok(dst[2 * 4] == 0, "not null terminated\n"); + } + ok(dst[2 * 4 + 1] == 0xcccc, "clobbered buffer\n"); + + memcpy(src, hexpacked_w, sizeof(hexpacked_w)); + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_WSTR, sizeof(hexpacked_w), &dst_len, src, dst, 2 * sizeof(WCHAR) * 4 +1, 0, &dst_status, 0, 0, 0); + todo_wine { + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == sizeof(hexpacked_w) * 4, "got %d\n", dst_len); + ok(!memcmp(hexunpacked_w, dst, 2 * sizeof(WCHAR) * 4 - 2 ), "got %s\n", wine_dbgstr_w(dst)); + ok(dst[2 * 4 - 1] == 0, "not null terminated\n"); + } + ok(dst[2 * 4] == 0xcccc, "clobbered buffer\n"); + + memcpy(src, hexpacked_w, sizeof(hexpacked_w)); + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_WSTR, sizeof(hexpacked_w), &dst_len, src, dst, 2 * sizeof(WCHAR) * 4, 0, &dst_status, 0, 0, 0); + todo_wine { + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == sizeof(hexpacked_w) * 4, "got %d\n", dst_len); + ok(!memcmp(hexunpacked_w, dst, 2 * sizeof(WCHAR) * 4 - 2 ), "got %s\n", wine_dbgstr_w(dst)); + ok(dst[2 * 4 - 1] == 0, "not null terminated\n"); + } + ok(dst[2 * 4] == 0xcccc, "clobbered buffer\n"); + + memcpy(src, hexpacked_w, sizeof(hexpacked_w)); + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_WSTR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, DBDATACONVERT_LENGTHFROMNTS); + todo_wine { + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + } + ok(dst_len == 0, "got %d\n", dst_len); + todo_wine ok(dst[0] == 0, "not null terminated\n"); + ok(dst[1] == 0xcccc, "clobbered buffer\n"); + + IDataConvert_Release(convert); } @@ -1293,6 +1380,8 @@ static void test_converttostr(void) static const char ten_a[] = "10"; static const char fourthreetwoone[] = "4321"; static const char guid_str[] = "{0C733A8D-2A1C-11CE-ADE5-00AA0044773D}"; + static const char hexunpacked_a[] = "57696E6500"; + static const char hexpacked_a[] = "Wine"; BSTR b; hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); @@ -1673,6 +1762,78 @@ static void test_converttostr(void) ok(dst_len == 2, "got %d\n", dst_len); ok(!lstrcmpA(ten_a, dst), "got %s\n", dst); + + + /* DBTYPE_BYTES to DBTYPE_*STR unpacks binary data into a hex string */ + memcpy(src, hexpacked_a, sizeof(hexpacked_a)); + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_STR, sizeof(hexpacked_a), &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + todo_wine { + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(hexpacked_a) * 2, "got %d\n", dst_len); + ok(!lstrcmpA(hexunpacked_a, dst), "got %s\n", dst); + } + ok(dst[sizeof(hexpacked_a)/sizeof(char) * 4 + 1] == (char)0xcc, "clobbered buffer\n"); + + memcpy(src, hexpacked_a, sizeof(hexpacked_a)); + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_STR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + todo_wine { + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + } + ok(dst_len == 0, "got %d\n", dst_len); + todo_wine ok(dst[0] == 0, "not null terminated\n"); + ok(dst[1] == (char)0xcc, "clobbered buffer\n"); + + memcpy(src, hexpacked_a, sizeof(hexpacked_a)); + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_STR, 4, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + todo_wine { + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 2 * sizeof(char) * 4, "got %d\n", dst_len); + ok(!memcmp(hexunpacked_a, dst, 2 * sizeof(char) * 4 ), "got %s\n", dst); + ok(dst[2 * 4] == 0, "not null terminated\n"); + } + ok(dst[2 * 4 + 1] == (char)0xcc, "clobbered buffer\n"); + + memcpy(src, hexpacked_a, sizeof(hexpacked_a)); + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_STR, sizeof(hexpacked_a), &dst_len, src, dst, 2 * sizeof(char) * 4 + sizeof(char), 0, &dst_status, 0, 0, 0); + todo_wine { + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == sizeof(hexpacked_a) * 2, "got %d\n", dst_len); + ok(!memcmp(hexunpacked_a, dst, 2 * sizeof(char) * 4 ), "got %s\n", dst); + ok(dst[2 * 4] == 0, "not null terminated\n"); + } + ok(dst[2 * 4 + 1] == (char)0xcc, "clobbered buffer\n"); + + memcpy(src, hexpacked_a, sizeof(hexpacked_a)); + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_STR, sizeof(hexpacked_a), &dst_len, src, dst, 2 * sizeof(char) * 4, 0, &dst_status, 0, 0, 0); + todo_wine { + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == sizeof(hexpacked_a) * 2, "got %d\n", dst_len); + ok(!memcmp(hexunpacked_a, dst, 2 * sizeof(char) * 4 - 2 ), "got %s\n", dst); + ok(dst[2 * 4 - 1] == 0, "not null terminated\n"); + } + ok(dst[2 * 4] == (char)0xcc, "clobbered buffer\n"); + + memcpy(src, hexpacked_a, sizeof(hexpacked_a)); + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_STR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, DBDATACONVERT_LENGTHFROMNTS); + todo_wine { + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + } + ok(dst_len == 0, "got %d\n", dst_len); + todo_wine ok(dst[0] == 0, "not null terminated\n"); + ok(dst[1] == (char)0xcc, "clobbered buffer\n"); + IDataConvert_Release(convert); }

1 0