Accepting request 316059 from Emulators
- Updated to 1.7.47 development snapshot - Text drawing in Direct2D. - Support for the new thread pool API. - Toolbar state saving. - Beginnings of an implementation for proper HID support. - Support for file objects in device drivers. - Various bug fixes. - winetricks update OBS-URL: https://build.opensuse.org/request/show/316059 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=177
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
06ace40f20
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9ab4046cc676de3054f9f2560e7d757b25324f72dd9a9cfed0d4aa48cc87350b
|
||||
size 22356320
|
||||
@ -1,7 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iEYEABECAAYFAlWNQUMACgkQ9ebp7rlGHdd+SQCg1VTILqEHspSeAqwu8wM0beAx
|
||||
CaoAnRwLTsLT2V8q7gr+20gVRRL417BZ
|
||||
=YyKt
|
||||
-----END PGP SIGNATURE-----
|
||||
3
wine-1.7.47.tar.bz2
Normal file
3
wine-1.7.47.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ba74f75aec400dc4b1d64ddc29560e4946837e73cb19d9c231604ff0147bbb2e
|
||||
size 22398577
|
||||
7
wine-1.7.47.tar.bz2.sign
Normal file
7
wine-1.7.47.tar.bz2.sign
Normal file
@ -0,0 +1,7 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iEYEABECAAYFAlWfzXwACgkQ9ebp7rlGHdeCvwCgxqAjGg1PFJfxcfz9R8myxMWy
|
||||
W2QAn3foapSl2LUwTUtd6yu2TqNmp2sj
|
||||
=24BB
|
||||
-----END PGP SIGNATURE-----
|
||||
12
wine.changes
12
wine.changes
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 10 13:58:37 UTC 2015 - meissner@suse.com
|
||||
|
||||
- Updated to 1.7.47 development snapshot
|
||||
- Text drawing in Direct2D.
|
||||
- Support for the new thread pool API.
|
||||
- Toolbar state saving.
|
||||
- Beginnings of an implementation for proper HID support.
|
||||
- Support for file objects in device drivers.
|
||||
- Various bug fixes.
|
||||
- winetricks update
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 7 09:55:22 UTC 2015 - meissner@suse.com
|
||||
|
||||
|
||||
@ -57,7 +57,7 @@ BuildRequires: sane-backends-devel
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: valgrind-devel
|
||||
BuildRequires: xorg-x11-devel
|
||||
Version: 1.7.46
|
||||
Version: 1.7.47
|
||||
Release: 0
|
||||
Summary: An MS Windows Emulator
|
||||
License: LGPL-2.1+
|
||||
|
||||
375
winetricks
375
winetricks
@ -2,7 +2,7 @@
|
||||
|
||||
# Name of this version of winetricks (YYYYMMDD)
|
||||
# (This doesn't change often, use the sha1sum of the file when reporting problems)
|
||||
WINETRICKS_VERSION=20150416
|
||||
WINETRICKS_VERSION=20150706
|
||||
|
||||
# This is a utf-8 file
|
||||
# You should see an o with two dots over it here [ö]
|
||||
@ -501,7 +501,7 @@ w_expand_env()
|
||||
# get sha1sum string and set $_W_gotsum to it
|
||||
w_get_sha1sum()
|
||||
{
|
||||
_W_file=$1
|
||||
local _W_file="$1"
|
||||
_W_gotsum=`$WINETRICKS_SHA1SUM < "$_W_file" | sed 's/(stdin)= //;s/ .*//'`
|
||||
}
|
||||
|
||||
@ -890,7 +890,7 @@ w_download_manual_to()
|
||||
case $LANG in
|
||||
da*) _W_dlmsg="Hent venligst filen $_W_file fra $_W_url og placér den i $W_CACHE/$_W_packagename, kør derefter dette skript.";;
|
||||
de*) _W_dlmsg="Bitte laden Sie $_W_file von $_W_url runter, stellen Sie's in $W_CACHE/$_W_packagename, dann wiederholen Sie diesen Kommando.";;
|
||||
pl*) _W_dlmsg="Proszę pobrać plik $_W_file z $_W_url, następnie umieścić go w $W_CACHE/$_W_packagename, a na końcu uruchomić ponownie ten skrytp.";;
|
||||
pl*) _W_dlmsg="Proszę pobrać plik $_W_file z $_W_url, następnie umieścić go w $W_CACHE/$_W_packagename, a na końcu uruchomić ponownie ten skrypt.";;
|
||||
uk*) _W_dlmsg="Будь ласка, звантажте $_W_file з $_W_url, розташуйте в $W_CACHE/$_W_packagename, потім запустіть скрипт знову.";;
|
||||
zh_CN*) _W_dlmsg="请从 $_W_url 下载 $_W_file，并置放于 $W_CACHE/$_W_packagename, 然后重新运行 winetricks.";;
|
||||
zh_TW*) _W_dlmsg="請從 $_W_url 下載 $_W_file，并置放於 $W_CACHE/$_W_packagename, 然后重新執行 winetricks.";;
|
||||
@ -2039,7 +2039,7 @@ w_conflicts()
|
||||
{
|
||||
for x in $2
|
||||
do
|
||||
if test $(grep -w "$x" "$WINEPREFIX/winetricks.log")
|
||||
if grep -qw "$x" "$WINEPREFIX/winetricks.log"
|
||||
then
|
||||
w_die "error: $1 conflicts with $x, which is already installed."
|
||||
fi
|
||||
@ -3728,6 +3728,12 @@ winetricks_mount_real_volume()
|
||||
|
||||
winetricks_cleanup()
|
||||
{
|
||||
# We don't want to run this multiple times, so unfortunately we have to run it here:
|
||||
if test "$W_NGEN_CMD"
|
||||
then
|
||||
"$W_NGEN_CMD"
|
||||
fi
|
||||
|
||||
set +e
|
||||
if test -f "$WINETRICKS_WORKDIR/dd-pid"
|
||||
then
|
||||
@ -4040,10 +4046,6 @@ winetricks_init()
|
||||
if test "$WINEPREFIX"
|
||||
then
|
||||
WINETRICKS_ORIGINAL_WINEPREFIX="$WINEPREFIX"
|
||||
#if test WINETRICKS_OPT_SHAREDPREFIX=0
|
||||
#then
|
||||
# w_info "To install apps into $WINEPREFIX, give the --no-isolate option"
|
||||
#fi
|
||||
else
|
||||
WINETRICKS_ORIGINAL_WINEPREFIX="$HOME/.wine"
|
||||
fi
|
||||
@ -4138,9 +4140,9 @@ Executes given verbs. Each verb installs an application or changes a setting.
|
||||
Options:
|
||||
--force Don't check whether packages were already installed
|
||||
--gui Show gui diagnostics even when driven by commandline
|
||||
--isolate Install each app or game in its own bottle (WINEPREFIX)
|
||||
-k, --keep_isos Cache isos (allows later installation without disc)
|
||||
--no-clean Don't delete temp directories (useful during debugging)
|
||||
--no-isolate Don't install each app or game in its own bottle
|
||||
-q, --unattended Don't ask any questions, just install automatically
|
||||
-r, --ddrescue Retry hard when caching scratched discs
|
||||
--showbroken Even show verbs that are currently broken in wine
|
||||
@ -4200,6 +4202,8 @@ then
|
||||
|
||||
# Which GUI helper to use (none/zenity/kdialog). See winetricks_detect_gui.
|
||||
WINETRICKS_GUI=none
|
||||
# Default to a shared prefix:
|
||||
WINETRICKS_OPT_SHAREDPREFIX=1
|
||||
|
||||
# Handle options before init, to avoid starting wine for --help or --version
|
||||
while winetricks_handle_option $1
|
||||
@ -5234,6 +5238,8 @@ load_dotnet11()
|
||||
else
|
||||
WINEDLLOVERRIDES="regsvcs.exe=b" w_try "$WINE" dotnetfx.exe
|
||||
fi
|
||||
|
||||
W_NGEN_CMD="w_try $WINE $DRIVE_C/windows/Microsoft.NET/Framework/v1.1.4322/ngen.exe executequeueditems"
|
||||
}
|
||||
|
||||
verify_dotnet11()
|
||||
@ -5285,6 +5291,8 @@ load_dotnet11sp1()
|
||||
else
|
||||
WINEDLLOVERRIDES="regsvcs.exe=b" w_try "$WINE" "$W_CACHE"/dotnet11sp1/NDP1.1sp1-KB867460-X86.exe
|
||||
fi
|
||||
|
||||
W_NGEN_CMD="w_try $WINE $DRIVE_C/windows/Microsoft.NET/Framework/v1.1.4322/ngen.exe executequeueditems"
|
||||
}
|
||||
|
||||
verify_dotnet11sp1()
|
||||
@ -5294,29 +5302,6 @@ verify_dotnet11sp1()
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata dotnet_verifier dlls \
|
||||
title="MS .NET Verifier" \
|
||||
publisher="Microsoft" \
|
||||
year="2012" \
|
||||
media="download" \
|
||||
file1="netfx_5F00_setupverifier_5F00_new.zip" \
|
||||
installed_file1="$W_SYSTEM32_DLLS_WIN/netfx_setupverifier.exe"
|
||||
|
||||
load_dotnet_verifier()
|
||||
{
|
||||
# http://blogs.msdn.com/b/astebner/archive/2008/10/13/8999004.aspx
|
||||
# 2013/03/28: sha1sum 0eba832a0733cd47b7639463dd5a22a41e95ee6e
|
||||
# 2014/01/23: sha1sum 8818f3460826145e2a66bb91727afa7cd531037b
|
||||
# 2014/11/22: sha1sum 47de0b849c4c3d354df23588c709108e7816d788
|
||||
w_download http://blogs.msdn.com/cfs-file.ashx/__key/CommunityServer-Components-PostAttachments/00-08-99-90-04/netfx_5F00_setupverifier_5F00_new.zip 47de0b849c4c3d354df23588c709108e7816d788
|
||||
|
||||
cd "$W_CACHE"/dotnet_verifier
|
||||
|
||||
w_try_unzip "$W_SYSTEM32_DLLS" netfx_5F00_setupverifier_5F00_new.zip netfx_setupverifier.exe
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata dotnet20 dlls \
|
||||
title="MS .NET 2.0" \
|
||||
publisher="Microsoft" \
|
||||
@ -5366,6 +5351,7 @@ load_dotnet20()
|
||||
w_killall "mscorsvw.exe"
|
||||
fi
|
||||
|
||||
W_NGEN_CMD="w_try $WINE $DRIVE_C/windows/Microsoft.NET/Framework/v2.0.50727/ngen.exe executequeueditems"
|
||||
}
|
||||
|
||||
verify_dotnet20()
|
||||
@ -5497,6 +5483,8 @@ load_dotnet20sp1()
|
||||
rm -f "$W_SYSTEM32_DLLS"/msvc?80.dll
|
||||
|
||||
w_unset_winver
|
||||
|
||||
W_NGEN_CMD="w_try $WINE $DRIVE_C/windows/Microsoft.NET/Framework/v2.0.50727/ngen.exe executequeueditems"
|
||||
}
|
||||
|
||||
verify_dotnet20sp1()
|
||||
@ -5576,6 +5564,8 @@ load_dotnet20sp2()
|
||||
esac
|
||||
|
||||
w_unset_winver
|
||||
|
||||
W_NGEN_CMD="w_try $WINE $DRIVE_C/windows/Microsoft.NET/Framework/v2.0.50727/ngen.exe executequeueditems"
|
||||
}
|
||||
|
||||
verify_dotnet20sp2()
|
||||
@ -5650,6 +5640,9 @@ load_dotnet30()
|
||||
|
||||
cd "$W_CACHE"/dotnet30
|
||||
w_try "$WINE" $file1 ${W_OPT_UNATTENDED:+ /q /c:"install.exe /q"}
|
||||
|
||||
# Doesn't install any ngen.exe
|
||||
# W_NGEN_CMD=""
|
||||
}
|
||||
|
||||
verify_dotnet30()
|
||||
@ -5692,6 +5685,9 @@ load_dotnet30sp1()
|
||||
"$WINE" $file1 ${W_OPT_UNATTENDED:+/q}
|
||||
status=$?
|
||||
w_info $file1 exited with status $status
|
||||
|
||||
# Doesn't install any ngen.exe
|
||||
# W_NGEN_CMD=""
|
||||
}
|
||||
|
||||
verify_dotnet30sp1()
|
||||
@ -5737,6 +5733,9 @@ load_dotnet35()
|
||||
w_try_cabextract $W_UNATTENDED_DASH_Q "$W_CACHE"/dotnet35/dotnetfx35.exe
|
||||
cd wcu/dotNetFramework
|
||||
"$WINE" dotNetFx35setup.exe /lang:ENU $W_UNATTENDED_SLASH_Q
|
||||
|
||||
# Doesn't install any ngen.exe
|
||||
# W_NGEN_CMD=""
|
||||
}
|
||||
|
||||
verify_dotnet35()
|
||||
@ -5797,6 +5796,9 @@ load_dotnet35sp1()
|
||||
}
|
||||
}
|
||||
"
|
||||
|
||||
# Doesn't install any ngen.exe
|
||||
# W_NGEN_CMD=""
|
||||
}
|
||||
|
||||
verify_dotnet35sp1()
|
||||
@ -5870,6 +5872,8 @@ load_dotnet40()
|
||||
mkdir -p "$W_WINDIR_UNIX/Microsoft.NET/assembly/GAC_32/System.EnterpriseServices/v4.0_4.0.0.0__b03f5f7f11d50a3a"
|
||||
cp "$W_WINDIR_UNIX/Microsoft.NET/Framework/v4.0.30319/System.EnterpriseServices.dll" "$W_WINDIR_UNIX/Microsoft.NET/assembly/GAC_32/System.EnterpriseServices/v4.0_4.0.0.0__b03f5f7f11d50a3a"
|
||||
fi
|
||||
|
||||
W_NGEN_CMD="$WINE $WINEPREFIX/drive_c/windows/Microsoft.NET/Framework/v4.0.30319/ngen.exe executequeueditems"
|
||||
}
|
||||
|
||||
verify_dotnet40()
|
||||
@ -5935,6 +5939,29 @@ verify_dotnet45()
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata dotnet_verifier dlls \
|
||||
title="MS .NET Verifier" \
|
||||
publisher="Microsoft" \
|
||||
year="2012" \
|
||||
media="download" \
|
||||
file1="netfx_5F00_setupverifier_5F00_new.zip" \
|
||||
installed_file1="$W_SYSTEM32_DLLS_WIN/netfx_setupverifier.exe"
|
||||
|
||||
load_dotnet_verifier()
|
||||
{
|
||||
# http://blogs.msdn.com/b/astebner/archive/2008/10/13/8999004.aspx
|
||||
# 2013/03/28: sha1sum 0eba832a0733cd47b7639463dd5a22a41e95ee6e
|
||||
# 2014/01/23: sha1sum 8818f3460826145e2a66bb91727afa7cd531037b
|
||||
# 2014/11/22: sha1sum 47de0b849c4c3d354df23588c709108e7816d788
|
||||
w_download http://blogs.msdn.com/cfs-file.ashx/__key/CommunityServer-Components-PostAttachments/00-08-99-90-04/netfx_5F00_setupverifier_5F00_new.zip 47de0b849c4c3d354df23588c709108e7816d788
|
||||
|
||||
cd "$W_CACHE"/dotnet_verifier
|
||||
|
||||
w_try_unzip "$W_SYSTEM32_DLLS" netfx_5F00_setupverifier_5F00_new.zip netfx_setupverifier.exe
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata dxdiagn dlls \
|
||||
title="DirectX Diagnostic Library" \
|
||||
publisher="Microsoft" \
|
||||
@ -5976,7 +6003,7 @@ load_dsound()
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
# FIXME: update winetricks_is_installed to look at installed_file2
|
||||
# FIXME: update winetricks_is_installed to look at installed_file2..n
|
||||
w_metadata flash dlls \
|
||||
title="Flash Player 14" \
|
||||
publisher="Adobe" \
|
||||
@ -5984,8 +6011,10 @@ w_metadata flash dlls \
|
||||
media="download" \
|
||||
file1="install_flash_player.exe" \
|
||||
file2="install_flash_player_ax.exe" \
|
||||
file3="flashplayer_14_sa.exe" \
|
||||
installed_file1="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/FlashUtil32_14_0_0_179_Plugin.exe" \
|
||||
installed_file2="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/FlashUtil32_14_0_0_176_ActiveX.exe" \
|
||||
installed_file3="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/flashplayer_14_sa.exe" \
|
||||
homepage="http://www.adobe.com/products/flashplayer/"
|
||||
|
||||
load_flash()
|
||||
@ -6031,10 +6060,10 @@ load_flash()
|
||||
cd "$W_TMP"/fp_14.0.0.179_archive/14_0_r0_179
|
||||
w_try "$WINE" flashplayer14_0r0_179_win.exe ${W_OPT_UNATTENDED:+ /install}
|
||||
|
||||
if w_workaround_wine_bug 25966 "Flash11 still needs native visual c++ 2005 runtimes" 1.5.7,
|
||||
then
|
||||
w_call vcrun2005
|
||||
fi
|
||||
# Projector (standalone player)
|
||||
# 2015-07-06
|
||||
w_download http://download.macromedia.com/pub/flashplayer/updaters/14/flashplayer_14_sa.exe 62e5bc2e88b50091847408b9d473ee4a6c185167
|
||||
w_try cp "${W_CACHE}/${W_PACKAGE}/${file3}" "$W_SYSTEM32_DLLS/Macromed/Flash"
|
||||
|
||||
# After updating the above, you should carry the following steps out by
|
||||
# hand to verify that plugin works. (Ideally you'd also do it on
|
||||
@ -6052,7 +6081,7 @@ load_flash()
|
||||
#
|
||||
# cd ~/winetricks/src
|
||||
# rm -rf ~/.wine
|
||||
# sh winetricks -q flash --no-isolate firefox
|
||||
# sh winetricks -q flash firefox
|
||||
# cd ~/.wine/drive_c/Program\ Files/Mozilla\ Firefox
|
||||
# wine firefox.exe http://www.adobe.com/software/flash/about
|
||||
# Verify that the version of flash shows up and that you're not prompted
|
||||
@ -6327,23 +6356,22 @@ load_jet40()
|
||||
w_metadata kde apps \
|
||||
title="KDE on Windows" \
|
||||
publisher="various" \
|
||||
year="2011" \
|
||||
year="2013" \
|
||||
media="download" \
|
||||
file1="kdewin-installer-gui-0.9.8-1.exe" \
|
||||
file1="kdewin-installer-gui-1.0.0.exe" \
|
||||
installed_exe1="$W_PROGRAMS_WIN/kde/etc/installer.ini" \
|
||||
homepage="http://windows.kde.org" \
|
||||
unattended="no"
|
||||
|
||||
load_kde()
|
||||
{
|
||||
w_download http://www.winkde.org/pub/kde/ports/win32/installer/kdewin-installer-gui-0.9.8-1.exe b31aaf24d23b9f289bf56aa21e1571efc6bea58a
|
||||
|
||||
w_download http://mirrors.mit.edu/kde/stable/kdewin/installer/kdewin-installer-gui-1.0.0.exe 0d798facb7fbf11529e7ecd067e875d76adb9d78
|
||||
mkdir -p "$W_PROGRAMS_UNIX/kde"
|
||||
w_try cp "$W_CACHE"/kde/kdewin-installer-gui-0.9.8-1.exe "$W_PROGRAMS_UNIX/kde"
|
||||
w_try cp "$W_CACHE/kde/${file1}" "$W_PROGRAMS_UNIX/kde"
|
||||
cd "$W_PROGRAMS_UNIX/kde"
|
||||
# There's no unattended option, probably because there are so many choices,
|
||||
# it's like cygwin
|
||||
w_try "$WINE" kdewin-installer-gui-0.9.8-1.exe
|
||||
w_try "$WINE" "${file1}"
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
@ -6351,7 +6379,7 @@ load_kde()
|
||||
w_metadata kindle apps \
|
||||
title="Amazon Kindle" \
|
||||
publisher="Amazon" \
|
||||
year="2011" \
|
||||
year="2015" \
|
||||
media="download" \
|
||||
file1="KindleForPC-installer.exe" \
|
||||
installed_exe1="$W_PROGRAMS_WIN/Amazon/Kindle/Kindle.exe" \
|
||||
@ -6359,7 +6387,7 @@ w_metadata kindle apps \
|
||||
|
||||
load_kindle()
|
||||
{
|
||||
w_download http://kindleforpc.amazon.com/36154/KindleForPC-installer.exe aca576086de7abd1d82c211dbeeb810387e046f5
|
||||
w_download http://kindleforpc.amazon.com/40666/KindleForPC-installer.exe 10e8c82587f8c08b77e5ed55dd94d9851a2a899c
|
||||
cd "$W_CACHE"/kindle
|
||||
w_try "$WINE" $file1 ${W_OPT_UNATTENDED:+ /S}
|
||||
w_declare_exe "$W_PROGRAMS_WIN\\Amazon\\Kindle" Kindle.exe
|
||||
@ -6671,7 +6699,7 @@ w_metadata msxml3 dlls \
|
||||
title="MS XML Core Services 3.0" \
|
||||
publisher="Microsoft" \
|
||||
year="2005" \
|
||||
media="manual_download" \
|
||||
media="download" \
|
||||
file1="msxml3.msi" \
|
||||
installed_file1="$W_SYSTEM32_DLLS_WIN/msxml3.dll"
|
||||
|
||||
@ -6680,9 +6708,7 @@ load_msxml3()
|
||||
# Service Pack 5
|
||||
#w_download http://download.microsoft.com/download/a/5/e/a5e03798-2454-4d4b-89a3-4a47579891d8/msxml3.msi
|
||||
# Service Pack 7
|
||||
#w_download http://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b19f33dd/msxml3.msi d4c2178dfb807e1a0267fce0fd06b8d51106d913
|
||||
# Hmm. Anyone know of a better source? At least it has the right checksum.
|
||||
w_download_manual http://download.cnet.com/Microsoft-XML-Parser-MSXML-3-0-Service-Pack-7-SP7/3000-7241_4-10731613.html msxml3.msi d4c2178dfb807e1a0267fce0fd06b8d51106d913
|
||||
w_download http://web.archive.org/web/20070314193356/http://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b19f33dd/msxml3.msi d4c2178dfb807e1a0267fce0fd06b8d51106d913
|
||||
|
||||
# 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
|
||||
@ -8099,7 +8125,7 @@ load_xmllite()
|
||||
if w_workaround_wine_bug 16013
|
||||
then
|
||||
# Find instructions to create this file in dlls/wintrust/tests/crypt.c
|
||||
w_download http://winezeug.googlecode.com/svn/trunk/winetricks_files/winetest.cat ac8f50dd54d011f3bb1dd79240dae9378748449f
|
||||
w_download https://github.com/Winetricks/winetricks/raw/master/files/winetest.cat ac8f50dd54d011f3bb1dd79240dae9378748449f
|
||||
# Put a dummy catalog file in place
|
||||
mkdir -p "$W_SYSTEM32_DLLS"/catroot/\{f750e6c3-38ee-11d1-85e5-00c04fc295ee\}
|
||||
w_try cp -f "$W_CACHE"/xmllite/winetest.cat "$W_SYSTEM32_DLLS"/catroot/\{f750e6c3-38ee-11d1-85e5-00c04fc295ee\}/oem0.cat
|
||||
@ -8804,18 +8830,18 @@ load_allfonts()
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata 7zip apps \
|
||||
title="7-Zip" \
|
||||
title="7-Zip 15.05 beta" \
|
||||
publisher="Igor Pavlov" \
|
||||
year="2014" \
|
||||
year="2015" \
|
||||
media="download" \
|
||||
file1="7z935.exe" \
|
||||
file1="7z1505.exe" \
|
||||
installed_exe1="$W_PROGRAMS_X86_WIN/7-Zip/7zFM.exe"
|
||||
|
||||
load_7zip()
|
||||
{
|
||||
w_download http://downloads.sourceforge.net/project/sevenzip/7-Zip/9.35/7z935.exe f0f975755480ce7519a865aa750b7f52f0f8d7d5
|
||||
w_download http://www.7-zip.org/a/7z1505.exe ece8bbd4c8903095d44e99196219c953a1d47bfd
|
||||
cd "$W_CACHE/$W_PACKAGE"
|
||||
w_try "$WINE" 7z935.exe $W_UNATTENDED_SLASH_S
|
||||
w_try "$WINE" 7z1505.exe $W_UNATTENDED_SLASH_S
|
||||
w_declare_exe "$W_PROGRAMS_X86_WIN\\7-Zip" "7zFM.exe"
|
||||
}
|
||||
|
||||
@ -9088,11 +9114,11 @@ load_emu8086()
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata firefox apps \
|
||||
title="Firefox 33.1" \
|
||||
title="Firefox 39.0" \
|
||||
publisher="Mozilla" \
|
||||
year="2014" \
|
||||
year="2015" \
|
||||
media="download" \
|
||||
file1="Firefox Setup 33.1.exe" \
|
||||
file1="FirefoxSetup39.0.exe" \
|
||||
installed_exe1="$W_PROGRAMS_X86_WIN/Mozilla Firefox/firefox.exe"
|
||||
|
||||
load_firefox()
|
||||
@ -9102,7 +9128,7 @@ load_firefox()
|
||||
w_warn "Visit about:config, search for dom.ipc, and set those booleans false if you want to use flash."
|
||||
fi
|
||||
|
||||
w_download "http://download.mozilla.org/?product=firefox-33.1&os=win&lang=en-US" c721219fda2915c570e3de0954c8033ed7b1e7fa "$file1"
|
||||
w_download "https://download.mozilla.org/?product=firefox-39.0-SSL&os=win&lang=en-US" 75eccbd9b2d44210b551c9a5045f03f01e899528 "$file1"
|
||||
cd "$W_CACHE"/firefox
|
||||
w_try "$WINE" "$file1" ${W_OPT_UNATTENDED:+ -ms}
|
||||
|
||||
@ -9356,7 +9382,7 @@ load_ie7()
|
||||
|
||||
# See http://bugs.winehq.org/show_bug.cgi?id=16013
|
||||
# Find instructions to create this file in dlls/wintrust/tests/crypt.c
|
||||
w_download http://winezeug.googlecode.com/svn/trunk/winetricks_files/winetest.cat ac8f50dd54d011f3bb1dd79240dae9378748449f
|
||||
w_download https://github.com/Winetricks/winetricks/raw/master/files/winetest.cat ac8f50dd54d011f3bb1dd79240dae9378748449f
|
||||
|
||||
# Put a dummy catalog file in place
|
||||
mkdir -p "$W_SYSTEM32_DLLS"/catroot/\{f750e6c3-38ee-11d1-85e5-00c04fc295ee\}
|
||||
@ -9469,7 +9495,7 @@ load_ie8()
|
||||
|
||||
# See http://bugs.winehq.org/show_bug.cgi?id=16013
|
||||
# Find instructions to create this file in dlls/wintrust/tests/crypt.c
|
||||
w_download http://winezeug.googlecode.com/svn/trunk/winetricks_files/winetest.cat ac8f50dd54d011f3bb1dd79240dae9378748449f
|
||||
w_download https://github.com/Winetricks/winetricks/raw/master/files/winetest.cat ac8f50dd54d011f3bb1dd79240dae9378748449f
|
||||
|
||||
# Put a dummy catalog file in place
|
||||
mkdir -p "$W_SYSTEM32_DLLS"/catroot/\{f750e6c3-38ee-11d1-85e5-00c04fc295ee\}
|
||||
@ -9646,6 +9672,23 @@ load_nook()
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata npp apps \
|
||||
title="Notepad++" \
|
||||
publisher="Don Ho" \
|
||||
year="2015" \
|
||||
media="download" \
|
||||
file1="npp.6.7.9.2.Installer.exe" \
|
||||
installed_exe1="$W_PROGRAMS_X86_WIN/Notepad++/notepad++.exe"
|
||||
|
||||
load_npp()
|
||||
{
|
||||
w_download https://notepad-plus-plus.org/repository/6.x/6.7.9.2/npp.6.7.9.2.Installer.exe 34574fb2e4e06ff941061bf444b57ce926ce23d7
|
||||
cd "$W_CACHE/$W_PACKAGE"
|
||||
w_try "$WINE" "${file1}" $W_UNATTENDED_SLASH_S
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata office2003pro apps \
|
||||
title="Microsoft Office 2003 Professional" \
|
||||
publisher="Microsoft" \
|
||||
@ -10181,7 +10224,8 @@ load_steam()
|
||||
# 17 Mar 2014 b2a3fdbe4a662f3bf751f5b8bfc61f8d35e050fe
|
||||
# 11 Dec 2014 7ad8fbeffa6c963b821f80129c15c9d8e85f9a4a
|
||||
# 6 Jan 2015 e04aefe8bc894f11f211edec8e8a008abe0147d2
|
||||
w_download http://media.steampowered.com/client/installer/SteamSetup.exe e04aefe8bc894f11f211edec8e8a008abe0147d2
|
||||
# 21 Jun 2015 0e8046d40c38d817338135ec73a5b217cc340cf5
|
||||
w_download http://media.steampowered.com/client/installer/SteamSetup.exe 0e8046d40c38d817338135ec73a5b217cc340cf5
|
||||
cd "$W_CACHE"/steam
|
||||
|
||||
# Install corefonts first, so if the user doesn't have cabextract/Wine with cab support, we abort before installing Steam.
|
||||
@ -10556,17 +10600,17 @@ load_vc2010express()
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata vlc apps \
|
||||
title="VLC media player" \
|
||||
title="VLC media player 2.2.1" \
|
||||
publisher="videolan.org" \
|
||||
year="2014" \
|
||||
year="2015" \
|
||||
media="download" \
|
||||
file1="vlc-2.1.5-win32.exe" \
|
||||
file1="vlc-2.2.1-win32.exe" \
|
||||
installed_file1="$W_PROGRAMS_X86_WIN/VideoLAN/VLC/vlc.exe" \
|
||||
homepage="http://www.videolan.org/vlc/"
|
||||
|
||||
load_vlc()
|
||||
{
|
||||
w_download http://get.videolan.org/vlc/2.1.5/win32/vlc-2.1.5-win32.exe bc5e2b879c110c7702973fa3c380550ea2856689
|
||||
w_download http://get.videolan.org/vlc/2.2.1/win32/vlc-2.2.1-win32.exe 4cbcea9764b6b657d2147645eeb5b973b642530e
|
||||
cd "$W_CACHE"/vlc
|
||||
w_try "$WINE" $file1 ${W_OPT_UNATTENDED:+ /S}
|
||||
w_declare_exe "$W_PROGRAMS_X86_WIN\\VideoLAN\\VLC" vlc.exe
|
||||
@ -17476,132 +17520,6 @@ load_wog()
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata wot games \
|
||||
title="World of Tanks" \
|
||||
publisher="Wargaming" \
|
||||
year="2011" \
|
||||
media="download" \
|
||||
file1="WoT_0.6.7_us_setup.exe" \
|
||||
installed_exe1="c:/Games/World_of_Tanks/WorldOfTanks.exe" \
|
||||
wine_showstoppers="20395" # list a showstopper to hide this from average users for now
|
||||
|
||||
load_wot()
|
||||
{
|
||||
if w_workaround_wine_bug 20395 "game requires raw input hack"
|
||||
then
|
||||
w_open_webpage https://gist.github.com/895204#gistcomment-41069
|
||||
w_warn "You need to apply rawinput-hack.patch from vincas for this game to work"
|
||||
fi
|
||||
if w_workaround_wine_bug 25730 "installing msxml3 to avoid startup crash" 1.3.33,
|
||||
then
|
||||
w_call msxml3
|
||||
fi
|
||||
if w_workaround_wine_bug 11675 "need d3dx9_36 for effects framework"
|
||||
then
|
||||
w_call d3dx9_36
|
||||
fi
|
||||
if w_workaround_wine_bug 25779 "installing ie7 for launcher"
|
||||
then
|
||||
w_call ie7
|
||||
fi
|
||||
|
||||
# http://cdn1.worldoftanks.com/patches/auto/WoT_0.6.7_us_setup.exe.torrent
|
||||
w_download http://cdn1.worldoftanks.com/patches/auto/WoT_0.6.7_us_setup.exe 440c4b3f8269d3746c912db94d697eccb139d3a6
|
||||
|
||||
cd "$W_CACHE/$W_PACKAGE"
|
||||
w_ahk_do "
|
||||
SetWinDelay 500
|
||||
run $file1
|
||||
winwait, Setup - World of Tanks
|
||||
if ( w_opt_unattended > 0 ) {
|
||||
ControlClick, TNewButton1 ; Next
|
||||
winwait, Setup - World of Tanks, Select Destination
|
||||
ControlClick, TNewButton3 ; Next
|
||||
winwait, Setup - World of Tanks, Select Start
|
||||
ControlClick, TNewButton4 ; Next
|
||||
winwait, Setup - World of Tanks, Select Additional
|
||||
ControlClick, TNewButton4 ; Next
|
||||
winwait, Setup - World of Tanks, Ready
|
||||
ControlClick, TNewButton4 ; Next
|
||||
}
|
||||
winwait, Setup - World of Tanks, Completing
|
||||
if ( w_opt_unattended > 0 ) {
|
||||
ControlFocus, TNewCheckListBox1
|
||||
send {space} ; uncheck Wiki
|
||||
sleep 500
|
||||
ControlClick, TNewButton4 ; Finish
|
||||
winwaitclose
|
||||
}
|
||||
"
|
||||
w_declare_exe "c:\\Games\\World_of_Tanks" WorldOfTanks.exe
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata wowtrial games \
|
||||
title="World of Warcraft trial" \
|
||||
publisher="Blizzard" \
|
||||
year="2010" \
|
||||
media="download" \
|
||||
file1="WOW-4.0.0.12911-enUS-Trial.exe" \
|
||||
installed_exe1="$W_PROGRAMS_X86_WIN/World of Warcraft/WoW.exe"
|
||||
|
||||
load_wowtrial()
|
||||
{
|
||||
w_download http://us.media.battle.net.edgesuite.net/downloads/wow-installers/WOW-4.0.0.12911-enUS-Trial.exe 1efb32d10afc4c200a8f34d44980077668085c95
|
||||
|
||||
cd "$W_CACHE/$W_PACKAGE"
|
||||
|
||||
w_ahk_do "
|
||||
SetTitleMatchMode, slow
|
||||
SetTitleMatchMode, 2
|
||||
run WOW-4.0.0.12911-enUS-Trial.exe
|
||||
winwait, World of Warcraft Installer
|
||||
if ( w_opt_unattended > 0 ) {
|
||||
; Wait for it to find servers
|
||||
sleep 6000
|
||||
controlclick, x400 y440 ; Install
|
||||
winwait, End User License Agreement
|
||||
sleep 1000
|
||||
controlclick, Button2 ; Accept
|
||||
winwait, World of Warcraft Installer
|
||||
sleep 1000
|
||||
controlclick, x680 y560 ; OK
|
||||
}
|
||||
winwait, World of Warcraft v4, Play
|
||||
if ( w_opt_unattended > 0 ) {
|
||||
; Wait until left side of progress bar is green; that means the game is playable.
|
||||
;Loop
|
||||
;{
|
||||
; PixelGetColor, color, 33, 592
|
||||
; FileAppend, loop1 color is %color%, log.txt
|
||||
; ifEqual, color, 0x017425
|
||||
; {
|
||||
; break
|
||||
; }
|
||||
; sleep 5000
|
||||
;}
|
||||
; Wait until left side of progress bar goes blackish, that means game is fully loaded
|
||||
Loop
|
||||
{
|
||||
PixelGetColor, color, 33, 592
|
||||
;FileAppend, loop2 color is %color%, log.txt
|
||||
ifEqual, color, 0x003C10
|
||||
{
|
||||
break
|
||||
}
|
||||
sleep 5000
|
||||
}
|
||||
; All done downloading, so quit
|
||||
winclose
|
||||
}
|
||||
winwaitclose
|
||||
"
|
||||
w_declare_exe "$W_PROGRAMS_X86_WIN\\World of Warcraft" WoW.exe
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata zootycoon2_demo games \
|
||||
title="Zoo Tycoon 2 demo" \
|
||||
publisher="Microsoft" \
|
||||
@ -17990,20 +17908,6 @@ load_orm()
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata psm=enabled settings \
|
||||
title_uk="Включити PixelShaderMode" \
|
||||
title="Set PixelShaderMode to enabled"
|
||||
w_metadata psm=disabled settings \
|
||||
title_uk="Вимкнути PixelShaderMode" \
|
||||
title="Set PixelShaderMode to disabled"
|
||||
|
||||
load_psm()
|
||||
{
|
||||
winetricks_set_wined3d_var PixelShaderMode $1
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata strictdrawordering=enabled settings \
|
||||
title_uk="Включити StrictDrawOrdering" \
|
||||
title="Enable StrictDrawOrdering"
|
||||
@ -18281,6 +18185,22 @@ load_forcemono()
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata gsm=0 settings \
|
||||
title="Set MaxShaderModelGS to 0"
|
||||
w_metadata gsm=1 settings \
|
||||
title="Set MaxShaderModelGS to 1"
|
||||
w_metadata gsm=2 settings \
|
||||
title="Set MaxShaderModelGS to 2"
|
||||
w_metadata gsm=3 settings \
|
||||
title="Set MaxShaderModelGS to 3"
|
||||
|
||||
load_gsm()
|
||||
{
|
||||
winetricks_set_wined3d_var MaxShaderModelGS $1
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata heapcheck settings \
|
||||
title_uk="Включити накопичувальну перевірку GlobalFlag" \
|
||||
title="Enable heap checking with GlobalFlag"
|
||||
@ -18375,6 +18295,22 @@ load_nt40()
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata psm=0 settings \
|
||||
title="Set MaxShaderModelPS to 0"
|
||||
w_metadata psm=1 settings \
|
||||
title="Set MaxShaderModelPS to 1"
|
||||
w_metadata psm=2 settings \
|
||||
title="Set MaxShaderModelPS to 2"
|
||||
w_metadata psm=3 settings \
|
||||
title="Set MaxShaderModelPS to 3"
|
||||
|
||||
load_psm()
|
||||
{
|
||||
winetricks_set_wined3d_var MaxShaderModelPS $1
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata sandbox settings \
|
||||
title_uk="Пісочниця wineprefix - видалити посилання до HOME" \
|
||||
title="Sandbox the wineprefix - remove links to \$HOME"
|
||||
@ -18546,13 +18482,18 @@ load_vista()
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata vsm=hardware settings \
|
||||
title_uk="Поставити VertexShaderMode на hardware" \
|
||||
title="Set VertexShaderMode to hardware"
|
||||
w_metadata vsm=0 settings \
|
||||
title="Set MaxShaderModelVS to 0"
|
||||
w_metadata vsm=1 settings \
|
||||
title="Set MaxShaderModelVS to 1"
|
||||
w_metadata vsm=2 settings \
|
||||
title="Set MaxShaderModelVS to 2"
|
||||
w_metadata vsm=3 settings \
|
||||
title="Set MaxShaderModelVS to 3"
|
||||
|
||||
load_vsm()
|
||||
{
|
||||
winetricks_set_wined3d_var VertexShaders $1
|
||||
winetricks_set_wined3d_var MaxShaderModelVS $1
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
@ -19053,7 +18994,6 @@ execute_command()
|
||||
glsl=disable*) w_call glsl=disabled ;;
|
||||
multisampling=disable*) w_call multisampling=disabled ;;
|
||||
mwo=disable*) w_call mwo=disable ;; # FIXME: relax matching so we can handle these spelling differences in verb instead of here
|
||||
psm=disable*) w_call psm=disabled ;;
|
||||
rtlm=disable*) w_call rtlm=disabled ;;
|
||||
sound=disable*) w_call sound=disabled ;;
|
||||
ao=disable*) w_call ao=disabled ;;
|
||||
@ -19084,14 +19024,11 @@ execute_command()
|
||||
jscript) w_call wsh56js ;; # FIXME: use wsh57 instead?
|
||||
npm-repack) w_call npm=repack ;;
|
||||
oss) w_call sound=oss ;;
|
||||
psm=off) w_call psm=disabled ;;
|
||||
psm=on) w_call psm=enabled ;;
|
||||
python) w_call python26 ;;
|
||||
python-comtypes) w_call python26_comtypes ;;
|
||||
vbrun60) w_call vb6run ;;
|
||||
vcrun2005sp1) w_call vcrun2005 ;;
|
||||
vcrun2008sp1) w_call vcrun2008 ;;
|
||||
vsm-hard) w_call vsm=hardware ;;
|
||||
wsh56) w_call wsh57 ;;
|
||||
xlive) w_call gfw ;;
|
||||
|
||||
@ -19152,12 +19089,7 @@ then
|
||||
main) verbs=`winetricks_mainmenu` ;;
|
||||
prefix)
|
||||
verbs=`winetricks_prefixmenu`;
|
||||
# Cheezy hack: choosing type of package in prefix menu == whether to isolate.
|
||||
case "$verbs" in
|
||||
apps|benchmarks|games) WINETRICKS_OPT_SHAREDPREFIX=0 ;;
|
||||
*) WINETRICKS_OPT_SHAREDPREFIX=1 ;;
|
||||
esac
|
||||
# Cheezy hack #2: choosing 'attended' or 'unattended' leaves you in same menu
|
||||
# Cheezy hack: choosing 'attended' or 'unattended' leaves you in same menu
|
||||
case "$verbs" in
|
||||
attended) winetricks_set_unattended 0 ; continue;;
|
||||
unattended) winetricks_set_unattended 1 ; continue;;
|
||||
@ -19234,4 +19166,3 @@ then
|
||||
|
||||
winetricks_stats_report
|
||||
fi
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user