diff --git a/_service b/_service
index 66e8583..b1b48de 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,7 @@
@PARENT_TAG@
v(.*)
https://github.com/wine-staging/wine-staging.git
- refs/tags/v3.7
+ refs/tags/v3.9
v*.*
git
@@ -11,7 +11,7 @@
@PARENT_TAG@
wined3d9(.*)
https://github.com/sarnex/wine-d3d9-patches.git
- refs/tags/wine-d3d9-3.6
+ refs/tags/wine-d3d9-3.8
git
diff --git a/wine-3.7.tar.xz b/wine-3.7.tar.xz
deleted file mode 100644
index cd01320..0000000
--- a/wine-3.7.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:76c73760d72497c59e81dfd7c5def450171bd59e9cff3df0a42454e0c7fc2bb7
-size 20454036
diff --git a/wine-3.7.tar.xz.sign b/wine-3.7.tar.xz.sign
deleted file mode 100644
index 90234a5..0000000
--- a/wine-3.7.tar.xz.sign
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlrjaxMACgkQzvrI6q8X
-UZ3T4A/+J/6/gdbpcO/ZNtuOI3taWe3IysyO8gBjvZ5XWLqP50Llhaq4hSzeXLq5
-DQjCMoVC/irp3E2E8dibrRWTEgKq7DyEK/7XYOQ6Bg/yqh93uDOJTpbLZNN51Bb+
-jviDavApqbE1zBUVv1pKn7GYlLETB0XaQvDkG7goNB5qVsSl+7DH76MIP7jo32ho
-itNKdDvludJ+aXD/zUp4oGjuHyEqnKXl4keAmrype1VqHJm4sb25oPTCwH77uSMb
-ikAnY/hnCVpKRsh1a6BphwOWAa718YVi/i7Rg+vFeX2G4kVXIQ3M7mb9UUkX5EtZ
-12f8pzO1V4Q7noXs8ISyvrdgs52tb2/WHZ7zvFKnJCBgGeHc7X7xw9EhHRKO3js9
-b/yvcx367z9AFCZAqCa/CZFo0+yUKp4EpP1Fe58++ZEhPaWoJC4RzIQtJBjJ+jK3
-rDRI20rZ2LQMAPIvGcZkX0yvme6ZJ63kk1/w1MmNAyX80j9yx1GW/VgiVBdQQ4W4
-MJkq+1VI0/a8ukn5bCoS66xIduy6+cg6AOWmGoMUJx1ZfZwd3Or98bpdLKP+kRxP
-Y+t9bUgEFZNWuazRFinqS3IrEJAefFHm3I9mdm+eJR9Gn8KPd6bHH/20TN0dQBei
-1v1URKs7keif2Twdnj8d/oMrBPGhZ706c7+i28yRB3k96T4OTQo=
-=Hvel
------END PGP SIGNATURE-----
diff --git a/wine-3.9.tar.xz b/wine-3.9.tar.xz
new file mode 100644
index 0000000..b314c01
--- /dev/null
+++ b/wine-3.9.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ccadc281966d5a94f1161dec22d29bf7bd6506b371b26f18f652d374e986b735
+size 20508952
diff --git a/wine-3.9.tar.xz.sign b/wine-3.9.tar.xz.sign
new file mode 100644
index 0000000..3e8a26f
--- /dev/null
+++ b/wine-3.9.tar.xz.sign
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlsIWJQACgkQzvrI6q8X
+UZ3ZnRAAsUA/KHVKtpUmhfH98OKe1JED4Y2bMZg+g9ShAJP9Y5RarciU4vjKLG0H
+vNaPk9xYh46gnH5gu1VWy7muXR0Ivut1tEupHG3aHv/qYE01NwZZQcfQmqT9ShJp
+RGevBcmxb6p3fCyO+nbFi443VINVxGq81zd/dVNzat3PL0xp8TJ9dUSBjnbTB/c9
+x5s3pAIRnIjFX3NaySGRpUcPGV+ftnXJf8uywg3/TZCzFPTpS1Yq+EF3NaLrAJh5
+JZrHh8O4DpIiNJHbQHRxyWk2+3Hc6HykG3mwP0Kd71y+M+9osJE65skLgBJaBgCH
+45bhShVoqbqNqRroRo8kL08jwQQMekTQnw4wRdSbigS8Sxu8HOfjt+YL36bwJEvC
+hKT4MQz3kszSMnkWYQzM5qTgxX64QoDmWaFMJyTSRzhrUW1nakYsAFqAMaiE76tC
+7mVZtihqnnM143B1AWkn9u8KJSbMhBn2TTHdB7zucBTJx4PNeNB/FrWuweInf04x
+qs/cor+hMED/Ei0iwdQOTCW664gl4dVUQa+n7dpMJwrQfw+X6B/CLDHp0COQ5ID5
+EM5QBVuW2mrj0kw9KmLAoCrtxA3LF/4SWMD0ZjPm4UJbO6g94365N2C8tw1eGvk0
+jU/QNcdAFl4QqXHMwbthGE0tHuAW9fXhsQEJFDG2ehiqpWrgY4U=
+=Ij95
+-----END PGP SIGNATURE-----
diff --git a/wine-d3d9-patches-3.6.tar.xz b/wine-d3d9-patches-3.6.tar.xz
deleted file mode 100644
index b8b5803..0000000
--- a/wine-d3d9-patches-3.6.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fdf24fb8374f8a1b06c9231d137abc6c56e2b6546ab7cdb952fdb0d080a908ff
-size 42352
diff --git a/wine-d3d9-patches-3.8.tar.xz b/wine-d3d9-patches-3.8.tar.xz
new file mode 100644
index 0000000..03a8fd8
--- /dev/null
+++ b/wine-d3d9-patches-3.8.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3489a6bdcead24875e5ba0457746d903c1af42f17df8c411e91f8bf390784109
+size 42372
diff --git a/wine-staging-3.7.tar.xz b/wine-staging-3.7.tar.xz
deleted file mode 100644
index 0eb5428..0000000
--- a/wine-staging-3.7.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:798085a29343dabc7c7a7832a4588cc1e5b9dc317493655060f4484fc109caf0
-size 7530408
diff --git a/wine-staging-3.9.tar.xz b/wine-staging-3.9.tar.xz
new file mode 100644
index 0000000..324d201
--- /dev/null
+++ b/wine-staging-3.9.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9c786cf29d855d8b6ee87a1f097108ffb69125a81a905287f421e87968ea915
+size 7516568
diff --git a/wine.changes b/wine.changes
index 36c1473..54a6985 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Fri May 25 19:20:01 UTC 2018 - meissner@suse.com
+
+- Update to 3.9 development release
+ - OpenGL core contexts enabled by default in Direct 3D.
+ - Beginnings of Direct 3D 12 implementation using vkd3d.
+ - More support for the Task Scheduler.
+ - Some more Task Dialog support.
+ - Better arrow support in GdiPlus.
+ - Various bug fixes.
+- updated winetricks
+- updated staging to 3.9
+
+-------------------------------------------------------------------
+Fri May 11 18:37:37 UTC 2018 - meissner@suse.com
+
+- Update to 3.8 development release
+ - Infrastructure for writing kernel driver tests.
+ - Support for showing file properties in the Shell browser.
+ - MP3 decoder as a DirectX Media Object.
+ - More support for the Task Scheduler.
+ - Support for COM aggregation in UrlMon.
+ - Various bug fixes.
+- updated winetricks
+- updated staging to 3.8
+
-------------------------------------------------------------------
Fri Apr 27 18:55:43 UTC 2018 - meissner@suse.com
diff --git a/wine.spec b/wine.spec
index 37b4566..1ba45f7 100644
--- a/wine.spec
+++ b/wine.spec
@@ -101,8 +101,8 @@ BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(xxf86vm)
BuildRequires: pkgconfig(zlib)
-%define realver 3.7
-Version: 3.7
+%define realver 3.9
+Version: 3.9
Release: 0
Summary: An MS Windows Emulator
License: LGPL-2.1-or-later
@@ -140,7 +140,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %{ix86} x86_64 ppc %arm aarch64
%if %{staging}
# upstream patch target version
-%define staging_version 3.7
+%define staging_version 3.9
Source100: wine-staging-%{staging_version}.tar.xz
BuildRequires: gtk3-devel
BuildRequires: libOSMesa-devel
@@ -148,7 +148,7 @@ BuildRequires: libva-devel
%endif
%if %{nine}
# upstream patch target version
-%define nine_version 3.6
+%define nine_version 3.8
BuildRequires: Mesa-libd3d-devel
BuildRequires: dri2proto-devel
BuildRequires: libOSMesa-devel
diff --git a/winetricks b/winetricks
index 55d029a..24a8fb7 100644
--- a/winetricks
+++ b/winetricks
@@ -6,7 +6,7 @@
# Name of this version of winetricks (YYYYMMDD)
# (This doesn't change often, use the sha256sum of the file when reporting problems)
-WINETRICKS_VERSION=20180217-next
+WINETRICKS_VERSION=20180513-next
# This is a UTF-8 file
# You should see an o with two dots over it here [ö]
@@ -41,7 +41,10 @@ WINETRICKS_VERSION=20180217-next
# On Ubuntu, the following lines can be used to install all the prerequisites:
# sudo add-apt-repository ppa:ubuntu-wine/ppa
# sudo apt-get update
-# sudo apt-get install binutils cabextract p7zip unrar unzip wget wine zenity
+# sudo apt-get install binutils cabextract p7zip-full unrar unzip wget wine zenity
+# On Fedora, these commands can be used (RPM Fusion is used to install unrar):
+# sudo dnf install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
+# sudo dnf install binutils cabextract p7zip-plugins unrar unzip wget wine zenity
#
# See http://winetricks.org for documentation and tutorials, including
# how to contribute changes to winetricks.
@@ -192,7 +195,15 @@ w_askpermission()
case $WINETRICKS_GUI in
zenity) $WINETRICKS_GUI "$_W_timeout" --question --title=winetricks --text="$(echo "$@" | sed 's,\\\\,\\\\\\\\,g')" --no-wrap;;
kdialog) $WINETRICKS_GUI --title winetricks --warningcontinuecancel "$@" ;;
- none) printf %s "Press Y or N, then Enter: " ; read -r response ; test "$response" = Y || test "$response" = y;;
+ none)
+ if [ -n "$_W_timeout" ]; then
+ # -t / TMOUT don't seem to be portable, so just assume yes in unattended mode
+ w_info "Unattended mode, not prompting for confirmation"
+ else
+ printf %s "Press Y or N, then Enter: "
+ read -r response
+ test "$response" = Y || test "$response" = y
+ fi
esac
if test $? -ne 0; then
@@ -331,6 +342,8 @@ w_package_warn_win64()
fi
}
+### w_try and w_try wrappers ###
+
# Execute with error checking
# Put this in front of any command that might fail
w_try()
@@ -380,7 +393,7 @@ w_try_7z()
if test -x "$(which 7z 2>/dev/null)"; then
w_try 7z x "$filename" -o"$destdir" "$@"
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')."
+ 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-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 "$filename")" -o"$(w_pathconv -w "$destdir")" "$@"
@@ -420,6 +433,52 @@ w_try_cd()
w_try cd "$@"
}
+# Copy font files matching a glob pattern from source directory to destination directory.
+# Also remove any file in the destination directory that has the same name as
+# any of the files that we're trying to copy, but with different case letters.
+# Note: it converts font file names to lower case to avoid inconsistencies due to paths
+# being case-insensitive under Wine.
+w_try_cp_font_files()
+{
+ # $1 - source directory
+ # $2 - destination directory
+ # $3 - optional font file glob pattern (default: "*.ttf")
+
+ _W_src_dir="$1"
+ _W_dest_dir="$2"
+ _W_pattern="$3"
+ shift 2
+
+ if test ! -d "$_W_src_dir"; then
+ w_die "bug: missing source dir"
+ fi
+
+ if test ! -d "$_W_dest_dir"; then
+ w_die "bug: missing destination dir"
+ fi
+
+ if test -z "$_W_pattern"; then
+ _W_pattern="*.ttf"
+ fi
+
+ _W_src_files=$(find "$_W_src_dir" -maxdepth 1 -type f -iname "$_W_pattern")
+
+ for _W_src_file in $_W_src_files; do
+ # Extract the file name and lower case it
+ _W_file_name=$(basename "$_W_src_file" | tr "[:upper:]" "[:lower:]")
+
+ # Remove any existing font files that might have the same name, but with different case characters
+ find "$_W_dest_dir" -maxdepth 1 -type f -iname "$_W_file_name" -exec rm '{}' ';'
+
+ w_try cp -f "$_W_src_file" "$_W_dest_dir/$_W_file_name"
+ done
+
+ # Wait for Wine to add the new font to the registry under HKCU\Software\Wine\Fonts\Cache
+ w_wineserver -w
+
+ unset _W_src_files _W_dest_dir _W_src_file _W_file_name
+}
+
w_try_msiexec64()
{
if test "$W_ARCH" != "win64"; then
@@ -430,6 +489,19 @@ w_try_msiexec64()
w_try "$WINE" start /wait "$W_SYSTEM64_DLLS_WIN32/msiexec.exe" $W_UNATTENDED_SLASH_Q "$@"
}
+w_try_regedit()
+{
+ # If on wow64, run under both wine and wine64 (otherwise they only go in the 32-bit registry afaict)
+
+ # shellcheck disable=SC2086
+ if [ "$W_ARCH" = "win32" ]; then
+ w_try_regedit32 "$@"
+ elif [ "$W_ARCH" = "win64" ]; then
+ w_try_regedit32 "$@"
+ w_try_regedit64 "$@"
+ fi
+}
+
# fixme: cleanup. For wow64 registries, some/all entries need to be duplicated.
# Not sure of the best way yet, but thinking running wine/wine64 regedit for each?
w_try_regedit32()
@@ -456,19 +528,6 @@ w_try_regedit64()
w_try "$WINE64" $cmdc regedit $W_UNATTENDED_SLASH_S "$@"
}
-w_try_regedit()
-{
- # If on wow64, run under both wine and wine64 (otherwise they only go in the 32-bit registry afaict)
-
- # shellcheck disable=SC2086
- if [ "$W_ARCH" = "win32" ]; then
- w_try_regedit32 "$@"
- elif [ "$W_ARCH" = "win64" ]; then
- w_try_regedit32 "$@"
- w_try_regedit64 "$@"
- fi
-}
-
w_try_regsvr()
{
# shellcheck disable=SC2086
@@ -518,51 +577,7 @@ w_try_unzip()
w_try "$WINE" "$W_PROGRAMS_X86_WIN\\7-Zip\\7z.exe" x "$(w_pathconv -w "$zipfile")" -o"$(w_pathconv -w "$destdir")" "$@"
}
-# Copy font files matching a glob pattern from source directory to destination directory.
-# Also remove any file in the destination directory that has the same name as
-# any of the files that we're trying to copy, but with different case letters.
-# Note: it converts font file names to lower case to avoid inconsistencies due to paths
-# being case-insensitive under Wine.
-w_try_cp_font_files()
-{
- # $1 - source directory
- # $2 - destination directory
- # $3 - optional font file glob pattern (default: "*.ttf")
-
- _W_src_dir="$1"
- _W_dest_dir="$2"
- _W_pattern="$3"
- shift 2
-
- if test ! -d "$_W_src_dir"; then
- w_die "bug: missing source dir"
- fi
-
- if test ! -d "$_W_dest_dir"; then
- w_die "bug: missing destination dir"
- fi
-
- if test -z "$_W_pattern"; then
- _W_pattern="*.ttf"
- fi
-
- _W_src_files=$(find "$_W_src_dir" -maxdepth 1 -type f -iname "$_W_pattern")
-
- for _W_src_file in $_W_src_files; do
- # Extract the file name and lower case it
- _W_file_name=$(basename "$_W_src_file" | tr "[:upper:]" "[:lower:]")
-
- # Remove any existing font files that might have the same name, but with different case characters
- find "$_W_dest_dir" -maxdepth 1 -type f -iname "$_W_file_name" -exec rm '{}' ';'
-
- w_try cp -f "$_W_src_file" "$_W_dest_dir/$_W_file_name"
- done
-
- # Wait for Wine to add the new font to the registry under HKCU\Software\Wine\Fonts\Cache
- w_wineserver -w
-
- unset _W_src_files _W_dest_dir _W_src_file _W_file_name
-}
+### End of w_try ###
w_read_key()
{
@@ -3145,18 +3160,24 @@ winetricks_detect_gui()
{
if test -x "$(which zenity 2>/dev/null)"; then
WINETRICKS_GUI=zenity
-
+ WINETRICKS_GUI_VERSION="$(zenity --version)"
WINETRICKS_MENU_HEIGHT=500
WINETRICKS_MENU_WIDTH=1010
elif test -x "$(which kdialog 2>/dev/null)"; then
echo "Zenity not found! Using kdialog as poor substitute."
WINETRICKS_GUI=kdialog
+ WINETRICKS_GUI_VERSION="$(kdialog --version)"
else
echo "No arguments given, so tried to start GUI, but zenity not found."
echo "Please install zenity if you want a graphical interface, or "
echo "run with --help for more options."
exit 1
fi
+
+ # Print zenity/dialog version info for debugging:
+ if [ ! "$WINETRICKS_SUPER_QUIET" ] ; then
+ echo "winetricks GUI enabled, using $WINETRICKS_GUI $WINETRICKS_GUI_VERSION"
+ fi
}
# Detect which sudo to use
@@ -3987,6 +4008,7 @@ winetricks_metadata_exists()
winetricks_is_cached()
{
# FIXME: also check file2... if given
+ # https://github.com/Winetricks/winetricks/issues/989
# shellcheck disable=SC2154
_W_path="$W_CACHE/$1/$file1"
case "$_W_path" in
@@ -4103,27 +4125,13 @@ winetricks_list_manual_download()
winetricks_list_installed()
{
- (
- # Jump through a couple hoops to evaluate the verbs in alphabetical order
- # Assume that no filename contains '|'
-
- # Piping output of w_try_cd to /dev/null since winetricks-test parses it:
- w_try_cd "$WINETRICKS_METADATA" >/dev/null
- for _W_metadatafile in $(find . -iname \*.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
- (
- code=$(winetricks_metadata_basename "$_W_metadatafile")
- # shellcheck disable=SC1090
- . "$_W_metadatafile"
- if winetricks_is_installed "$code"; then
- echo "$code"
- fi
- )
- done
- )
- unset _W_metadatafile
+ # Rather than check individual metadata/files (which is slow/brittle, and also breaks settings and metaverbs)
+ # just show winetricks.log (if it exists), which lists verbs in the order they were installed
+ if [ -f "$WINEPREFIX/winetricks.log" ]; then
+ cat "$WINEPREFIX/winetricks.log"
+ else
+ echo "warning: $WINEPREFIX/winetricks.log not found; winetricks has not installed anything in this prefix."
+ fi
}
# Helper for adding a string to a list of flags
@@ -4809,10 +4817,14 @@ winetricks_set_wineprefix()
W_32BIT_DLLS="$W_WINDIR_UNIX/syswow64"
# Probably need fancier handling/checking, but for a basic start:
+ # Note 'wine' may be named 'wine-stable'/'wine-staging'/etc.):
# WINE64 = wine64, available on 64-bit prefixes
# WINE_ARCH = the native wine for the prefix (wine for 32-bit, wine64 for 64-bit)
# WINE_MULTI = generic wine, new name
- WINE64="${WINE}64"
+ case "$WINE" in
+ *64) WINE64="${WINE}" ;;
+ *) WINE64="${WINE}64" ;;
+ esac
WINE_ARCH="${WINE64}"
WINE_MULTI="${WINE}"
@@ -5090,6 +5102,7 @@ list-cached: vis en liste over verber for allerede-hentede installationsprogramm
list-download: vis en liste over verber for programmer der kan hentes
list-manual-download: list applications which can be downloaded with some help from the user
list-installed: list already-installed applications
+annihilate Delete ALL DATA AND APPLICATIONS INSIDE THIS WINEPREFIX
_EOF_
;;
de*)
@@ -5126,6 +5139,7 @@ list-download Verben für automatisch herunterladbare Anwendungen auflis
list-manual-download Verben für vom Benutzer herunterladbare Anwendungen auflisten
list-installed Bereits installierte Verben auflisten
prefix=foobar WINEPREFIX=$W_PREFIXES_ROOT/foobar auswählen
+annihilate ALLE DATEIEN UND PROGRAMME IN DIESEM WINEPREFIX Löschen
_EOF_
;;
*)
@@ -5164,6 +5178,7 @@ list-download list verbs which download automatically
list-manual-download list verbs which download with some help from the user
list-installed list already-installed verbs
prefix=foobar select WINEPREFIX=$W_PREFIXES_ROOT/foobar
+annihilate Delete ALL DATA AND APPLICATIONS INSIDE THIS WINEPREFIX
_EOF_
;;
esac
@@ -5370,6 +5385,10 @@ helper_win7sp1_x64()
w_try_cabextract -d "$W_TMP" -L -F "$filename" "$W_CACHE"/win7sp1/windows6.1-KB976932-X64.exe
}
+#######################
+# dlls
+#######################
+
#---------------------------------------------------------
w_metadata adobeair dlls \
@@ -7177,10 +7196,6 @@ load_dotnet35()
w_call dotnet30sp1
w_wineserver -w
- if w_workaround_wine_bug 33450 "Installing msxml3" ,1.5.28; then
- w_call msxml3
- fi
-
# See also https://blogs.msdn.microsoft.com/astebner/2008/07/17/scenarios-where-net-framework-3-5-setup-tries-to-connect-to-the-internet-and-how-to-avoid-them/
w_try_cd "$W_TMP"
w_try_cabextract $W_UNATTENDED_DASH_Q "$W_CACHE"/dotnet35/dotnetfx35.exe
@@ -7684,6 +7699,7 @@ load_esent()
#----------------------------------------------------------------
# FIXME: update winetricks_is_installed to look at installed_file2..n
+# https://github.com/Winetricks/winetricks/issues/988
w_metadata flash dlls \
title="Flash Player 14" \
publisher="Adobe" \
@@ -7884,17 +7900,15 @@ w_metadata gmdls dlls \
publisher="Microsoft / Roland" \
year="1999" \
media="download" \
- file1="../directx8/DX81Redist.exe" \
+ file1="../directx9/directx_apr2006_redist.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/drivers/gm.dls"
load_gmdls()
{
- # Originally at https://download.microsoft.com/download/whistler/Update/8.1/W982KMeXP/EN-US/DX81Redist.exe
- # Only archive.org seems to have it now
- w_download_to directx8 https://web.archive.org/web/20070105100243if_/download.microsoft.com/download/whistler/Update/8.1/W982KMeXP/EN-US/DX81Redist.exe 5ddc1a8e204381254dc5d65f406584787155983adf245a75000dcd0d2efb04c6
+ w_download_to directx9 https://download.microsoft.com/download/3/9/7/3972f80c-5711-4e14-9483-959d48a2d03b/directx_apr2006_redist.exe dd8c3d401efe4561b67bd88475201b2f62f43cd23e4acc947bb34a659fa74952
- w_try_unzip "$W_TMP" "$W_CACHE"/directx8/DX81Redist.exe "*/*/DirectX.cab"
- w_try_cabextract -d "$W_TMP" -F gm16.dls "$W_TMP"/*/*/DirectX.cab
+ w_try_cabextract -d "$W_TMP" -F DirectX.cab "$W_CACHE"/directx9/directx_apr2006_redist.exe
+ w_try_cabextract -d "$W_TMP" -F gm16.dls "$W_TMP"/DirectX.cab
w_try mv "$W_TMP"/gm16.dls "$W_SYSTEM32_DLLS"/drivers/gm.dls
if test "$W_ARCH" = "win64"; then
w_try_cd "$W_SYSTEM64_DLLS"/drivers
@@ -8096,11 +8110,14 @@ load_icodecs()
controlclick, Button4 ; Finish
}
winwaitclose
- ; Dangling explorer window
- winwait, Wine Explorer
- sleep 1000
- winclose, Wine Explorer
"
+ # Note, this leaves a dangling explorer window. The window name changed at some point
+ # because of a fixed wine bug that I'm too lazy to find. Since AHK doesn't make command line
+ # arguments easily accessible, we'd have to just kill all explorer.exe processes.
+ #
+ # So instead, use system kill
+ inode_pid="$(pgrep -f 'explorer.exe C:\\Program Files\\Ligos\\Indeo')"
+ kill -HUP "$inode_pid"
}
#----------------------------------------------------------------
@@ -8141,7 +8158,12 @@ w_metadata jet40 dlls \
load_jet40()
{
- w_call mdac27
+ # mdac27 is 32-bit only, so use mdac28 for win64:
+ if [ "$W_ARCH" = "win64" ] ; then
+ w_call mdac28
+ else
+ w_call mdac27
+ fi
w_call wsh57
# https://support.microsoft.com/kb/239114
@@ -8194,61 +8216,6 @@ load_ie8_kb2936068()
#----------------------------------------------------------------
-w_metadata kde apps \
- title="KDE on Windows" \
- publisher="various" \
- year="2013" \
- media="download" \
- file1="kdewin-installer-gui-1.0.0.exe" \
- installed_exe1="$W_PROGRAMS_WIN/kde/etc/installer.ini" \
- homepage="https://community.kde.org/Windows" \
- unattended="no"
-
-load_kde()
-{
- w_download http://mirrors.mit.edu/kde/stable/kdewin/installer/kdewin-installer-gui-1.0.0.exe 6bc5e0cc9e3418c08b6545300f68de0652ac297cbcdc81fd0ebe04f5934006f5
- mkdir -p "$W_PROGRAMS_UNIX/kde"
- w_try cp "$W_CACHE/kde/${file1}" "$W_PROGRAMS_UNIX/kde"
- w_try_cd "$W_PROGRAMS_UNIX/kde"
- # There's no unattended option, probably because there are so many choices,
- # it's like Cygwin
- w_try "$WINE" "${file1}"
-}
-
-#----------------------------------------------------------------
-
-w_metadata kindle apps \
- title="Amazon Kindle" \
- publisher="Amazon" \
- year="2017" \
- media="download" \
- file1="KindleForPC-installer-1.16.44025.exe" \
- installed_exe1="$W_PROGRAMS_WIN/Amazon/Kindle/Kindle.exe" \
- homepage="https://www.amazon.com/kindle-dbs/fd/kcp"
-
-load_kindle()
-{
- if w_workaround_wine_bug 43508; then
- w_warn "Using an older version of Kindle (1.16.44025) to work around https://bugs.winehq.org/show_bug.cgi?id=43508"
- fi
-
- w_download https://s3.amazonaws.com/kindleforpc/44025/KindleForPC-installer-1.16.44025.exe
- w_try_cd "$W_CACHE/$W_PACKAGE"
- w_try "$WINE" "$file1" ${W_OPT_UNATTENDED:+ /S}
-
- if w_workaround_wine_bug 35041 && [ ! -z "$W_TASKSET" ] ; then
- w_warn "You may need to run with $W_TASKSET to avoid a libX11 crash."
- fi
-
- if w_workaround_wine_bug 29045; then
- w_call corefonts
- fi
-
- w_warn "If kindle does not load for you, try increasing your open file limit"
-}
-
-#----------------------------------------------------------------
-
w_metadata l3codecx dlls \
title="MPEG Layer-3 Audio Codec for Microsoft DirectShow" \
publisher="Microsoft" \
@@ -8445,24 +8412,6 @@ load_mfc40()
#----------------------------------------------------------------
-w_metadata mozillabuild apps \
- title="Mozilla build environment" \
- publisher="Mozilla Foundation" \
- year="2015" \
- media="download" \
- file1="MozillaBuildSetup-2.0.0.exe" \
- installed_file1="c:/mozilla-build/moztools/bin/nsinstall.exe" \
- homepage="https://wiki.mozilla.org/MozillaBuild"
-
-load_mozillabuild()
-{
- w_download https://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/MozillaBuildSetup-2.0.0.exe d5ffe52fe634fb7ed02e61041cc183c3af92039ee74e794f7ae83a408e4cf3f5
- w_try_cd "$W_CACHE/$W_PACKAGE"
- w_try "$WINE" MozillaBuildSetup-2.0.0.exe $W_UNATTENDED_SLASH_S
-}
-
-#----------------------------------------------------------------
-
w_metadata msacm32 dlls \
title="MS ACM32" \
publisher="Microsoft" \
@@ -8809,107 +8758,6 @@ load_ole32()
#----------------------------------------------------------------
-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 GUI is unreadable without having corefonts installed.
- w_call corefonts
-
- w_download http://www.ollydbg.de/odbg110.zip 73b1770f28893dab22196eb58d45ede8ddf5444009960ccc0107d09881a7cd1e
- 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 GUI is unreadable without having corefonts installed.
- w_call corefonts
-
- w_download http://www.ollydbg.de/odbg200.zip 93dfd6348323db33f2005fc1fb8ff795256ae91d464dd186adc29c4314ed647c
- 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 GUI is unreadable without having corefonts installed.
- w_call corefonts
-
- w_download http://www.ollydbg.de/odbg201.zip 29244e551be31f347db00503c512058086f55b43c93c1ae93729b15ce6e087a5
- 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" \
- year="2010" \
- media="download" \
- file1="open-watcom-c-win32-1.9.exe" \
- installed_file1="c:/WATCOM/owsetenv.bat" \
- homepage="http://www.openwatcom.org"
-
-load_openwatcom()
-{
- # 2016/03/11: upstream http://www.openwatcom.org appears to be dead (404)
- w_download "http://openwatcom.mirror.fr/open-watcom-c-win32-1.9.exe" 040c910aba304fdb5f39b8fe508cd3c772b1da1f91a58179fa0895e0b2bf190b
-
- if [ $W_UNATTENDED_SLASH_Q ]; then
- # Options documented at http://bugzilla.openwatcom.org/show_bug.cgi?id=898
- # But they don't seem to work on Wine, so jam them into setup.inf
- # Pick smallest installation that supports 16-bit C and C++
- w_try_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
- 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
- else
- w_try_cd "$W_CACHE/$W_PACKAGE"
- w_try "$WINE" open-watcom-c-win32-1.9.exe
- fi
-
- if test ! -f "$W_DRIVE_C"/WATCOM/binnt/wcc.exe; then
- w_warn "c:/watcom/binnt/wcc.exe not found; you probably didn't select 16-bit tools, and won't be able to build win16test."
- fi
-}
-
-#----------------------------------------------------------------
-
w_metadata pdh dlls \
title="MS pdh.dll (Performance Data Helper)" \
publisher="Microsoft" \
@@ -8970,6 +8818,41 @@ load_pngfilt()
#----------------------------------------------------------------
+w_metadata python26 dlls \
+ title="Python interpreter 2.6.2" \
+ publisher="Python Software Foundaton" \
+ year="2009" \
+ media="download" \
+ file1="python-2.6.2.msi" \
+ installed_exe1="c:/Python26/python.exe"
+
+load_python26()
+{
+ w_download https://www.python.org/ftp/python/2.6.2/python-2.6.2.msi c2276b398864b822c25a7c240cb12ddb178962afd2e12d602f1a961e31ad52ff
+ w_download $WINETRICKS_SOURCEFORGE/project/pywin32/pywin32/Build%20214/pywin32-214.win32-py2.6.exe dc311bbdc5868e3dd139dfc46136221b7f55c5613a98a5a48fa725a6c681cd40
+
+ w_try_cd "$W_CACHE/$W_PACKAGE"
+ w_try "$WINE" msiexec /i python-2.6.2.msi ALLUSERS=1 $W_UNATTENDED_SLASH_Q
+
+ w_ahk_do "
+ SetTitleMatchMode, 2
+ run pywin32-214.win32-py2.6.exe
+ WinWait, Setup, Wizard will install pywin32
+ if ( w_opt_unattended > 0 ) {
+ ControlClick Button2 ; next
+ WinWait, Setup, Python 2.6 is required
+ ControlClick Button3 ; next
+ WinWait, Setup, Click Next to begin
+ ControlClick Button3 ; next
+ WinWait, Setup, finished
+ ControlClick Button4 ; Finish
+ }
+ WinWaitClose
+ "
+}
+
+#----------------------------------------------------------------
+
w_metadata qdvd dlls \
title="qdvd.dll" \
publisher="Microsoft" \
@@ -9114,32 +8997,6 @@ load_quicktime76()
#----------------------------------------------------------------
-w_metadata remove_mono settings \
- title_uk="Видалити вбудоване wine-mono" \
- title="Remove builtin wine-mono"
-
-load_remove_mono()
-{
- mono_uuid="$("${WINE_ARCH}" uninstaller --list | grep Mono | cut -f1 -d\|)"
- if test "$mono_uuid"; then
- "${WINE_ARCH}" uninstaller --remove "$mono_uuid"
- else
- w_warn "Mono does not appear to be installed."
- fi
-
- # FIXME: verify on pristine Windows XP:
- if w_workaround_wine_bug 34803; then
- "${WINE_ARCH}" reg delete 'HKLM\\Software\\Microsoft\\.NETFramework\\v2.0.50727\\SBSDisabled' /f
- fi
-
- "${WINE_ARCH}" reg delete "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v3.5" /f || true
- "${WINE_ARCH}" reg delete "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4" /f || true
-
- w_try rm -f "$W_WINDIR_UNIX/system32/mscoree.dll"
-}
-
-#----------------------------------------------------------------
-
w_metadata riched20 dlls \
title="MS RichEdit Control 2.0 (riched20.dll)" \
publisher="Microsoft" \
@@ -9284,7 +9141,8 @@ load_shockwave() {
# 2017/08/03: bebebaef1644a994179a2e491ce3f55599d768f7c6019729f21e7029b1845b9c
# 2017/12/12: 0a9813ac55a8718440518dc2f5f410a3a065b422fe0618c073bfc631b9abf12c
# 2018/03/16: 4d7b408cf5b65a522b071d7d9ddbc5f6964911a7d55c418e31f393e6055cf796
- w_download https://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi 4d7b408cf5b65a522b071d7d9ddbc5f6964911a7d55c418e31f393e6055cf796
+ # 2018/05/24: 2b03fa11ff6f31b3fef9313264f0ef356ee11d5bc3642c30a2482b4ac5dd0084
+ w_download https://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi 2b03fa11ff6f31b3fef9313264f0ef356ee11d5bc3642c30a2482b4ac5dd0084
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" msiexec /i sw_lic_full_installer.msi $W_UNATTENDED_SLASH_Q
@@ -10037,18 +9895,36 @@ load_vjrun20()
#----------------------------------------------------------------
-w_metadata vulkansdk dlls \
- title="Vulkan SDK 1.0.68 (developers only)" \
+w_metadata vulkanrt dlls \
+ title="Vulkan Runtime 1.1.73.0" \
publisher="LunarG" \
year="2018" \
media="download" \
- file1="VulkanSDK-1.0.68.0-Installer.exe" \
- installed_file1="C:/VulkanSDK/1.0.68.0/Vulkan.ico"
+ file1="VulkanRT-1.1.73.0-Installer.exe" \
+ installed_file1="$W_SYSTEM32_DLLS_WIN/vulkan-1.dll"
+
+load_vulkanrt()
+{
+ # https://vulkan.lunarg.com/sdk/home
+ w_download "https://sdk.lunarg.com/sdk/download/1.1.73.0/windows/VulkanRT-1.1.73.0-Installer.exe?Human=true;u=" cfec461b17aff521cf06b727aa612d654d4e72de8e3c21bd219e77b87f56f20a VulkanRT-1.1.73.0-Installer.exe
+ w_try_cd "$W_CACHE/$W_PACKAGE"
+ w_try "$WINE" "$file1" $W_UNATTENDED_SLASH_S
+}
+
+#----------------------------------------------------------------
+
+w_metadata vulkansdk dlls \
+ title="Vulkan SDK 1.1.73.0 (developers only)" \
+ publisher="LunarG" \
+ year="2018" \
+ media="download" \
+ file1="VulkanSDK-1.1.73.0-Installer.exe" \
+ installed_file1="C:/VulkanSDK/1.1.73.0/Vulkan.ico"
load_vulkansdk()
{
# https://vulkan.lunarg.com/sdk/home
- w_download "https://sdk.lunarg.com/sdk/download/1.0.68.0/windows/VulkanSDK-1.0.68.0-Installer.exe" 8e6401d4f90af1ab384f76cb59f1b7fe9bcd717c92b2080089f893f2de4b33bb
+ w_download "https://sdk.lunarg.com/sdk/download/1.1.73.0/windows/VulkanSDK-1.1.73.0-Installer.exe?Human=true;u=" a5d193f97db4de97e6b4fdd81f00ff6a603f66bb17dc3cf8ac0fe9aec58497c7 VulkanSDK-1.1.73.0-Installer.exe
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" "$file1" $W_UNATTENDED_SLASH_S
}
@@ -10405,9 +10281,9 @@ load_xvid()
w_try "$WINE" "$file1" ${W_OPT_UNATTENDED:+ --mode unattended --decode_divx 1 --decode_3ivx 1 --decode_other 1}
}
-#----------------------------------------------------------------
-# Fonts
-#----------------------------------------------------------------
+#######################
+# fonts
+#######################
w_metadata baekmuk fonts \
title="Baekmuk Korean fonts" \
@@ -10462,7 +10338,8 @@ w_metadata calibri fonts \
load_calibri()
{
# https://www.microsoft.com/en-us/download/details.aspx?id=13
- w_download_to PowerPointViewer "https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe" 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423
+ # Originally at https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe
+ w_download_to PowerPointViewer "http://www.business.uwm.edu/gdrive/Dietenberger_E/PowerPointViewer.exe" 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423
w_try_cabextract -d "$W_TMP" -F "ppviewer.cab" "$W_CACHE/PowerPointViewer/$file1"
w_try_cabextract -d "$W_TMP" -F "CALIBRI*.TTF" "$W_TMP/ppviewer.cab"
w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "CALIBRI*.TTF"
@@ -10485,7 +10362,8 @@ w_metadata cambria fonts \
load_cambria()
{
# https://www.microsoft.com/en-us/download/details.aspx?id=13
- w_download_to PowerPointViewer "https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe" 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423
+ # Originally at https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe
+ w_download_to PowerPointViewer "http://www.business.uwm.edu/gdrive/Dietenberger_E/PowerPointViewer.exe" 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423
w_try_cabextract -d "$W_TMP" -F "ppviewer.cab" "$W_CACHE/PowerPointViewer/$file1"
w_try_cabextract -d "$W_TMP" -F "CAMBRIA*.TT*" "$W_TMP/ppviewer.cab"
w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "CAMBRIA*.TT*"
@@ -10508,7 +10386,8 @@ w_metadata candara fonts \
load_candara()
{
# https://www.microsoft.com/en-us/download/details.aspx?id=13
- w_download_to PowerPointViewer "https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe" 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423
+ # Originally at https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe
+ w_download_to PowerPointViewer "http://www.business.uwm.edu/gdrive/Dietenberger_E/PowerPointViewer.exe" 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423
w_try_cabextract -d "$W_TMP" -F "ppviewer.cab" "$W_CACHE/PowerPointViewer/$file1"
w_try_cabextract -d "$W_TMP" -F "CANDARA*.TTF" "$W_TMP/ppviewer.cab"
w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "CANDARA*.TTF"
@@ -10531,7 +10410,8 @@ w_metadata consolas fonts \
load_consolas()
{
# https://www.microsoft.com/en-us/download/details.aspx?id=13
- w_download_to PowerPointViewer "https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe" 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423
+ # Originally at https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe
+ w_download_to PowerPointViewer "http://www.business.uwm.edu/gdrive/Dietenberger_E/PowerPointViewer.exe" 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423
w_try_cabextract -d "$W_TMP" -F "ppviewer.cab" "$W_CACHE/PowerPointViewer/$file1"
w_try_cabextract -d "$W_TMP" -F "CONSOLA*.TTF" "$W_TMP/ppviewer.cab"
w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "CONSOLA*.TTF"
@@ -10554,7 +10434,8 @@ w_metadata constantia fonts \
load_constantia()
{
# https://www.microsoft.com/en-us/download/details.aspx?id=13
- w_download_to PowerPointViewer "https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe" 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423
+ # Originally at https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe
+ w_download_to PowerPointViewer "http://www.business.uwm.edu/gdrive/Dietenberger_E/PowerPointViewer.exe" 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423
w_try_cabextract -d "$W_TMP" -F "ppviewer.cab" "$W_CACHE/PowerPointViewer/$file1"
w_try_cabextract -d "$W_TMP" -F "CONSTAN*.TTF" "$W_TMP/ppviewer.cab"
w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "CONSTAN*.TTF"
@@ -10577,7 +10458,8 @@ w_metadata corbel fonts \
load_corbel()
{
# https://www.microsoft.com/en-us/download/details.aspx?id=13
- w_download_to PowerPointViewer "https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe" 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423
+ # Originally at https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe
+ w_download_to PowerPointViewer "http://www.business.uwm.edu/gdrive/Dietenberger_E/PowerPointViewer.exe" 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423
w_try_cabextract -d "$W_TMP" -F "ppviewer.cab" "$W_CACHE/PowerPointViewer/$file1"
w_try_cabextract -d "$W_TMP" -F "CORBEL*.TTF" "$W_TMP/ppviewer.cab"
w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "CORBEL*.TTF"
@@ -10601,7 +10483,8 @@ w_metadata meiryo fonts \
load_meiryo()
{
# https://www.microsoft.com/en-us/download/details.aspx?id=13
- w_download_to PowerPointViewer "https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe" 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423
+ # Originally at https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe
+ w_download_to PowerPointViewer "http://www.business.uwm.edu/gdrive/Dietenberger_E/PowerPointViewer.exe" 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423
w_try_cabextract -d "$W_TMP" -F "ppviewer.cab" "$W_CACHE/PowerPointViewer/$file1"
w_try_cabextract -d "$W_TMP" -F "MEIRYO*.TTC" "$W_TMP/ppviewer.cab"
w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "MEIRYO*.TTC"
@@ -10926,28 +10809,6 @@ load_fakekorean()
#----------------------------------------------------------------
-w_metadata fontfix settings \
- title_uk="Перевірка шрифтів" \
- title="Check for broken fonts"
-
-load_fontfix()
-{
- # Focht says Samyak is bad news, and font substitution isn't a good workaround.
- # I've seen psdkwin7 setup crash because of this; the symptom was a messagebox saying
- # SDKSetup encountered an error: The type initializer for 'Microsoft.WizardFramework.WizardSettings' threw an exception
- # and WINEDEBUG=+relay,+seh shows an exception very quickly after
- # Call KERNEL32.CreateFileW(0c83b36c L"Z:\\USR\\SHARE\\FONTS\\TRUETYPE\\TTF-ORIYA-FONTS\\SAMYAK-ORIYA.TTF",80000000,00000001,00000000,00000003,00000080,00000000) ret=70d44091
- if [ -x "$(which xlsfonts 2>/dev/null)" ] ; then
- if xlsfonts 2>/dev/null | grep -E -i "samyak.*oriya" ; then
- w_die "Please uninstall the Samyak/Oriya font, e.g. 'sudo dpkg -r ttf-oriya-fonts', then log out and log in again. That font causes strange crashes in .net programs."
- fi
- else
- w_warn "xlsfonts not found. If you have (older versions of) Samyak/Oriya fonts installed, you may get crashes/bugs. If so, uninstall, then logout/login again to resolve."
- fi
-}
-
-#----------------------------------------------------------------
-
w_metadata ipamona fonts \
title="IPAMona Japanese fonts" \
publisher="Jun Kobayashi" \
@@ -11037,7 +10898,7 @@ w_metadata opensymbol fonts \
publisher="OpenOffice.org" \
year="2017" \
media="download" \
- file1="fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u10_all.deb" \
+ file1="fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u11_all.deb" \
installed_file1="$W_FONTSDIR_WIN/opens___.ttf"
load_opensymbol()
@@ -11045,7 +10906,7 @@ load_opensymbol()
# The OpenSymbol fonts are a replacement for the Windows Wingdings font from OpenOffice.org.
# Need to w_download Debian since I can't find a standalone download from OpenOffice
# Note: The source download package on debian is for _all_ of OpenOffice, which is 266 MB.
- w_download "http://security.debian.org/debian-security/pool/updates/main/libr/libreoffice/fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u10_all.deb" 33fe227786ae6dd89d265199bf3c03f09e540a5d2b96a38d7a581b4a039db696
+ w_download "http://security.debian.org/debian-security/pool/updates/main/libr/libreoffice/fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u11_all.deb" b105ec27c738f92bd9801962f10fd05125c38224c92e702f84b00cbb482dfce7
w_try_cd "$W_TMP"
w_try_ar "$W_CACHE/$W_PACKAGE/$file1" data.tar.xz
@@ -11234,8 +11095,10 @@ load_allfonts()
done
}
-#----------------------------------------------------------------
-# Apps
+#######################
+# apps
+#######################
+
#----------------------------------------------------------------
w_metadata 3m_library apps \
@@ -11361,6 +11224,30 @@ load_autohotkey()
#----------------------------------------------------------------
+w_metadata busybox apps \
+ title="BusyBox FRP-2121" \
+ publisher="Ron Yorston / Busybox authors" \
+ year="2015" \
+ media="download" \
+ file1="busybox-w32-FRP-2121-ga316078ad.exe" \
+ installed_exe1=""
+
+load_busybox()
+{
+ # Could use https://frippery.org/files/busybox/busybox.exe, but it hasn't updated in last 3 years..
+ w_download https://frippery.org/files/busybox/busybox-w32-FRP-2121-ga316078ad.exe 1bab530f2fd2a9d69528bc2b35ba1f9f75481ae053443b47cb23ad2c2740d887
+
+ if test "$W_ARCH" = "win64"; then
+ w_download https://frippery.org/files/busybox/busybox-w64-FRP-2121-ga316078ad.exe dcb2faf17f996fda8d273d513bc195aec615ef468e3d55b8b4dc9c089b22e035
+ w_try cp "${W_CACHE}/${W_PACKAGE}/${file1}" "$W_SYSTEM32_DLLS/busybox.exe"
+ w_try cp "${W_CACHE}/${W_PACKAGE}/busybox-w64-FRP-2121-ga316078ad.exe" "$W_SYSTEM64_DLLS/busybox.exe"
+ else
+ w_try cp "${W_CACHE}/${W_PACKAGE}/${file1}" "$W_SYSTEM32_DLLS/busybox.exe"
+ fi
+}
+
+#----------------------------------------------------------------
+
w_metadata cmake apps \
title="CMake 2.8" \
publisher="Kitware" \
@@ -11531,10 +11418,6 @@ load_ev3()
if w_workaround_wine_bug 40729 "Setting override for urlmon.dll to native to avoid crash"; then
w_override_dlls native urlmon
fi
-
- if w_workaround_wine_bug 34897 "Installing update KB2936068 to work around bug 34897" 1.9.10,1.9.12; then
- w_call ie8_kb2936068
- fi
}
#----------------------------------------------------------------
@@ -11991,6 +11874,61 @@ _EOF_
#----------------------------------------------------------------
+w_metadata kde apps \
+ title="KDE on Windows" \
+ publisher="various" \
+ year="2013" \
+ media="download" \
+ file1="kdewin-installer-gui-1.0.0.exe" \
+ installed_exe1="$W_PROGRAMS_WIN/kde/etc/installer.ini" \
+ homepage="https://community.kde.org/Windows" \
+ unattended="no"
+
+load_kde()
+{
+ w_download http://mirrors.mit.edu/kde/stable/kdewin/installer/kdewin-installer-gui-1.0.0.exe 6bc5e0cc9e3418c08b6545300f68de0652ac297cbcdc81fd0ebe04f5934006f5
+ mkdir -p "$W_PROGRAMS_UNIX/kde"
+ w_try cp "$W_CACHE/kde/${file1}" "$W_PROGRAMS_UNIX/kde"
+ w_try_cd "$W_PROGRAMS_UNIX/kde"
+ # There's no unattended option, probably because there are so many choices,
+ # it's like Cygwin
+ w_try "$WINE" "${file1}"
+}
+
+#----------------------------------------------------------------
+
+w_metadata kindle apps \
+ title="Amazon Kindle" \
+ publisher="Amazon" \
+ year="2017" \
+ media="download" \
+ file1="KindleForPC-installer-1.16.44025.exe" \
+ installed_exe1="$W_PROGRAMS_WIN/Amazon/Kindle/Kindle.exe" \
+ homepage="https://www.amazon.com/kindle-dbs/fd/kcp"
+
+load_kindle()
+{
+ if w_workaround_wine_bug 43508; then
+ w_warn "Using an older version of Kindle (1.16.44025) to work around https://bugs.winehq.org/show_bug.cgi?id=43508"
+ fi
+
+ w_download https://s3.amazonaws.com/kindleforpc/44025/KindleForPC-installer-1.16.44025.exe
+ w_try_cd "$W_CACHE/$W_PACKAGE"
+ w_try "$WINE" "$file1" ${W_OPT_UNATTENDED:+ /S}
+
+ if w_workaround_wine_bug 35041 && [ ! -z "$W_TASKSET" ] ; then
+ w_warn "You may need to run with $W_TASKSET to avoid a libX11 crash."
+ fi
+
+ if w_workaround_wine_bug 29045; then
+ w_call corefonts
+ fi
+
+ w_warn "If kindle does not load for you, try increasing your open file limit"
+}
+
+#----------------------------------------------------------------
+
w_metadata kobo apps \
title="Kobo e-book reader" \
publisher="Kobo" \
@@ -12032,6 +11970,24 @@ load_mingw()
#----------------------------------------------------------------
+w_metadata mozillabuild apps \
+ title="Mozilla build environment" \
+ publisher="Mozilla Foundation" \
+ year="2015" \
+ media="download" \
+ file1="MozillaBuildSetup-2.0.0.exe" \
+ installed_file1="c:/mozilla-build/moztools/bin/nsinstall.exe" \
+ homepage="https://wiki.mozilla.org/MozillaBuild"
+
+load_mozillabuild()
+{
+ w_download https://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/MozillaBuildSetup-2.0.0.exe d5ffe52fe634fb7ed02e61041cc183c3af92039ee74e794f7ae83a408e4cf3f5
+ w_try_cd "$W_CACHE/$W_PACKAGE"
+ w_try "$WINE" MozillaBuildSetup-2.0.0.exe $W_UNATTENDED_SLASH_S
+}
+
+#----------------------------------------------------------------
+
w_metadata mpc apps \
title="Media Player Classic - Home Cinema" \
publisher="doom9 folks" \
@@ -12108,6 +12064,76 @@ load_mt4()
#----------------------------------------------------------------
+w_metadata njcwp_trial apps \
+ title="NJStar Chinese Word Processor trial" \
+ publisher="NJStar" \
+ year="2015" \
+ media="download" \
+ file1="njcwp610sw15918.exe" \
+ installed_exe1="$W_PROGRAMS_X86_WIN/NJStar Chinese WP6/NJStar.exe" \
+ homepage="https://www.njstar.com/cms/njstar-chinese-word-processor"
+
+load_njcwp_trial()
+{
+ w_download http://ftp.njstar.com/sw/njcwp610sw15918.exe 7afa6dfc431f058d1397ac7100d5650b97347e1f37f81a2e2d2ee5dfdff4660b
+ w_try_cd "$W_CACHE/$W_PACKAGE"
+ if test "$W_OPT_UNATTENDED"; then
+ w_ahk_do "
+ SetTitleMatchMode, 2
+ run $file1
+ WinWait, Setup, Welcome
+ ControlClick Button2 ; next
+ WinWait, Setup, License
+ ControlClick Button2 ; agree
+ WinWait, Setup, Install
+ ControlClick Button2 ; install
+ WinWait, Setup, Completing
+ ControlClick Button4 ; do not launch
+ ControlClick Button2 ; finish
+ WinWaitClose
+ "
+ else
+ w_try "$WINE" "$file1"
+ fi
+}
+
+#----------------------------------------------------------------
+
+w_metadata njjwp_trial apps \
+ title="NJStar Japanese Word Processor trial" \
+ publisher="NJStar" \
+ year="2009" \
+ media="download" \
+ file1="njjwp610sw15918.exe" \
+ installed_exe1="$W_PROGRAMS_X86_WIN/NJStar Japanese WP6/NJStarJ.exe" \
+ homepage="https://www.njstar.com/cms/njstar-japanese-word-processor"
+
+load_njjwp_trial()
+{
+ w_download http://ftp.njstar.com/sw/njjwp610sw15918.exe 7f36138c3d19539cb73d757cd42a6f7afebdaf9cfed0cf9bc483c33e519e2a26
+ w_try_cd "$W_CACHE/$W_PACKAGE"
+ if test "$W_OPT_UNATTENDED"; then
+ w_ahk_do "
+ SetTitleMatchMode, 2
+ run $file1
+ WinWait, Setup, Welcome
+ ControlClick Button2 ; next
+ WinWait, Setup, License
+ ControlClick Button2 ; agree
+ WinWait, Setup, Install
+ ControlClick Button2 ; install
+ WinWait, Setup, Completing
+ ControlClick Button4 ; do not launch
+ ControlClick Button2 ; finish
+ WinWaitClose
+ "
+ else
+ w_try "$WINE" "$file1"
+ fi
+}
+
+#----------------------------------------------------------------
+
w_metadata nook apps \
title="Nook for PC (e-book reader)" \
publisher="Barnes & Noble" \
@@ -12322,6 +12348,107 @@ _EOF_
#----------------------------------------------------------------
+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 GUI is unreadable without having corefonts installed.
+ w_call corefonts
+
+ w_download http://www.ollydbg.de/odbg110.zip 73b1770f28893dab22196eb58d45ede8ddf5444009960ccc0107d09881a7cd1e
+ 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 GUI is unreadable without having corefonts installed.
+ w_call corefonts
+
+ w_download http://www.ollydbg.de/odbg200.zip 93dfd6348323db33f2005fc1fb8ff795256ae91d464dd186adc29c4314ed647c
+ 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 GUI is unreadable without having corefonts installed.
+ w_call corefonts
+
+ w_download http://www.ollydbg.de/odbg201.zip 29244e551be31f347db00503c512058086f55b43c93c1ae93729b15ce6e087a5
+ 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" \
+ year="2010" \
+ media="download" \
+ file1="open-watcom-c-win32-1.9.exe" \
+ installed_file1="c:/WATCOM/owsetenv.bat" \
+ homepage="http://www.openwatcom.org"
+
+load_openwatcom()
+{
+ # 2016/03/11: upstream http://www.openwatcom.org appears to be dead (404)
+ w_download "http://openwatcom.mirror.fr/open-watcom-c-win32-1.9.exe" 040c910aba304fdb5f39b8fe508cd3c772b1da1f91a58179fa0895e0b2bf190b
+
+ if [ $W_UNATTENDED_SLASH_Q ]; then
+ # Options documented at http://bugzilla.openwatcom.org/show_bug.cgi?id=898
+ # But they don't seem to work on Wine, so jam them into setup.inf
+ # Pick smallest installation that supports 16-bit C and C++
+ w_try_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
+ 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
+ else
+ w_try_cd "$W_CACHE/$W_PACKAGE"
+ w_try "$WINE" open-watcom-c-win32-1.9.exe
+ fi
+
+ if test ! -f "$W_DRIVE_C"/WATCOM/binnt/wcc.exe; then
+ w_warn "c:/watcom/binnt/wcc.exe not found; you probably didn't select 16-bit tools, and won't be able to build win16test."
+ fi
+}
+
+#----------------------------------------------------------------
+
w_metadata protectionid apps \
title="Protection ID" \
publisher="CDKiLLER & TippeX" \
@@ -12483,37 +12610,93 @@ _EOF_
#----------------------------------------------------------------
-w_metadata python26 dlls \
- title="Python interpreter 2.6.2" \
- publisher="Python Software Foundaton" \
- year="2009" \
- media="download" \
- file1="python-2.6.2.msi" \
- installed_exe1="c:/Python26/python.exe"
+w_metadata qq apps \
+ title="QQ 8.9.1(Chinese chat app)" \
+ publisher="Tencent" \
+ year="2017" \
+ media="download" \
+ file1="QQ8.9.1.exe" \
+ file2="QQ.tar.gz"\
+ installed_exe1="$W_PROGRAMS_X86_WIN/Tencent/QQ/Bin/QQScLauncher.exe" \
+ homepage="http://www.qq.com" \
+ unattended="no"
-load_python26()
+load_qq()
{
- w_download https://www.python.org/ftp/python/2.6.2/python-2.6.2.msi c2276b398864b822c25a7c240cb12ddb178962afd2e12d602f1a961e31ad52ff
- w_download $WINETRICKS_SOURCEFORGE/project/pywin32/pywin32/Build%20214/pywin32-214.win32-py2.6.exe dc311bbdc5868e3dd139dfc46136221b7f55c5613a98a5a48fa725a6c681cd40
+ w_download https://dldir1.qq.com/qqfile/qq/QQ8.9.1/20437/QQ8.9.1.exe 8e0d3ff5264da2d77e2fc011c21048edeebcf082f55f68a301f763c3a15c0d3f
+ w_download http://hillwoodhome.net/wine/QQ.tar.gz eb5cd6371eb75ec9e2fc0271199df05cbb9f38a60c2e81d5d8ac7daeb40aba62
+
+ if w_workaround_wine_bug 5162 "Installing native riched20 to work around can't input username."; then
+ w_call riched20
+ fi
+
+ # Make sure chinese fonts are available
+ w_call fakechinese
+
+ # uses mfc42u.dll
+ w_call mfc42
+
+ if w_workaround_wine_bug 38171 "Installing desktop file to work around bug"; then
+ w_try_cd "$W_TMP/"
+ tar -zxf "$W_CACHE/qq/QQ.tar.gz"
+ mkdir -p "$HOME/.local/share/applications/wine/Programs/腾讯软件/QQ"
+ mkdir -p "$HOME/.local/share/icons/hicolor/48x48/apps"
+ mkdir -p "$HOME/.local/share/icons/hicolor/256x256/apps"
+ w_try mv QQ/腾讯QQ.desktop ~/.local/share/applications/wine/Programs/腾讯软件/QQ
+ w_try mv QQ/48x48/QQ.png ~/.local/share/icons/hicolor/48x48/apps
+ w_try mv QQ/256x256/QQ.png ~/.local/share/icons/hicolor/256x256/apps
+ # shellcheck disable=SC1001
+ echo Exec=env WINEPREFIX="$WINEPREFIX" "$WINE" "$W_PROGRAMS_X86_WIN"\/Tencent\/QQ\/bin\/QQScLauncher.exe >> "$HOME/.local/share/applications/wine/Programs/腾讯软件/QQ/腾讯QQ.desktop"
+ fi
+
+ if w_workaround_wine_bug 39657 "Disable ntoskrnl.exe to work around can't be started bug"; then
+ w_override_dlls disabled ntoskrnl.exe
+ fi
+
+ if w_workaround_wine_bug 37680 "Disable txplatform.exe to work around QQ can't be quit cleanly"; then
+ w_override_dlls disabled txplatform.exe
+ fi
w_try_cd "$W_CACHE/$W_PACKAGE"
- w_try "$WINE" msiexec /i python-2.6.2.msi ALLUSERS=1 $W_UNATTENDED_SLASH_Q
+ w_try "$WINE" "$file1"
+}
- w_ahk_do "
- SetTitleMatchMode, 2
- run pywin32-214.win32-py2.6.exe
- WinWait, Setup, Wizard will install pywin32
- if ( w_opt_unattended > 0 ) {
- ControlClick Button2 ; next
- WinWait, Setup, Python 2.6 is required
- ControlClick Button3 ; next
- WinWait, Setup, Click Next to begin
- ControlClick Button3 ; next
- WinWait, Setup, finished
- ControlClick Button4 ; Finish
- }
- WinWaitClose
- "
+#----------------------------------------------------------------
+
+w_metadata qqintl apps \
+ title="QQ International Instant Messenger 2.11" \
+ publisher="Tencent" \
+ year="2014" \
+ media="download" \
+ file1="QQIntl2.11.exe" \
+ installed_exe1="$W_PROGRAMS_X86_WIN/Tencent/QQIntl/Bin/QQ.exe" \
+ homepage="http://www.imqq.com" \
+ unattended="no"
+
+load_qqintl()
+{
+ w_download https://dldir1.qq.com/qqfile/QQIntl/QQi_PC/QQIntl2.11.exe a08e5d8432ad41745cfe92479a9a0c3328a546c27f05486392ca7b77b1cb02a8
+
+ if w_workaround_wine_bug 33086 "Installing native riched20 to allow typing in username"; then
+ w_call riched20
+ fi
+
+ if w_workaround_wine_bug 37617 "Installing native wininet to work around crash"; then
+ w_call wininet
+ fi
+
+ if w_workaround_wine_bug 37680 "Disable txplatform.exe to work around QQ can't be quit cleanly"; then
+ w_override_dlls disabled txplatform.exe
+ fi
+
+ # Make sure chinese fonts are available
+ w_call fakechinese
+
+ # wants mfc80u.dll
+ w_call vcrun2005
+
+ w_try_cd "$W_CACHE/$W_PACKAGE"
+ w_try "$WINE" "$file1"
}
#----------------------------------------------------------------
@@ -13337,6 +13520,66 @@ load_3dmark06()
#----------------------------------------------------------------
+w_metadata stalker_pripyat_bench benchmarks \
+ title="S.T.A.L.K.E.R.: Call of Pripyat benchmark" \
+ publisher="GSC Game World" \
+ year="2009" \
+ media="manual_download" \
+ file1="stkcop-bench-setup.exe" \
+ installed_exe1="$W_PROGRAMS_X86_WIN/Call Of Pripyat Benchmark/Benchmark.exe"
+
+load_stalker_pripyat_bench()
+{
+ # Much faster
+ w_download_manual http://www.bigdownload.com/games/stalker-call-of-pripyat/pc/stalker-call-of-pripyat-benchmark stkcop-bench-setup.exe 8c810fba1bbb9c58fc01f4f602479886680c9f4b491dd0afe935e27083f54845
+ #w_download http://files.gsc-game.com/st/bench/stkcop-bench-setup.exe 8c810fba1bbb9c58fc01f4f602479886680c9f4b491dd0afe935e27083f54845
+
+ w_try_cd "$W_CACHE/$W_PACKAGE"
+
+ # FIXME: a bit fragile, if you're browsing the web while installing, it sometimes gets stuck.
+ w_ahk_do "
+ SetTitleMatchMode, 2
+ run $file1
+ WinWait,Setup - Call Of Pripyat Benchmark
+ if ( w_opt_unattended > 0 ) {
+ sleep 1000
+ ControlClick TNewButton1 ; Next
+ WinWait,Setup - Call Of Pripyat Benchmark,License
+ sleep 1000
+ ControlClick TNewRadioButton1 ; accept
+ sleep 1000
+ ControlClick TNewButton2 ; Next
+ WinWait,Setup - Call Of Pripyat Benchmark,Destination
+ sleep 1000
+ ControlClick TNewButton3 ; Next
+ WinWait,Setup - Call Of Pripyat Benchmark,shortcuts
+ sleep 1000
+ ControlClick TNewButton4 ; Next
+ WinWait,Setup - Call Of Pripyat Benchmark,performed
+ sleep 1000
+ ControlClick TNewButton4 ; Next
+ WinWait,Setup - Call Of Pripyat Benchmark,ready
+ sleep 1000
+ ControlClick, TNewButton4 ; Next (nah, who reads doc?)
+ }
+ WinWait,Setup - Call Of Pripyat Benchmark,finished
+ if ( w_opt_unattended > 0 ) {
+ sleep 1000
+ Send {Space} ; uncheck launch
+ sleep 1000
+ ControlClick TNewButton4 ; Finish
+ }
+ WinWaitClose,Setup - Call Of Pripyat Benchmark,finished
+ "
+
+ if w_workaround_wine_bug 24868; then
+ w_call d3dx9_31
+ w_call d3dx9_42
+ fi
+}
+
+#----------------------------------------------------------------
+
w_metadata unigine_heaven benchmarks \
title="Unigen Heaven 2.1 Benchmark" \
publisher="Unigen" \
@@ -13380,6 +13623,24 @@ load_unigine_heaven()
"
}
+#----------------------------------------------------------------
+
+w_metadata wglgears benchmarks \
+ title="wglgears" \
+ publisher="Clinton L. Jeffery" \
+ year="2005" \
+ media="download" \
+ file1="wglgears.exe" \
+ installed_exe1="$W_PROGRAMS_X86_WIN/misc/wglgears.exe"
+
+load_wglgears()
+{
+ w_download http://www2.cs.uidaho.edu/~jeffery/win32/wglgears.exe 858ba95ea3c9af4ded1f4100e59b6e8e57024f3efef56304dbd48106e8f2f6f7
+ mkdir -p "$W_PROGRAMS_X86_UNIX/misc"
+ cp "$W_CACHE"/wglgears/wglgears.exe "$W_PROGRAMS_X86_UNIX/misc"
+ chmod +x "$W_PROGRAMS_X86_UNIX/misc/wglgears.exe"
+}
+
#----------------------------------------------------------------
# Games
#----------------------------------------------------------------
@@ -16572,76 +16833,6 @@ load_nfsshift_demo()
#----------------------------------------------------------------
-w_metadata njcwp_trial apps \
- title="NJStar Chinese Word Processor trial" \
- publisher="NJStar" \
- year="2015" \
- media="download" \
- file1="njcwp610sw15918.exe" \
- installed_exe1="$W_PROGRAMS_X86_WIN/NJStar Chinese WP6/NJStar.exe" \
- homepage="https://www.njstar.com/cms/njstar-chinese-word-processor"
-
-load_njcwp_trial()
-{
- w_download http://ftp.njstar.com/sw/njcwp610sw15918.exe 7afa6dfc431f058d1397ac7100d5650b97347e1f37f81a2e2d2ee5dfdff4660b
- w_try_cd "$W_CACHE/$W_PACKAGE"
- if test "$W_OPT_UNATTENDED"; then
- w_ahk_do "
- SetTitleMatchMode, 2
- run $file1
- WinWait, Setup, Welcome
- ControlClick Button2 ; next
- WinWait, Setup, License
- ControlClick Button2 ; agree
- WinWait, Setup, Install
- ControlClick Button2 ; install
- WinWait, Setup, Completing
- ControlClick Button4 ; do not launch
- ControlClick Button2 ; finish
- WinWaitClose
- "
- else
- w_try "$WINE" "$file1"
- fi
-}
-
-#----------------------------------------------------------------
-
-w_metadata njjwp_trial apps \
- title="NJStar Japanese Word Processor trial" \
- publisher="NJStar" \
- year="2009" \
- media="download" \
- file1="njjwp610sw15918.exe" \
- installed_exe1="$W_PROGRAMS_X86_WIN/NJStar Japanese WP6/NJStarJ.exe" \
- homepage="https://www.njstar.com/cms/njstar-japanese-word-processor"
-
-load_njjwp_trial()
-{
- w_download http://ftp.njstar.com/sw/njjwp610sw15918.exe 7f36138c3d19539cb73d757cd42a6f7afebdaf9cfed0cf9bc483c33e519e2a26
- w_try_cd "$W_CACHE/$W_PACKAGE"
- if test "$W_OPT_UNATTENDED"; then
- w_ahk_do "
- SetTitleMatchMode, 2
- run $file1
- WinWait, Setup, Welcome
- ControlClick Button2 ; next
- WinWait, Setup, License
- ControlClick Button2 ; agree
- WinWait, Setup, Install
- ControlClick Button2 ; install
- WinWait, Setup, Completing
- ControlClick Button4 ; do not launch
- ControlClick Button2 ; finish
- WinWaitClose
- "
- else
- w_try "$WINE" "$file1"
- fi
-}
-
-#----------------------------------------------------------------
-
w_metadata oblivion games \
title="Elder Scrolls: Oblivion" \
publisher="Bethesda Game Studios" \
@@ -16764,97 +16955,6 @@ load_popfs()
#----------------------------------------------------------------
-w_metadata qq apps \
- title="QQ 8.9.1(Chinese chat app)" \
- publisher="Tencent" \
- year="2017" \
- media="download" \
- file1="QQ8.9.1.exe" \
- file2="QQ.tar.gz"\
- installed_exe1="$W_PROGRAMS_X86_WIN/Tencent/QQ/Bin/QQScLauncher.exe" \
- homepage="http://www.qq.com" \
- unattended="no"
-
-load_qq()
-{
- w_download https://dldir1.qq.com/qqfile/qq/QQ8.9.1/20437/QQ8.9.1.exe 8e0d3ff5264da2d77e2fc011c21048edeebcf082f55f68a301f763c3a15c0d3f
- w_download http://hillwoodhome.net/wine/QQ.tar.gz eb5cd6371eb75ec9e2fc0271199df05cbb9f38a60c2e81d5d8ac7daeb40aba62
-
- if w_workaround_wine_bug 5162 "Installing native riched20 to work around can't input username."; then
- w_call riched20
- fi
-
- # Make sure chinese fonts are available
- w_call fakechinese
-
- # uses mfc42u.dll
- w_call mfc42
-
- if w_workaround_wine_bug 38171 "Installing desktop file to work around bug"; then
- w_try_cd "$W_TMP/"
- tar -zxf "$W_CACHE/qq/QQ.tar.gz"
- mkdir -p "$HOME/.local/share/applications/wine/Programs/腾讯软件/QQ"
- mkdir -p "$HOME/.local/share/icons/hicolor/48x48/apps"
- mkdir -p "$HOME/.local/share/icons/hicolor/256x256/apps"
- w_try mv QQ/腾讯QQ.desktop ~/.local/share/applications/wine/Programs/腾讯软件/QQ
- w_try mv QQ/48x48/QQ.png ~/.local/share/icons/hicolor/48x48/apps
- w_try mv QQ/256x256/QQ.png ~/.local/share/icons/hicolor/256x256/apps
- # shellcheck disable=SC1001
- echo Exec=env WINEPREFIX="$WINEPREFIX" "$WINE" "$W_PROGRAMS_X86_WIN"\/Tencent\/QQ\/bin\/QQScLauncher.exe >> "$HOME/.local/share/applications/wine/Programs/腾讯软件/QQ/腾讯QQ.desktop"
- fi
-
- if w_workaround_wine_bug 39657 "Disable ntoskrnl.exe to work around can't be started bug"; then
- w_override_dlls disabled ntoskrnl.exe
- fi
-
- if w_workaround_wine_bug 37680 "Disable txplatform.exe to work around QQ can't be quit cleanly"; then
- w_override_dlls disabled txplatform.exe
- fi
-
- w_try_cd "$W_CACHE/$W_PACKAGE"
- w_try "$WINE" "$file1"
-}
-
-#----------------------------------------------------------------
-
-w_metadata qqintl apps \
- title="QQ International Instant Messenger 2.11" \
- publisher="Tencent" \
- year="2014" \
- media="download" \
- file1="QQIntl2.11.exe" \
- installed_exe1="$W_PROGRAMS_X86_WIN/Tencent/QQIntl/Bin/QQ.exe" \
- homepage="http://www.imqq.com" \
- unattended="no"
-
-load_qqintl()
-{
- w_download https://dldir1.qq.com/qqfile/QQIntl/QQi_PC/QQIntl2.11.exe a08e5d8432ad41745cfe92479a9a0c3328a546c27f05486392ca7b77b1cb02a8
-
- if w_workaround_wine_bug 33086 "Installing native riched20 to allow typing in username"; then
- w_call riched20
- fi
-
- if w_workaround_wine_bug 37617 "Installing native wininet to work around crash"; then
- w_call wininet
- fi
-
- if w_workaround_wine_bug 37680 "Disable txplatform.exe to work around QQ can't be quit cleanly"; then
- w_override_dlls disabled txplatform.exe
- fi
-
- # Make sure chinese fonts are available
- w_call fakechinese
-
- # wants mfc80u.dll
- w_call vcrun2005
-
- w_try_cd "$W_CACHE/$W_PACKAGE"
- w_try "$WINE" "$file1"
-}
-
-#----------------------------------------------------------------
-
w_metadata rct3deluxe games \
title="RollerCoaster Tycoon 3 Deluxe (DRM broken on Wine)" \
publisher="Atari" \
@@ -17838,84 +17938,6 @@ load_singularity()
#----------------------------------------------------------------
-w_metadata wglgears benchmarks \
- title="wglgears" \
- publisher="Clinton L. Jeffery" \
- year="2005" \
- media="download" \
- file1="wglgears.exe" \
- installed_exe1="$W_PROGRAMS_X86_WIN/misc/wglgears.exe"
-
-load_wglgears()
-{
- w_download http://www2.cs.uidaho.edu/~jeffery/win32/wglgears.exe 858ba95ea3c9af4ded1f4100e59b6e8e57024f3efef56304dbd48106e8f2f6f7
- mkdir -p "$W_PROGRAMS_X86_UNIX/misc"
- cp "$W_CACHE"/wglgears/wglgears.exe "$W_PROGRAMS_X86_UNIX/misc"
- chmod +x "$W_PROGRAMS_X86_UNIX/misc/wglgears.exe"
-}
-
-#----------------------------------------------------------------
-
-w_metadata stalker_pripyat_bench benchmarks \
- title="S.T.A.L.K.E.R.: Call of Pripyat benchmark" \
- publisher="GSC Game World" \
- year="2009" \
- media="manual_download" \
- file1="stkcop-bench-setup.exe" \
- installed_exe1="$W_PROGRAMS_X86_WIN/Call Of Pripyat Benchmark/Benchmark.exe"
-
-load_stalker_pripyat_bench()
-{
- # Much faster
- w_download_manual http://www.bigdownload.com/games/stalker-call-of-pripyat/pc/stalker-call-of-pripyat-benchmark stkcop-bench-setup.exe 8c810fba1bbb9c58fc01f4f602479886680c9f4b491dd0afe935e27083f54845
- #w_download http://files.gsc-game.com/st/bench/stkcop-bench-setup.exe 8c810fba1bbb9c58fc01f4f602479886680c9f4b491dd0afe935e27083f54845
-
- w_try_cd "$W_CACHE/$W_PACKAGE"
-
- # FIXME: a bit fragile, if you're browsing the web while installing, it sometimes gets stuck.
- w_ahk_do "
- SetTitleMatchMode, 2
- run $file1
- WinWait,Setup - Call Of Pripyat Benchmark
- if ( w_opt_unattended > 0 ) {
- sleep 1000
- ControlClick TNewButton1 ; Next
- WinWait,Setup - Call Of Pripyat Benchmark,License
- sleep 1000
- ControlClick TNewRadioButton1 ; accept
- sleep 1000
- ControlClick TNewButton2 ; Next
- WinWait,Setup - Call Of Pripyat Benchmark,Destination
- sleep 1000
- ControlClick TNewButton3 ; Next
- WinWait,Setup - Call Of Pripyat Benchmark,shortcuts
- sleep 1000
- ControlClick TNewButton4 ; Next
- WinWait,Setup - Call Of Pripyat Benchmark,performed
- sleep 1000
- ControlClick TNewButton4 ; Next
- WinWait,Setup - Call Of Pripyat Benchmark,ready
- sleep 1000
- ControlClick, TNewButton4 ; Next (nah, who reads doc?)
- }
- WinWait,Setup - Call Of Pripyat Benchmark,finished
- if ( w_opt_unattended > 0 ) {
- sleep 1000
- Send {Space} ; uncheck launch
- sleep 1000
- ControlClick TNewButton4 ; Finish
- }
- WinWaitClose,Setup - Call Of Pripyat Benchmark,finished
- "
-
- if w_workaround_wine_bug 24868; then
- w_call d3dx9_31
- w_call d3dx9_42
- fi
-}
-
-#----------------------------------------------------------------
-
w_metadata torchlight games \
title="Torchlight - boxed version" \
publisher="Runic Games" \
@@ -18379,204 +18401,12 @@ load_wormsreloaded_demo_steam()
w_steam_install_game 22690 "Worms Reloaded Demo"
}
-#----------------------------------------------------------------
-# Settings
-#----------------------------------------------------------------
-# Direct3D settings
-
-winetricks_set_wined3d_var()
-{
- # Filter out/correct bad or partial values
- # Confusing because dinput uses 'disable', but d3d uses 'disabled'
- # see wined3d_dll_init() in dlls/wined3d/wined3d_main.c
- # and DllMain() in dlls/ddraw/main.c
- case $2 in
- disable*) arg=disabled;;
- enable*) arg=enabled;;
- hard*) arg=hardware;;
- repack) arg=repack;;
- backbuffer|fbo|gdi|none|opengl|readdraw|readtex|texdraw|textex|auto) arg=$2;;
- [0-9]*) arg=$2;;
- *) w_die "illegal value $2 for $1";;
- esac
-
- echo "Setting Direct3D/$1 to $arg"
- cat > "$W_TMP"/set-wined3d.reg <<_EOF_
-REGEDIT4
-
-[HKEY_CURRENT_USER\\Software\\Wine\\Direct3D]
-"$1"="$arg"
-
-_EOF_
- w_try_regedit "$W_TMP_WIN"\\set-wined3d.reg
-}
-
-#----------------------------------------------------------------
-
-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()
-{
- winetricks_set_wined3d_var UseGLSL "$1"
-}
-
-#----------------------------------------------------------------
-
-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()
-{
- winetricks_set_wined3d_var Multisampling "$1"
-}
-
-#----------------------------------------------------------------
-
-w_metadata npm=repack settings \
- title_uk="Встановити NonPower2Mode на repack" \
- title="Set NonPower2Mode to repack"
-
-load_npm()
-{
- winetricks_set_wined3d_var NonPower2Mode "$1"
-}
-
-#----------------------------------------------------------------
-
-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()
-{
- winetricks_set_wined3d_var OffscreenRenderingMode "$1"
-}
-
-#----------------------------------------------------------------
-
-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()
-{
- winetricks_set_wined3d_var StrictDrawOrdering "$1"
-}
-
-#----------------------------------------------------------------
-
-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()
-{
- winetricks_set_wined3d_var RenderTargetLockMode "$1"
-}
-
-#----------------------------------------------------------------
-# 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()
-{
- winetricks_set_wined3d_var AlwaysOffscreen "$1"
-}
-
-#----------------------------------------------------------------
-# CheckFloatConstants settings
-
-w_metadata cfc=enabled settings \
- title_uk="Увімкнути CheckFloatConstants" \
- title="Enable CheckFloatConstants"
-w_metadata cfc=disable settings \
- title_uk="Вимкнути CheckFloatConstants (за замовчуванням)" \
- title="Disable CheckFloatConstants (default)"
-
-load_cfc()
-{
- winetricks_set_wined3d_var CheckFloatConstants "$1"
-}
-#----------------------------------------------------------------
-# CSMT settings
-
-w_metadata csmt=on settings \
- title_uk="Увімкнути Command Stream Multithreading (за замовчуванням)" \
- title="Enable Command Stream Multithreading (default)"
-w_metadata csmt=off settings \
- title_uk="Вимкнути Command Stream Multithreading"\
- title="Disable Command Stream Multithreading"
-
-load_csmt()
-{
- case "$1" in
- off) arg=0;;
- on) arg=1;;
- *) w_die "illegal value $1 for csmt";;
- esac
-
- echo "Setting csmt to $arg"
- cat > "$W_TMP"/set-csmt.reg <<_EOF_
-REGEDIT4
-
-[HKEY_CURRENT_USER\\Software\\Wine\\Direct3D]
-"csmt"=dword:$arg
-
-_EOF_
- w_try_regedit "$W_TMP"/set-csmt.reg
-}
-
-#----------------------------------------------------------------
-# 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()
-{
- winetricks_set_wined3d_var DirectDrawRenderer "$1"
-}
+#######################
+# settings
+#######################
+####
+# settings->desktop
#----------------------------------------------------------------
# DirectInput settings
@@ -18613,6 +18443,68 @@ _EOF_
w_try_regedit "$W_TMP"/set-mwo.reg
}
+#----------------------------------------------------------------
+
+w_metadata fontfix settings \
+ title_uk="Перевірка шрифтів" \
+ title="Check for broken fonts"
+
+load_fontfix()
+{
+ # Focht says Samyak is bad news, and font substitution isn't a good workaround.
+ # I've seen psdkwin7 setup crash because of this; the symptom was a messagebox saying
+ # SDKSetup encountered an error: The type initializer for 'Microsoft.WizardFramework.WizardSettings' threw an exception
+ # and WINEDEBUG=+relay,+seh shows an exception very quickly after
+ # Call KERNEL32.CreateFileW(0c83b36c L"Z:\\USR\\SHARE\\FONTS\\TRUETYPE\\TTF-ORIYA-FONTS\\SAMYAK-ORIYA.TTF",80000000,00000001,00000000,00000003,00000080,00000000) ret=70d44091
+ if [ -x "$(which xlsfonts 2>/dev/null)" ] ; then
+ if xlsfonts 2>/dev/null | grep -E -i "samyak.*oriya" ; then
+ w_die "Please uninstall the Samyak/Oriya font, e.g. 'sudo dpkg -r ttf-oriya-fonts', then log out and log in again. That font causes strange crashes in .net programs."
+ fi
+ else
+ w_warn "xlsfonts not found. If you have (older versions of) Samyak/Oriya fonts installed, you may get crashes/bugs. If so, uninstall, then logout/login again to resolve."
+ fi
+}
+
+#----------------------------------------------------------------
+
+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()
+{
+ case "$1" in
+ disable) FontSmoothing=0; FontSmoothingOrientation=1; FontSmoothingType=0;;
+ gray|grey) FontSmoothing=2; FontSmoothingOrientation=1; FontSmoothingType=1;;
+ bgr) FontSmoothing=2; FontSmoothingOrientation=0; FontSmoothingType=2;;
+ rgb) FontSmoothing=2; FontSmoothingOrientation=1; FontSmoothingType=2;;
+ *) w_die "unknown font smoothing type $1";;
+ esac
+
+ echo "Setting font smoothing to $1"
+
+ cat > "$W_TMP"/fontsmooth.reg <<_EOF_
+REGEDIT4
+
+[HKEY_CURRENT_USER\\Control Panel\\Desktop]
+"FontSmoothing"="$FontSmoothing"
+"FontSmoothingGamma"=dword:00000578
+"FontSmoothingOrientation"=dword:0000000$FontSmoothingOrientation
+"FontSmoothingType"=dword:0000000$FontSmoothingType
+
+_EOF_
+ w_try_regedit "$W_TMP_WIN"\\fontsmooth.reg
+}
+
#----------------------------------------------------------------
# Mac Driver settings
@@ -18715,24 +18607,361 @@ _EOF_
}
#----------------------------------------------------------------
-# Other settings
+
+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()
+{
+ size="$1"
+ case $size in
+ off|disabled)
+ cat > "$W_TMP"/vd.reg <<_EOF_
+REGEDIT4
+
+[HKEY_CURRENT_USER\\Software\\Wine\\Explorer]
+"Desktop"=-
+[HKEY_CURRENT_USER\\Software\\Wine\\Explorer\\Desktops]
+"Default"=-
+
+_EOF_
+ ;;
+ [1-9]*x[1-9]*)
+ cat > "$W_TMP"/vd.reg <<_EOF_
+REGEDIT4
+
+[HKEY_CURRENT_USER\\Software\\Wine\\Explorer]
+"Desktop"="Default"
+[HKEY_CURRENT_USER\\Software\\Wine\\Explorer\\Desktops]
+"Default"="$size"
+
+_EOF_
+ ;;
+ *)
+ w_die "you want a virtual desktop of $size? I don't understand."
+ ;;
+ esac
+ w_try_regedit "$W_TMP_WIN"/vd.reg
+}
+
+####
+# settings->direct3d
+
+winetricks_set_wined3d_var()
+{
+ # Filter out/correct bad or partial values
+ # Confusing because dinput uses 'disable', but d3d uses 'disabled'
+ # see wined3d_dll_init() in dlls/wined3d/wined3d_main.c
+ # and DllMain() in dlls/ddraw/main.c
+ case $2 in
+ disable*) arg=disabled;;
+ enable*) arg=enabled;;
+ hard*) arg=hardware;;
+ repack) arg=repack;;
+ backbuffer|fbo|gdi|none|opengl|readdraw|readtex|texdraw|textex|auto) arg=$2;;
+ [0-9]*) arg=$2;;
+ *) w_die "illegal value $2 for $1";;
+ esac
+
+ echo "Setting Direct3D/$1 to $arg"
+ cat > "$W_TMP"/set-wined3d.reg <<_EOF_
+REGEDIT4
+
+[HKEY_CURRENT_USER\\Software\\Wine\\Direct3D]
+"$1"="$arg"
+
+_EOF_
+ w_try_regedit "$W_TMP_WIN"\\set-wined3d.reg
+}
+
#----------------------------------------------------------------
+# AlwaysOffscreen settings
-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"
+w_metadata ao=enabled settings \
+ title_uk="Увімкнути AlwaysOffscreen" \
+ title="Enable AlwaysOffscreen"
+w_metadata ao=disabled settings \
+ title_uk="Вимкнути AlwaysOffscreen (за замовчуванням)" \
+ title="Disable AlwaysOffscreen (default)"
-load_alldlls()
+load_ao()
+{
+ winetricks_set_wined3d_var AlwaysOffscreen "$1"
+}
+
+#----------------------------------------------------------------
+# CheckFloatConstants settings
+
+w_metadata cfc=enabled settings \
+ title_uk="Увімкнути CheckFloatConstants" \
+ title="Enable CheckFloatConstants"
+w_metadata cfc=disable settings \
+ title_uk="Вимкнути CheckFloatConstants (за замовчуванням)" \
+ title="Disable CheckFloatConstants (default)"
+
+load_cfc()
+{
+ winetricks_set_wined3d_var CheckFloatConstants "$1"
+}
+#----------------------------------------------------------------
+# CSMT settings
+
+w_metadata csmt=on settings \
+ title_uk="Увімкнути Command Stream Multithreading (за замовчуванням)" \
+ title="Enable Command Stream Multithreading (default)"
+w_metadata csmt=off settings \
+ title_uk="Вимкнути Command Stream Multithreading"\
+ title="Disable Command Stream Multithreading"
+
+load_csmt()
{
case "$1" in
- default) w_override_no_dlls ;;
- builtin) w_override_all_dlls ;;
+ off) arg=0;;
+ on) arg=1;;
+ *) w_die "illegal value $1 for csmt";;
esac
+
+ echo "Setting csmt to $arg"
+ cat > "$W_TMP"/set-csmt.reg <<_EOF_
+REGEDIT4
+
+[HKEY_CURRENT_USER\\Software\\Wine\\Direct3D]
+"csmt"=dword:$arg
+
+_EOF_
+ w_try_regedit "$W_TMP"/set-csmt.reg
}
+#----------------------------------------------------------------
+# 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()
+{
+ winetricks_set_wined3d_var DirectDrawRenderer "$1"
+}
+
+#----------------------------------------------------------------
+
+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()
+{
+ winetricks_set_wined3d_var UseGLSL "$1"
+}
+
+#----------------------------------------------------------------
+
+w_metadata gsm=0 settings \
+ title_uk="Встановити MaxShaderModelGS на 0" \
+ title="Set MaxShaderModelGS to 0"
+w_metadata gsm=1 settings \
+ title_uk="Встановити MaxShaderModelGS на 1" \
+ title="Set MaxShaderModelGS to 1"
+w_metadata gsm=2 settings \
+ title_uk="Встановити MaxShaderModelGS на 2" \
+ title="Set MaxShaderModelGS to 2"
+w_metadata gsm=3 settings \
+ title_uk="Встановити MaxShaderModelGS на 3" \
+ title="Set MaxShaderModelGS to 3"
+
+load_gsm()
+{
+ winetricks_set_wined3d_var MaxShaderModelGS "$1"
+}
+
+#----------------------------------------------------------------
+
+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()
+{
+ winetricks_set_wined3d_var Multisampling "$1"
+}
+
+#----------------------------------------------------------------
+
+w_metadata npm=repack settings \
+ title_uk="Встановити NonPower2Mode на repack" \
+ title="Set NonPower2Mode to repack"
+
+load_npm()
+{
+ winetricks_set_wined3d_var NonPower2Mode "$1"
+}
+
+#----------------------------------------------------------------
+
+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()
+{
+ winetricks_set_wined3d_var OffscreenRenderingMode "$1"
+}
+
+#----------------------------------------------------------------
+
+w_metadata psm=0 settings \
+ title_uk="Встановити MaxShaderModelPS на 0" \
+ title="Set MaxShaderModelPS to 0"
+w_metadata psm=1 settings \
+ title_uk="Встановити MaxShaderModelPS на 1" \
+ title="Set MaxShaderModelPS to 1"
+w_metadata psm=2 settings \
+ title_uk="Встановити MaxShaderModelPS на 2" \
+ title="Set MaxShaderModelPS to 2"
+w_metadata psm=3 settings \
+ title_uk="Встановити MaxShaderModelPS на 3" \
+ title="Set MaxShaderModelPS to 3"
+
+load_psm()
+{
+ winetricks_set_wined3d_var MaxShaderModelPS "$1"
+}
+
+#----------------------------------------------------------------
+
+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()
+{
+ winetricks_set_wined3d_var StrictDrawOrdering "$1"
+}
+
+#----------------------------------------------------------------
+
+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()
+{
+ winetricks_set_wined3d_var RenderTargetLockMode "$1"
+}
+#----------------------------------------------------------------
+
+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()
+{
+ size="$1"
+ echo "Setting video memory size to $size"
+
+ case $size in
+ default)
+
+ cat > "$W_TMP"/set-video.reg <<_EOF_
+REGEDIT4
+
+[HKEY_CURRENT_USER\\Software\\Wine\\Direct3D]
+"VideoMemorySize"=-
+
+_EOF_
+ ;;
+ *)
+ cat > "$W_TMP"/set-video.reg <<_EOF_
+REGEDIT4
+
+[HKEY_CURRENT_USER\\Software\\Wine\\Direct3D]
+"VideoMemorySize"="$size"
+
+_EOF_
+ ;;
+ esac
+ w_try_regedit "$W_TMP_WIN"\\set-video.reg
+}
+
+#----------------------------------------------------------------
+
+w_metadata vsm=0 settings \
+ title_uk="Встановити MaxShaderModelVS на 0" \
+ title="Set MaxShaderModelVS to 0"
+w_metadata vsm=1 settings \
+ title_uk="Встановити MaxShaderModelVS на 1" \
+ title="Set MaxShaderModelVS to 1"
+w_metadata vsm=2 settings \
+ title_uk="Встановити MaxShaderModelVS на 2" \
+ title="Set MaxShaderModelVS to 2"
+w_metadata vsm=3 settings \
+ title_uk="Встановити MaxShaderModelVS на 3" \
+ title="Set MaxShaderModelVS to 3"
+
+load_vsm()
+{
+ winetricks_set_wined3d_var MaxShaderModelVS "$1"
+}
+
+####
+# settings->debug
+
#----------------------------------------------------------------
w_metadata autostart_winedbg=enable settings \
@@ -18764,42 +18993,68 @@ _EOF_
#----------------------------------------------------------------
-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"
+w_metadata heapcheck settings \
+ title_uk="Увімкнути накопичувальну перевірку GlobalFlag" \
+ title="Enable heap checking with GlobalFlag"
-load_fontsmooth()
+load_heapcheck()
{
- case "$1" in
- disable) FontSmoothing=0; FontSmoothingOrientation=1; FontSmoothingType=0;;
- gray|grey) FontSmoothing=2; FontSmoothingOrientation=1; FontSmoothingType=1;;
- bgr) FontSmoothing=2; FontSmoothingOrientation=0; FontSmoothingType=2;;
- rgb) FontSmoothing=2; FontSmoothingOrientation=1; FontSmoothingType=2;;
- *) w_die "unknown font smoothing type $1";;
- esac
-
- echo "Setting font smoothing to $1"
-
- cat > "$W_TMP"/fontsmooth.reg <<_EOF_
+ cat > "$W_TMP"/heapcheck.reg <<_EOF_
REGEDIT4
-[HKEY_CURRENT_USER\\Control Panel\\Desktop]
-"FontSmoothing"="$FontSmoothing"
-"FontSmoothingGamma"=dword:00000578
-"FontSmoothingOrientation"=dword:0000000$FontSmoothingOrientation
-"FontSmoothingType"=dword:0000000$FontSmoothingType
+[HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Control\\Session Manager]
+"GlobalFlag"=dword:00200030
_EOF_
- w_try_regedit "$W_TMP_WIN"\\fontsmooth.reg
+ w_try_regedit "$W_TMP_WIN"\\heapcheck.reg
+}
+
+#----------------------------------------------------------------
+
+w_metadata nocrashdialog settings \
+ title_uk="Вимкнути діалог про помилку" \
+ title="Disable crash dialog"
+
+load_nocrashdialog()
+{
+ echo "Disabling graphical crash dialog"
+ cat > "$W_TMP"/crashdialog.reg <<_EOF_
+REGEDIT4
+
+[HKEY_CURRENT_USER\\Software\\Wine\\WineDbg]
+"ShowCrashDialog"=dword:00000000
+
+_EOF_
+ w_try_cd "$W_TMP"
+ w_try_regedit crashdialog.reg
+}
+
+####
+# settings->misc
+
+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()
+{
+ case "$1" in
+ default) w_override_no_dlls ;;
+ builtin) w_override_all_dlls ;;
+ esac
+}
+
+#----------------------------------------------------------------
+
+w_metadata bad settings \
+ title="Fake verb that always returns false"
+
+load_bad()
+{
+ w_die "$W_PACKAGE failed!"
}
#----------------------------------------------------------------
@@ -18816,40 +19071,12 @@ load_forcemono()
#----------------------------------------------------------------
-w_metadata gsm=0 settings \
- title_uk="Встановити MaxShaderModelGS на 0" \
- title="Set MaxShaderModelGS to 0"
-w_metadata gsm=1 settings \
- title_uk="Встановити MaxShaderModelGS на 1" \
- title="Set MaxShaderModelGS to 1"
-w_metadata gsm=2 settings \
- title_uk="Встановити MaxShaderModelGS на 2" \
- title="Set MaxShaderModelGS to 2"
-w_metadata gsm=3 settings \
- title_uk="Встановити MaxShaderModelGS на 3" \
- title="Set MaxShaderModelGS to 3"
+w_metadata good settings \
+ title="Fake verb that always returns true"
-load_gsm()
+load_good()
{
- winetricks_set_wined3d_var MaxShaderModelGS "$1"
-}
-
-#----------------------------------------------------------------
-
-w_metadata heapcheck settings \
- title_uk="Увімкнути накопичувальну перевірку GlobalFlag" \
- title="Enable heap checking with GlobalFlag"
-
-load_heapcheck()
-{
- cat > "$W_TMP"/heapcheck.reg <<_EOF_
-REGEDIT4
-
-[HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Control\\Session Manager]
-"GlobalFlag"=dword:00200030
-
-_EOF_
- w_try_regedit "$W_TMP_WIN"\\heapcheck.reg
+ w_info "$W_PACKAGE succeeded!"
}
#----------------------------------------------------------------
@@ -18935,54 +19162,33 @@ load_native_oleaut32()
#----------------------------------------------------------------
-w_metadata nocrashdialog settings \
- title_uk="Вимкнути діалог про помилку" \
- title="Disable crash dialog"
+w_metadata remove_mono settings \
+ title_uk="Видалити вбудоване wine-mono" \
+ title="Remove builtin wine-mono"
-load_nocrashdialog()
+load_remove_mono()
{
- echo "Disabling graphical crash dialog"
- cat > "$W_TMP"/crashdialog.reg <<_EOF_
-REGEDIT4
+ mono_uuid="$("${WINE_ARCH}" uninstaller --list | grep Mono | cut -f1 -d\|)"
+ if test "$mono_uuid"; then
+ "${WINE_ARCH}" uninstaller --remove "$mono_uuid"
+ else
+ w_warn "Mono does not appear to be installed."
+ fi
-[HKEY_CURRENT_USER\\Software\\Wine\\WineDbg]
-"ShowCrashDialog"=dword:00000000
+ # FIXME: verify on pristine Windows XP:
+ if w_workaround_wine_bug 34803; then
+ "${WINE_ARCH}" reg delete 'HKLM\\Software\\Microsoft\\.NETFramework\\v2.0.50727\\SBSDisabled' /f
+ fi
-_EOF_
- w_try_cd "$W_TMP"
- w_try_regedit crashdialog.reg
+ "${WINE_ARCH}" reg delete "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v3.5" /f || true
+ "${WINE_ARCH}" reg delete "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4" /f || true
+
+ w_try rm -f "$W_WINDIR_UNIX/system32/mscoree.dll"
+ if [ "$W_ARCH" = "win64" ]; then
+ w_try rm -f "$W_WINDIR_UNIX/syswow64/mscoree.dll"
+ fi
}
-#----------------------------------------------------------------
-
-w_metadata nt40 settings \
- title_uk="Встановити версію Windows NT 4.0" \
- title="Set windows version to Windows NT 4.0"
-
-load_nt40()
-{
- w_set_winver nt40
-}
-
-#----------------------------------------------------------------
-
-w_metadata psm=0 settings \
- title_uk="Встановити MaxShaderModelPS на 0" \
- title="Set MaxShaderModelPS to 0"
-w_metadata psm=1 settings \
- title_uk="Встановити MaxShaderModelPS на 1" \
- title="Set MaxShaderModelPS to 1"
-w_metadata psm=2 settings \
- title_uk="Встановити MaxShaderModelPS на 2" \
- title="Set MaxShaderModelPS to 2"
-w_metadata psm=3 settings \
- title_uk="Встановити MaxShaderModelPS на 3" \
- title="Set MaxShaderModelPS to 3"
-
-load_psm()
-{
- winetricks_set_wined3d_var MaxShaderModelPS "$1"
-}
#----------------------------------------------------------------
@@ -19018,133 +19224,16 @@ load_sandbox()
echo disable > "$WINEPREFIX/.update-timestamp"
}
+# settings->winversions
#----------------------------------------------------------------
-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"
-w_metadata sound=pulse settings \
- title_uk="Встановити звуковий драйвер PulseAudio" \
- title="Set sound driver to PulseAudio"
+w_metadata nt40 settings \
+ title_uk="Встановити версію Windows NT 4.0" \
+ title="Set windows version to Windows NT 4.0"
-load_sound()
+load_nt40()
{
- echo "Setting sound driver to $1"
- cat > "$W_TMP"/set-sound.reg <<_EOF_
-REGEDIT4
-
-[HKEY_CURRENT_USER\\Software\\Wine\\Drivers]
-"Audio"="$1"
-
-_EOF_
- w_try_regedit "$W_TMP_WIN"\\set-sound.reg
-}
-
-#----------------------------------------------------------------
-
-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()
-{
- size="$1"
- case $size in
- off|disabled)
- cat > "$W_TMP"/vd.reg <<_EOF_
-REGEDIT4
-
-[HKEY_CURRENT_USER\\Software\\Wine\\Explorer]
-"Desktop"=-
-[HKEY_CURRENT_USER\\Software\\Wine\\Explorer\\Desktops]
-"Default"=-
-
-_EOF_
- ;;
- [1-9]*x[1-9]*)
- cat > "$W_TMP"/vd.reg <<_EOF_
-REGEDIT4
-
-[HKEY_CURRENT_USER\\Software\\Wine\\Explorer]
-"Desktop"="Default"
-[HKEY_CURRENT_USER\\Software\\Wine\\Explorer\\Desktops]
-"Default"="$size"
-
-_EOF_
- ;;
- *)
- w_die "you want a virtual desktop of $size? I don't understand."
- ;;
- esac
- w_try_regedit "$W_TMP_WIN"/vd.reg
-}
-
-#----------------------------------------------------------------
-
-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()
-{
- size="$1"
- echo "Setting video memory size to $size"
-
- case $size in
- default)
-
- cat > "$W_TMP"/set-video.reg <<_EOF_
-REGEDIT4
-
-[HKEY_CURRENT_USER\\Software\\Wine\\Direct3D]
-"VideoMemorySize"=-
-
-_EOF_
- ;;
- *)
- cat > "$W_TMP"/set-video.reg <<_EOF_
-REGEDIT4
-
-[HKEY_CURRENT_USER\\Software\\Wine\\Direct3D]
-"VideoMemorySize"="$size"
-
-_EOF_
- ;;
- esac
- w_try_regedit "$W_TMP_WIN"\\set-video.reg
+ w_set_winver nt40
}
#----------------------------------------------------------------
@@ -19160,26 +19249,6 @@ load_vista()
#----------------------------------------------------------------
-w_metadata vsm=0 settings \
- title_uk="Встановити MaxShaderModelVS на 0" \
- title="Set MaxShaderModelVS to 0"
-w_metadata vsm=1 settings \
- title_uk="Встановити MaxShaderModelVS на 1" \
- title="Set MaxShaderModelVS to 1"
-w_metadata vsm=2 settings \
- title_uk="Встановити MaxShaderModelVS на 2" \
- title="Set MaxShaderModelVS to 2"
-w_metadata vsm=3 settings \
- title_uk="Встановити MaxShaderModelVS на 3" \
- title="Set MaxShaderModelVS to 3"
-
-load_vsm()
-{
- winetricks_set_wined3d_var MaxShaderModelVS "$1"
-}
-
-#----------------------------------------------------------------
-
w_metadata win2k settings \
title_uk="Встановити версію Windows 2000" \
title="Set Windows version to Windows 2000"
@@ -19312,32 +19381,6 @@ load_winxp()
w_set_winver winxp
}
-#----------------------------------------------------------------
-
-# Not really a setting, just a fake verb, that shouldn't count as 'installed',
-# that always works
-
-w_metadata good settings \
- title="Fake verb that always returns true"
-
-load_good()
-{
- w_info "$W_PACKAGE succeeded!"
-}
-
-#----------------------------------------------------------------
-
-# Not really a setting, just a fake verb, that shouldn't count as 'installed',
-# that always fails
-
-w_metadata bad settings \
- title="Fake verb that always returns false"
-
-load_bad()
-{
- w_die "$W_PACKAGE failed!"
-}
-
#---- Main Program ----
winetricks_stats_save()
diff --git a/winetricks.1 b/winetricks.1
index ee42802..227ac80 100644
--- a/winetricks.1
+++ b/winetricks.1
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH WINETRICKS 1 "February 2018" "Winetricks 20180217" "Wine Package Manager"
+.TH WINETRICKS 1 "May 2018" "Winetricks 20180513" "Wine Package Manager"
.SH NAME
winetricks \- manage virtual Windows environments using Wine
.SH SYNOPSIS