From 3736c7c3f606385e9c0710422ff6a4fa3ae4225124aaaeaba32900b51ccc7dbd Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Fri, 17 Apr 2015 14:09:31 +0000
Subject: [PATCH] - Updated to 1.7.41 development snapshot   - More Known
 Folders supported in the shell.   - Some more support for kernel job objects.
   - More MSI patches improvements.   - Some theming fixes.   - Various bug
 fixes. - updated winetricks

OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=276
---
 wine-1.7.40.tar.bz2      |   3 -
 wine-1.7.40.tar.bz2.sign |   7 -
 wine-1.7.41.tar.bz2      |   3 +
 wine-1.7.41.tar.bz2.sign |   7 +
 wine.changes             |  11 +
 wine.spec                |   2 +-
 winetricks               | 653 +++++++++++++++++++++++++++++----------
 7 files changed, 508 insertions(+), 178 deletions(-)
 delete mode 100644 wine-1.7.40.tar.bz2
 delete mode 100644 wine-1.7.40.tar.bz2.sign
 create mode 100644 wine-1.7.41.tar.bz2
 create mode 100644 wine-1.7.41.tar.bz2.sign

diff --git a/wine-1.7.40.tar.bz2 b/wine-1.7.40.tar.bz2
deleted file mode 100644
index b8db240..0000000
--- a/wine-1.7.40.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d82e639a553765437f9a3f864f383e8e4e1eb0f1dd815263f9fda1c78d5cab6
-size 22183479
diff --git a/wine-1.7.40.tar.bz2.sign b/wine-1.7.40.tar.bz2.sign
deleted file mode 100644
index 1b46e6c..0000000
--- a/wine-1.7.40.tar.bz2.sign
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iEYEABECAAYFAlUenDIACgkQ9ebp7rlGHddlbgCguMK1IghpV1wUt6xbkdTMuFMF
-0O0AoIdGPNfpADJxL3jAWB/2/aQrdiNP
-=b6F4
------END PGP SIGNATURE-----
diff --git a/wine-1.7.41.tar.bz2 b/wine-1.7.41.tar.bz2
new file mode 100644
index 0000000..3c2ea1d
--- /dev/null
+++ b/wine-1.7.41.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6fa622b1dacb257fab671ddd689439daf6bb1cfb9e632c324db16a5db6372f97
+size 22237972
diff --git a/wine-1.7.41.tar.bz2.sign b/wine-1.7.41.tar.bz2.sign
new file mode 100644
index 0000000..e98c44c
--- /dev/null
+++ b/wine-1.7.41.tar.bz2.sign
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAlUxEC8ACgkQ9ebp7rlGHdfCWgCgmXTVLYDbPbwLshnyxzdz6gFd
+QxIAoIOGoBP6DaEMR5RWPQRCxfdZHECM
+=40Or
+-----END PGP SIGNATURE-----
diff --git a/wine.changes b/wine.changes
index 8556919..f3d78a8 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Apr 17 14:06:38 UTC 2015 - meissner@suse.com
+
+- Updated to 1.7.41 development snapshot
+  - More Known Folders supported in the shell.
+  - Some more support for kernel job objects.
+  - More MSI patches improvements.
+  - Some theming fixes.
+  - Various bug fixes.
+- updated winetricks
+
 -------------------------------------------------------------------
 Sun Apr  5 17:53:17 UTC 2015 - meissner@suse.com
 
diff --git a/wine.spec b/wine.spec
index 617f0da..6d4ee07 100644
--- a/wine.spec
+++ b/wine.spec
@@ -56,7 +56,7 @@ BuildRequires:  sane-backends-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  valgrind-devel
 BuildRequires:  xorg-x11-devel
-Version:        1.7.40
+Version:        1.7.41
 Release:        0
 Summary:        An MS Windows Emulator
 License:        LGPL-2.1+
diff --git a/winetricks b/winetricks
index 9c62a1c..25ad5a6 100644
--- a/winetricks
+++ b/winetricks
@@ -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=20150316
+WINETRICKS_VERSION=20150416
 
 # This is a utf-8 file
 # You should see an o with two dots over it here [ö]
@@ -295,6 +295,43 @@ w_try()
     fi
 }
 
+w_try_7z()
+{
+    # $1 - directory to extract to
+    # $2 - file to extract
+    # Not always installed, use Windows 7-zip as a fallback:
+    if test -x "`which 7z 2>/dev/null`"
+    then
+        w_try 7z x "$2" -o"$1"
+    else
+        w_warn "Cannot find 7z.  Using Windows 7-zip instead. (You can avoid this by installing 7z, e.g. 'sudo apt-get install p7zip-full' or 'sudo yum install p7zip p7zip-plugins')."
+        WINETRICKS_OPT_SHAREDPREFIX=1 w_call 7zip
+        # errors out if there is a space between -o and path
+        w_try "$WINE" "$W_PROGRAMS_X86_WIN\\7-Zip\\7z.exe" x "`w_pathconv -w $2`" -o"`w_pathconv -w $1`"
+    fi
+}
+
+w_try_cabextract()
+{
+    # Not always installed, but shouldn't be fatal unless it's being used
+    if test ! -x "`which cabextract 2>/dev/null`"
+    then
+        w_die "Cannot find cabextract.  Please install it (e.g. 'sudo apt-get install cabextract' or 'sudo yum install cabextract')."
+    fi
+
+    w_try cabextract -q "$@"
+}
+
+w_try_msiexec64()
+{
+    if test "$W_ARCH" != "win64"
+    then
+        w_die "bug: 64-bit msiexec called from a $W_ARCH prefix."
+    fi
+
+    w_try "$WINE" start /wait "$W_SYSTEM64_DLLS_WIN32/msiexec.exe" $W_UNATTENDED_SLASH_Q "$@"
+}
+
 w_try_regedit()
 {
     # on windows, doesn't work without cmd /c
@@ -311,48 +348,49 @@ w_try_regsvr()
     w_try "$WINE" regsvr32 $W_UNATTENDED_SLASH_S $@
 }
 
-w_try_cabextract()
-{
-    # Not always installed, but shouldn't be fatal unless it's being used
-    if test ! -x "`which cabextract 2>/dev/null`"
-    then
-        w_die "Cannot find cabextract.  Please install it (e.g. 'sudo apt-get install cabextract' or 'sudo yum install cabextract')."
-    fi
-
-    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
+    # $1 - zipfile to extract (keeping internal paths, in cwd)
 
-    w_try unrar x "$@"
+    # Not always installed, use Windows 7-zip as a fallback:
+    if test -x "`which unrar 2>/dev/null`"
+    then
+        w_try unrar x "$@"
+    else
+        w_warn "Cannot find unrar.  Using Windows 7-zip instead. (You can avoid this by installing unrar, e.g. 'sudo apt-get install unrar' or 'sudo yum install unrar')."
+        WINETRICKS_OPT_SHAREDPREFIX=1 w_call 7zip
+        w_try "$WINE" "$W_PROGRAMS_X86_WIN\\7-Zip\\7z.exe" x "`w_pathconv -w $1`"
+    fi
 }
 
 w_try_unzip()
 {
-    # Not always installed, but shouldn't be fatal unless it's being used
-    if test ! -x "`which unzip 2>/dev/null`"
+    # $1 - directory to extract to
+    # $2 - zipfile to extract
+    # $3 .. $n - files to extract from the archive
+
+    destdir="$1"
+    zipfile="$2"
+    shift 2
+
+    # Not always installed, use Windows 7-zip as a fallback:
+    if test -x "`which unzip 2>/dev/null`"
     then
-        w_die "Cannot find unzip.  Please install it (e.g. 'sudo apt-get install unzip' or 'sudo yum install unzip')."
+        # FreeBSD ships unzip, but it doesn't support self compressed exectuables
+        # If it fails ,fall back to 7-zip:
+        unzip -o -q -d"$destdir" "$zipfile" "$@"
+        ret=$?
+        case $ret in
+            0) return ;;
+            1|*) w_warn "Unzip failed, trying Windows 7-zip instead." ;;
+        esac
+    else
+        w_warn "Cannot find unzip.  Using Windows 7-zip instead. (You can avoid this by installing unzip, e.g. 'sudo apt-get install unzip' or 'sudo yum install unzip')."
     fi
 
-    w_try unzip -o -q "$@"
-}
-
-w_try_7z()
-{
-    # Not always installed, but shouldn't be fatal unless it's being used
-    if test ! -x "`which 7z 2>/dev/null`"
-    then
-        w_die "Cannot find 7z.  Please install it (e.g. 'sudo apt-get install p7zip-full' or 'sudo yum install p7zip p7zip-plugins')."
-    fi
-
-    w_try 7z "$@"
+    WINETRICKS_OPT_SHAREDPREFIX=1 w_call 7zip
+    # errors out if there is a space between -o and path
+    w_try "$WINE" "$W_PROGRAMS_X86_WIN\\7-Zip\\7z.exe" x "`w_pathconv -w $zipfile`" -o"`w_pathconv -w $destdir`" "$@"
 }
 
 w_read_key()
@@ -388,6 +426,15 @@ w_read_key()
         uk*) _W_keymsg="Будь ласка, введіть ключ для додатка '$W_PACKAGE'"
             _W_nokeymsg="Ключ не надано"
             ;;
+        zh_CN*)  _W_keymsg="按任意键为 '$W_PACKAGE'"
+            _W_nokeymsg="No key given"
+            ;;
+        zh_TW*)  _W_keymsg="按任意鍵為 '$W_PACKAGE'"
+            _W_nokeymsg="No key given"
+            ;;
+        zh_HK*)  _W_keymsg="按任意鍵為 '$W_PACKAGE'"
+            _W_nokeymsg="No key given"
+            ;;
         *)  _W_keymsg="Please enter the key for app '$W_PACKAGE'"
             _W_nokeymsg="No key given"
             ;;
@@ -697,9 +744,9 @@ w_download_to()
         # Also affects ttf files on github
         _W_filetype=`which file 2>/dev/null`
         case $_W_filetype-$_W_file in
-        /*-*.exe|/*-*.ttf)
+        /*-*.exe|/*-*.ttf|/*-*.zip)
             case `file "$_W_file"` in
-            *gzip*) mv "$_W_file" "$_W_file.gz"; gunzip < "$_W_file.gz" > "$_W_file";;
+            *:*gzip*) mv "$_W_file" "$_W_file.gz"; gunzip < "$_W_file.gz" > "$_W_file";;
             esac
         esac
 
@@ -843,6 +890,9 @@ w_download_manual_to()
     de*) _W_dlmsg="Bitte laden Sie $_W_file von $_W_url runter, stellen Sie's in $W_CACHE/$_W_packagename, dann wiederholen Sie diesen Kommando.";;
     pl*) _W_dlmsg="Proszę pobrać plik $_W_file z $_W_url, następnie umieścić go w $W_CACHE/$_W_packagename, a na końcu uruchomić ponownie ten skrytp.";;
     uk*) _W_dlmsg="Будь ласка, звантажте $_W_file з $_W_url, розташуйте в $W_CACHE/$_W_packagename, потім запустіть скрипт знову.";;
+    zh_CN*) _W_dlmsg="请从 $_W_url 下载 $_W_file，并置放于 $W_CACHE/$_W_packagename, 然后重新运行 winetricks.";;
+    zh_TW*) _W_dlmsg="請從 $_W_url 下載 $_W_file，并置放於 $W_CACHE/$_W_packagename, 然后重新執行 winetricks.";;
+    zh_HK*) _W_dlmsg="請從 $_W_url 下載 $_W_file，并置放於 $W_CACHE/$_W_packagename, 然后重新執行 winetricks.";;
     *) _W_dlmsg="Please download $_W_file from $_W_url, place it in $W_CACHE/$_W_packagename, then re-run this script.";;
     esac
 
@@ -1351,7 +1401,7 @@ w_ahk_do()
     then
         W_BROWSERAGENT=1 \
         w_download_to ahk http://www.autohotkey.com/download/AutoHotkey104805.zip b3981b13fbc45823131f69d125992d6330212f27
-        w_try_unzip -d "$W_CACHE/ahk"  "$W_CACHE/ahk/AutoHotkey104805.zip" AutoHotkey.exe AU3_Spy.exe
+        w_try_unzip "$W_CACHE/ahk" "$W_CACHE/ahk/AutoHotkey104805.zip" AutoHotkey.exe AU3_Spy.exe
         chmod +x "$W_CACHE/ahk/AutoHotkey.exe"
     fi
 
@@ -1875,6 +1925,9 @@ w_workaround_wine_bug()
     de*) w_warn "Wine-Fehler ${1} wird umgegangen $_W_msg" ;;
     pl*) w_warn "Obchodzenie błędu w wine ${1} $_W_msg" ;;
     uk*) w_warn "Обхід помилки ${1} $_W_msg" ;;
+    zh_CN*)   w_warn "绕过 wine bug ${1} $_W_msg" ;;
+    zh_TW*)   w_warn "繞過 wine bug ${1} $_W_msg" ;;
+    zh_HK*)   w_warn "繞過 wine bug ${1} $_W_msg" ;;
     *)   w_warn "Working around wine bug ${1} $_W_msg" ;;
     esac
     winetricks_stats_log_command w_workaround_wine_bug-$1
@@ -2303,6 +2356,42 @@ winetricks_prefixmenu()
          _W_msg_showbroken1="Показати нестабільні додатки (наприклад з проблемами з DRM)"
          _W_msg_help="Переглянути довідку"
          ;;
+    zh_CN*)   _W_msg_title="Windows 应用安装向导 - 选择一个 wine 容器"
+         _W_msg_body='君欲何为？'
+         _W_msg_apps='安装一个 windows 应用'
+         _W_msg_games='安装一个游戏'
+         _W_msg_benchmarks='安装一个基准测试软件'
+         _W_msg_default="选择默认的 wine 容器"
+         _W_msg_unattended0="禁用静默安装"
+         _W_msg_unattended1="启用静默安装"
+         _W_msg_showbroken0="隐藏有问题的程序 (例如那些有数字版权问题)"
+         _W_msg_showbroken1="有问题的程序 (例如那些有数字版权问题)"
+         _W_msg_help="查看帮助"
+         ;;
+    zh_TW*)   _W_msg_title="Windows 應用裝載向導 - 選取一個 wine 容器"
+         _W_msg_body='君欲何為？'
+         _W_msg_apps='裝載一個 windows 應用'
+         _W_msg_games='裝載一個游戲'
+         _W_msg_benchmarks='裝載一個基准測試軟體'
+         _W_msg_default="選取預設的 wine 容器"
+         _W_msg_unattended0="禁用靜默裝載"
+         _W_msg_unattended1="啟用靜默裝載"
+         _W_msg_showbroken0="隱藏有問題的程式 (例如那些有數字版權問題)"
+         _W_msg_showbroken1="有問題的程式 (例如那些有數字版權問題)"
+         _W_msg_help="檢視輔助說明"
+         ;;
+    zh_HK*)   _W_msg_title="Windows 應用裝載向導 - 選取一個 wine 容器"
+         _W_msg_body='君欲何為？'
+         _W_msg_apps='裝載一個 windows 應用'
+         _W_msg_games='裝載一個游戲'
+         _W_msg_benchmarks='裝載一個基准測試軟體'
+         _W_msg_default="選取預設的 wine 容器"
+         _W_msg_unattended0="禁用靜默裝載"
+         _W_msg_unattended1="啟用靜默裝載"
+         _W_msg_showbroken0="隱藏有問題的程式 (例如那些有數字版權問題)"
+         _W_msg_showbroken1="有問題的程式 (例如那些有數字版權問題)"
+         _W_msg_help="檢視輔助說明"
+         ;;
     *)   _W_msg_title="Winetricks - choose a wineprefix"
          _W_msg_body='What do you want to do?'
          _W_msg_apps='Install an app'
@@ -2453,6 +2542,42 @@ winetricks_mainmenu()
          _W_msg_folder='Перегляд файлів'
          _W_msg_annihilate="Видалити УСІ ДАНІ ТА ПРОГРАМИ З ЦЬОГО WINEPREFIX"
          ;;
+    zh_CN*)   _W_msg_title="Windows 应用安装向导 - 当前容器路径是 \"$WINEPREFIX\""
+         _W_msg_body='管理当前容器'
+         _W_msg_dlls="安装 Windows DLL 或组件"
+         _W_msg_fonts='安装字体'
+         _W_msg_settings='修改设置'
+         _W_msg_winecfg='运行 winecfg'
+         _W_msg_regedit='运行注册表'
+         _W_msg_taskmgr='运行任务管理器'
+         _W_msg_shell='运行命令提示窗口 (作为调试)'
+         _W_msg_folder='浏览容器中的文件'
+         _W_msg_annihilate="删除当前容器所有相关文件，包括启动器，完全卸载"
+         ;;
+    zh_TW*)   _W_msg_title="Windows 應用裝載向導 - 目前容器路徑是 \"$WINEPREFIX\""
+         _W_msg_body='管理目前容器'
+         _W_msg_dlls="裝載 Windows DLL 或套件"
+         _W_msg_fonts='裝載字型'
+         _W_msg_settings='修改設定'
+         _W_msg_winecfg='執行 winecfg'
+         _W_msg_regedit='執行註冊表'
+         _W_msg_taskmgr='執行工作管理者'
+         _W_msg_shell='執行指令輔助說明視窗 (作為除錯)'
+         _W_msg_folder='瀏覽容器中的檔案'
+         _W_msg_annihilate="移除目前容器所有相依檔案，包括啟動器，完全卸載"
+         ;;
+    zh_HK*)   _W_msg_title="Windows 應用裝載向導 - 目前容器路徑是 \"$WINEPREFIX\""
+         _W_msg_body='管理目前容器'
+         _W_msg_dlls="裝載 Windows DLL 或套件"
+         _W_msg_fonts='裝載字型'
+         _W_msg_settings='修改設定'
+         _W_msg_winecfg='執行 winecfg'
+         _W_msg_regedit='執行註冊表'
+         _W_msg_taskmgr='執行工作管理者'
+         _W_msg_shell='執行指令輔助說明視窗 (作為除錯)'
+         _W_msg_folder='瀏覽容器中的檔案'
+         _W_msg_annihilate="移除目前容器所有相依檔案，包括啟動器，完全卸載"
+         ;;
     *)   _W_msg_title="Winetricks - current prefix is \"$WINEPREFIX\""
          _W_msg_body='What would you like to do to this wineprefix?'
          _W_msg_dlls="Install a Windows DLL or component"
@@ -2533,6 +2658,15 @@ winetricks_settings_menu()
     uk*) _W_msg_title="Winetricks - поточний prefix \"$WINEPREFIX\""
          _W_msg_body='Які налаштування Ви хочете змінити?'
          ;;
+    zh_CN*)   _W_msg_title="Windows 应用安装向导 - 当前容器路径是 \"$WINEPREFIX\""
+         _W_msg_body='君欲更改哪项设置？'
+         ;;
+    zh_TW*)   _W_msg_title="Windows 應用裝載向導 - 目前容器路徑是 \"$WINEPREFIX\""
+         _W_msg_body='君欲變更哪項設定？'
+         ;;
+    zh_HK*)   _W_msg_title="Windows 應用裝載向導 - 目前容器路徑是 \"$WINEPREFIX\""
+         _W_msg_body='君欲變更哪項設定？'
+         ;;
     *)   _W_msg_title="Winetricks - current prefix is \"$WINEPREFIX\""
          _W_msg_body='Which settings would you like to change?'
          ;;
@@ -2589,6 +2723,42 @@ winetricks_settings_menu()
                 --width $WINETRICKS_MENU_WIDTH \
                 "
             ;;
+        zh_CN*) printf %s "zenity \
+                --title '$_W_msg_title' \
+                --text '$_W_msg_body' \
+                --list \
+                --checklist \
+                --column '' \
+                --column 设置 \
+                --column 标题 \
+                --height $WINETRICKS_MENU_HEIGHT \
+                --width $WINETRICKS_MENU_WIDTH \
+                "
+            ;;
+        zh_TW*) printf %s "zenity \
+                --title '$_W_msg_title' \
+                --text '$_W_msg_body' \
+                --list \
+                --checklist \
+                --column '' \
+                --column 設定 \
+                --column 標題 \
+                --height $WINETRICKS_MENU_HEIGHT \
+                --width $WINETRICKS_MENU_WIDTH \
+                "
+            ;;
+        zh_HK*) printf %s "zenity \
+                --title '$_W_msg_title' \
+                --text '$_W_msg_body' \
+                --list \
+                --checklist \
+                --column '' \
+                --column 設定 \
+                --column 標題 \
+                --height $WINETRICKS_MENU_HEIGHT \
+                --width $WINETRICKS_MENU_WIDTH \
+                "
+            ;;
         *) printf %s "zenity \
                 --title '$_W_msg_title' \
                 --text '$_W_msg_body' \
@@ -2659,6 +2829,18 @@ winetricks_showmenu()
          _W_msg_body='Які пакунки Ви хочете встановити?'
          _W_cached="кешовано"
          ;;
+    zh_CN*)   _W_msg_title="Windows 应用安装向导 - 当前容器路径是 \"$WINEPREFIX\""
+         _W_msg_body='君欲安装何种应用？'
+         _W_cached="已缓存"
+         ;;
+    zh_TW*)   _W_msg_title="Windows 應用裝載向導 - 目前容器路徑是 \"$WINEPREFIX\""
+         _W_msg_body='君欲裝載何種應用？'
+         _W_cached="已緩存"
+         ;;
+    zh_HK*)   _W_msg_title="Windows 應用裝載向導 - 目前容器路徑是 \"$WINEPREFIX\""
+         _W_msg_body='君欲裝載何種應用？'
+         _W_cached="已緩存"
+         ;;
     *)   _W_msg_title="Winetricks - current prefix is \"$WINEPREFIX\""
          _W_msg_body='Which package(s) would you like to install?'
          _W_cached="cached"
@@ -2741,6 +2923,60 @@ winetricks_showmenu()
                 --width $WINETRICKS_MENU_WIDTH \
                 "
              ;;
+        zh_CN*) printf %s "zenity \
+                --title '$_W_msg_title' \
+                --text '$_W_msg_body' \
+                --list \
+                --checklist \
+                --column '' \
+                --column 包名 \
+                --column 软件名 \
+                --column 发行商 \
+                --column 发行年 \
+                --column 媒介 \
+                --column 状态 \
+                --column '文件大小 (MB)' \
+                --column '时间 (秒)' \
+                --height $WINETRICKS_MENU_HEIGHT \
+                --width $WINETRICKS_MENU_WIDTH \
+                "
+             ;;
+        zh_TW*) printf %s "zenity \
+                --title '$_W_msg_title' \
+                --text '$_W_msg_body' \
+                --list \
+                --checklist \
+                --column '' \
+                --column 包名 \
+                --column 軟體名 \
+                --column 發行商 \
+                --column 發行年 \
+                --column 媒介 \
+                --column 狀態 \
+                --column '檔案大小 (MB)' \
+                --column '時間 (秒)' \
+                --height $WINETRICKS_MENU_HEIGHT \
+                --width $WINETRICKS_MENU_WIDTH \
+                "
+             ;;
+        zh_HK*) printf %s "zenity \
+                --title '$_W_msg_title' \
+                --text '$_W_msg_body' \
+                --list \
+                --checklist \
+                --column '' \
+                --column 包名 \
+                --column 軟體名 \
+                --column 發行商 \
+                --column 發行年 \
+                --column 媒介 \
+                --column 狀態 \
+                --column '檔案大小 (MB)' \
+                --column '時間 (秒)' \
+                --height $WINETRICKS_MENU_HEIGHT \
+                --width $WINETRICKS_MENU_WIDTH \
+                "
+             ;;
         *) printf %s "zenity \
                 --title '$_W_msg_title' \
                 --text '$_W_msg_body' \
@@ -2953,7 +3189,7 @@ winetricks_list_installed()
     # Jump through a couple hoops to evaluate the verbs in alphabetical order
     # Assume that no filename contains '|'
     cd "$WINETRICKS_METADATA"
-    for _W_metadatafile in `ls */*.vars | sed 's,^\(.*\)/,\1|,' | sort -t\| -k +2 | tr '|' /`
+    for _W_metadatafile in `ls */*.vars | sed 's,^\(.*\)/,\1|,' | sort -t\| -k 2 | tr '|' /`
     do
         # Use a subshell to avoid putting metadata in global space
         # If this is too slow, we can unset known metadata by hand
@@ -2994,6 +3230,9 @@ winetricks_list_all()
     de*) _W_cached="gecached" ; _W_download="herunterladbar";;
     pl*) _W_cached="zarchiwizowane"   ; _W_download="do pobrania"  ;;
     uk*) _W_cached="кешовано"   ; _W_download="завантажуване"  ;;
+    zh_CN*)   _W_cached="已缓存"   ; _W_download="可下载"  ;;
+    zh_TW*)   _W_cached="已緩存"   ; _W_download="可下載"  ;;
+    zh_HK*)   _W_cached="已緩存"   ; _W_download="可下載"  ;;
     *)   _W_cached="cached"   ; _W_download="downloadable"  ;;
     esac
 
@@ -3231,6 +3470,9 @@ winetricks_cache_iso()
             de*)  w_warn "Falsche Disk [$_W_volname] eingelegt.  Bitte legen Sie Disk [$_W_expected_volname] ein!" ;;
         pl*)  w_warn "Włożono zły dysk [$_W_volname].  Proszę włożyć dysk [$_W_expected_volname]" ;;
             uk*)  w_warn "Неправильний диск [$_W_volname].  Будь ласка, вставте диск [$_W_expected_volname]" ;;
+            zh_CN*)    w_warn " [$_W_volname] 光盘插入错误，请插入光盘 [$_W_expected_volname]" ;;
+            zh_TW*)    w_warn " [$_W_volname] 光槃插入錯誤，請插入光槃 [$_W_expected_volname]" ;;
+            zh_HK*)    w_warn " [$_W_volname] 光槃插入錯誤，請插入光槃 [$_W_expected_volname]" ;;
             *)    w_warn "Wrong disc [$_W_volname] inserted.  Please insert disc [$_W_expected_volname]" ;;
             esac
 
@@ -3449,6 +3691,9 @@ winetricks_mount_real_volume()
     de*)_W_mountmsg="Disc '$_W_expected_volname' bitte einlegen (für Pakete '$W_PACKAGE')" ;;
     pl*)  _W_mountmsg="Proszę włożyć dysk '$_W_expected_volname' (potrzebny paczce '$W_PACKAGE')" ;;
     uk*)  _W_mountmsg="Будь ласка, вставте том '$_W_expected_volname' (потрібний для пакунка '$W_PACKAGE')" ;;
+    zh_CN*)  _W_mountmsg="请插入卷 '$_W_expected_volname' (为包 '$W_PACKAGE 所需')" ;;
+    zh_TW*)  _W_mountmsg="請插入卷 '$_W_expected_volname' (為包 '$W_PACKAGE 所需')" ;;
+    zh_HK*)  _W_mountmsg="請插入卷 '$_W_expected_volname' (為包 '$W_PACKAGE 所需')" ;;
     *)  _W_mountmsg="Please insert volume '$_W_expected_volname' (needed for package '$W_PACKAGE')" ;;
     esac
 
@@ -3630,6 +3875,8 @@ winetricks_set_wineprefix()
         W_SYSTEM32_DLLS="$W_WINDIR_UNIX/syswow64"
         W_SYSTEM32_DLLS_WIN="C:\\windows\\syswow64"
         W_SYSTEM64_DLLS="$W_WINDIR_UNIX/system32"
+        W_SYSTEM64_DLLS_WIN32="C:\\windows\\sysnative" # path to access 64-bit dlls from 32-bit apps
+        W_SYSTEM64_DLLS_WIN64="C:\\windows\\system32"  # path to access 64-bit dlls from 64-bit apps
         # 64-bit prefixes still have plenty of issues:
         w_warn "You are using a 64-bit WINEPREFIX. If you encounter problems, please retest in a clean 32-bit WINEPREFIX before reporting a bug."
     else
@@ -3968,6 +4215,9 @@ winetricks_install_app()
     de*) fail_msg="Installieren von Pakete $1 gescheitert" ;;
     pl*) fail_msg="Niepowodzenie przy instalacji paczki $1" ;;
     uk*) fail_msg="Помилка встановлення пакунка $1" ;;
+    zh_CN*)   fail_msg="$1 安装失败" ;;
+    zh_TW*)   fail_msg="$1 裝載失敗" ;;
+    zh_HK*)   fail_msg="$1 裝載失敗" ;;
     *)   fail_msg="Failed to install package $1" ;;
     esac
 
@@ -4208,7 +4458,7 @@ load_comctl32()
     w_download $WINETRICKS_SOURCEFORGE/pocmin/Win%2095_98%20Controls/Win%2095_98%20Controls/CC32inst.exe 94c3c494258cc54bd65d2f0153815737644bffde cc32inst.exe
 
     w_try "$WINE" "$W_CACHE"/comctl32/cc32inst.exe "/T:$W_TMP_WIN" /c $W_UNATTENDED_SLASH_Q
-    w_try_unzip -d "$W_TMP" "$W_TMP"/comctl32.exe
+    w_try_unzip "$W_TMP" "$W_TMP"/comctl32.exe
     w_try "$WINE" "$W_TMP"/x86/50ComUpd.Exe "/T:$W_TMP_WIN" /c $W_UNATTENDED_SLASH_Q
     w_try cp "$W_TMP"/comcnt.dll "$W_SYSTEM32_DLLS"/comctl32.dll
 
@@ -4290,6 +4540,28 @@ load_crypt32()
 
 #----------------------------------------------------------------
 
+w_metadata binkw32 dlls \
+    title="RAD Game Tools binkw32.dll" \
+    publisher="RAD Game Tools, Inc." \
+    year="2000" \
+    media="download" \
+    file1="__32-binkw32.dll3.0.0.0.zip" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/binkw32.dll"
+
+load_binkw32()
+{
+    # Mirror: http://www.dlldump.com/download-dll-files_new.php/dllfiles/B/binkw32.dll/1.0q/download.html
+    # Checksum of the decompressed file: 613f81f82e12131e86ae60dd318941f40db2200f
+    w_download http://www.down-dll.com/dll/b/__32-binkw32.dll3.0.0.0.zip 991f77e8df513ccb8663dc4a2753fbf90338ef5c
+
+    w_try_unzip "$W_TMP" "$W_CACHE"/binkw32/__32-binkw32.dll3.0.0.0.zip
+    w_try cp "$W_TMP"/binkw32.dll "$W_SYSTEM32_DLLS"/binkw32.dll
+
+    w_override_dlls native binkw32
+}
+
+#----------------------------------------------------------------
+
 w_metadata d3dcompiler_43 dlls \
     title="MS d3dcompiler_43.dll" \
     publisher="Microsoft" \
@@ -4316,6 +4588,26 @@ load_d3dcompiler_43()
 
 #----------------------------------------------------------------
 
+w_metadata d3drm dlls \
+    title="MS d3drm.dll" \
+    publisher="Microsoft" \
+    year="2010" \
+    media="download" \
+    file1="../directx9/directx_feb2010_redist.exe" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3drm.dll"
+
+load_d3drm()
+{
+    helper_directx_dl
+
+    w_try_cabextract -d "$W_TMP" -L -F "dxnt.cab" "$W_CACHE"/directx9/$DIRECTX_NAME
+    w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F "d3drm.dll" "$W_TMP/dxnt.cab"
+
+    w_override_dlls native d3drm
+}
+
+#----------------------------------------------------------------
+
 w_metadata d3dx9 dlls \
     title="MS d3dx9_??.dll from DirectX 9 redistributable" \
     publisher="Microsoft" \
@@ -4569,6 +4861,25 @@ load_d3dxof()
 
 #----------------------------------------------------------------
 
+w_metadata dbghelp dlls \
+    title="MS dbghelp" \
+    publisher="Microsoft" \
+    year="2008" \
+    media="download" \
+    file1="../xpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/dbghelp.dll"
+
+load_dbghelp()
+{
+    helper_xpsp3 i386/dbghelp.dll
+
+    w_try cp -f "$W_TMP"/i386/dbghelp.dll "$W_SYSTEM32_DLLS"
+
+    w_override_dlls native dbghelp
+}
+
+#----------------------------------------------------------------
+
 w_metadata devenum dlls \
     title="MS devenum.dll from DirectX user redistributable" \
     publisher="Microsoft" \
@@ -4694,9 +5005,10 @@ load_directplay()
     w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dplayx.dll' "$W_TMP/dxnt.cab"
     w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dpnet.dll' "$W_TMP/dxnt.cab"
     w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dpnhpast.dll' "$W_TMP/dxnt.cab"
+    w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dpnsvr.exe' "$W_TMP/dxnt.cab"
     w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dpwsockx.dll' "$W_TMP/dxnt.cab"
 
-    w_override_dlls native dplayx dpnet dpnhpast dpwsockx
+    w_override_dlls native dplayx dpnet dpnhpast dpnsvr.exe dpwsockx
 
     w_try_regsvr dplayx.dll
     w_try_regsvr dpnet.dll
@@ -4804,27 +5116,6 @@ load_dsdmo()
 
 #----------------------------------------------------------------
 
-w_metadata dx8sdk dlls \
-    title="MS DirectX 8 SDK (developers only)" \
-    publisher="Microsoft" \
-    year="2001" \
-    media="download" \
-    file1="dx81sdk_full.exe" \
-    installed_file1="c:/DXSDK/include/d3dx8math.h"
-
-load_dx8sdk()
-{
-    # http://download.microsoft.com/download/whistler/dx/8.1/w982kmexp/en-us/DX81SDK_FULL.exe
-    w_download http://www.darwinbots.com/numsgil/dx81sdk_full.exe 61b5733209205e942f37431ee40da712e1f50e6a
-
-    cd "$W_TMP"
-    w_try_unzip "$W_CACHE"/dx8sdk/dx81sdk_full.exe
-    cd DXF
-    w_try "$WINE" setup.exe   # /S/v/qn  for silent mode, but it's broken?
-}
-
-#----------------------------------------------------------------
-
 w_metadata dxsdk_nov2006 dlls \
     title="MS DirectX SDK, November 2006 (developers only)" \
     publisher="Microsoft" \
@@ -4840,9 +5131,9 @@ load_dxsdk_nov2006()
     # dxview.dll uses mfc42u while registering
     w_call mfc42
 
-    cd "$W_TMP"
     w_try_cabextract "$W_CACHE"/dxsdk_nov2006/dxsdk_aug2006.exe
-    w_try_unzip dxsdk.exe
+    w_try_unzip "$W_TMP" dxsdk.exe
+    cd "$W_TMP"
     w_try "$WINE" msiexec /i Microsoft_DirectX_SDK.msi $W_UNATTENDED_SLASH_Q
 }
 
@@ -5019,7 +5310,7 @@ load_dotnet_verifier()
 
     cd "$W_CACHE"/dotnet_verifier
 
-    w_try_unzip -d "$W_SYSTEM32_DLLS" netfx_5F00_setupverifier_5F00_new.zip netfx_setupverifier.exe
+    w_try_unzip "$W_SYSTEM32_DLLS" netfx_5F00_setupverifier_5F00_new.zip netfx_setupverifier.exe
 }
 
 #----------------------------------------------------------------
@@ -5718,7 +6009,7 @@ load_flash()
     # 2014-10-02
     w_download http://download.macromedia.com/pub/flashplayer/installers/archive/fp_14.0.0.176_archive.zip 40df72ab2c22bcd4442aa35eb586000776129982
     
-    w_try_unzip -d "$W_TMP" "$W_CACHE"/flash/fp_14.0.0.176_archive.zip fp_14.0.0.176_archive/14_0_r0_176/flashplayer14_0r0_176_winax.exe
+    w_try_unzip "$W_TMP" "$W_CACHE"/flash/fp_14.0.0.176_archive.zip fp_14.0.0.176_archive/14_0_r0_176/flashplayer14_0r0_176_winax.exe
     cd "$W_TMP"/fp_14.0.0.176_archive/14_0_r0_176
     w_try "$WINE" flashplayer14_0r0_176_winax.exe ${W_OPT_UNATTENDED:+ /install}
 
@@ -5734,7 +6025,7 @@ load_flash()
     # 2014-10-02
     w_download http://download.macromedia.com/pub/flashplayer/installers/archive/fp_14.0.0.179_archive.zip b94860ca0eff3e1420c24f9647a5f9f5e610ce34
 
-    w_try_unzip -d "$W_TMP" "$W_CACHE"/flash/fp_14.0.0.179_archive.zip fp_14.0.0.179_archive/14_0_r0_179/flashplayer14_0r0_179_win.exe
+    w_try_unzip "$W_TMP" "$W_CACHE"/flash/fp_14.0.0.179_archive.zip fp_14.0.0.179_archive/14_0_r0_179/flashplayer14_0r0_179_win.exe
     cd "$W_TMP"/fp_14.0.0.179_archive/14_0_r0_179
     w_try "$WINE" flashplayer14_0r0_179_win.exe ${W_OPT_UNATTENDED:+ /install}
 
@@ -5860,8 +6151,10 @@ w_metadata glut dlls \
 
 load_glut()
 {
-    w_download http://www.xmission.com/~nate/glut/glut-3.7.6-bin.zip fb4731885c05b3cf2c79e85aabe8fc9949616ef4
-    w_try_unzip -d "$W_DRIVE_C" "$W_CACHE"/glut/glut-3.7.6-bin.zip
+    w_download http://press.liacs.nl/researchdownloads/glut.win32/glut-3.7.6-bin.zip fb4731885c05b3cf2c79e85aabe8fc9949616ef4
+    # FreeBSD unzip rm -rf's inside the target dir before extracting:
+    w_try_unzip "$W_TMP" "$W_CACHE"/glut/glut-3.7.6-bin.zip
+    w_try mv "$W_TMP/glut-3.7.6-bin" "$W_DRIVE_C"
     w_try cp "$W_DRIVE_C"/glut-3.7.6-bin/glut32.dll "$W_SYSTEM32_DLLS"
     w_warn "If you want to compile glut programs, add c:/glut-3.7.6-bin to LIB and INCLUDE"
 }
@@ -6134,7 +6427,7 @@ load_mdac28()
     # http://www.microsoft.com/downloads/en/details.aspx?familyid=78cac895-efc2-4f8e-a9e0-3a1afbd5922e
     w_download http://download.microsoft.com/download/4/a/a/4aafff19-9d21-4d35-ae81-02c48dcbbbff/MDAC_TYP.EXE 4fbc272c79da59e38818924d8575accb0af776fb
     load_native_mdac
-    w_set_winver win98
+    w_set_winver nt40
     cd "$W_CACHE"/mdac28
     if [ $W_UNATTENDED_SLASH_Q ]
     then
@@ -6433,10 +6726,21 @@ load_msxml6()
 {
     # Service Pack 1
     # http://www.microsoft.com/downloads/details.aspx?familyid=D21C292C-368B-4CE1-9DAB-3E9827B70604
-    w_download http://download.microsoft.com/download/e/a/f/eafb8ee7-667d-4e30-bb39-4694b5b3006f/msxml6_x86.msi 5125220e985b33c946bbf9f60e2b222c7570bfa2
+    if [ $W_ARCH = win64 ]
+    then
+        w_download http://download.microsoft.com/download/e/a/f/eafb8ee7-667d-4e30-bb39-4694b5b3006f/msxml6_x64.msi ca0c0814a9c7024583edb997296aad7cb0a3cbf7
+    else
+        w_download http://download.microsoft.com/download/e/a/f/eafb8ee7-667d-4e30-bb39-4694b5b3006f/msxml6_x86.msi 5125220e985b33c946bbf9f60e2b222c7570bfa2
+    fi
     w_override_dlls native,builtin msxml6
     rm -f "$W_SYSTEM32_DLLS/msxml6.dll"
-    w_try "$WINE" msiexec /i "$W_CACHE"/msxml6/msxml6_x86.msi $W_UNATTENDED_SLASH_Q
+    if [ $W_ARCH = win64 ]
+    then
+        rm -f "$W_SYSTEM64_DLLS/msxml6.dll"
+        w_try_msiexec64 /i "$W_CACHE"/msxml6/msxml6_x64.msi
+    else
+        w_try "$WINE" msiexec /i "$W_CACHE"/msxml6/msxml6_x86.msi $W_UNATTENDED_SLASH_Q
+    fi
 }
 
 #----------------------------------------------------------------
@@ -6482,6 +6786,71 @@ load_ogg()
 
 #----------------------------------------------------------------
 
+w_metadata ollydbg110 apps \
+    title="OllyDbg" \
+    publisher="ollydbg.de" \
+    year="2004" \
+    media="download" \
+    file1="odbg110.zip" \
+    installed_file1="c:/ollydbg110/OLLYDBG.EXE" \
+    homepage="http://ollydbg.de"
+
+load_ollydbg110()
+{
+    # the graphical user interface is unreadable without having corefonts installed
+    w_call corefonts
+
+    w_download http://www.ollydbg.de/odbg110.zip 8403d8049a0841887c16cf64889596ad52b84da8
+    w_try_unzip "$W_DRIVE_C/ollydbg110" "$W_CACHE/$W_PACKAGE"/odbg110.zip
+}
+
+#----------------------------------------------------------------
+
+w_metadata ollydbg200 apps \
+    title="OllyDbg" \
+    publisher="ollydbg.de" \
+    year="2010" \
+    media="download" \
+    file1="odbg200.zip" \
+    installed_file1="c:/ollydbg200/ollydbg.exe" \
+    homepage="http://ollydbg.de"
+
+load_ollydbg200()
+{
+    # the graphical user interface is unreadable without having corefonts installed
+    w_call corefonts
+
+    w_download http://www.ollydbg.de/odbg200.zip 68e572d94a0555e8f14516b55b6b96b879900fe9
+    w_try_unzip "$W_DRIVE_C/ollydbg200" "$W_CACHE/$W_PACKAGE"/odbg200.zip
+}
+
+#----------------------------------------------------------------
+
+w_metadata ollydbg201 apps \
+    title="OllyDbg" \
+    publisher="ollydbg.de" \
+    year="2013" \
+    media="download" \
+    file1="odbg201.zip" \
+    installed_file1="c:/ollydbg201/ollydbg.exe" \
+    homepage="http://ollydbg.de"
+
+load_ollydbg201()
+{
+    # the graphical user interface is unreadable without having corefonts installed
+    w_call corefonts
+
+    w_download http://www.ollydbg.de/odbg201.zip d41fe77a2801d38476f20468ab61ddce14c3abb8
+    w_try_unzip "$W_DRIVE_C/ollydbg201" "$W_CACHE/$W_PACKAGE"/odbg201.zip
+
+    # ollydbg201 is affected by wine bug 36012 if debug symbols are available.
+    # As a workaround native 'dbghelp' can be installed. We don't do this automatically
+    # because for some people it might work even without additional workarounds.
+    # Older versions of OllyDbg were not affected by this bug.
+}
+
+#----------------------------------------------------------------
+
 w_metadata openwatcom apps \
     title="Open Watcom C/C++ compiler (can compile win16 code!)" \
     publisher="Watcom" \
@@ -6502,7 +6871,7 @@ load_openwatcom()
         # Pick smallest installation that supports 16 bit C and C++
         cd "$W_TMP"
         cp "$W_CACHE"/openwatcom/open-watcom-c-win32-1.9.exe .
-        w_try_unzip open-watcom-c-win32-1.9.exe setup.inf
+        w_try_unzip . open-watcom-c-win32-1.9.exe setup.inf
         sed -i 's/tools16=.*/tools16=true/' setup.inf
         w_try zip -f open-watcom-c-win32-1.9.exe
         w_try "$WINE" open-watcom-c-win32-1.9.exe -s
@@ -6533,7 +6902,7 @@ load_pdh()
     w_download http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.2668/NT4/EN-US/pdhinst.exe f42448660def8cd7f42b34aa7bc7264745f4425e
 
     w_try_cabextract --directory="$W_TMP" "$W_CACHE"/pdh/pdhinst.exe
-    w_try_unzip -d "$W_TMP" "$W_TMP"/pdh.exe
+    w_try_unzip "$W_TMP" "$W_TMP"/pdh.exe
     w_try cp -f "$W_TMP"/x86/Pdh.Dll "$W_SYSTEM32_DLLS"/pdh.dll
 }
 
@@ -6542,17 +6911,17 @@ load_pdh()
 w_metadata physx dlls \
     title="PhysX" \
     publisher="NVidia" \
-    year="2013" \
+    year="2014" \
     media="download" \
-    file1="PhysX-9.13.0604-SystemSoftware.msi" \
+    file1="PhysX-9.14.0702-SystemSoftware.msi" \
     installed_file1="$W_PROGRAMS_WIN/NVIDIA Corporation/PhysX/Engine/v2.8.3/PhysXCore.dll"
 
 load_physx()
 {
     # Has a minor issue, see bug report http://bugs.winehq.org/show_bug.cgi?id=34167 
-    w_download http://uk.download.nvidia.com/Windows/9.13.0604/PhysX-9.13.0604-SystemSoftware.msi c2aac1635bfc474de82b5aad6571d15b4ccb84b5
+    w_download http://uk.download.nvidia.com/Windows/9.14.0702/PhysX-9.14.0702-SystemSoftware.msi 81e2d38e2356e807ad80cdf150ed5acfff839c8b
     cd "$W_CACHE"/physx
-    w_try "$WINE" msiexec /i PhysX-9.13.0604-SystemSoftware.msi $W_UNATTENDED_SLASH_Q
+    w_try "$WINE" msiexec /i PhysX-9.14.0702-SystemSoftware.msi $W_UNATTENDED_SLASH_Q
 }
 
 #----------------------------------------------------------------
@@ -6828,7 +7197,7 @@ load_sdl()
 {
     # http://www.libsdl.org/download-1.2.php
     w_download http://www.libsdl.org/release/SDL-1.2.14-win32.zip d22c71d1c2bdf283548187c4b0bd7ef9d0c1fb23
-    w_try_unzip "$W_CACHE"/sdl/SDL-1.2.14-win32.zip -d "$W_SYSTEM32_DLLS" SDL.dll
+    w_try_unzip "$W_SYSTEM32_DLLS" "$W_CACHE"/sdl/SDL-1.2.14-win32.zip SDL.dll
 }
 
 #----------------------------------------------------------------
@@ -6899,9 +7268,10 @@ load_shockwave() {
     # 2014-02-26 sha1sum: ae2855b729bfaedc766f3addd8c2b74eac576909
     # 2014-04-15 sha1sum: c2ea56450fb4a5bac66cb7d70e3b522431521787
     # 2014-05-21 sha1sum: d95d1a14ee264235b29e093105bd2baa8b06eb12
-    # 2014-11-22 sha1sum: 644d3228654ded798eabe40e7044b96b90e742f6x
-    
-    w_download http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi 644d3228654ded798eabe40e7044b96b90e742f6
+    # 2014-11-22 sha1sum: 644d3228654ded798eabe40e7044b96b90e742f6
+    # 2015-03-30 sha1sum: 9f2d4d929e7210ae9fb633881127b21586ffd8ce
+
+    w_download http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi 9f2d4d929e7210ae9fb633881127b21586ffd8ce
     cd "$W_CACHE"/shockwave
     w_try "$WINE" msiexec /i sw_lic_full_installer.msi $W_UNATTENDED_SLASH_Q
 }
@@ -6921,7 +7291,7 @@ load_speechsdk()
     # http://www.microsoft.com/download/en/details.aspx?id=10121
     w_download http://download.microsoft.com/download/B/4/3/B4314928-7B71-4336-9DE7-6FA4CF00B7B3/SpeechSDK51.exe f69efaee8eb47f8c7863693e8b8265a3c12c4f51
 
-    w_try_unzip -d "$W_TMP" "$W_CACHE"/speechsdk/SpeechSDK51.exe
+    w_try_unzip "$W_TMP" "$W_CACHE"/speechsdk/SpeechSDK51.exe
 
     # Otherwise it only installs the SDK and not the redistributable:
     w_set_winver win2k
@@ -7008,7 +7378,7 @@ load_vb2run()
     # 2014/05/31: Microosfot FTP is down ftp://$ftp_microsoft_com/Softlib/MSLFILES/VBRUN200.EXE 
     # Mirror list: http://www.filewatcher.com/m/VBRUN200.EXE.220504-0.html
     w_download ftp://ftp.chatnfiles.com/Winfilesdotcom/winfilesdotcom-june-98-4-of-4/required/VBRUN200.EXE ac0568b73ee375408778e9b505df995f79ab907e
-    w_try_unzip -d "$W_TMP" "$W_CACHE"/vb2run/VBRUN200.EXE
+    w_try_unzip "$W_TMP" "$W_CACHE"/vb2run/VBRUN200.EXE
     w_try cp -f "$W_TMP/VBRUN200.DLL" "$W_SYSTEM32_DLLS"
 }
 
@@ -7026,7 +7396,7 @@ load_vb3run()
 {
     # See http://support.microsoft.com/kb/196285
     w_download http://download.microsoft.com/download/vb30/utility/1/w9xnt4/en-us/vb3run.exe 518fcfefde9bf680695cadd06512efadc5ac2aa7
-    w_try_unzip -d "$W_TMP" "$W_CACHE"/vb3run/vb3run.exe
+    w_try_unzip "$W_TMP" "$W_CACHE"/vb3run/vb3run.exe
     w_try cp -f "$W_TMP/Vbrun300.dll" "$W_SYSTEM32_DLLS"
 }
 
@@ -7044,7 +7414,7 @@ load_vb4run()
 {
     # See http://support.microsoft.com/kb/196286
     w_download http://download.microsoft.com/download/vb40ent/sample27/1/w9xnt4/en-us/vb4run.exe 83e968063272e97bfffd628a73bf0ff5f8e1023b
-    w_try_unzip -d "$W_TMP" "$W_CACHE"/vb4run/vb4run.exe
+    w_try_unzip "$W_TMP" "$W_CACHE"/vb4run/vb4run.exe
     w_try cp -f "$W_TMP/Vb40032.dll" "$W_SYSTEM32_DLLS"
     w_try cp -f "$W_TMP/Vb40016.dll" "$W_SYSTEM32_DLLS"
 }
@@ -8324,9 +8694,9 @@ load_takao()
 {
     # The Takao font provides Japanese glyphs.  May also be needed with fakejapanese function above.
     # See http://launchpad.net/takao-fonts for project page
-    w_download http://launchpad.net/takao-fonts/003.02/003.02.01/+download/takao-fonts-ttf-003.02.01.zip 4f636d5c7c1bc16b96ea723adb16838cfb6df059
+    w_download http://launchpad.net/takao-fonts/trunk/003.02.01/+download/takao-fonts-ttf-003.02.01.zip 4f636d5c7c1bc16b96ea723adb16838cfb6df059
     cp -f "$W_CACHE"/takao/takao-fonts-ttf-003.02.01.zip "$W_TMP"
-    w_try_unzip -d "$W_TMP" "$W_TMP"/takao-fonts-ttf-003.02.01.zip
+    w_try_unzip "$W_TMP" "$W_TMP"/takao-fonts-ttf-003.02.01.zip
     w_try cp -f "$W_TMP"/takao-fonts-ttf-003.02.01/*.ttf "$W_FONTSDIR_UNIX"
 
     w_register_font TakaoGothic.ttf "TakaoGothic"
@@ -8352,7 +8722,7 @@ load_uff()
 {
     w_download http://font.ubuntu.com/download/ubuntu-font-family-0.70.1.zip efbab0d5d8cb5cff091307d2360dcb1bfe1ae6e1
     cd "$W_TMP"
-    w_try_unzip "$W_CACHE"/uff/ubuntu-font-family-0.70.1.zip
+    w_try_unzip . "$W_CACHE"/uff/ubuntu-font-family-0.70.1.zip
     mv ubuntu-font-family-0.70.1/*.ttf "$W_FONTSDIR_UNIX"
 
     w_register_font Ubuntu-R.ttf "Ubuntu"
@@ -8398,7 +8768,7 @@ load_unifont()
     # See http://unifoundry.com/unifont.html for project page
     w_download http://unifoundry.com/unifont-5.1.20080907.zip bb8a3960dc0a96aa305de28312ea8a0ab64123d2
     cp -f "$W_CACHE"/unifont/unifont-5.1.20080907.zip "$W_TMP"
-    w_try_unzip -d "$W_TMP" "$W_TMP"/unifont-5.1.20080907.zip
+    w_try_unzip "$W_TMP" "$W_TMP"/unifont-5.1.20080907.zip
     w_try cp -f "$W_TMP"/unifont-5.1.20080907.ttf "$W_FONTSDIR_UNIX/unifont.ttf"
 
     w_register_font unifont.ttf "Unifont"
@@ -8600,7 +8970,7 @@ w_metadata colorprofile apps \
 load_colorprofile()
 {
     w_download http://download.microsoft.com/download/whistler/hwdev1/1.0/wxp/en-us/ColorProfile.exe 6b72836b32b343c82d0760dff5cb51c2f47170eb
-    w_try_unzip -d "$W_TMP" "$W_CACHE"/colorprofile/ColorProfile.exe
+    w_try_unzip "$W_TMP" "$W_CACHE"/colorprofile/ColorProfile.exe
 
     # It's in system32 for both win32/win64
     mkdir -p "$W_WINDIR_UNIX"/system32/spool/drivers/color
@@ -8707,8 +9077,7 @@ w_metadata emu8086 apps \
 load_emu8086()
 {
     w_download http://emu8086.com/emu8086.zip fa3b2451cbc46fd2e3aa2670fa4d81ae8e75c7db
-    cd "$W_CACHE/$W_PACKAGE"
-    w_try_unzip $file1 -d "$W_TMP"
+    w_try_unzip "$W_TMP" "$W_CACHE/$W_PACKAGE"/$file1
     w_try "$WINE" "$W_TMP/Setup.exe" $W_UNATTENDED_SLASH_SILENT
     w_declare_exe "c:\\emu8086" "emu8086.exe"
 }
@@ -8788,7 +9157,7 @@ w_metadata irfanview apps \
 
 load_irfanview()
 {
-    w_download http://download.betanews.com/download/967963863-1/iview438_setup.exe c55c2fd91ac1af03e8063442b110ba771357d42e
+    w_download http://www.tucows.com/download/windows/files/iview438_setup.exe c55c2fd91ac1af03e8063442b110ba771357d42e
     if w_workaround_wine_bug 657 "Installing mfc42"
     then
         w_call mfc42
@@ -9212,21 +9581,17 @@ load_mingw()
 w_metadata mpc apps \
     title="Media Player Classic - Home Cinema" \
     publisher="doom9 folks" \
-    year="2010" \
+    year="2014" \
     media="download" \
-    file1="MPC-HomeCinema.1.4.2499.0.x86.zip" \
-    installed_file1="$W_PROGRAMS_X86_WIN/Media Player Classic/mpc-hc.exe" \
+    file1="MPC-HC.1.7.5.x86.exe" \
+    installed_file1="$W_PROGRAMS_X86_WIN/MPC-HC/mpc-hc.exe" \
     homepage="http://mpc-hc.sourceforge.net"
 
 load_mpc()
 {
-    w_download $WINETRICKS_SOURCEFORGE/project/mpc-hc/MPC%20HomeCinema%20-%20Win32/MPC-HC%20v1.4.2499.0_32%20bits/MPC-HomeCinema.1.4.2499.0.x86.zip 9f8c4a8e70fa36ffa68f878d13adc8b09b915ece
-
-    mkdir -p "$W_PROGRAMS_X86_UNIX/Media Player Classic"
-    cd "$W_PROGRAMS_X86_UNIX/Media Player Classic"
-    w_try_unzip -j "$W_CACHE/mpc/MPC-HomeCinema.1.4.2499.0.x86.zip"
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\Media Player Classic" mpc-hc.exe
+    w_download $WINETRICKS_SOURCEFORGE/project/mpc-hc/MPC%20HomeCinema%20-%20Win32/MPC-HC_v1.7.5_x86/MPC-HC.1.7.5.x86.exe 39f90869929007ae0576ae30dca6cd22ed5a59c2
+    cd "$W_CACHE/$W_PACKAGE"
+    w_try "$WINE" MPC-HC.1.7.5.x86.exe ${W_OPT_UNATTENDED:+ /VERYSILENT}
 }
 
 #----------------------------------------------------------------
@@ -9606,9 +9971,8 @@ load_python26_comtypes()
 
     w_download $WINETRICKS_SOURCEFORGE/comtypes/0.6.2/comtypes-0.6.2.zip b84f4e3050652d494e8c8d9d6d6f221c124ffba9
 
-    cd "$W_TMP"
-    w_try_unzip "$W_CACHE/$W_PACKAGE"/comtypes-0.6.2.zip
-    cd comtypes-0.6.2
+    w_try_unzip "$W_TMP" "$W_CACHE/$W_PACKAGE"/comtypes-0.6.2.zip
+    cd "$W_TMP"/comtypes-0.6.2
     w_try "$WINE" "C:\Python26\python.exe" setup.py install
 }
 
@@ -9993,9 +10357,9 @@ load_vc2005express()
     w_download http://download.microsoft.com/download/A/9/1/A91D6B2B-A798-47DF-9C7E-A97854B7DD18/VC.iso 1ae44e4eaf8c61c3a39e573fd6efd9889e940529
 
     # Unpack ISO (how handy that 7z can do this!)
-    cd "$W_TMP"
-    w_try_7z x "$W_CACHE"/vc2005express/VC.iso
+    w_try_7z "$W_TMP" "$W_CACHE"/vc2005express/VC.iso
 
+    cd "$W_TMP"
     if [ $W_UNATTENDED_SLASH_Q ]
     then
         chmod +x Ixpvc.exe
@@ -10130,11 +10494,10 @@ load_vc2008express()
     w_download http://download.microsoft.com/download/8/B/5/8B5804AD-4990-40D0-A6AA-CE894CBBB3DC/VS2008ExpressENUX1397868.iso 76c6d28274a67741da720744026ea991a70867d1
 
     # Unpack ISO
-    cd "$W_TMP"
-    w_try_7z x "$W_CACHE"/vc2008express/VS2008ExpressENUX1397868.iso
-    cd VCExpress
+    w_try_7z "$W_TMP" "$W_CACHE"/vc2008express/VS2008ExpressENUX1397868.iso
 
     # See also http://blogs.msdn.com/b/astebner/archive/2008/04/25/8425198.aspx
+    cd "$W_TMP"/VCExpress
     w_try "$WINE" setup.exe $W_UNATTENDED_SLASH_Q
 
     w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Visual Studio 9.0\\Common7\\IDE" "VCExpress.exe"
@@ -10165,9 +10528,8 @@ load_vc2010express()
     w_download http://download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso adef5e361a1f64374f520b9a2d03c54ee43721c6
 
     # Unpack ISO
-    cd "$W_TMP"
-    w_try_7z x "$W_CACHE"/vc2010express/VS2010Express1.iso
-    cd VCExpress
+    w_try_7z "$W_TMP" "$W_CACHE"/vc2010express/VS2010Express1.iso
+    cd "$W_TMP"/VCExpress
 
     # dotnet40 leaves winver at win2k, which causes vc2010 to abort on
     # start because it looks for c:\users\$LOGNAME\Application Data
@@ -10423,10 +10785,8 @@ load_3dmark2000()
         w_download http://www.ocinside.de/download/3dmark2000_v11_100308.exe b0400d59cfd45d8c8893d3d4edc58b6285ee1502
     fi
 
-    cd "$W_TMP"
-    mkdir $W_PACKAGE
-    cd $W_PACKAGE
-    w_try_unzip "$W_CACHE/$W_PACKAGE"/3dmark2000_v11_100308.exe
+    w_try_unzip "$W_TMP/$W_PACKAGE" "$W_CACHE/$W_PACKAGE"/3dmark2000_v11_100308.exe
+    cd "$W_TMP/$W_PACKAGE"
     w_ahk_do "
         SetTitleMatchMode, 2
         run Setup.exe
@@ -11617,16 +11977,7 @@ w_metadata blobby_volley games \
 load_blobby_volley()
 {
     w_download_manual http://www.chip.de/downloads/Blobby-Volley_12990993.html blobby.zip c7057c77a5009a88d9d877e17a63b5536ebeb177
-
-    mkdir -p "$W_DRIVE_C/BlobbyVolley"
-    cd "$W_CACHE/$W_PACKAGE"
-    w_try_unzip blobby.zip -d "$W_DRIVE_C/BlobbyVolley"
-    w_declare_exe "c:\\BlobbyVolley" "volley.exe"
-
-    if w_workaround_wine_bug 4432
-    then
-        w_warn "You may need to apply a patch, see http://bugs.winehq.org/show_bug.cgi?id=4432#c15"
-    fi
+    w_try_unzip "$W_DRIVE_C/BlobbyVolley" "$W_CACHE/$W_PACKAGE"/blobby.zip
 }
 
 #----------------------------------------------------------------
@@ -11994,8 +12345,7 @@ load_civ4_demo()
 {
     w_download_manual http://download.cnet.com/Civilization-IV-demo/3000-7489_4-10465206.html Civilization4_Demo.zip b54f1e5d0a1c2d1ef456d0c20098c23bbb6a0ea7
 
-    cd "$W_CACHE/$W_PACKAGE"
-    w_try_unzip Civilization4_Demo.zip -d "$W_TMP"
+    w_try_unzip "$W_TMP" "$W_CACHE/$W_PACKAGE"/Civilization4_Demo.zip
     cd "$W_TMP/$W_PACKAGE"
     chmod +x setup.exe
     w_ahk_do "
@@ -12721,8 +13071,7 @@ load_dirt2_demo()
 {
     w_download_manual http://www.joystiq.com/game/dirt-2/download/dirt-2-demo/ Dirt2Demo.zip 13af1beb8c4f6300e4655045b66aea1f8a29f2b3
 
-    mkdir "$W_TMP/$W_PACKAGE"
-    w_try_unzip -d "$W_TMP/$W_PACKAGE" "$W_CACHE/$W_PACKAGE/Dirt2Demo.zip"
+    w_try_unzip "$W_TMP/$W_PACKAGE" "$W_CACHE/$W_PACKAGE/Dirt2Demo.zip"
 
     if w_workaround_wine_bug 23532
     then
@@ -14213,7 +14562,7 @@ load_lego_potc_demo()
     w_download_manual http://www.gamershell.com/download_73976.shtml LPOTC_PC_Demo.zip 3025dcbbee9ff2d74d7837a78ef5b7aceae15d8f
     cd "$W_TMP"
     w_info "Unpacking $file1"
-    w_try_unzip "$W_CACHE/$W_PACKAGE/$file1" LPOTC_PC_Demo.exe
+    w_try_unzip . "$W_CACHE/$W_PACKAGE/$file1" LPOTC_PC_Demo.exe
     w_ahk_do "
         SetWinDelay, 500
         SetTitleMatchMode, 2
@@ -14672,10 +15021,9 @@ load_maxmagicmarker_demo()
 {
     w_download http://www.maxandthemagicmarker.com/maxdemo/max_demo_pc.zip 1a79c583ff40e7b2cf05d18a89a806fd6b88a5d1
 
-    w_try mkdir "$W_PROGRAMS_X86_UNIX"/$W_PACKAGE
-    cd "$W_PROGRAMS_X86_UNIX"/$W_PACKAGE
-    w_try_unzip "$W_CACHE/$W_PACKAGE"/max_demo_pc.zip
+    w_try_unzip "$W_PROGRAMS_X86_UNIX"/$W_PACKAGE "$W_CACHE/$W_PACKAGE"/max_demo_pc.zip
     # Work around bug in game?!
+    cd "$W_PROGRAMS_X86_UNIX/$W_PACKAGE"
     mv "max and the magic markerdemo pc" "max and the magic markerdemo pc"_Data
 
     w_declare_exe "$W_PROGRAMS_X86_WIN\\$W_PACKAGE" "max and the magic markerdemo pc.exe"
@@ -14740,7 +15088,7 @@ load_mdk()
         WinWaitClose
     "
     cd "$W_DRIVE_C/SHINY/MDK"
-    w_try_unzip "$W_CACHE/$W_PACKAGE"/patch-mdk3dfx.zip
+    w_try_unzip . "$W_CACHE/$W_PACKAGE"/patch-mdk3dfx.zip
 
     w_declare_exe "C:\\SHINY\\MDK" "MDK3DFX.EXE"
     # TODO: wine fails to install menu items, add a workaround for that
@@ -15248,31 +15596,6 @@ load_oblivion()
 
 #----------------------------------------------------------------
 
-w_metadata osmos_demo games \
-    title="Osmos demo" \
-    publisher="Hemisphere Games" \
-    year="2009" \
-    media="download" \
-    file1="OsmosDemo_Installer_1.6.0.exe" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/OsmosDemo/OsmosDemo.exe"
-
-load_osmos_demo()
-{
-    w_download http://www.hemispheregames.com/blog/wp-content/uploads/2010/01/OsmosDemo_Installer_1.6.0.exe 4880eb20ff850bf337bbae20455ee90f614e507e
-
-    cd "$W_CACHE/$W_PACKAGE"
-    w_try "$WINE" $file1 ${W_OPT_UNATTENDED:+ /S}
-
-    if w_workaround_wine_bug 24416 "installing C runtime library" 1.3.8,
-    then
-        w_call vcrun2005
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\OsmosDemo" "OsmosDemo.exe"
-}
-
-#----------------------------------------------------------------
-
 w_metadata penpenxmas games \
     title="Pen-Pen Xmas Olympics" \
     publisher="Army of Trolls / Black Cat" \
@@ -16297,7 +16620,7 @@ load_starcraft2_demo()
     w_download_manual http://www.fileplanet.com/217982/210000/fileinfo/Starcraft-2-Demo SC2-WingsOfLiberty-enUS-Demo-Installer.zip 4c06ad755fbde73f135a7359bf6bfdbd2c6eb00e
 
     cd "$W_TMP"
-    w_try_unzip "$W_CACHE/$W_PACKAGE"/SC2-WingsOfLiberty-enUS-Demo-Installer.zip
+    w_try_unzip . "$W_CACHE/$W_PACKAGE"/SC2-WingsOfLiberty-enUS-Demo-Installer.zip
 
     w_ahk_do "
         SetTitleMatchMode, 2
@@ -17008,12 +17331,8 @@ w_metadata typingofthedead_demo games \
 load_typingofthedead_demo()
 {
     w_download "http://www.fileplanet.com/54947/50000/fileinfo/The-Typing-of-the-Dead-Demo" 96fe3edb2431210932af840e29c59bce6b7fc80f
-
-    cd "$W_CACHE/$W_PACKAGE"
-    mkdir "$W_TMP"
     cd "$W_TMP"
-    w_try_unzip "$W_CACHE/$W_PACKAGE/tod-demo.zip"
-
+    w_try_unzip . "$W_CACHE/$W_PACKAGE/tod-demo.zip"
     w_ahk_do "
         SetTitleMatchMode, 2
         run SETUP.EXE