wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Qingchuan Wang : amstream: Expose also IMultiMediaStream which is the base interface of IAMMultiMediaStream .
by Alexandre Julliard 06 Apr '10

06 Apr '10

Module: wine Branch: master Commit: 33f41d15382d3c3102a153d4bbb342d4de20aab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33f41d15382d3c3102a153d4b… Author: Qingchuan Wang <rainy6144(a)gmail.com> Date: Mon Apr 5 20:30:09 2010 +0200 amstream: Expose also IMultiMediaStream which is the base interface of IAMMultiMediaStream. --- dlls/amstream/amstream.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index f8ae2a6..6bf515b 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -79,6 +79,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_QueryInterface(IAMMultiMediaStream TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMultiMediaStream) || IsEqualGUID(riid, &IID_IAMMultiMediaStream)) { IClassFactory_AddRef(iface);

1 0

Roderick Colenbrander : wined3d: Due to code rewrites is_color_fixup_supported is not needed anymore in RealizePalette .
by Alexandre Julliard 06 Apr '10

06 Apr '10

Module: wine Branch: master Commit: e6ae272efee51dffa62ca75d4f909c8855edf950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ae272efee51dffa62ca75d4… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 5 20:05:18 2010 +0200 wined3d: Due to code rewrites is_color_fixup_supported is not needed anymore in RealizePalette. The code in question should be executed in all cases. This also fixes palette refresh issues when shaders / paletted textures aren't around. --- dlls/wined3d/surface.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6ced082..f0bd431 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4276,18 +4276,13 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) if (This->resource.format_desc->format == WINED3DFMT_P8_UINT || This->resource.format_desc->format == WINED3DFMT_P8_UINT_A8_UNORM) { - IWineD3DDeviceImpl *device = This->resource.device; - if((This->resource.usage & WINED3DUSAGE_RENDERTARGET) && - device->blitter->color_fixup_supported(&device->adapter->gl_info, This->resource.format_desc->color_fixup)) + if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) { /* Make sure the texture is up to date. This call doesn't do anything if the texture is already up to date. */ IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL); /* We want to force a palette refresh, so mark the drawable as not being up to date */ IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, FALSE); - - /* Force a palette refresh by re-uploading to the drawable */ - IWineD3DSurface_LoadLocation(iface, SFLAG_INDRAWABLE, NULL); } else { if(!(This->Flags & SFLAG_INSYSMEM)) { TRACE("Palette changed with surface that does not have an up to date system memory copy\n");

1 0

Roderick Colenbrander : wined3d: Move the arbfp p8 fixup to the format table and get rid of the d3dfmt_get_conv override .
by Alexandre Julliard 06 Apr '10

06 Apr '10

Module: wine Branch: master Commit: 1f2976a302336eda5cb0782946d0444cbded8d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f2976a302336eda5cb078294… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 5 20:05:17 2010 +0200 wined3d: Move the arbfp p8 fixup to the format table and get rid of the d3dfmt_get_conv override. --- dlls/wined3d/surface.c | 8 -------- dlls/wined3d/utils.c | 2 +- 2 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a863372..6ced082 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2166,14 +2166,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ *convert = CONVERT_PALETTED; } } - /* TODO: this check is evil and should die (it basically checks which blitter backend is used) */ - else if (!gl_info->supported[EXT_PALETTED_TEXTURE] && device->blitter->color_fixup_supported(gl_info, This->resource.format_desc->color_fixup)) - { - *format = GL_ALPHA; - *type = GL_UNSIGNED_BYTE; - *target_bpp = 1; - } - break; case WINED3DFMT_B2G3R3_UNORM: diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 65f4761..45d4760 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -336,7 +336,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = ARB_TEXTURE_FLOAT}, /* Palettized formats */ {WINED3DFMT_P8_UINT, GL_RGBA, GL_RGBA, 0, - GL_RGBA, GL_UNSIGNED_BYTE, + GL_ALPHA, GL_UNSIGNED_BYTE, 0, ARB_FRAGMENT_PROGRAM}, {WINED3DFMT_P8_UINT, GL_COLOR_INDEX8_EXT, GL_COLOR_INDEX8_EXT, 0,

1 0

Roderick Colenbrander : wined3d: Disable framebuffer to texture blitting.
by Alexandre Julliard 06 Apr '10

06 Apr '10

Module: wine Branch: master Commit: a5a4be4fc54bb4bfb860bdfd98cd241785027797 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5a4be4fc54bb4bfb860bdfd9… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 5 20:05:16 2010 +0200 wined3d: Disable framebuffer to texture blitting. The current code doesn't work for this at all and causes major rendering issues in e.g. C&C. I don't think we should fix this code either since it isn't worth the effort and requires evil things like paletteOverride. --- dlls/wined3d/surface.c | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 95889e4..a863372 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3894,7 +3894,14 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const if((srcSwapchain || SrcSurface == myDevice->render_targets[0]) && !dstSwapchain) { /* Blit from render target to texture */ BOOL stretchx; - BOOL paletteOverride = FALSE; + + /* P8 read back is not implemented */ + if (Src->resource.format_desc->format == WINED3DFMT_P8_UINT || + This->resource.format_desc->format == WINED3DFMT_P8_UINT) + { + TRACE("P8 read back not supported by frame buffer to texture blit\n"); + return WINED3DERR_INVALIDCALL; + } if(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) { TRACE("Color keying not supported by frame buffer to texture blit\n"); @@ -3908,15 +3915,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const stretchx = FALSE; } - /* When blitting from a render target a texture, the texture isn't required to have a palette. - * In this case grab the palette from the render target. */ - if (This->resource.format_desc->format == WINED3DFMT_P8_UINT && !This->palette) - { - paletteOverride = TRUE; - TRACE("Source surface (%p) lacks palette, overriding palette with palette %p of destination surface (%p)\n", Src, This->palette, This); - This->palette = Src->palette; - } - /* Blt is a pretty powerful call, while glCopyTexSubImage2D is not. glCopyTexSubImage cannot * flip the image nor scale it. * @@ -3947,10 +3945,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const fb_copy_to_texture_hwstretch(This, SrcSurface, &src_rect, &dst_rect, Filter); } - /* Clear the palette as the surface didn't have a palette attached, it would confuse GetPalette and other calls */ - if(paletteOverride) - This->palette = NULL; - if(!(This->Flags & SFLAG_DONOTFREE)) { HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); This->resource.allocatedMemory = NULL;

1 0

Roderick Colenbrander : wined3d: Disable paletted texture support. It was only offered on a few cards, so can be missed.
by Alexandre Julliard 06 Apr '10

06 Apr '10

Module: wine Branch: master Commit: 9fec1a02b9e13969f929a3eed249e67773286033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fec1a02b9e13969f929a3eed… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 5 20:05:15 2010 +0200 wined3d: Disable paletted texture support. It was only offered on a few cards, so can be missed. --- dlls/wined3d/directx.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 581d6c7..5501899 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3404,12 +3404,12 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, return FALSE; /***** - * supported: Palettized + * Not supported: Palettized + * Only some Geforce/Voodoo3/G400 cards offer 8-bit textures in case of <=Direct3D7. + * Since it is not widely available, don't offer it. Further no Windows driver offers + * WINED3DFMT_P8_UINT_A8_NORM, so don't offer it either. */ case WINED3DFMT_P8_UINT: - TRACE_(d3d_caps)("[OK]\n"); - return TRUE; - /* No Windows driver offers WINED3DFMT_P8_UINT_A8_UNORM, so don't offer it either */ case WINED3DFMT_P8_UINT_A8_UNORM: return FALSE;

1 0

Roderick Colenbrander : wined3d: Move EXT_PALETTED_TEXTURE code over to ffp_blit.
by Alexandre Julliard 06 Apr '10

06 Apr '10

Module: wine Branch: master Commit: 69902ab6d07f7c3b975a46b21b0b795730cab06d URL: http://source.winehq.org/git/wine.git/?a=commit;h=69902ab6d07f7c3b975a46b21… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 5 20:05:14 2010 +0200 wined3d: Move EXT_PALETTED_TEXTURE code over to ffp_blit. --- dlls/wined3d/surface.c | 62 +++++++++++++++++++++--------------------------- 1 files changed, 27 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 57514e8..95889e4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2857,29 +2857,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI return WINED3D_OK; } -/* This function is used in case of 8bit paletted textures to upload the palette. - It supports GL_EXT_paletted_texture and GL_ARB_fragment_program, support for other - extensions like ATI_fragment_shaders is possible. -*/ -/* Context activation is done by the caller. */ -static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, - const struct wined3d_gl_info *gl_info, CONVERT_TYPES convert) -{ - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - BYTE table[256][4]; - - d3dfmt_p8_init_palette(This, table, (convert == CONVERT_PALETTED_CK)); - - /* Try to use the paletted texture extension */ - if (gl_info->supported[EXT_PALETTED_TEXTURE]) - { - TRACE("Using GL_EXT_PALETTED_TEXTURE for 8-bit paletted texture support\n"); - ENTER_GL(); - GL_EXTCALL(glColorTableEXT(This->texture_target, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, table)); - LEAVE_GL(); - } -} - BOOL palette9_changed(IWineD3DSurfaceImpl *This) { IWineD3DDeviceImpl *device = This->resource.device; @@ -4317,18 +4294,14 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) if((This->resource.usage & WINED3DUSAGE_RENDERTARGET) && device->blitter->color_fixup_supported(&device->adapter->gl_info, This->resource.format_desc->color_fixup)) { - struct wined3d_context *context; - /* Make sure the texture is up to date. This call doesn't do anything if the texture is already up to date. */ IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL); /* We want to force a palette refresh, so mark the drawable as not being up to date */ IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, FALSE); - /* Re-upload the palette */ - context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD); - d3dfmt_p8_upload_palette(iface, context->gl_info, NO_CONVERSION); - context_release(context); + /* Force a palette refresh by re-uploading to the drawable */ + IWineD3DSurface_LoadLocation(iface, SFLAG_INDRAWABLE, NULL); } else { if(!(This->Flags & SFLAG_INSYSMEM)) { TRACE("Palette changed with surface that does not have an up to date system memory copy\n"); @@ -4937,12 +4910,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D return WINED3DERR_OUTOFVIDEOMEMORY; } d3dfmt_convert_surface(This->resource.allocatedMemory, mem, pitch, width, height, outpitch, convert, This); - } - else if (This->resource.format_desc->format == WINED3DFMT_P8_UINT - && (device->blitter->color_fixup_supported(gl_info, This->resource.format_desc->color_fixup))) - { - d3dfmt_p8_upload_palette(iface, gl_info, convert); - mem = This->resource.allocatedMemory; } else { mem = This->resource.allocatedMemory; } @@ -5119,9 +5086,34 @@ static HRESULT ffp_blit_alloc(IWineD3DDevice *iface) { return WINED3D_OK; } /* Context activation is done by the caller. */ static void ffp_blit_free(IWineD3DDevice *iface) { } +/* This function is used in case of 8bit paletted textures using GL_EXT_paletted_texture */ +/* Context activation is done by the caller. */ +static void ffp_blit_p8_upload_palette(IWineD3DSurfaceImpl *surface, const struct wined3d_gl_info *gl_info) +{ + BYTE table[256][4]; + BOOL colorkey_active = (surface->CKeyFlags & WINEDDSD_CKSRCBLT) ? TRUE : FALSE; + + d3dfmt_p8_init_palette(surface, table, colorkey_active); + + TRACE("Using GL_EXT_PALETTED_TEXTURE for 8-bit paletted texture support\n"); + ENTER_GL(); + GL_EXTCALL(glColorTableEXT(surface->texture_target, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, table)); + LEAVE_GL(); +} + /* Context activation is done by the caller. */ static HRESULT ffp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surface) { + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + enum complex_fixup fixup = get_complex_fixup(surface->resource.format_desc->color_fixup); + + /* When EXT_PALETTED_TEXTURE is around, palette conversion is done by the GPU + * else the surface is converted in software at upload time in LoadLocation. + */ + if(fixup == COMPLEX_FIXUP_P8 && gl_info->supported[EXT_PALETTED_TEXTURE]) + ffp_blit_p8_upload_palette(surface, gl_info); + ENTER_GL(); glEnable(surface->texture_target); checkGLcall("glEnable(surface->texture_target)");

1 0

Roderick Colenbrander : wined3d: Move palette uploading code over to arbfp blit_shader.
by Alexandre Julliard 06 Apr '10

06 Apr '10

Module: wine Branch: master Commit: 3b6aea5934ee910e4ab679571b128a92775e1e5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b6aea5934ee910e4ab679571… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 5 20:05:13 2010 +0200 wined3d: Move palette uploading code over to arbfp blit_shader. --- dlls/wined3d/arb_program_shader.c | 49 ++++++++++++++++++++++++++++++++---- dlls/wined3d/surface.c | 45 +++++++-------------------------- dlls/wined3d/swapchain.c | 4 +-- dlls/wined3d/wined3d_private.h | 4 +- 4 files changed, 56 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b6aea5934ee910e4ab67…

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

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

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

← Newer
1
...
73
74
75
76
77
78
79
...
90
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 April 2010