wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Joel Holdsworth : comctl32: Replaced idb_view_large. bmp with a Tango compliant tool strip.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 6ac142b0b7e4222ce11ca42dbc430648bbfefe43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac142b0b7e4222ce11ca42db… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 16 23:08:30 2010 +0100 comctl32: Replaced idb_view_large.bmp with a Tango compliant tool strip. --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/idb_view_large.bmp | Bin 2270 -> 27770 bytes dlls/comctl32/idb_view_large.svg | 289 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 290 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ac142b0b7e4222ce11ca…

1 0

Joel Holdsworth : comctl32: Replaced idb_view_small. bmp with a Tango compliant tool strip.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: bf08efd2923452221ae64484bb78099924e2e929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf08efd2923452221ae64484b… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 16 23:08:06 2010 +0100 comctl32: Replaced idb_view_small.bmp with a Tango compliant tool strip. --- dlls/comctl32/Makefile.in | 3 + dlls/comctl32/idb_view_small.bmp | Bin 4150 -> 12410 bytes dlls/comctl32/idb_view_small.svg | 180 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 183 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf08efd2923452221ae64…

1 0

Joel Holdsworth : tools: Modified the ICO render script to also render BMPs .
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 465e653940e767637cff9cfac559ffbd0f57f648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=465e653940e767637cff9cfac… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 16 23:07:57 2010 +0100 tools: Modified the ICO render script to also render BMPs. --- Make.rules.in | 8 +-- tools/{buildicon => buildimage} | 81 +++++++++++++++++++++++++++++--------- 2 files changed, 65 insertions(+), 24 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index cc6d602..3f5d18e 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -63,7 +63,7 @@ IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS) TARGETFLAGS = @TARGETFLAGS@ MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755 WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check -BUILDICON = $(TOPSRCDIR)/tools/buildicon +BUILDIMAGE = $(TOPSRCDIR)/tools/buildimage C2MAN = $(TOPSRCDIR)/tools/c2man.pl RUNTEST = $(TOPSRCDIR)/tools/runtest WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT) @@ -190,12 +190,10 @@ 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: - CONVERT="$(CONVERT)" ICOTOOL="$(ICOTOOL)" RSVG="$(RSVG)" $(BUILDICON) $< $@ + CONVERT="$(CONVERT)" ICOTOOL="$(ICOTOOL)" RSVG="$(RSVG)" $(BUILDIMAGE) $< $@ .svg.bmp: - $(RSVG) $< $<.png - $(CONVERT) $<.png -alpha off $@ - $(RM) $<.png + CONVERT="$(CONVERT)" ICOTOOL="$(ICOTOOL)" RSVG="$(RSVG)" $(BUILDIMAGE) $< $@ # Rules for IDL files diff --git a/tools/buildicon b/tools/buildimage similarity index 61% rename from tools/buildicon rename to tools/buildimage index eae13dc..b307497 100755 --- a/tools/buildicon +++ b/tools/buildimage @@ -1,6 +1,6 @@ #! /usr/bin/perl -w # -# Render SVG files containing multiple images +# Render SVG files containing one or more images into an ICO or BMP. # # Copyright (C) 2010 Joel Holdsworth # @@ -22,17 +22,21 @@ use strict; use warnings; use XML::Parser; use MIME::Base64; +use File::Copy; # Parse the parameters my $svgFileName = $ARGV[0]; -my $icoFileName = $ARGV[1]; +my $outFileName = $ARGV[1]; + die "Cannot open SVG file" unless defined($svgFileName); -die "Cannot open ICO file" unless defined($icoFileName); +die "Cannot open output file" unless defined($outFileName); -my $renderedSVGFileName = "$svgFileName.ico"; -$icoFileName =~ m/(.*)\.ico/; -my $icoName = $1; +$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"; +my $renderedSVGFileName = "$svgFileName.png"; my @pngFiles; # Get the programs from the environment variables @@ -40,6 +44,7 @@ my $convert = $ENV{"CONVERT"} || "convert"; my $rsvg = $ENV{"RSVG"} || "rsvg"; my $icotool = $ENV{"ICOTOOL"} || "icotool"; +# Be ready to abort sub cleanup() { unlink $renderedSVGFileName; @@ -62,19 +67,35 @@ sub svg_element_start { my($expat, $element, %attr) = @_; - # Parse the id for icon format + # Parse the id for icon/bitmap render directives my $id = $attr{'id'}; return unless defined($id); - return unless $id =~ /icon:(\d*)-(\d*)/; - my $size = $1; - my $depth = $2; + + my $size = 0; + my $depth = 0; + + if($ext eq "ico") { + return unless $id =~ /icon:(\d*)-(\d*)/; + $size = $1; + $depth = $2; + } elsif($ext eq "bmp") { + return unless $id =~ /bitmap:(\d*)-(\d*)/; + $size = $1; + $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"; + $depth == 4 or $depth == 8 or $depth == 24 or $depth == 32; + my $pngFileName = "$outName-$size-$depth.png"; - if($element eq "rect") { + if($element eq "svg") { + + # The whole file is tagged + copy($renderedSVGFileName, $pngFileName) or die "File could not be copied"; + + } elsif($element eq "rect") { # Extract SVG vector images my $x = $attr{'x'}; @@ -116,12 +137,34 @@ my $parser = new XML::Parser( Handlers => {Start => \&svg_element_start}); $parser->parsefile("$svgFileName"); -# Die if no render directives were found -die "No render directives found in icon" unless(@pngFiles); +# If no render directives were found, take the full image as-is +unless(@pngFiles) { + 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; + +} elsif($ext eq "bmp") { + + # Only the first image becomes the final BMP + my $pngFile = $pngFiles[0]; + $pngFile =~ /.*-\d*-(\d*)\.png/; + my $depth = $1; -# Combine them into an ICO file -shell $icotool, "-c", "-o", $icoFileName, @pngFiles; + # Convert it into a bmp + if($depth == 24) { + shell $convert, "png:$pngFile", "+matte", $outFileName; + } else { + shell $convert, "png:$pngFile", $outFileName; + } + +} # Delete the intermediate images -unlink $renderedSVGFileName; -unlink $_ foreach(@pngFiles); +cleanup();

1 0

Joel Holdsworth : credui: Added a rendering hint to banner.svg.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 0c0e352fe0487138f142fb532cf7e4a73296992a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0e352fe0487138f142fb532… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 16 23:07:46 2010 +0100 credui: Added a rendering hint to banner.svg. --- dlls/credui/banner.svg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/credui/banner.svg b/dlls/credui/banner.svg index 31aa905..1e7577a 100644 --- a/dlls/credui/banner.svg +++ b/dlls/credui/banner.svg @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?>  -<svg xmlns="http://www.w3.org/2000/svg" height="60" width="320" version="1.0" xmlns:xlink="http://www.w3.org/1999/xlink"> +<svg xmlns="http://www.w3.org/2000/svg" id="bitmap:320-24" height="60" width="320" version="1.0" xmlns:xlink="http://www.w3.org/1999/xlink"> <defs id="defs9903"> <radialGradient id="radialGradient6201" gradientUnits="userSpaceOnUse" cy="2.0625" cx="11.156" gradientTransform="matrix(1,0,0,0.6206897,0,0.7823276)" r="0.90625"> <stop id="stop7584" stop-color="#FFF" offset="0"/>

1 0

Joel Holdsworth : configure: Added a check for ImageMagick v6. 6 or newer in maintainer mode.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: b9eae1ef8ece4eef2ec4a218078cf17be50ff549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9eae1ef8ece4eef2ec4a2180… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 16 23:07:40 2010 +0100 configure: Added a check for ImageMagick v6.6 or newer in maintainer mode. --- configure | 28 +++++++++++++++++++++++++++- configure.ac | 26 +++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/configure b/configure index fa0d59a..9de0946 100755 --- a/configure +++ b/configure @@ -5110,7 +5110,33 @@ 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 "$CONVERT" = false + then + as_fn_append wine_warnings "|imagemagick is missing, icons can't be rebuilt." + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for recent enough imagemagick" >&5 +$as_echo_n "checking for recent enough imagemagick... " >&6; } + convert_version=`convert --version | head -n1` + if test "x$convert_version" != "x" + then + convert_version_major=`expr "$convert_version" : '.* $[0-9]*$\.[0-9]*'` + convert_version_minor=`expr "$convert_version" : '.* [0-9]*\.$[0-9]*$'` + if test "$convert_version_major" -eq 6 -a "$convert_version_minor" -lt 6 + then + CONVERT=false + as_fn_append wine_warnings "|imagemagick version 6.6 or newer is needed to rebuild icons." + fi + fi + if test "$CONVERT" = false + then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no ($convert_version_major.$convert_version_minor)" >&5 +$as_echo "no ($convert_version_major.$convert_version_minor)" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($convert_version_major.$convert_version_minor)" >&5 +$as_echo "yes ($convert_version_major.$convert_version_minor)" >&6; } + fi + fi if test "$ICOTOOL" = false then diff --git a/configure.ac b/configure.ac index 006a325..46dca8e 100644 --- a/configure.ac +++ b/configure.ac @@ -285,7 +285,31 @@ 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 imagemagick version + if test "$CONVERT" = false + then + WINE_WARNING([imagemagick is missing, icons can't be rebuilt.]) + else + AC_MSG_CHECKING([for recent enough imagemagick]) + convert_version=`convert --version | head -n1` + if test "x$convert_version" != "x" + then + convert_version_major=`expr "$convert_version" : '.* $[[0-9]]*$\.[[0-9]]*'` + convert_version_minor=`expr "$convert_version" : '.* [[0-9]]*\.$[[0-9]]*$'` + if test "$convert_version_major" -eq 6 -a "$convert_version_minor" -lt 6 + then + CONVERT=false + WINE_WARNING([imagemagick version 6.6 or newer is needed to rebuild icons.]) + fi + fi + if test "$CONVERT" = false + then + AC_MSG_RESULT([no ($convert_version_major.$convert_version_minor)]) + else + AC_MSG_RESULT([yes ($convert_version_major.$convert_version_minor)]) + fi + fi dnl Check the icotool version if test "$ICOTOOL" = false

1 0

Joel Holdsworth : configure: Fix for icotool version checking regex.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 9571f781fb62f272bbbc863d639941d3506328ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=9571f781fb62f272bbbc863d6… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 16 23:07:33 2010 +0100 configure: Fix for icotool version checking regex. --- configure | 4 ++-- configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 2ab935b..fa0d59a 100755 --- a/configure +++ b/configure @@ -5121,8 +5121,8 @@ $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]*$'` + 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 diff --git a/configure.ac b/configure.ac index df70de6..006a325 100644 --- a/configure.ac +++ b/configure.ac @@ -296,8 +296,8 @@ then 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]]*$'` + 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

1 0

Joel Holdsworth : msiexec: Reused appwiz.cpl icon in msiexec.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: d8688d58468ff69d08a42668fdb52b696e97cae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8688d58468ff69d08a42668f… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 16 23:07:25 2010 +0100 msiexec: Reused appwiz.cpl icon in msiexec. --- programs/msiexec/msiexec.ico | Bin 15086 -> 25214 bytes programs/msiexec/msiexec.svg | 463 +++++++++++++++++++++++------------------- 2 files changed, 254 insertions(+), 209 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8688d58468ff69d08a42…

1 0

Sven Baars : notepad: Fix Dutch translation.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 6d7d19715cf7856de40780fc9bfc32ab4fef51bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d7d19715cf7856de40780fc9… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun May 16 20:27:12 2010 +0200 notepad: Fix Dutch translation. --- programs/notepad/Nl.rc | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/notepad/Nl.rc b/programs/notepad/Nl.rc index f543b13..ec2e77d 100644 --- a/programs/notepad/Nl.rc +++ b/programs/notepad/Nl.rc @@ -30,9 +30,9 @@ MAIN_MENU MENU MENUITEM "O&pslaan\tCtrl+S", CMD_SAVE MENUITEM "Ops&laan als...", CMD_SAVE_AS MENUITEM SEPARATOR - MENUITEM "&Afdrukken...\tCtrl+P", CMD_PRINT - MENUITEM "Pagina-in&stelling...", CMD_PAGE_SETUP - MENUITEM "Printerinstellingen...", CMD_PRINTER_SETUP + MENUITEM "Af&drukken...\tCtrl+P", CMD_PRINT + MENUITEM "Pa&gina-instellingen...", CMD_PAGE_SETUP + MENUITEM "Printerins&tellingen...", CMD_PRINTER_SETUP MENUITEM SEPARATOR MENUITEM "&Afsluiten", CMD_EXIT } @@ -58,7 +58,7 @@ POPUP "&Zoeken" { POPUP "&Help" { MENUITEM "&Help-onderwerpen", CMD_HELP_CONTENTS MENUITEM "&Zoeken...", CMD_HELP_SEARCH - MENUITEM "&Hulp bij Help", CMD_HELP_ON_HELP + MENUITEM "H&ulp bij Help", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&Over Notepad", CMD_HELP_ABOUT_NOTEPAD } @@ -69,7 +69,7 @@ POPUP "&Help" { DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Pagina-instelling" +CAPTION "Pagina-instellingen" { LTEXT "&Koptekst:", 0x140, 10, 07, 40, 15 EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP @@ -77,7 +77,7 @@ LTEXT "&Voettekst:", 0x142, 10, 24, 40, 15 EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP GROUPBOX "&Marges (millimeter):", 0x144, 10, 43,160, 45 -LTEXT "Li&nks:", 0x145, 20, 55, 30, 10, WS_CHILD +LTEXT "L&inks:", 0x145, 20, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP LTEXT "&Boven:", 0x148, 20, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_TOPVALUE, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP @@ -109,7 +109,7 @@ STRING_ERROR, "FOUT" STRING_WARNING, "WAARSCHUWING" STRING_INFO, "Informatie" -STRING_UNTITLED, "(naamloos)" +STRING_UNTITLED, "Naamloos" STRING_ALL_FILES, "Alle bestanden (*.*)" STRING_TEXT_FILES_TXT, "Tekstbestanden (*.txt)" @@ -130,9 +130,9 @@ STRING_UNICODE_LE, "Unicode (UTF-16)" STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ -Dit bestand bevat Unicode tekens welke verloren zullen gaan\n\ +Dit bestand bevat Unicode tekens die verloren zullen gaan\n\ als dit bestand wordt opgeslagen in de %s codering.\n\ -Om deze tekens te behouden, klikt u op Annuleren en selecteert\n\ -daarna een van de Unicode-opties in de Codering keuzelijst.\n\ +Klik op Annuleren om deze tekens te behouden, en selecteer\n\ +daarna een van de Unicode-opties in de coderingskeuzelijst.\n\ Wilt u doorgaan?" }

1 0

Alexandre Julliard : winex11: Use the subpixel rendering configuration from fontconfig to override the registry options .
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 922e15cbd04fde3d9d4fbb98600f5471420c2daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=922e15cbd04fde3d9d4fbb986… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 17 11:48:12 2010 +0200 winex11: Use the subpixel rendering configuration from fontconfig to override the registry options. --- dlls/winex11.drv/xrender.c | 84 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index d9735b0..d82cbf6 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -182,6 +182,21 @@ MAKE_FUNCPTR(XRenderSetPictureClipRectangles) MAKE_FUNCPTR(XRenderSetPictureTransform) #endif MAKE_FUNCPTR(XRenderQueryExtension) + +#ifdef SONAME_LIBFONTCONFIG +#include <fontconfig/fontconfig.h> +MAKE_FUNCPTR(FcConfigSubstitute) +MAKE_FUNCPTR(FcDefaultSubstitute) +MAKE_FUNCPTR(FcFontMatch) +MAKE_FUNCPTR(FcInit) +MAKE_FUNCPTR(FcPatternCreate) +MAKE_FUNCPTR(FcPatternDestroy) +MAKE_FUNCPTR(FcPatternAddInteger) +MAKE_FUNCPTR(FcPatternAddString) +MAKE_FUNCPTR(FcPatternGetInteger) +static BOOL fontconfig_installed; +#endif + #undef MAKE_FUNCPTR static CRITICAL_SECTION xrender_cs; @@ -326,6 +341,7 @@ static int load_xrender_formats(void) void X11DRV_XRender_Init(void) { int event_base, i; + void *fontconfig_handle; if (client_side_with_render && wine_dlopen(SONAME_LIBX11, RTLD_NOW|RTLD_GLOBAL, NULL, 0) && @@ -379,6 +395,23 @@ LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform) } } + if ((fontconfig_handle = wine_dlopen(SONAME_LIBFONTCONFIG, RTLD_NOW, NULL, 0))) + { +#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(fontconfig_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} + LOAD_FUNCPTR(FcConfigSubstitute); + LOAD_FUNCPTR(FcDefaultSubstitute); + LOAD_FUNCPTR(FcFontMatch); + LOAD_FUNCPTR(FcInit); + LOAD_FUNCPTR(FcPatternCreate); + LOAD_FUNCPTR(FcPatternDestroy); + LOAD_FUNCPTR(FcPatternAddInteger); + LOAD_FUNCPTR(FcPatternAddString); + LOAD_FUNCPTR(FcPatternGetInteger); +#undef LOAD_FUNCPTR + fontconfig_installed = pFcInit(); + } + else TRACE( "cannot find the fontconfig library " SONAME_LIBFONTCONFIG "\n" ); + sym_not_found: if(X11DRV_XRender_Installed || client_side_with_core) { @@ -839,6 +872,57 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) entry->aa_default = AA_None; break; } + +#ifdef SONAME_LIBFONTCONFIG + if (fontconfig_installed) + { + FcPattern *match, *pattern = pFcPatternCreate(); + FcResult result; + char family[LF_FACESIZE * 4]; + + WideCharToMultiByte( CP_UTF8, 0, plfsz->lf.lfFaceName, -1, family, sizeof(family), NULL, NULL ); + pFcPatternAddString( pattern, FC_FAMILY, (FcChar8 *)family ); + if (plfsz->lf.lfWeight != FW_DONTCARE) + { + int weight; + switch (plfsz->lf.lfWeight) + { + case FW_THIN: weight = FC_WEIGHT_THIN; break; + case FW_EXTRALIGHT: weight = FC_WEIGHT_EXTRALIGHT; break; + case FW_LIGHT: weight = FC_WEIGHT_LIGHT; break; + case FW_NORMAL: weight = FC_WEIGHT_NORMAL; break; + case FW_MEDIUM: weight = FC_WEIGHT_MEDIUM; break; + case FW_SEMIBOLD: weight = FC_WEIGHT_SEMIBOLD; break; + case FW_BOLD: weight = FC_WEIGHT_BOLD; break; + case FW_EXTRABOLD: weight = FC_WEIGHT_EXTRABOLD; break; + case FW_HEAVY: weight = FC_WEIGHT_HEAVY; break; + default: weight = (plfsz->lf.lfWeight - 80) / 4; break; + } + pFcPatternAddInteger( pattern, FC_WEIGHT, weight ); + } + pFcPatternAddInteger( pattern, FC_SLANT, plfsz->lf.lfItalic ? FC_SLANT_ITALIC : FC_SLANT_ROMAN ); + pFcConfigSubstitute( NULL, pattern, FcMatchPattern ); + pFcDefaultSubstitute( pattern ); + if ((match = pFcFontMatch( NULL, pattern, &result ))) + { + int rgba; + + if (pFcPatternGetInteger( match, FC_RGBA, 0, &rgba ) == FcResultMatch) + { + switch (rgba) + { + case FC_RGBA_RGB: entry->aa_default = AA_RGB; break; + case FC_RGBA_BGR: entry->aa_default = AA_BGR; break; + case FC_RGBA_VRGB: entry->aa_default = AA_VRGB; break; + case FC_RGBA_VBGR: entry->aa_default = AA_VBGR; break; + case FC_RGBA_NONE: entry->aa_default = AA_None; break; + } + } + pFcPatternDestroy( match ); + } + pFcPatternDestroy( pattern ); + } +#endif /* SONAME_LIBFONTCONFIG */ } else entry->aa_default = AA_None;

1 0

Matteo Bruni : d3dx9: Add DEFB instruction support in the shader assembler.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 1371e71f6159cf27e5aae3523a7dd3544f0b551c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1371e71f6159cf27e5aae3523… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Fri May 14 17:21:42 2010 +0200 d3dx9: Add DEFB instruction support in the shader assembler. This completes vs_3_0 assembler language support. --- dlls/d3dx9_36/asmparser.c | 11 ++++++++ dlls/d3dx9_36/asmshader.l | 9 ++++++ dlls/d3dx9_36/asmshader.y | 7 +++++ dlls/d3dx9_36/asmutils.c | 2 + dlls/d3dx9_36/bytecodewriter.c | 51 +++++++++++++++++++++++++++++++++++--- dlls/d3dx9_36/d3dx9_36_private.h | 3 ++ 6 files changed, 79 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index 68ee5ce..d1d75ba 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -48,6 +48,16 @@ static void asmparser_constF(struct asm_parser *This, DWORD reg, float x, float } } +static void asmparser_constB(struct asm_parser *This, DWORD reg, BOOL x) { + if(!This->shader) return; + TRACE("Adding boolean constant %u at pos %u\n", reg, This->shader->num_cb); + TRACE_(parsed_shader)("def b%u, %s\n", reg, x ? "true" : "false"); + if(!add_constB(This->shader, reg, x)) { + ERR("Out of memory\n"); + set_parse_status(This, PARSE_ERR); + } +} + static void asmparser_constI(struct asm_parser *This, DWORD reg, INT x, INT y, INT z, INT w) { if(!This->shader) return; TRACE("Adding integer constant %u at pos %u\n", reg, This->shader->num_ci); @@ -181,6 +191,7 @@ static void asmparser_coissue_unsupported(struct asm_parser *This) { static const struct asmparser_backend parser_vs_3 = { asmparser_constF, asmparser_constI, + asmparser_constB, asmparser_dstreg_vs_3, asmparser_srcreg_vs_3, diff --git a/dlls/d3dx9_36/asmshader.l b/dlls/d3dx9_36/asmshader.l index e8037f7..e65c6f9 100644 --- a/dlls/d3dx9_36/asmshader.l +++ b/dlls/d3dx9_36/asmshader.l @@ -139,6 +139,7 @@ m3x3 {return INSTR_M3x3; } m3x2 {return INSTR_M3x2; } dcl {return INSTR_DCL; } def {return INSTR_DEF; } +defb {return INSTR_DEFB; } defi {return INSTR_DEFI; } rep {return INSTR_REP; } endrep {return INSTR_ENDREP; } @@ -281,6 +282,14 @@ ps_3_0 {return VER_PS30; } asmshader_lval.immval.integer = ((strstr(yytext, ".") == NULL) && (strstr(yytext, "f") == NULL)); return IMMVAL; } +true { + asmshader_lval.immbool = TRUE; + return IMMBOOL; + } +false { + asmshader_lval.immbool = FALSE; + return IMMBOOL; + } {COMMA} {return yytext[0]; } - {return yytext[0]; } diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index 5321ad8..f8dd716 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -60,6 +60,7 @@ void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { float val; BOOL integer; } immval; + BOOL immbool; unsigned int regnum; struct shader_reg reg; DWORD srcmod; @@ -124,6 +125,7 @@ void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { %token INSTR_M3x2 %token INSTR_DCL %token INSTR_DEF +%token INSTR_DEFB %token INSTR_DEFI %token INSTR_REP %token INSTR_ENDREP @@ -226,6 +228,7 @@ void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { /* Misc stuff */ %token <component> COMPONENT %token <immval> IMMVAL +%token <immbool> IMMBOOL %type <reg> dreg_name %type <reg> dreg @@ -583,6 +586,10 @@ instruction: INSTR_ADD omods dreg ',' sregs { asm_ctx.funcs->constI(&asm_ctx, $2, $4.val, $6.val, $8.val, $10.val); } + | INSTR_DEFB REG_CONSTBOOL ',' IMMBOOL + { + asm_ctx.funcs->constB(&asm_ctx, $2, $4); + } | INSTR_REP sregs { TRACE("REP\n"); diff --git a/dlls/d3dx9_36/asmutils.c b/dlls/d3dx9_36/asmutils.c index 52fc2d0..c5ef6c2 100644 --- a/dlls/d3dx9_36/asmutils.c +++ b/dlls/d3dx9_36/asmutils.c @@ -189,6 +189,7 @@ DWORD d3d9_opcode(DWORD bwriter_opcode) { case BWRITERSIO_BREAK: return D3DSIO_BREAK; case BWRITERSIO_BREAKC: return D3DSIO_BREAKC; case BWRITERSIO_MOVA: return D3DSIO_MOVA; + case BWRITERSIO_DEFB: return D3DSIO_DEFB; case BWRITERSIO_DEFI: return D3DSIO_DEFI; case BWRITERSIO_EXPP: return D3DSIO_EXPP; case BWRITERSIO_LOGP: return D3DSIO_LOGP; @@ -456,6 +457,7 @@ const char *debug_print_opcode(DWORD opcode) { case BWRITERSIO_BREAK: return "break"; case BWRITERSIO_BREAKC: return "breakc"; case BWRITERSIO_MOVA: return "mova"; + case BWRITERSIO_DEFB: return "defb"; case BWRITERSIO_DEFI: return "defi"; case BWRITERSIO_EXPP: return "expp"; case BWRITERSIO_LOGP: return "logp"; diff --git a/dlls/d3dx9_36/bytecodewriter.c b/dlls/d3dx9_36/bytecodewriter.c index c6bdfd0..087422f 100644 --- a/dlls/d3dx9_36/bytecodewriter.c +++ b/dlls/d3dx9_36/bytecodewriter.c @@ -176,6 +176,39 @@ BOOL add_constI(struct bwriter_shader *shader, DWORD reg, INT x, INT y, INT z, I return TRUE; } +BOOL add_constB(struct bwriter_shader *shader, DWORD reg, BOOL x) { + struct constant *newconst; + + if(shader->num_cb) { + struct constant **newarray; + newarray = asm_realloc(shader->constB, + sizeof(*shader->constB) * (shader->num_cb + 1)); + if(!newarray) { + ERR("Failed to grow the constants array\n"); + return FALSE; + } + shader->constB = newarray; + } else { + shader->constB = asm_alloc(sizeof(*shader->constB)); + if(!shader->constB) { + ERR("Failed to allocate the constants array\n"); + return FALSE; + } + } + + newconst = asm_alloc(sizeof(*newconst)); + if(!newconst) { + ERR("Failed to allocate a new constant\n"); + return FALSE; + } + newconst->regnum = reg; + newconst->value[0].b = x; + shader->constB[shader->num_cb] = newconst; + + shader->num_cb++; + return TRUE; +} + BOOL record_declaration(struct bwriter_shader *shader, DWORD usage, DWORD usage_idx, BOOL output, DWORD regnum, DWORD writemask) { unsigned int *num; struct declaration **decl; @@ -343,7 +376,10 @@ static void write_const(struct constant **consts, int num, DWORD opcode, DWORD r D3DSP_WRITEMASK_ALL; if(len) { - instr_def |= 5 << D3DSI_INSTLENGTH_SHIFT; + if(opcode == D3DSIO_DEFB) + instr_def |= 2 << D3DSI_INSTLENGTH_SHIFT; + else + instr_def |= 5 << D3DSI_INSTLENGTH_SHIFT; } for(i = 0; i < num; i++) { @@ -352,9 +388,11 @@ static void write_const(struct constant **consts, int num, DWORD opcode, DWORD r put_dword(buffer, reg | (consts[i]->regnum & D3DSP_REGNUM_MASK)); put_dword(buffer, consts[i]->value[0].d); - put_dword(buffer, consts[i]->value[1].d); - put_dword(buffer, consts[i]->value[2].d); - put_dword(buffer, consts[i]->value[3].d); + if(opcode != D3DSIO_DEFB) { + put_dword(buffer, consts[i]->value[1].d); + put_dword(buffer, consts[i]->value[2].d); + put_dword(buffer, consts[i]->value[3].d); + } } } @@ -405,6 +443,10 @@ static void instr_handler(struct bc_writer *This, write_srcregs(This, instr, buffer); } +static void write_constB(const struct bwriter_shader *shader, struct bytecode_buffer *buffer, BOOL len) { + write_const(shader->constB, shader->num_cb, D3DSIO_DEFB, D3DSPR_CONSTBOOL, buffer, len); +} + static void write_constI(const struct bwriter_shader *shader, struct bytecode_buffer *buffer, BOOL len) { write_const(shader->constI, shader->num_ci, D3DSIO_DEFI, D3DSPR_CONSTINT, buffer, len); } @@ -449,6 +491,7 @@ static void sm_3_header(struct bc_writer *This, const struct bwriter_shader *sha write_declarations(buffer, TRUE, shader->inputs, shader->num_inputs, D3DSPR_INPUT); write_declarations(buffer, TRUE, shader->outputs, shader->num_outputs, D3DSPR_OUTPUT); write_constF(shader, buffer, TRUE); + write_constB(shader, buffer, TRUE); write_constI(shader, buffer, TRUE); write_samplers(shader, buffer); return; diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 7aab8b1..a12cb99 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -255,6 +255,7 @@ struct src_regs { struct asmparser_backend { void (*constF)(struct asm_parser *This, DWORD reg, float x, float y, float z, float w); void (*constI)(struct asm_parser *This, DWORD reg, INT x, INT y, INT z, INT w); + void (*constB)(struct asm_parser *This, DWORD reg, BOOL x); void (*dstreg)(struct asm_parser *This, struct instruction *instr, const struct shader_reg *dst); @@ -283,6 +284,7 @@ struct instruction *alloc_instr(unsigned int srcs); BOOL add_instruction(struct bwriter_shader *shader, struct instruction *instr); BOOL add_constF(struct bwriter_shader *shader, DWORD reg, float x, float y, float z, float w); BOOL add_constI(struct bwriter_shader *shader, DWORD reg, INT x, INT y, INT z, INT w); +BOOL add_constB(struct bwriter_shader *shader, DWORD reg, BOOL x); BOOL record_declaration(struct bwriter_shader *shader, DWORD usage, DWORD usage_idx, BOOL output, DWORD regnum, DWORD writemask); BOOL record_sampler(struct bwriter_shader *shader, DWORD samptype, DWORD regnum); @@ -442,6 +444,7 @@ typedef enum _BWRITERSHADER_INSTRUCTION_OPCODE_TYPE { BWRITERSIO_BREAK, BWRITERSIO_BREAKC, BWRITERSIO_MOVA, + BWRITERSIO_DEFB, BWRITERSIO_DEFI, BWRITERSIO_EXPP,

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2010