Skip to content

Commit

Permalink
vcrun*: delete builtin dlls before running installer
Browse files Browse the repository at this point in the history 
Closes: Winetricks#2309
  • Loading branch information
@austin987
austin987 committed Dec 21, 2024
1 parent 0d6c871 commit 7a9f6c9
Showing 1 changed file with 75 additions and 9 deletions.
84 changes: 75 additions & 9 deletions src/winetricks
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12535,7 +12535,14 @@ load_vcrun2005()
# 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
for dll in atl80 msvcm80 msvcp80 msvcr80 vcomp; do
w_override_dlls native,builtin "${dll}"
w_try rm -f "${W_SYSTEM32_DLLS}/${dll}.dll"

if [ "${W_ARCH}" = "win64" ]; then
w_try rm -f "${W_SYSTEM64_DLLS}/${dll}.dll"
fi
done

w_try_cd "${W_CACHE}/${W_PACKAGE}"
w_try_ms_installer "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/q}
Expand Down Expand Up @@ -12607,7 +12614,14 @@ load_vcrun2008()
# 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
for dll in atl90 msvcm90 msvcp90 msvcr90 vcomp90; do
w_override_dlls native,builtin "${dll}"
w_try rm -f "${W_SYSTEM32_DLLS}/${dll}.dll"

if [ "${W_ARCH}" = "win64" ]; then
w_try rm -f "${W_SYSTEM64_DLLS}/${dll}.dll"
fi
done

w_try_cd "${W_CACHE}/${W_PACKAGE}"
w_try_ms_installer "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/q}
Expand Down Expand Up @@ -12673,7 +12687,15 @@ load_vcrun2010()
# 2021/04/24: 31d32fa39d52cac9a765a43660431f7a127eee784b54b2f5e2af3e2b763a1af8
w_download https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe 31d32fa39d52cac9a765a43660431f7a127eee784b54b2f5e2af3e2b763a1af8

w_override_dlls native,builtin msvcp100 msvcr100 vcomp100 atl100
for dll in native,builtin msvcp100 msvcr100 vcomp100 atl100; do
w_override_dlls native,builtin "${dll}"
w_try rm -f "${W_SYSTEM32_DLLS}/${dll}.dll"

if [ "${W_ARCH}" = "win64" ]; then
w_try rm -f "${W_SYSTEM64_DLLS}/${dll}.dll"
fi
done

w_try_cd "${W_CACHE}/${W_PACKAGE}"
w_try_ms_installer "${WINE}" vcredist_x86.exe ${W_OPT_UNATTENDED:+/q}

Expand Down Expand Up @@ -12737,7 +12759,15 @@ load_vcrun2012()
# https://www.microsoft.com/en-us/download/details.aspx?id=30679
w_download https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x86.exe b924ad8062eaf4e70437c8be50fa612162795ff0839479546ce907ffa8d6e386

w_override_dlls native,builtin atl110 msvcp110 msvcr110 vcomp110
for dll in atl110 msvcp110 msvcr110 vcomp110; do
w_override_dlls native,builtin "${dll}"
w_try rm -f "${W_SYSTEM32_DLLS}/${dll}.dll"

if [ "${W_ARCH}" = "win64" ]; then
w_try rm -f "${W_SYSTEM64_DLLS}/${dll}.dll"
fi
done

w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
w_try_ms_installer "${WINE}" vcredist_x86.exe ${W_OPT_UNATTENDED:+/q}

Expand Down Expand Up @@ -12801,7 +12831,14 @@ load_vcrun2013()
# 2019/03/24: 89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17
w_download https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe 89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17

w_override_dlls native,builtin atl120 msvcp120 msvcr120 vcomp120
for dll in atl120 msvcp120 msvcr120 vcomp120; do
w_override_dlls native,builtin "${dll}"
w_try rm -f "${W_SYSTEM32_DLLS}/${dll}.dll"

if [ "${W_ARCH}" = "win64" ]; then
w_try rm -f "${W_SYSTEM64_DLLS}/${dll}.dll"
fi
done
w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
w_try_ms_installer "${WINE}" vcredist_x86.exe ${W_OPT_UNATTENDED:+/q}

Expand Down Expand Up @@ -12866,7 +12903,14 @@ load_vcrun2015()
# 2022/09/16: dafb8b5f4b46bfaf7faa1d0ad05211f5c9855f0005cd603f8b5037b6a708d6b6
w_download https://download.microsoft.com/download/6/D/F/6DF3FF94-F7F9-4F0B-838C-A328D1A7D0EE/vc_redist.x86.exe dafb8b5f4b46bfaf7faa1d0ad05211f5c9855f0005cd603f8b5037b6a708d6b6

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
for dll in 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; do
w_override_dlls native,builtin "${dll}"
w_try rm -f "${W_SYSTEM32_DLLS}/${dll}.dll"

if [ "${W_ARCH}" = "win64" ]; then
w_try rm -f "${W_SYSTEM64_DLLS}/${dll}.dll"
fi
done

if w_workaround_wine_bug 50894 "Working around failing wusa.exe lookup via C:\windows\SysNative"; then
w_store_winver
Expand Down Expand Up @@ -12949,7 +12993,14 @@ load_vcrun2017()
# 2024/10/17: 251640e8039d34290133b2c6e3e6fe098e61e2756d5a4c45fdcec9e4dee6c187
w_download https://aka.ms/vs/15/release/vc_redist.x86.exe 251640e8039d34290133b2c6e3e6fe098e61e2756d5a4c45fdcec9e4dee6c187

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
for dll in 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; do
w_override_dlls native,builtin "${dll}"
w_try rm -f "${W_SYSTEM32_DLLS}/${dll}.dll"

if [ "${W_ARCH}" = "win64" ]; then
w_try rm -f "${W_SYSTEM64_DLLS}/${dll}.dll"
fi
done

if w_workaround_wine_bug 50894 "Working around failing wusa.exe lookup via C:\windows\SysNative"; then
w_store_winver
Expand Down Expand Up @@ -13013,7 +13064,14 @@ load_vcrun2019()
# 2022/01/18: 4c6c420cf4cbf2c9c9ed476e96580ae92a97b2822c21329a2e49e8439ac5ad30
# 2023/12/30: 29f649c08928b31e6bb11d449626da14b5e99b5303fe2b68afa63732ef29c946
# 2024/10/17: 49545cb0f6499c4a65e1e8d5033441eeeb4edfae465a68489a70832c6a4f6399
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 msvcp140_codecvt_ids vcamp140 vccorlib140 vcomp140 vcruntime140
for dll in 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 msvcp140_codecvt_ids vcamp140 vccorlib140 vcomp140 vcruntime140; do
w_override_dlls native,builtin "${dll}"
w_try rm -f "${W_SYSTEM32_DLLS}/${dll}.dll"

if [ "${W_ARCH}" = "win64" ]; then
w_try rm -f "${W_SYSTEM64_DLLS}/${dll}.dll"
fi
done

w_download https://aka.ms/vs/16/release/vc_redist.x86.exe 49545cb0f6499c4a65e1e8d5033441eeeb4edfae465a68489a70832c6a4f6399

Expand Down Expand Up @@ -13047,6 +13105,7 @@ load_vcrun2019()

# vcruntime140_1 is only shipped on x64:
w_override_dlls native,builtin vcruntime140_1
w_try rm -f "${W_SYSTEM64_DLLS}/vcruntime140_1.dll"

w_download https://aka.ms/vs/16/release/vc_redist.x64.exe 5d9999036f2b3a930f83b7fe3e2186b12e79ae7c007d538f52e3582e986a37c3
w_try_ms_installer "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q}
Expand Down Expand Up @@ -13112,7 +13171,14 @@ load_vcrun2022()
# 2024/06/10: a32dd41eaab0c5e1eaa78be3c0bb73b48593de8d97a7510b97de3fd993538600
# 2024/10/17: ed1967c2ac27d806806d121601b526f84e497ae1b99ed139c0c4c6b50147df4a
# 2024/11/20: dd1a8be03398367745a87a5e35bebdab00fdad080cf42af0c3f20802d08c25d4
w_override_dlls native,builtin concrt140 msvcp140 msvcp140_1 msvcp140_2 msvcp140_atomic_wait msvcp140_codecvt_ids vcamp140 vccorlib140 vcomp140 vcruntime140
for dll in concrt140 msvcp140 msvcp140_1 msvcp140_2 msvcp140_atomic_wait msvcp140_codecvt_ids vcamp140 vccorlib140 vcomp140 vcruntime140; do
w_override_dlls native,builtin "${dll}"
w_try rm -f "${W_SYSTEM32_DLLS}/${dll}.dll"

if [ "${W_ARCH}" = "win64" ]; then
w_try rm -f "${W_SYSTEM64_DLLS}/${dll}.dll"
fi
done

w_download https://aka.ms/vs/17/release/vc_redist.x86.exe dd1a8be03398367745a87a5e35bebdab00fdad080cf42af0c3f20802d08c25d4

Expand Down

0 comments on commit 7a9f6c9

Please sign in to comment.