- Update to 2.20 development snapshot
- Improved event support in MSHTML. - Preloader support on ARM64. - Interpolation modes in Direct3D. - Improved metafile support in GdiPlus. - Initial version of Kerberos5 Authentication Package. - OLE clipboard cache improvements. - Various bug fixes. - updated winetricks OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=443
This commit is contained in:
Git OBS Bridge
191
winetricks
191
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=20170823-next
|
||||
WINETRICKS_VERSION=20171018-next
|
||||
|
||||
# This is a UTF-8 file
|
||||
# You should see an o with two dots over it here [ö]
|
||||
@@ -2679,12 +2679,6 @@ w_do_call()
|
||||
test "$W_OPT_NOCLEAN" = 1 || rm -rf "$W_TMP"
|
||||
mkdir -p "$W_TMP"
|
||||
|
||||
# Don't install if already installed
|
||||
if test "$WINETRICKS_FORCE" != 1 && winetricks_is_installed "$1"; then
|
||||
echo "$1 already installed, skipping"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Don't install if a conflicting verb is already installed:
|
||||
# shellcheck disable=SC2154
|
||||
if test "$WINETRICKS_FORCE" != 1 && test "$conflicts" && test -f "$WINEPREFIX/winetricks.log"; then
|
||||
@@ -2694,6 +2688,12 @@ w_do_call()
|
||||
done
|
||||
fi
|
||||
|
||||
# Don't install if already installed
|
||||
if test "$WINETRICKS_FORCE" != 1 && winetricks_is_installed "$1"; then
|
||||
echo "$1 already installed, skipping"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# We'd like to get rid of W_PACKAGE, but for now, just set it as late as possible.
|
||||
W_PACKAGE=$1
|
||||
w_try "load_$cmd" "$arg"
|
||||
@@ -9505,6 +9505,7 @@ w_metadata vcrun2015 dlls \
|
||||
publisher="Microsoft" \
|
||||
year="2015" \
|
||||
media="download" \
|
||||
conflicts="vcrun2017" \
|
||||
file1="vc_redist.x86.exe" \
|
||||
installed_file1="$W_SYSTEM32_DLLS_WIN/mfc140.dll"
|
||||
|
||||
@@ -9562,6 +9563,71 @@ load_vcrun2015()
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata vcrun2017 dlls \
|
||||
title="Visual C++ 2017 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll)" \
|
||||
publisher="Microsoft" \
|
||||
year="2017" \
|
||||
media="download" \
|
||||
conflicts="vcrun2015" \
|
||||
file1="VC_redist.x86.exe" \
|
||||
installed_file1="$W_SYSTEM32_DLLS_WIN/mfc140.dll"
|
||||
|
||||
# FIXME: There's a conflict with vcrun2015 because the dll's version number for 2017 and 2015 are the same. Correct behavior should be compared to native Windows.
|
||||
load_vcrun2017()
|
||||
{
|
||||
# https://go.microsoft.com/fwlink/?LinkId=746571
|
||||
# 2017/10/02: 2da11e22a276be85970eaed255daf3d92af84e94142ec04252326a882e57303e
|
||||
w_download https://download.visualstudio.microsoft.com/download/pr/11100229/78c1e864d806e36f6035d80a0e80399e/VC_redist.x86.exe 2da11e22a276be85970eaed255daf3d92af84e94142ec04252326a882e57303e
|
||||
|
||||
if w_workaround_wine_bug 37781; then
|
||||
w_warn "This may fail in non-XP mode, see https://bugs.winehq.org/show_bug.cgi?id=37781"
|
||||
fi
|
||||
|
||||
w_override_dlls native,builtin api-ms-win-crt-conio-l1-1-0 api-ms-win-crt-heap-l1-1-0 api-ms-win-crt-locale-l1-1-0 api-ms-win-crt-math-l1-1-0 api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 api-ms-win-crt-time-l1-1-0 atl140 concrt140 msvcp140 msvcr140 ucrtbase vcomp140 vcruntime140
|
||||
|
||||
w_set_winver winxp
|
||||
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
w_try "$WINE" VC_redist.x86.exe $W_UNATTENDED_SLASH_Q
|
||||
|
||||
case "$W_ARCH" in
|
||||
win64)
|
||||
# Also install the 64-bit version
|
||||
# https://go.microsoft.com/fwlink/?LinkId=746572
|
||||
# 2017/10/02: 7434bf559290cccc3dd3624f10c9e6422cce9927d2231d294114b2f929f0e465
|
||||
w_download https://download.visualstudio.microsoft.com/download/pr/11100230/15ccb3f02745c7b206ad10373cbca89b/VC_redist.x64.exe 7434bf559290cccc3dd3624f10c9e6422cce9927d2231d294114b2f929f0e465
|
||||
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" VC_redist.x64.exe
|
||||
w_try_cabextract --directory="$W_TMP" "$W_TMP/a10"
|
||||
w_try_cabextract --directory="$W_TMP" "$W_TMP/a11"
|
||||
cp "$W_TMP"/concrt140.dll "$W_SYSTEM64_DLLS"/concrt140.dll
|
||||
cp "$W_TMP"/mfc140.dll "$W_SYSTEM64_DLLS"/mfc140.dll
|
||||
cp "$W_TMP"/mfc140u.dll "$W_SYSTEM64_DLLS"/mfc140u.dll
|
||||
cp "$W_TMP"/mfcm140.dll "$W_SYSTEM64_DLLS"/mfcm140.dll
|
||||
cp "$W_TMP"/mfcm140u.dll "$W_SYSTEM64_DLLS"/mfcm140u.dll
|
||||
cp "$W_TMP"/msvcp140.dll "$W_SYSTEM64_DLLS"/msvcp140.dll
|
||||
cp "$W_TMP"/vcamp140.dll "$W_SYSTEM64_DLLS"/vcamp140.dll
|
||||
cp "$W_TMP"/vccorlib140.dll "$W_SYSTEM64_DLLS"/vccorlib140.dll
|
||||
cp "$W_TMP"/vcomp140.dll "$W_SYSTEM64_DLLS"/vcomp140.dll
|
||||
cp "$W_TMP"/vcruntime140.dll "$W_SYSTEM64_DLLS"/vcruntime140.dll
|
||||
|
||||
cp "$W_TMP"/api_ms_win_crt_conio_l1_1_0.dll "$W_SYSTEM64_DLLS"/api-ms-win-crt-conio-l1-1-0.dll
|
||||
cp "$W_TMP"/api_ms_win_crt_heap_l1_1_0.dll "$W_SYSTEM64_DLLS"/api-ms-win-crt-heap-l1-1-0.dll
|
||||
cp "$W_TMP"/api_ms_win_crt_locale_l1_1_0.dll "$W_SYSTEM64_DLLS"/api-ms-win-crt-locale-l1-1-0.dll
|
||||
cp "$W_TMP"/api_ms_win_crt_math_l1_1_0.dll "$W_SYSTEM64_DLLS"/api-ms-win-crt-math-l1-1-0.dll
|
||||
cp "$W_TMP"/api_ms_win_crt_runtime_l1_1_0.dll "$W_SYSTEM64_DLLS"/api-ms-win-crt-runtime-l1-1-0.dll
|
||||
cp "$W_TMP"/api_ms_win_crt_stdio_l1_1_0.dll "$W_SYSTEM64_DLLS"/api-ms-win-crt-stdio-l1-1-0.dll
|
||||
cp "$W_TMP"/ucrtbase.dll "$W_SYSTEM64_DLLS"/ucrtbase.dll
|
||||
else
|
||||
w_try "$WINE" VC_redist.x64.exe $W_UNATTENDED_SLASH_Q
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata vjrun20 dlls \
|
||||
title="MS Visual J# 2.0 SE libraries (requires dotnet20)" \
|
||||
publisher="Microsoft" \
|
||||
@@ -9711,11 +9777,13 @@ load_wmi()
|
||||
# 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
|
||||
# Originally at: https://download.microsoft.com/download/platformsdk/wmi9x/1.5/W9X/EN-US/wmi9x.exe
|
||||
# 2017/10/14: ftp://59.124.141.94 is dead
|
||||
# Mirror list: http://www.filewatcher.com/_/?q=wmi9x.exe
|
||||
w_download ftp://59.124.141.94/Sharpdesk/Redist/Enu/WMI/wmi9x.exe 1d5d94050354b164c6a19531df151e0703d5eb39cebf4357ee2cfc340c2509d0
|
||||
w_download ftp://82.162.138.211/pub/Install/Microsoft/Win9x/Update/wmi9x.exe 1d5d94050354b164c6a19531df151e0703d5eb39cebf4357ee2cfc340c2509d0
|
||||
|
||||
w_set_winver win98
|
||||
w_override_dlls native,builtin wbemprox wmiutils
|
||||
|
||||
# Note: there is a crash in the background towards the end, doesn't seem to hurt; see https://bugs.winehq.org/show_bug.cgi?id=7920
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
w_try "$WINE" wmi9x.exe $W_UNATTENDED_SLASH_S
|
||||
@@ -15137,113 +15205,6 @@ load_gta_vc()
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata hegemonygold_demo games \
|
||||
title="Hegemony Gold" \
|
||||
publisher="Longbow Games" \
|
||||
year="2011" \
|
||||
media="download" \
|
||||
file1="HegemonyGoldInstaller.exe" \
|
||||
installed_exe1="$W_PROGRAMS_X86_WIN/Longbow Digital Arts/Hegemony Gold/Hegemony Gold.exe" \
|
||||
homepage="https://www.longbowgames.com/forums/topic/?id=2146" \
|
||||
rating="bronze"
|
||||
|
||||
load_hegemonygold_demo()
|
||||
{
|
||||
# 2012/03/08: 143a6335b20855922907e3e266fe0ab286ac274dab434f1fca749c7b19c2ab49
|
||||
w_download "https://www.longbowgames.com/downloads/Hegemony%20Gold%20Installer.exe" 143a6335b20855922907e3e266fe0ab286ac274dab434f1fca749c7b19c2ab49 HegemonyGoldInstaller.exe
|
||||
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
|
||||
w_ahk_do "
|
||||
SetWinDelay 500
|
||||
SetTitleMatchMode, 2
|
||||
Run, HegemonyGoldInstaller.exe
|
||||
WinWait,Hegemony
|
||||
if ( w_opt_unattended > 0 ) {
|
||||
ControlClick Button2 ; Next
|
||||
WinWait,Hegemony, License
|
||||
ControlClick Button2 ; Agree
|
||||
WinWait,Hegemony, Components
|
||||
Click, Left, 187, 185
|
||||
Sleep 500
|
||||
ControlClick Button2 ; Next
|
||||
WinWait,Hegemony, Location
|
||||
ControlClick Button2 ; Next
|
||||
WinWait,Hegemony, shortcuts
|
||||
ControlClick Button2 ; Install
|
||||
WinWait,Hegemony, Completing
|
||||
ControlFocus,Button4,launch
|
||||
Sleep 1000
|
||||
Send {Space}
|
||||
Sleep 500
|
||||
ControlClick Button2 ; finish
|
||||
}
|
||||
WinWaitClose,Hegemony
|
||||
"
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata hegemony_demo games \
|
||||
title="Hegemony: Philip of Macedon Demo" \
|
||||
publisher="Longbow Games" \
|
||||
year="2010" \
|
||||
media="download" \
|
||||
file1="Hegemony_Philip_of_Macedon_Installer.exe" \
|
||||
installed_exe1="$W_PROGRAMS_X86_WIN/Longbow Digital Arts/Hegemony Philip of Macedon/Hegemony Philip of Macedon.exe"
|
||||
|
||||
load_hegemony_demo()
|
||||
{
|
||||
# 2017/03/27: 697879215eadfda213c4105de653d056c69ed85ecb06ebafcc19d9344f70751c
|
||||
w_download "https://www.longbowgames.com/downloads/Hegemony%20Philip%20of%20Macedon%20Installer.exe" 697879215eadfda213c4105de653d056c69ed85ecb06ebafcc19d9344f70751c Hegemony_Philip_of_Macedon_Installer.exe
|
||||
|
||||
w_try_cd "$W_CACHE/$W_PACKAGE"
|
||||
|
||||
w_ahk_do "
|
||||
SetTitleMatchMode, 2
|
||||
run, Hegemony_Philip_of_Macedon_Installer.exe
|
||||
winwait, Hegemony, installation
|
||||
if ( w_opt_unattended > 0 ) {
|
||||
controlclick, Button2
|
||||
Sleep 500
|
||||
winwait, Hegemony, License
|
||||
controlclick, Button2
|
||||
winwait, Hegemony, Components
|
||||
controlclick, Button2
|
||||
winwait, Hegemony, Install Location
|
||||
controlclick, Button2
|
||||
winwait, Hegemony, shortcuts
|
||||
controlclick, Button2
|
||||
Loop
|
||||
{
|
||||
; Work around wine bug 24484
|
||||
IfWinExist, Log message, IKnownFolderManager
|
||||
{
|
||||
send {Enter}
|
||||
}
|
||||
; Work around wine bug 21261
|
||||
IfWinExist, Log message, Games Explorer
|
||||
{
|
||||
send {Enter}
|
||||
}
|
||||
IfWinExist, Hegemony, has been installed
|
||||
{
|
||||
break
|
||||
}
|
||||
Sleep (2000)
|
||||
}
|
||||
winwait, Hegemony, has been installed
|
||||
Sleep 500
|
||||
controlclick, Button4
|
||||
Sleep 500
|
||||
controlclick, Button2
|
||||
}
|
||||
WinWaitClose,Hegemony
|
||||
"
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------
|
||||
|
||||
w_metadata hphbp_demo games \
|
||||
title="Harry Potter and the Half-Blood Prince Demo" \
|
||||
publisher="EA" \
|
||||
|
||||
Reference in New Issue
Block a user