OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=60

wine-1.1.23.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e9dc32d2045e1525f8678b0db07a3927117dd9e4b590afafc1091a465441952c
-size 15413944

wine-1.1.24.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dbe8d15a18151d9cd4c77b5c0c031beec7eb3795e16f02ffabfc12de984c723d
+size 15455581

wine.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Jun 21 22:35:23 CEST 2009 - meissner@suse.de
+
+- Updated to upstream 1.1.24
+  - Support for freedesktop file associations.
+  - Support for exception handling on 64-bit.
+  - Improved ARB shaders.
+  - Fixes for the FBO mode.
+  - Many listview improvements.
+  - Various bug fixes.
+- added hardrequires libgnutls.so.26 for schannel.dll.
+- updated winetricks script
+
 -------------------------------------------------------------------
 Sun Jun  7 09:35:57 CEST 2009 - meissner@suse.de
 

winetricks

@@ -2,14 +2,29 @@
 # Quick and dirty script to download and install various 
 # redistributable runtime libraries
 #
+# Current maintainers: Austin English, Dan Kegel
 # Copyright 2007, 2008, 2009 Google (Dan Kegel, dank@kegel.com)
+# Copyright 2008, 2009 Austin English (austinenglish@gmail.com)
 # Thanks to Detlef Riekenberg for lots of updates
 # Thanks to Saulius Krasuckas for corrections and suggestions
+# Thanks to Erik Inge Bolsø for several patches
 # Please report problems at http://code.google.com/p/winezeug/issues
 # See also http://wiki.winehq.org/winetricks
+#
+# Note to contributors: please avoid gnu extensions in this shell script,
+# as it has to run on MacOSX and Solaris, too.  A good book on the topic is
+# "Portable Shell Programming" by Bruce Blinn
+
+# Prevent running with sudo/root. This would create a .winetrickscache as root 
+# in the user's home directory!
+if ! test -O $HOME
+    then
+        echo "Don't run winetricks with sudo!"
+        exit 1
+fi
 
 # Name of this version of winetricks (YYYYMMDD)
-VERSION=20090227
+VERSION=20090607
 
 # Default values for important settings if not already in environment.
 # These settings should not need editing here.
@@ -37,7 +52,7 @@ esac
 
 case "$1" in
 -V|--version) 
-  echo "Winetricks version $VERSION.  (C) 2007-2009 Dan Kegel, Google.  LGPL."
+  echo "Winetricks version $VERSION.  (C) 2007-2009 Dan Kegel et al.  LGPL."
   exit 0
   ;;
 esac
@@ -79,9 +94,10 @@ usage() {
     echo " comctl32.ocx  MS comctl32.ocx and mscomctl.ocx, comctl32 wrappers for VB6"
     echo " controlpad    MS ActiveX Control Pad"
     echo " corefonts     MS Arial, Courier, Times fonts"
+    echo " d3dx9         MS d3dx9_??.dll (from DirectX 9 user redistributable)"
     echo " dcom98        MS DCOM (ole32, oleaut32); requires Win98 license!"
     echo " dirac0.8      the obsolete Dirac 0.8 directshow filter"
-    echo " directx9      MS DirectX 9 user redistributable"
+    echo " directx9      MS DirectX 9 user redistributable (not recommended! use d3dx9 instead)"
     echo " divx          divx video codec"
     echo " dotnet11      MS .NET 1.1 (requires Windows license)"
     echo " dotnet20      MS .NET 2.0 (requires Windows license)"
@@ -89,8 +105,13 @@ usage() {
     echo " flash         Adobe Flash Player ActiveX and firefox plugins"
     echo " fm20          MS Forms 2.0 Object Library"
     echo " fontfix       Fix bad fonts which cause crash in some apps (e.g. .net)."
+    echo " fontsmooth-disable    Disables font smoothing"
+    echo " fontsmooth-gray       Enables grayscale font smoothing"
+    echo " fontsmooth-rgb        Enables subpixel smoothing for RGB LCDs"
+    echo " fontsmooth-bgr        Enables subpixel smoothing for BGR LCDs"
     echo " gdiplus       MS gdiplus.dll (from powerpoint viewer)"
     echo " gecko         The HTML rendering Engine (Mozilla)"
+    echo " gecko-dbg     The HTML rendering Engine (Mozilla), with debugging symbols"
     echo " hosts         Adds empty C:\windows\system32\drivers\etc\{hosts,services} files"
     echo " icodecs       Intel Codecs (Indeo)"
     echo " jet40         MS Jet 4.0 Service Pack 8"
@@ -118,6 +139,7 @@ usage() {
     echo " riched30      MS riched30"
     echo " tahoma        MS Tahoma font (not part of corefonts)"
     echo " urlmon        MS urlmon.dll"
+    echo " vb2run        MS Visual Basic 2 runtime"
     echo " vb3run        MS Visual Basic 3 runtime"
     echo " vb4run        MS Visual Basic 4 runtime"
     echo " vb5run        MS Visual Basic 5 runtime"
@@ -127,6 +149,7 @@ usage() {
     echo " vcrun2005     MS Visual C++ 2005 libraries (mfc80,msvcp80,msvcr80)"
     echo " vcrun2005sp1  MS Visual C++ 2005 sp1 libraries"
     echo " vcrun2008     MS Visual C++ 2008 libraries (mfc90,msvcp90,msvcr90)"
+    echo " vcrun2008sp1  MS Visual C++ 2008 sp1 libraries"
     echo " vjrun20       MS Visual J# 2.0 libraries (requires dotnet20)"
     echo " wininet       MS wininet.dll (requires Windows license)"
     echo " wme9          MS Windows Media Encoder 9 (requires Windows license)"
@@ -135,6 +158,7 @@ usage() {
     echo " wsh56         MS Windows Scripting Host 5.6"
     echo " wsh56js       MS Windows scripting 5.6, jscript only, no cscript"
     echo " wsh56vb       MS Windows scripting 5.6, vbscript only, no cscript"
+    echo " xact          MS XACT Engine (x3daudio?_?.dll, xactengine?_?.dll)"
     echo " xvid          xvid video codec"
     echo "Apps:"
     echo " autohotkey    Autohotkey (open source gui scripting language)"
@@ -452,6 +476,15 @@ _EOF_
     $WINE regedit "$WINETRICKS_TMP"/register-font.reg
 }
 
+#----- common download for several verbs
+helper_directx_dl() {
+    # Mar 2009 DirectX 9c User Redistributable
+    # http://www.microsoft.com/downloads/details.aspx?FamilyID=0cf368e5-5ce1-4032-a207-c693d210f616&displaylang=en
+    download . http://download.microsoft.com/download/3/C/4/3C46A69A-CB0F-4CCA-B1E8-248D43270D5F/directx_mar2009_redist.exe 29957ee0d29b95019b082a47da5eab52f50cde0d
+
+    DIRECTX_NAME=directx_mar2009_redist.exe
+}
+
 #----- One function per package, in alphabetical order ----------
 
 load_art2kmin() {
@@ -479,7 +512,7 @@ load_cc580() {
     try $WINE "$WINETRICKS_CACHE"/cc32inst.exe "/T:`$WINE winepath -w "$WINETRICKS_TMP"`" /c $WINETRICKS_QUIET
     try $WINE "$WINETRICKS_TMP"/comctl32.exe
     try $WINE "$WINDIR"/temp/x86/50ComUpd.Exe "/T:`$WINE winepath -w "$WINETRICKS_TMP"`" /c $WINETRICKS_QUIET
-    cp "$WINETRICKS_TMP"/comcnt.dll "$WINDIR"/system32/comctl32.dll
+    try cp "$WINETRICKS_TMP"/comcnt.dll "$WINDIR"/system32/comctl32.dll
 
     override_dlls native,builtin comctl32
 }
@@ -491,8 +524,8 @@ load_comctl32ocx() {
     download . http://download.microsoft.com/download/3/a/5/3a5925ac-e779-4b1c-bb01-af67dc2f96fc/VisualBasic6-KB896559-v1-ENU.exe f52cf2034488235b37a1da837d1c40eb2a1bad84
 
     try cabextract -q --directory="$WINETRICKS_TMP" "$WINETRICKS_CACHE"/VisualBasic6-KB896559-v1-ENU.exe
-    cp "$WINETRICKS_TMP"/mscomctl.ocx "$WINDIR"/system32/mscomctl.ocx
+    try cp "$WINETRICKS_TMP"/mscomctl.ocx "$WINDIR"/system32/mscomctl.ocx
-    cp "$WINETRICKS_TMP"/comctl32.ocx "$WINDIR"/system32/comctl32.ocx
+    try cp "$WINETRICKS_TMP"/comctl32.ocx "$WINDIR"/system32/comctl32.ocx
     try $WINE regsvr32 comctl32.ocx
     try $WINE regsvr32 mscomctl.ocx
 }
@@ -503,7 +536,7 @@ load_colorprofile() {
     download . http://download.microsoft.com/download/whistler/hwdev1/1.0/wxp/en-us/ColorProfile.exe 6b72836b32b343c82d0760dff5cb51c2f47170eb
     try unzip -o $WINETRICKS_UNIXQUIET -d "$WINETRICKS_TMP" "$WINETRICKS_CACHE"/ColorProfile.exe
     mkdir -p "$WINDIR"/system32/spool/drivers/color
-    cp -f "$WINETRICKS_TMP/sRGB Color Space Profile.icm" "$WINDIR"/system32/spool/drivers/color
+    try cp -f "$WINETRICKS_TMP/sRGB Color Space Profile.icm" "$WINDIR"/system32/spool/drivers/color
 }
 
 #----------------------------------------------------------------
@@ -511,10 +544,10 @@ load_colorprofile() {
 load_controlpad() {
     # http://msdn.microsoft.com/en-us/library/ms968493.aspx
     # Fixes error "Failed to load UniText..."
+    load_wsh56
     download . http://download.microsoft.com/download/activexcontrolpad/install/4.0.0.950/win98mexp/en-us/setuppad.exe 8921e0f52507ca6a373c94d222777c750fb48af7
     try cabextract --directory="$WINETRICKS_TMP" "$WINETRICKS_CACHE"/setuppad.exe
     echo "If setup says 'Unable to start DDE ...', press Ignore"
-    echo "If setup says 'Requires IE 3.0', run 'winetricks wsh56'"
     try $WINE "$WINETRICKS_TMP"/setup $WINETRICKS_QUIET
 }
 
@@ -614,6 +647,23 @@ load_corefonts() {
 
 #----------------------------------------------------------------
 
+load_d3dx9() {
+    helper_directx_dl
+
+    # Kinder, less invasive directx - only extract and override d3dx9_??.dll
+    cabextract -d "$WINETRICKS_TMP" -L -F '*d3dx9*x86*' "$WINETRICKS_CACHE"/$DIRECTX_NAME
+    for x in `ls "$WINETRICKS_TMP"/*.cab`; do
+      cabextract -d "$WINDIR"/system32 -L -F '*.dll' "$x"
+    done
+
+    # For now, not needed, but when Wine starts preferring our builtin dll over native it will be.
+    override_dlls native d3dx9_24 d3dx9_25 d3dx9_26 d3dx9_27 d3dx9_28 d3dx9_29 d3dx9_30
+    override_dlls native d3dx9_31 d3dx9_32 d3dx9_33 d3dx9_34 d3dx9_35 d3dx9_36 d3dx9_37
+    override_dlls native d3dx9_38 d3dx9_39 d3dx9_40 d3dx9_41
+}
+
+#----------------------------------------------------------------
+
 load_dirac08() {
     download . http://codecpack.nl/dirac_dsfilter_080.exe aacfcddf6b2636de5f0a50422ba9155e395318af
     try $WINE "$WINETRICKS_CACHE"/dirac_dsfilter_080.exe $WINETRICKS_SILENT
@@ -622,9 +672,8 @@ load_dirac08() {
 #----------------------------------------------------------------
 
 load_directx9() {
-    # Aug 2008 DirectX 9c User Redistributable
+    helper_directx_dl
-    # http://www.microsoft.com/downloads/details.aspx?familyid=886ACB56-C91A-4A8E-8BB8-9F20F1244A8E&displaylang=en
+
-    download . http://download.microsoft.com/download/0/d/3/0d307649-9967-49fa-ab27-61f11024e97f/directx_nov2008_redist.exe 0cbe95cacd413208a9f38e31b602015408025019
     # Stefan suggested that, when installing, one should override as follows:
     # 1) use builtin wintrust (we don't run native properly somehow?)
     # 2) disable mscoree (else if it's present some module misbehaves?)
@@ -632,14 +681,17 @@ load_directx9() {
     # For #3, I have no idea which DLLs don't register themselves well yet,
     # so I'm just listing a few of the basic ones.  Let's whittle that
     # list down as soon as we can.  
+    echo "You probably shouldn't be using this. It's VERY invasive."
+    echo "Use 'winetricks d3dx9' instead."
     set_winver win2k
     WINEDLLOVERRIDES="wintrust=b,mscoree=,ddraw,d3d8,d3d9,dsound,dinput=n" \
-       try $WINE "$WINETRICKS_CACHE"/directx_nov2008_redist.exe /t:"$WINETRICKS_TMP_WIN" $WINETRICKS_QUIET
+       try $WINE "$WINETRICKS_CACHE"/$DIRECTX_NAME /t:"$WINETRICKS_TMP_WIN" $WINETRICKS_QUIET
 
     # How many of these do we really need?
     # We should probably remove most of these...?
     override_dlls native d3dim d3drm d3dx8 d3dx9_24 d3dx9_25 d3dx9_26 d3dx9_27 d3dx9_28 d3dx9_29
-    override_dlls native d3dx9_30 d3dx9_31 d3dx9_32 d3dx9_33 d3dx9_34 d3dx9_35 d3dx9_36 d3dxof
+    override_dlls native d3dx9_30 d3dx9_31 d3dx9_32 d3dx9_33 d3dx9_34 d3dx9_35 d3dx9_36 d3dx9_37
+    override_dlls native d3dx9_38 d3dx9_39 d3dx9_40 d3dx9_41 d3dxof
     override_dlls native dciman32 ddrawex devenum dmband dmcompos dmime dmloader dmscript dmstyle 
     override_dlls native dmsynth dmusic dmusic32 dnsapi dplay dplayx dpnaddr dpnet dpnhpast dpnlobby 
     override_dlls native dswave dxdiagn mscoree msdmo qcap quartz streamci
@@ -658,9 +710,12 @@ load_divx() {
     # 6.8.3: f4f4387ef89316aea440a29f3e24c1f1945e14af as of 20 jun 2008 as http://download.divx.com/divx/abt/b1/DivXInstaller.exe
     # 6.8.4: c5fcb1465a1bb24d1c104c2588fdb6706d1e1476 as of 10 Jul 2008 as http://download.divx.com/divx/abt/b1/DivXInstaller.exe
     # 6.8.4: d28a2b041f4af45d22c4dedfe7608f2958cf997d as of 23 Aug 2008 as http://download.divx.com/divx/DivXInstaller.exe
-    download divx-6.8.4-1 http://download.divx.com/divx/DivXInstaller.exe d28a2b041f4af45d22c4dedfe7608f2958cf997d
 
-    try $WINE "$WINETRICKS_CACHE"/divx-6.8.4-1/DivXInstaller $WINETRICKS_SILENT
+    # 7.? 4d91ef90ae26a6088851560c4263ef0cdbf09123 as of 22 Mar 2009 as http://download.divx.com/divx/DivXInstaller.exe
+    # 7.0 19c9ba3104025d1fab335e405e7f411dfbbcb477 as of 28 May 2009 as http://download.divx.com/divx/DivXInstaller.exe
+    download divx-7 http://download.divx.com/divx/DivXInstaller.exe 19c9ba3104025d1fab335e405e7f411dfbbcb477
+
+    try $WINE "$WINETRICKS_CACHE"/divx-7/DivXInstaller $WINETRICKS_SILENT
 }
 
 #----------------------------------------------------------------
@@ -775,12 +830,12 @@ _EOF_
 
 load_firefox3() {
     # Firefox 3
-    download . "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.5/win32/en-US/Firefox%20Setup%203.0.5.exe" a3bc99e32fa07fc5db3d2dfcddbfdc05400ec3a0 "Firefox Setup 3.0.5.exe"
+    download . "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.10/win32/en-US/Firefox%20Setup%203.0.10.exe" ef719c1fc82b7a716a54b5ad03b3b633ddbd6193 "Firefox Setup 3.0.10.exe"
     if [ "$WINETRICKS_QUIET"x = ""x ]
     then
-       try $WINE "$WINETRICKS_CACHE"/"Firefox Setup 3.0.5.exe" 
+       try $WINE "$WINETRICKS_CACHE"/"Firefox Setup 3.0.10.exe" 
     else
-       try $WINE "$WINETRICKS_CACHE"/"Firefox Setup 3.0.5.exe" -ms
+       try $WINE "$WINETRICKS_CACHE"/"Firefox Setup 3.0.10.exe" -ms
     fi
 }
 
@@ -829,7 +884,7 @@ load_fontfix() {
         # FIXME: do all affected versions of the font have same sha1sum as Gutsy?  Seems unlikely.
         if [ "$gotsum"x = "96e1121f89953e5169d3e2e7811569148f573985"x ]
         then
-            download . http://apt.debian.org.tw/pool/t/ttf-arphic-ukai/ttf-arphic-ukai_0.1.20060108.orig.tar.gz 46cc7b67b6117a7e161c1a573502c0bf2b09cbdc  
+            download . https://launchpadlibrarian.net/1499628/ttf-arphic-ukai_0.1.20060108.orig.tar.gz 92e577602d71454a108968e79ab667451f3602a2
             cd "$WINETRICKS_TMP/"
             tar -xzf "$WINETRICKS_CACHE/ttf-arphic-ukai_0.1.20060108.orig.tar.gz"
             try mv ttf-arphic-ukai-0.1.20060108/*.ttf "$winefontsdir"
@@ -842,15 +897,84 @@ load_fontfix() {
         gotsum=`$SHA1SUM < /usr/share/fonts/truetype/arphic/uming.ttf | sed 's/ .*//'`
         if [ "$gotsum"x = "2a4f4a69e343c21c24d044b2cb19fd4f0decc82c"x ]
         then
-            download . http://apt.debian.org.tw/pool/t/ttf-arphic-uming/ttf-arphic-uming_0.1.20060108.orig.tar.gz ec34aeb240fcce09d25fce2fbe5e5b6f358c2f24  
+            download . https://launchpadlibrarian.net/1564410/ttf-arphic-uming_0.1.20060108.orig.tar.gz 1439cdd731906e9e5311f320c2cb33262b24ef91
             cd "$WINETRICKS_TMP/"
             tar -xzf "$WINETRICKS_CACHE/ttf-arphic-uming_0.1.20060108.orig.tar.gz"
             try mv ttf-arphic-uming-0.1.20060108/*.ttf "$winefontsdir"
             cd "$olddir"
         fi
     fi
+
+    # The heterogeneity of SHA-1 checksums and paths for "bad" Samyak-Oriya.ttf
+    # fonts make checking impractical, so we'll substitute in a good version
+    # regardless of the installed version, if any.
+
+    download . http://cvs.fedora.redhat.com/repo/pkgs/samyak-fonts/samyak-fonts-1.2.0.tar.gz/a57339ba2b4279938a2d792ebdf70377/samyak-fonts-1.2.0.tar.gz f06d0eaac201a3ec79418d69d46807a52150f047
+    cd "$WINETRICKS_TMP/"
+    tar -xzf "$WINETRICKS_CACHE/samyak-fonts-1.2.0.tar.gz"
+    try mv samyak-fonts-1.2.0/oriya/Samyak-Oriya.ttf "$winefontsdir"
+    cd "$olddir"
 }
 
+#----------------------------------------------------------------
+load_fs_disable() {
+    cat > "$WINETRICKS_TMP"/fs_disable.reg <<_EOF_
+REGEDIT4
+
+[HKEY_CURRENT_USER\Control Panel\Desktop]
+"FontSmoothing"="0"
+"FontSmoothingGamma"=dword:00000578
+"FontSmoothingOrientation"=dword:00000001
+"FontSmoothingType"=dword:00000000
+
+_EOF_
+    try $WINE regedit "$WINETRICKS_TMP"/fs_disable.reg
+}
+#----------------------------------------------------------------
+load_fs_grayscale() {
+    cat > "$WINETRICKS_TMP"/fs_grayscale.reg <<_EOF_
+
+REGEDIT4
+
+[HKEY_CURRENT_USER\Control Panel\Desktop]
+"FontSmoothing"="2"
+"FontSmoothingGamma"=dword:00000578
+"FontSmoothingOrientation"=dword:00000001
+"FontSmoothingType"=dword:00000001
+
+_EOF_
+    try $WINE regedit "$WINETRICKS_TMP"/fs_grayscale.reg
+}
+#----------------------------------------------------------------
+load_fs_bgr() {
+    cat > "$WINETRICKS_TMP"/fs_bgr.reg <<_EOF_
+
+REGEDIT4
+
+[HKEY_CURRENT_USER\Control Panel\Desktop]
+"FontSmoothing"="2"
+"FontSmoothingGamma"=dword:00000578
+"FontSmoothingOrientation"=dword:00000000
+"FontSmoothingType"=dword:00000002
+
+_EOF_
+    try $WINE regedit "$WINETRICKS_TMP"/fs_bgr.reg
+}
+#----------------------------------------------------------------
+load_fs_rgb() {
+    cat > "$WINETRICKS_TMP"/fs_rgb.reg <<_EOF_
+
+REGEDIT4
+
+[HKEY_CURRENT_USER\Control Panel\Desktop]
+"FontSmoothing"="2"
+"FontSmoothingGamma"=dword:00000578
+"FontSmoothingOrientation"=dword:00000001
+"FontSmoothingType"=dword:00000002
+
+_EOF_
+    try $WINE regedit "$WINETRICKS_TMP"/fs_rgb.reg
+}
 #----------------------------------------------------------------
 
 load_gecko() {
@@ -888,11 +1012,8 @@ REGEDIT4
 _EOF_
 
     #The registry-entry does not support an environment-variable
-    # note: echo's behavior with backslashes and options is nonportable,
+    printf '"GeckoPath"="' >>"$WINETRICKS_TMP"/geckopath.reg
-    # see http://www.opengroup.org/onlinepubs/009695399/utilities/echo.html
+    printf 'c:\\windows\\gecko\\'$GECKO_VERSION'\\wine_gecko\\"' | sed "s/\\\\/\\\\\\\\/g" >>"$WINETRICKS_TMP"/geckopath.reg
-    echo -n '"GeckoPath"="' >>"$WINETRICKS_TMP"/geckopath.reg
-    echo -n 'c:\\windows\\gecko\\'$GECKO_VERSION | sed "s/\\\\/\\\\\\\\/g" >>"$WINETRICKS_TMP"/geckopath.reg
-    echo '\\\\wine_gecko"' >>"$WINETRICKS_TMP"/geckopath.reg
 
     # extract the files
     mkdir -p "$WINDIR"/gecko/$GECKO_VERSION
@@ -906,6 +1027,56 @@ _EOF_
 
 #----------------------------------------------------------------
 
+load_gecko_dbg() {
+    # Load the HTML rendering Engine (Gecko), with debugging symbols
+    # FIXME: shouldn't this code be in some script installed 
+    # as part of Wine instead of in winetricks?
+    # (e.g. we hardcode gecko's url here, but it's normally
+    # only hardcoded in wine.inf, and fetched from the registry thereafter,
+    # so we're adding a maintenance burden here.)
+    case `$WINE --version` in
+    wine-0*|wine-1.0*|wine-1.1|wine-1.1.?|wine-1.1.11)
+        echo "There isn't a gecko debug build for your Wine version."
+        exit 1
+        ;;
+    wine-1.1.1[234]*)
+        GECKO_VERSION=0.9.0 
+        GECKO_SHA1SUM=23e354a82d7b7e61a6abe0384cc44669fbf92f86
+        ;;
+    *)
+        GECKO_VERSION=0.9.1
+        GECKO_SHA1SUM=a9b58d3330f8c78524fe4683f348302bfce96ff4
+        ;;
+    esac
+
+    if test ! -f "$WINETRICKS_CACHE"/wine_gecko-$GECKO_VERSION-dbg.cab
+    then
+       # FIXME: busted if using curl!
+       download . "http://downloads.sourceforge.net/wine/wine_gecko-$GECKO_VERSION-dbg.cab" $GECKO_SHA1SUM wine_gecko-$GECKO_VERSION-dbg.cab
+    fi
+
+    cat > "$WINETRICKS_TMP"/geckopath.reg <<_EOF_
+REGEDIT4
+
+[HKEY_CURRENT_USER\\Software\\Wine\\MSHTML\\$GECKO_VERSION]
+_EOF_
+
+    #The registry-entry does not support an environment-variable
+    printf '"GeckoPath"="' >>"$WINETRICKS_TMP"/geckopath.reg
+    printf 'c:\\windows\\gecko\\'$GECKO_VERSION'\\wine_gecko\\"' | sed "s/\\\\/\\\\\\\\/g" >>"$WINETRICKS_TMP"/geckopath.reg
+
+    # extract the files
+    mkdir -p "$WINDIR"/gecko/$GECKO_VERSION
+    cd "$WINDIR"/gecko/$GECKO_VERSION
+    try cabextract $WINETRICKS_UNIXQUIET "$WINETRICKS_CACHE"/wine_gecko-$GECKO_VERSION-dbg.cab
+    cd "$olddir"
+
+    # set install-path
+    try $WINE regedit "$WINETRICKS_TMP"/geckopath.reg
+}
+
+#----------------------------------------------------------------
+
 load_gdiplus() {
     # gdiplus is documented here as a redistributable:
     # http://msdn.microsoft.com/library/en-us/gdicpp/GDIPlus/GDIPlus.asp
@@ -945,6 +1116,7 @@ load_icodecs() {
     try $WINE regsvr32 ir50_32.dll
 }
 
+#----------------------------------------------------------------
 load_ie6() {
     load_msls31
 
@@ -955,15 +1127,15 @@ load_ie6() {
     override_dlls native,builtin iexplore.exe itircl itss jscript mlang mshtml msimtf shdoclc shdocvw shlwapi urlmon
 
     # Remove the fake dlls from the existing WINEPREFIX 
-    mv "$WINEPREFIX"/drive_c/"$programfilesdir_unix"/"Internet Explorer"/iexplore.exe "$WINEPREFIX"/drive_c/"$programfilesdir_unix"/"Internet Explorer"/iexplore.exe.bak
+    mv "$programfilesdir_unix"/"Internet Explorer"/iexplore.exe "$programfilesdir_unix"/"Internet Explorer"/iexplore.exe.bak
     for dll in itircl itss jscript mlang mshtml msimtf shdoclc shdocvw shlwapi urlmon
     do
         test -f "$WINDIR"/system32/$dll.dll && 
           mv "$WINDIR"/system32/$dll.dll "$WINDIR"/system32/$dll.dll.bak
     done
 
-    # fixes rendering issues in IE
+    # The installer doesn't want to install iexplore.exe in XP mode.
-    #set_winver win2k
+    set_winver win2k
 
     # Workaround a IE6 Installer bug, not Wine's fault
     # See http://bugs.winehq.org/show_bug.cgi?id=5409
@@ -973,7 +1145,7 @@ load_ie6() {
 
     # Install
     download . http://download.microsoft.com/download/ie6sp1/finrel/6_sp1/W98NT42KMeXP/EN-US/ie6setup.exe f3ab61a785eb9611fa583612e83f3b69377f2cef
-    $WINE "$WINETRICKS_CACHE"/ie6setup.exe
+    try $WINE "$WINETRICKS_CACHE"/ie6setup.exe
 
     # Work around DLL registration bug until ierunonce/RunOnce/wineboot is fixed
     # FIXME: whittle down this list 
@@ -992,6 +1164,9 @@ load_ie6() {
         $WINE regsvr32 /i $i > /dev/null 2>&1
     done
 
+    # Set windows version back to user's default. Leave at win2k for better rendering (is there a bug for that?)
+    unset_winver
+
     # try $WINE "$programfilesdir_unix"/"Internet Explorer"/IEXPLORE.EXE http://www.winehq.org
 }
 
@@ -1007,11 +1182,12 @@ load_jet40() {
 #----------------------------------------------------------------
 
 load_kde() {
-    download . http://winkde.org/pub/kde/ports/win32/installer/kdewin-installer-gui-0.9.3-1.exe 618f1c4987aa0725640ff331b14ff9a0d3e84f3a
+    download . http://www.winkde.org/pub/kde/ports/win32/installer/kdewin-installer-gui-0.9.5-0.exe c2a95102312ca859fce5190307748da51fae644e
     mkdir -p "$programfilesdir_unix/kde"
-    cp "$WINETRICKS_CACHE"/kdewin-installer-gui-0.9.3-1.exe "$programfilesdir_unix/kde"
+    try cp "$WINETRICKS_CACHE"/kdewin-installer-gui-0.9.5-0.exe "$programfilesdir_unix/kde"
     cd "$programfilesdir_unix/kde"
-    try $WINE "$programfilesdir_win\\kde\\kdewin-installer-gui-0.9.3-1.exe"
+    # This reports an errorlevel of 1, even for success. See https://bugs.kde.org/show_bug.cgi?id=194796
+    $WINE "$programfilesdir_win\\kde\\kdewin-installer-gui-0.9.5-0.exe" || true
     cd "$olddir"
 }
 
@@ -1019,8 +1195,19 @@ load_kde() {
 
 load_liberation() {
     # http://www.redhat.com/promo/fonts/
+    if [ `uname -s` = 'SunOS' ] || [ `uname -s` = 'Solaris' ]; then
+    echo "If you get 'ERROR: Certificate verification error for fedorahosted.org: unable to get local issuer certificate':"
+    echo "Then you need to add Verisign root certificates to your local keystore."
+    echo "OpenSolaris users, see: http://www.linuxtopia.org/online_books/opensolaris_2008/SYSADV1/html/swmgrpatchtasks-14.html"
+    echo "Or edit winetricks' download function, and add '--no-check-certificate' to the command."
+    fi
+    
     download . https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-1.04.tar.gz 097882c92e3260742a3dc3bf033792120d8635a3
-    tar --strip 1 --wildcards -C "$winefontsdir" -xvzf "$WINETRICKS_CACHE"/liberation-fonts-1.04.tar.gz '*.ttf'
+    cd "$WINETRICKS_TMP"
+    tar -xzvf "$WINETRICKS_CACHE"/liberation-fonts-1.04.tar.gz
+    mv liberation-fonts-1.04/*.ttf "$winefontsdir"
+    rm -rf "$WINETRICKS_TMP"/*
+    cd "$olddir"
 }
 
 #----------------------------------------------------------------
@@ -1155,10 +1342,10 @@ load_mshflxgd() {
     # http://msdn.microsoft.com/en-us/library/aa240864(VS.60).aspx
     # orig: 5f9c7a81022949bfe39b50f2bbd799c448bb7377
     # Jan 2009: 7ad74e589d5eefcee67fa14e65417281d237a6b6
-    download .  http://activex.microsoft.com/controls/vb6/MSHFLXGD.CAB 7ad74e589d5eefcee67fa14e65417281d237a6b6
+    # May 2009: bd8aa796e16e5f213414af78931e0379d9cbe292
+    download .  http://activex.microsoft.com/controls/vb6/MSHFLXGD.CAB bd8aa796e16e5f213414af78931e0379d9cbe292
     try cabextract --directory="$WINETRICKS_TMP" "$WINETRICKS_CACHE"/MSHFLXGD.CAB
-    #try cp -f "$WINETRICKS_TMP"/MSHFLXGD.OCX "$WINDIR"/system32
+    try cp -f "$WINETRICKS_TMP"/[Mm][Ss][Hh][Ff][Ll][Xx][Gg][Dd].[Oo][Cc][Xx] "$WINDIR"/system32
-    try cp -f "$WINETRICKS_TMP"/mshflxgd.ocx "$WINDIR"/system32
 }
 
 #----------------------------------------------------------------
@@ -1175,9 +1362,11 @@ load_msls31() {
 load_msmask() {
     # http://msdn.microsoft.com/en-us/library/11405hcf(VS.71).aspx
     # http://bugs.winehq.org/show_bug.cgi?id=2934
-    download .  http://activex.microsoft.com/controls/vb6/MSMASK32.CAB bdd2bb3a32d18926a048f302aff18b1e6d250d9d
+    # old: 3c6b26f68053364ea2e09414b615dbebafb9d5c3
+    # May 2009: 30e55679e4a13fe4d9620404476f215f93239292 
+    download .  http://activex.microsoft.com/controls/vb6/MSMASK32.CAB 30e55679e4a13fe4d9620404476f215f93239292 
     try cabextract --directory="$WINETRICKS_TMP" "$WINETRICKS_CACHE"/MSMASK32.CAB
-    try cp -f "$WINETRICKS_TMP"/MSMASK32.OCX "$WINDIR"/system32
+    try cp -f "$WINETRICKS_TMP"/[Mm][Ss][Mm][Aa][Ss][Kk]32.[Oo][Cc][Xx] "$WINDIR"/system32/msmask32.ocx
     try $WINE regsvr32 msmask32.ocx
 }
 
@@ -1246,7 +1435,8 @@ load_ogg() {
     # http://www.diracvideo.org/git?p=direct-schro.git;a=summary
     # Requires wine-1.1.1
     download . http://cross-lfs.org/~mlankhorst/direct-schro.dll
-    cp "$WINETRICKS_CACHE"/direct-schro.dll "$WINDIR"/system32/direct-schro.dll
+    try cp "$WINETRICKS_CACHE"/direct-schro.dll "$WINDIR"/system32/direct-schro.dll
+    # This is currently broken. Maarten's not sure why.
     try $WINE regsvr32 direct-schro.dll
 }
 
@@ -1258,10 +1448,12 @@ load_ole2() {
     try unzip -o $WINETRICKS_UNIXQUIET -d "$WINETRICKS_TMP" "$WINETRICKS_CACHE"/ww1116.exe
     set_winver win31
     cd "$WINETRICKS_TMP"
-    try $WINE setup.exe $WINETRICKS_QUIET
+    try $WINE setup.exe
     cd "$olddir"
     unset_winver 
-    # TODO: Need to set native overrides for some dlls, like ole2disp?
+
+    override_dlls native,builtin COMPOBJ.DLL OLE2CONV.DLL OLE2DISP.DLL OLE2.DLL 
+    override_dlls native,builtin OLE2NLS.DLL OLE2PROX.DLL STORAGE.DLL TYPELIB.DLL
 }
 
 #----------------------------------------------------------------
@@ -1383,6 +1575,17 @@ load_urlmon() {
 
 #----------------------------------------------------------------
 
+load_vb2run() {
+    # Not referenced on MS web anymore. But the old Microsoft Software Library FTP still has it.
+    # See ftp://ftp.microsoft.com/Softlib/index.txt
+    download . ftp://ftp.microsoft.com/Softlib/MSLFILES/VBRUN200.EXE ac0568b73ee375408778e9b505df995f79ab907e
+    try unzip -o $WINETRICKS_UNIXQUIET -d "$WINETRICKS_TMP" "$WINETRICKS_CACHE"/VBRUN200.EXE
+    try cp -f "$WINETRICKS_TMP/VBRUN200.DLL" "$WINDIR"/system32/
+
+}
+
+#----------------------------------------------------------------
+
 load_vb3run() {
     # See http://support.microsoft.com/kb/196285
     download . http://download.microsoft.com/download/vb30/utility/1/w9xnt4/en-us/vb3run.exe 518fcfefde9bf680695cadd06512efadc5ac2aa7
@@ -1453,6 +1656,9 @@ load_vcrun6() {
     try cabextract "$WINETRICKS_CACHE"/vcredist.exe
     mv mfc42u.dll "$WINDIR"/system32/
     cd "$olddir"
+
+    override_dlls native,builtin msvcrt
+
 }
 
 #----------------------------------------------------------------
@@ -1463,7 +1669,7 @@ load_vcrun2003() {
     echo "Installing BZFlag (which comes with the Visual C++ 2003 runtimes)"
     download . $SOURCEFORGE/bzflag/BZEditW32_1.6.5_Installer.exe bdd1b32c4202fd77e6513fd507c8236888b09121
     try $WINE "$WINETRICKS_CACHE"/BZEditW32_1.6.5_Installer.exe $WINETRICKS_S
-    cp "$programfilesdir_unix/BZEdit1.6.5"/m*71* "$WINDIR"/system32/
+    try cp "$programfilesdir_unix/BZEdit1.6.5"/m*71* "$WINDIR"/system32/
 }
 
 #----------------------------------------------------------------
@@ -1487,7 +1693,9 @@ load_vcrun2005sp1() {
 #----------------------------------------------------------------
 
 load_vcrun2008() {
-    # Otherwise it complains...
+    # Work around bug 5351 (http://bugs.winehq.org/show_bug.cgi?id=5351). In recent
+    # wine (>= 1.1.7) the bug is fixed. The workaround doesn't hurt anything, and lets
+    # installer work on older Wine (e.g., the stabe 1.0.1).
     volnum
 
     # Load the Visual C++ 2008 runtime libraries
@@ -1498,7 +1706,20 @@ load_vcrun2008() {
 
 #----------------------------------------------------------------
 
+load_vcrun2008sp1() {
+    # This should be fixed in recent Wine, but for those using 1.0.1, fails.
+    volnum
+
+    # Load the Visual C++ 2008 SP1 runtime libraries
+    # See http://www.microsoft.com/downloads/details.aspx?FamilyID=a5c84275-3b97-4ab7-a40d-3802b2af5fc2
+    download vcrun2008sp1 http://download.microsoft.com/download/d/d/9/dd9a82d0-52ef-40db-8dab-795376989c03/vcredist_x86.exe 6939100e397cef26ec22e95e53fcd9fc979b7bc9
+    try $WINE "$WINETRICKS_CACHE"/vcrun2008sp1/vcredist_x86.exe $WINETRICKS_QUIET
+}
+
+#----------------------------------------------------------------
+
 load_vjrun20() {
+    load_dotnet20
     download vjrun20 http://download.microsoft.com/download/9/2/3/92338cd0-759f-4815-8981-24b437be74ef/vjredist.exe 80a098e36b90d159da915aebfbfbacf35f302bd8
     try $WINE "$WINETRICKS_CACHE"/vjrun20/vjredist.exe $WINETRICKS_QUIET
 }
@@ -1506,8 +1727,7 @@ load_vjrun20() {
 #----------------------------------------------------------------
 
 load_vlc() {
-    # want http://www.videolan.org/mirror.php?file=vlc/0.8.6f/win32/vlc-0.8.6f-win32.exe but it doesn't redirect?
+    download . http://www.videolan.org/mirror-geo-redirect.php?file=vlc/0.8.6f/win32/vlc-0.8.6f-win32.exe b83558e4232c47a385dbc93ebdc2e6b942fbcfbf
-    download . http://mirrors.optralan.com/videolan/vlc/0.8.6f/win32/vlc-0.8.6f-win32.exe b83558e4232c47a385dbc93ebdc2e6b942fbcfbf
     try $WINE "$WINETRICKS_CACHE"/vlc-0.8.6f-win32.exe $WINETRICKS_S
 }
 
@@ -1552,6 +1772,10 @@ load_wmp9() {
     download . http://download.microsoft.com/download/5/c/2/5c29d825-61eb-4b16-8eb8-58367d0464d5/WM9Codecs9x.exe 8b76bdcbea0057eb12b7966edab4b942ddacc253
     try $WINE "$WINETRICKS_CACHE"/WM9Codecs9x.exe $WINETRICKS_QUIET
 
+    # Disable WMP's services, since they depend on unimplemented stuff, they trigger the GUI debugger several times
+    try $WINE regedit /D "HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\Cdr4_2K"
+    try $WINE regedit /D "HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\Cdralw2k"
+
     unset_winver
 }
 
@@ -1572,6 +1796,11 @@ load_wmp10() {
     download . http://download.microsoft.com/download/5/c/2/5c29d825-61eb-4b16-8eb8-58367d0464d5/WM9Codecs9x.exe 8b76bdcbea0057eb12b7966edab4b942ddacc253
     set_winver win2k
     try $WINE "$WINETRICKS_CACHE"/WM9Codecs9x.exe $WINETRICKS_QUIET
+
+    # Disable WMP's services, since they depend on unimplemented stuff, they trigger the GUI debugger several times
+    try $WINE regedit /D "HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\Cdr4_2K"
+    try $WINE regedit /D "HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\Cdralw2k"
+
     unset_winver
 }
 
@@ -1607,6 +1836,24 @@ load_wsh56vb() {
 
 #----------------------------------------------------------------
 
+load_xact() {
+    helper_directx_dl ;
+
+    # xactengine?_?.dll and X3DAudio?_?.dll - extract
+    cabextract -d "$WINETRICKS_TMP" -L -F '*_xact_*x86*' "$WINETRICKS_CACHE"/$DIRECTX_NAME
+    cabextract -d "$WINETRICKS_TMP" -L -F '*_x3daudio_*x86*' "$WINETRICKS_CACHE"/$DIRECTX_NAME
+    for x in `ls "$WINETRICKS_TMP"/*.cab`; do
+      cabextract -d "$WINDIR"/system32 -L -F '*.dll' "$x"
+    done
+
+    # xactengine?_?.dll - register
+    for x in `ls "$WINDIR"/system32/xactengine*`; do
+      try $WINE regsvr32 `basename $x`
+    done
+}
+
+#----------------------------------------------------------------
+
 load_xvid() {
     # xvid
     test -f "$WINDIR"/system32/[Mm][Ff][Cc]42.[Dd][Ll][Ll] || load_vcrun6
@@ -1616,6 +1863,11 @@ load_xvid() {
 
 #----------------------------------------------------------------
 
+print_version() {
+    echo "$VERSION"
+}
+
+#----------------------------------------------------------------
 
 while test "$1" != ""
 do
@@ -1630,24 +1882,30 @@ do
         ;;
     -v) set -x;;
     art2kmin) load_art2kmin;;
-    autohotkey) load_autohotkey;;
+    ahk|autohotkey) load_autohotkey;;
     cc580|comctl32) load_cc580;;
     comctl32.ocx) load_comctl32ocx;;
     colorprofile) load_colorprofile;;
     corefonts) load_corefonts;;
     controlpad|fm20) load_controlpad;;
+    d3dx9) load_d3dx9;;
     dcom98) load_dcom98;;
     dirac|dirac0.8) load_dirac08;;
     directx9) load_directx9;;
     divx) load_divx;;
-    dotnet11) load_dotnet11; load_fontfix;;
+    dotnet1|dotnet11) load_dotnet11; load_fontfix;;
-    dotnet20) load_dotnet20; load_fontfix;;
+    dotnet2|dotnet20) load_dotnet20; load_fontfix;;
     firefox|firefox3) load_firefox3;;
     ffdshow) load_ffdshow;;
     flash) load_flash;;
     fontfix) load_fontfix;;
+    fontsmooth-disable|fs-disable) load_fs_disable;;
+    fontsmooth-gray|fontsmooth-grayscale|fontsmooth-enable|fs-enable) load_fs_grayscale;;
+    fontsmooth-rgb|fs-rgb|fs-cleartype) load_fs_rgb;;
+    fontsmooth-bgr|fs-bgr) load_fs_bgr;;
     gdiplus) load_gdiplus;;
     gecko) load_gecko;;
+    gecko-dbg|geckodbg|gecko_dbg|geckodebug|gecko_debug|gecko-debug) load_gecko_dbg;;
     hosts) load_hosts;;
     icodecs) load_icodecs;;
     ie6) load_ie6;;
@@ -1677,15 +1935,17 @@ do
     riched30) load_riched30;;
     tahoma) load_tahoma;;
     urlmon) load_urlmon;;
-    vb3run) load_vb3run;;
+    vbrun200|vb2run) load_vb2run;;
-    vb4run) load_vb4run;;
+    vbrun300|vb3run) load_vb3run;;
-    vbvm50|vb5run) load_vbvm50;;
+    vbrun400|vb4run) load_vb4run;;
-    vbrun60|vb6run) load_vbrun60;;
+    vbrun500|vbvm50|vb5run) load_vbvm50;;
-    vcrun6|mfc42) load_vcrun6;;
+    vbrun600|vbrun60|vb6run) load_vbrun60;;
+    vcrun600|vcrun6|mfc42) load_vcrun6;;
     vcrun2003) load_vcrun2003;;
     vcrun2005) load_vcrun2005;;
     vcrun2005sp1) load_vcrun2005sp1;;
     vcrun2008) load_vcrun2008;;
+    vcrun2008sp1) load_vcrun2008sp1;;
     vjrun20) load_vjrun20;;
     vlc) load_vlc;;
     wininet) load_wininet;;
@@ -1695,6 +1955,7 @@ do
     wsh56) load_vcrun6; load_wsh56;;
     wsh56js) load_wsh56js;;
     wsh56vb) load_wsh56vb;;
+    xact|xactengine|x3daudio) load_xact;;
     xvid) load_xvid;;
 
     fakeie6) set_fakeie6;;
@@ -1708,6 +1969,7 @@ do
     winver=) unset_winver;;
     native_mdac) set_native_mdac;;
     native_oleaut32) override_dlls native,builtin oleaut32;;
+    version) print_version;;
     volnum) volnum;;
     *) echo Unknown arg $1; usage ; exit 1;;
     esac