From 72611ebb45a05aa05f1509bc207be0b8f566871ee0a1e21b65b0e342c52dab0e Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Fri, 18 Apr 2014 19:55:30 +0000
Subject: [PATCH] - Updated to 1.7.17 development snapshot   - More
 implementations for the Task Scheduler.   - C runtime made more compatible by
 sharing source files.   - Fixes in the Mac OS X joystick support.   - Various
 bug fixes. - updated winetricks

- Updated to 1.7.16 development snapshot
  - More regression test fixes.
  - String arrays better supported in the IDL compiler.
  - Initial stubs for DirectX Video Acceleration.
  - Various bug fixes.

- Updated to 1.7.15 development snapshot
  - New Task Scheduler service.
  - Many regression test fixes.
  - Support for exception unwinding in VBScript.
  - Various bug fixes.

- Updated to 1.7.14 development snapshot
  - More Task Scheduler support.
  - Improvements for AVI encoding support.
  - More VisualBasic interfaces in MSXML.
  - Support for deflate content encoding in Wininet.
  - Some fixes for monochrome printers.
  - Various bug fixes.

OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=222
---
 wine-1.7.13.tar.bz2      |   3 -
 wine-1.7.13.tar.bz2.sign |   7 -
 wine-1.7.17.tar.bz2      |   3 +
 wine-1.7.17.tar.bz2.sign |   7 +
 wine.changes             |  39 ++
 wine.spec                |   2 +-
 winetricks               | 879 ++++++++++++++++++---------------------
 7 files changed, 466 insertions(+), 474 deletions(-)
 delete mode 100644 wine-1.7.13.tar.bz2
 delete mode 100644 wine-1.7.13.tar.bz2.sign
 create mode 100644 wine-1.7.17.tar.bz2
 create mode 100644 wine-1.7.17.tar.bz2.sign

diff --git a/wine-1.7.13.tar.bz2 b/wine-1.7.13.tar.bz2
deleted file mode 100644
index 09d4b43..0000000
--- a/wine-1.7.13.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a72fdee6e1898007b38f3b30584f86d996567ad8d2f1cc0fe3a877be0493b9df
-size 21385204
diff --git a/wine-1.7.13.tar.bz2.sign b/wine-1.7.13.tar.bz2.sign
deleted file mode 100644
index 36d4cd0..0000000
--- a/wine-1.7.13.tar.bz2.sign
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.15 (GNU/Linux)
-
-iEYEABECAAYFAlMGSToACgkQ9ebp7rlGHdfvdwCgnki6uea+Cks1JbwdYILqVUjc
-N7AAnj1VvWua5RIAX92byO3pStGWZc8r
-=RTkY
------END PGP SIGNATURE-----
diff --git a/wine-1.7.17.tar.bz2 b/wine-1.7.17.tar.bz2
new file mode 100644
index 0000000..26beeb7
--- /dev/null
+++ b/wine-1.7.17.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb6fbd7fd70f9aafba557995d9ce537ded56e750e0a89a062e3318d584a8abef
+size 21531865
diff --git a/wine-1.7.17.tar.bz2.sign b/wine-1.7.17.tar.bz2.sign
new file mode 100644
index 0000000..a49e509
--- /dev/null
+++ b/wine-1.7.17.tar.bz2.sign
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.15 (GNU/Linux)
+
+iEYEABECAAYFAlNRdPEACgkQ9ebp7rlGHdckIQCbBmXwedCLwWrFN1OpxMWQRdSG
+3tUAnRga5vG1qF4T/P79oX2e0f4HT8tQ
+=2pCY
+-----END PGP SIGNATURE-----
diff --git a/wine.changes b/wine.changes
index f9050ee..0320cb1 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Fri Apr 18 19:08:23 UTC 2014 - meissner@suse.com
+
+- Updated to 1.7.17 development snapshot
+  - More implementations for the Task Scheduler.
+  - C runtime made more compatible by sharing source files.
+  - Fixes in the Mac OS X joystick support.
+  - Various bug fixes.
+- updated winetricks
+
+-------------------------------------------------------------------
+Fri Apr  4 21:15:06 UTC 2014 - meissner@suse.com
+
+- Updated to 1.7.16 development snapshot
+  - More regression test fixes.
+  - String arrays better supported in the IDL compiler.
+  - Initial stubs for DirectX Video Acceleration.
+  - Various bug fixes.
+
+-------------------------------------------------------------------
+Fri Mar 21 22:56:05 UTC 2014 - meissner@suse.com
+
+- Updated to 1.7.15 development snapshot
+  - New Task Scheduler service.
+  - Many regression test fixes.
+  - Support for exception unwinding in VBScript.
+  - Various bug fixes.
+
+-------------------------------------------------------------------
+Fri Mar  7 21:41:41 UTC 2014 - meissner@suse.com
+
+- Updated to 1.7.14 development snapshot
+  - More Task Scheduler support.
+  - Improvements for AVI encoding support.
+  - More VisualBasic interfaces in MSXML.
+  - Support for deflate content encoding in Wininet.
+  - Some fixes for monochrome printers.
+  - Various bug fixes.
+
 -------------------------------------------------------------------
 Sat Feb 22 08:43:13 UTC 2014 - meissner@suse.com
 
diff --git a/wine.spec b/wine.spec
index 2aed78e..2d97f77 100644
--- a/wine.spec
+++ b/wine.spec
@@ -55,7 +55,7 @@ BuildRequires:  sane-backends-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  valgrind-devel
 BuildRequires:  xorg-x11-devel
-Version:        1.7.13
+Version:        1.7.17
 Release:        0
 Summary:        An MS Windows Emulator
 License:        LGPL-2.1+
diff --git a/winetricks b/winetricks
index 10dc45d..e43df52 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=20140123
+WINETRICKS_VERSION=20140415
 
 # This is a utf-8 file
 # You should see an o with two dots over it here [ö]
@@ -33,7 +33,7 @@ WINETRICKS_VERSION=20140123
 # 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 cabextract p7zip unrar unzip wget wine1.3 zenity
+#    sudo apt-get install cabextract p7zip unrar unzip wget wine1.7 zenity
 #
 # See http://winetricks.org for documentation and tutorials, including
 # how to contribute changes to winetricks.
@@ -499,6 +499,56 @@ winetricks_wget_progress()
     esac
 }
 
+w_dotnet_verify()
+{
+    case $1 in
+        dotnet11) version="1.1" ;;
+        dotnet11sp1) version="1.1 SP1" ;;
+        dotnet20) version="2.0" ;;
+        dotnet20sp1) version="2.0 SP1" ;;
+        dotnet20sp2) version="2.0 SP2" ;;
+        dotnet30) version="3.0" ;;
+        dotnet30sp1) version="3.0 SP1" ;;
+        dotnet35) version="3.5" ;;
+        dotnet35sp1) version="3.5 SP1" ;;
+        dotnet40) version="4 Client" ;;
+        dotnet45) version="4.5" ;;
+        *) echo error ; exit 1 ;;
+    esac
+            w_call dotnet_verifier
+            # FIXME: The logfile may be useful somewhere (or at least print the location)
+            w_ahk_do "
+                SetTitleMatchMode, 2
+                ; FIXME; this only works the first time? Check if it's already verified somehow..
+                run, netfx_setupverifier.exe /q:a /c:"setupverifier2.exe"
+                winwait, Verification Utility
+                ControlClick, Button1
+                Control, ChooseString, NET Framework $version, ComboBox1
+                ControlClick, Button1 ; Verify
+                loop, 60
+                {
+                    sleep 1000
+                    process, exist, setupverifier2.exe
+                    dn_pid=%ErrorLevel%
+                    if dn_pid = 0
+                    {
+                        break
+                    }
+                    ifWinExist, Verification Utility, Product verification failed
+                    {
+                        process, close, setupverifier2.exe
+                        exit 1
+                    }
+                    ifWinExist, Verification Utility, Product verification succeeded
+                    {
+                        process, close, setupverifier2.exe
+                        break
+                    }                    
+                }
+            "
+            dn_status=$?
+}
+
 # Download a file
 # Usage: w_download_to packagename url [sha1sum [filename [cookie jar]]]
 # Caches downloads in winetrickscache/$packagename
@@ -1898,6 +1948,19 @@ __EOF__
     unset _W_dir _W_exe _W_name
 }
 
+# Checks that a conflicting verb is not already installed in the prefix
+# Usage: w_conflicts verb_to_install conflicts
+w_conflicts()
+{
+    for x in $2
+    do
+        if test $(grep -w "$x" "$WINEPREFIX/winetricks.log")
+        then
+            w_die "error: $1 conflicts with $x, which is already installed."
+        fi
+    done
+}
+
 # Call a verb, don't let it affect environment
 # Hope that subshell passes through exit status
 # Usage: w_do_call foo [bar]       (calls load_foo bar)
@@ -1930,7 +1993,7 @@ w_do_call()
         mkdir -p "$W_TMP"
 
         # Unset all known used metadata values, in case this is a nested call
-        unset installed_file1 installed_exe1
+        unset conflicts installed_file1 installed_exe1
 
         if winetricks_metadata_exists $1
         then
@@ -1976,11 +2039,20 @@ w_do_call()
             echo "$1 already installed, skipping"
             return 0
         fi
+        
+        # Don't install if a conflicting verb is already installed:
+        if test "$WINETRICKS_FORCE" != 1 && test "$conflicts" && test -f "$WINEPREFIX/winetricks.log"
+        then
+            for x in $conflicts
+            do
+                w_conflicts $1 $x
+            done
+        fi
 
         # We'd like to get rid of W_PACKAGE, but for now, just set it as late as possible.
         W_PACKAGE=$1
-        winetricks_stats_log_command $*
         w_try load_$cmd $arg
+        winetricks_stats_log_command $*
 
         # User-specific postinstall hook.
         # Source it so the script can call w_download() if needed.
@@ -1991,9 +2063,6 @@ w_do_call()
             . "$postfile"
         fi
 
-        # Clean up after this verb
-        test "$W_OPT_NOCLEAN" = 1 || rm -rf "$W_TMP"
-
         # Verify install
         if test "$installed_exe1" || test "$installed_file1"
         then
@@ -2002,6 +2071,16 @@ w_do_call()
                 w_die "$1 install completed, but installed file $_W_file_unix not found"
             fi
         fi
+
+        # If the user specified --verify, also run gui tests:
+        if test "$WINETRICKS_VERIFY" = 1 && type verify_$cmd 2> /dev/null
+        then
+            w_try verify_$cmd
+        fi
+
+        # Clean up after this verb
+        test "$W_OPT_NOCLEAN" = 1 || rm -rf "$W_TMP"
+
         # Calling subshell must explicitly propagate error code with exit $?
     ) || exit $?
 }
@@ -2098,7 +2177,7 @@ winetricks_early_wine()
     # gecko (winezeug bug 223).
     # The tr removes carriage returns so expanded variables don't have crud on the end
     # The grep works around using new wineprefixes with old wine
-    WINEDEBUG=-all "$WINE" "$@" 2>/dev/null | ( sed 's/.*1h.=//' | tr -d '\r' | grep -v "Module not found" || true)
+    WINEDEBUG=-all "$WINE" "$@" 2> /tmp/early_wine.err.txt | ( sed 's/.*1h.=//' | tr -d '\r' | grep -v "Module not found" || true)
 }
 
 winetricks_detect_gui()
@@ -2312,7 +2391,7 @@ winetricks_mainmenu()
          _W_msg_annihilate="Usuń WSZYSTKIE DANE I APLIKACJE WEWNĄTRZ TEGO WINEPREFIXA"
          ;;
     uk*) _W_msg_title="Winetricks - поточний prefix \"$WINEPREFIX\""
-         _W_msg_body='Щоб Ви хочете зробити для цього wineprefix?'
+         _W_msg_body='Що Ви хочете зробити для цього wineprefix?'
          _W_msg_dlls="Встановити Windows DLL чи компонент(и)"
          _W_msg_fonts='Встановити шрифт'
          _W_msg_settings='Змінити налаштування'
@@ -2467,6 +2546,14 @@ winetricks_settings_menu()
             title='?'
             author='?'
             . "$metadatafile"
+          # Begin 'title' strings localization code
+            case $LANG in
+            uk*) case "$title_uk" in
+                 "") ;;
+                 *) title="$title_uk";;
+                 esac
+            esac
+          # End of code
             printf "%s %s %s %s" " " FALSE \
                     $code \
                     "\"$title\""
@@ -3387,7 +3474,7 @@ winetricks_set_wineprefix()
     # The folder-name is localized!
     W_PROGRAMS_WIN="`w_expand_env ProgramFiles`"
     case "$W_PROGRAMS_WIN" in
-    "") w_die "$WINE cmd.exe /c echo '%ProgramFiles%' returned empty string" ;;
+    "")  w_die "$WINE cmd.exe /c echo '%ProgramFiles%' returned empty string, error message '`cat /tmp/early_wine.err.txt`'";;
     %*) w_die "$WINE cmd.exe /c echo '%ProgramFiles%' returned unexpanded string '$W_PROGRAMS_WIN' ... can be caused a corrupt wineprefix, an old wine, or by not owning $WINEPREFIX" ;;
     *unknown*) w_die "$WINE cmd.exe /c echo '%ProgramFiles%' returned a string containing the word 'unknown', as if a voice had cried out in terror, and was suddenly silenced." ;;
     esac
@@ -3656,6 +3743,7 @@ winetricks_init()
         case "$WINETRICKS_OPT_VERBOSE" in
         "1") echo -n "Wine is '$WINE'; Wine version is "
              "$WINE" --version || w_die "Can't get wine version"
+             echo "winetricks is $0 ; winetricks version is $WINETRICKS_VERSION"
              ;;
         esac
         unset _abswine
@@ -3744,6 +3832,7 @@ Options:
 -q, --unattended      Don't ask any questions, just install automatically
 -r, --ddrescue        Retry hard when caching scratched discs
     --showbroken      Even show verbs that are currently broken in wine
+    --verify          Run (automated) GUI tests for verbs, if available
 -v, --verbose         Echo all commands as they are executed
 -h, --help            Display this message and exit
 -V, --version         Display version and exit
@@ -3774,6 +3863,7 @@ winetricks_handle_option()
     -q|--unattended) winetricks_set_unattended 1 ;;
     -v|--verbose) WINETRICKS_OPT_VERBOSE=1; set -x ;;
     -V|--version) winetricks_print_version ; exit 0;;
+    --verify) WINETRICKS_VERIFY=1 ;;
     -h|--help) winetricks_usage ; exit 0 ;;
     --isolate) WINETRICKS_OPT_SHAREDPREFIX=0 ;;
     --no-isolate) WINETRICKS_OPT_SHAREDPREFIX=1 ;;
@@ -3877,14 +3967,14 @@ helper_win2ksp4()
     w_try_cabextract -d "$W_TMP" -L -F $filename "$W_CACHE"/win2ksp4/W2KSP4_EN.EXE
 }
 
-helper_xpsp2()
+helper_xpsp3()
 {
     filename=$1
 
-    # http://www.microsoft.com/en-us/download/details.aspx?id=28
-    w_download_to xpsp2 http://download.microsoft.com/download/1/6/5/165b076b-aaa9-443d-84f0-73cf11fdcdf8/WindowsXP-KB835935-SP2-ENU.exe 33a8fef60d48ae1f2c4feea27111af5ceca3c4f6
+    # http://www.microsoft.com/en-us/download/details.aspx?id=24
+    w_download_to xpsp3 http://download.microsoft.com/download/d/3/0/d30e32d8-418a-469d-b600-f32ce3edf42d/WindowsXP-KB936929-SP3-x86-ENU.exe c81472f7eeea2eca421e116cd4c03e2300ebfde4
 
-    w_try_cabextract -d "$W_TMP" -L -F $filename "$W_CACHE"/xpsp2/WindowsXP-KB835935-SP2-ENU.exe
+    w_try_cabextract -d "$W_TMP" -L -F $filename "$W_CACHE"/xpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe
 }
 
 helper_win7sp1()
@@ -3900,9 +3990,9 @@ helper_win7sp1()
 #---------------------------------------------------------
 
 w_metadata  adobeair dlls \
-    title="Adobe AIR 2.7" \
+    title="Adobe AIR 4.0" \
     publisher="Adobe" \
-    year="2011" \
+    year="2014" \
     media="download" \
     file1="AdobeAIRInstaller.exe" \
     installed_file1="$W_COMMONFILES_X86_WIN/Adobe AIR/Versions/1.0/Adobe AIR.dll" \
@@ -3916,7 +4006,9 @@ load_adobeair()
     # 2010-12-08: 2.5.1 sha1sum 2664207ca8e836f5070ee356064829a39785a92e
     # 2011-04-13: 2.6   sha1sum 3d9c2f9d8f3533424cfea84d61fcb9464278d9fc
     # 2011-10-26: 2.7   sha1sum dfa337d4b53e9d924356febc116450190fa183dd
-    w_download http://airdownload.adobe.com/air/win/download/2.7/AdobeAIRInstaller.exe dfa337d4b53e9d924356febc116450190fa183dd
+    # 2014-03-01: 4.0   sha1sum 0034bdd4e0b2ce0fa6198b0b715fba85754d9a57
+    # http://helpx.adobe.com/en/flash-player/release-note/fp_12_air_4_release_notes.html
+    w_download http://airdownload.adobe.com/air/win/download/4.0/AdobeAIRInstaller.exe 0034bdd4e0b2ce0fa6198b0b715fba85754d9a57
     cd "$W_CACHE"/adobeair
     w_try "$WINE" AdobeAIRInstaller.exe $W_UNATTENDED_DASH_SILENT
 }
@@ -3984,12 +4076,12 @@ w_metadata avifil32 dlls \
     publisher="Microsoft" \
     year="2004" \
     media="download" \
-    file1="../xpsp2/WindowsXP-KB835935-SP2-ENU.exe" \
+    file1="../xpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
     installed_file1="$W_SYSTEM32_DLLS_WIN/avifil32.dll"
 
 load_avifil32()
 {
-    helper_xpsp2 i386/avifil32.dl_
+    helper_xpsp3 i386/avifil32.dl_
     w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/avifil32.dl_
 
     w_override_dlls native avifil32
@@ -4117,14 +4209,14 @@ w_metadata crypt32 dlls \
     publisher="Microsoft" \
     year="2004" \
     media="download" \
-    file1="../xpsp2/WindowsXP-KB835935-SP2-ENU.exe" \
+    file1="../xpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
     installed_file1="$W_SYSTEM32_DLLS_WIN/crypt32.dll"
 
 load_crypt32()
 {
     w_call msasn1
 
-    helper_xpsp2 i386/crypt32.dl_
+    helper_xpsp3 i386/crypt32.dl_
     w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/crypt32.dl_
 
     w_override_dlls native crypt32
@@ -4703,13 +4795,13 @@ load_dmsynth()
 #----------------------------------------------------------------
 
 w_metadata dotnet11 dlls \
-    title="MS .NET 1.1 (broken on wine)" \
+    title="MS .NET 1.1" \
     publisher="Microsoft" \
     year="2003" \
     media="download" \
+    conflicts="dotnet20 dotnet20sdk dotnet20sp1 dotnet20sp2 dotnet30 dotnet30sp1 dotnet35 dotnet35sp1 vjrun20" \
     file1="dotnetfx.exe" \
-    installed_file1="c:/windows/Microsoft.NET/Framework/v1.1.4322/ndpsetup.ico" \
-    wine_showstoppers="25120"
+    installed_file1="c:/windows/Microsoft.NET/Framework/v1.1.4322/ndpsetup.ico"
 
 load_dotnet11()
 {
@@ -4760,38 +4852,58 @@ load_dotnet11()
     fi
 }
 
+verify_dotnet11()
+{
+    w_dotnet_verify dotnet11
+}
+
 #----------------------------------------------------------------
 
 w_metadata dotnet11sp1 dlls \
-    title="MS .NET 1.1 SP1 (broken in wine)" \
+    title="MS .NET 1.1 SP1" \
     publisher="Microsoft" \
     year="2004" \
     media="download" \
     file1="NDP1.1sp1-KB867460-X86.exe" \
-    installed_file1="c:/windows/Microsoft.NET/Framework/v1.1.4322/CONFIG/web_hightrust.config.default" \
-    wine_showstoppers="25120"
+    installed_file1="c:/windows/Microsoft.NET/Framework/v1.1.4322/CONFIG/web_hightrust.config.default"
 
-# fixme: sometimes security.config is missing after install, see
-# http://blogs.msdn.com/b/shawnfa/archive/2006/02/09/527688.aspx
-# If this happens often, we may need to change the install check.
 load_dotnet11sp1()
 {
     w_call dotnet11
     w_download http://download.microsoft.com/download/8/b/4/8b4addd8-e957-4dea-bdb8-c4e00af5b94b/NDP1.1sp1-KB867460-X86.exe 74a5b25d65a70b8ecd6a9c301a0aea10d8483a23
 
+    w_try cd "$W_CACHE/dotnet11sp1"
+    # Use builtin regsvcs.exe to work around http://bugs.winehq.org/show_bug.cgi?id=25120
     if test $W_OPT_UNATTENDED
     then
-        WINEDLLOVERRIDES="regsvcs.exe=b" "$WINE" "$W_CACHE"/dotnet11sp1/NDP1.1sp1-KB867460-X86.exe /q /C:"install /q"
-    else
-        WINEDLLOVERRIDES="regsvcs.exe=b" "$WINE" "$W_CACHE"/dotnet11sp1/NDP1.1sp1-KB867460-X86.exe
-    fi
-    status=$?
+        WINEDLLOVERRIDES="regsvcs.exe=b" w_ahk_do "
+            SetTitleMatchMode, 2
+            run, NDP1.1sp1-KB867460-X86.exe /q /C:"install /q"
 
-    case $status in
-    0) ;;
-    105|194) echo "exit status $status - normal, system needs simulated reboot" ;;
-    *) w_die "exit status $status - $W_PACKAGE installation failed" ;;
-    esac
+            Loop
+            {
+                sleep 1000
+                ifwinexist, Fatal error, Failed to delay load library
+                {
+                    WinClose, Fatal error, Failed to delay load library
+                    continue
+                }
+                Process, exist, dotnetfx.exe
+                dotnet_pid = %ErrorLevel%  ; Save the value immediately since ErrorLevel is often changed.
+                if dotnet_pid = 0
+                {
+                    break
+                }
+            }
+        "
+    else
+        WINEDLLOVERRIDES="regsvcs.exe=b" w_try "$WINE" "$W_CACHE"/dotnet11sp1/NDP1.1sp1-KB867460-X86.exe
+    fi
+}
+
+verify_dotnet11sp1()
+{
+    w_dotnet_verify dotnet11sp1
 }
 
 #----------------------------------------------------------------
@@ -4823,6 +4935,7 @@ w_metadata dotnet20 dlls \
     publisher="Microsoft" \
     year="2006" \
     media="download" \
+    conflicts="dotnet11" \
     file1="dotnetfx.exe" \
     installed_file1="c:/windows/Microsoft.NET/Framework/v2.0.50727/Microsoft .NET Framework 2.0/install.exe"
 
@@ -4835,6 +4948,12 @@ load_dotnet20()
     # and http://bugs.winehq.org/show_bug.cgi?id=30845#c10
     w_set_winver win2k
 
+    # FIXME: verify on pristine windows XP:
+    if w_workaround_wine_bug 34803
+    then
+        "$WINE" reg delete 'HKLM\Software\Microsoft\.NETFramework\v2.0.50727\SBSDisabled'
+    fi
+
     # http://www.microsoft.com/downloads/details.aspx?FamilyID=0856eacb-4362-4b0d-8edd-aab15c5e04f5
     w_download http://download.lenovo.com/ibmdl/pub/pc/pccbbs/thinkvantage_en/dotnetfx.exe a3625c59d7a2995fb60877b5f5324892a1693b2a
 
@@ -4859,6 +4978,12 @@ load_dotnet20()
     then
         w_killall "mscorsvw.exe"
     fi
+
+}
+
+verify_dotnet20()
+{
+    w_dotnet_verify dotnet20
 }
 
 #----------------------------------------------------------------
@@ -4868,6 +4993,7 @@ w_metadata dotnet20sdk dlls \
     publisher="Microsoft" \
     year="2006" \
     media="download" \
+    conflicts="dotnet11 dotnet20sp1 dotnet20sp2 dotnet30 dotnet40" \
     file1="setup.exe" \
     installed_file1="$W_PROGRAMS_X86_WIN/Microsoft.NET/SDK/v2.0/Bin/cordbg.exe"
 
@@ -4934,6 +5060,7 @@ w_metadata dotnet20sp1 dlls \
     publisher="Microsoft" \
     year="2008" \
     media="download" \
+    conflicts="dotnet11 dotnet20sp2 dotnet35sp1" \
     file1="NetFx20SP1_x86.exe" \
     installed_file1="c:/windows/winsxs/manifests/x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.1433_x-ww_5cf844d2.cat"
 
@@ -4983,6 +5110,11 @@ load_dotnet20sp1()
     w_unset_winver
 }
 
+verify_dotnet20sp1()
+{
+    w_dotnet_verify dotnet20sp1
+}
+
 #----------------------------------------------------------------
 
 w_metadata dotnet20sp2 dlls \
@@ -4990,7 +5122,9 @@ w_metadata dotnet20sp2 dlls \
     publisher="Microsoft" \
     year="2009" \
     media="download" \
-    file1="NetFx20SP2_x86.exe"
+    conflicts="dotnet11" \
+    file1="NetFx20SP2_x86.exe" \
+    installed_file1="c:/windows/assembly/NativeImages_v2.0.50727_32/mscorlib/fbb56b651d41914fad1c998a3602fb7b/mscorlib.ni.dll"
 
 load_dotnet20sp2()
 {
@@ -5011,6 +5145,12 @@ load_dotnet20sp2()
         export WINEDLLOVERRIDES
     fi
 
+    # FIXME: verify on pristine windows XP:
+    if w_workaround_wine_bug 34803
+    then
+        "$WINE" reg delete 'HKLM\Software\Microsoft\.NETFramework\v2.0.50727\SBSDisabled'
+    fi
+
     # http://www.microsoft.com/downloads/details.aspx?familyid=5B2C0358-915B-4EB5-9B1D-10E506DA9D0F
     w_download http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe 22d776d4d204863105a5db99e8b8888be23c61a7
     cd "$W_CACHE"/dotnet20sp2
@@ -5021,9 +5161,9 @@ load_dotnet20sp2()
         Loop
         {
             sleep 1000
-            ifwinexist, Error, cannot be uninstalled
+            ifwinexist,, cannot be uninstalled
             {
-                WinClose, Error, cannot be uninstalled
+                WinClose,, cannot be uninstalled
                 continue
             }
             Process, exist, NetFx20SP2_x86.exe
@@ -5046,6 +5186,11 @@ load_dotnet20sp2()
     w_unset_winver
 }
 
+verify_dotnet20sp2()
+{
+    w_dotnet_verify dotnet20sp2
+}
+
 #----------------------------------------------------------------
 
 w_metadata dotnet30 dlls \
@@ -5053,6 +5198,7 @@ w_metadata dotnet30 dlls \
     publisher="Microsoft" \
     year="2006" \
     media="manual_download" \
+    conflicts="dotnet11 dotnet20sp1 dotnet20sp2 dotnet30sp1 dotnet35 dotnet35sp1 dotnet45" \
     file1="netframework3.exe" \
     installed_file1="c:/windows/Microsoft.NET/Framework/v3.0/Microsoft .NET Framework 3.0/logo.bmp"
 
@@ -5118,6 +5264,11 @@ load_dotnet30()
     w_try "$WINE" $file1 ${W_OPT_UNATTENDED:+ /q /c:"install.exe /q"}
 }
 
+verify_dotnet30()
+{
+    w_dotnet_verify dotnet30
+}
+
 #----------------------------------------------------------------
 
 w_metadata dotnet30sp1 dlls \
@@ -5125,6 +5276,7 @@ w_metadata dotnet30sp1 dlls \
     publisher="Microsoft" \
     year="2007" \
     media="download" \
+    conflicts="dotnet11 dotnet20sdk dotnet20sp1 dotnet20sp2" \
     file1="NetFx30SP1_x86.exe" \
     installed_file1="c:/windows/system32/XpsFilt.dll"    # we're cheating a bit here
 
@@ -5158,6 +5310,11 @@ load_dotnet30sp1()
     w_info $file1 exited with status $status
 }
 
+verify_dotnet30sp1()
+{
+    w_dotnet_verify dotnet30sp1
+}
+
 #----------------------------------------------------------------
 
 w_metadata dotnet35 dlls \
@@ -5165,6 +5322,7 @@ w_metadata dotnet35 dlls \
     publisher="Microsoft" \
     year="2007" \
     media="download" \
+    conflicts="dotnet11 dotnet20 dotnet20sdk dotnet20sp1 dotnet20sp2" \
     file1="dotnetfx35.exe" \
     installed_file1="c:/windows/Microsoft.NET/Framework/v3.5/MSBuild.exe"
 
@@ -5195,6 +5353,11 @@ load_dotnet35()
     "$WINE" dotNetFx35setup.exe /lang:ENU $W_UNATTENDED_SLASH_Q
 }
 
+verify_dotnet35()
+{
+    w_dotnet_verify dotnet35
+}
+
 #----------------------------------------------------------------
 
 w_metadata dotnet35sp1 dlls \
@@ -5202,6 +5365,7 @@ w_metadata dotnet35sp1 dlls \
     publisher="Microsoft" \
     year="2008" \
     media="download" \
+    conflicts="dotnet11 dotnet20sp1 dotnet20sp2" \
     file1="dotnetfx35.exe" \
     installed_file1="c:/windows/Microsoft.NET/Framework/v3.5/Microsoft .NET Framework 3.5 SP1/logo.bmp"
 
@@ -5232,9 +5396,9 @@ load_dotnet35sp1()
         Loop
         {
             sleep 1000
-            ifwinexist, Error, cannot be uninstalled
+            ifwinexist,, cannot be uninstalled
             {
-                WinClose, Error, cannot be uninstalled
+                WinClose,, cannot be uninstalled
                 continue
             }
             Process, exist, dotnetfx35.exe
@@ -5247,6 +5411,11 @@ load_dotnet35sp1()
     "
 }
 
+verify_dotnet35sp1()
+{
+    w_dotnet_verify dotnet35sp1
+}
+
 #----------------------------------------------------------------
 
 w_metadata dotnet40 dlls \
@@ -5254,6 +5423,7 @@ w_metadata dotnet40 dlls \
     publisher="Microsoft" \
     year="2011" \
     media="manual_download" \
+    conflicts="dotnet20sdk" \
     file1="dotNetFx40_Full_x86_x64.exe" \
     installed_file1="c:/windows/Microsoft.NET/Framework/v4.0.30319/ngen.exe"
 
@@ -5314,6 +5484,11 @@ load_dotnet40()
     fi
 }
 
+verify_dotnet40()
+{
+    w_dotnet_verify dotnet40
+}
+
 #----------------------------------------------------------------
 
 w_metadata dotnet45 dlls \
@@ -5321,8 +5496,9 @@ w_metadata dotnet45 dlls \
     publisher="Microsoft" \
     year="2012" \
     media="download" \
-    file1="dotnetfx45_full_x86_x64.exe" #\
-    #installed_file1="c:/windows/Microsoft.NET/Framework/v4.0.30319/ngen.exe"
+    conflicts="dotnet20 dotnet20sdk dotnet20sp1 dotnet20sp2 dotnet35sp1 dotnet40 vjrun20" \
+    file1="dotnetfx45_full_x86_x64.exe" \
+    installed_file1="c:/windows/Microsoft.NET/Framework/v4.0.30319/Microsoft.Windows.ApplicationServer.Applications.45.man"
 
 load_dotnet45()
 {
@@ -5364,6 +5540,11 @@ load_dotnet45()
     w_set_winver win2k3
 }
 
+verify_dotnet45()
+{
+    w_dotnet_verify dotnet45
+}
+
 #----------------------------------------------------------------
 
 w_metadata dxdiagn dlls \
@@ -5540,87 +5721,6 @@ load_glidewrapper()
     w_try "$WINE" $file1 ${W_OPT_UNATTENDED:+ /S}
 }
 
-#----------------------------------------------------------------
-
-w_metadata gecko dlls \
-    title="Gecko (usually installed by distro)" \
-    publisher="WineHQ/Mozilla"
-
-load_gecko()
-{
-    if test -f /usr/share/wine/gecko/wine_gecko-1.0.0-x86.cab && test -f /usr/share/wine/gecko/wine_gecko-1.1.0-x86.cab && test -f /usr/share/wine/gecko/wine_gecko-1.2.0-x86.msi
-    then
-        w_warn "gecko is already installed in /usr/share/wine"
-    else
-        w_warn "Please install gecko in /usr/share/wine per http://wiki.winehq.org/Gecko.  http://winezeug.googlecode.com/svn/trunk/install-gecko.sh is an easy script to do that.  Then you should never need to do 'winetricks gecko' again."
-    fi
-}
-
-#----------------------------------------------------------------
-
-w_metadata gecko110 dlls \
-    title="Gecko 1.1.0 (not normally needed)" \
-    publisher="WineHQ/Mozilla" \
-    year="2010" \
-    media="download" \
-    file1="wine_gecko-1.1.0-x86.cab" \
-    installed_file1="$W_SYSTEM32_DLLS_WIN/gecko/1.1.0/wine_gecko/nspr4.dll"
-
-load_gecko110()
-{
-    w_skip_windows gecko110 && return
-
-    w_warn "You should probably not be using the gecko110 verb, see http://wiki.winehq.org/Gecko"
-    case `$WINE --version` in
-        wine-1.3.[2-9]|wine-1.3.[2-9]-*|wine-1.3.1[0-5]*)
-        ;;
-    *)
-        w_die "This verb only supports wine-1.3.2 to wine-1.3.15"
-        ;;
-    esac
-
-    w_download http://downloads.sourceforge.net/project/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86.cab 1b6c637207b6f032ae8a52841db9659433482714
-
-    mkdir -p "$W_SYSTEM32_DLLS/gecko/1.1.0"
-    cd "$W_SYSTEM32_DLLS/gecko/1.1.0"
-    w_try_cabextract $W_UNATTENDED_DASH_Q "$W_CACHE/gecko110/wine_gecko-1.1.0-x86.cab"
-
-    cat > "$W_TMP"/geckopath.reg <<_EOF_
-REGEDIT4
-
-[HKEY_CURRENT_USER\Software\Wine\MSHTML\1.1.0]
-"GeckoPath"="c:\\\\windows\\\\system32\\\\gecko\\\\1.1.0\\\\wine_gecko\\\\"
-_EOF_
-    w_try_regedit "$W_TMP_WIN"\\geckopath.reg
-
-    w_try_regsvr mshtml
-}
-
-w_metadata gecko120 dlls \
-    title="Gecko 1.2.0 (not normally needed)" \
-    publisher="WineHQ/Mozilla" \
-    year="2011" \
-    media="download" \
-    file1="wine_gecko-1.2.0-x86.msi" \
-    installed_file1="$W_SYSTEM32_DLLS_WIN/gecko/1.2.0/wine_gecko/nspr4.dll"
-
-load_gecko120()
-{
-    w_skip_windows gecko120 && return
-
-    w_warn "You should probably not be using the gecko120 verb, see http://wiki.winehq.org/Gecko"
-    case `$WINE --version` in
-    wine-0*|wine-1.[012]*|wine-1.3|wine-1.3.[0-9]|wine-1.3.1[0-4])
-        w_die "This verb only supports wine-1.3.15 and higher at the moment"
-        ;;
-    esac
-
-    w_download http://downloads.sourceforge.net/project/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86.msi 6964d1877668ab7da07a60f6dcf23fb0e261a808
-
-    w_try "$WINE" msiexec /i "$W_CACHE"/gecko120/wine_gecko-1.2.0-x86.msi $W_UNATTENDED_SLASH_Q
-}
-
-
 #----------------------------------------------------------------
 
 w_metadata gfw dlls \
@@ -5770,7 +5870,9 @@ load_icodecs()
     # Note: this codec is insecure, see
     # http://support.microsoft.com/kb/954157
     # Original source, ftp://download.intel.com/support/createshare/camerapack/codinstl.exe, had same checksum
-    w_download "http://codec.alshow.co.kr/Down/codinstl.exe" 2c5d64f472abe3f601ce352dcca75b4f02996f8a
+    # 2010-11-14: http://codec.alshow.co.kr/Down/codinstl.exe
+    # 2014-04-11: http://www.cucusoft.com/codecdownload/codinstl.exe (linked from http://www.cucusoft.com/codec.asp)
+    w_download "http://www.cucusoft.com/codecdownload/codinstl.exe" 2c5d64f472abe3f601ce352dcca75b4f02996f8a
 
     cd "$W_CACHE"/icodecs
 
@@ -5981,12 +6083,12 @@ w_metadata msacm32 dlls \
     publisher="Microsoft" \
     year="2003" \
     media="download" \
-    file1="../xpsp2/WindowsXP-KB835935-SP2-ENU.exe" \
+    file1="../xpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
     installed_file1="$W_SYSTEM32_DLLS_WIN/msacm32.dll"
 
 load_msacm32()
 {
-    helper_xpsp2 i386/msacm32.dl_
+    helper_xpsp3 i386/msacm32.dl_
     w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/msacm32.dl_
     w_override_dlls native,builtin msacm32
 }
@@ -6014,12 +6116,12 @@ w_metadata msctf dlls \
     publisher="Microsoft" \
     year="2003" \
     media="download" \
-    file1="../xpsp2/WindowsXP-KB835935-SP2-ENU.exe" \
+    file1="../xpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
     installed_file1="$W_SYSTEM32_DLLS_WIN/msctf.dll"
 
 load_msctf()
 {
-    helper_xpsp2 i386/msctf.dl_
+    helper_xpsp3 i386/msctf.dl_
     w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/msctf.dl_
     w_override_dlls native,builtin msctf
 }
@@ -6247,7 +6349,11 @@ w_metadata nuget dlls \
 load_nuget()
 {
     w_call dotnet40
-    w_download https://nuget.org/nuget.exe d4082afc4f89df195fa1e83ee1cf02bce3dd2f13
+    # 2014-01-22: d4082afc4f89df195fa1e83ee1cf02bce3dd2f13
+    # 2014-02-26: 9bc98ced9c2d2b51ab687f86b5580913c025b8b0
+    # 2014-04-17: 3210cc9a2e575384d59b0604c892bccce760e9b6
+    # probably changes too rapidly to check
+    w_download https://nuget.org/nuget.exe
     w_try cp "$W_CACHE/$W_PACKAGE"/nuget.exe "$W_SYSTEM32_DLLS"
     w_warn "To run nuget, use the commandline \"$WINE nuget\"."
 }
@@ -6499,6 +6605,7 @@ load_quicktime76()
 #----------------------------------------------------------------
 
 w_metadata remove_mono settings \
+    title_uk="Видалити вбудоване wine-mono" \
     title="Remove builtin wine-mono"
 
 load_remove_mono()
@@ -6618,6 +6725,24 @@ load_secur32()
 
 #----------------------------------------------------------------
 
+w_metadata setupapi dlls \
+    title="MS Setup API" \
+    publisher="Microsoft" \
+    year="2004" \
+    media="download" \
+    file1="../xpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/setupapi.dll"
+
+load_setupapi()
+{
+    helper_xpsp3 i386/setupapi.dl_
+    w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/setupapi.dl_
+
+    w_override_dlls native,builtin setupapi
+}
+
+#----------------------------------------------------------------
+
 w_metadata shockwave dlls \
     title="Shockwave" \
     publisher="Adobe" \
@@ -6645,7 +6770,10 @@ load_shockwave() {
     # 2012-08-08 sha1sum: 3c4d531ccf0bb5788f1c197c63e9c0aa89885ee6
     # 2013-06-15 sha1sum: 9c02499deaf567bde7d827493705e5680833d02e
     # 2014-01-22 sha1sum: c8f1b2c137a1373d591f7c1d48db9c6baa961caf
-    w_download http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi c8f1b2c137a1373d591f7c1d48db9c6baa961caf
+    # 2014-02-26 sha1sum: ae2855b729bfaedc766f3addd8c2b74eac576909
+    # 2014-04-15 sha1sum: c2ea56450fb4a5bac66cb7d70e3b522431521787
+
+    w_download http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi c2ea56450fb4a5bac66cb7d70e3b522431521787
     cd "$W_CACHE"/shockwave
     w_try "$WINE" msiexec /i sw_lic_full_installer.msi $W_UNATTENDED_SLASH_Q
 }
@@ -6699,6 +6827,24 @@ load_tabctl32()
 
 #----------------------------------------------------------------
 
+w_metadata updspapi dlls \
+    title="Windows Update Service API" \
+    publisher="Microsoft" \
+    year="2004" \
+    media="download" \
+    file1="../xpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/updspapi.dll"
+
+load_updspapi()
+{
+    helper_xpsp3 i386/update/updspapi.dll
+    w_try cp -f "$W_TMP"/i386/update/updspapi.dll "$W_SYSTEM32_DLLS"
+
+    w_override_dlls native,builtin updspapi
+}
+
+#----------------------------------------------------------------
+
 w_metadata usp10 dlls \
     title="Uniscribe 1.325 " \
     publisher="Microsoft" \
@@ -7077,6 +7223,7 @@ w_metadata vjrun20 dlls \
     publisher="Microsoft" \
     year="2007" \
     media="download" \
+    conflicts="dotnet11 dotnet20sp1 dotnet20sp2" \
     file1="vjredist.exe" \
     installed_file1="c:/windows/Microsoft.NET/Framework/VJSharp/VJSharpSxS10.dll"
 
@@ -7818,27 +7965,20 @@ load_fakekorean()
 
 #----------------------------------------------------------------
 
-w_metadata fontfix fonts \
-    title="Updated Arphic fonts" \
-    publisher="Arphic" \
-    year="2007" \
-    media="download" \
-    file1="ttf-arphic-ukai_0.1.20060108.orig.tar.gz"
+w_metadata fontfix settings \
+    title="Check for broken fonts"
 
 load_fontfix()
 {
     # some versions of ukai.ttf and uming.ttf crash .net and picasa
     # See http://bugs.winehq.org/show_bug.cgi?id=7098#c9
-    # Could fix globally, but that needs root, so just fix for wine
+    # Very unlikely to still be around, so downgrade to fatal warning
     if test -f /usr/share/fonts/truetype/arphic/ukai.ttf
     then
         gotsum=`$SHA1SUM < /usr/share/fonts/truetype/arphic/ukai.ttf | sed 's/ .*//'`
-        # FIXME: do all affected versions of the font have same sha1sum as Gutsy?  Seems unlikely.
         if [ "$gotsum"x = "96e1121f89953e5169d3e2e7811569148f573985"x ]
         then
-            w_download https://launchpadlibrarian.net/1499628/ttf-arphic-ukai_0.1.20060108.orig.tar.gz 92e577602d71454a108968e79ab667451f3602a2
-            gunzip -dc "$W_CACHE/fontfix/ttf-arphic-ukai_0.1.20060108.orig.tar.gz" | (cd "$W_TMP"; tar -xf -)
-            w_try mv "$W_TMP"/ttf-arphic-ukai-0.1.20060108/*.ttf "$W_FONTSDIR_UNIX"
+            w_die "Your installed ukai.ttf is known to be broken. Upgrade your ttf-arphic font package!"
         fi
     fi
 
@@ -7847,9 +7987,7 @@ load_fontfix()
         gotsum=`$SHA1SUM < /usr/share/fonts/truetype/arphic/uming.ttf | sed 's/ .*//'`
         if [ "$gotsum"x = "2a4f4a69e343c21c24d044b2cb19fd4f0decc82c"x ]
         then
-            w_download https://launchpadlibrarian.net/1564410/ttf-arphic-uming_0.1.20060108.orig.tar.gz 1439cdd731906e9e5311f320c2cb33262b24ef91
-            gunzip -dc "$W_CACHE/fontfix/ttf-arphic-uming_0.1.20060108.orig.tar.gz" | (cd "$W_TMP"; tar -xf -)
-            w_try mv "$W_TMP"/ttf-arphic-uming-0.1.20060108/*.ttf "$W_FONTSDIR_UNIX"
+            w_die "Your installed uming.ttf is known to be broken. Upgrade your ttf-uming font package!"
         fi
     fi
 
@@ -8656,6 +8794,16 @@ load_ie7()
         "$WINE" IE7-WindowsXP-x86-enu.exe $quiet
     fi
 
+    # IE7 exits with 194 to signal a reboot
+    status=$?
+    case $status in
+    0) ;;
+    105) echo "exit status $status - normal, user selected 'restart now'" ;;
+    194) echo "exit status $status - normal, user selected 'restart later'" ;;
+    *) w_die "exit status $status - $W_PACKAGE installation failed" ;;
+    esac
+
+
     if test -w /
     then
         # END KLUDGE: restore z:, assuming user didn't kill us
@@ -8802,16 +8950,17 @@ w_metadata mingw apps \
     publisher="GNU" \
     year="2013" \
     media="download" \
-    file1="mingw-get-0.6.2-mingw32-beta-20131004-1-bin.tar.xz" \
+    file1="mingw-get-setup.exe" \
     installed_exe1="c:/MinGW/bin/gcc.exe" \
     homepage="http://mingw.org/wiki/Getting_Started"
 
 load_mingw()
 {
-    w_download "$WINETRICKS_SOURCEFORGE/mingw/files/$file1"
+    w_download "$WINETRICKS_SOURCEFORGE/mingw/files/mingw-get-setup.exe" 66f1355f16ac1e328243e877880eb6e45e8b30e2
+
+    cd "$W_CACHE/mingw"
+    w_try "$WINE" "$file1"
     
-    w_try mkdir -p "$W_DRIVE_C/MinGW"
-    w_try tar -C "$W_DRIVE_C/MinGW" -Jxvf "$W_CACHE/mingw/$file1"
     w_append_path 'C:\MinGW\bin'
     w_try "$WINE" mingw-get update
     w_try "$WINE" mingw-get install gcc msys-base
@@ -9208,14 +9357,10 @@ load_spotify()
             WinClose
         }
         WinWaitClose
+        sleep 1000
+        Process, Close, SpotifyWebHelper.exe
         "
 
-    # 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\\$LOGNAME\\Application Data\\Spotify" spotify.exe
 }
 
@@ -9353,7 +9498,8 @@ load_steam()
 {
     # 18 Mar 2011 7f2fee9ffeaba8424a6c76d6c95b794735ac9959
     # 29 Nov 2012 fa053c268b6285741d1a1392c25f92c5cb2a6ffb
-    w_download http://storefront.steampowered.com/download/SteamInstall.msi fa053c268b6285741d1a1392c25f92c5cb2a6ffb
+    # 17 Mar 2014 b2a3fdbe4a662f3bf751f5b8bfc61f8d35e050fe
+    w_download http://media.steampowered.com/client/installer/SteamSetup.exe b2a3fdbe4a662f3bf751f5b8bfc61f8d35e050fe
     cd "$W_CACHE"/steam
 
     # Install corefonts first, so if the user doesn't have cabextract/Wine with cab support, we abort before installing Steam.
@@ -9364,7 +9510,7 @@ load_steam()
         w_call corefonts
     fi
 
-    w_try "$WINE" msiexec /i SteamInstall.msi $W_UNATTENDED_SLASH_Q
+    w_try "$WINE" SteamSetup.exe $W_UNATTENDED_SLASH_Q
 
     # Not all users need this disabled, but let's play it safe for now
     if w_workaround_wine_bug 22053 "Disabling gameoverlayrenderer to prevent game crashes on some machines."
@@ -9835,11 +9981,6 @@ load_wmp9()
         w_die "Installer doesn't support 64-bit architecture."
     fi
 
-    if w_workaround_wine_bug 28994 "virtualprotect problem" ,1.3.31 1.3.35,
-    then
-        w_die "Please upgrade to wine-1.3.35 to install wmp9."
-    fi
-
     w_call wsh57
 
     w_set_winver win2k
@@ -9847,8 +9988,11 @@ load_wmp9()
     # See also http://www.microsoft.com/windows/windowsmedia/player/9series/default.aspx
     w_download http://download.microsoft.com/download/1/b/c/1bc0b1a3-c839-4b36-8f3c-19847ba09299/MPSetup.exe 580536d10657fa3868de2869a3902d31a0de791b
 
-    # Wine's wmvcore crashes when the installer asks it to register itself?
-    w_override_dlls native wmvcore
+    # remove builtin placeholders to allow update
+    rm -f "$W_SYSTEM32_DLLS"/wmvcore.dll "$W_SYSTEM32_DLLS"/wmp.dll
+    # need native wmp override to allow update and later checks to succeed
+    w_override_dlls native wmp
+
     # FIXME: should we override quartz?  Builtin crashes when you play
     # anything, but maybe that's bug 30557 and only affects new systems?
     # Wine's pidgen is too stubby, crashes, see wine bug 31111
@@ -10327,45 +10471,30 @@ load_amnesia_tdd_demo()
     cd "$W_CACHE/$W_PACKAGE"
 
     w_ahk_do "
-        SetWinDelay 1000
         SetTitleMatchMode, 2
-        run amnesia_tdd_demo_1.0.1.exe
-        WinWait,Select Setup Language,language
+        Run, amnesia_tdd_demo_1.0.1.exe
         if ( w_opt_unattended > 0 ) {
-            WinActivate
-            ;ControlClick, TNewButton1; OK
-            send {Enter}              ; OK
-            WinWait,Setup - Amnesia - The Dark Descent Demo,Welcome
-            ;ControlClick TNewButton1 ; Next
-            send {Enter}              ; Next
-            WinWait,Setup - Amnesia - The Dark Descent Demo,License
-            ControlClick TNewRadioButton1 ; agree
-            Sleep 1000
-            send !n                   ; Next
-            ;send {Enter}             ; Next
-            ;ControlClick TNewButton2 ; Next
-            WinWait,Setup - Amnesia - The Dark Descent Demo,Destination
-            ;ControlClick TNewButton3 ; Next
-            send {Enter}              ; Next
-            WinWait,Folder Does Not Exist,created
-            ;ControlClick Button1     ; OK
-            send {Enter}              ; OK
-            WinWait,Setup - Amnesia - The Dark Descent Demo,shortcuts
-            ;ControlClick TNewButton4 ; Next
-            send {Enter}              ; Next
-            WinWait,Setup - Amnesia - The Dark Descent Demo,additional tasks
-            ;ControlClick TNewButton4 ; Next
-            send {Enter}              ; Next
-            WinWait,Setup - Amnesia - The Dark Descent Demo,installing
-            ;ControlClick TNewButton4 ; Install
-            send {Enter}              ; Install
-        }
-        WinWait,Setup - Amnesia - The Dark Descent Demo,finished
-        if ( w_opt_unattended > 0 ) {
-            ;ControlClick TNewButton4 ; Finish
-            send {Enter}              ; Finish
-        }
-        WinWaitClose,Setup - Amnesia - The Dark Descent Demo,finished
+            WinWait,Select Setup Language, language
+            ControlClick, TNewButton1
+            WinWait, Amnesia - The Dark Descent Demo, Welcome
+            ControlClick, TNewButton1
+            WinWait, Amnesia - The Dark Descent Demo, License
+            ControlClick, TNewRadioButton1
+            ControlClick, TNewButton2
+            WinWait, Amnesia - The Dark Descent Demo, installed?
+            ControlClick, TNewButton3
+            WinWait, Folder Does Not Exist, created
+            ControlClick, Button1
+            WinWait, Amnesia - The Dark Descent Demo, shortcuts
+            ControlClick, TNewButton4
+            WinWait, Amnesia - The Dark Descent Demo, additional tasks
+            ControlClick, TNewButton4
+            WinWait, Amnesia - The Dark Descent Demo, ready to begin installing
+            ControlClick, TNewButton4
+            WinWait, Amnesia - The Dark Descent Demo, finished
+            ControlClick, TNewButton4
+            WinWaitClose, Amnesia - The Dark Descent Demo, finished
+        }       
     "
 
     w_declare_exe "$W_PROGRAMS_X86_WIN\\Amnesia - The Dark Descent Demo\\redist" "Amnesia.exe"
@@ -11006,129 +11135,6 @@ load_bladekitten_demo()
 
 #----------------------------------------------------------------
 
-w_metadata braid_demo games \
-    title="Braid Demo" \
-    publisher="Number None" \
-    year="2009" \
-    media="download" \
-    file1="braid_windows_r3.exe" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/Braid/braid.exe"
-
-load_braid_demo()
-{
-    if ! test -f "$W_CACHE/$W_PACKAGE/braid_windows_r3.exe"
-    then
-        w_download http://mirror.3fl.net.au/games/arcade/braid/client/braid_windows_r3.exe 7ea08ddbf5f2fb2f38057d930389b5af7d737e2c
-    fi
-
-    cd "$W_CACHE/$W_PACKAGE"
-    w_ahk_do "
-        SetTitleMatchMode, 2
-        run, braid_windows_r3.exe
-        if ( w_opt_unattended > 0 ) {
-            winwait, Braid, install
-            controlclick, TButton1
-            winwait, Braid, Destination
-            controlclick, TButton3
-            winwait, Braid, Ready to Install
-            controlclick, TButton3
-            winwait, Setup, Finishing installation
-            sleep 5000
-            ; Workaround_winebug 21761
-            ifwinactive, Setup, ShellExecuteEx failed
-            {
-                controlclick, Button1
-            }
-        }
-        winwait, Braid, finished
-        if ( w_opt_unattended > 0 )
-            controlclick, TButton3
-        winwaitclose, Braid, finished
-    "
-
-    if w_workaround_wine_bug 22161
-    then
-        w_call d3dx9_36
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Braid" "braid.exe"
-}
-
-#----------------------------------------------------------------
-
-w_metadata braid games \
-    title="Braid" \
-    publisher="Number None" \
-    year="2009" \
-    media="download" \
-    file1="braid_windows_r3.exe" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/Braid/braid.exe"
-
-load_braid()
-{
-    if ! test -f "$W_CACHE/$W_PACKAGE/braid_windows_r3.exe"
-    then
-        w_download http://mirror.3fl.net.au/games/arcade/braid/client/braid_windows_r3.exe 7ea08ddbf5f2fb2f38057d930389b5af7d737e2c
-    fi
-
-    cd "$W_CACHE/$W_PACKAGE"
-    w_ahk_do "
-        SetTitleMatchMode, 2
-        run, braid_windows_r3.exe
-        if ( w_opt_unattended > 0 ) {
-            winwait, Braid, install
-            controlclick, TButton1
-            winwait, Braid, Destination
-            controlclick, TButton3
-            winwait, Braid, Ready to Install
-            controlclick, TButton3
-            winwait, Setup, Finishing installation
-            sleep 5000
-            ; Workaround_winebug 21761
-            ifwinactive, Setup, ShellExecuteEx failed
-            {
-                controlclick, Button1
-            }
-        }
-        winwait, Braid, finished
-        if ( w_opt_unattended > 0 )
-            controlclick, TButton3
-        winwaitclose, Braid, finished
-    "
-
-    if w_workaround_wine_bug 22161
-    then
-        w_call d3dx9_36
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Braid" "braid.exe"
-
-    w_read_key
-    cd "$W_DRIVE_C"
-    w_ahk_do "
-        SetTitleMatchMode, 2
-        run, run-$W_PACKAGE.bat
-        winwait, Braid, Enter Registration
-        controlclick, Button4
-        winwait, Enter Registration
-        send {Raw}$W_RAW_KEY
-        controlclick, Button1
-        sleep 5000
-        process, close, braid.exe
-    "
-
-    # Fix resolution for user:
-    if [ -x "`which xrandr`" ]
-    then
-        xrandr -s 0
-    else
-        w_warn "Xrandr is not available, not sure how to fix resolution, sorry!"
-    fi
-
-}
-
-#----------------------------------------------------------------
-
 w_metadata cnc_tiberian_sun games \
     title="Command and Conquer: Tiberian Sun (2010 edition)" \
     publisher="EA" \
@@ -12423,19 +12429,19 @@ w_metadata divinity2_demo games \
     title="Divinity II Demo" \
     publisher="DTP Entertainment" \
     year="2010" \
-    media="download" \
-    file1="Divinity2_DEMO_EN.exe" \
+    media="manual_download" \
+    file1="Divinity2_DEMO_EN_US.zip" \
     installed_file1="$W_PROGRAMS_X86_WIN/Divinity II - Ego Draconis - Demo/Bin/Divinity2_Demo.exe"
 
 load_divinity2_demo()
 {
-    w_download "http://demos.dtp-entertainment.ag/Divinity2_DEMO_EN.exe" \
-        01161a1375f5ee3bb215753e40dd1dcdceffd3a7
+    w_download_manual "http://www.gamershell.com/download_54304.shtml" $file1 2a33670b705d4da89e1119d808cda64977bb6096
 
-    cd "$W_CACHE/$W_PACKAGE"
+    w_try unzip -d "$W_TMP" "$W_CACHE/$W_PACKAGE/$file1"
+    cd "$W_TMP"
 
     w_ahk_do "
-        Run, Divinity2_DEMO_EN.exe
+        Run, Divinity2_DEMO_EN_US.exe
         SetTitleMatchMode, 2
         WinWait,Setup - Divinity II - Ego Draconis - Demo
         if ( w_opt_unattended > 0 ) {
@@ -13784,130 +13790,6 @@ load_kotor1()
     w_declare_exe "$W_PROGRAMS_X86_WIN\\LucasArts\\SWKotOR" "swkotor.exe"
 }
 
-#--------------------------------------------------------------------
-
-w_metadata kotor2 games \
-    title="Star Wars: Knights of the Old Republic 2" \
-    publisher="LucasArts" \
-    year="2005" \
-    media="cd" \
-    file1="K2_UK_v_1_0_dsc_.iso" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/LucasArts/SWKotOR2/swkotor2.exe"
-
-load_kotor2()
-{
-    if w_workaround_wine_bug 16596
-    then
-        w_call vd=800x600
-    fi
-
-    w_mount "K2_UK_v_1_0_dsc_"
-    w_ahk_do "
-        SetTitleMatchMode 2
-        SetWinDelay 500
-        run ${W_ISO_MOUNT_LETTER}:setup.exe
-        winwait Star Wars, Welcome
-        if ( w_opt_unattended > 0 ) {
-            controlclick button1
-            winwait Star Wars, License Agreement
-            controlclick button2
-            winwait Question, Licensing Agreement
-            controlclick button1
-            winwait Star Wars, Destination Location
-            controlclick button1
-            winwait Star Wars, Program Folder
-            controlclick button2
-        }
-        winwait Next Disk, disk 2
-    "
-    w_umount
-    w_mount "K2_UK_v_1_0_dsc_"
-    w_ahk_do "
-        SetTitleMatchMode 2
-        winwait Next Disk, disk 2
-        if ( w_opt_unattended > 0 )
-            controlclick button2
-        winwait Next Disk, disk 3
-    "
-    w_umount
-    w_mount "K2_UK_v_1_0_dsc_"
-    w_ahk_do "
-        SetTitleMatchMode 2
-        winwait Next Disk, disk 3
-        if ( w_opt_unattended > 0 )
-            controlclick button2
-        winwait Next Disk, disk 4
-    "
-    w_umount
-    w_mount "K2_UK_v_1_0_dsc_"
-    w_ahk_do "
-        SetTitleMatchMode 2
-        winwait Next Disk, disk 4
-        if ( w_opt_unattended > 0 )
-            controlclick button2
-        winwait Next Disk, Play disc
-    "
-    w_umount
-    w_mount "K2_UK_v_1_0_dsc_"
-    w_ahk_do "
-        SetTitleMatchMode 2
-        SetWinDelay 500
-        winwait Next Disk, Play disc
-        if ( w_opt_unattended > 0 ) {
-            controlclick button2
-            winwait Question, shortcut
-            controlclick button1
-            winwait Question, DirectX
-            controlclick button2
-        }
-        winwait Star Wars, Wizard Complete
-        if ( w_opt_unattended > 0 ) {
-            controlclick button1
-            controlclick button2
-            controlclick button4
-        }
-        winwaitclose Star Wars, Wizard Complete
-    "
-
-    # download 1.0a and 1.0b patches
-    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"
-
-    # install 1.0a patch
-    w_ahk_do "
-        SetTitleMatchMode 2
-        SetWinDelay 500
-        run KotOR2 Patch v201420 UK.exe
-        winwait RTPatch Software, 1.0a
-        if ( w_opt_unattended > 0 ) {
-            controlclick button1
-            winwait RTPatch Software, updated
-            controlclick button1
-        }
-        winwaitclose RTPatch Software
-    "
-
-    # install 1.0b patch
-    w_ahk_do "
-        SetTitleMatchMode 2
-        SetWinDelay 500
-        run sw_pc_uk_from201420_to211427.exe
-        winwait RTPatch Software, 1.0b
-        if ( w_opt_unattended > 0 ) {
-            controlclick button1
-            winwait Update1_0b.txt
-            winclose Update1_0b.txt ;close readme that pops up
-            winwait RTPatch Software, updated
-            controlclick button1
-        }
-        winwaitclose RTPatch Software
-    "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\LucasArts\\SWKotOR2" "swkotor2.exe"
-}
-
 #----------------------------------------------------------------
 
 w_metadata losthorizon_demo games \
@@ -16754,13 +16636,13 @@ w_metadata typingofthedead_demo games \
     title="Typing of the Dead Demo" \
     publisher="Sega" \
     year="1999" \
-    media="download" \
+    media="manual_download" \
     file1="Tod_e_demo.exe" \
     installed_exe1="$W_PROGRAMS_X86_WIN/SEGA/TOD-Demo/Tod_e_demo.exe"
 
 load_typingofthedead_demo()
 {
-    w_download "http://downloads.pcworld.com/pub/new/fun_and_games/other/tod-demo.zip" 96fe3edb2431210932af840e29c59bce6b7fc80f
+    w_download "http://www.fileplanet.com/54947/50000/fileinfo/The-Typing-of-the-Dead-Demo" 96fe3edb2431210932af840e29c59bce6b7fc80f
 
     cd "$W_CACHE/$W_PACKAGE"
     mkdir "$W_TMP"
@@ -17369,8 +17251,10 @@ _EOF_
 #----------------------------------------------------------------
 
 w_metadata glsl=enabled settings \
+    title_uk="Включити glsl шейдери (за замовчуванням)" \
     title="Enable glsl shaders (default)"
 w_metadata glsl=disabled settings \
+    title_uk="Вимкнути glsl шейдери та використовувати arb шейдери (швидше, але іноді з перервами)" \
     title="Disable glsl shaders, use arb shaders (faster, but sometimes breaks)"
 
 load_glsl()
@@ -17381,8 +17265,10 @@ load_glsl()
 #----------------------------------------------------------------
 
 w_metadata multisampling=enabled settings \
+    title_uk="Включити Direct3D мультисемплінг" \
     title="Enable Direct3D multisampling"
 w_metadata multisampling=disabled settings \
+    title_uk="Вимкнути Direct3D мультисемплінг" \
     title="Disable Direct3D multisampling"
 
 load_multisampling()
@@ -17393,6 +17279,7 @@ load_multisampling()
 #----------------------------------------------------------------
 
 w_metadata npm=repack settings \
+    title_uk="Поставити NonPower2Mode на repack" \
     title="Set NonPower2Mode to repack"
 
 load_npm()
@@ -17403,8 +17290,10 @@ load_npm()
 #----------------------------------------------------------------
 
 w_metadata orm=fbo settings \
+    title_uk="Поставити OffscreenRenderingMode=fbo (за замовчуванням)" \
     title="Set OffscreenRenderingMode=fbo (default)"
 w_metadata orm=backbuffer settings \
+    title_uk="Поставити OffscreenRenderingMode=backbuffer" \
     title="Set OffscreenRenderingMode=backbuffer"
 
 load_orm()
@@ -17415,8 +17304,10 @@ load_orm()
 #----------------------------------------------------------------
 
 w_metadata psm=enabled settings \
+    title_uk="Включити PixelShaderMode" \
     title="Set PixelShaderMode to enabled"
 w_metadata psm=disabled settings \
+    title_uk="Вимкнути PixelShaderMode" \
     title="Set PixelShaderMode to disabled"
 
 load_psm()
@@ -17427,8 +17318,10 @@ load_psm()
 #----------------------------------------------------------------
 
 w_metadata strictdrawordering=enabled settings \
+    title_uk="Включити StrictDrawOrdering" \
     title="Enable StrictDrawOrdering"
 w_metadata strictdrawordering=disabled settings \
+    title_uk="Вимкнути StrictDrawOrdering (за замовчуванням)" \
     title="Disable StrictDrawOrdering (default)"
 
 load_strictdrawordering()
@@ -17439,16 +17332,22 @@ load_strictdrawordering()
 #----------------------------------------------------------------
 
 w_metadata rtlm=auto settings \
+    title_uk="Поставити RenderTargetLockMode на авто (за замовчуванням)" \
     title="Set RenderTargetLockMode to auto (default)"
 w_metadata rtlm=disabled settings \
+    title_uk="Вимкнути RenderTargetLockMode" \
     title="Set RenderTargetLockMode to disabled"
 w_metadata rtlm=readdraw settings \
+    title_uk="Поставити RenderTargetLockMode на readdraw" \
     title="Set RenderTargetLockMode to readdraw"
 w_metadata rtlm=readtex settings \
+    title_uk="Поставити RenderTargetLockMode на readtex" \
     title="Set RenderTargetLockMode to readtex"
 w_metadata rtlm=texdraw settings \
+    title_uk="Поставити RenderTargetLockMode на texdraw" \
     title="Set RenderTargetLockMode to texdraw"
 w_metadata rtlm=textex settings \
+    title_uk="Поставити RenderTargetLockMode на textex" \
     title="Set RenderTargetLockMode to textex"
 
 load_rtlm()
@@ -17460,8 +17359,10 @@ load_rtlm()
 # AlwaysOffscreen settings
 
 w_metadata ao=enabled settings \
+    title_uk="Включити AlwaysOffscreen" \
     title="Enable AlwaysOffscreen"
 w_metadata ao=disabled settings \
+    title_uk="Вимкнути AlwaysOffscreen (за замовчуванням)" \
     title="Disable AlwaysOffscreen (default)"
 
 load_ao()
@@ -17473,8 +17374,10 @@ load_ao()
 # DirectDraw settings
 
 w_metadata ddr=gdi settings \
+    title_uk="Поставити DirectDrawRenderer на gdi" \
     title="Set DirectDrawRenderer to gdi"
 w_metadata ddr=opengl settings \
+    title_uk="Поставити DirectDrawRenderer на opengl" \
     title="Set DirectDrawRenderer to opengl"
 
 load_ddr()
@@ -17486,10 +17389,13 @@ load_ddr()
 # DirectInput settings
 
 w_metadata mwo=force settings \
+    title_uk="Поставити примусове DirectInput MouseWarpOverride (необхідно для деяких ігор)" \
     title="Set DirectInput MouseWarpOverride to force (needed by some games)"
 w_metadata mwo=enabled settings \
+    title_uk="Включити DirectInput MouseWarpOverride (за замовчуванням)" \
     title="Set DirectInput MouseWarpOverride to enabled (default)"
 w_metadata mwo=disable settings \
+    title_uk="Вимкнути DirectInput MouseWarpOverride" \
     title="Set DirectInput MouseWarpOverride to disable"
 
 load_mwo()
@@ -17519,8 +17425,10 @@ _EOF_
 # Mac Driver settings
 
 w_metadata macdriver=mac settings \
+    title_uk="Включити рідний Mac Quartz драйвер (за замовчуванням)" \
     title="Enable the Mac native Quartz driver (default)"
 w_metadata macdriver=x11 settings \
+    title_uk="Вимкнути рідний Mac Quartz драйвер та використовувати замість нього X11" \
     title="Disable the Mac native Quartz driver, use X11 instead"
 
 load_macdriver()
@@ -17540,8 +17448,10 @@ _EOF_
 # X11 Driver settings
 
 w_metadata grabfullscreen=y settings \
+    title_uk="Примусове захоплення курсору для повноекранних вікон (необхідно для деяких ігор)" \
     title="Force cursor clipping for full-screen windows (needed by some games)"
 w_metadata grabfullscreen=n settings \
+    title_uk="Вимкнути примусове захоплення курсору для повноекранних вікон (за замовчуванням)" \
     title="Disable cursor clipping for full-screen windows (default)"
 
 load_grabfullscreen()
@@ -17563,8 +17473,10 @@ _EOF_
 }
 
 w_metadata windowmanagerdecorated=y settings \
+    title_uk="Дозволити менеджеру вікон декорувати вікна (за замовчуванням)" \
     title="Allow the window manager to decorate windows (default)"
 w_metadata windowmanagerdecorated=n settings \
+    title_uk="Не дозволяти менеджеру вікон декорувати вікна" \
     title="Prevent the window manager from decorating windows"
 
 load_windowmanagerdecorated()
@@ -17586,8 +17498,10 @@ _EOF_
 }
 
 w_metadata windowmanagermanaged=y settings \
+    title_uk="Дозволити менеджеру вікон керування вікнами (за замовчуванням)" \
     title="Allow the window manager to control windows (default)"
 w_metadata windowmanagermanaged=n settings \
+    title_uk="Не дозволяти менеджеру вікон керування вікнами" \
     title="Prevent the window manager from controling windows"
 
 load_windowmanagermanaged()
@@ -17614,8 +17528,10 @@ _EOF_
 #----------------------------------------------------------------
 
 w_metadata alldlls=default settings \
+    title_uk="Видалити всі перевизначення DLL" \
     title="Remove all DLL overrides"
 w_metadata alldlls=builtin settings \
+    title_uk="Перевизначити найбільш поширені DLL на вбудовані" \
     title="Override most common DLLs to builtin"
 
 load_alldlls()
@@ -17627,12 +17543,16 @@ load_alldlls()
 }
 
 w_metadata fontsmooth=disable settings \
+    title_uk="Вимкнути згладжування шрифту" \
     title="Disable font smoothing"
 w_metadata fontsmooth=bgr settings \
+    title_uk="Включити субпіксельне згладжування шрифту для BGR LCD моніторів" \
     title="Enable subpixel font smoothing for BGR LCDs"
 w_metadata fontsmooth=rgb settings \
+    title_uk="Включити субпіксельне згладжування шрифту для RGB LCD моніторів" \
     title="Enable subpixel font smoothing for RGB LCDs"
 w_metadata fontsmooth=gray settings \
+    title_uk="Включити субпіксельне згладжування шрифту" \
     title="Enable subpixel font smoothing"
 
 load_fontsmooth()
@@ -17663,6 +17583,7 @@ _EOF_
 #----------------------------------------------------------------
 
 w_metadata forcemono settings \
+    title_uk="Примусове використання mono замість .Net (для налогодження)" \
     title="Force using mono instead of .Net (for debugging)"
 
 load_forcemono()
@@ -17674,6 +17595,7 @@ load_forcemono()
 #----------------------------------------------------------------
 
 w_metadata heapcheck settings \
+    title_uk="Включити накопичувальну перевірку GlobalFlag" \
     title="Enable heap checking with GlobalFlag"
 
 load_heapcheck()
@@ -17691,6 +17613,7 @@ _EOF_
 #----------------------------------------------------------------
 
 w_metadata hosts settings \
+    title_uk="Додати порожні файли у C:\windows\system32\drivers\etc\{hosts,services}" \
     title="Add empty C:\windows\system32\drivers\etc\{hosts,services} files"
 
 load_hosts()
@@ -17711,6 +17634,7 @@ load_hosts()
 #----------------------------------------------------------------
 
 w_metadata native_mdac settings \
+    title_uk="Перевизначити odbc32, odbccp32 та oledb32" \
     title="Override odbc32, odbccp32 and oledb32"
 
 load_native_mdac()
@@ -17723,6 +17647,7 @@ load_native_mdac()
 #----------------------------------------------------------------
 
 w_metadata native_oleaut32 settings \
+    title_uk="Перевизначити oleaut32" \
     title="Override oleaut32"
 
 load_native_oleaut32()
@@ -17733,6 +17658,7 @@ load_native_oleaut32()
 #----------------------------------------------------------------
 
 w_metadata nocrashdialog settings \
+    title_uk="Вимкнути діалог про помилку" \
     title="Disable crash dialog"
 
 load_nocrashdialog()
@@ -17752,6 +17678,7 @@ _EOF_
 #----------------------------------------------------------------
 
 w_metadata nt40 settings \
+    title_uk="Поставити версію Windows NT 4.0" \
     title="Set windows version to Windows NT 4.0"
 
 load_nt40()
@@ -17762,6 +17689,7 @@ load_nt40()
 #----------------------------------------------------------------
 
 w_metadata sandbox settings \
+    title_uk="Пісочниця wineprefix - видалити посилання до HOME" \
     title="Sandbox the wineprefix - remove links to \$HOME"
 
 load_sandbox()
@@ -17771,7 +17699,8 @@ load_sandbox()
     # Unmap drive Z
     rm -f "$WINEPREFIX/dosdevices/z:"
 
-    pushd "$WINEPREFIX/drive_c/users/$USER"
+    _olddir="`pwd`"
+    cd "$WINEPREFIX/drive_c/users/$USER"
     for x in *
     do
         if test -h "$x" && test -d "$x"
@@ -17780,7 +17709,8 @@ load_sandbox()
             mkdir -p "$x"
         fi
     done
-    popd
+    cd "$_olddir"
+    unset _olddir
 
     # Disable unixfs
     # Unfortunately, when you run with a different version of Wine, Wine will recreate this key.
@@ -17794,12 +17724,16 @@ load_sandbox()
 #----------------------------------------------------------------
 
 w_metadata sound=alsa settings \
+    title_uk="Поставити звуковий драйвер ALSA" \
     title="Set sound driver to ALSA"
 w_metadata sound=coreaudio settings \
+    title_uk="Поставити звуковий драйвер Mac CoreAudio" \
     title="Set sound driver to Mac CoreAudio"
 w_metadata sound=disabled settings \
+    title_uk="Вимкнути звуковий драйвер" \
     title="Set sound driver to disabled"
 w_metadata sound=oss settings \
+    title_uk="Поставити звуковий драйвер OSS" \
     title="Set sound driver to OSS"
 
 load_sound()
@@ -17818,16 +17752,22 @@ _EOF_
 #----------------------------------------------------------------
 
 w_metadata vd=off settings \
+    title_uk="Вимкнути віртуальний робочий стіл" \
     title="Disable virtual desktop"
 w_metadata vd=640x480 settings \
+    title_uk="Включити віртуальний робочий стіл та поставити розмір 640x480" \
     title="Enable virtual desktop, set size to 640x480"
 w_metadata vd=800x600 settings \
+    title_uk="Включити віртуальний робочий стіл та поставити розмір 800x600" \
     title="Enable virtual desktop, set size to 800x600"
 w_metadata vd=1024x768 settings \
+    title_uk="Включити віртуальний робочий стіл та поставити розмір 1024x768" \
     title="Enable virtual desktop, set size to 1024x768"
 w_metadata vd=1280x1024 settings \
+    title_uk="Включити віртуальний робочий стіл та поставити розмір 1280x1024" \
     title="Enable virtual desktop, set size to 1280x1024"
 w_metadata vd=1440x900 settings \
+    title_uk="Включити віртуальний робочий стіл та поставити розмір 1440x900" \
     title="Enable virtual desktop, set size to 1440x900"
 
 load_vd()
@@ -17866,12 +17806,16 @@ _EOF_
 #----------------------------------------------------------------
 
 w_metadata videomemorysize=default settings \
+    title_uk="Дати можливість Wine визначити розмір відеопам'яті" \
     title="Let Wine detect amount of video card memory"
 w_metadata videomemorysize=512 settings \
+    title_uk="Повідомити Wine про 512МБ відеопам'яті" \
     title="Tell Wine your video card has 512MB RAM"
 w_metadata videomemorysize=1024 settings \
+    title_uk="Повідомити Wine про 1024МБ відеопам'яті" \
     title="Tell Wine your video card has 1024MB RAM"
 w_metadata videomemorysize=2048 settings \
+    title_uk="Повідомити Wine про 2048МБ відеопам'яті" \
     title="Tell Wine your video card has 2048MB RAM"
 
 load_videomemorysize()
@@ -17905,6 +17849,7 @@ _EOF_
 #----------------------------------------------------------------
 
 w_metadata vista settings \
+    title_uk="Поставити версію Windows Vista" \
     title="Set windows version to Windows Vista"
 
 load_vista()
@@ -17915,6 +17860,7 @@ load_vista()
 #----------------------------------------------------------------
 
 w_metadata vsm=hardware settings \
+    title_uk="Поставити VertexShaderMode на hardware" \
     title="Set VertexShaderMode to hardware"
 
 load_vsm()
@@ -17925,6 +17871,7 @@ load_vsm()
 #----------------------------------------------------------------
 
 w_metadata win2k settings \
+    title_uk="Поставити версію Windows 2000" \
     title="Set windows version to Windows 2000"
 
 load_win2k()
@@ -17935,6 +17882,7 @@ load_win2k()
 #----------------------------------------------------------------
 
 w_metadata win2k3 settings \
+    title_uk="Поставити версію Windows 2003" \
     title="Set windows version to Windows 2003"
 
 load_win2k3()
@@ -17945,6 +17893,7 @@ load_win2k3()
 #----------------------------------------------------------------
 
 w_metadata win31 settings \
+    title_uk="Поставити версію Windows 3.1" \
     title="Set windows version to Windows 3.1"
 
 load_win31()
@@ -17955,6 +17904,7 @@ load_win31()
 #----------------------------------------------------------------
 
 w_metadata win7 settings \
+    title_uk="Поставити версію Windows 7" \
     title="Set windows version to Windows 7"
 
 load_win7()
@@ -17965,6 +17915,7 @@ load_win7()
 #----------------------------------------------------------------
 
 w_metadata win95 settings \
+    title_uk="Поставити версію Windows 95" \
     title="Set windows version to Windows 95"
 
 load_win95()
@@ -17975,6 +17926,7 @@ load_win95()
 #----------------------------------------------------------------
 
 w_metadata win98 settings \
+    title_uk="Поставити версію Windows 98" \
     title="Set windows version to Windows 98"
 
 load_win98()
@@ -17986,6 +17938,7 @@ load_win98()
 
 # Really, we should support other values, since winetricks did
 w_metadata winver= settings \
+    title_uk="Поставити версію Windows за замовчуванням (winxp)" \
     title="Set windows version to default (winxp)"
 
 load_winver()
@@ -17996,6 +17949,7 @@ load_winver()
 #----------------------------------------------------------------
 
 w_metadata winxp settings \
+    title_uk="Поставити версію Windows XP" \
     title="Set windows version to Windows XP"
 
 load_winxp()
@@ -18087,7 +18041,6 @@ for data in \
     fontfix:size_MB=47,time_sec=0 \
     fontxplorer:size_MB=51,time_sec=5 \
     gdiplus:size_MB=50,time_sec=2 \
-    gecko110:size_MB=47,time_sec=0 \
     gfw:size_MB=211,time_sec=11 \
     glut:size_MB=47,time_sec=1 \
     gothic4_demo:size_MB=7719,time_sec=1402 \