Skip to content

winetricks
winetricks
Commit 78566eed authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

just import winetricks-20230207.tar with rpmgs script

parent 19d1141c
Show whitespace changes
Inline Side-by-side
Showing with 196 additions and 36 deletions
winetricks/README.md
View file @ 78566eed
...@@ -199,7 +199,7 @@ w_metadata icecat apps \ ...@@ -199,7 +199,7 @@ w_metadata icecat apps \
load_icecat() load_icecat()
{ {
w_download https://ftp.gnu.org/gnu/gnuzilla/38.8.0/${file1} e5f9481e78710c25eb3a271d81aceb19ef44ff6e8599da7d5f7a2da584c01213 w_download https://ftp.gnu.org/gnu/gnuzilla/38.8.0/${file1} e5f9481e78710c25eb3a271d81aceb19ef44ff6e8599da7d5f7a2da584c01213
w_try_unzip "${W_PROGRAMS_X86_UNIX}" "${W_CACHE}/${W_PACKAGE}/${file1}" w_try_unzip "${W_PROGRAMS_X86_UNIX}" "${W_CACHE}/${W_PACKAGE}/icecat-38.8.0.en-us.win32.zip"
} }
``` ```
......
winetricks/files/verbs/all.txt
View file @ 78566eed
...@@ -343,6 +343,7 @@ vcrun2013 Visual C++ 2013 libraries (mfc120,mfc120u,msvcp120,msvc ...@@ -343,6 +343,7 @@ vcrun2013 Visual C++ 2013 libraries (mfc120,mfc120u,msvcp120,msvc
vcrun2015 Visual C++ 2015 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (Microsoft, 2015) [downloadable] vcrun2015 Visual C++ 2015 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (Microsoft, 2015) [downloadable]
vcrun2017 Visual C++ 2017 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,msvcp140_1.dll,msvcp140_2.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (Microsoft, 2017) [downloadable] vcrun2017 Visual C++ 2017 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,msvcp140_1.dll,msvcp140_2.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (Microsoft, 2017) [downloadable]
vcrun2019 Visual C++ 2015-2019 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,msvcp140_1,msvcp140_2,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (and vcruntime140_1.dll on win64) (Microsoft, 2019) [downloadable] vcrun2019 Visual C++ 2015-2019 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,msvcp140_1,msvcp140_2,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (and vcruntime140_1.dll on win64) (Microsoft, 2019) [downloadable]
vcrun2022 Visual C++ 2015-2022 libraries (concrt140.dll,mfc140.dll,mfc140chs.dll,mfc140cht.dll,mfc140deu.dll,mfc140enu.dll,mfc140esn.dll,mfc140fra.dll,mfc140ita.dll,mfc140jpn.dll,mfc140kor.dll,mfc140rus.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,msvcp140_1.dll,msvcp140_2.dll,msvcp140_atomic_wait.dll,msvcp140_codecvt_ids.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (and vcruntime140_1.dll on win64) (Microsoft, 2022) [downloadable]
vcrun6 Visual C++ 6 SP4 libraries (mfc42, msvcp60, msvcirt) (Microsoft, 2000) [downloadable] vcrun6 Visual C++ 6 SP4 libraries (mfc42, msvcp60, msvcirt) (Microsoft, 2000) [downloadable]
vcrun6sp6 Visual C++ 6 SP6 libraries (with fixes in ATL and MFC) (Microsoft, 2004) [downloadable] vcrun6sp6 Visual C++ 6 SP6 libraries (with fixes in ATL and MFC) (Microsoft, 2004) [downloadable]
vjrun20 MS Visual J# 2.0 SE libraries (requires dotnet20) (Microsoft, 2007) [downloadable] vjrun20 MS Visual J# 2.0 SE libraries (requires dotnet20) (Microsoft, 2007) [downloadable]
......
winetricks/files/verbs/dlls.txt
View file @ 78566eed
...@@ -273,6 +273,7 @@ vcrun2013 Visual C++ 2013 libraries (mfc120,mfc120u,msvcp120,msvc ...@@ -273,6 +273,7 @@ vcrun2013 Visual C++ 2013 libraries (mfc120,mfc120u,msvcp120,msvc
vcrun2015 Visual C++ 2015 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (Microsoft, 2015) [downloadable] vcrun2015 Visual C++ 2015 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (Microsoft, 2015) [downloadable]
vcrun2017 Visual C++ 2017 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,msvcp140_1.dll,msvcp140_2.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (Microsoft, 2017) [downloadable] vcrun2017 Visual C++ 2017 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,msvcp140_1.dll,msvcp140_2.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (Microsoft, 2017) [downloadable]
vcrun2019 Visual C++ 2015-2019 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,msvcp140_1,msvcp140_2,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (and vcruntime140_1.dll on win64) (Microsoft, 2019) [downloadable] vcrun2019 Visual C++ 2015-2019 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,msvcp140_1,msvcp140_2,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (and vcruntime140_1.dll on win64) (Microsoft, 2019) [downloadable]
vcrun2022 Visual C++ 2015-2022 libraries (concrt140.dll,mfc140.dll,mfc140chs.dll,mfc140cht.dll,mfc140deu.dll,mfc140enu.dll,mfc140esn.dll,mfc140fra.dll,mfc140ita.dll,mfc140jpn.dll,mfc140kor.dll,mfc140rus.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,msvcp140_1.dll,msvcp140_2.dll,msvcp140_atomic_wait.dll,msvcp140_codecvt_ids.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (and vcruntime140_1.dll on win64) (Microsoft, 2022) [downloadable]
vcrun6 Visual C++ 6 SP4 libraries (mfc42, msvcp60, msvcirt) (Microsoft, 2000) [downloadable] vcrun6 Visual C++ 6 SP4 libraries (mfc42, msvcp60, msvcirt) (Microsoft, 2000) [downloadable]
vcrun6sp6 Visual C++ 6 SP6 libraries (with fixes in ATL and MFC) (Microsoft, 2004) [downloadable] vcrun6sp6 Visual C++ 6 SP6 libraries (with fixes in ATL and MFC) (Microsoft, 2004) [downloadable]
vjrun20 MS Visual J# 2.0 SE libraries (requires dotnet20) (Microsoft, 2007) [downloadable] vjrun20 MS Visual J# 2.0 SE libraries (requires dotnet20) (Microsoft, 2007) [downloadable]
......
winetricks/files/verbs/download.txt
View file @ 78566eed
...@@ -383,6 +383,7 @@ vcrun2013 ...@@ -383,6 +383,7 @@ vcrun2013
vcrun2015 vcrun2015
vcrun2017 vcrun2017
vcrun2019 vcrun2019
vcrun2022
vcrun6 vcrun6
vcrun6sp6 vcrun6sp6
verdana verdana
......
winetricks/src/winetricks
View file @ 78566eed
...@@ -1798,10 +1798,10 @@ _EOF_ ...@@ -1798,10 +1798,10 @@ _EOF_
w_ahk_do() w_ahk_do()
{ {
if ! test -f "${W_CACHE}/ahk/AutoHotkey.exe"; then if ! test -f "${W_CACHE}/ahk/AutoHotkeyU32.exe"; then
w_download_to ahk https://github.com/AutoHotkey/AutoHotkey/releases/download/v1.0.48.05/AutoHotkey104805_Install.exe 4311c3e7c29ed2d67f415138360210bc2f55ff78758b20b003b91d775ee207b9 w_download_to ahk https://github.com/AutoHotkey/AutoHotkey/releases/download/v1.1.36.01/AutoHotkey_1.1.36.01_setup.exe 62734d219f14a942986e62d6c0fef0c2315bc84acd963430aed788c36e67e1ff
w_try_7z "${W_CACHE}/ahk" "${W_CACHE}/ahk/AutoHotkey104805_Install.exe" AutoHotkey.exe AU3_Spy.exe w_try_7z "${W_CACHE}/ahk" "${W_CACHE}/ahk/AutoHotkey_1.1.36.01_setup.exe" AutoHotkeyU32.exe
chmod +x "${W_CACHE}/ahk/AutoHotkey.exe" chmod +x "${W_CACHE}/ahk/AutoHotkeyU32.exe"
fi fi
# Previously this used printf + sed, but that was broken with BSD sed (FreeBSD/OS X): # Previously this used printf + sed, but that was broken with BSD sed (FreeBSD/OS X):
...@@ -1811,7 +1811,7 @@ w_ahk_do() ...@@ -1811,7 +1811,7 @@ w_ahk_do()
w_opt_unattended = ${W_OPT_UNATTENDED:-0} w_opt_unattended = ${W_OPT_UNATTENDED:-0}
$@ $@
_EOF_ _EOF_
w_try "${WINE}" "${W_CACHE_WIN}\\ahk\\AutoHotkey.exe" "${W_TMP_WIN}\\${W_PACKAGE}.ahk" w_try "${WINE}" "${W_CACHE_WIN}\\ahk\\AutoHotkeyU32.exe" "${W_TMP_WIN}\\${W_PACKAGE}.ahk"
} }
# Function to protect Wine-specific sections of code. # Function to protect Wine-specific sections of code.
...@@ -2370,6 +2370,28 @@ w_set_winver() ...@@ -2370,6 +2370,28 @@ w_set_winver()
w_wineserver -w w_wineserver -w
} }
# Restore a previously set winver. If not found, use default
w_restore_winver()
{
if [ -z "${_W_user_winver}" ]; then
_W_user_winver="default"
fi
w_set_winver "${_W_user_winver}"
unset ${_W_user_winver}
}
# Get the current winver from winecfg, store it in a variable to be restored with w_restore_winver
w_store_winver()
{
# Only set if not set already; for cases where a verb changes the version multiple times
# or calls a second verb that changes the version
if [ -z "${_W_user_winver}" ]; then
_W_user_winver="$(${WINE} winecfg /v | tr -d '\r')"
fi
}
w_unset_winver() w_unset_winver()
{ {
w_warn "w_unset_winver() is deprecated, use \'w_set_winver default\' instead" w_warn "w_unset_winver() is deprecated, use \'w_set_winver default\' instead"
...@@ -8095,7 +8117,7 @@ load_dxvk1102() ...@@ -8095,7 +8117,7 @@ load_dxvk1102()
w_metadata dxvk1103 dlls \ w_metadata dxvk1103 dlls \
title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.10.3)" \ title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.10.3)" \
publisher="Philip Rebohle" \ publisher="Philip Rebohle" \
year="2017" \ year="2022" \
media="download" \ media="download" \
file1="dxvk-1.10.3.tar.gz" \ file1="dxvk-1.10.3.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \ installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
...@@ -8115,7 +8137,7 @@ load_dxvk1103() ...@@ -8115,7 +8137,7 @@ load_dxvk1103()
w_metadata dxvk2000 dlls \ w_metadata dxvk2000 dlls \
title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (2.0)" \ title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (2.0)" \
publisher="Philip Rebohle" \ publisher="Philip Rebohle" \
year="2017" \ year="2022" \
media="download" \ media="download" \
file1="dxvk-2.0.tar.gz" \ file1="dxvk-2.0.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \ installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
...@@ -8130,12 +8152,29 @@ load_dxvk2000() ...@@ -8130,12 +8152,29 @@ load_dxvk2000()
helper_dxvk "${file1}" "7.1" "1.3.204" "dxgi,d3d9,d3d10core,d3d11" helper_dxvk "${file1}" "7.1" "1.3.204" "dxgi,d3d9,d3d10core,d3d11"
} }
w_metadata dxvk2010 dlls \
title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (2.1)" \
publisher="Philip Rebohle" \
year="2023" \
media="download" \
file1="dxvk-2.1.tar.gz" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
load_dxvk2010()
{
w_download "https://github.com/doitsujin/dxvk/releases/download/v2.1/dxvk-2.1.tar.gz" 329940b0c01226459f073d91ff1276d4d9c1c4c017303afe06193eb064502cde
helper_dxvk "${file1}" "7.1" "1.3.204" "dxgi,d3d9,d3d10core,d3d11"
}
#---------------------------------------------------------------- #----------------------------------------------------------------
w_metadata dxvk dlls \ w_metadata dxvk dlls \
title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (latest)" \ title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (latest)" \
publisher="Philip Rebohle" \ publisher="Philip Rebohle" \
year="2017" \ year="2023" \
media="download" \ media="download" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \ installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \ installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
...@@ -8577,6 +8616,7 @@ load_dotnet20() ...@@ -8577,6 +8616,7 @@ load_dotnet20()
w_download https://download.lenovo.com/ibmdl/pub/pc/pccbbs/thinkvantage_en/dotnetfx.exe 46693d9b74d12454d117cc61ff2e9481cabb100b4d74eb5367d3cf88b89a0e71 w_download https://download.lenovo.com/ibmdl/pub/pc/pccbbs/thinkvantage_en/dotnetfx.exe 46693d9b74d12454d117cc61ff2e9481cabb100b4d74eb5367d3cf88b89a0e71
# Needed for https://bugs.winehq.org/show_bug.cgi?id=12401 # Needed for https://bugs.winehq.org/show_bug.cgi?id=12401
w_store_winver
w_set_winver win2k w_set_winver win2k
# if dotnet11 if installed there is a warning dialog, but it still verifies # if dotnet11 if installed there is a warning dialog, but it still verifies
...@@ -8609,7 +8649,7 @@ load_dotnet20() ...@@ -8609,7 +8649,7 @@ load_dotnet20()
w_try_ms_installer "${WINE}" dotnetfx.exe ${W_OPT_UNATTENDED:+/q /c:"install.exe /q"} w_try_ms_installer "${WINE}" dotnetfx.exe ${W_OPT_UNATTENDED:+/q /c:"install.exe /q"}
fi fi
w_set_winver 'default' w_restore_winver
# We can't stop installing dotnet20 in win2k mode until Wine supports # We can't stop installing dotnet20 in win2k mode until Wine supports
# reparse/junction points # reparse/junction points
...@@ -8725,6 +8765,7 @@ load_dotnet20sp1() ...@@ -8725,6 +8765,7 @@ load_dotnet20sp1()
WINEDLLOVERRIDES="ngen.exe,regsvcs.exe,mscorsvw.exe=b;${WINEDLLOVERRIDES}" WINEDLLOVERRIDES="ngen.exe,regsvcs.exe,mscorsvw.exe=b;${WINEDLLOVERRIDES}"
export WINEDLLOVERRIDES export WINEDLLOVERRIDES
w_store_winver
if [ "${W_ARCH}" = "win32" ]; then if [ "${W_ARCH}" = "win32" ]; then
# https://www.microsoft.com/en-us/download/details.aspx?id=16614 # https://www.microsoft.com/en-us/download/details.aspx?id=16614
w_download https://download.microsoft.com/download/0/8/c/08c19fa4-4c4f-4ffb-9d6c-150906578c9e/NetFx20SP1_x86.exe c36c3a1d074de32d53f371c665243196a7608652a2fc6be9520312d5ce560871 w_download https://download.microsoft.com/download/0/8/c/08c19fa4-4c4f-4ffb-9d6c-150906578c9e/NetFx20SP1_x86.exe c36c3a1d074de32d53f371c665243196a7608652a2fc6be9520312d5ce560871
...@@ -8755,7 +8796,7 @@ load_dotnet20sp1() ...@@ -8755,7 +8796,7 @@ load_dotnet20sp1()
fi fi
w_set_winver 'default' w_restore_winver
W_NGEN_CMD="w_try ${WINE} ${W_DRIVE_C}/windows/Microsoft.NET/Framework/v2.0.50727/ngen.exe executequeueditems" W_NGEN_CMD="w_try ${WINE} ${W_DRIVE_C}/windows/Microsoft.NET/Framework/v2.0.50727/ngen.exe executequeueditems"
...@@ -8789,6 +8830,7 @@ load_dotnet20sp2() ...@@ -8789,6 +8830,7 @@ load_dotnet20sp2()
export WINEDLLOVERRIDES export WINEDLLOVERRIDES
w_warn "Setting Windows version so installer works" w_warn "Setting Windows version so installer works"
w_store_winver
w_set_winver winxp w_set_winver winxp
if [ "${W_ARCH}" = "win32" ]; then if [ "${W_ARCH}" = "win32" ]; then
...@@ -8814,7 +8856,7 @@ load_dotnet20sp2() ...@@ -8814,7 +8856,7 @@ load_dotnet20sp2()
rm -f "${W_SYSTEM32_DLLS}"/msvc?80.dll rm -f "${W_SYSTEM32_DLLS}"/msvc?80.dll
fi fi
w_set_winver 'default' w_restore_winver
w_override_dlls native mscorwks w_override_dlls native mscorwks
W_NGEN_CMD="w_try ${WINE} ${W_DRIVE_C}/windows/Microsoft.NET/Framework/v2.0.50727/ngen.exe executequeueditems" W_NGEN_CMD="w_try ${WINE} ${W_DRIVE_C}/windows/Microsoft.NET/Framework/v2.0.50727/ngen.exe executequeueditems"
...@@ -8876,6 +8918,7 @@ load_dotnet30() ...@@ -8876,6 +8918,7 @@ load_dotnet30()
ln -sf "${W_SYSTEM32_DLLS}/spupdsvc.exe" "${LANGPACKS_BASE_PATH}/dotnetfx3langpack${lang}.exe" ln -sf "${W_SYSTEM32_DLLS}/spupdsvc.exe" "${LANGPACKS_BASE_PATH}/dotnetfx3langpack${lang}.exe"
done done
w_store_winver
w_set_winver winxp w_set_winver winxp
# Delete FontCache 3.0 service, it's in Wine for Mono, breaks native .NET # Delete FontCache 3.0 service, it's in Wine for Mono, breaks native .NET
...@@ -8890,7 +8933,7 @@ load_dotnet30() ...@@ -8890,7 +8933,7 @@ load_dotnet30()
w_try "${WINE}" "${file1}" /q /c:"install.exe /q" w_try "${WINE}" "${file1}" /q /c:"install.exe /q"
w_override_dlls native mscorwks w_override_dlls native mscorwks
w_set_winver 'default' w_restore_winver
# Doesn't install any ngen.exe # Doesn't install any ngen.exe
# W_NGEN_CMD="" # W_NGEN_CMD=""
...@@ -8934,6 +8977,7 @@ load_dotnet30sp1() ...@@ -8934,6 +8977,7 @@ load_dotnet30sp1()
"${WINE}" reg add "HKLM\\Software\\Microsoft\\Net Framework Setup\\NDP\\v3.0" /v Version /t REG_SZ /d "3.0" /f "${WINE}" reg add "HKLM\\Software\\Microsoft\\Net Framework Setup\\NDP\\v3.0" /v Version /t REG_SZ /d "3.0" /f
"${WINE}" reg add "HKLM\\Software\\Microsoft-\\Net Framework Setup\\NDP\\v3.0" /v SP /t REG_DWORD /d 0001 /f "${WINE}" reg add "HKLM\\Software\\Microsoft-\\Net Framework Setup\\NDP\\v3.0" /v SP /t REG_DWORD /d 0001 /f
w_store_winver
w_set_winver winxp w_set_winver winxp
"${WINE}" sc delete FontCache3.0.0.0 "${WINE}" sc delete FontCache3.0.0.0
...@@ -8941,7 +8985,7 @@ load_dotnet30sp1() ...@@ -8941,7 +8985,7 @@ load_dotnet30sp1()
w_try_ms_installer "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/q} w_try_ms_installer "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/q}
w_override_dlls native mscorwks w_override_dlls native mscorwks
w_set_winver 'default' w_restore_winver
# Doesn't install any ngen.exe # Doesn't install any ngen.exe
# W_NGEN_CMD="" # W_NGEN_CMD=""
...@@ -8978,6 +9022,7 @@ load_dotnet35() ...@@ -8978,6 +9022,7 @@ load_dotnet35()
w_call remove_mono internal w_call remove_mono internal
w_store_winver
w_set_winver winxp w_set_winver winxp
w_override_dlls native mscoree mscorwks w_override_dlls native mscoree mscorwks
...@@ -8986,7 +9031,7 @@ load_dotnet35() ...@@ -8986,7 +9031,7 @@ load_dotnet35()
w_try_cd "${W_CACHE}/${W_PACKAGE}" w_try_cd "${W_CACHE}/${W_PACKAGE}"
w_try_ms_installer "${WINE}" "${file1}" /lang:ENU ${W_OPT_UNATTENDED:+/q} w_try_ms_installer "${WINE}" "${file1}" /lang:ENU ${W_OPT_UNATTENDED:+/q}
w_set_winver 'default' w_restore_winver
# Doesn't install any ngen.exe # Doesn't install any ngen.exe
# W_NGEN_CMD="" # W_NGEN_CMD=""
...@@ -9019,6 +9064,7 @@ load_dotnet35sp1() ...@@ -9019,6 +9064,7 @@ load_dotnet35sp1()
w_call remove_mono internal w_call remove_mono internal
w_store_winver
w_set_winver winxp w_set_winver winxp
w_override_dlls native mscoree mscorwks w_override_dlls native mscoree mscorwks
...@@ -9039,7 +9085,7 @@ load_dotnet35sp1() ...@@ -9039,7 +9085,7 @@ load_dotnet35sp1()
WINEDLLOVERRIDES="ngen.exe=n" w_try_ms_installer "${WINE}" dotnetfx35.exe /lang:ENU ${W_OPT_UNATTENDED:+/q} WINEDLLOVERRIDES="ngen.exe=n" w_try_ms_installer "${WINE}" dotnetfx35.exe /lang:ENU ${W_OPT_UNATTENDED:+/q}
w_try rm dotnetfx35.exe w_try rm dotnetfx35.exe
w_set_winver 'default' w_restore_winver
# Doesn't install any ngen.exe # Doesn't install any ngen.exe
# W_NGEN_CMD="" # W_NGEN_CMD=""
...@@ -9078,6 +9124,7 @@ load_dotnet40() ...@@ -9078,6 +9124,7 @@ load_dotnet40()
w_call remove_mono internal w_call remove_mono internal
w_store_winver
w_call winxp w_call winxp
w_try_cd "${W_CACHE}/${W_PACKAGE}" w_try_cd "${W_CACHE}/${W_PACKAGE}"
...@@ -9103,7 +9150,7 @@ load_dotnet40() ...@@ -9103,7 +9150,7 @@ load_dotnet40()
# *) w_warn " # *) w_warn "
esac esac
w_set_winver 'default' w_restore_winver
} }
verify_dotnet40() verify_dotnet40()
...@@ -9148,8 +9195,6 @@ load_dotnet40_kb2468871() ...@@ -9148,8 +9195,6 @@ load_dotnet40_kb2468871()
# I don't think it's worth warning *every* non-en_US.UTF-8 user: # I don't think it's worth warning *every* non-en_US.UTF-8 user:
# *) w_warn " # *) w_warn "
esac esac
w_set_winver 'default'
} }
verify_dotnet40_kb2468871() verify_dotnet40_kb2468871()
...@@ -10680,6 +10725,7 @@ load_ie8_kb2936068() ...@@ -10680,6 +10725,7 @@ load_ie8_kb2936068()
{ {
w_call ie8 w_call ie8
w_store_winver
if [ "${W_ARCH}" = "win32" ]; then if [ "${W_ARCH}" = "win32" ]; then
w_download https://download.microsoft.com/download/3/8/C/38CE0ABB-01FD-4C0A-A569-BC5E82C34A17/IE8-WindowsXP-KB2936068-x86-ENU.exe 8bda23c78cdcd9d01c364a01c6d639dfb2d11550a5521b8a81c808c1a2b1824e w_download https://download.microsoft.com/download/3/8/C/38CE0ABB-01FD-4C0A-A569-BC5E82C34A17/IE8-WindowsXP-KB2936068-x86-ENU.exe 8bda23c78cdcd9d01c364a01c6d639dfb2d11550a5521b8a81c808c1a2b1824e
w_set_winver winxp w_set_winver winxp
...@@ -10692,7 +10738,45 @@ load_ie8_kb2936068() ...@@ -10692,7 +10738,45 @@ load_ie8_kb2936068()
w_try_ms_installer "${WINE}" IE8-WindowsServer2003.WindowsXP-KB2936068-x64-ENU.exe ${W_OPT_UNATTENDED:+/quiet /forcerestart} w_try_ms_installer "${WINE}" IE8-WindowsServer2003.WindowsXP-KB2936068-x64-ENU.exe ${W_OPT_UNATTENDED:+/quiet /forcerestart}
fi fi
w_set_winver 'default' w_restore_winver
}
#----------------------------------------------------------------
w_metadata ie8_tls12 dlls \
title="TLS 1.1 and 1.2 for Internet Explorer 8" \
publisher="Microsoft" \
year="2017" \
media="download" \
file1="windowsxp-kb4019276-x86-embedded-enu_3822fc1692076429a7dc051b00213d5e1240ce3d.exe" \
file2="ie8-windowsxp-kb4230450-x86-embedded-enu_d8b388624d07b6804485d347be4f74a985d50be7.exe" \
installed_file1="c:/windows/KB4230450-IE8.log"
load_ie8_tls12()
{
w_package_unsupported_win64
w_call ie8
w_set_winver winxp
"${WINE}" reg add "HKLM\\System\\WPA\\PosReady" /v Installed /t REG_DWORD /d 0001 /f
w_download http://download.windowsupdate.com/c/msdownload/update/software/updt/2017/10/windowsxp-kb4019276-x86-embedded-enu_3822fc1692076429a7dc051b00213d5e1240ce3d.exe 381abded5dd70a02bd54d4e8926e519ca6b306e26cbf10c45bbf1533bf57a026
w_try_cd "${W_CACHE}/${W_PACKAGE}"
# Avoid permanent hang in attended mode; avoid long pause in unattended mode
w_try_ms_installer "${WINE}" "${file1}" /passive /norestart ${W_OPT_UNATTENDED:+/quiet}
"${WINE}" reg add "HKLM\\System\\CurrentControlSet\\Control\\SecurityProviders\\Schannel\\Protocols\\TLS 1.1\\Client" /v DisabledByDefault /t REG_DWORD /d 0000 /f
"${WINE}" reg add "HKLM\\System\\CurrentControlSet\\Control\\SecurityProviders\\Schannel\\Protocols\\TLS 1.2\\Client" /v DisabledByDefault /t REG_DWORD /d 0000 /f
w_download http://download.windowsupdate.com/c/msdownload/update/software/secu/2018/06/ie8-windowsxp-kb4230450-x86-embedded-enu_d8b388624d07b6804485d347be4f74a985d50be7.exe ec1183d4bfd0a92286678554f20a2d0f58c70ee9cb8ad90a5084812545b80068
# Force quiet mode to avoid permanent hang
w_try_ms_installer "${WINE}" ie8-windowsxp-kb4230450-x86-embedded-enu_d8b388624d07b6804485d347be4f74a985d50be7.exe /quiet
"${WINE}" reg add "HKLM\\Software\\Microsoft\\Internet Explorer\\AdvancedOptions\\CRYPTO\\TLS1.1" /v OSVersion /t REG_SZ /d "3.5.1.0.0" /f
"${WINE}" reg add "HKLM\\Software\\Microsoft\\Internet Explorer\\AdvancedOptions\\CRYPTO\\TLS1.2" /v OSVersion /t REG_SZ /d "3.5.1.0.0" /f
} }
#---------------------------------------------------------------- #----------------------------------------------------------------
...@@ -10778,10 +10862,11 @@ load_mdac27() ...@@ -10778,10 +10862,11 @@ load_mdac27()
w_download https://web.archive.org/web/20060718123742/http://ftp.gunadarma.ac.id/pub/driver/itegno/USB%20Software/MDAC/MDAC_TYP.EXE 36d2a3099e6286ae3fab181a502a95fbd825fa5ddb30bf09b345abc7f1f620b4 w_download https://web.archive.org/web/20060718123742/http://ftp.gunadarma.ac.id/pub/driver/itegno/USB%20Software/MDAC/MDAC_TYP.EXE 36d2a3099e6286ae3fab181a502a95fbd825fa5ddb30bf09b345abc7f1f620b4
load_native_mdac load_native_mdac
w_store_winver
w_set_winver nt40 w_set_winver nt40
w_try_cd "${W_CACHE}/${W_PACKAGE}" w_try_cd "${W_CACHE}/${W_PACKAGE}"
w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/q /C:"setup /qnt"} w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/q /C:"setup /qnt"}
w_set_winver 'default' w_restore_winver
} }
#---------------------------------------------------------------- #----------------------------------------------------------------
...@@ -10801,10 +10886,11 @@ load_mdac28() ...@@ -10801,10 +10886,11 @@ load_mdac28()
# https://www.microsoft.com/en-us/download/details.aspx?id=5793 # https://www.microsoft.com/en-us/download/details.aspx?id=5793
w_download https://web.archive.org/web/20070127061938/https://download.microsoft.com/download/4/a/a/4aafff19-9d21-4d35-ae81-02c48dcbbbff/MDAC_TYP.EXE 157ebae46932cb9047b58aa849ac1885e8cbd2f218810cb83e57613b49c679d6 w_download https://web.archive.org/web/20070127061938/https://download.microsoft.com/download/4/a/a/4aafff19-9d21-4d35-ae81-02c48dcbbbff/MDAC_TYP.EXE 157ebae46932cb9047b58aa849ac1885e8cbd2f218810cb83e57613b49c679d6
load_native_mdac load_native_mdac
w_store_winver
w_set_winver nt40 w_set_winver nt40
w_try_cd "${W_CACHE}"/"${W_PACKAGE}" w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
w_try "${WINE}" mdac_typ.exe ${W_OPT_UNATTENDED:+/q /C:"setup /qnt"} w_try "${WINE}" mdac_typ.exe ${W_OPT_UNATTENDED:+/q /C:"setup /qnt"}
w_set_winver 'default' w_restore_winver
} }
#---------------------------------------------------------------- #----------------------------------------------------------------
...@@ -11392,6 +11478,25 @@ load_oleaut32() ...@@ -11392,6 +11478,25 @@ load_oleaut32()
#---------------------------------------------------------------- #----------------------------------------------------------------
w_metadata openal dlls \
title="OpenAL Runtime" \
publisher="Creative" \
year="2023" \
media="download" \
file1="oalinst.zip" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/OpenAL32.dll"
load_openal()
{
# Official version
w_download https://www.openal.org/downloads/oalinst.zip d165bcb7628fd950d14847585468cc11943b2a1da92a59a839d397c68f9d4b06
w_try_unzip "${W_TMP}" "${W_CACHE}/${W_PACKAGE}/oalinst.zip"
w_try "${WINE}" "${W_TMP}/oalinst.exe" /silent
}
#----------------------------------------------------------------
w_metadata pdh dlls \ w_metadata pdh dlls \
title="MS pdh.dll (Performance Data Helper)" \ title="MS pdh.dll (Performance Data Helper)" \
publisher="Microsoft" \ publisher="Microsoft" \
...@@ -12735,7 +12840,7 @@ w_metadata vcrun2015 dlls \ ...@@ -12735,7 +12840,7 @@ w_metadata vcrun2015 dlls \
publisher="Microsoft" \ publisher="Microsoft" \
year="2015" \ year="2015" \
media="download" \ media="download" \
conflicts="vcrun2017 vcrun2019 ucrtbase2019" \ conflicts="vcrun2017 vcrun2019 ucrtbase2019 vcrun2022" \
file1="vc_redist.x86.exe" \ file1="vc_redist.x86.exe" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/mfc140.dll" installed_file1="${W_SYSTEM32_DLLS_WIN}/mfc140.dll"
...@@ -12748,6 +12853,7 @@ load_vcrun2015() ...@@ -12748,6 +12853,7 @@ load_vcrun2015()
w_override_dlls native,builtin api-ms-win-crt-private-l1-1-0 api-ms-win-crt-conio-l1-1-0 api-ms-win-crt-convert-l1-1-0 api-ms-win-crt-environment-l1-1-0 api-ms-win-crt-filesystem-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-multibyte-l1-1-0 api-ms-win-crt-process-l1-1-0 api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 api-ms-win-crt-string-l1-1-0 api-ms-win-crt-utility-l1-1-0 api-ms-win-crt-time-l1-1-0 atl140 concrt140 msvcp140 msvcp140_1 msvcp140_atomic_wait ucrtbase vcomp140 vccorlib140 vcruntime140 vcruntime140_1 w_override_dlls native,builtin api-ms-win-crt-private-l1-1-0 api-ms-win-crt-conio-l1-1-0 api-ms-win-crt-convert-l1-1-0 api-ms-win-crt-environment-l1-1-0 api-ms-win-crt-filesystem-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-multibyte-l1-1-0 api-ms-win-crt-process-l1-1-0 api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 api-ms-win-crt-string-l1-1-0 api-ms-win-crt-utility-l1-1-0 api-ms-win-crt-time-l1-1-0 atl140 concrt140 msvcp140 msvcp140_1 msvcp140_atomic_wait ucrtbase vcomp140 vccorlib140 vcruntime140 vcruntime140_1
if w_workaround_wine_bug 50894 "Working around failing wusa.exe lookup via C:\windows\SysNative"; then if w_workaround_wine_bug 50894 "Working around failing wusa.exe lookup via C:\windows\SysNative"; then
w_store_winver
w_set_winver winxp w_set_winver winxp
fi fi
...@@ -12771,7 +12877,7 @@ load_vcrun2015() ...@@ -12771,7 +12877,7 @@ load_vcrun2015()
;; ;;
esac esac
w_set_winver 'default' w_restore_winver
} }
w_metadata mfc140 dlls \ w_metadata mfc140 dlls \
...@@ -12814,7 +12920,7 @@ w_metadata vcrun2017 dlls \ ...@@ -12814,7 +12920,7 @@ w_metadata vcrun2017 dlls \
publisher="Microsoft" \ publisher="Microsoft" \
year="2017" \ year="2017" \
media="download" \ media="download" \
conflicts="vcrun2015 vcrun2019 ucrtbase2019" \ conflicts="vcrun2015 vcrun2019 ucrtbase2019 vcrun2022" \
file1="vc_redist.x86.exe" \ file1="vc_redist.x86.exe" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/mfc140.dll" installed_file1="${W_SYSTEM32_DLLS_WIN}/mfc140.dll"
...@@ -12829,6 +12935,7 @@ load_vcrun2017() ...@@ -12829,6 +12935,7 @@ load_vcrun2017()
w_override_dlls native,builtin api-ms-win-crt-private-l1-1-0 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 msvcp140_1 msvcp140_2 msvcp140_atomic_wait ucrtbase vcamp140 vcomp140 vccorlib140 vcruntime140 vcruntime140_1 w_override_dlls native,builtin api-ms-win-crt-private-l1-1-0 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 msvcp140_1 msvcp140_2 msvcp140_atomic_wait ucrtbase vcamp140 vcomp140 vccorlib140 vcruntime140 vcruntime140_1
if w_workaround_wine_bug 50894 "Working around failing wusa.exe lookup via C:\windows\SysNative"; then if w_workaround_wine_bug 50894 "Working around failing wusa.exe lookup via C:\windows\SysNative"; then
w_store_winver
w_set_winver winxp w_set_winver winxp
fi fi
...@@ -12855,7 +12962,7 @@ load_vcrun2017() ...@@ -12855,7 +12962,7 @@ load_vcrun2017()
;; ;;
esac esac
w_set_winver 'default' w_restore_winver
} }
#---------------------------------------------------------------- #----------------------------------------------------------------
...@@ -12865,7 +12972,7 @@ w_metadata vcrun2019 dlls \ ...@@ -12865,7 +12972,7 @@ w_metadata vcrun2019 dlls \
publisher="Microsoft" \ publisher="Microsoft" \
year="2019" \ year="2019" \
media="download" \ media="download" \
conflicts="vcrun2015 vcrun2017" \ conflicts="vcrun2015 vcrun2017 vcrun2022" \
file1="vc_redist.x86.exe" \ file1="vc_redist.x86.exe" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/mfc140.dll" installed_file1="${W_SYSTEM32_DLLS_WIN}/mfc140.dll"
...@@ -12892,6 +12999,7 @@ load_vcrun2019() ...@@ -12892,6 +12999,7 @@ load_vcrun2019()
w_download https://aka.ms/vs/16/release/vc_redist.x86.exe 4c6c420cf4cbf2c9c9ed476e96580ae92a97b2822c21329a2e49e8439ac5ad30 w_download https://aka.ms/vs/16/release/vc_redist.x86.exe 4c6c420cf4cbf2c9c9ed476e96580ae92a97b2822c21329a2e49e8439ac5ad30
if w_workaround_wine_bug 50894 "Working around failing wusa.exe lookup via C:\windows\SysNative"; then if w_workaround_wine_bug 50894 "Working around failing wusa.exe lookup via C:\windows\SysNative"; then
w_store_winver
w_set_winver winxp w_set_winver winxp
fi fi
...@@ -12926,7 +13034,7 @@ load_vcrun2019() ...@@ -12926,7 +13034,7 @@ load_vcrun2019()
w_call ucrtbase2019 w_call ucrtbase2019
w_set_winver 'default' w_restore_winver
} }
#---------------------------------------------------------------- #----------------------------------------------------------------
...@@ -12963,6 +13071,43 @@ load_ucrtbase2019() ...@@ -12963,6 +13071,43 @@ load_ucrtbase2019()
#---------------------------------------------------------------- #----------------------------------------------------------------
w_metadata vcrun2022 dlls \
title="Visual C++ 2015-2022 libraries (concrt140.dll,mfc140.dll,mfc140chs.dll,mfc140cht.dll,mfc140deu.dll,mfc140enu.dll,mfc140esn.dll,mfc140fra.dll,mfc140ita.dll,mfc140jpn.dll,mfc140kor.dll,mfc140rus.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,msvcp140_1.dll,msvcp140_2.dll,msvcp140_atomic_wait.dll,msvcp140_codecvt_ids.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll,vcruntime140_1.dll)" \
publisher="Microsoft" \
year="2022" \
media="download" \
conflicts="vcrun2015 vcrun2017 vcrun2019" \
file1="vc_redist.x86.exe" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/vcruntime140.dll"
load_vcrun2022()
{
# https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist
# 2022-08-05: 14.32.31332 @ https://download.visualstudio.microsoft.com/download/pr/7331f052-6c2d-4890-8041-8058fee5fb0f/CF92A10C62FFAB83B4A2168F5F9A05E5588023890B5C0CC7BA89ED71DA527B0F/VC_redist.x86.exe
w_override_dlls native,builtin concrt140 msvcp140 msvcp140_1 msvcp140_2 msvcp140_atomic_wait msvcp140_codecvt_ids vcamp140 vccorlib140 vcomp140 vcruntime140
w_download https://aka.ms/vs/17/release/vc_redist.x86.exe cf92a10c62ffab83b4a2168f5f9a05e5588023890b5c0cc7ba89ed71da527b0f
w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
w_try_ms_installer "${WINE}" vc_redist.x86.exe ${W_OPT_UNATTENDED:+/q}
case "${W_ARCH}" in
win64)
# Also install the 64-bit version
# 2022-08-05: 14.32.31332 @ https://download.visualstudio.microsoft.com/download/pr/7331f052-6c2d-4890-8041-8058fee5fb0f/CE6593A1520591E7DEA2B93FD03116E3FC3B3821A0525322B0A430FAA6B3C0B4/VC_redist.x64.exe
# vcruntime140_1 is only shipped on x64:
w_override_dlls native,builtin vcruntime140_1
w_download https://aka.ms/vs/17/release/vc_redist.x64.exe ce6593a1520591e7dea2b93fd03116e3fc3b3821a0525322b0a430faa6b3c0b4
w_try_ms_installer "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q}
;;
esac
}
#----------------------------------------------------------------
w_metadata vjrun20 dlls \ w_metadata vjrun20 dlls \
title="MS Visual J# 2.0 SE libraries (requires dotnet20)" \ title="MS Visual J# 2.0 SE libraries (requires dotnet20)" \
publisher="Microsoft" \ publisher="Microsoft" \
...@@ -13065,6 +13210,7 @@ load_windowscodecs() ...@@ -13065,6 +13210,7 @@ load_windowscodecs()
w_override_dlls native windowscodecs windowscodecsext w_override_dlls native windowscodecs windowscodecsext
# Previously this was winxp, but that didn't work for 64-bit, see https://github.com/Winetricks/winetricks/issues/970 # Previously this was winxp, but that didn't work for 64-bit, see https://github.com/Winetricks/winetricks/issues/970
w_store_winver
w_set_winver win2k3 w_set_winver win2k3
# Always run the WIC installer in passive mode. # Always run the WIC installer in passive mode.
...@@ -13079,7 +13225,7 @@ load_windowscodecs() ...@@ -13079,7 +13225,7 @@ load_windowscodecs()
w_try "${WINE}" "${EXE}" /passive w_try "${WINE}" "${EXE}" /passive
fi fi
w_set_winver 'default' w_restore_winver
} }
#---------------------------------------------------------------- #----------------------------------------------------------------
...@@ -13169,6 +13315,7 @@ load_wmi() ...@@ -13169,6 +13315,7 @@ load_wmi()
# 2019/12/22: all ftp mirrors I found are dead, so use wayback machine for original MS url # 2019/12/22: all ftp mirrors I found are dead, so use wayback machine for original MS url
w_download https://web.archive.org/web/20051221074940/https://download.microsoft.com/download/platformsdk/wmi9x/1.5/W9X/EN-US/wmi9x.exe 1d5d94050354b164c6a19531df151e0703d5eb39cebf4357ee2cfc340c2509d0 w_download https://web.archive.org/web/20051221074940/https://download.microsoft.com/download/platformsdk/wmi9x/1.5/W9X/EN-US/wmi9x.exe 1d5d94050354b164c6a19531df151e0703d5eb39cebf4357ee2cfc340c2509d0
w_store_winver
w_set_winver win98 w_set_winver win98
w_override_dlls native,builtin wbemprox wmiutils w_override_dlls native,builtin wbemprox wmiutils
...@@ -13177,7 +13324,7 @@ load_wmi() ...@@ -13177,7 +13324,7 @@ load_wmi()
w_try "${WINE}" wmi9x.exe ${W_OPT_UNATTENDED:+/S} w_try "${WINE}" wmi9x.exe ${W_OPT_UNATTENDED:+/S}
w_killall "WinMgmt.exe" w_killall "WinMgmt.exe"
w_set_winver 'default' w_restore_winver
} }
#---------------------------------------------------------------- #----------------------------------------------------------------
...@@ -13262,6 +13409,7 @@ load_xact() ...@@ -13262,6 +13409,7 @@ load_xact()
w_override_dlls native,builtin xaudio2_0 xaudio2_1 xaudio2_2 xaudio2_3 xaudio2_4 xaudio2_5 xaudio2_6 xaudio2_7 w_override_dlls native,builtin xaudio2_0 xaudio2_1 xaudio2_2 xaudio2_3 xaudio2_4 xaudio2_5 xaudio2_6 xaudio2_7
w_override_dlls native,builtin x3daudio1_0 x3daudio1_1 x3daudio1_2 x3daudio1_3 x3daudio1_4 x3daudio1_5 x3daudio1_6 x3daudio1_7 w_override_dlls native,builtin x3daudio1_0 x3daudio1_1 x3daudio1_2 x3daudio1_3 x3daudio1_4 x3daudio1_5 x3daudio1_6 x3daudio1_7
w_override_dlls native,builtin xapofx1_1 xapofx1_2 xapofx1_3 xapofx1_4 xapofx1_5 w_override_dlls native,builtin xapofx1_1 xapofx1_2 xapofx1_3 xapofx1_4 xapofx1_5
w_override_dlls native,builtin xactengine2_0 xactengine2_10 xactengine2_1 xactengine2_2 xactengine2_3 xactengine2_4 xactengine2_5 xactengine2_6 xactengine2_7 xactengine2_8 xactengine2_9 xactengine3_0 xactengine3_1 xactengine3_2 xactengine3_3 xactengine3_4 xactengine3_5 xactengine3_6 xactengine3_7
# Register xactengine?_?.dll # Register xactengine?_?.dll
for x in "${W_SYSTEM32_DLLS}"/xactengine* ; do for x in "${W_SYSTEM32_DLLS}"/xactengine* ; do
...@@ -13308,6 +13456,7 @@ load_xact_x64() ...@@ -13308,6 +13456,7 @@ load_xact_x64()
w_override_dlls native,builtin xaudio2_0 xaudio2_1 xaudio2_2 xaudio2_3 xaudio2_4 xaudio2_5 xaudio2_6 xaudio2_7 w_override_dlls native,builtin xaudio2_0 xaudio2_1 xaudio2_2 xaudio2_3 xaudio2_4 xaudio2_5 xaudio2_6 xaudio2_7
w_override_dlls native,builtin x3daudio1_0 x3daudio1_1 x3daudio1_2 x3daudio1_3 x3daudio1_4 x3daudio1_5 x3daudio1_6 x3daudio1_7 w_override_dlls native,builtin x3daudio1_0 x3daudio1_1 x3daudio1_2 x3daudio1_3 x3daudio1_4 x3daudio1_5 x3daudio1_6 x3daudio1_7
w_override_dlls native,builtin xapofx1_1 xapofx1_2 xapofx1_3 xapofx1_4 xapofx1_5 w_override_dlls native,builtin xapofx1_1 xapofx1_2 xapofx1_3 xapofx1_4 xapofx1_5
w_override_dlls native,builtin xactengine2_0 xactengine2_10 xactengine2_1 xactengine2_2 xactengine2_3 xactengine2_4 xactengine2_5 xactengine2_6 xactengine2_7 xactengine2_8 xactengine2_9 xactengine3_0 xactengine3_1 xactengine3_2 xactengine3_3 xactengine3_4 xactengine3_5 xactengine3_6 xactengine3_7
# Register xactengine?_?.dll # Register xactengine?_?.dll
for x in "${W_SYSTEM64_DLLS}"/xactengine* ; do for x in "${W_SYSTEM64_DLLS}"/xactengine* ; do
...@@ -13433,6 +13582,9 @@ load_xvid() ...@@ -13433,6 +13582,9 @@ load_xvid()
# 2022/09/08: https://s3.amazonaws.com/moviecodec/files/Xvid-1.3.2-20110601.exe # 2022/09/08: https://s3.amazonaws.com/moviecodec/files/Xvid-1.3.2-20110601.exe
w_download https://s3.amazonaws.com/moviecodec/files/Xvid-1.3.2-20110601.exe 74b23965cebe59e388eab6dba224b6b751ef4519454cc12086ade51c81f0a33c w_download https://s3.amazonaws.com/moviecodec/files/Xvid-1.3.2-20110601.exe 74b23965cebe59e388eab6dba224b6b751ef4519454cc12086ade51c81f0a33c
w_try_cd "${W_CACHE}/${W_PACKAGE}" w_try_cd "${W_CACHE}/${W_PACKAGE}"
# This will give a warning about Windows Media Player being out of date.
# Turns out it's not checking the wmp version, but the presence of ${W_SYSTEM32_DLLS}/l3codecp.acm
# http://websvn.xvid.org/cvs/viewvc.cgi/trunk/xvidextra/src/installer/xvid.xml?view=diff&pathrev=2159&r1=2006&r2=2007
w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+ --mode unattended --decode_divx 1 --decode_3ivx 1 --decode_other 1} w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+ --mode unattended --decode_divx 1 --decode_3ivx 1 --decode_other 1}
} }
...@@ -14720,7 +14872,7 @@ w_metadata dxwnd apps \ ...@@ -14720,7 +14872,7 @@ w_metadata dxwnd apps \
publisher="ghotik" \ publisher="ghotik" \
year="2011" \ year="2011" \
media="download" \ media="download" \
file1"v2_05_88_build.rar" \ file1="v2_05_88_build.rar" \
installed_exe1="${W_PROGRAMS_X86_WIN}/dxwnd/dxwnd.exe" \ installed_exe1="${W_PROGRAMS_X86_WIN}/dxwnd/dxwnd.exe" \
homepage="https://dxwnd.sourceforge.io" homepage="https://dxwnd.sourceforge.io"
...@@ -15004,6 +15156,7 @@ load_ie6() ...@@ -15004,6 +15156,7 @@ load_ie6()
done done
# The installer doesn't want to install iexplore.exe in XP mode. # The installer doesn't want to install iexplore.exe in XP mode.
w_store_winver
w_set_winver win2k w_set_winver win2k
# Workaround https://bugs.winehq.org/show_bug.cgi?id=21009 # Workaround https://bugs.winehq.org/show_bug.cgi?id=21009
...@@ -15039,7 +15192,7 @@ load_ie6() ...@@ -15039,7 +15192,7 @@ load_ie6()
done done
# Set Windows version back to the default. Leave at win2k for better rendering (is there a bug for that?) # Set Windows version back to the default. Leave at win2k for better rendering (is there a bug for that?)
w_set_winver 'default' w_restore_winver
# the ie6 we use these days lacks pngfilt, so grab that # the ie6 we use these days lacks pngfilt, so grab that
w_call pngfilt w_call pngfilt
...@@ -15168,6 +15321,7 @@ w_metadata ie8 dlls \ ...@@ -15168,6 +15321,7 @@ w_metadata ie8 dlls \
load_ie8() load_ie8()
{ {
w_store_winver
if [ "${W_ARCH}" = "win32" ]; then if [ "${W_ARCH}" = "win32" ]; then
# Bundled in Windows 7, so refuses to install. Works with XP: # Bundled in Windows 7, so refuses to install. Works with XP:
w_set_winver winxp w_set_winver winxp
...@@ -15324,7 +15478,7 @@ _EOF_ ...@@ -15324,7 +15478,7 @@ _EOF_
w_warn "To start ie8 (32-bit), from a terminal shell, use the command \"${WINE}\" '${W_PROGRAMS_X86_WIN}\\\\Internet Explorer\\\\iexplore.exe'\nTo start ie8 (64-bit), from a terminal shell, use the command \"${WINE}\" '${W_PROGRAMS_WIN}\\\\Internet Explorer\\\\iexplore.exe'" w_warn "To start ie8 (32-bit), from a terminal shell, use the command \"${WINE}\" '${W_PROGRAMS_X86_WIN}\\\\Internet Explorer\\\\iexplore.exe'\nTo start ie8 (64-bit), from a terminal shell, use the command \"${WINE}\" '${W_PROGRAMS_WIN}\\\\Internet Explorer\\\\iexplore.exe'"
fi fi
w_set_winver 'default' w_restore_winver
unset _W_restore_z unset _W_restore_z
} }
...@@ -16831,6 +16985,7 @@ load_wmp9() ...@@ -16831,6 +16985,7 @@ load_wmp9()
w_call wsh57 w_call wsh57
w_store_winver
w_set_winver winxp w_set_winver winxp
# See also https://support.microsoft.com/en-us/help/18612/windows-media-player # See also https://support.microsoft.com/en-us/help/18612/windows-media-player
...@@ -16862,7 +17017,7 @@ load_wmp9() ...@@ -16862,7 +17017,7 @@ load_wmp9()
load_wm9codecs load_wm9codecs
fi fi
w_set_winver 'default' w_restore_winver
} }
#---------------------------------------------------------------- #----------------------------------------------------------------
...@@ -16888,6 +17043,7 @@ load_wmp10() ...@@ -16888,6 +17043,7 @@ load_wmp10()
# https://www.microsoft.com/en-us/download/details.aspx?id=20426 # https://www.microsoft.com/en-us/download/details.aspx?id=20426
w_download https://web.archive.org/web/20200803205216/https://download.microsoft.com/download/1/2/a/12a31f29-2fa9-4f50-b95d-e45ef7013f87/MP10Setup.exe c1e71784c530035916aad5b09fa002abfbb7569b75208dd79351f29c6d197e03 w_download https://web.archive.org/web/20200803205216/https://download.microsoft.com/download/1/2/a/12a31f29-2fa9-4f50-b95d-e45ef7013f87/MP10Setup.exe c1e71784c530035916aad5b09fa002abfbb7569b75208dd79351f29c6d197e03
w_store_winver
w_set_winver winxp w_set_winver winxp
# remove builtin placeholders to allow update # remove builtin placeholders to allow update
...@@ -16908,7 +17064,7 @@ load_wmp10() ...@@ -16908,7 +17064,7 @@ load_wmp10()
load_wm9codecs load_wm9codecs
w_set_winver 'default' w_restore_winver
} }
#---------------------------------------------------------------- #----------------------------------------------------------------
...@@ -16943,6 +17099,7 @@ load_wmp11() ...@@ -16943,6 +17099,7 @@ load_wmp11()
wmp_exe=wmp11-64.exe wmp_exe=wmp11-64.exe
fi fi
w_store_winver
w_set_winver winxp w_set_winver winxp
# remove builtin placeholders to allow update # remove builtin placeholders to allow update
...@@ -16966,7 +17123,7 @@ load_wmp11() ...@@ -16966,7 +17123,7 @@ load_wmp11()
w_try_regedit /D "HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Services\\Cdr4_2K" w_try_regedit /D "HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Services\\Cdr4_2K"
w_try_regedit /D "HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Services\\Cdralw2k" w_try_regedit /D "HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Services\\Cdralw2k"
w_set_winver 'default' w_restore_winver
} }
#---------------------------------------------------------------- #----------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment