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

Joel Holdsworth : configure: Maintainer mode requires icotool v0.29. 0 or newer.
by Alexandre Julliard 06 Apr '10

06 Apr '10

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

Joel Holdsworth : configure: Maintainer mode requires imagemagick.
by Alexandre Julliard 06 Apr '10

06 Apr '10

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 : tools: Installed new icon build script.
by Alexandre Julliard 06 Apr '10

06 Apr '10

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 : user32: Replaced oic_winlogo. ico with Tango compliant icon.
by Alexandre Julliard 06 Apr '10

06 Apr '10

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

Alexandre Julliard : tools: Improve error handling in the buildicon script.
by Alexandre Julliard 06 Apr '10

06 Apr '10

Module: wine Branch: master Commit: 513c77655a963a70d74d3fd3fa27cbd49f52a0a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=513c77655a963a70d74d3fd3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 6 13:24:04 2010 +0200 tools: Improve error handling in the buildicon script. --- tools/buildicon | 37 +++++++++++++++++++++++++------------ 1 files changed, 25 insertions(+), 12 deletions(-) diff --git a/tools/buildicon b/tools/buildicon index 2f91f4b..4c6a088 100755 --- a/tools/buildicon +++ b/tools/buildicon @@ -36,12 +36,27 @@ 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 ""; +my $convert = $ENV{"CONVERT"} || "convert"; +my $rsvg = $ENV{"RSVG"} || "rsvg"; +my $icotool = $ENV{"ICOTOOL"} || "icotool"; + +sub cleanup() +{ + unlink $renderedSVGFileName; + unlink $_ foreach(@pngFiles); +} + +$SIG{"INT"} = "cleanup"; +$SIG{"HUP"} = "cleanup"; +$SIG{"TERM"} = "cleanup"; +$SIG{"__DIE__"} = "cleanup"; + +# run a shell command and die on error +sub shell(@) +{ + my @args = @_; + system(@args) == 0 or die "@args failed: $?"; +} sub svg_element_start { @@ -67,7 +82,7 @@ sub svg_element_start if(defined($x) and defined($x)) { if($x =~ /\d*/ and $y =~ /\d*/) { - system "$convert $renderedSVGFileName -crop '$size x$size+$x+$y' $pngFileName"; + shell $convert, $renderedSVGFileName, "-crop", "${size}x${size}+$x+$y", $pngFileName; } } @@ -96,7 +111,7 @@ sub resize_image # Use ImageMagick to stretch the image my($size) = @_; my $pngFileName = "$icoName-$size.png"; - system "$convert $renderedSVGFileName -resize '$size x$size' $pngFileName"; + shell $convert, $renderedSVGFileName, "-resize", "${size}x${size}", $pngFileName; push(@pngFiles, $pngFileName); } @@ -108,7 +123,7 @@ sub fallback_render } # Render the SVG image -system 'rsvg', $svgFileName, $renderedSVGFileName; +shell 'rsvg', $svgFileName, $renderedSVGFileName; # Render the images in the SVG my $parser = new XML::Parser( @@ -120,9 +135,7 @@ $parser->parsefile("$svgFileName"); fallback_render unless(@pngFiles); # Combine them into an ICO file -my $icotoolCommand = "$icotool -c -o $icoFileName"; -$icotoolCommand .= " $_" foreach(@pngFiles); -system $icotoolCommand; +shell $icotool, "-c", "-o", $icoFileName, @pngFiles; # Delete the intermediate images unlink $renderedSVGFileName;

1 0

Alex Villacís Lasso : oledb32: Added tests for DBTYPE_BYTES to DBTYPE_WSTR/DBTYPE_STR marked as todo_wine .
by Alexandre Julliard 06 Apr '10

06 Apr '10

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

Alex Villacís Lasso : oledb32: Implement conversion from DBTYPE_BYTES to DBTYPE_WSTR/DBTYPE_STR.
by Alexandre Julliard 06 Apr '10

06 Apr '10

Module: wine Branch: master Commit: 714283c9406365dbc6c0e3fd649794a1f6d5bc11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=714283c9406365dbc6c0e3fd6… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 5 11:45:57 2010 -0500 oledb32: Implement conversion from DBTYPE_BYTES to DBTYPE_WSTR/DBTYPE_STR. --- dlls/oledb32/convert.c | 20 ++++++++++++++++++++ dlls/oledb32/tests/convert.c | 34 ++++------------------------------ 2 files changed, 24 insertions(+), 30 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index ce32a2a..6338090 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -352,6 +352,26 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, hr = *d ? S_OK : E_OUTOFMEMORY; } break; + case DBTYPE_BYTES: + { + *d = SysAllocStringLen(NULL, 2 * src_len); + if (*d == NULL) + hr = E_OUTOFMEMORY; + else + { + const char hexchars[] = "0123456789ABCDEF"; + WCHAR *s = *d; + unsigned char *p = src; + while (src_len > 0) + { + *s++ = hexchars[(*p >> 4) & 0x0F]; + *s++ = hexchars[(*p) & 0x0F]; + src_len--; p++; + } + hr = S_OK; + } + } + break; default: FIXME("Unimplemented conversion %04x -> BSTR\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 77872b7..9cece28 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1286,82 +1286,68 @@ static void test_converttowstr(void) 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[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[0] == 0, "not null terminated\n"); ok(dst[1] == 0xcccc, "clobbered buffer\n"); @@ -1768,70 +1754,58 @@ static void test_converttostr(void) 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[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[0] == 0, "not null terminated\n"); ok(dst[1] == (char)0xcc, "clobbered buffer\n"); IDataConvert_Release(convert);

1 0

Stefan Leichter : setupapi: Implement SetupGetInfFileListA.
by Alexandre Julliard 06 Apr '10

06 Apr '10

Module: wine Branch: master Commit: 05a308a80ba8acef2f25732d652a5ffd5361479b URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a308a80ba8acef2f25732d6… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Apr 5 19:37:58 2010 +0200 setupapi: Implement SetupGetInfFileListA. --- dlls/setupapi/install.c | 34 ++++++++++++++++++++++ dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/tests/install.c | 62 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 354f105..a71f274 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1463,6 +1463,40 @@ BOOL WINAPI SetupInstallServicesFromInfSectionA( HINF Inf, PCSTR SectionName, DW /*********************************************************************** + * SetupGetInfFileListA (SETUPAPI.@) + */ +BOOL WINAPI SetupGetInfFileListA(PCSTR dir, DWORD style, PSTR buffer, + DWORD insize, PDWORD outsize) +{ + UNICODE_STRING dirW; + PWSTR bufferW = NULL; + BOOL ret = FALSE; + DWORD outsizeA, outsizeW; + + if ( dir ) + RtlCreateUnicodeStringFromAsciiz( &dirW, dir ); + else + dirW.Buffer = NULL; + + if ( buffer ) + bufferW = HeapAlloc( GetProcessHeap(), 0, insize * sizeof( WCHAR )); + + ret = SetupGetInfFileListW( dirW.Buffer, style, bufferW, insize, &outsizeW); + + if ( ret ) + { + outsizeA = WideCharToMultiByte( CP_ACP, 0, bufferW, outsizeW, + buffer, insize, NULL, NULL); + if ( outsize ) *outsize = outsizeA; + } + + HeapFree( GetProcessHeap(), 0, bufferW ); + RtlFreeUnicodeString( &dirW ); + return ret; +} + + +/*********************************************************************** * SetupGetInfFileListW (SETUPAPI.@) */ BOOL WINAPI SetupGetInfFileListW(PCWSTR dir, DWORD style, PWSTR buffer, diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 5532aaa..1f77305 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -412,7 +412,7 @@ @ stdcall SetupGetFileCompressionInfoW(wstr ptr ptr ptr ptr) @ stdcall SetupGetFileQueueCount(long long ptr) @ stdcall SetupGetFileQueueFlags(long ptr) -@ stub SetupGetInfFileListA +@ stdcall SetupGetInfFileListA(str long ptr long ptr) @ stdcall SetupGetInfFileListW(wstr long ptr long ptr) @ stdcall SetupGetInfInformationA(ptr long ptr long ptr) @ stdcall SetupGetInfInformationW(ptr long ptr long ptr) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 668b2c2..f5df3df 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -53,6 +53,7 @@ static char CURR_DIR[MAX_PATH]; static void (WINAPI *pInstallHinfSectionA)(HWND, HINSTANCE, LPCSTR, INT); static void (WINAPI *pInstallHinfSectionW)(HWND, HINSTANCE, LPCWSTR, INT); +static BOOL (WINAPI *pSetupGetInfFileListA)(PCSTR, DWORD, PSTR, DWORD, PDWORD); static BOOL (WINAPI *pSetupGetInfFileListW)(PCWSTR, DWORD, PWSTR, DWORD, PDWORD); /* @@ -468,6 +469,65 @@ cleanup: DeleteFile(inffile); } +static void test_inffilelistA(void) +{ + static const char inffile2[] = "test2.inf"; + static const char *inf = + "[Version]\n" + "Signature=\"$Chicago$\""; + + char buffer[MAX_PATH] = { 0 }; + char dir[MAX_PATH], *p; + DWORD expected, outsize; + BOOL ret; + + if(!pSetupGetInfFileListA) + { + win_skip("SetupGetInfFileListA not present\n"); + return; + } + + /* create a private directory, the temp directory may contain some + * inf files left over from old installations + */ + if (!GetTempFileNameA(CURR_DIR, "inftest", 1, dir)) + { + win_skip("GetTempFileNameA failed with error %d\n", GetLastError()); + return; + } + if (!CreateDirectoryA(dir, NULL )) + { + win_skip("CreateDirectoryA(%s) failed with error %d\n", dir, GetLastError()); + return; + } + if (!SetCurrentDirectoryA(dir)) + { + win_skip("SetCurrentDirectoryA failed with error %d\n", GetLastError()); + RemoveDirectoryA(dir); + return; + } + + create_inf_file(inffile, inf); + create_inf_file(inffile2, inf); + + /* mixed style + */ + expected = 3 + strlen(inffile) + strlen(inffile2); + ret = pSetupGetInfFileListA(dir, INF_STYLE_OLDNT | INF_STYLE_WIN4, buffer, + MAX_PATH, &outsize); + ok(ret, "expected SetupGetInfFileListA to succeed!\n"); + ok(expected == outsize, "expected required buffersize to be %d, got %d\n", + expected, outsize); + for(p = buffer; lstrlenA(p) && (outsize > (p - buffer)); p+=lstrlenA(p) + 1) + ok(!lstrcmpA(p,inffile2) || !lstrcmpA(p,inffile), + "unexpected filename %s\n",p); + + DeleteFile(inffile); + DeleteFile(inffile2); + SetCurrentDirectoryA(CURR_DIR); + RemoveDirectoryA(dir); +} + static void test_inffilelist(void) { static const char inffile2[] = "test2.inf"; @@ -656,6 +716,7 @@ START_TEST(install) pInstallHinfSectionA = (void *)GetProcAddress(hsetupapi, "InstallHinfSectionA"); pInstallHinfSectionW = (void *)GetProcAddress(hsetupapi, "InstallHinfSectionW"); + pSetupGetInfFileListA = (void *)GetProcAddress(hsetupapi, "SetupGetInfFileListA"); pSetupGetInfFileListW = (void *)GetProcAddress(hsetupapi, "SetupGetInfFileListW"); if (pInstallHinfSectionA) @@ -695,6 +756,7 @@ START_TEST(install) } test_inffilelist(); + test_inffilelistA(); SetCurrentDirectory(prev_path); }

1 0

Jacek Caban : mshtml: Fixed nsIHttpChannel:: GetRequestSucceeded implementation.
by Alexandre Julliard 06 Apr '10

06 Apr '10

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

Henri Verbeet : d3d8/tests: Use color_match() in test_rcp_rsq().
by Alexandre Julliard 06 Apr '10

06 Apr '10

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