diff --git a/wine-1.1.13.tar.bz2 b/wine-1.1.13.tar.bz2
deleted file mode 100644
index 150c1de..0000000
--- a/wine-1.1.13.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:18aae8ff625070348071ace9fc89571272fc2e33e3a47e9cce8eb577bde2eabd
-size 14850151
diff --git a/wine-1.1.14.tar.bz2 b/wine-1.1.14.tar.bz2
new file mode 100644
index 0000000..3b040c6
--- /dev/null
+++ b/wine-1.1.14.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b915466a874b5c214e98745e7c5806fbb5cdb7ec414561a2243df7d1152d186
+size 15021276
diff --git a/wine.changes b/wine.changes
index 91ea22f..f7eb3e9 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Feb  3 17:50:35 CET 2009 - meissner@suse.de
+
+- Updated to upstream 1.1.14
+  - Various bug fixes for Internet Explorer 7.
+  - Many crypt32 improvements, including new export wizard.
+  - Better support for windowless Richedit.
+  - Improvements to the print dialog.
+  - Many fixes to the regression tests on Windows.
+  - Various bug fixes.
+- Updated winetricks
+
 -------------------------------------------------------------------
 Sun Jan 18 23:13:18 CET 2009 - meissner@suse.de
 
diff --git a/wine.spec b/wine.spec
index 47a3e43..e98a242 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package wine (Version 1.1.13)
+# spec file for package wine (Version 1.1.14)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -23,7 +23,7 @@ BuildRequires:  alsa-devel bison capi4linux-devel cups-devel desktop-file-utils
 License:        LGPL v2.1 or later
 Group:          System/Emulators/PC
 AutoReqProv:    on
-Version:        1.1.13
+Version:        1.1.14
 Release:        1
 Summary:        An MS Windows Emulator
 Url:            http://www.winehq.com
@@ -125,6 +125,15 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/aclocal/wine.m4
 
 %changelog
+* Tue Feb 03 2009 meissner@suse.de
+- Updated to upstream 1.1.14
+  - Various bug fixes for Internet Explorer 7.
+  - Many crypt32 improvements, including new export wizard.
+  - Better support for windowless Richedit.
+  - Improvements to the print dialog.
+  - Many fixes to the regression tests on Windows.
+  - Various bug fixes.
+- Updated winetricks
 * Sun Jan 18 2009 meissner@suse.de
 - Updated to upstream 1.1.13
   - Freedesktop.org-compliant startup notifications.
diff --git a/winetricks b/winetricks
index 6ff210a..8765cd0 100644
--- a/winetricks
+++ b/winetricks
@@ -19,6 +19,8 @@ WINETRICKS_TMP="$WINEPREFIX"/drive_c/winetrickstmp
 mkdir -p "$WINETRICKS_TMP"
 WINETRICKS_TMP_WIN='c:\winetrickstmp'
 
+WINDIR="$WINEPREFIX/drive_c/windows"
+
 # Which sourceforge mirror to use.  Rotate based on time, since 
 # their mirror picker sometimes persistantly sends you to a broken
 # mirror.
@@ -30,7 +32,7 @@ esac
 
 case "$1" in
 -V|--version) 
-  echo "Winetricks version 20080710.  (C) Dan Kegel.  LGPL."
+  echo "Winetricks version 20090121.  (C) Dan Kegel.  LGPL."
   exit 0
   ;;
 esac
@@ -46,8 +48,7 @@ die() {
   exit 1
 }
 
-which "$WINE" > /dev/null
-if test "$?" -ne "0"
+if [ ! -x "`which "$WINE"`" ]
 then
   die "Cannot find wine ($WINE)"
 fi
@@ -71,6 +72,7 @@ usage() {
     echo " colorprofile  Standard RGB color profile"
     echo " comctl32      MS common controls 5.80"
     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 " dcom98        MS DCOM, override the Wine implementation"
     echo " dirac0.8      the obsolete Dirac 0.8 directshow filter"
@@ -79,11 +81,13 @@ usage() {
     echo " dotnet11      MS .NET 1.1 (requires Windows license)"
     echo " dotnet20      MS .NET 2.0 (requires Windows license)"
     echo " ffdshow       ffdshow video codecs"
-    echo " flash         Adobe Flash Player activex"
+    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 " gdiplus       MS gdiplus.dll (from powerpoint viewer)"
     echo " gecko         The HTML rendering Engine (Mozilla)"
-    echo " icodecs       Intel Codecs"
+    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"
     echo " liberation    Red Hat Liberation fonts (Sans, Serif, Mono)"
     echo " mdac25        MS MDAC 2.5: Microsoft ODBC drivers, etc."
@@ -91,18 +95,24 @@ usage() {
     echo " mdac28        MS MDAC 2.8"
     echo " mfc40         MS mfc40 (Microsoft Foundation Classes from Visual C++ 4)"
     echo " mfc42         MS mfc42 (see vcrun6 below)"
-    echo " mono19        mono-1.9.1-gtksharp-2.10.4-win32-2"
+    echo " mono20        mono-2.0.1"
+    echo " mono22        mono-2.2"
     echo " msi2          MS Installer 2.0"
+    echo " mshflxgd      MS Hierarchical Flex Grid Control"
     echo " msls31        MS Line Services 3.1 (needed by native riched?)"
+    echo " msmask        MS Masked Edit Control"
+    echo " msscript      MS Script Control"
     echo " msxml3        MS XML version 3"
     echo " msxml4        MS XML version 4"
     echo " msxml6        MS XML version 6" 
     echo " ogg           ogg filters/codecs: flac, theora, speex, vorbis, schroedinger"
+    echo " ole2          MS 16 bit OLE"
     echo " pdh           MS pdh.dll (Performance Data Helper)"
     echo " quicktime72   Apple Quicktime 7.2"
     echo " riched20      MS riched20 and riched32"
     echo " riched30      MS riched30"
     echo " tahoma        MS Tahoma font (not part of corefonts)"
+    echo " urlmon        MS urlmon.dll"
     echo " vb3run        MS Visual Basic 3 runtime"
     echo " vb4run        MS Visual Basic 4 runtime"
     echo " vb5run        MS Visual Basic 5 runtime"
@@ -113,9 +123,9 @@ usage() {
     echo " vcrun2005sp1  MS Visual C++ 2005 sp1 libraries"
     echo " vcrun2008     MS Visual C++ 2008 libraries (mfc90,msvcp90,msvcr90)"
     echo " vjrun20       MS Visual J# 2.0 libraries (requires dotnet20)"
+    echo " wininet       MS wininet.dll (requires Windows license)"
     echo " wmp9          MS Windows Media Player 9 (requires Windows license)"
     echo " wmp10         MS Windows Media Player 10 (requires Windows license)"
-    echo " wsh51         MS Windows Scripting Host 5.1"
     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"
@@ -123,6 +133,7 @@ usage() {
     echo "Apps:"
     echo " autohotkey    Autohotkey (open source gui scripting language)"
     echo " firefox3      Firefox Version 3"
+    echo " ie6           Microsoft Internet Explorer 6.0"
     echo " kde           KDE for Windows installer"
     echo " mpc           Media Player Classic"
     echo " vlc           VLC media player"
@@ -131,6 +142,7 @@ usage() {
     echo " allcodecs     All listed codecs (xvid, ffdshow, icodecs)"
     echo " fakeie6       Set registry to claim IE6sp1 is installed"
     echo " native_mdac   Override odbc32 and odbccp32"
+    echo " native_oleaut32 Override oleaut32"
     echo " nt40          Set windows version to nt40"
     echo " win98         Set windows version to Windows 98"
     echo " win2k         Set windows version to Windows 2000"
@@ -197,8 +209,8 @@ x_showmenu() {
         args="$args,$1"
         shift
     done
-    (echo "$title"; echo ""; echo "$text") > /tmp/x_showmenu.txt 
-    xmessage -print -file /tmp/x_showmenu.txt -buttons "Cancel,$args" | sed 's/Cancel//'
+    (echo "$title"; echo ""; echo "$text") | \
+    xmessage -print -file - -buttons "Cancel,$args" | sed 's/Cancel//'
 }
 
 showmenu()
@@ -206,8 +218,7 @@ showmenu()
     detectDE
     case $DE in
     kde) kde_showmenu "$@" ;;
-    #gnome) gnome_showmenu "$@" ;;
-    x) x_showmenu "$@" ;;
+    gnome|x) x_showmenu "$@" ;;
     none) usage 1>&2; exit 1;;
     esac
 }
@@ -217,9 +228,9 @@ dogui()
   detectDE
   if [ $DE = gnome ]
   then
-    echo "zenity --title 'Select a package to install' --text 'Install?' --list --checklist --column '' --column Package --column Description --height 440 --width 600 \\" > $WINETRICKS_TMP/zenity.sh
+    echo "zenity --title 'Select a package to install' --text 'Install?' --list --checklist --column '' --column Package --column Description --height 440 --width 600 \\" > "$WINETRICKS_TMP"/zenity.sh
     usage | grep '^ [a-z]' | sed 's/^ \([^ ]*\) *\(.*\)/FALSE "\1" '"'\2'/" | sed 's/$/ \\/' >> $WINETRICKS_TMP/zenity.sh
-    export todo="`sh $WINETRICKS_TMP/zenity.sh | tr '|' ' '`"
+    export todo="`sh "$WINETRICKS_TMP"/zenity.sh | tr '|' ' '`"
   else
     packages=`usage | awk '/^ [a-z]/ {print $1}'`
     export todo="`showmenu "winetricks" "Select a package to install" "Install?" "Package" $packages`"
@@ -245,15 +256,20 @@ olddir=`pwd`
 rm -rf "$WINETRICKS_TMP"/*
 
 # The folder-name is localized!
-programfilesdir_win="`$WINE cmd.exe /c echo "%ProgramFiles%"`"
-programfilesdir_unix="`$WINE winepath -u "$programfilesdir_win"`"
+programfilesdir_win="`unset WINEDEBUG; $WINE cmd.exe /c echo "%ProgramFiles%"`"
+test x"$programfilesdir_win" != x || die "$WINE cmd.exe /c echo '%ProgramFiles%' returned empty string"
+programfilesdir_unix="`unset WINEDEBUG; $WINE winepath -u "$programfilesdir_win"`"
+test x"$programfilesdir_unix" != x || die "winepath -u $programfilesdir_win returned empty string"
 
+# (Fixme: get fonts path from SHGetFolderPath
+# See also http://blogs.msdn.com/oldnewthing/archive/2003/11/03/55532.aspx)
+#
 # Did the user rename Fonts to fonts?
-if ! test -d "$WINEPREFIX"/drive_c/windows/Fonts && test -d "$WINEPREFIX"/drive_c/windows/fonts 
+if test ! -d "$WINDIR"/Fonts && test -d "$WINDIR"/fonts 
 then
-    winefontsdir="$WINEPREFIX"/drive_c/windows/fonts
+    winefontsdir="$WINDIR"/fonts
 else
-    winefontsdir="$WINEPREFIX"/drive_c/windows/Fonts
+    winefontsdir="$WINDIR"/Fonts
 fi
 
 # Mac folks tend to not have sha1sum, but we can make do with openssl
@@ -264,8 +280,7 @@ else
    SHA1SUM="openssl dgst -sha1"
 fi
 
-which cabextract > /dev/null
-if test "$?" -ne "0"
+if [ ! -x "`which "cabextract"`" ]
 then
   echo "Cannot find cabextract.  Please install it (e.g. 'sudo apt-get install cabextract' or 'sudo yum install cabextract')."
 fi
@@ -311,7 +326,7 @@ download() {
     fi
     cache="$WINETRICKS_CACHE/$1"
     mkdir -p "$cache"
-    if ! test -f "$cache/$file"
+    if test ! -f "$cache/$file"
     then
         cd "$cache"
         # Mac folks tend to have curl rather than wget
@@ -330,9 +345,9 @@ download() {
         else
            # curl doesn't get filename from the location given by the server!
            # fortunately, we know it
-           try curl -L -o $file -C - --header "Accept-Encoding: gzip,deflate" "$2"
+           try curl -L -o "$file" -C - --header "Accept-Encoding: gzip,deflate" "$2"
         fi
-        cd $olddir
+        cd "$olddir"
     fi
     if [ "$3"x != ""x ]
     then
@@ -377,7 +392,7 @@ _EOF_
     do
         case "$1" in
         comctl32)
-           rm -rf "$WINEPREFIX"/drive_c/windows/winsxs/manifests/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest
+           rm -rf "$WINDIR"/winsxs/manifests/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest
            ;;
         esac
         echo "\"$1\"=\"$mode\"" >> "$WINETRICKS_TMP"/override-dll.reg
@@ -404,7 +419,7 @@ override_app_dlls() {
     do
         case "$1" in
         comctl32)
-           rm -rf "$WINEPREFIX"/drive_c/windows/winsxs/manifests/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest
+           rm -rf "$WINDIR"/winsxs/manifests/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest
            ;;
         esac
         echo "\"$1\"=\"$mode\"" >> "$WINETRICKS_TMP"/override-dll.reg
@@ -456,8 +471,8 @@ 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 "$WINEPREFIX"/drive_c/windows/temp/x86/50ComUpd.Exe "/T:`$WINE winepath -w "$WINETRICKS_TMP"`" /c $WINETRICKS_QUIET
-    cp "$WINETRICKS_TMP"/comcnt.dll "$WINEPREFIX"/drive_c/windows/system32/comctl32.dll
+    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
 
     override_dlls native,builtin comctl32
 }
@@ -469,8 +484,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 "$WINEPREFIX"/drive_c/windows/system32/mscomctl.ocx
-    cp "$WINETRICKS_TMP"/comctl32.ocx "$WINEPREFIX"/drive_c/windows/system32/comctl32.ocx
+    cp "$WINETRICKS_TMP"/mscomctl.ocx "$WINDIR"/system32/mscomctl.ocx
+    cp "$WINETRICKS_TMP"/comctl32.ocx "$WINDIR"/system32/comctl32.ocx
     try $WINE regsvr32 comctl32.ocx
     try $WINE regsvr32 mscomctl.ocx
 }
@@ -480,8 +495,20 @@ load_comctl32ocx() {
 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 "$WINEPREFIX"/drive_c/windows/system32/spool/drivers/color
-    cp -f "$WINETRICKS_TMP/sRGB Color Space Profile.icm" "$WINEPREFIX"/drive_c/windows/system32/spool/drivers/color
+    mkdir -p "$WINDIR"/system32/spool/drivers/color
+    cp -f "$WINETRICKS_TMP/sRGB Color Space Profile.icm" "$WINDIR"/system32/spool/drivers/color
+}
+
+#----------------------------------------------------------------
+
+load_controlpad() {
+    # http://msdn.microsoft.com/en-us/library/ms968493.aspx
+    # Fixes error "Failed to load UniText..."
+    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
 }
 
 #----------------------------------------------------------------
@@ -580,7 +607,7 @@ load_corefonts() {
 
 #----------------------------------------------------------------
 
-load_dirac() {
+load_dirac08() {
     download . http://codecpack.nl/dirac_dsfilter_080.exe aacfcddf6b2636de5f0a50422ba9155e395318af
     try $WINE "$WINETRICKS_CACHE"/dirac_dsfilter_080.exe $WINETRICKS_SILENT
 }
@@ -588,9 +615,9 @@ load_dirac() {
 #----------------------------------------------------------------
 
 load_directx9() {
-    # March 2008 DirectX 9c User Redistributable
-    # http://www.microsoft.com/downloads/details.aspx?familyid=740AC79A-5B72-447D-84F9-EE6407ED1A91
-    download . http://download.microsoft.com/download/6/4/c/64c3d3d6-c5da-47eb-9db4-86e45b9f579e/directx_mar2008_redist.exe 21aa91ca8e0cbb5fbb986f47a1ccdad5d2984cae
+    # Aug 2008 DirectX 9c User Redistributable
+    # 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?)
@@ -600,9 +627,10 @@ load_directx9() {
     # list down as soon as we can.  
     set_winver win2k
     WINEDLLOVERRIDES="wintrust=b,mscoree=,ddraw,d3d8,d3d9,dsound,dinput=n" \
-       try $WINE "$WINETRICKS_CACHE"/directx_mar2008_redist.exe /t:"$WINETRICKS_TMP_WIN" $WINETRICKS_QUIET
+       try $WINE "$WINETRICKS_CACHE"/directx_nov2008_redist.exe /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 dciman32 ddrawex devenum dmband dmcompos dmime dmloader dmscript dmstyle 
@@ -622,9 +650,10 @@ load_divx() {
     # 6.8.2: e36bf87c1675d0cf9169839bc0cd8f866b9db026 as of 4 jun 2008 as http://download.divx.com/divx/DivXInstaller.exe
     # 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
-    download divx-6.8.4 http://download.divx.com/divx/abt/b1/DivXInstaller.exe c5fcb1465a1bb24d1c104c2588fdb6706d1e1476
+    # 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/DivXInstaller $WINETRICKS_SILENT
+    try $WINE "$WINETRICKS_CACHE"/divx-6.8.4-1/DivXInstaller $WINETRICKS_SILENT
 }
 
 #----------------------------------------------------------------
@@ -639,10 +668,10 @@ load_dcom98() {
 
     # Avoid "err:setupapi:SetupDefaultQueueCallbackA copy error 5 ..."
     # Those messages are suspect, probably shouldn't be err's.
-    rm -f "$WINEPREFIX"/drive_c/windows/system32/ole32.dll
-    rm -f "$WINEPREFIX"/drive_c/windows/system32/olepro32.dll
-    rm -f "$WINEPREFIX"/drive_c/windows/system32/oleaut32.dll
-    rm -f "$WINEPREFIX"/drive_c/windows/system32/rpcrt4.dll
+    rm -f "$WINDIR"/system32/ole32.dll
+    rm -f "$WINDIR"/system32/olepro32.dll
+    rm -f "$WINDIR"/system32/oleaut32.dll
+    rm -f "$WINDIR"/system32/rpcrt4.dll
 
     # Normally only need to override ole32, but overriding advpack
     # as well gets us the correct exit status.
@@ -663,35 +692,25 @@ load_dcom98() {
 #----------------------------------------------------------------
 
 load_dotnet11() {
-    DOTNET_INSTALL_DIR="$WINEPREFIX/drive_c/windows/Microsoft.NET/Framework/v1.1.4322" 
+    DOTNET_INSTALL_DIR="$WINDIR/Microsoft.NET/Framework/v1.1.4322" 
 
     # need corefonts, else installer crashes
     load_corefonts
 
-    # Set win2k so .net installs gdiplus
-    set_winver win2k
-
     # http://www.microsoft.com/downloads/details.aspx?FamilyId=262D25E3-F589-4842-8157-034D1E7CF3A3
     download dotnet11 http://download.microsoft.com/download/a/a/c/aac39226-8825-44ce-90e3-bf8203e74006/dotnetfx.exe 16a354a2207c4c8846b617cbc78f7b7c1856340e
     try $WINE "$WINETRICKS_CACHE"/dotnet11/dotnetfx.exe $WINETRICKS_QUIET
-
-    # Need native gdiplus until wine implements gdiplus.GdipGetFamily
-    #load_gdiplus
-    cp -f "$DOTNET_INSTALL_DIR/gdiplus.dll" "$WINEPREFIX/drive_c/windows/system32/"
-    override_dlls native gdiplus
-
-    unset_winver
 } 
 
 #----------------------------------------------------------------
 
 load_dotnet20() {
     # Recipe from http://bugs.winehq.org/show_bug.cgi?id=10467#c57
-    test -d "$WINEPREFIX/drive_c/windows/gecko" || load_gecko
+    test -d "$WINDIR/gecko" || load_gecko
     set_winver win2k
     # See http://kegel.com/wine/l_intl-sh.txt for how l_intl.nls was generated
     download dotnet20 http://kegel.com/wine/l_intl.nls
-    try cp -f "$WINETRICKS_CACHE"/dotnet20/l_intl.nls "$WINEPREFIX/drive_c/windows/system32/"
+    try cp -f "$WINETRICKS_CACHE"/dotnet20/l_intl.nls "$WINDIR/system32/"
 
     # http://www.microsoft.com/downloads/details.aspx?FamilyID=0856eacb-4362-4b0d-8edd-aab15c5e04f5
     download dotnet20 http://download.microsoft.com/download/5/6/7/567758a3-759e-473e-bf8f-52154438565a/dotnetfx.exe a3625c59d7a2995fb60877b5f5324892a1693b2a
@@ -738,7 +757,7 @@ _EOF_
         if [ ! -d "$programfilesdir_unix/Internet Explorer/iexplore.exe" ]; then
             try mkdir "$programfilesdir_unix/Internet Explorer";
         fi
-        try cp -f "$WINEPREFIX/drive_c/windows/system32/shdocvw.dll" "$programfilesdir_unix/Internet Explorer/iexplore.exe"
+        try cp -f "$WINDIR/system32/shdocvw.dll" "$programfilesdir_unix/Internet Explorer/iexplore.exe"
     fi
 }
 
@@ -746,12 +765,12 @@ _EOF_
 
 load_firefox3() {
     # Firefox 3
-    download . "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0/win32/en-US/Firefox Setup 3.0.exe" 91cf99edbc4eb1ef6af3179e6126abc659309265
+    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"
     if [ "$WINETRICKS_QUIET"x = ""x ]
     then
-       try $WINE "$WINETRICKS_CACHE"/"Firefox Setup 3.0.exe" 
+       try $WINE "$WINETRICKS_CACHE"/"Firefox Setup 3.0.5.exe" 
     else
-       try $WINE "$WINETRICKS_CACHE"/"Firefox Setup 3.0.exe" -ms
+       try $WINE "$WINETRICKS_CACHE"/"Firefox Setup 3.0.5.exe" -ms
     fi
 }
 
@@ -759,19 +778,31 @@ load_firefox3() {
 
 load_ffdshow() {
     # ffdshow
-    download . $SOURCEFORGE/ffdshow-tryout/ffdshow_beta4a_rev1723_20071224_clsid.exe 6e018139c3ed4800aa3580267d1da47fa936a82a
-    try $WINE "$WINETRICKS_CACHE"/ffdshow_beta4a_rev1723_20071224_clsid.exe $WINETRICKS_SILENT
+    download . $SOURCEFORGE/ffdshow-tryout/ffdshow_beta5_rev2033_20080705_clsid.exe 6da6837e2f400923ff5294a6591a88a3eee5ee40
+    try $WINE "$WINETRICKS_CACHE"/ffdshow_beta5_rev2033_20080705_clsid.exe $WINETRICKS_SILENT
 }
 
 #----------------------------------------------------------------
 
 load_flash() {
     # www.adobe.com/products/flashplayer/
+
+    # Active X plugin
     # http://blogs.adobe.com/psirt/2008/03/preparing_for_april_flash_play.html
+    # http://fpdownload.macromedia.com/get/flashplayer/current/licensing/win/install_flash_player_active_x.msi 
     # 2008-04-01: old version sha1sum f4dd1c0c715b791db2c972aeba90d3b78372996a
     # 2008-04-18: new version sha1sum 04ac79c4f1eb1e1ca689f27fa71f12bb5cd11cc2
-    download . http://fpdownload.macromedia.com/get/flashplayer/current/licensing/win/install_flash_player_active_x.msi 04ac79c4f1eb1e1ca689f27fa71f12bb5cd11cc2  
-    try $WINE msiexec /i "$WINETRICKS_CACHE"/install_flash_player_active_x.msi $WINETRICKS_QUIET
+    # Version 10 http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_ax.exe
+    # 2008-11-27: 10 sha1sum 7f6850ae815e953311bb94a8aa9d226f97a646dd  
+
+    download . http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_ax.exe 7f6850ae815e953311bb94a8aa9d226f97a646dd
+    try $WINE "$WINETRICKS_CACHE"/install_flash_player_ax.exe $WINETRICKS_S
+
+    # Mozilla / Firefox plugin
+    # 2008-07-22: sha1sum 1e6f7627784a5b791e99ae9ad63133dc11c7940b
+    # 2008-11-27: sha1sum 20ec0300a8cae19105c903a7ec6c0801e016beb0
+    download . http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player.exe 20ec0300a8cae19105c903a7ec6c0801e016beb0
+    try $WINE "$WINETRICKS_CACHE"/install_flash_player.exe $WINETRICKS_S
 }
 
 #----------------------------------------------------------------
@@ -789,7 +820,7 @@ load_fontfix() {
             download . http://apt.debian.org.tw/pool/t/ttf-arphic-ukai/ttf-arphic-ukai_0.1.20060108.orig.tar.gz 46cc7b67b6117a7e161c1a573502c0bf2b09cbdc  
             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""
+	    try mv ttf-arphic-ukai-0.1.20060108/*.ttf "$winefontsdir"
             cd "$olddir"
         fi
     fi
@@ -802,7 +833,7 @@ load_fontfix() {
             download . http://apt.debian.org.tw/pool/t/ttf-arphic-uming/ttf-arphic-uming_0.1.20060108.orig.tar.gz ec34aeb240fcce09d25fce2fbe5e5b6f358c2f24  
             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""
+	    try mv ttf-arphic-uming-0.1.20060108/*.ttf "$winefontsdir"
             cd "$olddir"
         fi
     fi
@@ -817,12 +848,21 @@ load_gecko() {
     # (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.)
-    GECKO_VERSION=0.1.0
+    case `$WINE --version` in
+    wine-0*|wine-1.0*|wine-1.1|wine-1.1.?|wine-1.1.11)
+        GECKO_VERSION=0.1.0 
+        GECKO_SHA1SUM=c16f1072dc6b0ced20935662138dcf019a38cd56 
+        ;;
+    *)
+        GECKO_VERSION=0.9.0 
+        GECKO_SHA1SUM=5cf410ff7fdd3f9d625f481f9d409968728d3d09
+        ;;
+    esac
 
-    if ! test -f "$WINETRICKS_CACHE"/wine_gecko-$GECKO_VERSION.cab
+    if test ! -f "$WINETRICKS_CACHE"/wine_gecko-$GECKO_VERSION.cab
     then
        # FIXME: busted if using curl!
-       download . "http://source.winehq.org/winegecko.php?v=$GECKO_VERSION" c16f1072dc6b0ced20935662138dcf019a38cd56 wine_gecko-$GECKO_VERSION.cab
+       download . "http://source.winehq.org/winegecko.php?v=$GECKO_VERSION" $GECKO_SHA1SUM wine_gecko-$GECKO_VERSION.cab
     fi
 
     cat > "$WINETRICKS_TMP"/geckopath.reg <<_EOF_
@@ -839,8 +879,8 @@ _EOF_
     echo '\\\\wine_gecko"' >>"$WINETRICKS_TMP"/geckopath.reg
 
     # extract the files
-    mkdir -p "$WINEPREFIX"/drive_c/windows/gecko/$GECKO_VERSION
-    cd "$WINEPREFIX"/drive_c/windows/gecko/$GECKO_VERSION
+    mkdir -p "$WINDIR"/gecko/$GECKO_VERSION
+    cd "$WINDIR"/gecko/$GECKO_VERSION
     try cabextract $WINETRICKS_UNIXQUIET "$WINETRICKS_CACHE"/wine_gecko-$GECKO_VERSION.cab
     cd "$olddir"
 
@@ -858,7 +898,7 @@ load_gdiplus() {
     download . http://download.microsoft.com/download/a/1/a/a1adc39b-9827-4c7a-890b-91396aed2b86/ppviewer.exe 4d13ca85d1d366167b6247ac7340b7736b1bff87
     try $WINE "$WINETRICKS_CACHE"/ppviewer.exe $WINETRICKS_QUIET
     # And then make it globally available.
-    try cp "$programfilesdir_unix/Microsoft Office/PowerPoint Viewer/GDIPLUS.DLL" "$WINEPREFIX"/drive_c/windows/system32/
+    try cp "$programfilesdir_unix/Microsoft Office/PowerPoint Viewer/GDIPLUS.DLL" "$WINDIR"/system32/
 
     # For some reason, native,builtin isn't good enough...?
     override_dlls native gdiplus
@@ -866,10 +906,77 @@ load_gdiplus() {
 
 #----------------------------------------------------------------
 
+load_hosts() {
+    # Create fake system32\drivers\etc\hosts and system32\drivers\etc\services files.
+    # The hosts file is used to map network names to IP addresses without DNS.
+    # The services file is used map service names to network ports.
+    # Some apps depend on these files, but they're not implemented in wine.
+    # Fortunately, empty files in the correct location satisfy those apps. 
+    # See http://bugs.winehq.org/show_bug.cgi?id=12076
+    mkdir -p "$WINDIR"/system32/drivers/etc
+    touch "$WINDIR"/system32/drivers/etc/hosts
+    touch "$WINDIR"/system32/drivers/etc/services
+}
+
+#----------------------------------------------------------------
 load_icodecs() {
     # http://downloadcenter.intel.com/Detail_Desc.aspx?strState=LIVE&ProductID=355&DwnldID=2846
     download . http://downloadmirror.intel.com/2846/eng/codinstl.exe 2c5d64f472abe3f601ce352dcca75b4f02996f8a
     try $WINE "$WINETRICKS_CACHE"/codinstl.exe
+    # Work around bug in codec's installer?
+    # http://support.britannica.com/other/touchthesky/win/issues/TSTUw_150.htm
+    # http://appdb.winehq.org/objectManager.php?sClass=version&iId=7091
+    try $WINE regsvr32 ir50_32.dll
+}
+
+load_ie6() {
+    load_msls31
+
+    # Unregister Wine IE
+    try $WINE iexplore -unregserver
+
+    # Change the override to the native so we are sure we use and register them
+    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
+    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
+    #set_winver win2k
+
+    # Workaround a IE6 Installer bug, not Wine's fault
+    # See http://bugs.winehq.org/show_bug.cgi?id=5409
+    # Actual value downloaded doesn't matter
+    rm -f "$WINETRICKS_CACHE"/ie6sites.dat
+    download . http://www.microsoft.com/windows/ie/ie6sp1/download/rtw/x86/ie6sites.dat
+
+    # Install
+    download . http://download.microsoft.com/download/ie6sp1/finrel/6_sp1/W98NT42KMeXP/EN-US/ie6setup.exe f3ab61a785eb9611fa583612e83f3b69377f2cef
+    $WINE "$WINETRICKS_CACHE"/ie6setup.exe
+
+    # Work around DLL registration bug until ierunonce/RunOnce/wineboot is fixed
+    # FIXME: whittle down this list 
+    cd "$WINDIR"/system32/
+    for i in actxprxy.dll browseui.dll browsewm.dll cdfview.dll ddraw.dll \
+      dispex.dll dsound.dll iedkcs32.dll iepeers.dll iesetup.dll \
+      imgutil.dll inetcomm.dll inseng.dll isetup.dll jscript.dll laprxy.dll \
+      mlang.dll mshtml.dll mshtmled.dll msi.dll msident.dll \
+      msoeacct.dll msrating.dll mstime.dll msxml3.dll occache.dll \
+      ole32.dll oleaut32.dll olepro32.dll pngfilt.dll quartz.dll \
+      rpcrt4.dll rsabase.dll rsaenh.dll scrobj.dll scrrun.dll \
+      shdocvw.dll shell32.dll urlmon.dll vbscript.dll webcheck.dll \
+      wshcon.dll wshext.dll asctrls.ocx hhctrl.ocx mscomct2.ocx \
+      plugin.ocx proctexe.ocx tdc.ocx webcheck.dll wshom.ocx
+    do
+        $WINE regsvr32 /i $i > /dev/null 2>&1
+    done
+
+    # try $WINE "$programfilesdir_unix"/"Internet Explorer"/IEXPLORE.EXE http://www.winehq.org
 }
 
 #----------------------------------------------------------------
@@ -884,11 +991,11 @@ load_jet40() {
 #----------------------------------------------------------------
 
 load_kde() {
-    download . http://winkde.org/pub/kde/ports/win32/installer/kdewin-installer-gui-0.9.2-1.exe 504a05f3e47c429747a71bcc930c551ff4758d83
+    download . http://winkde.org/pub/kde/ports/win32/installer/kdewin-installer-gui-0.9.3-1.exe 618f1c4987aa0725640ff331b14ff9a0d3e84f3a
     mkdir -p "$programfilesdir_unix/kde"
-    cp "$WINETRICKS_CACHE"/kdewin-installer-gui-0.9.2-1.exe "$programfilesdir_unix/kde"
+    cp "$WINETRICKS_CACHE"/kdewin-installer-gui-0.9.3-1.exe "$programfilesdir_unix/kde"
     cd "$programfilesdir_unix/kde"
-    try $WINE "$programfilesdir_win\\kde\\kdewin-installer-gui-0.9.2-1.exe"
+    try $WINE "$programfilesdir_win\\kde\\kdewin-installer-gui-0.9.3-1.exe"
     cd "$olddir"
 }
 
@@ -896,10 +1003,8 @@ load_kde() {
 
 load_liberation() {
     # http://www.redhat.com/promo/fonts/ 				
-    download . http://www.redhat.com/f/fonts/liberation-fonts.tar.gz 38276ab5e4322e131217d26f193bfce396195c0a
-    # Fixme: get fonts path from SHGetFolderPath
-    # see also http://blogs.msdn.com/oldnewthing/archive/2003/11/03/55532.aspx
-    tar --wildcards -C "$winefontsdir" -xvzf "$WINETRICKS_CACHE"/liberation-fonts.tar.gz '*.ttf'
+    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'
 }
 
 #----------------------------------------------------------------
@@ -946,20 +1051,20 @@ load_mfc40() {
     # See http://support.microsoft.com/kb/122244
     download . http://download.microsoft.com/download/ole/ole2v/3.5/w351/en-us/ole2v.exe c6cac71f32405ccb09c6f375e0738e6e13f073e4
     try unzip -o $WINETRICKS_UNIXQUIET -d "$WINETRICKS_TMP" "$WINETRICKS_CACHE"/ole2v.exe
-    try cp -f "$WINETRICKS_TMP"/MFC40.DLL "$WINEPREFIX"/drive_c/windows/system32/
+    try cp -f "$WINETRICKS_TMP"/MFC40.DLL "$WINDIR"/system32/
 
     rm -rf "$WINETRICKS_TMP"/*
 }
 
 #----------------------------------------------------------------
 
-load_mono19() {
+load_mono20() {
     # Load Mono, have it handle all .net requests
-    download .  http://ftp.novell.com/pub/mono/archive/1.9.1/windows-installer/2/mono-1.9.1-gtksharp-2.10.4-win32-2.exe 47ccc5dbba22f6f684833a4efea5119231e8e71e
+    download .  ftp://ftp.novell.com/pub/mono/archive/2.0.1/windows-installer/1/mono-2.0.1-gtksharp-2.10.4-win32-1.exe ccb67ac41b59522846e47d0c423836b9d334c088
     # Anyone know how to get it to do a silent install?
-    try $WINE "$WINETRICKS_CACHE"/mono-1.9.1-gtksharp-2.10.4-win32-2.exe
+    try $WINE "$WINETRICKS_CACHE"/mono-2.0.1-gtksharp-2.10.4-win32-1.exe
 
-    cat > "$WINETRICKS_TMP"/mono_1.9.reg <<_EOF_
+    cat > "$WINETRICKS_TMP"/mono_2.0.reg <<_EOF_
 REGEDIT4
 
 [HKEY_LOCAL_MACHINE\Software\Microsoft\NET Framework Setup\NDP\v2.0.50727]
@@ -969,8 +1074,31 @@ REGEDIT4
 [HKEY_LOCAL_MACHINE\Software\Microsoft\.NETFramework\policy\v2.0]
 "4322"="3706-4322"
 _EOF_
-    try $WINE regedit "$WINETRICKS_TMP"/mono_1.9.reg
-    rm -f "$WINETRICKS_TMP"/mono_1.9.reg
+    try $WINE regedit "$WINETRICKS_TMP"/mono_2.0.reg
+    rm -f "$WINETRICKS_TMP"/mono_2.0.reg
+}
+
+#----------------------------------------------------------------
+
+load_mono22() {
+    # Load Mono, have it handle all .net requests
+    download .  ftp://ftp.novell.com/pub/mono/archive/2.2/windows-installer/5/mono-2.2-gtksharp-2.12.7-win32-5.exe be977dfa9c49deea1be02ba4a2228e343f1e5840
+    # Anyone know how to get it to do a silent install?
+    try $WINE "$WINETRICKS_CACHE"/mono-2.2-gtksharp-2.12.7-win32-5.exe
+
+    # FIXME: what should this be for mono 2.2?
+    cat > "$WINETRICKS_TMP"/mono_2.0.reg <<_EOF_
+REGEDIT4
+
+[HKEY_LOCAL_MACHINE\Software\Microsoft\NET Framework Setup\NDP\v2.0.50727]
+"Install"=dword:00000001
+"SP"=dword:00000001
+
+[HKEY_LOCAL_MACHINE\Software\Microsoft\.NETFramework\policy\v2.0]
+"4322"="3706-4322"
+_EOF_
+    try $WINE regedit "$WINETRICKS_TMP"/mono_2.0.reg
+    rm -f "$WINETRICKS_TMP"/mono_2.0.reg
 }
 
 #----------------------------------------------------------------
@@ -994,8 +1122,8 @@ load_msi2() {
     set_winver win98
 
     # Avoid "err:setupapi:SetupDefaultQueueCallbackA copy error 5 ..."
-    rm -f "$WINEPREFIX"/drive_c/windows/system32/msi.dll
-    rm -f "$WINEPREFIX"/drive_c/windows/system32/msiexec.exe
+    rm -f "$WINDIR"/system32/msi.dll
+    rm -f "$WINDIR"/system32/msiexec.exe
 
     WINEDLLOVERRIDES="msi,msiexec.exe=n" try $WINE "$WINETRICKS_CACHE"/InstMSIA.exe $WINETRICKS_QUIET
 
@@ -1007,11 +1135,45 @@ load_msi2() {
 
 #----------------------------------------------------------------
 
+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
+    try cabextract --directory="$WINETRICKS_TMP" "$WINETRICKS_CACHE"/MSHFLXGD.CAB
+    #try cp -f "$WINETRICKS_TMP"/MSHFLXGD.OCX "$WINDIR"/system32
+    try cp -f "$WINETRICKS_TMP"/mshflxgd.ocx "$WINDIR"/system32
+}
+
+#----------------------------------------------------------------
+
 load_msls31() {
     # Install native Microsoft Line Services (needed by e-Sword, possibly only when using native riched20)
     download . http://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US/InstMsiA.exe e739c40d747e7c27aacdb07b50925b1635ee7366
     try cabextract --directory="$WINETRICKS_TMP" "$WINETRICKS_CACHE"/InstMsiA.exe
-    try cp -f "$WINETRICKS_TMP"/msls31.dll "$WINEPREFIX"/drive_c/windows/system32
+    try cp -f "$WINETRICKS_TMP"/msls31.dll "$WINDIR"/system32
+}
+
+#----------------------------------------------------------------
+
+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
+    try cabextract --directory="$WINETRICKS_TMP" "$WINETRICKS_CACHE"/MSMASK32.CAB
+    try cp -f "$WINETRICKS_TMP"/MSMASK32.OCX "$WINDIR"/system32
+    try $WINE regsvr32 msmask32.ocx
+}
+
+#----------------------------------------------------------------
+
+load_msscript() {
+    # http://msdn.microsoft.com/scripting/scriptcontrol/x86/sct10en.exe
+    # http://www.microsoft.com/downloads/details.aspx?familyid=d7e31492-2595-49e6-8c02-1426fec693ac
+    download .  http://download.microsoft.com/download/d/2/a/d2a7430c-6d5b-48e9-96c4-3c751be7bffe/sct10en.exe fd9f2f23357ab11ae70682d6864f7e9f188adf2a
+    try cabextract --directory="$WINETRICKS_TMP" "$WINETRICKS_CACHE"/sct10en.exe
+    try cp -f "$WINETRICKS_TMP"/msscript.ocx "$WINDIR"/system32
+    try $WINE regsvr32 msscript.ocx
 }
 
 #----------------------------------------------------------------
@@ -1030,13 +1192,13 @@ load_msxml3() {
 
 load_msxml4() {
     # http://www.microsoft.com/downloads/details.aspx?familyid=24B7D141-6CDF-4FC4-A91B-6F18FE6921D4
-    if ! test -f "$WINETRICKS_CACHE"/msxml4.msi
+    if test ! -f "$WINETRICKS_CACHE"/msxml4.msi
     then
        download . http://download.microsoft.com/download/e/2/e/e2e92e52-210b-4774-8cd9-3a7a0130141d/msxml4-KB927978-enu.exe d364f9fe80c3965e79f6f64609fc253dfeb69c25
        rm -rf "$WINETRICKS_TMP"/*
 
        try $WINE "$WINETRICKS_CACHE"/msxml4-KB927978-enu.exe "/x:`$WINE winepath -w "$WINETRICKS_TMP"`" $WINETRICKS_QUIET
-       if ! test -f "$WINETRICKS_TMP"/msxml.msi
+       if test ! -f "$WINETRICKS_TMP"/msxml.msi
        then
           die msxml.msi not found
        fi
@@ -1068,17 +1230,31 @@ 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 "$WINEPREFIX"/drive_c/windows/system32/direct-schro.dll
+    cp "$WINETRICKS_CACHE"/direct-schro.dll "$WINDIR"/system32/direct-schro.dll
     try $WINE regsvr32 direct-schro.dll
 }
 
 #----------------------------------------------------------------
 
+load_ole2() {
+    # http://support.microsoft.com/kb/123087/EN-US/
+    download . http://download.microsoft.com/download/win31/update/2.03/win/en-us/ww1116.exe b803991c40f387464b61f606536b7c98a88245d2
+    try unzip -o $WINETRICKS_UNIXQUIET -d "$WINETRICKS_TMP" "$WINETRICKS_CACHE"/ww1116.exe
+    set_winver win31
+    cd "$WINETRICKS_TMP"
+    try $WINE setup.exe $WINETRICKS_QUIET
+    cd "$olddir"
+    unset_winver 
+    # TODO: Need to set native overrides for some dlls, like ole2disp?
+}
+
+#----------------------------------------------------------------
+
 load_pdh() {
     # http://support.microsoft.com/kb/284996
     download . http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.2668/NT4/EN-US/pdhinst.exe f42448660def8cd7f42b34aa7bc7264745f4425e
     try $WINE "$WINETRICKS_CACHE"/pdhinst.exe
-    try cp -f "$WINEPREFIX"/drive_c/windows/temp/x86/Pdh.Dll $WINEPREFIX/drive_c/windows/system32/pdh.dll
+    try cp -f "$WINDIR"/temp/x86/Pdh.Dll "$WINDIR"/system32/pdh.dll
 }
 
 #----------------------------------------------------------------
@@ -1121,7 +1297,7 @@ volnum() {
     # You may be able to work around this by using the installer's /x or /extract switch,
     # but renaming drive_c to "harddiskvolume0" lets you just run the installer as normal.
 
-    if ! test -d "$WINEPREFIX"/harddiskvolume0/
+    if test ! -d "$WINEPREFIX"/harddiskvolume0/
     then
 	ln -s drive_c "$WINEPREFIX"/harddiskvolume0
 	rm "$WINEPREFIX"/dosdevices/c:
@@ -1138,7 +1314,7 @@ load_riched20() {
     # http://support.microsoft.com/?kbid=249973
     download . http://download.microsoft.com/download/winntsp/Patch/RTF/NT4/EN-US/Q249973i.EXE f0b7663f15dbd31410435483ba832318c7a70470
     try cabextract --directory="$WINETRICKS_TMP" "$WINETRICKS_CACHE"/Q249973i.EXE
-    try cp -f "$WINETRICKS_TMP"/riched??.dll "$WINEPREFIX"/drive_c/windows/system32
+    try cp -f "$WINETRICKS_TMP"/riched??.dll "$WINDIR"/system32
     override_dlls native,builtin riched20 riched32
     
     rm -rf "$WINETRICKS_TMP"/*
@@ -1155,7 +1331,7 @@ load_riched30() {
     # http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=CEBBACD8-C094-4255-B702-DE3BB768148F
     download . http://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US/InstMsiA.exe e739c40d747e7c27aacdb07b50925b1635ee7366
     try cabextract --directory="$WINETRICKS_TMP" "$WINETRICKS_CACHE"/InstMsiA.exe
-    try cp -f "$WINETRICKS_TMP"/riched20.dll "$WINEPREFIX"/drive_c/windows/system32
+    try cp -f "$WINETRICKS_TMP"/riched20.dll "$WINDIR"/system32
     override_dlls native,builtin riched20 
     
     rm -rf "$WINETRICKS_TMP"/*
@@ -1164,24 +1340,35 @@ load_riched30() {
 #----------------------------------------------------------------
 
 load_tahoma() {
-    # The tahoma font is needed by e.g. Steam
-    download . $SOURCEFORGE/corefonts/wd97vwr32.exe 8edf758f92513094a94e50b7826cd6f2b7696b8c
-    try cabextract --directory="$WINETRICKS_TMP" "$WINETRICKS_CACHE"/wd97vwr32.exe
-    try cabextract --directory="$WINETRICKS_TMP" $WINETRICKS_TMP/Viewer1.cab
-    # Fixme: get fonts path from SHGetFolderPath
-    # see also http://blogs.msdn.com/oldnewthing/archive/2003/11/03/55532.aspx
-    try cp -f "$WINETRICKS_TMP"/tahoma.ttf "$winefontsdir"/tahoma.ttf
-    chmod +w "$winefontsdir"/tahoma.ttf
+    # The tahoma and tahomabd fonts are needed by e.g. Steam
+    
+    download . http://download.microsoft.com/download/office97pro/fonts/1/w95/en-us/tahoma32.exe 888ce7b7ab5fd41f9802f3a65fd0622eb651a068
+    try cabextract --directory="$WINETRICKS_TMP" "$WINETRICKS_CACHE"/tahoma32.exe
+    try cp -f "$WINETRICKS_TMP"/Tahoma.TTF "$winefontsdir"/tahoma.ttf
+    try cp -f "$WINETRICKS_TMP"/Tahomabd.TTF "$winefontsdir"/tahomabd.ttf
+    chmod +w "$winefontsdir"/tahoma*.ttf
     rm -rf "$WINETRICKS_TMP"/*
 }
 
 #----------------------------------------------------------------
 
+load_urlmon() {
+    # This is an updated urlmon from IE 6.0
+    # See http://www.microsoft.com/downloads/details.aspx?familyid=85BB441A-5BB1-4A82-86EC-A249AF287513
+    # (Works for Dolphin Smalltalk, see http://bugs.winehq.org/show_bug.cgi?id=8258)
+    download . http://download.microsoft.com/download/8/2/0/820faffc-3ea0-4914-bca3-584235964ded/Q837251.exe bcc79b92ac3c06c4de3692672c3d70bdd36be892
+    try cabextract --directory="$WINETRICKS_TMP" "$WINETRICKS_CACHE/Q837251.exe"
+    try cp -f "$WINETRICKS_TMP"/URLMON.DLL "$WINDIR"/system32/urlmon.dll
+    override_dlls native,builtin urlmon
+}
+
+#----------------------------------------------------------------
+
 load_vb3run() {
     # See http://support.microsoft.com/kb/196285
     download . http://download.microsoft.com/download/vb30/utility/1/w9xnt4/en-us/vb3run.exe 518fcfefde9bf680695cadd06512efadc5ac2aa7
     try unzip -o $WINETRICKS_UNIXQUIET -d "$WINETRICKS_TMP" "$WINETRICKS_CACHE"/vb3run.exe
-    try cp -f "$WINETRICKS_TMP/Vbrun300.dll" "$WINEPREFIX"/drive_c/windows/system32/
+    try cp -f "$WINETRICKS_TMP/Vbrun300.dll" "$WINDIR"/system32/
 
 }
 
@@ -1191,8 +1378,8 @@ load_vb4run() {
     # See http://support.microsoft.com/kb/196286
     download . http://download.microsoft.com/download/vb40ent/sample27/1/w9xnt4/en-us/vb4run.exe 83e968063272e97bfffd628a73bf0ff5f8e1023b
     try unzip -o $WINETRICKS_UNIXQUIET -d "$WINETRICKS_TMP" "$WINETRICKS_CACHE"/vb4run.exe
-    try cp -f "$WINETRICKS_TMP/Vb40032.dll" "$WINEPREFIX"/drive_c/windows/system32/
-    try cp -f "$WINETRICKS_TMP/Vb40016.dll" "$WINEPREFIX"/drive_c/windows/system32/
+    try cp -f "$WINETRICKS_TMP/Vb40032.dll" "$WINDIR"/system32/
+    try cp -f "$WINETRICKS_TMP/Vb40016.dll" "$WINDIR"/system32/
 
 }
 
@@ -1215,28 +1402,28 @@ load_vbrun60() {
 
 load_vcrun6() {
     # Load the Visual C++ 6 runtime libraries, including the elusive mfc42u.dll
-    if test -f "$WINEPREFIX"/drive_c/windows/system32/mfc42u.dll
+    if test -f "$WINDIR"/system32/mfc42u.dll
     then
         echo "vcrun6 already installed, skipping"
         return
     fi
 
-    if ! test -f "$WINETRICKS_CACHE"/vcredist.exe
+    if test ! -f "$WINETRICKS_CACHE"/vcredist.exe
     then
        download . http://download.microsoft.com/download/vc60pro/update/1/w9xnt4/en-us/vc6redistsetup_enu.exe 382c8f5a7f41189af8d4165cf441f274b7e2a457
        rm -rf "$WINETRICKS_TMP"/*
        
        try $WINE "$WINETRICKS_CACHE"/vc6redistsetup_enu.exe "/T:`$WINE winepath -w "$WINETRICKS_TMP"`" /c $WINETRICKS_QUIET
-       if ! test -f "$WINETRICKS_TMP"/vcredist.exe
+       if test ! -f "$WINETRICKS_TMP"/vcredist.exe
        then
           die vcredist.exe not found
        fi
        mv "$WINETRICKS_TMP"/vcredist.exe "$WINETRICKS_CACHE"
     fi
     # Delete some fake dlls to avoid vcredist installer warnings
-    rm -f "$WINEPREFIX"/drive_c/windows/system32/msvcrt.dll
-    rm -f "$WINEPREFIX"/drive_c/windows/system32/oleaut32.dll
-    rm -f "$WINEPREFIX"/drive_c/windows/system32/olepro32.dll
+    rm -f "$WINDIR"/system32/msvcrt.dll
+    rm -f "$WINDIR"/system32/oleaut32.dll
+    rm -f "$WINDIR"/system32/olepro32.dll
     # vcredist still exits with status 43.  Anyone know why?
     $WINE "$WINETRICKS_CACHE"/vcredist.exe || true
 
@@ -1245,7 +1432,7 @@ load_vcrun6() {
     cd "$WINETRICKS_TMP"/
     rm -rf "$WINETRICKS_TMP"/*
     try cabextract "$WINETRICKS_CACHE"/vcredist.exe
-    mv mfc42u.dll "$WINEPREFIX"/drive_c/windows/system32/
+    mv mfc42u.dll "$WINDIR"/system32/
     cd "$olddir"
 }
 
@@ -1257,7 +1444,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* "$WINEPREFIX"/drive_c/windows/system32/
+    cp "$programfilesdir_unix/BZEdit1.6.5"/m*71* "$WINDIR"/system32/
 }
 
 #----------------------------------------------------------------
@@ -1265,10 +1452,8 @@ load_vcrun2003() {
 load_vcrun2005() {
     # Load the Visual C++ 2005 runtime libraries
     # See http://www.microsoft.com/downloads/details.aspx?familyid=32BC1BEE-A3F9-4C13-9C99-220B62A191EE
-    set_winver win2k
     download vcrun2005 http://download.microsoft.com/download/d/3/4/d342efa6-3266-4157-a2ec-5174867be706/vcredist_x86.exe 47fba37de95fa0e2328cf2e5c8ebb954c4b7b93c
     try $WINE "$WINETRICKS_CACHE"/vcrun2005/vcredist_x86.exe $WINETRICKS_QUIET
-    unset_winver
 }
 
 #----------------------------------------------------------------
@@ -1309,6 +1494,18 @@ load_vlc() {
 
 #----------------------------------------------------------------
 
+load_wininet() {
+    # This is an updated wininet from IE 5.0.1.   
+    # (Good enough for Active Worlds browser.  Also helps "Avatar - Legends of the Arena" get to login screen.)
+    # See http://www.microsoft.com/downloads/details.aspx?familyid=6DEE32AB-B618-4FB3-9A45-CDD08162E167
+    download . http://download.microsoft.com/download/ie5/Update/1/WIN98/EN-US/3725.exe b048e0b4e303298de3317b16f7008c43ca71ddfe
+    try cabextract --directory="$WINETRICKS_TMP" "$WINETRICKS_CACHE/3725.exe"
+    try cp -f "$WINETRICKS_TMP"/Wininet.dll "$WINDIR"/system32/wininet.dll
+    override_dlls native,builtin wininet
+}
+
+#----------------------------------------------------------------
+
 load_wmp9() {
     # Not really expected to work well yet; see
     # http://appdb.winehq.org/appview.php?versionId=1449
@@ -1352,19 +1549,6 @@ load_wmp10() {
 
 #----------------------------------------------------------------
 
-load_wsh51() {
-    # See also http://www.microsoft.com/downloads/details.aspx?FamilyID=bfdb7709-51e4-4aa6-adb0-05444e68dd80&DisplayLang=en
-    echo "Note: Microsoft has since pulled this download.  Sorry!"
-    download . http://download.microsoft.com/download/8/7/5/8751c696-282d-49da-b118-2735315dbb5e/ste51en.exe ecc0fb713684294fe6c759f4633c5befbeba1ade
-
-    try $WINE "$WINETRICKS_CACHE"/ste51en.exe $WINETRICKS_QUIET
-
-    # Not sure why this gets installed to the wrong directory
-    mv "$WINEPREFIX"/drive_c/windows/system32/unknown/cscript.exe $WINEPREFIX/drive_c/windows/system32 
-}
-
-#----------------------------------------------------------------
-
 load_wsh56() {
     # See also http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=C717D943-7E4B-4622-86EB-95A22B832CAA
     # FIXME: depends on vcrun6, should we install that automatically?
@@ -1397,6 +1581,7 @@ load_wsh56vb() {
 
 load_xvid() {
     # xvid
+    test -f "$WINDIR"/system32/[Mm][Ff][Cc]42.[Dd][Ll][Ll] || load_vcrun6
     download . http://download2.videohelp.com/download/Xvid-1.1.3-27042008.exe f1008a11037c0b9368aa4979e62d0963d05d8007
     try $WINE "$WINETRICKS_CACHE"/Xvid-1.1.3-27042008.exe $WINETRICKS_SILENT
 }
@@ -1422,8 +1607,9 @@ do
     comctl32.ocx) load_comctl32ocx;;
     colorprofile) load_colorprofile;;
     corefonts) load_corefonts;;
+    controlpad|fm20) load_controlpad;;
     dcom98) load_dcom98;;
-    dirac) load_dirac;;
+    dirac|dirac0.8) load_dirac08;;
     directx9) load_directx9;;
     divx) load_divx;;
     dotnet11) load_dotnet11; load_fontfix;;
@@ -1434,7 +1620,9 @@ do
     fontfix) load_fontfix;;
     gdiplus) load_gdiplus;;
     gecko) load_gecko;;
+    hosts) load_hosts;;
     icodecs) load_icodecs;;
+    ie6) load_ie6;;
     jet40) load_jet40;;
     kde) load_kde;;
     liberation) load_liberation;;
@@ -1442,19 +1630,25 @@ do
     mdac27) load_mdac27;;
     mdac28) load_mdac28;;
     mfc40) load_mfc40;;
-    mono19) load_mono19;;
+    mono19|mono20) load_mono20;;
+    mono22) load_mono22;;
     mpc) load_mpc;;
     msi2) load_msi2;;
+    mshflxgd) load_mshflxgd;;
     msls31) load_msls31;;
+    msmask) load_msmask;;
+    msscript) load_msscript;;
     msxml3) load_msxml3;;
     msxml4) load_msxml4;;
     msxml6) load_msxml6;;
     ogg) load_ogg;;
+    ole2) load_ole2;;
     pdh) load_pdh;;
     quicktime72) load_gdiplus; load_quicktime72;;  # needs e.g. gdiplus.dll.GdipCloneImage
     riched20) load_riched20;;
     riched30) load_riched30;;
     tahoma) load_tahoma;;
+    urlmon) load_urlmon;;
     vb3run) load_vb3run;;
     vb4run) load_vb4run;;
     vbvm50|vb5run) load_vbvm50;;
@@ -1466,9 +1660,9 @@ do
     vcrun2008) load_vcrun2008;;
     vjrun20) load_vjrun20;;
     vlc) load_vlc;;
+    wininet) load_wininet;;
     wmp9) load_vcrun6; load_wsh56; load_wmp9;;
     wmp10) load_vcrun6; load_wsh56; load_wmp10;;
-    wsh51) load_wsh51;;
     wsh56) load_vcrun6; load_wsh56;;
     wsh56js) load_wsh56js;;
     wsh56vb) load_wsh56vb;;
@@ -1484,6 +1678,7 @@ do
     vista|winver=vista) set_winver vista;;
     winver=) unset_winver;;
     native_mdac) set_native_mdac;;
+    native_oleaut32) override_dlls native,builtin oleaut32;;
     volnum) volnum;;
     *) echo Unknown arg $1; usage ; exit 1;;
     esac
@@ -1494,9 +1689,8 @@ do
     *) echo "Install of $1 done" ;;
     esac
     shift
+    # cleanup
+    rm -rf "$WINETRICKS_TMP"/*
 done
 
-# cleanup
-rm -rf "$WINETRICKS_TMP"/*
-
 test "$WINETRICKS_QUIET" = "" && echo winetricks done. || true