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

Hans Leidekker : msi: Make msi_get_property_int and friends take a pointer to a database instead of a package .
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 186f4efa3f6fedb199984f310145a78d276a7882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=186f4efa3f6fedb199984f310… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 11:37:54 2010 +0200 msi: Make msi_get_property_int and friends take a pointer to a database instead of a package. They only operate on a database and this way we can use them before a package is created. --- dlls/msi/action.c | 82 ++++++++++++++++++++++++++-------------------------- dlls/msi/cond.y | 2 +- dlls/msi/custom.c | 16 +++++----- dlls/msi/dialog.c | 28 +++++++++--------- dlls/msi/events.c | 6 ++-- dlls/msi/files.c | 8 ++-- dlls/msi/format.c | 2 +- dlls/msi/helpers.c | 12 ++++---- dlls/msi/install.c | 4 +- dlls/msi/media.c | 10 +++--- dlls/msi/msipriv.h | 7 ++-- dlls/msi/package.c | 30 +++++++++--------- dlls/msi/upgrade.c | 4 +- 13 files changed, 105 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=186f4efa3f6fedb199984…

1 0

Joel Holdsworth : tools: Fixed buildicon to use the path of rsvg provided in the environment variable .
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 258a2128b9715ec699b0946265feb78bda24f322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=258a2128b9715ec699b094626… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 20 23:50:52 2010 +0100 tools: Fixed buildicon to use the path of rsvg provided in the environment variable. --- tools/buildicon | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/buildicon b/tools/buildicon index 4c6a088..ec2ec69 100755 --- a/tools/buildicon +++ b/tools/buildicon @@ -123,7 +123,7 @@ sub fallback_render } # Render the SVG image -shell 'rsvg', $svgFileName, $renderedSVGFileName; +shell $rsvg, $svgFileName, $renderedSVGFileName; # Render the images in the SVG my $parser = new XML::Parser(

1 0

Joel Holdsworth : tools: Fixed buildicon to support rectangular icons.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 310561acbbb6b1fd5b746f90f934482413fa595f URL: http://source.winehq.org/git/wine.git/?a=commit;h=310561acbbb6b1fd5b746f90f… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 20 23:50:58 2010 +0100 tools: Fixed buildicon to support rectangular icons. --- tools/buildicon | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/buildicon b/tools/buildicon index f5d32c0..eae13dc 100755 --- a/tools/buildicon +++ b/tools/buildicon @@ -79,10 +79,12 @@ sub svg_element_start # Extract SVG vector images my $x = $attr{'x'}; my $y = $attr{'y'}; + my $width = $attr{'width'}; + my $height = $attr{'height'}; if(defined($x) and defined($x)) { if($x =~ /\d*/ and $y =~ /\d*/) { - shell $convert, $renderedSVGFileName, "-crop", "${size}x${size}+$x+$y", $pngFileName; + shell $convert, $renderedSVGFileName, "-crop", "${width}x${height}+$x+$y", $pngFileName; } }

1 0

Joel Holdsworth : taskmgr: Show a 48x48 icon in the about box.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: b8f2302776d23c396202395f31cf4b3850d34be3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f2302776d23c396202395f3… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 20 23:50:48 2010 +0100 taskmgr: Show a 48x48 icon in the about box. --- programs/taskmgr/about.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/taskmgr/about.c b/programs/taskmgr/about.c index 68d64ca..c165f25 100644 --- a/programs/taskmgr/about.c +++ b/programs/taskmgr/about.c @@ -40,5 +40,5 @@ void OnAbout(void) '<','b','r','i','a','n','p','@','r','e','a','c','t','o','s','.','o','r','g','>',0}; LoadStringW( hInst, IDC_TASKMGR, appname, sizeof(appname)/sizeof(WCHAR) ); ShellAboutW( hMainWnd, appname, copy, - LoadImageA( hInst, (LPSTR)IDI_TASKMANAGER, IMAGE_ICON, 32, 32, LR_SHARED )); + LoadImageA( hInst, (LPSTR)IDI_TASKMANAGER, IMAGE_ICON, 48, 48, LR_SHARED )); }

1 0

Joel Holdsworth : comdlg32: Replaced collate icons with Tango compliant icons.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 6d467bb4346767bf72c84b02d9eb25b81378fe08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d467bb4346767bf72c84b02d… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 20 23:51:02 2010 +0100 comdlg32: Replaced collate icons with Tango compliant icons. --- dlls/comdlg32/Makefile.in | 4 + dlls/comdlg32/pd32_collate.ico | Bin 1374 -> 12206 bytes dlls/comdlg32/pd32_collate.svg | 676 +++++++++++++++ dlls/comdlg32/pd32_nocollate.ico | Bin 1374 -> 12206 bytes dlls/comdlg32/pd32_nocollate.svg | 1689 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 2369 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d467bb4346767bf72c84…

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLEventObj IDispatch functions.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: ec3220339120cfcdd58855790fc6cd7f21e05916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec3220339120cfcdd58855790… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 21 14:56:41 2010 +1000 mshtml: Implement IHTMLEventObj IDispatch functions. --- dlls/mshtml/htmlevent.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index eef006c..30eea28 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -283,16 +283,14 @@ static ULONG WINAPI HTMLEventObj_Release(IHTMLEventObj *iface) static HRESULT WINAPI HTMLEventObj_GetTypeInfoCount(IHTMLEventObj *iface, UINT *pctinfo) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->dispex), pctinfo); } static HRESULT WINAPI HTMLEventObj_GetTypeInfo(IHTMLEventObj *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLEventObj_GetIDsOfNames(IHTMLEventObj *iface, REFIID riid, @@ -300,9 +298,7 @@ static HRESULT WINAPI HTMLEventObj_GetIDsOfNames(IHTMLEventObj *iface, REFIID ri LCID lcid, DISPID *rgDispId) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLEventObj_Invoke(IHTMLEventObj *iface, DISPID dispIdMember, @@ -310,9 +306,8 @@ static HRESULT WINAPI HTMLEventObj_Invoke(IHTMLEventObj *iface, DISPID dispIdMem VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLEventObj_get_srcElement(IHTMLEventObj *iface, IHTMLElement **p)

1 0

Joel Holdsworth : tools: Remove fallback render rule.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 60fad33ae9e7eaff4fb3733ff640a5706ada0c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60fad33ae9e7eaff4fb3733ff… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 20 23:50:55 2010 +0100 tools: Remove fallback render rule. --- tools/buildicon | 21 ++------------------- 1 files changed, 2 insertions(+), 19 deletions(-) diff --git a/tools/buildicon b/tools/buildicon index ec2ec69..f5d32c0 100755 --- a/tools/buildicon +++ b/tools/buildicon @@ -106,22 +106,6 @@ sub svg_element_start push(@pngFiles, $pngFileName); } -sub resize_image -{ - # Use ImageMagick to stretch the image - my($size) = @_; - my $pngFileName = "$icoName-$size.png"; - shell $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 shell $rsvg, $svgFileName, $renderedSVGFileName; @@ -130,9 +114,8 @@ 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); +# Die if no render directives were found +die "No render directives found in icon" unless(@pngFiles); # Combine them into an ICO file shell $icotool, "-c", "-o", $icoFileName, @pngFiles;

1 0

Joel Holdsworth : winecfg: Installed a Tango compliant application icon.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: c166cb3840b13921a5a122a750b9ac7a1306e14b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c166cb3840b13921a5a122a75… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 20 23:50:45 2010 +0100 winecfg: Installed a Tango compliant application icon. --- programs/winecfg/Makefile.in | 3 + programs/winecfg/main.c | 6 +- programs/winecfg/resource.h | 1 + programs/winecfg/winecfg.ico | Bin 0 -> 25214 bytes programs/winecfg/winecfg.rc | 3 + programs/winecfg/winecfg.svg | 302 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 314 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c166cb3840b13921a5a12…

1 0

Nikolay Sivov : comctl32/listview: Properly handle subitem hittesting outside of horizontal columns bounds.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 7d846eb19fc9d2cba4ce2d5a1c5b135bba9f9c21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d846eb19fc9d2cba4ce2d5a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 21 01:54:43 2010 +0400 comctl32/listview: Properly handle subitem hittesting outside of horizontal columns bounds. --- dlls/comctl32/listview.c | 8 +++ dlls/comctl32/tests/listview.c | 105 ++++++++++++++++++++++------------------ 2 files changed, 66 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d846eb19fc9d2cba4ce2…

1 0

Jaime Rave : wineboot: Update Spanish translation.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: c2ebd0d5f82d1e9c89087d3d705b7af91f759a08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ebd0d5f82d1e9c89087d3d7… Author: Jaime Rave <jaimerave(a)ubuntu-co.com> Date: Tue Apr 20 18:38:01 2010 -0500 wineboot: Update Spanish translation. --- programs/wineboot/wineboot_Es.rc | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot_Es.rc b/programs/wineboot/wineboot_Es.rc index 359cdd2..9c3ad0e 100644 --- a/programs/wineboot/wineboot_Es.rc +++ b/programs/wineboot/wineboot_Es.rc @@ -2,6 +2,7 @@ * WineBoot resources * * Copyright 2007 Luis Carlos Busquets Pérez + * Copyright 2010 Jaime Rave * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,3 +38,13 @@ BEGIN LTEXT "Si termina el programa puede perder los datos no grabados.", IDC_STATIC,7,28,172,15 END + +IDD_WAITDLG DIALOG 0, 0, 200, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_DISABLED +CAPTION "Wine" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WAITICON, 3, 3, 10, 10 + LTEXT "La configuración de Wine en %s está siendo actualizada, por favor espere...", + IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX +END

1 0