diff --git a/wine-2.11.tar.xz b/wine-2.11.tar.xz new file mode 100644 index 0000000..260435f --- /dev/null +++ b/wine-2.11.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efa96dade206aa21accf0da195335a805d38209d6a14320607c6308ebde4cc3c +size 19251116 diff --git a/wine-2.11.tar.xz.sign b/wine-2.11.tar.xz.sign new file mode 100644 index 0000000..39b1271 --- /dev/null +++ b/wine-2.11.tar.xz.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAllNWL8ACgkQzvrI6q8X +UZ3uKw//Q1V0e30uC8P4wZqGKOBteF2E+JawygfAncInfx4P8VgK4rIA6bgacWYP +bn73aziWAds3Nhzqx8VlnIBwWZ3c/e0Wv2vwUbSbwoZxxNfmGv4GyFYq/LxA6hUh +dbxcRoYa42Nr+IXDiz3Z9kVfchxaJIG1t31Q/yJ2lXw3AVN1PZWHHxGpsC1fdQV5 +ikELKKIU2R3S4mM5kAhsjeM9it7IxrAZIr1GBIvdsEIV39Auo6PQ3l/DP0ADEgd8 +8MEU3JIEH6tpFDd6/G2w4wjjGfXDo+KlhjzURrWY0MgOh99+L9C6IpD8gCpoPyIy +mQBuEVMqwZZLh1w9KoWbZ8Bbje4mMTE0zcoEBZ/WIrDMkCrRuiJSzOnQN2gNXn/J +xaI+aeHeQ2Ql1HfcSMZ5tvPAnjhruK4CL/1HTq5DESKZOm0X4GORNZxe2ApKairG +xSJQO+vRSGAQjOzD1UJDdtxToOov+NBFKD+UGAtqYNdmxymy6N6NT9t89LkEP664 +84eHpB4ri/rVAGVIojXlzEWWoR4+224oUL/7b+eeW4Q52oYCiqvNbj9hKlSOZJFS +68Y74te+HLNUZ90qiRuI3TPAJt26GDGr8w60PHIMCWc13XCKzpZysk9/89En7GC/ +OJv/pa3VBc7fJqJw52CWgyy3M+hR9c1INzkJKmZ3bs4M/cr4gZs= +=Wove +-----END PGP SIGNATURE----- diff --git a/wine-2.6.tar.xz b/wine-2.6.tar.xz deleted file mode 100644 index b8c52ab..0000000 --- a/wine-2.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6ff64758f437647e99a36c1275e41adf54f0432907172d3bba22b070a97aac0 -size 19023352 diff --git a/wine-2.6.tar.xz.sign b/wine-2.6.tar.xz.sign deleted file mode 100644 index 93667f6..0000000 --- a/wine-2.6.tar.xz.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAljvvdIACgkQzvrI6q8X -UZ1b6A/9GCdCM2mBNOmdYphAeUq9r7UuCBj+PzgRnvQOmUF0PQQxgYI7VygYxbm5 -rXUfgqjOHW1cc/ysivQuYzq5BuZTQL51+X652iUhlc1DFW8nEqNt/uRmY+CPQj3f -rf3WD1KW+3iJL+uOIVTJriJm8bn4aGVxP5BjaHyp8dLm02kRCPDhaTdK2kB/TSdR -ix3HtUHrDjRnbJKicfHAhYo9FgqnA6O3iEdNGoV0Abo64MfoRLalaqP6/S/4x/wT -u6rkNaJFP88cJ2WMDORKG2gig/sV+I1rN4uKnI5NeK7TZsKkm2pynapC0OtF49Kv -DuTIsLiQrvXstWg5Mcayaxan6c8y1LerG/rM+SsgS531ciFh32P+BN6LJSqm+Rde -km+K0ShBb6lBkbTydBJY0Mf/qdb1Qmz9TvImx4dv0EGrHkQwNSkgds298BxTgFEL -AkWSJo3elSaZbJYIQ9qH042eU0XojjG40T7cZkKQgGjg65+3egz61LbCDR0S2i3G -f/omIIBtZBuJ5hdCp3Y7+pXy3XAvuR3zqQHlDb2Ar71smJ9hik5QQt0G0IYQN8Tz -CJKrkI2fL9T/fu0ygu6jG+9Kw9VAaOUk1VOzlqtlrtHtaMYw5aFj4hfeiyNRDVLu -Nmz4gOtjpaQ7f8CbJEaRy0mCN0hnHsvCdvMZYxcymJ1ibFdFvp4= -=ja76 ------END PGP SIGNATURE----- diff --git a/wine.changes b/wine.changes index 56f2107..196ab12 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Mon Jun 26 07:21:39 UTC 2017 - meissner@suse.com + +- Update to 2.11 development snapshot + - OpenGL support in the Android driver. + - Support for security labels. + - Relay debugging on ARM64. + - More dictionary support in WebServices. + - New registry file parser in RegEdit. + - Various bug fixes. +- updated winetricks + +------------------------------------------------------------------- +Sat Jun 10 11:14:22 UTC 2017 - meissner@suse.com + +- Update to 2.10 development snapshot + - Initial version of the Android graphics driver. + - Dictionary support in WebServices. + - A number of Direct2D fixes. + - User interface improvements in RegEdit. + - OLE clipboard cache fixes. + - Various bug fixes. +- updated winetricks + +------------------------------------------------------------------- +Sat Jun 3 07:50:23 UTC 2017 - meissner@suse.com + +- obsolete also the 32bit wine-mp3 package. (bsc#1042452) + +------------------------------------------------------------------- +Fri May 26 14:35:31 UTC 2017 - meissner@suse.com + +- Update to 2.9 development snapshot + - Direct3D command stream runs asynchronously. + - Better serial and parallel ports autodetection. + - Still more fixes for high DPI settings. + - System tray notifications on macOS. + - Various bug fixes. +- updated winetricks + +------------------------------------------------------------------- +Tue May 23 09:10:31 UTC 2017 - meissner@suse.com + +- obsolete the external wine-mp3 for distributions that have + mp3 support now. (bsc#1040190) + +------------------------------------------------------------------- +Mon May 15 11:16:10 UTC 2017 - meissner@suse.com + +- Update to 2.8 development snapshot + - Direct3D command stream runs asynchronously. + - Better serial and parallel ports autodetection. + - Still more fixes for high DPI settings. + - System tray notifications on macOS. + - Various bug fixes. +- updated winetricks + +------------------------------------------------------------------- +Sat Apr 29 16:06:30 UTC 2017 - meissner@suse.com + +- Update to 2.7 development snapshot + - TCP and UDP connection support in WebServices. + - Various shader improvements for Direct3D 11. + - Improved support for high DPI settings. + - Partial reimplementation of the GLU library. + - Support for recent versions of OSMesa. + - Window management improvements on macOS. + - Various bug fixes. +- updated winetricks + ------------------------------------------------------------------- Wed Apr 19 07:55:57 UTC 2017 - meissner@suse.com diff --git a/wine.spec b/wine.spec index ce4bd36..8386b7a 100644 --- a/wine.spec +++ b/wine.spec @@ -46,6 +46,10 @@ BuildRequires: libxml2-devel BuildRequires: libxslt-devel %if 0%{?suse_version} >= 1330 BuildRequires: mpg123-devel +Provides: wine-mp3 = %version +Obsoletes: wine-mp3 < %version +%else +Recommends: wine-mp3 %endif BuildRequires: ncurses-devel BuildRequires: openal-soft-devel @@ -57,8 +61,8 @@ BuildRequires: update-desktop-files BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel BuildRequires: pkgconfig(libudev) -%define realver 2.6 -Version: 2.6 +%define realver 2.11 +Version: 2.11 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ @@ -79,7 +83,6 @@ Source7: baselibs.conf # - currently none, but add them here #Patch0: susepatches.patch Recommends: wine-gecko >= 2.47 -Recommends: wine-mp3 # not packaged in distro... Recommends: wine-mono Recommends: dosbox @@ -162,7 +165,11 @@ grep SONAME_ config.log grep SONAME_ config.log|grep -v 'so"'|sed -e 's/^.*\(".*"\).*$/ requires \1/;'|sort -u >>%SOURCE7 echo " recommends \"alsa-plugins-pulse-32bit\"" >> %SOURCE7 echo " recommends \"alsa-plugins-32bit\"" >> %SOURCE7 +%if 0%{?suse_version} >= 1330 +echo " obsoletes \"wine-mp3-32bit\"" >> %SOURCE7 +%else echo " recommends \"wine-mp3-32bit\"" >> %SOURCE7 +%endif %if 0%{?suse_version} >= 1310 echo " requires \"p11-kit-32bit\"" >> %SOURCE7 %endif diff --git a/winetricks b/winetricks index 38831fb..a38b7d7 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=20170327-next +WINETRICKS_VERSION=20170614-next # This is a UTF-8 file # You should see an o with two dots over it here [ö] @@ -148,11 +148,10 @@ WINETRICKS_VERSION=20170327-next # # Support: # - Winetricks is maintained by Austin English . -# - If winetricks has helped you out, then please consider donating to the FSF/EFF as a thank you # - If winetricks has helped you out, then please consider donating to the FSF/EFF as a thank you: # * EFF - https://supporters.eff.org/donate/button # * FSF - https://my.fsf.org/donate -# - Donations towards electricity bill and developer beer fund can be sent via Paypal to above address. +# - Donations towards electricity bill and developer beer fund can be sent via Bitcoin to 18euSAZztpZ9wcN6xZS3vtNnE1azf8niDk # - I try to actively respond to bugs and pull requests on GitHub: # - Bugs: https://github.com/Winetricks/winetricks/issues/new # - Pull Requests: https://github.com/Winetricks/winetricks/pulls @@ -166,11 +165,9 @@ W_COUNTRY="" W_PREFIXES_ROOT="${WINE_PREFIXES:-$XDG_DATA_HOME/wineprefixes}" # For temp files before $WINEPREFIX is available: -if [ -x "$(which mktemp 2>/dev/null)" ] -then +if [ -x "$(which mktemp 2>/dev/null)" ] ; then W_TMP_EARLY="$(mktemp -d "${TMPDIR:-/tmp}/winetricks.XXXXXXXX")" -elif [ -w "$TMPDIR" ] -then +elif [ -w "$TMPDIR" ] ; then W_TMP_EARLY="$TMPDIR" else W_TMP_EARLY="/tmp" @@ -200,6 +197,7 @@ w_askpermission() then case $LANG in uk*) w_die "Операція скасована." ;; + pl*) w_die "Anulowano operację, opuszczanie." ;; *) w_die "Operation cancelled, quitting." ;; esac exec false @@ -292,16 +290,38 @@ w_killall() kill -s KILL $(pgrep $1) } +# Warn user if package is broken. Optionally provide a link to the bug report. +w_package_broken_win64() +{ + # Optional: + bug_link="$1" + + if [ "$W_ARCH" = "win64" ] ; then + if [ -n "$1" ] ; then + w_die "This package is broken on 64-bit Wine. Using a prefix made with WINEARCH=win32 to work around this. See: ${bug_link}" + else + w_die "This package is broken on 64-bit Wine. Using a prefix made with WINEARCH=win32 to work around this." + fi + fi +} + # Some packages don't support win64, die with an appropriate message -# Note: this is for packages that natively don't support win64, not packages that are broken on wine64 +# Note: this is for packages that natively don't support win64, not packages that are broken on wine64, for that, use w_package_broken_win64() w_package_unsupported_win64() { - if [ "$W_ARCH" = "win64" ] - then + if [ "$W_ARCH" = "win64" ] ; then w_die "This package does not work on a 64-bit installation. You must use a prefix made with WINEARCH=win32." fi } +# For packages that are not well tested or have some known issues on win64, but aren't broken +w_package_warn_win64() +{ + if [ "$W_ARCH" = "win64" ] ; then + w_warn "This package may not fully work on a 64-bit installation. 32-bit prefixes may work better." + fi +} + # Execute with error checking # Put this in front of any command that might fail w_try() @@ -338,15 +358,21 @@ w_try_7z() { # $1 - directory to extract to # $2 - file to extract + # $3 .. $n - files to extract from the archive + + destdir="$1" + filename="$2" + shift 2 + # Not always installed, use Windows 7-Zip as a fallback: if test -x "$(which 7z 2>/dev/null)" then - w_try 7z x "$2" -o"$1" + 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')." WINETRICKS_OPT_SHAREDPREFIX=1 w_call 7zip # errors out if there is a space between -o and path - w_try "$WINE" "$W_PROGRAMS_X86_WIN\\7-Zip\\7z.exe" x "$(w_pathconv -w "$2")" -o"$(w_pathconv -w "$1")" + w_try "$WINE" "$W_PROGRAMS_X86_WIN\\7-Zip\\7z.exe" x "$(w_pathconv -w "$filename")" -o"$(w_pathconv -w "$destdir")" "$@" fi } @@ -569,8 +595,7 @@ w_get_sha1sum() # See https://github.com/Winetricks/winetricks/issues/645 # User is running winetricks from /dev/stdin - if [ -f "$_W_sha1_file" ] || [ -h "$_W_sha1_file" ] - then + if [ -f "$_W_sha1_file" ] || [ -h "$_W_sha1_file" ] ; then _W_gotsha1sum=$($WINETRICKS_SHA1SUM < "$_W_sha1_file" | sed 's/(stdin)= //;s/ .*//') w_get_sha256sum "$_W_sha1_file" else @@ -590,8 +615,7 @@ w_get_sha256sum() # See https://github.com/Winetricks/winetricks/issues/645 # User is running winetricks from /dev/stdin - if [ -f "$_W_sha256_file" ] || [ -h "$_W_sha256_file" ] - then + if [ -f "$_W_sha256_file" ] || [ -h "$_W_sha256_file" ] ; then _W_gotsha256sum=$($WINETRICKS_SHA256SUM < "$_W_sha256_file" | sed 's/(stdin)= //;s/ .*//') else w_warn "$_W_sha256_file is not a regular file, not checking sha256sum" @@ -622,8 +646,7 @@ w_verify_sha1sum() _W_vs_file=$2 w_get_sha1sum "$_W_vs_file" - if [ "$_W_gotsha1sum"x != "$_W_vs_wantsum"x ] - then + if [ "$_W_gotsha1sum"x != "$_W_vs_wantsum"x ] ; then w_die "sha1sum mismatch! Rename $_W_vs_file and try again." fi unset _W_vs_wantsum _W_vs_file _W_gotsha1sum @@ -636,8 +659,7 @@ w_verify_sha256sum() _W_vs_file=$2 w_get_sha256sum "$_W_vs_file" - if [ "$_W_gotsha256sum"x != "$_W_vs_wantsum"x ] - then + if [ "$_W_gotsha256sum"x != "$_W_vs_wantsum"x ] ; then w_die "sha256sum mismatch! Rename $_W_vs_file and try again." fi unset _W_vs_wantsum _W_vs_file _W_gotsha256sum @@ -864,12 +886,10 @@ w_download_to() .) w_die "bug: please do not download packages to top of cache" ;; esac - if echo "$_W_url" | grep ' ' - then + if echo "$_W_url" | grep ' ' ; then w_die "bug: please use %20 instead of literal spaces in urls, curl rejects spaces, and they make life harder for linkcheck.sh" fi - if [ "$_W_file"x = ""x ] - then + if [ "$_W_file"x = ""x ] ; then _W_file=$(basename "$_W_url") fi @@ -885,31 +905,25 @@ w_download_to() fi fi - if test ! -d "$_W_cache" - then + if test ! -d "$_W_cache" ; then w_try mkdir -p "$_W_cache" fi # Try download twice checksum_ok="" tries=0 - while test $tries -lt 2 - do + while test $tries -lt 2 ; do # Warn on a second try test "$tries" -eq 1 && winetricks_dl_warning tries=$((tries + 1)) - if test -s "$_W_cache/$_W_file" - then - if test "$_W_sum" - then - if test $tries = 1 - then + if test -s "$_W_cache/$_W_file" ; then + if test "$_W_sum" ; then + if test $tries = 1 ; then # The cache was full. If the file is larger than 500 MB, # don't checksum it, that just annoys the user. # shellcheck disable=SC2046 - if test $(du -k "$_W_cache/$_W_file" | cut -f1) -gt 500000 - then + if test $(du -k "$_W_cache/$_W_file" | cut -f1) -gt 500000 ; then checksum_ok=1 break fi @@ -921,24 +935,21 @@ w_download_to() ;; sha1) w_get_sha1sum "$_W_cache/$_W_file" - if [ "$_W_gotsha1sum"x = "$_W_sum"x ] - then + if [ "$_W_gotsha1sum"x = "$_W_sum"x ] ; then checksum_ok=1 break fi ;; sha256) w_get_sha256sum "$_W_cache/$_W_file" - if [ "$_W_gotsha256sum"x = "$_W_sum"x ] - then + if [ "$_W_gotsha256sum"x = "$_W_sum"x ] ; then checksum_ok=1 break fi ;; esac - if test ! "$WINETRICKS_CONTINUE_DOWNLOAD" - then + if test ! "$WINETRICKS_CONTINUE_DOWNLOAD" ; then w_warn "Checksum for $_W_cache/$_W_file did not match, retrying download" mv -f "$_W_cache/$_W_file" "$_W_cache/$_W_file".bak fi @@ -946,8 +957,7 @@ w_download_to() # file exists, no checksum known, declare success and exit loop break fi - elif test -f "$_W_cache/$_W_file" - then + elif test -f "$_W_cache/$_W_file" ; then # zero-length file, just delete before retrying rm "$_W_cache/$_W_file" fi @@ -964,8 +974,7 @@ w_download_to() *) _W_agent="" ;; esac - if [ "${WINETRICKS_DOWNLOADER}" = "aria2c" ] - then + if [ "${WINETRICKS_DOWNLOADER}" = "aria2c" ] ; then # Note: aria2c wants = for most options or silently fails # (Slightly fancy) aria2c support @@ -992,8 +1001,7 @@ w_download_to() --save-session='' \ --stream-piece-selector=geom \ "$_W_url" - elif [ "${WINETRICKS_DOWNLOADER}" = "wget" ] - then + elif [ "${WINETRICKS_DOWNLOADER}" = "wget" ] ; then # Use -nd to insulate ourselves from people who set -x in WGETRC # [*] --retry-connrefused works around the broken sf.net mirroring # system when downloading corefonts @@ -1013,8 +1021,7 @@ w_download_to() ${_W_cookiejar:+--load-cookies "$_W_cookiejar"} \ ${_W_agent:+--user-agent="$_W_agent"} \ "$_W_url" - elif [ "${WINETRICKS_DOWNLOADER}" = "curl" ] - then + elif [ "${WINETRICKS_DOWNLOADER}" = "curl" ] ; then # Note: curl does not accept '=' when passing options # curl doesn't get filename from the location given by the server! @@ -1030,8 +1037,7 @@ w_download_to() ${_W_cookiejar:+--cookie "$_W_cookiejar"} \ ${_W_agent:+--user-agent "$_W_agent"} \ "$_W_url" - elif [ "${WINETRICKS_DOWNLOADER}" = "fetch" ] - then + elif [ "${WINETRICKS_DOWNLOADER}" = "fetch" ] ; then # Note: fetch does not support configurable retry count # shellcheck disable=SC2086 @@ -1043,8 +1049,8 @@ w_download_to() else w_die "Here be dragons" fi - if test $? = 0 - then + + if test $? = 0 ; then # Need to decompress .exe's that are compressed, else Cygwin fails # Also affects ttf files on github # FIXME: gzip hack below may no longer be needed, but need to investigate before removing @@ -1069,7 +1075,7 @@ w_download_to() w_die "Downloading $_W_url failed" fi # Download from the Wayback Machine on second try - _W_url="https://web.archive.org/web/$_W_url" + _W_url="https://web.archive.org/web/2000/$_W_url" done if test "$_W_sum" && test ! "$checksum_ok" ; then @@ -1081,11 +1087,9 @@ w_download_to() # Usage: w_open_folder directory w_open_folder() { - for _W_cmd in xdg-open open cygstart true - do + for _W_cmd in xdg-open open cygstart true ; do _W_cmdpath=$(which $_W_cmd) - if test -n "$_W_cmdpath" - then + if test -n "$_W_cmdpath" ; then break fi done @@ -1098,11 +1102,9 @@ w_open_folder() w_open_webpage() { # See https://www.dwheeler.com/essays/open-files-urls.html - for _W_cmd in xdg-open sdtwebclient cygstart open firefox true - do + for _W_cmd in xdg-open sdtwebclient cygstart open firefox true ; do _W_cmdpath=$(which $_W_cmd) - if test -n "$_W_cmdpath" - then + if test -n "$_W_cmdpath" ; then break fi done @@ -1132,12 +1134,10 @@ w_download_torrent() UT_WINPATH="$W_CACHE_WIN\\$W_PACKAGE" w_try_cd "$W_CACHE/$W_PACKAGE" - if [ "$2"x != ""x ] # foo.torrent parameter supplied - then + if [ "$2"x != ""x ] ; then # foo.torrent parameter supplied w_try "$WINE" utorrent "/DIRECTORY" "$UT_WINPATH" "$UT_WINPATH\\$2" & else # grab all torrents - for torrent in *.torrent - do + for torrent in *.torrent ; do w_try "$WINE" utorrent "/DIRECTORY" "$UT_WINPATH" "$UT_WINPATH\\$torrent" & done fi @@ -1260,14 +1260,14 @@ sub read_into_container{ if (/"([^"]*)"\s*"([^"]*)"$/) { ${$pcontainer}{$1} = $2; } elsif (/"([^"]*)"$/) { - my( %newcon, $name ); - $name = $1; - read_into_container(\%newcon); - ${$pcontainer}{$name} = \%newcon; + my( %newcon, $name ); + $name = $1; + read_into_container(\%newcon); + ${$pcontainer}{$name} = \%newcon; } elsif (/}/) { - return; + return; } else { - w_die "huh?"; + w_die "huh?"; } } } @@ -1320,8 +1320,7 @@ dump_container(\%top, "\t"); print "}\n"; _EOF_ -for file in userdata/*/config/localconfig.vdf -do +for file in userdata/*/config/localconfig.vdf ; do cp "$file" "$file.old" perl "$W_TMP"/steamconfig.pl "$file.old" > "$file" done @@ -1743,19 +1742,68 @@ w_skip_windows() return 1 } +# for common code in w_override_dlls and w_override_app_dlls +w_common_override_dll() +{ + _W_mode="$1" + module="$2" + + # Remove wine's builtin manifest, if present. Use: + # wineboot ; find "$WINEPREFIX"/drive_c/windows/winsxs/ -iname *manifest | grep deadbeef | sort + case "$W_PACKAGE" in + comctl32) + w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest + w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest + ;; + vcrun2005) + w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/amd64_microsoft.vc80.atl_1fc8b3b9a1e18e3b_8.0.50727.4053_none_deadbeef.manifest + w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/amd64_microsoft.vc80.crt_1fc8b3b9a1e18e3b_8.0.50727.4053_none_deadbeef.manifest + w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/x86_microsoft.vc80.atl_1fc8b3b9a1e18e3b_8.0.50727.4053_none_deadbeef.manifest + w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/x86_microsoft.vc80.crt_1fc8b3b9a1e18e3b_8.0.50727.4053_none_deadbeef.manifest + + # These are 32-bit only? + w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/x86_microsoft.vc80.mfc_1fc8b3b9a1e18e3b_8.0.50727.6195_none_deadbeef.manifest + w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/x86_microsoft.vc80.mfcloc_1fc8b3b9a1e18e3b_8.0.50727.6195_none_deadbeef.manifest + w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/x86_microsoft.vc80.openmp_1fc8b3b9a1e18e3b_8.0.50727.6195_none_deadbeef.manifest + ;; + vcrun2008) + w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/amd64_microsoft.vc90.atl_1fc8b3b9a1e18e3b_9.0.30729.6161_none_deadbeef.manifest + w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/amd64_microsoft.vc90.crt_1fc8b3b9a1e18e3b_9.0.30729.6161_none_deadbeef.manifest + w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/x86_microsoft.vc90.atl_1fc8b3b9a1e18e3b_9.0.30729.6161_none_deadbeef.manifest + w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/x86_microsoft.vc90.crt_1fc8b3b9a1e18e3b_9.0.30729.6161_none_deadbeef.manifest + + # These are 32-bit only? + w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/x86_microsoft.vc90.mfc_1fc8b3b9a1e18e3b_9.0.30729.6161_none_deadbeef.manifest + w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/x86_microsoft.vc90.mfcloc_1fc8b3b9a1e18e3b_9.0.30729.6161_none_deadbeef.manifest + w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/x86_microsoft.vc90.openmp_1fc8b3b9a1e18e3b_9.0.30729.6161_none_deadbeef.manifest + ;; + esac + + if [ "$_W_mode" = default ] ; then + # To delete a registry key, give an unquoted dash as value + echo "\"*$module\"=-" >> "$W_TMP"/override-dll.reg + else + # Note: if you want to override even DLLs loaded with an absolute + # path, you need to add an asterisk: + echo "\"*$module\"=\"$_W_mode\"" >> "$W_TMP"/override-dll.reg + fi +} + w_override_dlls() { w_skip_windows w_override_dlls && return _W_mode=$1 case $_W_mode in - *=*) - w_die "w_override_dlls: unknown mode $_W_mode. + *=*) + w_die "w_override_dlls: unknown mode $_W_mode. Usage: 'w_override_dlls mode[,mode] dll ...'." ;; - disabled) - _W_mode="" ;; + disabled) + _W_mode="" ;; esac + shift + echo "Using $_W_mode override for following DLLs: $*" cat > "$W_TMP"/override-dll.reg <<_EOF_ REGEDIT4 @@ -1764,23 +1812,7 @@ REGEDIT4 _EOF_ while test "$1" != "" do - case "$1" in - comctl32) - rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest - ;; - esac - - if [ "$_W_mode" = default ] - then - # To delete a registry key, give an unquoted dash as value - echo "\"*$1\"=-" >> "$W_TMP"/override-dll.reg - else - # Note: if you want to override even DLLs loaded with an absolute - # path, you need to add an asterisk: - echo "\"*$1\"=\"$_W_mode\"" >> "$W_TMP"/override-dll.reg - #echo "\"$1\"=\"$_W_mode\"" >> "$W_TMP"/override-dll.reg - fi - + w_common_override_dll "$_W_mode" "$1" shift done @@ -1800,17 +1832,65 @@ w_override_all_dlls() { # Disable all known native Microsoft DLLs in favor of Wine's built-in ones # Generated with: - # find ~/wine-git/dlls -maxdepth 1 -type d -print | sed 's,.*/,,' | sort | fmt -50 | sed 's/$/ \\/' + # find ./dlls -maxdepth 1 -type d ! -iname "*.dll16" ! -iname "*.drv*" ! -iname "*.ds" ! -iname "*.exe*" ! -iname "*.tlb" ! -iname "*.vxd" -print | sed \ + # -e '/^.*\/adsiid$/ d' \ + # -e '/^.*\/advapi32$/ d' \ + # -e '/^.*\/capi2032$/ d' \ + # -e '/^.*\/dbghelp$/ d' \ + # -e '/^.*\/ddraw$/ d' \ + # -e '/^.*\/dlls$/ d' \ + # -e '/^.*\/dxerr8$/ d' \ + # -e '/^.*\/dxerr9$/ d' \ + # -e '/^.*\/dxguid$/ d' \ + # -e '/^.*\/gdi32$/ d' \ + # -e '/^.*\/glu32$/ d' \ + # -e '/^.*\/icmp$/ d' \ + # -e '/^.*\/iphlpapi$/ d' \ + # -e '/^.*\/kernel32$/ d' \ + # -e '/^.*\/mountmgr.sys$/ d' \ + # -e '/^.*\/mswsock$/ d' \ + # -e '/^.*\/ntdll$/ d' \ + # -e '/^.*\/opengl32$/ d' \ + # -e '/^.*\/strmbase$/ d' \ + # -e '/^.*\/strmiids$/ d' \ + # -e '/^.*\/twain_32$/ d' \ + # -e '/^.*\/unicows$/ d' \ + # -e '/^.*\/user32$/ d' \ + # -e '/^.*\/uuid$/ d' \ + # -e '/^.*\/vdmdbg$/ d' \ + # -e '/^.*\/w32skrnl$/ d' \ + # -e '/^.*\/winecrt0$/ d' \ + # -e '/^.*\/wined3d$/ d' \ + # -e '/^.*\/winemp3.acm$/ d' \ + # -e '/^.*\/wineqtdecoder$/ d' \ + # -e '/^.*\/winmm$/ d' \ + # -e '/^.*\/wintab32$/ d' \ + # -e '/^.*\/wnaspi32$/ d' \ + # -e '/^.*\/wow32$/ d' \ + # -e '/^.*\/ws2_32$/ d' \ + # -e '/^.*\/wsock32$/ d' \ + # -e 's,.*/, ,' | sort | fmt -63 | sed 's/$/ \\/' # - # 2015/09/28: Last list update + # 2017/04/30: Last list update (wine-2.7) w_override_dlls builtin \ - acledit aclui activeds actxprxy adsiid advapi32 \ - advpack amstream api-ms-win-core-com-l1-1-0 \ + acledit aclui activeds actxprxy advpack \ + amstream api-ms-win-appmodel-identity-l1-1-0 \ + api-ms-win-appmodel-runtime-l1-1-1 \ + api-ms-win-core-apiquery-l1-1-0 \ + api-ms-win-core-appcompat-l1-1-1 \ + api-ms-win-core-appinit-l1-1-0 \ + api-ms-win-core-atoms-l1-1-0 \ + api-ms-win-core-bem-l1-1-0 api-ms-win-core-com-l1-1-0 \ + api-ms-win-core-com-l1-1-1 \ + api-ms-win-core-com-private-l1-1-0 \ api-ms-win-core-console-l1-1-0 \ + api-ms-win-core-console-l2-1-0 \ api-ms-win-core-datetime-l1-1-0 \ api-ms-win-core-datetime-l1-1-1 \ api-ms-win-core-debug-l1-1-0 \ api-ms-win-core-debug-l1-1-1 \ + api-ms-win-core-delayload-l1-1-0 \ + api-ms-win-core-delayload-l1-1-1 \ api-ms-win-core-errorhandling-l1-1-0 \ api-ms-win-core-errorhandling-l1-1-1 \ api-ms-win-core-errorhandling-l1-1-2 \ @@ -1818,6 +1898,7 @@ w_override_all_dlls() api-ms-win-core-fibers-l1-1-1 \ api-ms-win-core-file-l1-1-0 \ api-ms-win-core-file-l1-2-0 \ + api-ms-win-core-file-l1-2-1 \ api-ms-win-core-file-l2-1-0 \ api-ms-win-core-file-l2-1-1 \ api-ms-win-core-handle-l1-1-0 \ @@ -1826,19 +1907,33 @@ w_override_all_dlls() api-ms-win-core-heap-obsolete-l1-1-0 \ api-ms-win-core-interlocked-l1-1-0 \ api-ms-win-core-interlocked-l1-2-0 \ - api-ms-win-core-io-l1-1-1 \ + api-ms-win-core-io-l1-1-0 api-ms-win-core-io-l1-1-1 \ + api-ms-win-core-job-l1-1-0 api-ms-win-core-job-l2-1-0 \ api-ms-win-core-kernel32-legacy-l1-1-0 \ + api-ms-win-core-kernel32-legacy-l1-1-1 \ + api-ms-win-core-kernel32-private-l1-1-1 \ api-ms-win-core-libraryloader-l1-1-0 \ api-ms-win-core-libraryloader-l1-1-1 \ + api-ms-win-core-libraryloader-l1-2-0 \ + api-ms-win-core-libraryloader-l1-2-2 \ + api-ms-win-core-localization-l1-1-0 \ api-ms-win-core-localization-l1-2-0 \ api-ms-win-core-localization-l1-2-1 \ + api-ms-win-core-localization-l2-1-0 \ api-ms-win-core-localization-obsolete-l1-1-0 \ + api-ms-win-core-localization-obsolete-l1-2-0 \ + api-ms-win-core-localization-private-l1-1-0 \ api-ms-win-core-localregistry-l1-1-0 \ api-ms-win-core-memory-l1-1-0 \ api-ms-win-core-memory-l1-1-1 \ + api-ms-win-core-memory-l1-1-2 \ api-ms-win-core-misc-l1-1-0 \ api-ms-win-core-namedpipe-l1-1-0 \ api-ms-win-core-namedpipe-l1-2-0 \ + api-ms-win-core-namespace-l1-1-0 \ + api-ms-win-core-normalization-l1-1-0 \ + api-ms-win-core-path-l1-1-0 \ + api-ms-win-core-privateprofile-l1-1-1 \ api-ms-win-core-processenvironment-l1-1-0 \ api-ms-win-core-processenvironment-l1-2-0 \ api-ms-win-core-processthreads-l1-1-0 \ @@ -1846,24 +1941,46 @@ w_override_all_dlls() api-ms-win-core-processthreads-l1-1-2 \ api-ms-win-core-profile-l1-1-0 \ api-ms-win-core-psapi-l1-1-0 \ + api-ms-win-core-psapi-obsolete-l1-1-0 \ + api-ms-win-core-quirks-l1-1-0 \ + api-ms-win-core-realtime-l1-1-0 \ api-ms-win-core-registry-l1-1-0 \ + api-ms-win-core-registry-l2-1-0 \ + api-ms-win-core-registryuserspecific-l1-1-0 \ api-ms-win-core-rtlsupport-l1-1-0 \ api-ms-win-core-rtlsupport-l1-2-0 \ api-ms-win-core-shlwapi-legacy-l1-1-0 \ + api-ms-win-core-shlwapi-obsolete-l1-1-0 \ + api-ms-win-core-sidebyside-l1-1-0 \ + api-ms-win-core-stringansi-l1-1-0 \ api-ms-win-core-string-l1-1-0 \ + api-ms-win-core-string-l2-1-0 \ + api-ms-win-core-string-obsolete-l1-1-0 \ api-ms-win-core-synch-l1-1-0 \ api-ms-win-core-synch-l1-2-0 \ api-ms-win-core-sysinfo-l1-1-0 \ api-ms-win-core-sysinfo-l1-2-0 \ api-ms-win-core-sysinfo-l1-2-1 \ + api-ms-win-core-threadpool-l1-1-0 \ + api-ms-win-core-threadpool-l1-2-0 \ api-ms-win-core-threadpool-legacy-l1-1-0 \ + api-ms-win-core-threadpool-private-l1-1-0 \ api-ms-win-core-timezone-l1-1-0 \ - api-ms-win-core-url-l1-1-0 \ - api-ms-win-core-util-l1-1-0 \ + api-ms-win-core-toolhelp-l1-1-0 \ + api-ms-win-core-url-l1-1-0 api-ms-win-core-util-l1-1-0 \ + api-ms-win-core-versionansi-l1-1-0 \ + api-ms-win-core-version-l1-1-0 \ + api-ms-win-core-version-private-l1-1-0 \ + api-ms-win-core-windowserrorreporting-l1-1-0 \ api-ms-win-core-winrt-error-l1-1-0 \ api-ms-win-core-winrt-error-l1-1-1 \ + api-ms-win-core-winrt-errorprivate-l1-1-1 \ api-ms-win-core-winrt-l1-1-0 \ + api-ms-win-core-winrt-registration-l1-1-0 \ + api-ms-win-core-winrt-roparameterizediid-l1-1-0 \ api-ms-win-core-winrt-string-l1-1-0 \ + api-ms-win-core-wow64-l1-1-0 \ + api-ms-win-core-xstate-l1-1-0 \ api-ms-win-core-xstate-l2-1-0 \ api-ms-win-crt-conio-l1-1-0 \ api-ms-win-crt-convert-l1-1-0 \ @@ -1880,6 +1997,8 @@ w_override_all_dlls() api-ms-win-crt-string-l1-1-0 \ api-ms-win-crt-time-l1-1-0 \ api-ms-win-crt-utility-l1-1-0 \ + api-ms-win-devices-config-l1-1-1 \ + api-ms-win-devices-query-l1-1-1 \ api-ms-win-downlevel-advapi32-l1-1-0 \ api-ms-win-downlevel-advapi32-l2-1-0 \ api-ms-win-downlevel-normaliz-l1-1-0 \ @@ -1889,114 +2008,126 @@ w_override_all_dlls() api-ms-win-downlevel-shlwapi-l2-1-0 \ api-ms-win-downlevel-user32-l1-1-0 \ api-ms-win-downlevel-version-l1-1-0 \ + api-ms-win-dx-d3dkmt-l1-1-0 \ + api-ms-win-eventing-classicprovider-l1-1-0 \ + api-ms-win-eventing-consumer-l1-1-0 \ + api-ms-win-eventing-controller-l1-1-0 \ api-ms-win-eventing-provider-l1-1-0 \ + api-ms-win-eventlog-legacy-l1-1-0 \ + api-ms-win-mm-misc-l1-1-1 api-ms-win-mm-mme-l1-1-0 \ api-ms-win-ntuser-dc-access-l1-1-0 \ + api-ms-win-power-base-l1-1-0 \ + api-ms-win-power-setting-l1-1-0 \ + api-ms-win-rtcore-ntuser-private-l1-1-0 \ + api-ms-win-security-audit-l1-1-1 \ api-ms-win-security-base-l1-1-0 \ api-ms-win-security-base-l1-2-0 \ + api-ms-win-security-base-private-l1-1-1 \ + api-ms-win-security-grouppolicy-l1-1-0 \ + api-ms-win-security-lsalookup-l1-1-0 \ + api-ms-win-security-lsalookup-l1-1-1 \ + api-ms-win-security-lsalookup-l2-1-1 \ + api-ms-win-security-lsapolicy-l1-1-0 \ api-ms-win-security-sddl-l1-1-0 \ + api-ms-win-security-systemfunctions-l1-1-0 \ + api-ms-win-service-core-l1-1-0 \ api-ms-win-service-core-l1-1-1 \ api-ms-win-service-management-l1-1-0 \ - api-ms-win-service-winsvc-l1-2-0 apphelp \ + api-ms-win-service-management-l2-1-0 \ + api-ms-win-service-private-l1-1-1 \ + api-ms-win-service-winsvc-l1-1-0 \ + api-ms-win-service-winsvc-l1-2-0 \ + api-ms-win-shell-shellcom-l1-1-0 \ + api-ms-win-shell-shellfolders-l1-1-0 apphelp \ appwiz.cpl atl atl100 atl110 atl80 atl90 authz \ - avicap32 avifil32 avifile.dll16 avrt bcrypt \ - browseui cabinet capi2032 cards cfgmgr32 clusapi \ - combase comcat comctl32 comdlg32 commdlg.dll16 \ - comm.drv16 compobj.dll16 compstui comsvcs connect \ - credui crtdll crypt32 cryptdlg cryptdll cryptext \ - cryptnet cryptui ctapi32 ctl3d32 ctl3d.dll16 \ - ctl3dv2.dll16 d2d1 d3d10 d3d10_1 d3d10core \ - d3d11 d3d8 d3d9 d3dcompiler_33 d3dcompiler_34 \ - d3dcompiler_35 d3dcompiler_36 d3dcompiler_37 \ - d3dcompiler_38 d3dcompiler_39 d3dcompiler_40 \ - d3dcompiler_41 d3dcompiler_42 d3dcompiler_43 \ - d3dcompiler_46 d3dcompiler_47 d3dim d3drm \ - d3dx10_33 d3dx10_34 d3dx10_35 d3dx10_36 d3dx10_37 \ - d3dx10_38 d3dx10_39 d3dx10_40 d3dx10_41 d3dx10_42 \ - d3dx10_43 d3dx11_42 d3dx11_43 d3dx9_24 d3dx9_25 \ - d3dx9_26 d3dx9_27 d3dx9_28 d3dx9_29 d3dx9_30 \ - d3dx9_31 d3dx9_32 d3dx9_33 d3dx9_34 d3dx9_35 \ - d3dx9_36 d3dx9_37 d3dx9_38 d3dx9_39 d3dx9_40 \ - d3dx9_41 d3dx9_42 d3dx9_43 d3dxof davclnt \ - dbgeng dbghelp dciman32 ddeml.dll16 ddraw \ - ddrawex devenum dhcpcsvc difxapi dinput \ - dinput8 dispdib.dll16 dispex display.drv16 \ - dlls dmband dmcompos dmime dmloader dmscript \ - dmstyle dmsynth dmusic dmusic32 dnsapi dplay \ - dplayx dpnaddr dpnet dpnhpast dpnlobby dpvoice \ - dpwsockx drmclien dsound dssenh dswave dwmapi \ - dwrite dxdiagn dxerr8 dxerr9 dxgi dxguid dxva2 \ - evr explorerframe ext-ms-win-gdi-devcaps-l1-1-0 \ - faultrep fltlib fntcache fontsub fusion fwpuclnt \ - gameux gdi32 gdi.exe16 gdiplus glu32 gphoto2.ds \ - gpkcsp hal hhctrl.ocx hid hidclass.sys hlink \ - hnetcfg httpapi iccvid icmp ieframe ifsmgr.vxd \ - imaadp32.acm imagehlp imm32 imm.dll16 inetcomm \ - inetcpl.cpl inetmib1 infosoft initpki inkobj \ - inseng iphlpapi itircl itss joy.cpl jscript \ - jsproxy kernel32 keyboard.drv16 krnl386.exe16 \ - ksuser ktmw32 loadperf localspl localui lz32 \ - lzexpand.dll16 mapi32 mapistub mciavi32 mcicda \ - mciqtz32 mciseq mciwave mf mfplat mfreadwrite \ - mgmtapi midimap mlang mmcndmgr mmdevapi \ - mmdevldr.vxd mmsystem.dll16 monodebg.vxd \ - mountmgr.sys mouse.drv16 mpr mprapi msacm32 \ - msacm32.drv msacm.dll16 msadp32.acm msasn1 \ - mscat32 mscms mscoree msctf msctfp msdaps \ - msdmo msftedit msg711.acm msgsm32.acm mshtml \ - mshtml.tlb msi msident msimg32 msimsg msimtf \ - msisip msisys.ocx msls31 msnet32 mspatcha msrle32 \ - msscript.ocx mssign32 mssip32 mstask msvcirt \ - msvcm80 msvcm90 msvcp100 msvcp110 msvcp120 \ - msvcp120_app msvcp60 msvcp70 msvcp71 msvcp80 \ - msvcp90 msvcr100 msvcr110 msvcr120 msvcr120_app \ - msvcr70 msvcr71 msvcr80 msvcr90 msvcrt msvcrt20 \ - msvcrt40 msvcrtd msvfw32 msvidc32 msvideo.dll16 \ - mswsock msxml msxml2 msxml3 msxml4 msxml6 \ - nddeapi ndis.sys netapi32 netcfgx netprofm \ - newdev normaliz npmshtml npptools ntdll ntdsapi \ - ntoskrnl.exe ntprint objsel odbc32 odbccp32 \ - odbccu32 ole2conv.dll16 ole2disp.dll16 ole2.dll16 \ - ole2nls.dll16 ole2prox.dll16 ole2thk.dll16 \ - ole32 oleacc oleaut32 olecli32 olecli.dll16 \ - oledb32 oledlg olepro32 olesvr32 olesvr.dll16 \ - olethk32 openal32 opencl opengl32 packager pdh \ - photometadatahandler pidgen powrprof printui \ - prntvpt propsys psapi pstorec qcap qedit qmgr \ - qmgrprxy quartz query rasapi16.dll16 rasapi32 \ - rasdlg regapi resutils riched20 riched32 \ - rpcrt4 rsabase rsaenh rstrtmgr rtutils \ - samlib sane.ds scarddlg sccbase schannel \ - schedsvc scrrun scsiport.sys secur32 security \ - sensapi serialui setupapi setupx.dll16 sfc \ - sfc_os shdoclc shdocvw shell32 shell.dll16 \ - shfolder shlwapi slbcsp slc snmpapi softpub \ - sound.drv16 spoolss stdole2.tlb stdole32.tlb \ - sti storage.dll16 stress.dll16 strmbase strmiids \ - svrapi sxs system.drv16 t2embed tapi32 taskschd \ - toolhelp.dll16 traffic twain_32 twain.dll16 \ - typelib.dll16 ucrtbase unicows updspapi url \ - urlmon usbd.sys user32 userenv user.exe16 usp10 \ - uuid uxtheme vbscript vcomp vcomp100 vcomp110 \ - vcomp90 vdhcp.vxd vdmdbg ver.dll16 version \ - vmm.vxd vnbt.vxd vnetbios.vxd vssapi vtdapi.vxd \ - vwin32.vxd w32skrnl w32sys.dll16 wbemdisp \ - wbemprox webservices wer wevtapi wiaservc \ - win32s16.dll16 win87em.dll16 winaspi.dll16 \ - windebug.dll16 windowscodecs windowscodecsext \ - winealsa.drv winecoreaudio.drv winecrt0 wined3d \ - winegstreamer winejoystick.drv winemac.drv \ - winemapi winemp3.acm wineoss.drv wineps16.drv16 \ - wineps.drv wineqtdecoder winex11.drv wing32 \ - wing.dll16 winhttp wininet winmm winnls32 \ - winnls.dll16 winscard winsock.dll16 winspool.drv \ - winsta wintab32 wintab.dll16 wintrust wlanapi \ - wldap32 wmi wmiutils wmp wmvcore wnaspi32 wow32 \ - wpcap ws2_32 wshom.ocx wsnmp32 wsock32 wtsapi32 \ - wuapi wuaueng x3daudio1_1 x3daudio1_2 x3daudio1_3 \ + avicap32 avifil32 avrt bcrypt bluetoothapis browseui \ + bthprops.cpl cabinet cards cfgmgr32 clusapi combase \ + comcat comctl32 comdlg32 compstui comsvcs concrt140 \ + connect credui crtdll crypt32 cryptdlg cryptdll \ + cryptext cryptnet cryptui ctapi32 ctl3d32 d2d1 d3d10 \ + d3d10_1 d3d10core d3d11 d3d8 d3d9 d3dcompiler_33 \ + d3dcompiler_34 d3dcompiler_35 d3dcompiler_36 \ + d3dcompiler_37 d3dcompiler_38 d3dcompiler_39 \ + d3dcompiler_40 d3dcompiler_41 d3dcompiler_42 \ + d3dcompiler_43 d3dcompiler_46 d3dcompiler_47 d3dim \ + d3drm d3dx10_33 d3dx10_34 d3dx10_35 d3dx10_36 \ + d3dx10_37 d3dx10_38 d3dx10_39 d3dx10_40 d3dx10_41 \ + d3dx10_42 d3dx10_43 d3dx11_42 d3dx11_43 d3dx9_24 \ + d3dx9_25 d3dx9_26 d3dx9_27 d3dx9_28 d3dx9_29 d3dx9_30 \ + d3dx9_31 d3dx9_32 d3dx9_33 d3dx9_34 d3dx9_35 d3dx9_36 \ + d3dx9_37 d3dx9_38 d3dx9_39 d3dx9_40 d3dx9_41 d3dx9_42 \ + d3dx9_43 d3dxof davclnt dbgeng dciman32 ddrawex \ + devenum dhcpcsvc difxapi dinput dinput8 dispex dmband \ + dmcompos dmime dmloader dmscript dmstyle dmsynth \ + dmusic dmusic32 dnsapi dplay dplayx dpnaddr dpnet \ + dpnhpast dpnlobby dpvoice dpwsockx drmclien dsound \ + dssenh dswave dwmapi dwrite dxdiagn dxgi dxva2 esent \ + evr explorerframe ext-ms-win-domainjoin-netjoin-l1-1-0 \ + ext-ms-win-gdi-dc-create-l1-1-1 \ + ext-ms-win-gdi-dc-l1-2-0 ext-ms-win-gdi-devcaps-l1-1-0 \ + ext-ms-win-gdi-draw-l1-1-1 \ + ext-ms-win-gdi-render-l1-1-0 \ + ext-ms-win-kernel32-package-current-l1-1-0 \ + ext-ms-win-ntuser-message-l1-1-1 \ + ext-ms-win-ntuser-private-l1-1-1 \ + ext-ms-win-ntuser-rectangle-ext-l1-1-0 \ + ext-ms-win-ntuser-uicontext-ext-l1-1-0 \ + ext-ms-win-ntuser-window-l1-1-1 \ + ext-ms-win-rtcore-gdi-object-l1-1-0 \ + ext-ms-win-rtcore-gdi-rgn-l1-1-0 \ + ext-ms-win-rtcore-ntuser-dc-access-l1-1-0 \ + ext-ms-win-rtcore-ntuser-dpi-l1-1-0 \ + ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 faultrep \ + fltlib fltmgr.sys fntcache fontsub fusion fwpuclnt \ + gameux gdiplus gpkcsp hal hhctrl.ocx hid hidclass.sys \ + hlink hnetcfg httpapi iccvid ieframe imaadp32.acm \ + imagehlp imm32 inetcomm inetcpl.cpl inetmib1 infosoft \ + initpki inkobj inseng iprop irprops.cpl itircl itss \ + joy.cpl jscript jsproxy kernelbase ksuser ktmw32 \ + loadperf localspl localui lz32 mapi32 mapistub \ + mciavi32 mcicda mciqtz32 mciseq mciwave mf mf3216 \ + mfplat mfreadwrite mgmtapi midimap mlang mmcndmgr \ + mmdevapi mpr mprapi msacm32 msadp32.acm msasn1 \ + mscat32 mscms mscoree msctf msctfp msdaps msdelta \ + msdmo msdrm msftedit msg711.acm msgsm32.acm mshtml \ + msi msident msimg32 msimsg msimtf msisip msisys.ocx \ + msls31 msnet32 mspatcha msports msrle32 msscript.ocx \ + mssign32 mssip32 mstask msvcirt msvcm80 msvcm90 \ + msvcp100 msvcp110 msvcp120 msvcp120_app msvcp140 \ + msvcp60 msvcp70 msvcp71 msvcp80 msvcp90 msvcr100 \ + msvcr110 msvcr120 msvcr120_app msvcr70 msvcr71 msvcr80 \ + msvcr90 msvcrt msvcrt20 msvcrt40 msvcrtd msvfw32 \ + msvidc32 msxml msxml2 msxml3 msxml4 msxml6 mtxdm \ + ncrypt nddeapi ndis.sys netapi32 netcfgx netprofm \ + newdev normaliz npmshtml npptools ntdsapi ntprint \ + objsel odbc32 odbccp32 odbccu32 ole32 oleacc oleaut32 \ + olecli32 oledb32 oledlg olepro32 olesvr32 olethk32 \ + openal32 opencl packager pdh photometadatahandler \ + pidgen powrprof printui prntvpt propsys psapi pstorec \ + qcap qedit qmgr qmgrprxy quartz query rasapi32 rasdlg \ + regapi resutils riched20 riched32 rpcrt4 rsabase \ + rsaenh rstrtmgr rtutils samlib scarddlg sccbase \ + schannel schedsvc scrobj scrrun scsiport.sys secur32 \ + security sensapi serialui setupapi sfc sfc_os shdoclc \ + shdocvw shell32 shfolder shlwapi slbcsp slc snmpapi \ + softpub spoolss sspicli sti svrapi sxs t2embed tapi32 \ + taskschd tdi.sys traffic ucrtbase uiautomationcore \ + updspapi url urlmon usbd.sys userenv usp10 uxtheme \ + vbscript vcomp vcomp100 vcomp110 vcomp120 vcomp140 \ + vcomp90 vcruntime140 version virtdisk vssapi \ + wbemdisp wbemprox webservices wer wevtapi wiaservc \ + wimgapi windowscodecs windowscodecsext winebus.sys \ + winegstreamer winehid.sys winemapi wing32 winhttp \ + wininet winnls32 winscard winsta wintrust winusb \ + wlanapi wldap32 wmasf wmi wmiutils wmp wmvcore wpc \ + wpcap wsdapi wshom.ocx wsnmp32 wtsapi32 wuapi wuaueng \ + x3daudio1_0 x3daudio1_1 x3daudio1_2 x3daudio1_3 \ x3daudio1_4 x3daudio1_5 x3daudio1_6 x3daudio1_7 \ - xapofx1_1 xapofx1_3 xapofx1_4 xapofx1_5 xaudio2_7 \ - xaudio2_8 xinput1_1 xinput1_2 xinput1_3 xinput1_4 \ - xinput9_1_0 xmllite xolehlp xpsprint xpssvcs \ + xapofx1_1 xapofx1_2 xapofx1_3 xapofx1_4 xapofx1_5 \ + xaudio2_0 xaudio2_1 xaudio2_2 xaudio2_3 xaudio2_4 \ + xaudio2_5 xaudio2_6 xaudio2_7 xaudio2_8 xaudio2_9 \ + xinput1_1 xinput1_2 xinput1_3 xinput1_4 xinput9_1_0 \ + xmllite xolehlp xpsprint xpssvcs \ # blank line so you don't have to remove the extra trailing \ } @@ -2012,44 +2143,30 @@ w_override_app_dlls() # Fixme: handle comma-separated list of modes case $_W_mode in - b|builtin) _W_mode=builtin ;; - n|native) _W_mode=native ;; - default) _W_mode=default ;; - d|disabled) _W_mode="" ;; - *) + b|builtin) _W_mode=builtin ;; + n|native) _W_mode=native ;; + default) _W_mode=default ;; + d|disabled) _W_mode="" ;; + *) w_die "w_override_app_dlls: unknown mode $_W_mode. (want native, builtin, default, or disabled) Usage: 'w_override_app_dlls app mode dll ...'." ;; esac echo "Using $_W_mode override for following DLLs when running $_W_app: $*" ( - echo REGEDIT4 - echo "" - echo "[HKEY_CURRENT_USER\\Software\\Wine\\AppDefaults\\$_W_app\\DllOverrides]" + echo REGEDIT4 + echo "" + echo "[HKEY_CURRENT_USER\\Software\\Wine\\AppDefaults\\$_W_app\\DllOverrides]" ) > "$W_TMP"/override-dll.reg while test "$1" != "" do - case "$1" in - comctl32) - rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest - ;; - esac - if [ "$_W_mode" = default ] - then - # To delete a registry key, give an unquoted dash as value - echo "\"*$1\"=-" >> "$W_TMP"/override-dll.reg - else - # Note: if you want to override even DLLs loaded with an absolute - # path, you need to add an asterisk: - echo "\"*$1\"=\"$_W_mode\"" >> "$W_TMP"/override-dll.reg - #echo "\"$1\"=\"$_W_mode\"" >> "$W_TMP"/override-dll.reg - fi + w_common_override_dll "$_W_mode" "$1" shift done w_try_regedit "$W_TMP_WIN"\\override-dll.reg - rm "$W_TMP"/override-dll.reg + w_try rm "$W_TMP"/override-dll.reg unset _W_app _W_mode } @@ -2254,60 +2371,46 @@ w_set_app_winver() unset _W_app } -# Usage: w_wine_version OP VALUE -# All the integer comparison operators of 'test' are supported, since 'test' does the work. +# Usage: w_compare_wine_version OP VALUE +# Note: currently only -ge and -le are supported, +# as well as the special case -bn (between) # Example: -# if w_wine_version -gt 1.3.2 -# then +# if w_compare_wine_version -gt 2.5 ; then # ... # fi -w_wine_version() +w_compare_wine_version() { - # Note, there are also hacks for major releases (1.6/1.8/2.0/etc. and RCs) in winetricks_init() - # - # Parse major/minor/micro/nano fields of VALUE. Ignore nano. - case $2 in - 0*|1.0|1.0.*) w_die "bug: $2 is before 1.1, we don't bother with bugs fixed that long ago" ;; - 1.1.*) _W_minor=1; _W_micro=$(echo "$2" | sed 's/.*\.//');; - 1.2) _W_minor=2; _W_micro=0;; - 1.2.*) _W_minor=2; _W_micro=$(echo "$2" | sed 's/.*\.//');; - 1.3.*) _W_minor=3; _W_micro=$(echo "$2" | sed 's/.*\.//');; - 1.4) _W_minor=4; _W_micro=0;; - 1.4.*) _W_minor=4; _W_micro=$(echo "$2" | sed 's/.*\.//');; - 1.5.*) _W_minor=5; _W_micro=$(echo "$2" | sed 's/.*\.//');; - 1.6|1.6-rc*) _W_minor=6; _W_micro=0;; - 1.6.*) _W_minor=6; _W_micro=$(echo "$2" | sed 's/.*\.//');; - 1.7.*) _W_minor=7; _W_micro=$(echo "$2" | sed 's/.*\.//');; - 1.8.*) _W_minor=8; _W_micro=$(echo "$2" | sed 's/.*\.//');; - 1.9.*) _W_minor=9; _W_micro=$(echo "$2" | sed 's/.*\.//');; + comparison="$1" + known_wine_val1="$2" + known_wine_val2="$3" - # Rather than rework numbering system to handle both, just consider 2.x+ as 1.10, 1.11, etc. - 2.0|2.0-rc*) _W_minor=10; _W_micro=0;; - 2.0.*|2.*) _W_minor=10; _W_micro=$(echo "$2" | sed 's/.*\.//');; - 3.0|3.0-rc*) _W_minor=11; _W_micro=0;; - 3.0.*|3.*) _W_minor=11; _W_micro=$(echo "$2" | sed 's/.*\.//');; - - *) w_die "bug: unrecognized version $2";; + case "$comparison" in + # expected value if the comparison is true + -bn) _expected_pos_current_wine="2" + _wine_versions_string="${known_wine_val1}\n${_wine_version_stripped}\n${known_wine_val2}" + ;; + -ge) _expected_pos_current_wine="2" + _wine_versions_string="${known_wine_val1}\n${_wine_version_stripped}" + ;; + -le) _expected_pos_current_wine="1" + _wine_versions_string="${known_wine_val1}\n${_wine_version_stripped}" + ;; + *) w_die "Unsupported comparison. Only -ge and -le are supported" ;; esac - # Comparing current wine version 1.$WINETRICKS_WINE_MINOR.$WINETRICKS_WINE_MICRO against 1.$_W_minor.$_W_micro - if test "$WINETRICKS_WINE_MINOR" = "$_W_minor" - then - test "$WINETRICKS_WINE_MICRO" "$1" "$_W_micro" || return 1 + # shellcheck disable=SC2039 + _pos_current_wine="$(echo -e "${_wine_versions_string}" | sort -V | grep -n "^${_wine_version_stripped}\$" | cut -d : -f1)" + if [ "$_pos_current_wine" = "$_expected_pos_current_wine" ] ; then + #echo "true: known_wine_version=$2, comparison=$1, stripped wine=$_wine_version_stripped, expected_pos=$_expected_pos_known, pos_known=$_pos_known_wine" + #echo "Wine version comparison is true" + return 1 else - test "$WINETRICKS_WINE_MINOR" "$1" "$_W_minor" || return 1 + #echo "false: known_wine_version=$2, comparison=$1, stripped wine=$_wine_version_stripped, expected_pos=$_expected_pos_known, pos_known=$_pos_known_wine" + #echo "Wine version comparison is false" + return 0 fi } -# Built-in self test for w_wine_version -#echo Verify that version 1.3.4 is equal to itself -#WINETRICKS_WINE_MINOR=3 WINETRICKS_WINE_MICRO=4 w_wine_version -eq 1.3.4 || w_die "fail test case wine-1.3.4 = 1.3.4" -#echo Verify that version 1.3.4 is greater than 1.2 -#WINETRICKS_WINE_MINOR=3 WINETRICKS_WINE_MICRO=4 w_wine_version -gt 1.2 || w_die "fail test case wine-1.3.4 > wine-1.2" -#echo Verify that version 1.6 is greater than 1.2 -#WINETRICKS_WINE_MINOR=6 WINETRICKS_WINE_MICRO=0 w_wine_version -gt 1.2 || w_die "fail test case wine-1.6 > wine-1.2" -# FIXME: 2.x tests - # Usage: w_wine_version_in range ... # True if wine version in any of the given ranges # 'range' can be @@ -2316,41 +2419,21 @@ w_wine_version() # val1,val2 (for >= val1 && <= val2) w_wine_version_in() { - for _W_range - do - _W_val1=$(echo "$_W_range" | sed 's/,.*//') - _W_val2=$(echo "$_W_range" | sed 's/.*,//') - - # If in this range, return true - case $_W_range in - ,*) w_wine_version -le "$_W_val2" && unset _W_range _W_val1 _W_val2 && return 0;; - *,) w_wine_version -ge "$_W_val1" && unset _W_range _W_val1 _W_val2 && return 0;; - *) w_wine_version -ge "$_W_val1" && w_wine_version -le "$_W_val2" && unset _W_range _W_val1 _W_val2 && return 0;; - esac - done - unset _W_range _W_val1 _W_val2 - return 1 + for _W_range + do + _W_val1=$(echo "$_W_range" | sed 's/,.*//') + _W_val2=$(echo "$_W_range" | sed 's/.*,//') + # If in this range, return true + case $_W_range in + ,*) w_compare_wine_version -le "$_W_val2" && unset _W_range _W_val1 _W_val2 && return 0;; + *,) w_compare_wine_version -ge "$_W_val1" && unset _W_range _W_val1 _W_val2 && return 0;; + *) w_compare_wine_version -bn "$_W_val1" "$_W_val2" && unset _W_range _W_val1 _W_val2 && return 0;; + esac + done + unset _W_range _W_val1 _W_val2 + return 1 } -# Built-in self test for w_wine_version_in -#w_wine_version_in_test() -#{ -# WINETRICKS_WINE_MINOR=$1 WINETRICKS_WINE_MICRO=$2 w_wine_version_in $3 $4 $5 $6 || w_die "fail test case wine-1.$1.$2 in $3 $4 $5 $6" -#} -#w_wine_version_not_in_test() -#{ -# WINETRICKS_WINE_MINOR=$1 WINETRICKS_WINE_MICRO=$2 w_wine_version_in $3 $4 $5 $6 && w_die "fail test case wine-1.$1.$2 in $3 $4 $5 $6" -#} -#echo Verify that version 1.2.0 is in the range 1.2, -#w_wine_version_in_test 2 0 1.2, -#echo Verify that version 1.3.4 is in the range 1.2, -#w_wine_version_in_test 3 4 1.2, -#echo Verify that version 1.3 is not in the range ,1.2 -#w_wine_version_not_in_test 3 0 ,1.2 -#echo Verify that version 1.6-rc1 is in the range 1.2, -#w_wine_version_in_test 6 0 1.2, -#echo test passed - # Usage: workaround_wine_bug bugnumber [message] [good-wine-version-range ...] # Returns true and outputs given msg if the workaround needs to be applied. # For debugging: if you want to skip a bug's workaround, put the bug number in @@ -2799,6 +2882,7 @@ winetricks_dl_url_to_stdout() winetricks_dl_warning() { case $LANG in ru*) _W_countrymsg="Скрипт определил, что ваш IP адрес принадлежит России. Если во время загрузки файлов вы увидите ошибки несоответствия сертификата, перезапустите скрипт с опцией '--torify' или скачайте файлы вручную, например, используя VPN." ;; + pl*) _W_countrymsg="Wykryto, że twój adres IP należy do Rosji. W wypadku problemów z pobieraniem, uruchom z parametrem '--torify' lub pobierz plik manualnie, np. z użyciem VPN." ;; *) _W_countrymsg="Your IP address has been determined to belong to Russia. If you encounter a certificate error while downloading, please relaunch with the '--torify' option, or download files manually, for instance using VPN." ;; esac @@ -2872,12 +2956,15 @@ winetricks_latest_version_check() if [ "$WINETRICKS_LATEST_VERSION_CHECK" = 'disabled' ] || [ -f "${WINETRICKS_CONFIG}/disable-latest-version-check" ] ; then w_info "winetricks latest version check update disabled" return + # Used by ./src/release.sh, not for end users. Silently disables update check, without using $WINETRICKS_SUPER_QUIET + elif [ "$WINETRICKS_LATEST_VERSION_CHECK" = 'development' ] ; then + return fi latest_version="$(winetricks_dl_url_to_stdout https://raw.githubusercontent.com/Winetricks/winetricks/master/files/LATEST)" # Check that $latest_version is an actual number in case github is down - if ! echo "${latest_version}" | grep -E "[0-9]{8}" || [ -z "${latest_version}" ] ; then + if ! echo "${latest_version}" | grep -q -E "[0-9]{8}" || [ -z "${latest_version}" ] ; then w_warn "Github down? version '${latest_version}' doesn't appear to be a valid version" fi @@ -3042,6 +3129,18 @@ winetricks_prefixmenu() _W_msg_showbroken1="Defekte Programme anzeigen (z.B. solche mit DRM Problemen)" _W_msg_help="Hilfe anzeigen" ;; + pl*) _W_msg_title="Winetricks - wybierz prefiks Wine" + _W_msg_body='Co chcesz zrobić?' + _W_msg_apps='Zainstalować aplikację' + _W_msg_games='Zainstalować grę' + _W_msg_benchmarks='Zainstalować program sprawdzający wydajność komputera' + _W_msg_default="Wybrać domyślny prefiks Wine" + _W_msg_unattended0="Wyłącz cichą instalację" + _W_msg_unattended1="Włącz cichą instalację" + _W_msg_showbroken0="Ukrywaj uszkodzone aplikacje (np. z problemami z DRM)" + _W_msg_showbroken1="Pokazuj uszkodzone aplikacje (np. z problemami z DRM)" + _W_msg_help="Wyświetl pomoc" + ;; *) _W_msg_title="Winetricks - choose a wineprefix" _W_msg_body='What do you want to do?' _W_msg_apps='Install an application' @@ -3101,6 +3200,7 @@ winetricks_prefixmenu() zh_CN*) printf %s " FALSE prefix='$p' '选择管理 $_W_msg_name' " ;; zh_TW*|zh_HK*) printf %s " FALSE prefix='$p' '選擇管理 $_W_msg_name' " ;; de*) printf %s " FALSE prefix='$p' '$_W_msg_name auswählen' " ;; + pl*) printf %s " FALSE prefix='$p' 'Wybierz $_W_msg_name' " ;; *) printf %s " FALSE prefix='$p' 'Select $_W_msg_name' " ;; esac done >> "$WINETRICKS_WORKDIR"/zenity.sh @@ -3176,17 +3276,17 @@ winetricks_mainmenu() _W_msg_annihilate="ALLE DATEIEN UND PROGRAMME IN DIESEM WINEPREFIX Löschen" ;; pl*) _W_msg_title="Winetricks - obecny prefiks to \"$WINEPREFIX\"" - _W_msg_body='What would you like to do to this wineprefix?' - _W_msg_dlls="Zainstaluj Windowsową bibliotekę DLL lub komponent" - _W_msg_fonts='Zainstaluj czcionkę' - _W_msg_settings='Zmień ustawienia' - _W_msg_winecfg='Uruchom winecfg' - _W_msg_regedit='Uruchom regedit' - _W_msg_taskmgr='Uruchom taskmgr' - _W_msg_uninstaller='Run uninstaller' - _W_msg_shell='Uruchom powłokę wiersza poleceń (dla debugowania)' - _W_msg_folder='Przeglądaj pliki' - _W_msg_annihilate="Usuń WSZYSTKIE DANE I APLIKACJE WEWNĄTRZ TEGO WINEPREFIXA" + _W_msg_body='Co chcesz zrobić w tym prefiksie?' + _W_msg_dlls="Zainstalować windowsową bibliotekę DLL lub komponent" + _W_msg_fonts='Zainstalować czcionkę' + _W_msg_settings='Zmienić ustawienia' + _W_msg_winecfg='Uruchomić winecfg' + _W_msg_regedit='Uruchomić edytor rejestru' + _W_msg_taskmgr='Uruchomić menedżer zadań' + _W_msg_uninstaller='Uruchomić program odinstalowujący' + _W_msg_shell='Uruchomić powłokę wiersza poleceń (dla debugowania)' + _W_msg_folder='Przeglądać pliki' + _W_msg_annihilate="Usuńąć WSZYSTKIE DANE I APLIKACJE WEWNĄTRZ TEGO PREFIKSU WINE" ;; ru*) _W_msg_title="Winetricks - текущий путь для wine (wineprefix) \"$WINEPREFIX\"" _W_msg_body='Что вы хотите сделать с этим wineprefix?' @@ -3318,7 +3418,7 @@ winetricks_settings_menu() _W_msg_body='Welche Einstellungen möchten Sie ändern?' ;; pl*) _W_msg_title="Winetricks - obecny prefiks to \"$WINEPREFIX\"" - _W_msg_body='Which settings would you like to change?' + _W_msg_body='Jakie ustawienia chcesz zmienić?' ;; ru*) _W_msg_title="Winetricks - текущий путь wine (wineprefix) \"$WINEPREFIX\"" _W_msg_body='Какие настройки вы хотите изменить?' @@ -3559,7 +3659,7 @@ winetricks_showmenu() --list \ --checklist \ --column '' \ - --column Paczka \ + --column Pakiet \ --column Nazwa \ --column Wydawca \ --column Rok \ @@ -4143,7 +4243,7 @@ winetricks_cache_iso() case $LANG in da*) w_warn "Forkert disk [$_W_volname] indsat. Indsæt venligst disken [$_W_expected_volname]" ;; de*) w_warn "Falsche Disk [$_W_volname] eingelegt. Bitte legen Sie Disk [$_W_expected_volname] ein!" ;; - pl*) w_warn "Włożono zły dysk [$_W_volname]. Proszę włożyć dysk [$_W_expected_volname]" ;; + pl*) w_warn "Umieszczono zły dysk [$_W_volname]. Proszę włożyć dysk [$_W_expected_volname]" ;; ru*) w_warn "Неверный диск [$_W_volname]. Пожалуйста, вставьте диск [$_W_expected_volname]" ;; uk*) w_warn "Неправильний диск [$_W_volname]. Будь ласка, вставте диск [$_W_expected_volname]" ;; zh_CN*) w_warn " [$_W_volname] 光盘插入错误，请插入光盘 [$_W_expected_volname]" ;; @@ -4525,15 +4625,17 @@ winetricks_set_wineprefix() esac W_COMMONFILES_X86_WIN="$(w_expand_env CommonProgramFiles)" + W_COMMONFILES_WIN="$(w_expand_env CommonProgramW6432)" # CommonProgramW6432 is only defined on win64, not win32 arches - W_COMMONFILES_WIN="$(w_expand_env CommonProgramW6432)" - W_COMMONFILES_WIN="${W_COMMONFILES_WIN:-$W_COMMONFILES_X86_WIN}" + # win32: %CommonProgramW6432% + # win64: 'C:\Program Files\Common Files' + if [ -z "$W_COMMONFILES_WIN" ] || [ "$W_COMMONFILES_WIN" = "%CommonProgramW6432%" ] ; then + W_COMMONFILES_WIN="$W_COMMONFILES_X86_WIN" + fi - W_WINDIR_UNIX="$W_DRIVE_C/windows" - - # FIXME: move that tr into w_pathconv, if it's still needed? W_PROGRAMS_UNIX="$(w_pathconv -u "$W_PROGRAMS_WIN")" + W_WINDIR_UNIX="$W_DRIVE_C/windows" # 64-bit Windows has a second directory for program files W_PROGRAMS_X86_WIN="${W_PROGRAMS_WIN} (x86)" @@ -4590,6 +4692,7 @@ winetricks_annihilate_wineprefix() case $LANG in uk*) w_askpermission "Бажаєте видалити '$WINEPREFIX'?" ;; + pl*) w_askpermission "Czy na pewno chcesz usunąć prefiks $WINEPREFIX i wszystkie jego elementy?" ;; *) w_askpermission "Delete $WINEPREFIX, its apps, icons, and menu items?" ;; esac rm -rf "$WINEPREFIX" @@ -4772,24 +4875,17 @@ winetricks_init() W_ISO_MOUNT_ROOT=/mnt/winetricks W_ISO_MOUNT_LETTER=i - WINETRICKS_WINE_VERSION=$(winetricks_early_wine --version | sed 's/.*wine/wine/') + WINETRICKS_WINE_VERSION=${WINETRICKS_WINE_VERSION:-$(winetricks_early_wine --version | sed 's/.*wine/wine/')} WINETRICKS_ORIG_WINE_VERSION="${WINETRICKS_WINE_VERSION}" - # See also w_wine_version() - # A small hack... - case "$WINETRICKS_WINE_VERSION" in - wine-1.4-*) WINETRICKS_WINE_VERSION="wine-1.4.40"; export WINETRICKS_WINE_VERSION;; - wine-1.4) WINETRICKS_WINE_VERSION="wine-1.4.0"; export WINETRICKS_WINE_VERSION;; - wine-1.6-*) WINETRICKS_WINE_VERSION="wine-1.6.0"; export WINETRICKS_WINE_VERSION;; - wine-1.6) WINETRICKS_WINE_VERSION="wine-1.6.0"; export WINETRICKS_WINE_VERSION;; - wine-1.8-*) WINETRICKS_WINE_VERSION="wine-1.8.0"; export WINETRICKS_WINE_VERSION;; - wine-1.8) WINETRICKS_WINE_VERSION="wine-1.8.0"; export WINETRICKS_WINE_VERSION;; - wine-2.0-*) WINETRICKS_WINE_VERSION="wine-1.10.0"; export WINETRICKS_WINE_VERSION;; - wine-2.0) WINETRICKS_WINE_VERSION="wine-1.10.0"; export WINETRICKS_WINE_VERSION;; - wine-3.0-*) WINETRICKS_WINE_VERSION="wine-1.11.0"; export WINETRICKS_WINE_VERSION;; - wine-3.0) WINETRICKS_WINE_VERSION="wine-1.11.0"; export WINETRICKS_WINE_VERSION;; - esac - WINETRICKS_WINE_MINOR=$(echo $WINETRICKS_WINE_VERSION | sed 's/wine-1\.\([0-9]*\)\..*/\1/') - WINETRICKS_WINE_MICRO=$(echo $WINETRICKS_WINE_VERSION | sed 's/wine-1.[0-9][0-9]*\.\([0-9]*\).*/\1/') + + # Need to account for lots of variations: + # wine-1.9.22 + # wine-1.9.22 (Debian 1.9.22-1) + # wine-1.9.22 (Staging) + # wine-2.0 (Debian 2.0-1) + # wine-2.0-rc1 + # wine-2.8 + _wine_version_stripped="$(echo "$WINETRICKS_WINE_VERSION" | cut -d ' ' -f1 | sed -e 's/wine-//' -e 's/-rc.*//')" if [ ! "$WINETRICKS_SUPER_QUIET" ] ; then echo "Using winetricks $(winetricks_print_version) with ${WINETRICKS_ORIG_WINE_VERSION} and WINEARCH=${W_ARCH}" @@ -5002,22 +5098,25 @@ helper_directx_Jun2010() DIRECTX_NAME=directx_Jun2010_redist.exe } -# Filelist at ./misc/filelists/directx-feb2010.txt +# Filelist at ./misc/filelists/directx-jun2010.txt helper_d3dx9_xx() { dllname=d3dx9_$1 - helper_directx_dl + helper_directx_Jun2010 # Even kinder, less invasive directx - only extract and override d3dx9_xx.dll w_try_cabextract -d "$W_TMP" -L -F "*$dllname*x86*" "$W_CACHE"/directx9/$DIRECTX_NAME + for x in "$W_TMP"/*.cab do w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F "$dllname.dll" "$x" done + if test "$W_ARCH" = "win64" then w_try_cabextract -d "$W_TMP" -L -F "*$dllname*x64*" "$W_CACHE"/directx9/$DIRECTX_NAME + for x in "$W_TMP"/*x64.cab do w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F "$dllname.dll" "$x" @@ -5027,13 +5126,28 @@ helper_d3dx9_xx() w_override_dlls native "$dllname" } +# Filelist at ./misc/filelists/vb6sp6.txt +helper_vb6sp6() +{ + # $1 - directory to extract to + # $2 .. $n - files to extract from the archive + + destdir="$1" + shift + + w_download_to vb6sp6 https://download.microsoft.com/download/5/6/3/5635D6A9-885E-4C80-A2E7-8A7F4488FBF1/VB60SP6-KB2708437-x86-ENU.msi 350602b2e084b39c97d1394c8594b18e41ef622315d4a9635c5e8ea6aa977b5e + w_try_7z "$destdir" "$W_CACHE"/vb6sp6/VB60SP6-KB2708437-x86-ENU.msi "$@" +} + # Filelist at ./misc/filelists/win2ksp4.txt helper_win2ksp4() { filename=$1 - # https://www.microsoft.com/en-us/download/details.aspx?id=4127 - w_download_to win2ksp4 https://download.microsoft.com/download/E/6/A/E6A04295-D2A8-40D0-A0C5-241BFECD095E/W2KSP4_EN.EXE 167bb78d4adc957cc39fb4902517e1f32b1e62092353be5f8fb9ee647642de7e + # Originally at https://www.microsoft.com/en-us/download/details.aspx?id=4127 + # Mirror list at http://www.filewatcher.com/m/w2ksp4_en.exe.135477136-0.html + # The rename from w2ksp4_en.exe to W2KSP4_EN.EXE avoids users having to redownload for a file rename + w_download_to win2ksp4 ftp://ftp.twaren.net/pub/cpatch/msupdate/win2000/en/w2ksp4_en.exe 167bb78d4adc957cc39fb4902517e1f32b1e62092353be5f8fb9ee647642de7e W2KSP4_EN.EXE w_try_cabextract -d "$W_TMP" -L -F "$filename" "$W_CACHE"/win2ksp4/W2KSP4_EN.EXE } @@ -5049,8 +5163,11 @@ helper_winxpsp3() w_try mv "$W_CACHE/xpsp3" "$W_CACHE/winxpsp3" fi + # Formerly at: # https://www.microsoft.com/en-us/download/details.aspx?id=24 - w_download_to winxpsp3 https://download.microsoft.com/download/d/3/0/d30e32d8-418a-469d-b600-f32ce3edf42d/WindowsXP-KB936929-SP3-x86-ENU.exe 62e524a552db9f6fd22d469010ea4d7e28ee06fa615a1c34362129f808916654 + # https://download.microsoft.com/download/d/3/0/d30e32d8-418a-469d-b600-f32ce3edf42d/WindowsXP-KB936929-SP3-x86-ENU.exe + # Mirror list: http://www.filewatcher.com/m/WindowsXP-KB936929-SP3-x86-ENU.exe.331805736-0.html + w_download_to winxpsp3 ftp://ftp.gnome.org/mirror/archive/ftp.sunet.se/pub/security/vendor/microsoft/winxp/Service_Packs/WindowsXP-KB936929-SP3-x86-ENU.exe 62e524a552db9f6fd22d469010ea4d7e28ee06fa615a1c34362129f808916654 w_try_cabextract -d "$W_TMP" -L -F "$filename" "$W_CACHE"/winxpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe } @@ -5101,21 +5218,23 @@ load_adobeair() w_metadata amstream dlls \ title="MS amstream.dll" \ publisher="Microsoft" \ - year="2010" \ + year="2011" \ media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ + file1="../win7sp1/windows6.1-KB976932-X86.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/amstream.dll" load_amstream() { - helper_directx_dl - mkdir "$W_CACHE"/amstream # kludge so test -f $file1 works + helper_win7sp1 x86_microsoft-windows-directshow-other_31bf3856ad364e35_6.1.7601.17514_none_0f58f1e53efca91e/amstream.dll + w_try cp "$W_TMP/x86_microsoft-windows-directshow-other_31bf3856ad364e35_6.1.7601.17514_none_0f58f1e53efca91e/amstream.dll" "$W_SYSTEM32_DLLS/amstream.dll" - w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME - w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'amstream.dll' "$W_TMP/dxnt.cab" - w_try_regsvr amstream.dll + if [ "$W_ARCH" = "win64" ] + then + helper_win7sp1_x64 amd64_microsoft-windows-directshow-other_31bf3856ad364e35_6.1.7601.17514_none_6b778d68f75a1a54/amstream.dll + w_try cp "$W_TMP/amd64_microsoft-windows-directshow-other_31bf3856ad364e35_6.1.7601.17514_none_6b778d68f75a1a54/amstream.dll" "$W_SYSTEM64_DLLS/amstream.dll" + fi - w_override_dlls native amstream + w_override_dlls native,builtin amstream } #---------------------------------------------------------------- @@ -5177,15 +5296,18 @@ w_metadata cabinet dlls \ publisher="Microsoft" \ year="2002" \ media="download" \ - file1="mdac_typ.exe" \ + file1="MDAC_TYP.EXE" \ installed_file1="$W_SYSTEM32_DLLS_WIN/cabinet.dll" load_cabinet() { # https://www.microsoft.com/downloads/en/details.aspx?FamilyId=9AD000F2-CAE7-493D-B0F3-AE36C570ADE8&displaylang=en - w_download https://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe 36d2a3099e6286ae3fab181a502a95fbd825fa5ddb30bf09b345abc7f1f620b4 - w_try_cabextract --directory="$W_TMP" "$W_CACHE/cabinet/$file1" - w_try cp "$W_TMP"/cabinet.dll "$W_SYSTEM32_DLLS"/cabinet.dll + # Originally at: https://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe + # Mirror list: http://www.filewatcher.com/m/MDAC_TYP.EXE.5389224-0.html (5.14 MB MDAC_TYP.EXE) + w_download ftp://ftp.gunadarma.ac.id/pub/driver/itegno/USB%20Software/MDAC/MDAC_TYP.EXE 36d2a3099e6286ae3fab181a502a95fbd825fa5ddb30bf09b345abc7f1f620b4 + + w_try_cabextract --directory="${W_TMP}" "${W_CACHE}/${W_PACKAGE}/${file1}" + w_try cp "${W_TMP}/cabinet.dll" "${W_SYSTEM32_DLLS}/cabinet.dll" w_override_dlls native,builtin cabinet } @@ -5202,7 +5324,9 @@ w_metadata cmd dlls \ load_cmd() { - w_download https://download.microsoft.com/download/8/d/c/8dc79965-dfbc-4b25-9546-e23bc4b791c6/Q811493_W2K_SP4_X86_EN.exe b5574b3516a724c2cba0d864162a3d1d684db1cf30de8db4b0e0ea6a1f6f1480 + # Originally at: https://download.microsoft.com/download/8/d/c/8dc79965-dfbc-4b25-9546-e23bc4b791c6/Q811493_W2K_SP4_X86_EN.exe + # Mirror list: http://www.filewatcher.com/_/?q=Q811493_W2K_SP4_X86_EN.exe + w_download ftp://ftp.fu-berlin.de/pc/security/ms-patches/win2000/Security_Bulletins/Q811493_W2K_SP4_X86_EN.exe b5574b3516a724c2cba0d864162a3d1d684db1cf30de8db4b0e0ea6a1f6f1480 w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_CACHE/$W_PACKAGE/$file1" -F cmd.exe w_override_dlls native,builtin cmd.exe @@ -5246,27 +5370,17 @@ load_comctl32() w_metadata comctl32ocx dlls \ title="MS comctl32.ocx and mscomctl.ocx, comctl32 wrappers for VB6" \ publisher="Microsoft" \ - year="2009" \ + year="2012" \ media="download" \ - file1="VisualBasic6-KB896559-v1-ENU.exe" \ - file2="mscomct2.cab" \ + file1="../vb6sp6/VB60SP6-KB2708437-x86-ENU.msi" \ installed_file1="$W_SYSTEM32_DLLS_WIN/mscomctl.ocx" load_comctl32ocx() { - # https://www.microsoft.com/en-us/download/details.aspx?id=10019 - w_download https://download.microsoft.com/download/3/a/5/3a5925ac-e779-4b1c-bb01-af67dc2f96fc/VisualBasic6-KB896559-v1-ENU.exe c4d43fe4aea782d7d6c08c038778fe3635c7bae1b93fb1a7740c6644aabf567e - # More ActiveX controls. See https://support.microsoft.com/kb/297381 - w_download http://activex.microsoft.com/controls/vb6/mscomct2.cab a2efa44a8caff106c8101bd62eff8ed61732182afb8bc57e0ae563135acd2e13 + helper_vb6sp6 "$W_SYSTEM32_DLLS" comctl32.ocx mscomctl.ocx mscomct2.ocx - w_try_cabextract --directory="$W_TMP" "$W_CACHE"/comctl32ocx/VisualBasic6-KB896559-v1-ENU.exe - w_try cp "$W_TMP"/mscomctl.ocx "$W_SYSTEM32_DLLS"/mscomctl.ocx - w_try cp "$W_TMP"/comctl32.ocx "$W_SYSTEM32_DLLS"/comctl32.ocx w_try_regsvr comctl32.ocx w_try_regsvr mscomctl.ocx - - w_try_cabextract --directory="$W_TMP" "$W_CACHE"/comctl32ocx/mscomct2.cab - w_try cp "$W_TMP"/mscomct2.ocx "$W_SYSTEM32_DLLS"/mscomct2.ocx w_try_regsvr mscomct2.ocx } @@ -5275,17 +5389,15 @@ load_comctl32ocx() w_metadata comdlg32ocx dlls \ title="Common Dialog ActiveX Control for VB6" \ publisher="Microsoft" \ - year="2009" \ + year="2012" \ media="download" \ - file1="ComDlg32.cab" \ + file1="../vb6sp6/VB60SP6-KB2708437-x86-ENU.msi" \ installed_file1="$W_SYSTEM32_DLLS_WIN/comdlg32.ocx" load_comdlg32ocx() { - # By analogy with vb5 version in https://support.microsoft.com/kb/168917 - w_download http://activex.microsoft.com/controls/vb6/ComDlg32.cab 6a445b34a1a6a0ab302beb1663377d86203594ee83e4e4ee0b5d72aaf47cad97 - w_try_cabextract --directory="$W_TMP" "$W_CACHE/comdlg32ocx/${file1}" - w_try cp "$W_TMP"/comdlg32.ocx "$W_SYSTEM32_DLLS"/comdlg32.ocx + helper_vb6sp6 "$W_TMP" ComDlg32.ocx + w_try mv "$W_TMP/ComDlg32.ocx" "$W_SYSTEM32_DLLS/comdlg32.ocx" w_try_regsvr comdlg32.ocx } @@ -5426,12 +5538,42 @@ load_d3dx9() #---------------------------------------------------------------- +w_metadata d3dx9_24 dlls \ + title="MS d3dx9_24.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_24.dll" + +load_d3dx9_24() +{ + helper_d3dx9_xx 24 +} + +#---------------------------------------------------------------- + +w_metadata d3dx9_25 dlls \ + title="MS d3dx9_25.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_Jun2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_25.dll" + +load_d3dx9_25() +{ + helper_d3dx9_xx 25 +} + +#---------------------------------------------------------------- + w_metadata d3dx9_26 dlls \ title="MS d3dx9_26.dll" \ publisher="Microsoft" \ year="2010" \ media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ + file1="../directx9/directx_Jun2010_redist.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_26.dll" load_d3dx9_26() @@ -5441,12 +5583,27 @@ load_d3dx9_26() #---------------------------------------------------------------- +w_metadata d3dx9_27 dlls \ + title="MS d3dx9_27.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_Jun2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_27.dll" + +load_d3dx9_27() +{ + helper_d3dx9_xx 27 +} + +#---------------------------------------------------------------- + w_metadata d3dx9_28 dlls \ title="MS d3dx9_28.dll" \ publisher="Microsoft" \ year="2010" \ media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ + file1="../directx9/directx_Jun2010_redist.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_28.dll" load_d3dx9_28() @@ -5456,12 +5613,42 @@ load_d3dx9_28() #---------------------------------------------------------------- +w_metadata d3dx9_29 dlls \ + title="MS d3dx9_29.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_Jun2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_29.dll" + +load_d3dx9_29() +{ + helper_d3dx9_xx 29 +} + +#---------------------------------------------------------------- + +w_metadata d3dx9_30 dlls \ + title="MS d3dx9_30.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_Jun2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_30.dll" + +load_d3dx9_30() +{ + helper_d3dx9_xx 30 +} + +#---------------------------------------------------------------- + w_metadata d3dx9_31 dlls \ title="MS d3dx9_31.dll" \ publisher="Microsoft" \ year="2010" \ media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ + file1="../directx9/directx_Jun2010_redist.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_31.dll" load_d3dx9_31() @@ -5471,12 +5658,57 @@ load_d3dx9_31() #---------------------------------------------------------------- +w_metadata d3dx9_32 dlls \ + title="MS d3dx9_32.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_Jun2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_32.dll" + +load_d3dx9_32() +{ + helper_d3dx9_xx 32 +} + +#---------------------------------------------------------------- + +w_metadata d3dx9_33 dlls \ + title="MS d3dx9_33.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_Jun2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_33.dll" + +load_d3dx9_33() +{ + helper_d3dx9_xx 33 +} + +#---------------------------------------------------------------- + +w_metadata d3dx9_34 dlls \ + title="MS d3dx9_34.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_Jun2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_34.dll" + +load_d3dx9_34() +{ + helper_d3dx9_xx 34 +} + +#---------------------------------------------------------------- + w_metadata d3dx9_35 dlls \ title="MS d3dx9_35.dll" \ publisher="Microsoft" \ year="2010" \ media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ + file1="../directx9/directx_Jun2010_redist.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_35.dll" load_d3dx9_35() @@ -5491,7 +5723,7 @@ w_metadata d3dx9_36 dlls \ publisher="Microsoft" \ year="2010" \ media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ + file1="../directx9/directx_Jun2010_redist.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_36.dll" load_d3dx9_36() @@ -5501,12 +5733,42 @@ load_d3dx9_36() #---------------------------------------------------------------- +w_metadata d3dx9_37 dlls \ + title="MS d3dx9_37.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_Jun2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_37.dll" + +load_d3dx9_37() +{ + helper_d3dx9_xx 37 +} + +#---------------------------------------------------------------- + +w_metadata d3dx9_38 dlls \ + title="MS d3dx9_38.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_Jun2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_38.dll" + +load_d3dx9_38() +{ + helper_d3dx9_xx 38 +} + +#---------------------------------------------------------------- + w_metadata d3dx9_39 dlls \ title="MS d3dx9_39.dll" \ publisher="Microsoft" \ year="2010" \ media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ + file1="../directx9/directx_Jun2010_redist.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_39.dll" load_d3dx9_39() @@ -5516,12 +5778,42 @@ load_d3dx9_39() #---------------------------------------------------------------- +w_metadata d3dx9_40 dlls \ + title="MS d3dx9_40.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_Jun2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_40.dll" + +load_d3dx9_40() +{ + helper_d3dx9_xx 40 +} + +#---------------------------------------------------------------- + +w_metadata d3dx9_41 dlls \ + title="MS d3dx9_41.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_Jun2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_41.dll" + +load_d3dx9_41() +{ + helper_d3dx9_xx 41 +} + +#---------------------------------------------------------------- + w_metadata d3dx9_42 dlls \ title="MS d3dx9_42.dll" \ publisher="Microsoft" \ year="2010" \ media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ + file1="../directx9/directx_Jun2010_redist.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_42.dll" load_d3dx9_42() @@ -5541,25 +5833,7 @@ w_metadata d3dx9_43 dlls \ load_d3dx9_43() { - dllname=d3dx9_43 - - helper_directx_Jun2010 - - w_try_cabextract -d "$W_TMP" -L -F "*$dllname*x86*" "$W_CACHE"/directx9/$DIRECTX_NAME - for x in "$W_TMP"/*.cab - do - w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F "$dllname.dll" "$x" - done - if test "$W_ARCH" = "win64" - then - w_try_cabextract -d "$W_TMP" -L -F "*$dllname*x64*" "$W_CACHE"/directx9/$DIRECTX_NAME - for x in "$W_TMP"/*x64.cab - do - w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F "$dllname.dll" "$x" - done - fi - - w_override_dlls native $dllname + helper_d3dx9_xx 43 } #---------------------------------------------------------------- @@ -5896,6 +6170,7 @@ load_directx9() # list down as soon as we can. # Setting Windows version to win2k apparently crashes the installer on OS X. + # FIXME: seems this didn't get migrated to Github? # See https://code.google.com/p/winezeug/issues/detail?id=71 w_set_winver winxp @@ -6409,8 +6684,11 @@ load_dotnet30() { w_package_unsupported_win64 - # https://msdn.microsoft.com/en-us/netframework/bb264589.aspx - w_download https://download.microsoft.com/download/3/F/0/3F0A922C-F239-4B9B-9CB0-DF53621C57D9/dotnetfx3.exe 6cf8921e00f52bbd888aa7a520a7bac47e818e2a850bcc44494c64d6cbfafdac + # Originally at https://msdn.microsoft.com/en-us/netframework/bb264589.aspx + # No longer on microsoft.com, and archive.org is unreliablel. Choose amongst the oldest/most reliable looking from + # http://www.filewatcher.com/m/dotnetfx3.exe.52770576-0.html + # (and verify sha256sum, of course ;)) + w_download ftp://ftp.softlab-nsk.com/pub/ForwardTxSoftware/DotNetFX123/DotNet_v3/dotnetfx3.exe 6cf8921e00f52bbd888aa7a520a7bac47e818e2a850bcc44494c64d6cbfafdac w_call remove_mono @@ -6643,7 +6921,7 @@ w_metadata dotnet40 dlls \ load_dotnet40() { - w_package_unsupported_win64 + w_package_warn_win64 case "$W_PLATFORM" in windows_cmd) ;; @@ -6689,10 +6967,7 @@ w_metadata dotnet45 dlls \ load_dotnet45() { - if [ $W_ARCH = win64 ] - then - w_warn "This package may not work on a 64-bit installation" - fi + w_package_warn_win64 # The installer will fail later in dotnet35 if cabextract isn't installed, so check/fail now: w_try_cabextract -v >/dev/null @@ -6703,7 +6978,9 @@ load_dotnet45() w_call remove_mono # See https://appdb.winehq.org/objectManager.php?sClass=version&iId=25478 for Focht's recipe - w_call dotnet35 + + # Seems unneeded in wine-2.0 + # w_call dotnet35 w_call dotnet40 w_set_winver win7 @@ -6743,10 +7020,7 @@ w_metadata dotnet452 dlls \ load_dotnet452() { - if [ $W_ARCH = win64 ] - then - w_warn "This package may not work on a 64-bit installation" - fi + w_package_warn_win64 # The installer will fail later in dotnet35 if cabextract isn't installed, so check/fail now: w_try_cabextract -v >/dev/null @@ -6757,7 +7031,9 @@ load_dotnet452() w_call remove_mono # See https://appdb.winehq.org/objectManager.php?sClass=version&iId=25478 for Focht's recipe - w_call dotnet35 + + # Seems unneeded in wine-2.0 + # w_call dotnet35 w_call dotnet40 w_set_winver win7 @@ -6797,10 +7073,7 @@ w_metadata dotnet46 dlls \ load_dotnet46() { - if [ $W_ARCH = win64 ] - then - w_warn "This package may not work on a 64-bit installation" - fi + w_package_warn_win64 # https://support.microsoft.com/kb/3045560 w_download https://download.microsoft.com/download/C/3/A/C3A5200B-D33C-47E9-9D70-2F7C65DAAD94/NDP46-KB3045557-x86-x64-AllOS-ENU.exe b21d33135e67e3486b154b11f7961d8e1cfd7a603267fb60febb4a6feab5cf87 @@ -6850,10 +7123,7 @@ w_metadata dotnet461 dlls \ load_dotnet461() { - if [ $W_ARCH = win64 ] - then - w_warn "This package may not work on a 64-bit installation" - fi + w_package_warn_win64 # https://www.microsoft.com/en-us/download/details.aspx?id=49982 w_download https://download.microsoft.com/download/E/4/1/E4173890-A24A-4936-9FC9-AF930FE3FA40/NDP461-KB3102436-x86-x64-AllOS-ENU.exe beaa901e07347d056efe04e8961d5546c7518fab9246892178505a7ba631c301 @@ -6892,20 +7162,18 @@ w_metadata dotnet462 dlls \ publisher="Microsoft" \ year="2016" \ media="download" \ - conflicts="dotnet20 dotnet20sdk dotnet20sp1 dotnet20sp2 dotnet35sp1 dotnet40 dotnet46 dotnet461 vjrun20" + conflicts="dotnet20 dotnet20sdk dotnet20sp1 dotnet20sp2 dotnet35sp1 dotnet40 dotnet46 dotnet461 vjrun20" \ + installed_file1="c:/windows/dotnet462.installed.workaround" load_dotnet462() { - if [ $W_ARCH = win64 ] - then - w_warn "This package may not work on a 64-bit installation" - fi + w_package_warn_win64 if w_workaround_wine_bug 42170 "Running un-official repacked .NET 4.6.2 setup until the official version is fixed." then # Un-official slim version. See http://repacks.net/forum/viewtopic.php?t=7 - w_download http://repacks.net/uploads/dotNetFx462_Full_x86_x64_Slim.exe 8f03c8a9b2f4666c3707abe2d70145f200cb2f0f3b792626e64d167d1ad0565f file_package="dotNetFx462_Full_x86_x64_Slim.exe" + w_download https://www.dropbox.com/s/1bdocgbate8hc8z/dotNetFx462_Full_x86_x64_Slim.exe?dl=1 8f03c8a9b2f4666c3707abe2d70145f200cb2f0f3b792626e64d167d1ad0565f $file_package unattended_args="/ai /gm2" else # Official version. See https://www.microsoft.com/en-us/download/details.aspx?id=53344 @@ -6933,6 +7201,10 @@ load_dotnet462() esac w_override_dlls native mscoree + + # Unfortunately, dotnet462 install the same files that dotnet461 does, but with different checksums + # The only unique files are temporary ones. As a workaround, touch a file instead so that we know it's been installed for list-installed + w_try touch "${W_WINDIR_UNIX}/dotnet462.installed.workaround" } verify_dotnet462() @@ -6954,8 +7226,9 @@ load_dotnet_verifier() { # https://blogs.msdn.microsoft.com/astebner/2008/10/13/net-framework-setup-verification-tool-users-guide/ # 2016/10/26: sha256sum 1daf4b1b27669b65f613e17814da3c8342d3bfa9520a65a880c58d6a2a6e32b5, adds .NET Framework 4.6.{1,2} support + # 2017/06/12: sha256sum , adds .NET Framework 4.7 support - w_download https://msdnshared.blob.core.windows.net/media/2016/10/netfx_setupverifier_new.zip 1daf4b1b27669b65f613e17814da3c8342d3bfa9520a65a880c58d6a2a6e32b5 "${file1}" + w_download https://msdnshared.blob.core.windows.net/media/2017/05/netfx_setupverifier_new.zip 22c596a13f0822871a01346d2f5736a3b230e1f6cb8ea429aba844d52adc568a w_try_cd "$W_CACHE/$W_PACKAGE" w_try_unzip "$W_SYSTEM32_DLLS" netfx_setupverifier_new.zip netfx_setupverifier.exe @@ -6968,18 +7241,23 @@ load_dotnet_verifier() w_metadata dxdiagn dlls \ title="DirectX Diagnostic Library" \ publisher="Microsoft" \ - year="2010" \ + year="2011" \ media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ + file1="../win7sp1/windows6.1-KB976932-X86.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/dxdiagn.dll" load_dxdiagn() { - helper_directx_dl + helper_win7sp1 x86_microsoft-windows-d..x-directxdiagnostic_31bf3856ad364e35_6.1.7601.17514_none_25cb021dbc0611db/dxdiagn.dll + w_try cp "$W_TMP/x86_microsoft-windows-d..x-directxdiagnostic_31bf3856ad364e35_6.1.7601.17514_none_25cb021dbc0611db/dxdiagn.dll" "$W_SYSTEM32_DLLS/dxdiagn.dll" - w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME - w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F dxdiagn.dll "$W_TMP/dxnt.cab" - w_override_dlls native dxdiagn + if [ "$W_ARCH" = "win64" ] + then + helper_win7sp1_x64 amd64_microsoft-windows-d..x-directxdiagnostic_31bf3856ad364e35_6.1.7601.17514_none_81e99da174638311/dxdiagn.dll + w_try cp "$W_TMP/amd64_microsoft-windows-d..x-directxdiagnostic_31bf3856ad364e35_6.1.7601.17514_none_81e99da174638311/dxdiagn.dll" "$W_SYSTEM64_DLLS/dxdiagn.dll" + fi + + w_override_dlls native,builtin dxdiagn } #---------------------------------------------------------------- @@ -7239,14 +7517,16 @@ w_metadata gmdls dlls \ load_gmdls() { - w_download_to directx8 https://download.microsoft.com/download/whistler/Update/8.1/W982KMeXP/EN-US/DX81Redist.exe 5ddc1a8e204381254dc5d65f406584787155983adf245a75000dcd0d2efb04c6 + # Originally at https://download.microsoft.com/download/whistler/Update/8.1/W982KMeXP/EN-US/DX81Redist.exe + # Mirror list: http://www.filewatcher.com/m/DX81Redist.exe.25746272-0.html + w_download_to directx8 ftp://140.164.21.241/dati_server_win/a_ERALAB/Data/Software/Remote_Sensing/NI-1428/NI-IMAQ/v.3.1.1/NIIMAQ311/DirectX%208.1/DX81Redist.exe 5ddc1a8e204381254dc5d65f406584787155983adf245a75000dcd0d2efb04c6 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 mv "$W_TMP"/gm16.dls "$W_SYSTEM32_DLLS"/drivers/gm.dls if test "$W_ARCH" = "win64" then - w_try w_try_cd "$W_SYSTEM64_DLLS"/drivers + w_try_cd "$W_SYSTEM64_DLLS"/drivers w_try ln -s ../../syswow64/drivers/gm.dls fi } @@ -7393,6 +7673,62 @@ load_icodecs() # https://support.britannica.com/other/touchthesky/win/issues/TSTUw_150.htm # https://appdb.winehq.org/objectManager.php?sClass=version&iId=7091 w_try_regsvr ir50_32.dll + + # Apparently some codecs are missing, see https://github.com/Winetricks/winetricks/issues/302 + # Download at https://www.moviecodec.com/download-codec-packs/indeo-codecs-legacy-package-31/ + w_download https://s3.amazonaws.com/moviecodec/files/iv5setup.exe 51bec25488b5b94eb3ce49b0a117618c9526161fd0753817a7a724ce25ff0cad + + w_ahk_do " + SetTitleMatchMode, 2 + run iv5setup.exe + winwait, InstallShield Wizard + if ( w_opt_unattended > 0 ) { + sleep 1000 + controlclick, Button2 ; Next + winwait, Welcome + controlclick, Button1 ; Next + winwait, Software License Agreement + sleep 1000 + controlclick, Button2 ; Yes + winwait, Choose Destination + sleep 1000 + controlclick, Button1 ; Next + winwait, Setup Type + sleep 1000 + controlclick, ListBox1 ; Next + sleep 1000 + Send C ; Custom + sleep 1000 + controlclick, Button2 ; Next + winwait, Select Components + controlclick, ISAVIEWCMPTCLASS1 ; Component Selection + Send {Home} + Send {Down} ; + Send {Down} ; IV5 Directshow plugin (gives error about missing Ivfsrc.ax) + Send {Space} ; Disable it (directshow plugin) + Send {End} ; Web browser (Netscape) plugin + sleep 1000 + Send {Space} ; Disable it (web plugin) + sleep 1000 + controlclick, Button3 ; Next + winwait, Question + sleep 1000 + controlclick, Button2 ; No + winwait, Start Copying Files + sleep 1000 + controlclick, Button1 ; No + } + winwait, Setup Complete + if ( w_opt_unattended > 0 ) { + sleep 1000 + controlclick, Button4 ; Finish + } + winwaitclose + ; Dangling explorer window + winwait, Wine Explorer + sleep 1000 + winclose, Wine Explorer + " } #---------------------------------------------------------------- @@ -7533,22 +7869,22 @@ w_metadata mdac27 dlls \ publisher="Microsoft" \ year="2006" \ media="download" \ - file1="mdac_typ.exe" \ + file1="MDAC_TYP.EXE" \ installed_file1="$W_COMMONFILES_X86_WIN/System/ADO/msado26.tlb" load_mdac27() { - if test $W_ARCH = win64 - then - w_die "Installer doesn't support 64-bit architecture." - fi + w_package_unsupported_win64 # https://www.microsoft.com/downloads/en/details.aspx?FamilyId=9AD000F2-CAE7-493D-B0F3-AE36C570ADE8&displaylang=en - w_download https://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe 36d2a3099e6286ae3fab181a502a95fbd825fa5ddb30bf09b345abc7f1f620b4 + # Originally at: https://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe + # Mirror list: http://www.filewatcher.com/m/MDAC_TYP.EXE.5389224-0.html (5.14 MB MDAC_TYP.EXE) + w_download ftp://ftp.gunadarma.ac.id/pub/driver/itegno/USB%20Software/MDAC/MDAC_TYP.EXE 36d2a3099e6286ae3fab181a502a95fbd825fa5ddb30bf09b345abc7f1f620b4 + load_native_mdac w_set_winver nt40 - w_try_cd "$W_CACHE"/"$W_PACKAGE" - w_try "$WINE" mdac_typ.exe ${W_OPT_UNATTENDED:+ /q /C:"setup $W_UNATTENDED_SLASH_QNT"} + w_try_cd "${W_CACHE}/${W_PACKAGE}" + w_try "$WINE" "${file1}" ${W_OPT_UNATTENDED:+ /q /C:"setup $W_UNATTENDED_SLASH_QNT"} w_unset_winver } @@ -7585,7 +7921,7 @@ w_metadata mdx dlls \ load_mdx() { - helper_directx_dl + helper_directx_Jun2010 w_try_cd "$W_TMP" @@ -7681,18 +8017,22 @@ load_mf() #---------------------------------------------------------------- w_metadata mfc40 dlls \ - title="MS mfc40 (Microsoft Foundation Classes from Visual C++ 4.0)" \ + title="MS mfc40 (Microsoft Foundation Classes from win7sp1)" \ publisher="Microsoft" \ year="1999" \ media="download" \ - file1="mfc40.cab" \ + file1="../win7sp1/windows6.1-KB976932-X86.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/mfc40.dll" load_mfc40() { - w_download http://activex.microsoft.com/controls/vc/mfc40.cab b15ffb8cbf99ddc63edf9bd5ee9d6c9dffdc851d7aec23670fb6d5af63d2287e - w_try_cabextract -d "$W_TMP" "$W_CACHE"/mfc40/mfc40.cab - w_try_cabextract -d "$W_SYSTEM32_DLLS" -F '*40.dll' "$W_TMP"/mfc40.exe + w_warn "mfc40 no longer installs msvcrt40.dll, only mfc40.dll/mfc40u.dll. Please file a bug if you have an application that needs native msvcrt40.dll." + + helper_win7sp1 x86_microsoft-windows-mfc40_31bf3856ad364e35_6.1.7601.17514_none_5c06580240091047/mfc40.dll + w_try cp "$W_TMP/x86_microsoft-windows-mfc40_31bf3856ad364e35_6.1.7601.17514_none_5c06580240091047/mfc40.dll" "$W_SYSTEM32_DLLS/mfc40.dll" + + helper_win7sp1 x86_microsoft-windows-mfc40u_31bf3856ad364e35_6.1.7601.17514_none_f51a7bf0b3d25294/mfc40u.dll + w_try cp "$W_TMP/x86_microsoft-windows-mfc40u_31bf3856ad364e35_6.1.7601.17514_none_f51a7bf0b3d25294/mfc40u.dll" "$W_SYSTEM32_DLLS/mfc40u.dll" } #---------------------------------------------------------------- @@ -7798,21 +8138,16 @@ load_msdxmocx() w_metadata msflxgrd dlls \ title="MS FlexGrid Control (msflxgrd.ocx)" \ publisher="Microsoft" \ - year="2009" \ + year="2012" \ media="download" \ - file1="MsFlxGrd.cab" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/MSFLXGRD.OCX" + file1="../vb6sp6/VB60SP6-KB2708437-x86-ENU.msi" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/msflxgrd.ocx" load_msflxgrd() { - # https://msdn.microsoft.com/en-us/library/aa240864(VS.60).aspx - # 2015/11/09: Removed from Microsoft.com, archive.org has an older copy: - # 2015/11/09: a0d374293ab9556a6eb7705efbca533ad8f20e6b9cb55f14f1ec5bb55552ec8d - w_download http://activex.microsoft.com/controls/vb6/MsFlxGrd.cab a0d374293ab9556a6eb7705efbca533ad8f20e6b9cb55f14f1ec5bb55552ec8d - - w_try_cabextract --directory="$W_TMP" "$W_CACHE/msflxgrd/${file1}" - w_try cp -f "$W_TMP"/[Mm][Ss][Ff][Ll][Xx][Gg][Rr][Dd].[Oo][Cc][Xx] "$W_SYSTEM32_DLLS" - w_try_regsvr MSFLXGRD.OCX + helper_vb6sp6 "$W_TMP" MSFlxGrd.ocx + w_try mv "${W_TMP}/MSFlxGrd.ocx" "$W_SYSTEM32_DLLS/msflxgrd.ocx" + w_try_regsvr msflxgrd.ocx } #---------------------------------------------------------------- @@ -7820,21 +8155,16 @@ load_msflxgrd() w_metadata mshflxgd dlls \ title="MS Hierarchical FlexGrid Control (mshflxgd.ocx)" \ publisher="Microsoft" \ - year="2009" \ + year="2012" \ media="download" \ - file1="MSHFLXGD.CAB" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/MSHFLXGD.OCX" + file1="../vb6sp6/VB60SP6-KB2708437-x86-ENU.msi" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/mshflxgd.ocx" load_mshflxgd() { - # https://msdn.microsoft.com/en-us/library/aa240864(VS.60).aspx - # 2015/11/09: Removed from Microsoft.com, archive.org has the original copy: ccff83fd24a0e6d7611050c8cafcb1aede608b6a3d096fb7476ce302e569479a - - w_download http://activex.microsoft.com/controls/vb6/MSHFLXGD.CAB ccff83fd24a0e6d7611050c8cafcb1aede608b6a3d096fb7476ce302e569479a - - w_try_cabextract --directory="$W_TMP" "$W_CACHE"/mshflxgd/MSHFLXGD.CAB - w_try cp -f "$W_TMP"/[Mm][Ss][Hh][Ff][Ll][Xx][Gg][Dd].[Oo][Cc][Xx] "$W_SYSTEM32_DLLS" - w_try_regsvr MSHFLXGD.OCX + helper_vb6sp6 "$W_TMP" MShflxgd.ocx + w_try mv "${W_TMP}/MShflxgd.ocx" "$W_SYSTEM32_DLLS/mshflxgd.ocx" + w_try_regsvr mshflxgd.ocx } #---------------------------------------------------------------- @@ -7862,19 +8192,16 @@ w_metadata msscript dlls \ publisher="Microsoft" \ year="2004" \ media="download" \ - file1="sct10en.exe" \ + file1="../winxpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/msscript.ocx" load_msscript() { - # https://msdn.microsoft.com/scripting/scriptcontrol/x86/sct10en.exe - # https://www.microsoft.com/en-us/download/details.aspx?id=1949 - w_download https://download.microsoft.com/download/d/2/a/d2a7430c-6d5b-48e9-96c4-3c751be7bffe/sct10en.exe 9b6730c3070f252f5051e0cf6b99523b66730599d795a607efd40b7fb0e11efb - - w_try_cabextract --directory="$W_TMP" "$W_CACHE"/msscript/sct10en.exe - w_try cp -f "$W_TMP"/msscript.ocx "$W_SYSTEM32_DLLS" - w_try_regsvr msscript.ocx + helper_winxpsp3 i386/msscript.oc_ + w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/msscript.oc_ + w_override_dlls native,builtin i386/msscript.ocx } + #---------------------------------------------------------------- w_metadata msls31 dlls \ @@ -7888,7 +8215,10 @@ w_metadata msls31 dlls \ load_msls31() { # Needed by native RichEdit and Internet Explorer - w_download https://download.microsoft.com/download/WindowsInstaller/Install/2.0/NT45/EN-US/InstMsiW.exe 4c3516c0b5c2b76b88209b22e3bf1cb82d8e2de7116125e97e128952372eed6b + # Originally at https://download.microsoft.com/download/WindowsInstaller/Install/2.0/NT45/EN-US/InstMsiW.exe + # Mirror list at http://www.filewatcher.com/m/InstMsiW.exe.1822848-0.html + w_download ftp://ftp.hp.com/pub/softlib/software/msi/InstMsiW.exe 4c3516c0b5c2b76b88209b22e3bf1cb82d8e2de7116125e97e128952372eed6b InstMsiW.exe + w_try_cabextract --directory="$W_TMP" "$W_CACHE"/msls31/InstMsiW.exe w_try cp -f "$W_TMP"/msls31.dll "$W_SYSTEM32_DLLS" } @@ -7900,18 +8230,13 @@ w_metadata msmask dlls \ publisher="Microsoft" \ year="2009" \ media="download" \ - file1="MSMASK32.CAB" \ + file1="../vb6sp6/VB60SP6-KB2708437-x86-ENU.msi" \ installed_file1="$W_SYSTEM32_DLLS_WIN/msmask32.ocx" load_msmask() { - # https://msdn.microsoft.com/en-us/library/11405hcf(VS.71).aspx - # https://bugs.winehq.org/show_bug.cgi?id=2934 - # 2015/11/09: Removed from microsoft.com, archive.org has an older copy: - # 2015/11/09: 25e49bd2aa8f96ff3c1068fc0fa7ba87fe86d8d5999e3592919a4b03f0602d67 - w_download http://activex.microsoft.com/controls/vb6/MSMASK32.CAB 25e49bd2aa8f96ff3c1068fc0fa7ba87fe86d8d5999e3592919a4b03f0602d67 - w_try_cabextract --directory="$W_TMP" "$W_CACHE"/msmask/MSMASK32.CAB - w_try cp -f "$W_TMP"/[Mm][Ss][Mm][Aa][Ss][Kk]32.[Oo][Cc][Xx] "$W_SYSTEM32_DLLS"/msmask32.ocx + helper_vb6sp6 "$W_TMP" msmask32.ocx + w_try mv "${W_TMP}/msmask32.ocx" "$W_SYSTEM32_DLLS/msmask32.ocx" w_try_regsvr msmask32.ocx } @@ -7951,10 +8276,13 @@ w_metadata msxml3 dlls \ load_msxml3() { - # Service Pack 5 - #w_download https://download.microsoft.com/download/a/5/e/a5e03798-2454-4d4b-89a3-4a47579891d8/msxml3.msi # Service Pack 7 - w_download https://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b19f33dd/msxml3.msi f9c678f8217e9d4f9647e8a1f6d89a7c26a57b9e9e00d39f7487493dd7b4e36c + # Originally at https://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b19f33dd/msxml3.msi + # Mirror list: http://www.filewatcher.com/m/msxml3.msi.1070592-0.html + # Known bad sites (2017/06/11): + # ftp://support.danbit.dk/D/DVD-RW-USB2B/Driver/Installation/Data/Redist/msxml3.msi + # ftp://94.79.56.169/common/Client/MSXML%204.0%20Service%20Pack%202/msxml3.msi + w_download "ftp://176.9.43.153/MS%20XML%20Parser/msxml3.msi" f9c678f8217e9d4f9647e8a1f6d89a7c26a57b9e9e00d39f7487493dd7b4e36c # It won't install on top of Wine's msxml3, which has a pretty high version number, so delete Wine's fake DLL rm "$W_SYSTEM32_DLLS"/msxml3.dll @@ -8182,19 +8510,23 @@ load_openwatcom() w_metadata pdh dlls \ title="MS pdh.dll (Performance Data Helper)" \ publisher="Microsoft" \ - year="2001" \ + year="2011" \ media="download" \ - file1="pdhinst.exe" \ + file1="../win7sp1/windows6.1-KB976932-X86.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/pdh.dll" load_pdh() { - # https://support.microsoft.com/kb/284996 - w_download https://download.microsoft.com/download/platformsdk/Redist/5.0.2195.2668/NT4/EN-US/pdhinst.exe 5506e34930badec5c27d4c325462530e4b06a4a9797a8f70089b39013b5dffae + helper_win7sp1 x86_microsoft-windows-p..rastructureconsumer_31bf3856ad364e35_6.1.7601.17514_none_b5e3f88a8eb425e8/pdh.dll + w_try cp "$W_TMP/x86_microsoft-windows-p..rastructureconsumer_31bf3856ad364e35_6.1.7601.17514_none_b5e3f88a8eb425e8/pdh.dll" "$W_SYSTEM32_DLLS/pdh.dll" - w_try_cabextract --directory="$W_TMP" "$W_CACHE"/pdh/pdhinst.exe - w_try_unzip "$W_TMP" "$W_TMP"/pdh.exe - w_try cp -f "$W_TMP"/x86/Pdh.Dll "$W_SYSTEM32_DLLS"/pdh.dll + if [ "$W_ARCH" = "win64" ] + then + helper_win7sp1_x64 amd64_microsoft-windows-p..rastructureconsumer_31bf3856ad364e35_6.1.7601.17514_none_1202940e4711971e/pdh.dll + w_try cp "$W_TMP/amd64_microsoft-windows-p..rastructureconsumer_31bf3856ad364e35_6.1.7601.17514_none_1202940e4711971e/pdh.dll" "$W_SYSTEM64_DLLS/pdh.dll" + fi + + w_override_dlls native,builtin pdh } #---------------------------------------------------------------- @@ -8209,7 +8541,7 @@ w_metadata physx dlls \ load_physx() { - w_download http://uk.download.nvidia.com/Windows/9.14.0702/PhysX-9.14.0702-SystemSoftware.msi 0a022e28accf5851be9d6577487cdcd3d3a3e2a8a21a64456b72b415c217f03c + w_download https://uk.download.nvidia.com/Windows/9.14.0702/PhysX-9.14.0702-SystemSoftware.msi 0a022e28accf5851be9d6577487cdcd3d3a3e2a8a21a64456b72b415c217f03c w_try_cd "$W_CACHE/$W_PACKAGE" w_try "$WINE" msiexec /i PhysX-9.14.0702-SystemSoftware.msi $W_UNATTENDED_SLASH_Q } @@ -8217,41 +8549,69 @@ load_physx() #---------------------------------------------------------------- w_metadata pngfilt dlls \ - title="pngfilt.dll (from ie5)" \ + title="pngfilt.dll (from winxp)" \ publisher="Microsoft" \ year="2004" \ media="download" \ - file1="IE5.01sp4-KB871260-Windows2000sp4-x86-ENU.exe" \ + file1="../winxpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/pngfilt.dll" load_pngfilt() { - # https://www.microsoft.com/en-us/download/details.aspx?id=3907 - w_download https://download.microsoft.com/download/5/0/c/50c42d0e-07a8-4a2b-befb-1a403bd0df96/IE5.01sp4-KB871260-Windows2000sp4-x86-ENU.exe eb1b90677ee969b278494c6180d906af37eda6d20f760dc395350a2da91eb631 - w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F pngfilt.dll "$W_CACHE"/pngfilt/IE5.01sp4-KB871260-Windows2000sp4-x86-ENU.exe + # Previously used https://www.microsoft.com/en-us/download/details.aspx?id=3907 + # Now using winxp's dll + + helper_winxpsp3 i386/pngfilt.dl_ + w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/pngfilt.dl_ w_try_regsvr pngfilt.dll } #---------------------------------------------------------------- w_metadata qdvd dlls \ - title="qdvd.dll (from DirectX 9 user redistributable)" \ + title="qdvd.dll" \ publisher="Microsoft" \ - year="2010" \ + year="2011" \ media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ + file1="../win7sp1/windows6.1-KB976932-X86.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/qdvd.dll" load_qdvd() { - helper_directx_dl + helper_win7sp1 x86_microsoft-windows-directshow-dvdsupport_31bf3856ad364e35_6.1.7601.17514_none_562994bd321aac67/qdvd.dll + w_try cp "$W_TMP/x86_microsoft-windows-directshow-dvdsupport_31bf3856ad364e35_6.1.7601.17514_none_562994bd321aac67/qdvd.dll" "$W_SYSTEM32_DLLS/qdvd.dll" - w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME - w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F qdvd.dll "$W_TMP/dxnt.cab" + if [ "$W_ARCH" = "win64" ] + then + helper_win7sp1_x64 amd64_microsoft-windows-directshow-dvdsupport_31bf3856ad364e35_6.1.7601.17514_none_b2483040ea781d9d/qdvd.dll + w_try cp "$W_TMP/amd64_microsoft-windows-directshow-dvdsupport_31bf3856ad364e35_6.1.7601.17514_none_b2483040ea781d9d/qdvd.dll" "$W_SYSTEM64_DLLS/qdvd.dll" + fi - w_try_regsvr qdvd.dll + w_override_dlls native,builtin qdvd +} - w_override_dlls native qdvd +#---------------------------------------------------------------- + +w_metadata qedit dlls \ + title="qedit.dll" \ + publisher="Microsoft" \ + year="2011" \ + media="download" \ + file1="../win7sp1/windows6.1-KB976932-X86.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/qedit.dll" + +load_qedit() +{ + helper_win7sp1 x86_microsoft-windows-qedit_31bf3856ad364e35_6.1.7601.17514_none_5ca34698a5a970d2/qedit.dll + w_try cp "$W_TMP/x86_microsoft-windows-qedit_31bf3856ad364e35_6.1.7601.17514_none_5ca34698a5a970d2/qedit.dll" "$W_SYSTEM32_DLLS/qedit.dll" + + if [ "$W_ARCH" = "win64" ] + then + helper_win7sp1_x64 amd64_microsoft-windows-qedit_31bf3856ad364e35_6.1.7601.17514_none_b8c1e21c5e06e208/qedit.dll + w_try cp "$W_TMP/amd64_microsoft-windows-qedit_31bf3856ad364e35_6.1.7601.17514_none_b8c1e21c5e06e208/qedit.dll" "$W_SYSTEM64_DLLS/qedit.dll" + fi + + w_override_dlls native,builtin qedit } #---------------------------------------------------------------- @@ -8395,7 +8755,7 @@ load_riched20() w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/riched20.dl_ w_override_dlls native,builtin riched20 - # https://code.google.com/p/winetricks/issues/detail?id=292 + # https://github.com/Winetricks/winetricks/issues/292 w_call msls31 } @@ -8420,8 +8780,14 @@ load_riched30() # only works with riched30, and recommends getting it by installing # msi 2, which just happens to come with riched30 version of riched20 # (though not with a corresponding riched32, which might be a problem) + # https://www.microsoft.com/en-us/download/details.aspx?id=21990 - w_download https://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US/InstMsiA.exe 536e4c8385d7d250fd5702a6868d1ed004692136eefad22252d0dac15f02563a + # Originally at https://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US/InstMsiA.exe + # with sha256sum 536e4c8385d7d250fd5702a6868d1ed004692136eefad22252d0dac15f02563a + # Mirror list at http://www.filewatcher.com/m/InstMsiA.Exe.1707856-0.html + # But they all have a different sha256sum, 5ab8b82f578f09dbccf797754155e531b5996b532c1f19c531596ec07cc4b46d + w_download ftp://ftp.vim.org/vol/2/linux-asp/i386/beta/cpe/b29/Changed_Components/win/InstMsiA.Exe 5ab8b82f578f09dbccf797754155e531b5996b532c1f19c531596ec07cc4b46d InstMsiA.exe + w_try_cabextract --directory="$W_TMP" "$W_CACHE"/riched30/InstMsiA.exe w_try cp -f "$W_TMP"/riched20.dll "$W_SYSTEM32_DLLS" w_try cp -f "$W_TMP"/msls31.dll "$W_SYSTEM32_DLLS" @@ -8433,16 +8799,15 @@ load_riched30() w_metadata richtx32 dlls \ title="MS Rich TextBox Control 6.0" \ publisher="Microsoft" \ - year="2009" \ + year="2012" \ media="download" \ - file1="richtx32.cab" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/RichTx32.Ocx" + file1="../vb6sp6/VB60SP6-KB2708437-x86-ENU.msi" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/richtx32.ocx" load_richtx32() { - w_download http://activex.microsoft.com/controls/vb6/richtx32.cab bb75c45af3e7428f1ee5380d33175aa9f36a6a84f5a2d74927a1dbf0d4b7f938 - w_try_cabextract "$W_CACHE"/richtx32/richtx32.cab -d "$W_SYSTEM32_DLLS" -F RichTx32.ocx - w_try_regsvr RichTx32.ocx + helper_vb6sp6 "$W_SYSTEM32_DLLS" richtx32.ocx + w_try_regsvr richtx32.ocx } #---------------------------------------------------------------- @@ -8467,16 +8832,22 @@ load_sdl() w_metadata secur32 dlls \ title="MS Security Support Provider Interface" \ publisher="Microsoft" \ - year="2009" \ + year="2011" \ media="download" \ - file1="Windows2000-KB959426-x86-ENU.EXE" \ + file1="../win7sp1/windows6.1-KB976932-X86.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/secur32.dll" load_secur32() { - # https://www.microsoft.com/en-us/download/details.aspx?id=12784 - w_download https://download.microsoft.com/download/6/9/5/69501788-B62F-44D8-933F-B6FAA576CA87/Windows2000-KB959426-x86-ENU.EXE a150e8b8fc68164eed18f214ee0726d9b7eb6c4726aab91decd12627b045d68b - w_try_cabextract "$W_CACHE"/secur32/Windows2000-KB959426-x86-ENU.EXE -d "$W_SYSTEM32_DLLS" -F secur32.dll + helper_win7sp1 x86_microsoft-windows-lsa_31bf3856ad364e35_6.1.7601.17514_none_a851f4adbb0d5141/secur32.dll + w_try cp "$W_TMP/x86_microsoft-windows-lsa_31bf3856ad364e35_6.1.7601.17514_none_a851f4adbb0d5141/secur32.dll" "$W_SYSTEM32_DLLS/secur32.dll" + + if [ "$W_ARCH" = "win64" ] + then + helper_win7sp1_x64 amd64_microsoft-windows-lsa_31bf3856ad364e35_6.1.7601.17514_none_04709031736ac277/secur32.dll + w_try "$W_TMP/amd64_microsoft-windows-lsa_31bf3856ad364e35_6.1.7601.17514_none_04709031736ac277/secur32.dll" "$W_SYSTEM64_DLLS/secur32.dll" + fi + w_override_dlls native,builtin secur32 } @@ -8548,19 +8919,15 @@ load_speechsdk() w_metadata tabctl32 dlls \ title="Microsoft Tabbed Dialog Control 6.0 (tabctl32.ocx)" \ publisher="Microsoft" \ - year="2009" \ + year="2012" \ media="download" \ - file1="TABCTL32.CAB" \ + file1="../vb6sp6/VB60SP6-KB2708437-x86-ENU.msi" \ installed_file1="$W_SYSTEM32_DLLS_WIN/tabctl32.ocx" load_tabctl32() { - # https://msdn.microsoft.com/en-us/library/aa240864(VS.60).aspx - # 2012/11: tabctl32 - w_download http://activex.microsoft.com/controls/vb6/TABCTL32.CAB d2a7bdacf74de95146384578d0f08ccefb2defb0081b3d42d34fdcee7ea4cc68 - - w_try_cabextract --directory="$W_TMP" "$W_CACHE/tabctl32/${file1}" - w_try cp -f "$W_TMP"/[Tt][Aa][Bb][Cc][Tt][Ll][3][2].[Oo][Cc][Xx] "$W_SYSTEM32_DLLS" + helper_vb6sp6 "$W_TMP" TabCtl32.ocx + w_try mv "${W_TMP}/TabCtl32.ocx" "$W_SYSTEM32_DLLS/tabctl32.ocx" w_try_regsvr tabctl32.ocx } @@ -8585,20 +8952,24 @@ load_updspapi() #---------------------------------------------------------------- w_metadata usp10 dlls \ - title="Uniscribe 1.325 " \ + title="Uniscribe" \ publisher="Microsoft" \ - year="2001" \ + year="2011" \ media="download" \ - file1="../msi2/InstMsiA.exe" \ + file1="../win7sp1/windows6.1-KB976932-X86.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/usp10.dll" load_usp10() { - # https://en.wikipedia.org/wiki/Uniscribe - # https://www.microsoft.com/en-us/download/details.aspx?id=21990 - w_download_to msi2 https://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US/InstMsiA.exe 536e4c8385d7d250fd5702a6868d1ed004692136eefad22252d0dac15f02563a - w_try_cabextract --directory="$W_TMP" "$W_CACHE"/msi2/InstMsiA.exe - w_try cp -f "$W_TMP"/usp10.dll "$W_SYSTEM32_DLLS" + helper_win7sp1 x86_microsoft-windows-usp_31bf3856ad364e35_6.1.7601.17514_none_af01e2f9b6be7939/usp10.dll + w_try cp "$W_TMP/x86_microsoft-windows-usp_31bf3856ad364e35_6.1.7601.17514_none_af01e2f9b6be7939/usp10.dll" "$W_SYSTEM32_DLLS/usp10.dll" + + if [ "$W_ARCH" = "win64" ] + then + helper_win7sp1_x64 amd64_microsoft-windows-usp_31bf3856ad364e35_6.1.7601.17514_none_0b207e7d6f1bea6f/usp10.dll + w_try "$W_TMP/amd64_microsoft-windows-usp_31bf3856ad364e35_6.1.7601.17514_none_0b207e7d6f1bea6f/usp10.dll" "$W_SYSTEM64_DLLS/usp10.dll" + fi + w_override_dlls native,builtin usp10 } @@ -8886,9 +9257,42 @@ load_vcrun2005() # https://support.microsoft.com/kb/2538242 w_download https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE 4ee4da0fe62d5fa1b5e80c6e6d88a4a2f8b3b140c35da51053d0d7b72a381d29 - w_try_cd "$W_CACHE/$W_PACKAGE" + # For native to be used, msvc* dlls must either be set to native only, OR + # set to native, builtin and remove wine's builtin manifest. Setting to native only breaks several apps, + # e.g., Dirac Codec and Ragnarok Online. + # For more info, see: + # https://bugs.winehq.org/show_bug.cgi?id=28225 + # https://bugs.winehq.org/show_bug.cgi?id=33604 + # https://bugs.winehq.org/show_bug.cgi?id=42859 w_override_dlls native,builtin atl80 msvcm80 msvcp80 msvcr80 vcomp + + w_try_cd "$W_CACHE/$W_PACKAGE" w_try "$WINE" "$file1" $W_UNATTENDED_SLASH_Q + + if [ $W_ARCH = win64 ] ;then + w_download https://download.microsoft.com/download/9/1/4/914851c6-9141-443b-bdb4-8bad3a57bea9/vcredist_x64.exe bb9e8606e26c2b76984252182f7db0d6e9108b204b81d2a7b036c9b618c1f9f1 + + if w_workaround_wine_bug 30713 "Manually extracting the 64-bit dlls" + then + rm -f "$W_TMP"/* # Avoid permission error + w_try_cabextract --directory="$W_TMP" vcredist_x64.exe + w_try_cabextract --directory="$W_TMP" "$W_TMP/VCREDI~2.EXE" + w_try_cabextract --directory="$W_TMP" "$W_TMP/vcredist.msi" + + w_try cp "$W_TMP/ATL80.dll.837BF1EB_D770_94EB_FF1F_C8B3B9A1E18E" "$W_SYSTEM64_DLLS/atl80.dll" + w_try cp "$W_TMP/mfc80.dll.8731EA9C_B0D8_8F16_FF1F_C8B3B9A1E18E" "$W_SYSTEM64_DLLS/mfc80.dll" + w_try cp "$W_TMP/mfc80u.dll.8731EA9C_B0D8_8F16_FF1F_C8B3B9A1E18E" "$W_SYSTEM64_DLLS/mfc80u.dll" + w_try cp "$W_TMP/mfcm80.dll.8731EA9C_B0D8_8F16_FF1F_C8B3B9A1E18E" "$W_SYSTEM64_DLLS/mfcm80.dll" + w_try cp "$W_TMP/mfcm80u.dll.8731EA9C_B0D8_8F16_FF1F_C8B3B9A1E18E" "$W_SYSTEM64_DLLS/mfcm80u.dll" + + w_try cp "$W_TMP/msvcm80.dll.844EFBA7_1C24_93B2_FF1F_C8B3B9A1E18E" "$W_SYSTEM64_DLLS/msvcm80.dll" + w_try cp "$W_TMP/msvcp80.dll.844EFBA7_1C24_93B2_FF1F_C8B3B9A1E18E" "$W_SYSTEM64_DLLS/msvcp80.dll" + w_try cp "$W_TMP/msvcr80.dll.844EFBA7_1C24_93B2_FF1F_C8B3B9A1E18E" "$W_SYSTEM64_DLLS/msvcr80.dll" + w_try cp "$W_TMP/vcomp.dll.09D44781_D142_FE32_FF1F_C8B3B9A1E18E" "$W_SYSTEM64_DLLS/vcomp80.dll" + else + w_try "$WINE" vcredist_x64.exe $W_UNATTENDED_SLASH_Q + fi + fi } #---------------------------------------------------------------- @@ -8907,7 +9311,19 @@ load_vcrun2008() # https://technet.microsoft.com/library/security/ms11-025 or # https://support.microsoft.com/kb/2538242 w_download https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x86.exe 6b3e4c51c6c0e5f68c8a72b497445af3dbf976394cbb62aa23569065c28deeb6 + + # For native to be used, msvc* dlls must either be set to native only, OR + # set to native, builtin and remove wine's builtin manifest. Setting to native only breaks several apps, + # e.g., Dirac Codec and Ragnarok Online. + # For more info, see: + # https://bugs.winehq.org/show_bug.cgi?id=28225 + # https://bugs.winehq.org/show_bug.cgi?id=33604 + # https://bugs.winehq.org/show_bug.cgi?id=42859 + # https://bugs.winehq.org/show_bug.cgi?id=28225 + # https://bugs.winehq.org/show_bug.cgi?id=33604 + # https://bugs.winehq.org/show_bug.cgi?id=42859 w_override_dlls native,builtin atl90 msvcm90 msvcp90 msvcr90 vcomp90 + w_try_cd "$W_CACHE/$W_PACKAGE" w_try "$WINE" "$file1" $W_UNATTENDED_SLASH_Q @@ -9212,15 +9628,22 @@ load_windowscodecs() w_metadata winhttp dlls \ title="MS Windows HTTP Services" \ publisher="Microsoft" \ - year="2005" \ + year="2011" \ media="download" \ - file1="../win2ksp4/W2KSP4_EN.EXE" \ + file1="../win7sp1/windows6.1-KB976932-X86.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/winhttp.dll" load_winhttp() { - helper_win2ksp4 i386/new/winhttp.dl_ - w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/new/winhttp.dl_ + helper_win7sp1 x86_microsoft.windows.winhttp_31bf3856ad364e35_5.1.7601.17514_none_5ea69615819a23e4/winhttp.dll + w_try cp "$W_TMP/x86_microsoft.windows.winhttp_31bf3856ad364e35_5.1.7601.17514_none_5ea69615819a23e4/winhttp.dll" "$W_SYSTEM32_DLLS/winhttp.dll" + + if [ "$W_ARCH" = "win64" ] + then + helper_win7sp1_x64 amd64_microsoft.windows.winhttp_31bf3856ad364e35_5.1.7601.17514_none_bac5319939f7951a/winhttp.dll + w_try cp "$W_TMP/amd64_microsoft.windows.winhttp_31bf3856ad364e35_5.1.7601.17514_none_bac5319939f7951a/winhttp.dll" "$W_SYSTEM64_DLLS/winhttp.dll" + fi + w_override_dlls native,builtin winhttp } @@ -9253,14 +9676,13 @@ w_metadata wmi dlls \ load_wmi() { - if test $W_ARCH = win64 - then - w_die "Installer doesn't support 64-bit architecture." - fi + w_package_unsupported_win64 # WMI for NT4.0 need validation: https://www.microsoft.com/en-us/download/details.aspx?id=7665 # See also https://www.microsoft.com/en-us/download/details.aspx?id=16510 - w_download https://download.microsoft.com/download/platformsdk/wmi9x/1.5/W9X/EN-US/wmi9x.exe 1d5d94050354b164c6a19531df151e0703d5eb39cebf4357ee2cfc340c2509d0 + # Originally at: https://download.microsoft.com/download/platformsdk/wmi9x/1.5/W9X/EN-US/wmi9x.exe + # Mirror list: http://www.filewatcher.com/_/?q=wmi9x.exe + w_download ftp://59.124.141.94/Sharpdesk/Redist/Enu/WMI/wmi9x.exe 1d5d94050354b164c6a19531df151e0703d5eb39cebf4357ee2cfc340c2509d0 w_set_winver win98 w_override_dlls native,builtin wbemprox wmiutils @@ -9335,7 +9757,9 @@ load_wsh56vb() { # This installs VBScript 5.6 (but not JScript) # See also https://www.microsoft.com/en-us/download/details.aspx?id=8495 - w_download https://download.microsoft.com/download/IE60/Patch/Q318089/W9XNT4Me/EN-US/vbs56men.exe 792a36d629e01cb474a434761e8cd33211c19ff84f5aa52f0d41111e054ecaac + # Originally at: https://download.microsoft.com/download/IE60/Patch/Q318089/W9XNT4Me/EN-US/vbs56men.exe + # Mirror list: ftp://ftp.uni-rostock.de/pub/tools/microsoft/ServicePacks/IE/us/vbs56men.exe + w_download ftp://ftp.uni-rostock.de/pub/tools/microsoft/ServicePacks/IE/us/vbs56men.exe 792a36d629e01cb474a434761e8cd33211c19ff84f5aa52f0d41111e054ecaac w_try_cd "$W_CACHE/$W_PACKAGE" w_override_dlls native,builtin vbscript @@ -9427,7 +9851,7 @@ w_metadata xinput dlls \ load_xinput() { - helper_directx_dl + helper_directx_Jun2010 w_try_cabextract -d "$W_TMP" -L -F '*_xinput_*x86*' "$W_CACHE"/directx9/$DIRECTX_NAME for x in "$W_TMP"/*.cab @@ -9927,9 +10351,12 @@ load_fontfix() # 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 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." + 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, the logout/login again to resolve." fi } @@ -10026,7 +10453,7 @@ w_metadata opensymbol fonts \ publisher="OpenOffice.org" \ year="2016" \ media="download" \ - file1="fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u8_all.deb" \ + file1="fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u9_all.deb" \ installed_file1="$W_FONTSDIR_WIN/opens___.ttf" load_opensymbol() @@ -10034,7 +10461,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+deb7u8_all.deb 3b7ad433cf8944789be1f1b7cf14aed5c2f9dab26f04824eebea2a3a8544a777 + w_download http://security.debian.org/debian-security/pool/updates/main/libr/libreoffice/fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u9_all.deb 11f272c3de3f2d891dfd067f467263ff361c08566a1a0ee5e5d64cbee459ee22 w_try_cd "$W_TMP" w_try_ar "$W_CACHE/$W_PACKAGE/$file1" data.tar.xz @@ -10055,19 +10482,20 @@ w_metadata tahoma fonts \ load_tahoma() { - # The tahoma and tahomabd fonts are needed by e.g. Steam + # Formerly at https://download.microsoft.com/download/office97pro/fonts/1/w95/en-us/tahoma32.exe + # Mirror list: http://www.filewatcher.com/_/?q=tahoma32.exe + w_download ftp://ftp.uevora.pt/pub/windows/Microsoft/Euro/Euro-Compatible%20Tahoma%20Font/tahoma32.exe 57496fb91d1629d2b6f313aaa6ebcdbcfd09c269b6462fe490420c786c089a40 - w_download https://download.microsoft.com/download/office97pro/fonts/1/w95/en-us/tahoma32.exe 57496fb91d1629d2b6f313aaa6ebcdbcfd09c269b6462fe490420c786c089a40 - w_try_cabextract --directory="$W_TMP" "$W_CACHE"/tahoma/tahoma32.exe - w_try cp -f "$W_TMP"/Tahoma.TTF "$W_FONTSDIR_UNIX"/tahoma.ttf - w_try cp -f "$W_TMP"/Tahomabd.TTF "$W_FONTSDIR_UNIX"/tahomabd.ttf + w_try_cabextract --directory="${W_TMP}" "${W_CACHE}/${W_PACKAGE}/${file1}" + w_try cp -f "${W_TMP}/Tahoma.TTF" "${W_FONTSDIR_UNIX}/tahoma.ttf" + w_try cp -f "${W_TMP}/Tahomabd.TTF" "${W_FONTSDIR_UNIX}/tahomabd.ttf" - # FIXME: Wine seems to nuke the registry entries for Tahoma. Why? Font Xplorer always lists it as 'not installed'. + # FIXME: Wine seems to nuke the registry entries for Tahoma. Why? Font Xplorer always lists it as 'not installed'. w_register_font tahoma.ttf "Tahoma" w_register_font tahomabd.ttf "Tahoma Bold" - # ? does some app assume it can overwrite these, or is this a leftover from before we had install checks? - chmod +w "$W_FONTSDIR_UNIX"/tahoma*.ttf + # FIXME: ? does some app assume it can overwrite these, or is this a leftover from before we had install checks? + chmod +w "${W_FONTSDIR_UNIX}"/tahoma*.ttf } #---------------------------------------------------------------- @@ -10489,7 +10917,7 @@ load_ev3() w_override_dlls native urlmon fi - if w_workaround_wine_bug 34897 "Installing update KB2936068 to work around bug 34897" 1.9.10, + 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 @@ -10680,6 +11108,7 @@ load_ie6() w_set_winver win2k # Workaround https://bugs.winehq.org/show_bug.cgi?id=21009 + # FIXME: seems this didn't get migrated to Github? # See also https://code.google.com/p/winezeug/issues/detail?id=78 rm -f "$W_SYSTEM32_DLLS"/browseui.dll "$W_SYSTEM32_DLLS"/inseng.dll @@ -10852,7 +11281,7 @@ w_metadata ie8 dlls \ load_ie8() { # Bundled in Windows 7, so refuses to install. Works with XP: - w_call winxp + w_set_winver winxp # Unregister Wine IE if grep -q -i "wine placeholder" "$W_PROGRAMS_X86_UNIX/Internet Explorer/iexplore.exe" @@ -10878,7 +11307,7 @@ load_ie8() then mv "$W_PROGRAMS_X86_UNIX/Internet Explorer/iexplore.exe" "$W_PROGRAMS_X86_UNIX/Internet Explorer/iexplore.exe.bak" fi - for dll in browseui.dll inseng.dll itircl itss jscript msctf mshtml shdoclc shdocvw shlwapi urlmon + for dll in browseui inseng itircl itss jscript msctf mshtml shdoclc shdocvw shlwapi urlmon do test -f "$W_SYSTEM32_DLLS"/$dll.dll && mv "$W_SYSTEM32_DLLS"/$dll.dll "$W_SYSTEM32_DLLS"/$dll.dll.bak @@ -11031,7 +11460,10 @@ load_mspaint() then w_call mfc42 fi - w_download https://download.microsoft.com/download/0/A/4/0A40DF5C-2BAE-4C63-802A-84C33B34AC98/WindowsXP-KB978706-x86-ENU.exe 93ed34ab6c0d01a323ce10992d1c1ca27d1996fef82f0864d83e7f5ac6f9b24b + + # Originally at: https://download.microsoft.com/download/0/A/4/0A40DF5C-2BAE-4C63-802A-84C33B34AC98/WindowsXP-KB978706-x86-ENU.exe + # Mirror list: http://www.filewatcher.com/_/?q=WindowsXP-KB978706-x86-ENU.exe + w_download ftp://cbvk.cz/programy_pro_knihovny/update-pack/Windows%20XP%20x86%20ENU/Security%20Updates/WindowsXP-KB978706-x86-ENU.exe 93ed34ab6c0d01a323ce10992d1c1ca27d1996fef82f0864d83e7f5ac6f9b24b w_try $WINE "$W_CACHE"/mspaint/WindowsXP-KB978706-x86-ENU.exe /q /x:"$W_TMP"/WindowsXP-KB978706-x86-ENU w_try cp -f "$W_TMP"/WindowsXP-KB978706-x86-ENU/SP3GDR/mspaint.exe "$W_WINDIR_UNIX"/mspaint.exe } @@ -11285,7 +11717,7 @@ w_metadata protectionid apps \ load_protectionid() { - w_download_manual "http://pid.gamecopyworld.com/" ProtectionId.685.December.2016.rar 27a84d740c9fb96cc866438a2b5cd4afc350affc8b7a0122c28c651af3559aea + w_download_manual "https://pid.gamecopyworld.com/" ProtectionId.685.December.2016.rar 27a84d740c9fb96cc866438a2b5cd4afc350affc8b7a0122c28c651af3559aea w_try_cd "$W_SYSTEM32_DLLS" w_try_unrar "${W_CACHE}/${W_PACKAGE}/${file1}" @@ -11305,10 +11737,7 @@ w_metadata psdk2003 apps \ load_psdk2003() { - if [ $W_ARCH = win64 ] - then - w_die "Installer doesn't support 64-bit architecture." - fi + w_package_unsupported_win64 w_call mfc42 @@ -11824,7 +12253,9 @@ w_metadata vc2010express apps \ load_vc2010express() { - w_download https://download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b + # Originally at: https://download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso + # Mirror list at: http://www.filewatcher.com/_/?q=VS2010Express1.iso + w_download ftp://www.daba.lv/pub/Programmeeshana/VisualStudio/VS2010Express1.iso a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b # Unpack ISO w_try_7z "$W_TMP" "$W_CACHE"/vc2010express/VS2010Express1.iso @@ -11936,12 +12367,12 @@ w_metadata wme9 apps \ load_wme9() { - if [ $W_ARCH = win64 ] - then - w_die "Installer doesn't support 64-bit architecture." - fi + w_package_unsupported_win64 + # See also https://www.microsoft.com/en-us/download/details.aspx?id=17792 - w_download https://download.microsoft.com/download/8/1/f/81f9402f-efdd-439d-b2a4-089563199d47/WMEncoder.exe 19d1610d12b51c969f64703c4d3a76aae30dee526bae715381b5f3369f717d76 + # Formerly at: https://download.microsoft.com/download/8/1/f/81f9402f-efdd-439d-b2a4-089563199d47/WMEncoder.exe + # Mirror list: http://www.filewatcher.com/_/?q=WMEncoder.exe + w_download ftp://ftp.upmost.com.tw/pub/UPMOST/CD-ISO/V30I/Extra/WMEncoder/Media%20Encoder%209/ENG/WMEncoder.exe 19d1610d12b51c969f64703c4d3a76aae30dee526bae715381b5f3369f717d76 w_try_cd "$W_CACHE/$W_PACKAGE" w_try "$WINE" WMEncoder.exe $W_UNATTENDED_SLASH_Q @@ -11978,10 +12409,7 @@ load_wmp9() # Not really expected to work well yet; see # https://appdb.winehq.org/appview.php?versionId=1449 - if [ $W_ARCH = win64 ] - then - w_die "Installer doesn't support 64-bit architecture." - fi + w_package_unsupported_win64 w_call wsh57 @@ -12020,10 +12448,7 @@ w_metadata wmp10 dlls \ load_wmp10() { - if [ $W_ARCH = win64 ] - then - w_die "Installer doesn't support 64-bit architecture. Use a 32-bit WINEPREFIX instead." - fi + w_package_unsupported_win64 # FIXME: what versions of Windows are really bundled with wmp10? w_skip_windows wmp10 && return @@ -12459,7 +12884,7 @@ w_metadata aoe3_demo games \ load_aoe3_demo() { - w_download http://http.download.nvidia.com/downloads/nZone/demos/aoe3trial.exe 4ef69289dfa0817ec14942d85ef597835a9d2b09e1506c60b9938b20daa274ad + w_download https://http.download.nvidia.com/downloads/nZone/demos/aoe3trial.exe 4ef69289dfa0817ec14942d85ef597835a9d2b09e1506c60b9938b20daa274ad w_try_cd "$W_CACHE/$W_PACKAGE" @@ -12736,7 +13161,7 @@ w_metadata bioshock_demo games \ load_bioshock_demo() { - w_download http://us.download.nvidia.com/downloads/nZone/demos/nzd_BioShockPC.zip 36f73251c0c1c6f4b6a83af9b6e44c642b4fce127c2c28cb6d2b25bc95baa934 + w_download https://us.download.nvidia.com/downloads/nZone/demos/nzd_BioShockPC.zip 36f73251c0c1c6f4b6a83af9b6e44c642b4fce127c2c28cb6d2b25bc95baa934 w_info "Unzipping demo, installer will start in about 30 seconds." w_try unzip "$W_CACHE/$W_PACKAGE/nzd_BioShockPC.zip" -d "$W_TMP/$W_PACKAGE" @@ -14278,7 +14703,7 @@ w_metadata eve games \ load_eve() { # https://community.eveonline.com/support/download/ - w_download http://binaries.eveonline.com/EveLauncher-1104888.exe d1d66ea0a0e4a476a926307dcdb3d7b5e777d7cff7feb172ce7779dac9fdae8f + w_download https://binaries.eveonline.com/EveLauncher-1104888.exe d1d66ea0a0e4a476a926307dcdb3d7b5e777d7cff7feb172ce7779dac9fdae8f w_try_cd "$W_CACHE/$W_PACKAGE" w_ahk_do " @@ -14924,42 +15349,6 @@ load_hphbp_demo() #---------------------------------------------------------------- -w_metadata imvu games \ - title="IMVU - Instant Messaging Virtual Universe" \ - publisher="IMVU" \ - year="2004" \ - media="download" \ - file1="InstallIMVU_465.0_st_c.exe" \ - installed_exe1="c:/users/$LOGNAME/Application Data/IMVUClient/IMVUClient.exe" - -load_imvu() -{ - w_download http://static-akm.imvu.com/imvufiles/installers/InstallIMVU_465.0_st_c.exe 4c54b65308cc6bb832cbc3ed3b82701a23cbae5a67f07d6c1d6bdc84b6b2cbe4 - - w_try_cd "$W_CACHE/$W_PACKAGE" - w_ahk_do " - SetTitleMatchMode, 2 - SetWinDelay 500 - Run, $file1 - if ( w_opt_unattended > 0 ) { - WinWait,IMVU Setup, IMVU Extension - ControlClick Button4 ; Don't install extension - Sleep 500 - ControlClick Button2 ; Finish - ; There's no way to tell it not to launch - WinWait,IMVU Login, chrome - Click, Left, 29, 230 ; Uncheck [run on startup] - Sleep 500 - Click, Left, 416, 11 ; Click X on window decoration to close - Sleep 500 - WinKill,IMVU Login, chrome ; and then close harshly, just in case? - } - winwaitclose - " -} - -#---------------------------------------------------------------- - w_metadata kotor1 games \ title="Star Wars: Knights of the Old Republic" \ publisher="LucasArts" \ @@ -17356,42 +17745,6 @@ load_wog() " } -#---------------------------------------------------------------- - -w_metadata zootycoon2_demo games \ - title="Zoo Tycoon 2 demo" \ - publisher="Microsoft" \ - year="2004" \ - media="download" \ - file1="Zoo2Trial.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/Microsoft Games/Zoo Tycoon 2 Trial Version/zt2demoretail.exe" - -load_zootycoon2_demo() -{ - w_download "https://download.microsoft.com/download/9/f/6/9f6a95f0-f34a-4312-9749-77b81d3de245/Zoo2Trial.exe" d50e9c8bd8fd70d920f312dbe1b520688a5c6ae1352a6cbf2cfa5fc2036d0c5d - - w_try_cd "$W_CACHE/$W_PACKAGE" - w_ahk_do " - ; Uses winwaitactive, because the windows appear and immediately after another window - ; gets in the way, then disappears after a second or so - SetTitleMatchMode, 2 - run Zoo2Trial.exe - winwaitclose, APPMESSAGE - winwaitactive, Zoo Tycoon 2 Trial, AUTORUN - if ( w_opt_unattended > 0 ) { - sleep 1000 - controlclick, CButtonClassName1, Zoo Tycoon 2 Trial, AUTORUN - winwaitclose, APPMESSAGE - winwaitactive, Zoo Tycoon 2 Trial, INSTALLTYPE - ; 1 second was not enough. - sleep 3000 - controlclick, CButtonClassName1, Zoo Tycoon 2 Trial, INSTALLTYPE - } - winwaitactive, Zoo Tycoon 2 Trial, COMPLETE - winclose, Zoo Tycoon 2 Trial, COMPLETE - " -} - #---------------------------------------------------------------- # Gog.com games #---------------------------------------------------------------- @@ -17769,6 +18122,32 @@ load_cfc() { winetricks_set_wined3d_var CheckFloatConstants "$1" } +#---------------------------------------------------------------- +# CSMT settings + +w_metadata csmt=on settings \ + title="Enable Command Stream Multithreading" +w_metadata csmt=off settings \ + title="Disable Command Stream Multithreading (default)" + +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 @@ -17902,7 +18281,7 @@ w_metadata windowmanagermanaged=y settings \ title="Allow the window manager to control windows (default)" w_metadata windowmanagermanaged=n settings \ title_uk="Не дозволяти менеджеру вікон керування вікнами" \ - title="Prevent the window manager from controling windows" + title="Prevent the window manager from controlling windows" load_windowmanagermanaged() { @@ -18093,7 +18472,7 @@ load_native_mdac() { # Set those overrides globally so user programs get MDAC's ODBC # instead of Wine's unixodbc - w_override_dlls native,builtin odbc32 odbccp32 oledb32 + w_override_dlls native,builtin mtxdm odbc32 odbccp32 oledb32 } #---------------------------------------------------------------- @@ -18504,226 +18883,6 @@ load_bad() w_die "$W_PACKAGE failed!" } -#---- Derived Metadata ---- -# Generated automatically by measuring time and space requirements of all verbs -# size_MB includes size of virgin wineprefix, but not the cached installer -case $WINETRICKS_OPT_VERBOSE in - 2) set -x ;; - *) set +x ;; -esac - -for data in \ - 3dmark03:size_MB=895,time_sec=149 \ - 3dmark05:size_MB=1255,time_sec=208 \ - 3dmark06:size_MB=2627,time_sec=461 \ - 3dmark2000:size_MB=165,time_sec=71 \ - 3dmark2001:size_MB=260,time_sec=141 \ - 7zip:size_MB=53,time_sec=9 \ - abiword:size_MB=119,time_sec=15 \ - adobeair:size_MB=132,time_sec=8 \ - algodoo_demo:size_MB=165,time_sec=52 \ - allcodecs:size_MB=48,time_sec=3 \ - allfonts:size_MB=132,time_sec=114 \ - amstream:size_MB=48,time_sec=2 \ - aoe3_demo:size_MB=4472,time_sec=422 \ - aoe_demo:size_MB=164,time_sec=35 \ - art2kmin:size_MB=363,time_sec=36 \ - atmlib:size_MB=454,time_sec=73 \ - autohotkey:size_MB=53,time_sec=4 \ - baekmuk:size_MB=138,time_sec=3 \ - bioshock_demo:size_MB=7510,time_sec=1543 \ - bladekitten_demo:size_MB=1444,time_sec=174 \ - cjkfonts:size_MB=48,time_sec=4 \ - cmake:size_MB=85,time_sec=8 \ - cnc3_demo:size_MB=5244,time_sec=1022 \ - cod4mw_demo:size_MB=5730,time_sec=1108 \ - cod_demo:size_MB=574,time_sec=115 \ - colorprofile:size_MB=47,time_sec=1 \ - comctl32:size_MB=49,time_sec=1 \ - comdlg32ocx:size_MB=49,time_sec=1 \ - controlpad:size_MB=69,time_sec=4 \ - corefonts:size_MB=62,time_sec=2 \ - crypt32:size_MB=178,time_sec=71 \ - crysis2:size_MB=8259,time_sec=1200 \ - crysis2_demo_mp:size_MB=5259,time_sec=1473 \ - d3dcompiler_43:size_MB=138,time_sec=51 \ - d3dx10:size_MB=50,time_sec=4 \ - d3dx11_43:size_MB=48,time_sec=1 \ - d3dx9:size_MB=126,time_sec=3 \ - d3dx9_26:size_MB=48,time_sec=2 \ - d3dx9_28:size_MB=48,time_sec=1 \ - d3dx9_31:size_MB=48,time_sec=2 \ - d3dx9_35:size_MB=50,time_sec=2 \ - d3dx9_36:size_MB=48,time_sec=1 \ - d3dx9_42:size_MB=48,time_sec=1 \ - d3dxof:size_MB=48,time_sec=2 \ - dc2ba_demo:size_MB=209,time_sec=38 \ - deadspace2:size_MB=12693,time_sec=720 \ - devenum:size_MB=59,time_sec=2 \ - diablo2:size_MB=2577,time_sec=37 \ - dinput:size_MB=48,time_sec=1 \ - dinput8:size_MB=61,time_sec=2 \ - dirac:size_MB=50,time_sec=4 \ - directmusic:size_MB=63,time_sec=4 \ - directplay:size_MB=61,time_sec=3 \ - directx9:size_MB=387,time_sec=12 \ - dirt2_demo:size_MB=6241,time_sec=977 \ - divinity2_demo:size_MB=2906,time_sec=2627 \ - dmsynth:size_MB=57,time_sec=2 \ - dotnet11:size_MB=94,time_sec=15 \ - dotnet20:size_MB=360,time_sec=64 \ - dotnet30:size_MB=645,time_sec=302 \ - dotnet35:size_MB=1149,time_sec=445 \ - dragonage:size_MB=23771,time_sec=673 \ - dragonage2_demo:size_MB=4014,time_sec=1428 \ - droid:size_MB=63,time_sec=8 \ - dsound:size_MB=48,time_sec=1 \ - dxdiag:size_MB=75,time_sec=6 \ - dxdiagn:size_MB=48,time_sec=1 \ - eufonts:size_MB=58,time_sec=2 \ - eve:size_MB=5313,time_sec=1568 \ - eve:size_MB=11215,time_sec=467 \ - farmsim2011_demo:size_MB=48,time_sec=4 \ - ffdshow:size_MB=53,time_sec=4 \ - fifa11_demo:size_MB=4932,time_sec=845 \ - flash:size_MB=57,time_sec=3 \ - fontfix:size_MB=47,time_sec=0 \ - fontxplorer:size_MB=51,time_sec=5 \ - gdiplus:size_MB=50,time_sec=2 \ - gfw:size_MB=211,time_sec=11 \ - glut:size_MB=47,time_sec=1 \ - gothic4_demo:size_MB=7719,time_sec=1402 \ - guildwars:size_MB=224,time_sec=392 \ - hegemony_demo:size_MB=1927,time_sec=315 \ - hegemonygold_demo:size_MB=2339,time_sec=247 \ - hon:size_MB=1536,time_sec=337 \ - hphbp_demo:size_MB=2898,time_sec=556 \ - icodecs:size_MB=60,time_sec=29 \ - ie6:size_MB=340,time_sec=58 \ - ie7:size_MB=181,time_sec=44 \ - ie8:size_MB=202,time_sec=39 \ - imvu:size_MB=194,time_sec=17 \ - jet40:size_MB=54,time_sec=3 \ - l3codecx:size_MB=60,time_sec=5 \ - lhp_demo:size_MB=3200,time_sec=645 \ - liberation:size_MB=50,time_sec=3 \ - lucida:size_MB=51,time_sec=1 \ - masseffect2_demo:size_MB=8291,time_sec=1397 \ - mb_warband_demo:size_MB=1495,time_sec=35 \ - mdac25:size_MB=97,time_sec=6 \ - mdac27:size_MB=70,time_sec=3 \ - mdac28:size_MB=75,time_sec=4 \ - mfc40:size_MB=48,time_sec=0 \ - mfc42:size_MB=47,time_sec=1 \ - mingw:size_MB=132,time_sec=3 \ - mozillabuild:size_MB=891,time_sec=26 \ - mpc:size_MB=87,time_sec=2 \ - msasn1:size_MB=178,time_sec=3 \ - mshflxgd:size_MB=47,time_sec=0 \ - msi2:size_MB=62,time_sec=4 \ - msls31:size_MB=48,time_sec=0 \ - msmask:size_MB=47,time_sec=0 \ - mspaint:size_MB=49,time_sec=0 \ - msscript:size_MB=48,time_sec=0 \ - msxml3:size_MB=49,time_sec=1 \ - msxml4:size_MB=55,time_sec=0 \ - msxml6:size_MB=54,time_sec=1 \ - nfsshift_demo:size_MB=4877,time_sec=157 \ - ogg:size_MB=54,time_sec=1 \ - opensymbol:size_MB=49,time_sec=1 \ - openwatcom:size_MB=274,time_sec=12 \ - osmos_demo:size_MB=67,time_sec=5 \ - pdh:size_MB=48,time_sec=0 \ - penpenxmas:size_MB=49,time_sec=6 \ - physx:size_MB=213,time_sec=5 \ - plantsvszombies:size_MB=156,time_sec=24 \ - pngfilt:size_MB=49,time_sec=0 \ - puzzleagent_demo:size_MB=495,time_sec=36 \ - python26:size_MB=160,time_sec=9 \ - quartz:size_MB=62,time_sec=3 \ - quicktime72:size_MB=219,time_sec=9 \ - quicktime76:size_MB=237,time_sec=6 \ - rayman2_demo:size_MB=239,time_sec=146 \ - riched20:size_MB=49,time_sec=0 \ - riched30:size_MB=48,time_sec=0 \ - richtx32:size_MB=48,time_sec=0 \ - safari:size_MB=210,time_sec=4 \ - sammax301_demo:size_MB=1419,time_sec=341 \ - sammax304_demo:size_MB=1642,time_sec=88 \ - secondlife:size_MB=266,time_sec=24 \ - secur32:size_MB=47,time_sec=0 \ - shockwave:size_MB=134,time_sec=6 \ - sims3:size_MB=12884,time_sec=584 \ - sketchup:size_MB=319,time_sec=15 \ - starcraft2_demo:size_MB=5241,time_sec=211 \ - tahoma:size_MB=48,time_sec=0 \ - takao:size_MB=176,time_sec=3 \ - tmnationsforever:size_MB=1871,time_sec=116 \ - uff:size_MB=47,time_sec=0 \ - unifont:size_MB=51,time_sec=0 \ - usp10:size_MB=50,time_sec=0 \ - ut3:size_MB=7355,time_sec=426 \ - utorrent:size_MB=48,time_sec=1 \ - vb2run:size_MB=48,time_sec=0 \ - vb3run:size_MB=47,time_sec=0 \ - vb4run:size_MB=49,time_sec=0 \ - vb5run:size_MB=49,time_sec=0 \ - vb6run:size_MB=50,time_sec=1 \ - vc2005express:size_MB=1614,time_sec=173 \ - vc2005trial:size_MB=7156,time_sec=53 \ - vcrun2003:size_MB=47,time_sec=0 \ - vcrun2005:size_MB=60,time_sec=2 \ - vcrun2008:size_MB=60,time_sec=2 \ - vcrun2010:size_MB=71,time_sec=7 \ - vcrun6:size_MB=51,time_sec=0 \ - vcrun6sp6:size_MB=109,time_sec=2 \ - vjrun20:size_MB=319,time_sec=57 \ - vlc:size_MB=221,time_sec=7 \ - wenquanyi:size_MB=50,time_sec=0 \ - windowscodecs:size_MB=53,time_sec=2 \ - winhttp:size_MB=49,time_sec=0 \ - wininet:size_MB=47,time_sec=0 \ - wme9:size_MB=136,time_sec=5 \ - wmi:size_MB=62,time_sec=12 \ - wmp10:size_MB=161,time_sec=7 \ - wmp9:size_MB=143,time_sec=12 \ - wog:size_MB=124,time_sec=5 \ - wsh56js:size_MB=45,time_sec=0 \ - xact:size_MB=60,time_sec=6 \ - xinput:size_MB=47,time_sec=2 \ - xmllite:size_MB=50,time_sec=4 \ - xvid:size_MB=54,time_sec=2 \ - zootycoon2_demo:size_MB=299,time_sec=32 \ - -do - cmd=${data%%:*} - file="$(echo "$WINETRICKS_METADATA"/*/$cmd.vars)" - if test -f "$file" - then - case $data in - *size_MB*) - size_MB=${data##*size_MB=} # remove anything before value - size_MB=${size_MB%%,*} # remove anything after value - echo size_MB=$size_MB >> "$file" - ;; - esac - - case $data in - *time_sec*) - time_sec=${data##*time_sec=} - time_sec=${time_sec%%,*} - echo time_sec=$time_sec >> "$file" - esac - fi - unset size_MB time_sec -done - -# Restore verbosity: -case $WINETRICKS_OPT_VERBOSE in - 1|2) set -x ;; - *) set +x ;; -esac - #---- Main Program ---- winetricks_stats_save() @@ -18755,6 +18914,12 @@ winetricks_stats_init() thanks="Danke! Sie bekommen diese Frage nicht mehr gestellt. Sie können die Übermittlung jederzeit mit 'winetricks --optout' wieder ausschalten" declined="OK, Winetricks wird *keine* Statistiken übermitteln. Sie bekommen diese Frage nicht mehr gestellt." ;; + pl*) + title="Jednorazowe pytanie dotyczące pomocy w rozwoju Winetricks" + question="Czy chcesz pomóc w rozwoju Winetricks pozwalając na wysyłanie statystyk przez program? Możesz wyłączyć tą opcję w każdej chwili z użyciem komendy 'winetricks --optout'." + thanks="Dziękujemy! Nie otrzymasz już tego pytania. Pamiętaj, ze możesz wyłączyć tą opcję komendą 'winetricks --optout'" + declined="OK, Winetricks *nie* będzie wysyłać statystyk. Nie otrzymasz już tego pytania." + ;; *) title="One-time question about helping Winetricks development" question="Would you like to help winetricks development by letting winetricks report statistics? You can turn reporting off at any time with the command 'winetricks --optout'" @@ -18902,7 +19067,7 @@ execute_command() # Hard-coded verbs main) WINETRICKS_CURMENU=main ;; - help) w_open_webpage https://code.google.com/archive/p/winetricks/wikis ;; + help) w_open_webpage https://github.com/Winetricks/winetricks/wiki ;; list) winetricks_list_all ;; list-cached) winetricks_list_cached ;; list-download) winetricks_list_download ;; diff --git a/winetricks.1 b/winetricks.1 index dc6badf..1990301 100644 --- a/winetricks.1 +++ b/winetricks.1 @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.TH WINETRICKS 1 "March 2017" "Winetricks 20170327" "Wine Package Manager" +.TH WINETRICKS 1 "June 2017" "Winetricks 20170614" "Wine Package Manager" .SH NAME winetricks \- manage virtual Windows environments using Wine .SH SYNOPSIS