diff -Nru winetricks-0.0+20130624~precise1~ppa1/debian/changelog winetricks-0.0+20130707~precise1~ppa1/debian/changelog
--- winetricks-0.0+20130624~precise1~ppa1/debian/changelog	2013-06-25 03:58:34.000000000 +0000
+++ winetricks-0.0+20130707~precise1~ppa1/debian/changelog	2013-07-21 21:59:24.000000000 +0000
@@ -1,3 +1,9 @@
+winetricks (0.0+20130707~precise1~ppa1) precise; urgency=low
+
+  * New upstream release
+
+ -- Scott Ritchie <scottritchie@ubuntu.com>  Sun, 21 Jul 2013 14:58:53 -0700
+
 winetricks (0.0+20130624~precise1~ppa1) precise; urgency=low
 
   * New upstream release
diff -Nru winetricks-0.0+20130624~precise1~ppa1/winetricks winetricks-0.0+20130707~precise1~ppa1/winetricks
--- winetricks-0.0+20130624~precise1~ppa1/winetricks	2013-06-25 02:33:59.000000000 +0000
+++ winetricks-0.0+20130707~precise1~ppa1/winetricks	2013-07-07 23:10:07.000000000 +0000
@@ -2,7 +2,7 @@
 
 # Name of this version of winetricks (YYYYMMDD)
 # (This doesn't change often, use the sha1sum of the file when reporting problems)
-WINETRICKS_VERSION=20130624
+WINETRICKS_VERSION=20130707
 
 # This is a utf-8 file
 # You should see an o with two dots over it here [ö]
@@ -22,7 +22,7 @@
 #
 # Uses the following non-Posix system tools:
 # - wine is used to execute win32 apps except on cygwin.
-# - cabextract, unzip, and 7z are needed by some verbs.
+# - cabextract, unrar, unzip, and 7z are needed by some verbs.
 # - axel, wget, or curl is needed for downloading.
 # - sha1sum or openssl is needed for verifying downloads.
 # - zenity is needed by the GUI, though it can limp along somewhat with kdialog.
@@ -33,7 +33,7 @@
 # On ubuntu, the following lines can be used to install all the prereqs:
 #    sudo add-apt-repository ppa:ubuntu-wine/ppa
 #    sudo apt-get update
-#    sudo apt-get install wine1.3 cabextract unzip p7zip wget zenity
+#    sudo apt-get install cabextract p7zip unrar unzip wget wine1.3 zenity
 #
 # See http://winetricks.org for documentation and tutorials, including
 # how to contribute changes to winetricks.
@@ -306,6 +306,17 @@
     w_try cabextract -q "$@"
 }
 
+w_try_unrar()
+{
+    # Not always installed, but shouldn't be fatal unless it's being used
+    if test ! -x "`which unrar 2>/dev/null`"
+    then
+        w_die "Cannot find unrar.  Please install it (e.g. 'sudo apt-get install unrar' or 'sudo yum install unrar')."
+    fi
+
+    w_try unrar x "$@"
+}
+
 w_try_unzip()
 {
     # Not always installed, but shouldn't be fatal unless it's being used
@@ -496,6 +507,10 @@
     .) w_die "bug: please do not download packages to top of cache" ;;
     esac
 
+    if echo "$_W_url" | grep ' '
+    then
+        w_die "bug: please use %20 instead of literal spaces in urls, curl rejects spaces, and they make life harder for linkcheck.sh"
+    fi
     if [ "$_W_file"x = ""x ]
     then
         _W_file=`basename "$_W_url"`
@@ -1991,19 +2006,19 @@
     cp "$W_TMP"/*.reg /tmp/_reg$$-2.reg
 }
 
-w_register_font_substitution()
+w_register_font_replacement()
 {
     _W_alias=$1
     shift
     _W_font=$1
     # Kludge: use _r to avoid \r expansion in w_try
-    cat > "$W_TMP"/_register-font-sub.reg <<_EOF_
+    cat > "$W_TMP"/_register-font-replacements.reg <<_EOF_
 REGEDIT4
 
-[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes]
+[HKEY_CURRENT_USER\Software\Wine\Fonts\Replacements]
 "$_W_alias"="$_W_font"
 _EOF_
-    w_try_regedit "$W_TMP_WIN"\\_register-font-sub.reg
+    w_try_regedit "$W_TMP_WIN"\\_register-font-replacements.reg
     unset _W_alias _W_font
 }
 
@@ -2629,16 +2644,26 @@
         esac
         if test -d "$_W_prefix/dosdevices"
         then
-            _W_file_unix="`WINEPREFIX="$_W_prefix" w_pathconv -u "$_W_file"`"
+          # 'win7 vcrun2005' creates diffrent file than 'winxp vcrun2005'
+          # so let it specify multiple, separated by |
+          _W_IFS="$IFS"
+          IFS='|'
+          for _W_file_ in $_W_file
+          do
+            _W_file_unix="`WINEPREFIX="$_W_prefix" w_pathconv -u "$_W_file_"`"
             if test -f "$_W_file_unix" && ! grep -q "Wine placeholder DLL" "$_W_file_unix"
             then
-                unset _W_file _W_file_unix _W_prefix
+                IFS="$_W_IFS"
+                unset _W_file _W_file_ _W_file_unix _W_prefix _W_IFS
                 return 0  # installed
             fi
+          done
+         IFS="$_W_IFS"
         fi
         ;;
     esac
     unset _W_file _W_prefix  # leak _W_file_unix for caller.  Is this wise?
+    unset _W_IFS _W_file_
     return 1  # not installed
 }
 
@@ -3133,7 +3158,7 @@
 
     # If that fails, read volume name the hard way for each volume
     # Have to use file to return results from implicit subshell
-    rm -f "/tmp/_W_tmp.$USERNAME"
+    rm -f "/tmp/_W_tmp.$LOGNAME"
     winetricks_list_mounts . | while true
     do
         IFS= read _W_tmp
@@ -3145,17 +3170,17 @@
         if test "$1" = "$_W_volname"
         then
             # Volume found!  Want to return from function here, but can't
-            echo "$_W_tmp" > "/tmp/_W_tmp.$USERNAME"
+            echo "$_W_tmp" > "/tmp/_W_tmp.$LOGNAME"
             break
         fi
     done
 
-    if test -f "/tmp/_W_tmp.$USERNAME"
+    if test -f "/tmp/_W_tmp.$LOGNAME"
     then
         # Volume found!  Return from function.
-        _W_dev=`cat "/tmp/_W_tmp.$USERNAME" | sed 's/ .*//'`
-        _W_mountpoint="`cat "/tmp/_W_tmp.$USERNAME" | sed 's/^[^ ]* //'`"
-        rm -f "/tmp/_W_tmp.$USERNAME"
+        _W_dev=`cat "/tmp/_W_tmp.$LOGNAME" | sed 's/ .*//'`
+        _W_mountpoint="`cat "/tmp/_W_tmp.$LOGNAME" | sed 's/^[^ ]* //'`"
+        rm -f "/tmp/_W_tmp.$LOGNAME"
         return 0
     fi
 
@@ -3393,14 +3418,15 @@
     if ! test "$USERNAME"
     then
         # Posix only requires LOGNAME to be defined, and sure enough, when
-        # logging in via console and startx in ubuntu, USERNAME is not set!
+        # logging in via console and startx in ubuntu 11.04, USERNAME isn't set!
+        # And even normal logins in Ubuntu 13.04 doesn't set it.
         # I tried using only LOGNAME in this script, but it's so easy to slip
         # and use USERNAME, so define it here if needed.
         USERNAME="$LOGNAME"
     fi
 
     # Ephemeral files for this run
-    WINETRICKS_WORKDIR="/tmp/w.$USERNAME.$$"
+    WINETRICKS_WORKDIR="/tmp/w.$LOGNAME.$$"
     test "$W_OPT_NOCLEAN" = 1 || rm -rf "$WINETRICKS_WORKDIR"
 
     # Registering a verb creates a file in WINETRICKS_METADATA
@@ -4893,7 +4919,7 @@
     $WINE reg add "HKLM\\Software\\Microsoft-\\Net Framework Setup\\NDP\\v3.0" /v SP /t REG_DWORD /d 0001 /f
 
     # Recipe from http://bugs.winehq.org/show_bug.cgi?id=25060#c10
-    w_download http://download.microsoft.com/download/2/5/2/2526f55d-32bc-410f-be18-164ba67ae07d/"XPSEP XP and Server 2003 32 bit.msi" 5d332ebd1025e294adafe72030fe33db707b2c82
+    w_download http://download.microsoft.com/download/2/5/2/2526f55d-32bc-410f-be18-164ba67ae07d/XPSEP%20XP%20and%20Server%202003%2032%20bit.msi 5d332ebd1025e294adafe72030fe33db707b2c82
     w_try $WINE msiexec /i "XPSEP XP and Server 2003 32 bit.msi" ${W_OPT_UNATTENDED:+/qb}
     $WINE sc delete FontCache3.0.0.0
 
@@ -4922,6 +4948,11 @@
     w_call dotnet30sp1
     $WINESERVER -w
 
+    if w_workaround_wine_bug 33450 "Installing msxml3"  ,1.5.28
+    then
+        w_call msxml3
+    fi
+
     # http://www.microsoft.com/downloads/details.aspx?FamilyId=333325FD-AE52-4E35-B531-508D977D32A6
     w_download http://download.microsoft.com/download/6/0/f/60fc5854-3cb8-4892-b6db-bd4f42510f28/dotnetfx35.exe 0a271bb44531aadef902829f98dfad66e4a57586
 
@@ -5615,25 +5646,6 @@
 
 #----------------------------------------------------------------
 
-#----------------------------------------------------------------
-
-w_metadata mono210 dlls \
-    title="Mono 2.10 (.NET compatability)" \
-    publisher="Novell" \
-    year="2011" \
-    media="download" \
-    file1="mono-2.10.8-gtksharp-2.12.11-win32-1.exe" \
-    installed_file1="$W_PROGRAMS_X86_WIN/Mono-2.10.8/bin/mono-2.0.dll"
-
-load_mono210()
-{
-    w_download http://download.mono-project.com/archive/2.10.8/windows-installer/1/mono-2.10.8-gtksharp-2.12.11-win32-1.exe adf2f944056b55aceb48bf4e028ebb0814f290f9
-    cd "$W_CACHE"/mono210
-    w_try $WINE $file1 $W_UNATTENDED_SLASH_SILENT
-}
-
-#----------------------------------------------------------------
-
 w_metadata mozillabuild apps \
     title="Mozilla build environment" \
     publisher="The Mozilla Foundation" \
@@ -6617,13 +6629,20 @@
 
 #----------------------------------------------------------------
 
+# Temporary fix for bug 169
+# The | symbol in installed_file1 means "or".
+# (Adding an installed_file2 would mean 'and'.)
+# Perhaps we should test for one if winxp mode, and the other if win7 mode;
+# if that becomes important to get right, we'll do something like
+# "if installed_file1 is just the single char @, call test_installed_$verb"
+# and then define that function here.
 w_metadata vcrun2005 dlls \
     title="Visual C++ 2005 libraries (mfc80,msvcp80,msvcr80)" \
     publisher="Microsoft" \
     year="2011" \
     media="download" \
     file1="vcredist_x86.EXE" \
-    installed_file1="c:/windows/winsxs/x86_Microsoft.VC80.MFC_1fc8b3b9a1e18e3b_8.0.50727.6195_x-ww_150c9e8b/mfc80.dll"
+    installed_file1="c:/windows/winsxs/x86_Microsoft.VC80.MFC_1fc8b3b9a1e18e3b_8.0.50727.6195_x-ww_150c9e8b/mfc80.dll|c:/windows/winsxs/x86_microsoft.vc80.mfc_1fc8b3b9a1e18e3b_8.0.50727.6195_none_deadbeef/mfc80.dll"
 
 load_vcrun2005()
 {
@@ -7339,9 +7358,9 @@
     # Microsoft YaHei --> WenQuanYi Micro Hei
     # SimHei --> WenQuanYi Micro Hei
 
-    w_register_font_substitution "Microsoft JhengHei" "WenQuanYi Micro Hei"
-    w_register_font_substitution "Microsoft YaHei" "WenQuanYi Micro Hei"
-    w_register_font_substitution "SimHei" "WenQuanYi Micro Hei"
+    w_register_font_replacement "Microsoft JhengHei" "WenQuanYi Micro Hei"
+    w_register_font_replacement "Microsoft YaHei" "WenQuanYi Micro Hei"
+    w_register_font_replacement "SimHei" "WenQuanYi Micro Hei"
 }
 
 #----------------------------------------------------------------
@@ -7362,10 +7381,10 @@
     # MS PMincho --> TakaoPMincho
     # These aliases were taken from what was listed in Ubuntu's fontconfig definitions.
 
-    w_register_font_substitution "MS Gothic" "TakaoGothic"
-    w_register_font_substitution "MS PGothic" "TakaoPGothic"
-    w_register_font_substitution "MS Mincho" "TakaoMincho"
-    w_register_font_substitution "MS PMincho" "TakaoPMincho"
+    w_register_font_replacement "MS Gothic" "TakaoGothic"
+    w_register_font_replacement "MS PGothic" "TakaoPGothic"
+    w_register_font_replacement "MS Mincho" "TakaoMincho"
+    w_register_font_replacement "MS PMincho" "TakaoPMincho"
 }
 
 #----------------------------------------------------------------
@@ -7387,12 +7406,12 @@
     # Dotum --> Baekmuk Dotum
     # DotumChe --> Baekmuk Dotum
 
-    w_register_font_substitution "Gulim" "Baekmuk Gulim"
-    w_register_font_substitution "GulimChe" "Baekmuk Gulim"
-    w_register_font_substitution "Batang" "Baekmuk Batang"
-    w_register_font_substitution "BatangChe" "Baekmuk Batang"
-    w_register_font_substitution "Dotum" "Baekmuk Dotum"
-    w_register_font_substitution "DotumChe" "Baekmuk Dotum"
+    w_register_font_replacement "Gulim" "Baekmuk Gulim"
+    w_register_font_replacement "GulimChe" "Baekmuk Gulim"
+    w_register_font_replacement "Batang" "Baekmuk Batang"
+    w_register_font_replacement "BatangChe" "Baekmuk Batang"
+    w_register_font_replacement "Dotum" "Baekmuk Dotum"
+    w_register_font_replacement "DotumChe" "Baekmuk Dotum"
 }
 
 #----------------------------------------------------------------
@@ -7644,7 +7663,7 @@
     w_try cp -f "$W_TMP"/unifont-5.1.20080907.ttf "$W_FONTSDIR_UNIX/unifont.ttf"
 
     w_register_font unifont.ttf "Unifont"
-    w_register_font_substitution "Arial Unicode MS" "Unifont"
+    w_register_font_replacement "Arial Unicode MS" "Unifont"
 }
 
 #----------------------------------------------------------------
@@ -7806,7 +7825,7 @@
 load_autohotkey()
 {
     W_BROWSERAGENT=1 \
-    w_download http://www.autohotkey.net/programs/AutoHotkey104805_Install.exe 13e5a9ca6d5b7705f1cd02560c3af4d38b1904fc
+    w_download http://www.autohotkey.com/download/AutoHotkey104805_Install.exe 13e5a9ca6d5b7705f1cd02560c3af4d38b1904fc
     cd "$W_CACHE"/autohotkey
     w_try $WINE AutoHotkey104805_Install.exe $W_UNATTENDED_SLASH_S
 }
@@ -8855,7 +8874,7 @@
     year="2011" \
     media="download" \
     file1="SpotifyInstaller.exe" \
-    installed_exe1="c:/users/$USERNAME/Application Data/Spotify/spotify.exe"
+    installed_exe1="c:/users/$LOGNAME/Application Data/Spotify/spotify.exe"
 
 load_spotify()
 {
@@ -8893,9 +8912,10 @@
     # Kill the background task started if "Allow Spotify to be started from the Web" is specified
     # or should we just do $WINESERVER -k, like fable_tlc does?
     PID=`ps augxw | grep SpotifyWebHelper.exe | grep -v grep | awk '{print $2}'`
+
     kill $PID
 
-    w_declare_exe "c:\\users\\$USERNAME\\Application Data\\Spotify" spotify.exe
+    w_declare_exe "c:\\users\\$LOGNAME\\Application Data\\Spotify" spotify.exe
 }
 
 #----------------------------------------------------------------
@@ -9064,7 +9084,7 @@
 w_metadata uplay apps \
     title="Uplay" \
     publisher="Ubisoft" \
-    year="2012" \
+    year="2013" \
     media="download" \
     file1="UplayInstaller.exe" \
     installed_exe1="$W_PROGRAMS_X86_WIN/Ubisoft/Ubisoft Game Launcher/Uplay.exe"
@@ -9072,7 +9092,8 @@
 load_uplay()
 {
     # 4 June 2013 3.0.1 sha1sum fdb9e736b5b2211fb23b35d30d52deae6f4b32a4
-    w_download http://static3.cdn.ubi.com/orbit/launcher_installer/UplayInstaller.exe fdb9e736b5b2211fb23b35d30d52deae6f4b32a4
+    # 1 July 2013 3.1.0 sha1sum 21a7f469534dd1463eaaab6b2be2fa9084bceea2
+    w_download http://static3.cdn.ubi.com/orbit/launcher_installer/UplayInstaller.exe 21a7f469534dd1463eaaab6b2be2fa9084bceea2
     cd "$W_CACHE"/uplay
 
     # NSIS installer
@@ -9132,7 +9153,7 @@
     year="2011" \
     media="download" \
     file1="uTorrent.exe" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/uTorrent/uTorrent.exe"
+    installed_exe1="c:/users/$LOGNAME/Application Data/uTorrent/uTorrent.exe"
 
 load_utorrent3()
 {
@@ -9141,14 +9162,13 @@
     # 7 May 2011: sha1sum 1793a7b15d905a9fa82f9a969a96fa53abaac04c
     # 14 May: removed checksum, changes too often to track
     # 7 Mar 2012: sha1sum 73ba69b5d0004239a709af5db57c88c9d9c8f7b2
-    w_download http://download.utorrent.com/3.1.2/uTorrent.exe 73ba69b5d0004239a709af5db57c88c9d9c8f7b2
+    # 28 Jun 2013: sha1sum d2408c8a09a2bd9704af39f818ec7ac9e9cca46e
+    w_download http://download-new.utorrent.com/endpoint/utorrent/os/windows/track/stable/ d2408c8a09a2bd9704af39f818ec7ac9e9cca46e uTorrent.exe
 
-    case "$W_OPT_UNATTENDED" in
-    0) _W_opt="" ;;
-    *) _W_opt="/PERFORMINSTALL /NORUN" ;;
-    esac
     cd "$W_CACHE/$W_PACKAGE"
-    $WINE $file1 $_W_opt
+    # If you don't use /PERFORMINSTALL, it just runs uTorrent
+    # FIXME: That's no longer a quiet option, though..
+    $WINE $file1 /PERFORMINSTALL /NORUN
 
     # dang installer exits with status 1 on success
     status=$?
@@ -9157,11 +9177,7 @@
     *) w_die "Note: utorrent installer returned status '$status'.  Aborting." ;;
     esac
 
-    # for backwards compatibility
-    rm -f "$W_WINDIR_UNIX"/utorrent.exe
-    w_try cp -f "$W_PROGRAMS_X86_UNIX/uTorrent/uTorrent.exe" "$W_WINDIR_UNIX"/uTorrent.exe
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\uTorrent" "uTorrent.exe"
+    w_declare_exe "$W_DRIVE_C\\users\\$LOGNAME\\Application Data\\uTorrent" "uTorrent.exe"
 }
 
 #----------------------------------------------------------------
@@ -9507,7 +9523,7 @@
     title="Windows Media Player 10" \
     publisher="Microsoft" \
     year="2006" \
-    media="manual_download" \
+    media="download" \
     file1="MP10Setup.exe" \
     installed_file1="$W_SYSTEM32_DLLS_WIN/l3codecp.acm"
 
@@ -9520,7 +9536,7 @@
     w_call wsh57
 
     # http://www.microsoft.com/downloads/en/details.aspx?FamilyID=b446ae53-3759-40cf-80d5-cde4bbe07999
-    w_download_manual http://www.softpedia.com/get/Multimedia/Audio/Audio-Players/Windows-Media-Player.shtml MP10Setup.exe 69862273a5d9d97b4a2e5a3bd93898d259e86657
+    w_download http://download.microsoft.com/download/1/2/a/12a31f29-2fa9-4f50-b95d-e45ef7013f87/MP10Setup.exe 69862273a5d9d97b4a2e5a3bd93898d259e86657
 
     # Crashes on exit, but otherwise ok; see http://bugs.winehq.org/show_bug.cgi?id=12633
     cd "$W_CACHE"/wmp10
@@ -9765,22 +9781,17 @@
     title="3D Mark 06" \
     publisher="Futuremark" \
     year="2006" \
-    media="download" \
-    file1="3dmark06_v120_1901.exe" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/Futuremark/3DMark06/3DMark06.exe" \
-    wine_showstoppers="9210"
+    media="manual_download" \
+    file1="3DMark06_v121_installer.exe" \
+    installed_exe1="$W_PROGRAMS_X86_WIN/Futuremark/3DMark06/3DMark06.exe"
 
 load_3dmark06()
 {
-    # http://www.futuremark.com/benchmarks/3dmark06/download/
-    if ! test -f "$W_CACHE/$W_PACKAGE/3DMark06_v120_1901.exe"
-    then
-        w_download http://www.ocinside.de/download/3dmark06_v120_1901.exe 2e4a52d5b0f7caebd7b4407dfa9e258ac623b5dd
-    fi
+    w_download_manual http://www.futuremark.com/support/downloads 3DMark06_v121_installer.exe a125a4b0a5649f848292f38cf424c672d8142058
 
     cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
-        run 3DMark06_v120_1901.exe
+        run $file1
         WinWait ahk_class #32770, Welcome
         if ( w_opt_unattended > 0 ) {
             Send {Enter}
@@ -9795,8 +9806,6 @@
             ControlClick Button2 ; OK
             WinWait ahk_class #32770
             ControlClick Button1 ; OK
-            WinWait, ahk_class #32770, Purchase
-            ControlClick Button4 ; Later
         }
         WinWait, ahk_class #32770, Complete
         if ( w_opt_unattended > 0 ) {
@@ -9808,12 +9817,12 @@
 
     if w_workaround_wine_bug 9210
     then
-        w_warn "You may need to apply the patch in http://bugs.winehq.org/show_bug.cgi?id=9210 to fix pCaps->MaxPointSize, or the benchmark will w_warn that shader model 2.0 is not present, and refuse to run."
+        w_warn "The benchmark may warn that shader model 2.0 is not present.  You can ignore this, but if you want to work around it, see http://bugs.winehq.org/show_bug.cgi?id=9210 for a patch."
     fi
 
-    if w_workaround_wine_bug 22393
+    if w_workaround_wine_bug 0 "Installing shader compiler..."
     then
-        # "Demo" button doesn't work without this
+        # "Demo" button doesn't work without this.  d3dcompiler_43 related.
         w_call d3dx9_28
         w_call d3dx9_36
     fi
@@ -10159,7 +10168,7 @@
 
         # And turn off after-effects to fix depth of field problem caused
         # by disabling glsl...
-        cd "$W_DRIVE_C/users/$USERNAME/My Documents"
+        cd "$W_DRIVE_C/users/$LOGNAME/My Documents"
         dir="Ubisoft/Assassin's Creed Brotherhood"
         file="$dir/ACBrotherhood.ini"
         if test -f "$file"
@@ -10304,7 +10313,7 @@
     fi
 
     cd "$W_TMP"
-    w_try unrar x "$W_CACHE/$W_PACKAGE/Avatar_The_Game_Demo.exe"
+    w_try_unrar "$W_CACHE/$W_PACKAGE/Avatar_The_Game_Demo.exe"
     w_ahk_do "
         SetTitleMatchMode, 2
         SetWinDelay 500
@@ -10565,7 +10574,7 @@
     if w_workaround_wine_bug 22762
     then
         # FIXME: does this directory name change in win7?
-        cd "$W_DRIVE_C/users/$USERNAME/My Documents"
+        cd "$W_DRIVE_C/users/$LOGNAME/My Documents"
         if test -f BFBC2/settings.ini
         then
             mv BFBC2/settings.ini BFBC2/oldsettings.ini
@@ -10772,14 +10781,12 @@
 
 load_cnc_tiberian_sun()
 {
-    w_download \
-        http://na.llnet.cnc3tv.ea.com/u/f/eagames/cnc3/cnc3tv/Classic/$file1 \
-        591aabd639fb9f2d2476a2150f3c00b1162674f5
+    w_download http://lvlt.bioware.cdn.ea.com/u/f/eagames/cnc3/cnc3tv/Classic/$file1 591aabd639fb9f2d2476a2150f3c00b1162674f5
 
     cd "$W_PROGRAMS_X86_UNIX"
     # FIXME: we need a progress indicator when unpacking large archives
     w_info "Unpacking rar file.  This will take a minute."
-    w_try unrar x "$W_CACHE/$W_PACKAGE/$file1"
+    w_try_unrar "$W_CACHE/$W_PACKAGE/$file1"
 
     w_declare_exe \
         "$W_PROGRAMS_X86_WIN\\EA Games\\Command & Conquer The First Decade\\Command & Conquer(tm) Tiberian Sun(tm)\\SUN" \
@@ -11919,7 +11926,7 @@
         winwait, Choose Installation Size
         send {u}
         send {Enter}
-        send {Raw}$USERNAME
+        send {Raw}$LOGNAME
         send {Tab}{Raw}$W_KEY
         send {Enter}
         winwait, Diablo II - choose install directory
@@ -12242,7 +12249,7 @@
     done
 
     # FIXME: does this directory name change in win7?
-    ini="$W_DRIVE_C/users/$USERNAME/My Documents/BioWare/Dragon Age/Settings/DragonAge.ini"
+    ini="$W_DRIVE_C/users/$LOGNAME/My Documents/BioWare/Dragon Age/Settings/DragonAge.ini"
     if ! test -f "$ini"
     then
         w_warn "$ini not found?"
@@ -12374,7 +12381,7 @@
 
 load_dragonage2_demo()
 {
-    w_download http://na.llnet.bioware.cdn.ea.com/u/f/eagames/bioware/dragonage2/demo/DragonAge2Demo_F93M2qCj_EnEsItPlRu.exe a94715cd7943533a3cf1d84d40e667b04e1abc2e
+    w_download http://lvlt.bioware.cdn.ea.com/bioware/u/f/eagames/bioware/dragonage2/demo/DragonAge2Demo_F93M2qCj_EnEsItPlRu.exe a94715cd7943533a3cf1d84d40e667b04e1abc2e
 
     cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -12419,13 +12426,13 @@
     publisher="CCP Games" \
     year="2011" \
     media="download" \
-    file1="EVE_Premium_Setup_264377_m.exe" \
+    file1="EVE_Online_Installer_561078.exe" \
     installed_exe1="$W_PROGRAMS_X86_WIN/CCP/EVE/eve.exe"
 
 load_eve()
 {
     # http://www.eveonline.com/download/?fallback=1&
-    w_download http://content.eveonline.com/EVE_Premium_Setup_264377_m.exe 00d930853c68d2a75f29558b344f885f6c2ff6a7
+    w_download http://content.eveonline.com/561078/EVE_Online_Installer_561078.exe 5b5f0cd4fbd42f82b1d1cccb2e22ddeed97d1d3a
 
     if w_workaround_wine_bug 18221
     then
@@ -12435,7 +12442,7 @@
     cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
         run, $file1
-        WinWait, EVE Online Installer
+        WinWait, EVE Online
         if ( w_opt_unattended > 0 ) {
             WinActivate
             send {Enter}         ; Next
@@ -12452,7 +12459,7 @@
             ControlClick Button4  ; untick Launch
             Send {Enter}         ; Finish (Button2)
         }
-        WinWaitClose, EVE Online Installer
+        WinWaitClose, EVE Online
     "
     w_declare_exe "$W_PROGRAMS_X86_WIN\\CCP\\EVE" "eve.exe"
 }
@@ -12697,22 +12704,23 @@
 w_metadata hon games \
     title="Heroes of Newerth" \
     publisher="S2 Games" \
-    year="2010" \
+    year="2013" \
     media="download" \
-    file1="HoNClient-2.2.8.exe" \
+    file1="HoNClient-3.1.2.exe" \
     installed_exe1="$W_PROGRAMS_X86_WIN/Heroes of Newerth/hon.exe"
 
 load_hon()
 {
-    w_download http://dl.heroesofnewerth.com/HoNClient-2.2.8.exe 15eb6fc4b5da5b2316e52d955dbfb0797496789c
+    w_download http://dl.heroesofnewerth.com/HoNClient-3.1.2.exe 49123d092f1fa75b8dddc20c817ab8addd5aee5f
 
     cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
         SetTitleMatchMode, 2
         run, $file1
-        winwait, Heroes of Newerth
-        u = $W_OPT_UNATTENDED
-        if ( u > 0 ) {
+        winwait, Installer Language
+        if ( w_opt_unattended > 0 ) {
+            send {Enter}
+            winwait, Heroes of Newerth
             controlclick, Button2, Heroes of Newerth
             winwait, Heroes of Newerth, License
             controlclick, Button2, Heroes of Newerth, License
@@ -12727,6 +12735,10 @@
         }
         winwaitclose, Heroes of Newerth, Finish
     "
+    if w_workaround_wine_bug 25919 "disabling mmdevapi to fix sound and avoid crash"
+    then
+        w_override_dlls disabled mmdevapi
+    fi
 
     w_declare_exe "$W_PROGRAMS_X86_WIN\\Heroes of Newerth" "hon.exe"
 }
@@ -13023,7 +13035,7 @@
             send {enter}
             winwait, Grand Theft Auto Vice City, Customer Information
             controlclick, edit1
-            send $USERNAME
+            send $LOGNAME
             send {tab}
             send company ; installer won't proceed without something here
             send {enter}
@@ -13288,7 +13300,7 @@
     year="2004" \
     media="download" \
     file1="InstallIMVU_465.0_st_c.exe" \
-    installed_exe1="c:/users/$USERNAME/Application Data/IMVUClient/IMVUClient.exe"
+    installed_exe1="c:/users/$LOGNAME/Application Data/IMVUClient/IMVUClient.exe"
 
 load_imvu()
 {
@@ -13321,7 +13333,7 @@
         winwaitclose
     "
 
-    w_declare_exe "c:\\users\\$USERNAME\\Application Data\\IMVUClient" "IMVUClient.exe"
+    w_declare_exe "c:\\users\\$LOGNAME\\Application Data\\IMVUClient" "IMVUClient.exe"
 }
 
 #----------------------------------------------------------------
@@ -13500,8 +13512,8 @@
     "
 
     # download 1.0a and 1.0b patches
-    w_download "ftp://ftp.lucasarts.com/patches/pc/KotOR2 Patch v201420 UK.exe" ab97a0d41ae15782418d0fd1b2ad43ccf35ca070
-    w_download "ftp://ftp.lucasarts.com/patches/pc/sw_pc_uk_from201420_to211427.exe" cf4ed797a0314b3ca047012f732321c6ba9a2388
+    w_download ftp://ftp.lucasarts.com/patches/pc/KotOR2%20Patch%20v201420%20UK.exe ab97a0d41ae15782418d0fd1b2ad43ccf35ca070
+    w_download ftp://ftp.lucasarts.com/patches/pc/sw_pc_uk_from201420_to211427.exe cf4ed797a0314b3ca047012f732321c6ba9a2388
 
     cd "$W_CACHE/$W_PACKAGE"
 
@@ -14360,7 +14372,7 @@
         }
         winwait, Setup, Complete
         if ( w_opt_unattended > 0 ) {
-            controlclick, Button4   ; Don't run
+            controlclick, Button4   ; Do not run
             controlclick, Button2   ; Finish
         }
         winwaitclose
@@ -14443,9 +14455,9 @@
 w_metadata nfsworld games \
     title="Need For Speed World" \
     publisher="EA" \
-    year="2012" \
+    year="2013" \
     media="download" \
-    file1="setup_1229.exe" \
+    file1="setup_nfsw" \
     installed_exe1="$W_PROGRAMS_X86_WIN/Electronic Arts/Need For Speed World/GameLauncher.exe"
 
 load_nfsworld()
@@ -14454,19 +14466,25 @@
 
     w_workaround_wine_bug 27047 "Game fails with corrupt executable error in wine-1.3.19 and earlier" 1.3.20,
 
-    # This changes frequently, I'm afraid
+    # This changes frequently, I fear
     # Be careful to update $file1 when you update the url
     # 1.8.40.65   9b1f10af09350e2b3f5ccbc679dbea628e9f432d0 ?
     # 1.8.40.1229 f355fcad20dd6267910bec93a318224718ab5de7
-    w_download http://static.cdn.ea.com/blackbox/u/f/NFSWO/1229/launcher/weblaunch_1.8.40.1229/setup_1229.exe f355fcad20dd6267910bec93a318224718ab5de7
+    # 4 July 2013 1.8.40.1509 6f76c74ae07d36470931bac74b44548d1a319ce0
+    w_download http://static.cdn.ea.com/blackbox/u/f/NFSWO/1509/launcher/weblaunch_1.8.40.1509/setup_nfsw.exe 6f76c74ae07d36470931bac74b44548d1a319ce0
 
-    if w_workaround_wine_bug 25658 "Installing dotnet20 and ie7 so launcher UI works"
+    # pre-1.6 versions of wine also needed ie7?
+    if w_workaround_wine_bug 25658 "Installing dotnet20 so launcher does not just exit"
     then
-        w_call ie7
         w_call dotnet20
     fi
 
-    if test "$W_OPT_UNATTENDED" && w_workaround_wine_bug 25961
+    if w_workaround_wine_bug 28652 "Installing gdiplus so launcher does not look horrible (and to work around crash bug 33880, too)"
+    then
+        w_call gdiplus
+    fi
+
+    if test "$W_OPT_UNATTENDED" && w_workaround_wine_bug 25961 "Installing vcrun2008 just to make unattended install easier"
     then
         w_call vcrun2008
     fi
@@ -14481,9 +14499,11 @@
         SetWinDelay 500
         SetTitleMatchMode, 2
         run $file1
-        winwait Setup - Need For Speed
+        winwait, Language
         if ( w_opt_unattended > 0 ) {
             ControlClick TNewButton1        ; Next
+            winwait Setup - Need For Speed
+            ControlClick TNewButton1        ; Next
             winwait Setup - Need For Speed, License
             ControlClick TNewRadioButton1   ; Accept
             sleep 1000
@@ -15554,7 +15574,7 @@
 
 load_spore_cc_demo()
 {
-    w_download http://na.llnet.cdn.ea.com/u/f/eagames/spore/scc/promo/792248d6ad421d577132c2b648bbed45_scc_trial_na.exe 06da5558e6ebbc39d2fac955eceab78cf8470e07
+    w_download http://lvlt.bioware.cdn.ea.com/u/f/eagames/spore/scc/promo/792248d6ad421d577132c2b648bbed45_scc_trial_na.exe 06da5558e6ebbc39d2fac955eceab78cf8470e07
 
     w_info "The installer runs on for about a minute after it's done."
 
@@ -17703,7 +17723,6 @@
     mfc40:size_MB=48,time_sec=0 \
     mfc42:size_MB=47,time_sec=1 \
     mingw:size_MB=132,time_sec=3 \
-    mono210:size_MB=463,time_sec=26 \
     mozillabuild:size_MB=891,time_sec=26 \
     mpc:size_MB=87,time_sec=2 \
     msasn1:size_MB=178,time_sec=3 \