Skip to content

Commit 1c6deb1

Browse files
Gcenxaustin987
authored andcommitted
vcrun2026: new verb
closes #2452
1 parent e78e024 commit 1c6deb1

File tree

4 files changed

+55
-4
lines changed

4 files changed

+55
-4
lines changed

files/verbs/all.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@ vcrun2015 Visual C++ 2015 libraries (concrt140.dll,mfc140.dll,mfc
369369
vcrun2017 Visual C++ 2017 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,msvcp140_1.dll,msvcp140_2.dll,msvcp140_atomic_wait.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll,vcruntime140_1.dll) (Microsoft, 2017) [downloadable]
370370
vcrun2019 Visual C++ 2015-2019 libraries (concrt140.dll,mfc140.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 (Microsoft, 2019) [downloadable]
371371
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,vcruntime140_1.dll) (Microsoft, 2022) [downloadable]
372+
vcrun2026 Visual C++ 2017-2026 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) (Microsoft, 2026) [downloadable]
372373
vcrun6 Visual C++ 6 SP4 libraries (mfc42, msvcp60, msvcirt) (Microsoft, 2000) [downloadable]
373374
vcrun6sp6 Visual C++ 6 SP6 libraries (with fixes in ATL and MFC) (Microsoft, 2004) [downloadable]
374375
vjrun20 MS Visual J# 2.0 SE libraries (requires dotnet20) (Microsoft, 2007) [downloadable]

files/verbs/dlls.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ vcrun2015 Visual C++ 2015 libraries (concrt140.dll,mfc140.dll,mfc
300300
vcrun2017 Visual C++ 2017 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,msvcp140_1.dll,msvcp140_2.dll,msvcp140_atomic_wait.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll,vcruntime140_1.dll) (Microsoft, 2017) [downloadable]
301301
vcrun2019 Visual C++ 2015-2019 libraries (concrt140.dll,mfc140.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 (Microsoft, 2019) [downloadable]
302302
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,vcruntime140_1.dll) (Microsoft, 2022) [downloadable]
303+
vcrun2026 Visual C++ 2017-2026 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) (Microsoft, 2026) [downloadable]
303304
vcrun6 Visual C++ 6 SP4 libraries (mfc42, msvcp60, msvcirt) (Microsoft, 2000) [downloadable]
304305
vcrun6sp6 Visual C++ 6 SP6 libraries (with fixes in ATL and MFC) (Microsoft, 2004) [downloadable]
305306
vjrun20 MS Visual J# 2.0 SE libraries (requires dotnet20) (Microsoft, 2007) [downloadable]

files/verbs/download.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,7 @@ vcrun2015
384384
vcrun2017
385385
vcrun2019
386386
vcrun2022
387+
vcrun2026
387388
vcrun6
388389
vcrun6sp6
389390
verdana

src/winetricks

Lines changed: 52 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13401,7 +13401,7 @@ w_metadata vcrun2015 dlls \
1340113401
publisher="Microsoft" \
1340213402
year="2015" \
1340313403
media="download" \
13404-
conflicts="vcrun2017 vcrun2019 ucrtbase2019 vcrun2022" \
13404+
conflicts="vcrun2017 vcrun2019 ucrtbase2019 vcrun2022 vcrun2026" \
1340513405
file1="vc_redist.x86.exe" \
1340613406
installed_file1="${W_SYSTEM32_DLLS_WIN}/mfc140.dll"
1340713407

@@ -13477,7 +13477,7 @@ w_metadata vcrun2017 dlls \
1347713477
publisher="Microsoft" \
1347813478
year="2017" \
1347913479
media="download" \
13480-
conflicts="vcrun2015 vcrun2019 ucrtbase2019 vcrun2022" \
13480+
conflicts="vcrun2015 vcrun2019 ucrtbase2019 vcrun2022 vcrun2026" \
1348113481
file1="vc_redist.x86.exe" \
1348213482
installed_file1="${W_SYSTEM32_DLLS_WIN}/mfc140.dll"
1348313483

@@ -13527,7 +13527,7 @@ w_metadata vcrun2019 dlls \
1352713527
publisher="Microsoft" \
1352813528
year="2019" \
1352913529
media="download" \
13530-
conflicts="vcrun2015 vcrun2017 vcrun2022" \
13530+
conflicts="vcrun2015 vcrun2017 vcrun2022 vcrun2026" \
1353113531
file1="vc_redist.x86.exe" \
1353213532
installed_file1="${W_SYSTEM32_DLLS_WIN}/mfc140.dll"
1353313533

@@ -13637,7 +13637,7 @@ w_metadata vcrun2022 dlls \
1363713637
publisher="Microsoft" \
1363813638
year="2022" \
1363913639
media="download" \
13640-
conflicts="vcrun2015 vcrun2017 vcrun2019" \
13640+
conflicts="vcrun2015 vcrun2017 vcrun2019 vcrun2026" \
1364113641
file1="vc_redist.x86.exe" \
1364213642
installed_file1="${W_SYSTEM32_DLLS_WIN}/vcruntime140.dll"
1364313643

@@ -13695,6 +13695,54 @@ load_vcrun2022()
1369513695

1369613696
#----------------------------------------------------------------
1369713697

13698+
w_metadata vcrun2026 dlls \
13699+
title="Visual C++ 2017-2026 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)" \
13700+
publisher="Microsoft" \
13701+
year="2026" \
13702+
media="download" \
13703+
conflicts="vcrun2015 vcrun2017 vcrun2019 vcrun2022" \
13704+
file1="VC_redist.x86.exe" \
13705+
installed_file1="${W_SYSTEM32_DLLS_WIN}/vcruntime140.dll"
13706+
13707+
load_vcrun2026()
13708+
{
13709+
# https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist
13710+
# 2026-02-01: 14.50.35719 @ https://download.visualstudio.microsoft.com/download/pr/6f02464a-5e9b-486d-a506-c99a17db9a83/E7267C1BDF9237C0B4A28CF027C382B97AA909934F84F1C92D3FB9F04173B33E/VC_redist.x86.exe
13711+
w_override_dlls native,builtin concrt140 msvcp140 msvcp140_1 msvcp140_2 msvcp140_atomic_wait msvcp140_codecvt_ids vcamp140 vccorlib140 vcomp140 vcruntime140
13712+
13713+
w_download https://aka.ms/vc14/vc_redist.x86.exe e7267c1bdf9237c0b4a28cf027c382b97aa909934f84f1c92d3fb9f04173b33e
13714+
w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
13715+
w_try_ms_installer "${WINE}" VC_redist.x86.exe ${W_OPT_UNATTENDED:+/q}
13716+
13717+
# Setup will refuse to install msvcp140 & msvcp140_2 because the builtin's version number is higher, so manually replace them
13718+
# See https://bugs.winehq.org/show_bug.cgi?id=57518
13719+
w_try_cabextract --directory="${W_TMP}/win32" "${W_CACHE}"/"${W_PACKAGE}"/VC_redist.x86.exe -F 'a2'
13720+
w_try_cabextract --directory="${W_TMP}/win32" "${W_TMP}/win32/a2"
13721+
w_try mv -f "${W_TMP}/win32/msvcp140.dll_x86" "${W_SYSTEM32_DLLS}/msvcp140.dll"
13722+
w_try mv -f "${W_TMP}/win32/msvcp140_2.dll_x86" "${W_SYSTEM32_DLLS}/msvcp140_2.dll"
13723+
13724+
case "${W_ARCH}" in
13725+
win64)
13726+
# Also install the 64-bit version
13727+
# 2026-02-01: 14.50.35719 @ https://download.visualstudio.microsoft.com/download/pr/6f02464a-5e9b-486d-a506-c99a17db9a83/8995548DFFFCDE7C49987029C764355612BA6850EE09A7B6F0FDDC85BDC5C280/VC_redist.x64.exe
13728+
# vcruntime140_1 is only shipped on x64:
13729+
w_override_dlls native,builtin vcruntime140_1
13730+
13731+
w_download https://aka.ms/vc14/vc_redist.x64.exe 8995548dfffcde7c49987029c764355612ba6850ee09a7b6f0fddc85bdc5c280
13732+
w_try_ms_installer "${WINE}" VC_redist.x64.exe ${W_OPT_UNATTENDED:+/q}
13733+
13734+
# Also replace 64-bit msvcp140.dll, msvcp140_2.dll & vcruntime140_1.dll
13735+
w_try_cabextract --directory="${W_TMP}/win64" "${W_CACHE}"/"${W_PACKAGE}"/VC_redist.x64.exe -F 'a4'
13736+
w_try_cabextract --directory="${W_TMP}/win64" "${W_TMP}/win64/a4"
13737+
w_try mv -f "${W_TMP}/win64/msvcp140.dll_amd64" "${W_SYSTEM64_DLLS}/msvcp140.dll"
13738+
w_try mv -f "${W_TMP}/win64/msvcp140_2.dll_amd64" "${W_SYSTEM64_DLLS}/msvcp140_2.dll"
13739+
w_try mv -f "${W_TMP}/win64/vcruntime140_1.dll_amd64" "${W_SYSTEM64_DLLS}/vcruntime140_1.dll"
13740+
;;
13741+
esac
13742+
}
13743+
13744+
#----------------------------------------------------------------
13745+
1369813746
w_metadata vjrun20 dlls \
1369913747
title="MS Visual J# 2.0 SE libraries (requires dotnet20)" \
1370013748
publisher="Microsoft" \

0 commit comments

Comments
 (0)