Commit 5f50d069 authored by Vitaly Lipatov's avatar Vitaly Lipatov

Merge branch 'master' into etersoft

parents c84a9269 c757f1ac
%define oname winetricks
Name: wine-etersoft-winetricks
Version: 20230207
Version: 20230212
Release: alt1
Summary: Work around common problems in Wine
......@@ -79,6 +79,9 @@ desktop-file-validate %buildroot%_desktopdir/%oname.desktop
#exclude %_datadir/appdata/%name.appdata.xml
%changelog
* Sun Feb 12 2023 Vitaly Lipatov <lav@altlinux.ru> 20230212-alt1
- new version 20230212 (with rpmrb script)
* Tue Feb 07 2023 Vitaly Lipatov <lav@altlinux.ru> 20230207-alt1
- new version (20230207) with rpmgs script
......
......@@ -12,6 +12,7 @@ controlspy Control Spy 6 (Microsoft, 2005) [downloadable]
dotnet20sdk MS .NET 2.0 SDK (Microsoft, 2006) [downloadable]
dxsdk_aug2006 MS DirectX SDK, August 2006 (developers only) (Microsoft, 2006) [downloadable]
dxsdk_jun2010 MS DirectX SDK, June 2010 (developers only) (Microsoft, 2010) [downloadable]
dxwnd Window hooker to run fullscreen programs in window and much more... (ghotik, 2011) [downloadable]
emu8086 emu8086 (emu8086.com, 2015) [downloadable]
ev3 Lego Mindstorms EV3 Home Edition (Lego, 2014) [downloadable]
firefox Firefox 51.0 (Mozilla, 2017) [downloadable]
......@@ -38,6 +39,8 @@ ollydbg110 OllyDbg (ollydbg.de, 2004) [downloadable]
ollydbg200 OllyDbg (ollydbg.de, 2010) [downloadable]
ollydbg201 OllyDbg (ollydbg.de, 2013) [downloadable]
openwatcom Open Watcom C/C++ compiler (can compile win16 code!) (Watcom, 2010) [downloadable]
origin EA Origin (EA, 2011) [downloadable]
originupdater EA Origin (updater) (EA, ) [downloadable]
protectionid Protection ID (CDKiLLER & TippeX, 2016)
psdk2003 MS Platform SDK 2003 (Microsoft, 2003) [downloadable]
psdkwin71 MS Windows 7.1 SDK (Microsoft, 2010) [downloadable]
......@@ -57,6 +60,7 @@ vc2010express MS Visual C++ 2010 Express (Microsoft, 2010) [downloada
vlc VLC media player 2.2.1 (VideoLAN, 2015) [downloadable]
vstools2019 MS Visual Studio Build Tools 2019 (Microsoft, 2019) [downloadable]
winamp Winamp (Radionomy (AOL (Nullsoft)), 2013) [downloadable]
winrar WinRAR 6.11 (RARLAB, 1993) [downloadable]
wme9 MS Windows Media Encoder 9 (broken in Wine) (Microsoft, 2002) [downloadable]
===== benchmarks =====
3dmark03 3D Mark 03 (Futuremark, 2003)
......@@ -151,10 +155,12 @@ dotnet462 MS .NET 4.6.2 (Microsoft, 2016) [downloadable]
dotnet471 MS .NET 4.7.1 (Microsoft, 2017) [downloadable]
dotnet472 MS .NET 4.7.2 (Microsoft, 2018) [downloadable]
dotnet48 MS .NET 4.8 (Microsoft, 2019) [downloadable]
dotnet6 MS .NET Runtime 6.0 LTS (Microsoft, 2023) [downloadable]
dotnet_verifier MS .NET Verifier (Microsoft, 2016) [downloadable]
dotnetcore2 MS .NET Core Runtime 2.1 LTS (Microsoft, 2020) [downloadable]
dotnetcore3 MS .NET Core Runtime 3.1 LTS (Microsoft, 2020) [downloadable]
dotnetcoredesktop3 MS .NET Core Desktop Runtime 3.1 LTS (Microsoft, 2020) [downloadable]
dotnetdesktop6 MS .NET Desktop Runtime 6.0 LTS (Microsoft, 2023) [downloadable]
dpvoice Microsoft dpvoice dpvvox dpvacm Audio dlls (Microsoft, 2002) [downloadable]
dsdmo MS dsdmo.dll (Microsoft, 2010) [downloadable]
dsound MS DirectSound from DirectX user redistributable (Microsoft, 2010) [downloadable]
......@@ -164,7 +170,7 @@ dxdiag DirectX Diagnostic Tool (Microsoft, 2010) [downloadable
dxdiagn DirectX Diagnostic Library (Microsoft, 2011) [downloadable]
dxdiagn_feb2010 DirectX Diagnostic Library (February 2010) (Microsoft, 2010) [downloadable]
dxtrans MS dxtrans.dll (Microsoft, 2002) [downloadable]
dxvk Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (latest) (Philip Rebohle, 2017) [downloadable]
dxvk Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (latest) (Philip Rebohle, 2023) [downloadable]
dxvk0054 Vulkan-based D3D11 implementation for Linux / Wine (0.54) (Philip Rebohle, 2017) [downloadable]
dxvk0060 Vulkan-based D3D11 implementation for Linux / Wine (0.60) (Philip Rebohle, 2017) [downloadable]
dxvk0061 Vulkan-based D3D11 implementation for Linux / Wine (0.61) (Philip Rebohle, 2017) [downloadable]
......@@ -226,6 +232,10 @@ dxvk1093 Vulkan-based D3D9/D3D10/D3D11 implementation for Linux
dxvk1094 Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.9.4) (Philip Rebohle, 2017) [downloadable]
dxvk1100 Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.10) (Philip Rebohle, 2017) [downloadable]
dxvk1101 Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.10.1) (Philip Rebohle, 2017) [downloadable]
dxvk1102 Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.10.2) (Philip Rebohle, 2017) [downloadable]
dxvk1103 Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.10.3) (Philip Rebohle, 2022) [downloadable]
dxvk2000 Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (2.0) (Philip Rebohle, 2022) [downloadable]
dxvk2010 Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (2.1) (Philip Rebohle, 2023) [downloadable]
esent MS Extensible Storage Engine (Microsoft, 2011) [downloadable]
faudio FAudio (xaudio reimplementation, with xna support) builds for win32 (latest) (Kron4ek, 2019) [downloadable]
faudio1901 FAudio (xaudio reimplementation, with xna support) builds for win32 (19.01) (Kron4ek, 2019) [downloadable]
......@@ -257,6 +267,7 @@ ie6 Internet Explorer 6 (Microsoft, 2002) [downloadable]
ie7 Internet Explorer 7 (Microsoft, 2008) [downloadable]
ie8 Internet Explorer 8 (Microsoft, 2009) [downloadable]
ie8_kb2936068 Cumulative Security Update for Internet Explorer 8 (Microsoft, 2014) [downloadable]
ie8_tls12 TLS 1.1 and 1.2 for Internet Explorer 8 (Microsoft, 2017) [downloadable]
iertutil MS Runtime Utility (Microsoft, 2011) [downloadable]
itircl MS itircl.dll (Microsoft, 1999) [downloadable]
itss MS itss.dll (Microsoft, 1999) [downloadable]
......@@ -295,11 +306,12 @@ msvcirt Visual C++ 6 SP4 msvcirt library; part of vcrun6 (Micro
msvcrt40 fixme (Microsoft, 2011) [downloadable]
msxml3 MS XML Core Services 3.0 (Microsoft, 2005) [downloadable]
msxml4 MS XML Core Services 4.0 (Microsoft, 2009) [downloadable]
msxml6 MS XML Core Services 6.0 sp2 (Microsoft, 2009) [downloadable]
msxml6 MS XML Core Services 6.0 sp2 (Microsoft, 2014) [downloadable]
nuget NuGet Package manager (Outercurve Foundation, 2013) [downloadable]
ogg OpenCodecs 0.85: FLAC, Speex, Theora, Vorbis, WebM (Xiph.Org Foundation, 2011) [downloadable]
ole32 MS ole32 Module (ole32.dll) (Microsoft, 2004) [downloadable]
oleaut32 MS oleaut32.dll (Microsoft, 2011) [downloadable]
openal OpenAL Runtime (Creative, 2023) [downloadable]
pdh MS pdh.dll (Performance Data Helper) (Microsoft, 2011) [downloadable]
pdh_nt4 MS pdh.dll (Performance Data Helper); WinNT 4.0 Version (Microsoft, 1997) [downloadable]
peverify MS peverify (from .NET 2.0 SDK) (Microsoft, 2006) [downloadable]
......@@ -326,6 +338,7 @@ setupapi MS Setup API (Microsoft, 2004) [downloadable]
shockwave Shockwave (Adobe, 2018) [downloadable]
speechsdk MS Speech SDK 5.1 (Microsoft, 2009) [downloadable]
tabctl32 Microsoft Tabbed Dialog Control 6.0 (tabctl32.ocx) (Microsoft, 2012) [downloadable]
ucrtbase2019 Visual C++ 2019 library (ucrtbase.dll) (Microsoft, 2019) [downloadable]
updspapi Windows Update Service API (Microsoft, 2004) [downloadable]
urlmon MS urlmon (Microsoft, 2011) [downloadable]
usp10 Uniscribe (Microsoft, 2011) [downloadable]
......@@ -340,10 +353,10 @@ vcrun2008 Visual C++ 2008 libraries (mfc90,msvcp90,msvcr90) (Micr
vcrun2010 Visual C++ 2010 libraries (mfc100,msvcp100,msvcr100) (Microsoft, 2010) [downloadable]
vcrun2012 Visual C++ 2012 libraries (atl110,mfc110,mfc110u,msvcp110,msvcr110,vcomp110) (Microsoft, 2012) [downloadable]
vcrun2013 Visual C++ 2013 libraries (mfc120,mfc120u,msvcp120,msvcr120,vcomp120) (Microsoft, 2013) [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]
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]
vcrun2015 Visual C++ 2015 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,msvcp140_1.dll,msvcp140_atomic_wait.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll,vcruntime140_1.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,msvcp140_atomic_wait.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll,vcruntime140_1.dll) (Microsoft, 2017) [downloadable]
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]
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]
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]
vjrun20 MS Visual J# 2.0 SE libraries (requires dotnet20) (Microsoft, 2007) [downloadable]
......@@ -411,20 +424,16 @@ wenquanyizenhei WenQuanYi ZenHei font (wenq.org, 2009) [downloadable]
===== games =====
acreedbro Assassin's Creed Brotherhood (Ubisoft, 2011)
algodoo_demo Algodoo Demo (Algoryx, 2009) [downloadable]
alienswarm_steam Alien Swarm (Steam) (Valve, 2010) [downloadable]
amnesia_tdd_demo Amnesia: The Dark Descent Demo (Frictional Games, 2010)
aoe3_demo Age of Empires III Trial (Microsoft, 2005) [downloadable]
avatar_demo James Camerons Avatar: The Game Demo (Ubisoft, 2009)
bfbc2 Battlefield Bad Company 2 (EA, 2010)
bioshock2 Bioshock 2 (2K Games, 2010)
bioshock2_steam Bioshock 2 (Steam) (2k, 2010) [downloadable]
bioshock_demo Bioshock Demo (2K Games, 2007) [downloadable]
blobby_volley Blobby Volley (Daniel Skoraszewsky, 2000)
borderlands_steam Borderlands (Steam, non-free) (2K Games, 2009) [downloadable]
bttf101 Back to the Future Episode 1 (Telltale, 2011)
cim_demo Cities In Motion Demo (Paradox Interactive, 2010)
civ4_demo Civilization IV Demo (Firaxis Games, 2005)
civ5_demo_steam Civilization V Demo (Steam) (2K Games, 2010) [downloadable]
cnc3_demo Command & Conquer 3 Demo (EA, 2007) [downloadable]
cnc_redalert3_demo Command & Conquer Red Alert 3 Demo (EA, 2008)
cod1 Call of Duty (Activision, 2003)
......@@ -442,7 +451,6 @@ deadspace2 Dead Space 2 (EA, 2011)
demolition_company_demo Demolition Company demo (Giants Software, 2010)
deusex2_demo Deus Ex 2 / Deus Ex: Invisible War Demo (Eidos, 2003)
diablo2 Diablo II (Blizzard, 2000)
digitanks_demo Digitanks Demo (Lunar Workshop, 2011) [downloadable]
dirt2_demo Dirt 2 Demo (Codemasters, 2009)
dragonage Dragon Age: Origins (Bioware / EA, 2009)
dragonage2_demo Dragon Age II demo (EA/Bioware, 2011) [downloadable]
......@@ -451,7 +459,6 @@ eve EVE Online Tyrannis (CCP Games, 2017) [downloadable]
fable_tlc Fable: The Lost Chapters (Microsoft, 2005)
fifa11_demo FIFA 11 Demo (EA Sports, 2010) [downloadable]
gta_vc Grand Theft Auto: Vice City (Rockstar, 2003)
hon Heroes of Newerth (S2 Games, 2018) [downloadable]
hordesoforcs2_demo Hordes of Orcs 2 Demo (Freeverse, 2010)
kotor1 Star Wars: Knights of the Old Republic (LucasArts, 2003)
lemonysnicket Lemony Snicket: A Series of Unfortunate Events (Activision, 2004)
......@@ -473,7 +480,6 @@ penpenxmas Pen-Pen Xmas Olympics (Army of Trolls / Black Cat, 2007
popfs Prince of Persia: The Forgotten Sands (Ubisoft, 2010)
rct3deluxe RollerCoaster Tycoon 3 Deluxe (DRM broken on Wine) (Atari, 2004)
riseofnations_demo Rise of Nations Trial (Microsoft, 2003)
ruse_demo_steam Ruse Demo (Steam) (Ubisoft, 2010) [downloadable]
sammax301_demo Sam & Max 301: The Penal Zone (Telltale Games, 2010)
sammax304_demo Sam & Max 304: Beyond the Alley of the Dolls (Telltale Games, 2010)
secondlife Second Life Viewer (Linden Labs, 2003-2011) [downloadable]
......@@ -485,19 +491,15 @@ splitsecond Split Second (Disney, 2010)
spore Spore (EA, 2008)
spore_cc_demo Spore Creature Creator trial (EA, 2008) [downloadable]
starcraft2_demo Starcraft II Demo (Blizzard, 2010)
supermeatboy_steam Super Meat Boy (Steam, non-free) (Independent, 2010) [downloadable]
theundergarden_demo The UnderGarden Demo (Atari, 2010)
tmnationsforever TrackMania Nations Forever (Nadeo, 2009) [downloadable]
torchlight Torchlight - boxed version (Runic Games, 2009)
trainztcc_2004 Trainz: The Complete Collection: TRS2004 (Paradox Interactive, 2008)
trine_demo_steam Trine Demo (Steam) (Frozenbyte, 2009) [downloadable]
trine_steam Trine (Steam) (Frozenbyte, 2009) [downloadable]
tropico3_demo Tropico 3 Demo (Kalypso Media GmbH, 2009)
twfc Transformers: War for Cybertron (Activision, 2010)
typingofthedead_demo Typing of the Dead Demo (Sega, 1999)
ut3 Unreal Tournament 3 (Midway Games, 2007)
wog World of Goo Demo (2D Boy, 2008) [downloadable]
wormsreloaded_demo_steam Worms Reloaded Demo (Steam) (Team17, 2010) [downloadable]
===== prefix =====
apps
benchmarks
......
......@@ -11,6 +11,7 @@ controlspy Control Spy 6 (Microsoft, 2005) [downloadable]
dotnet20sdk MS .NET 2.0 SDK (Microsoft, 2006) [downloadable]
dxsdk_aug2006 MS DirectX SDK, August 2006 (developers only) (Microsoft, 2006) [downloadable]
dxsdk_jun2010 MS DirectX SDK, June 2010 (developers only) (Microsoft, 2010) [downloadable]
dxwnd Window hooker to run fullscreen programs in window and much more... (ghotik, 2011) [downloadable]
emu8086 emu8086 (emu8086.com, 2015) [downloadable]
ev3 Lego Mindstorms EV3 Home Edition (Lego, 2014) [downloadable]
firefox Firefox 51.0 (Mozilla, 2017) [downloadable]
......@@ -37,6 +38,8 @@ ollydbg110 OllyDbg (ollydbg.de, 2004) [downloadable]
ollydbg200 OllyDbg (ollydbg.de, 2010) [downloadable]
ollydbg201 OllyDbg (ollydbg.de, 2013) [downloadable]
openwatcom Open Watcom C/C++ compiler (can compile win16 code!) (Watcom, 2010) [downloadable]
origin EA Origin (EA, 2011) [downloadable]
originupdater EA Origin (updater) (EA, ) [downloadable]
protectionid Protection ID (CDKiLLER & TippeX, 2016)
psdk2003 MS Platform SDK 2003 (Microsoft, 2003) [downloadable]
psdkwin71 MS Windows 7.1 SDK (Microsoft, 2010) [downloadable]
......@@ -56,4 +59,5 @@ vc2010express MS Visual C++ 2010 Express (Microsoft, 2010) [downloada
vlc VLC media player 2.2.1 (VideoLAN, 2015) [downloadable]
vstools2019 MS Visual Studio Build Tools 2019 (Microsoft, 2019) [downloadable]
winamp Winamp (Radionomy (AOL (Nullsoft)), 2013) [downloadable]
winrar WinRAR 6.11 (RARLAB, 1993) [downloadable]
wme9 MS Windows Media Encoder 9 (broken in Wine) (Microsoft, 2002) [downloadable]
......@@ -81,10 +81,12 @@ dotnet462 MS .NET 4.6.2 (Microsoft, 2016) [downloadable]
dotnet471 MS .NET 4.7.1 (Microsoft, 2017) [downloadable]
dotnet472 MS .NET 4.7.2 (Microsoft, 2018) [downloadable]
dotnet48 MS .NET 4.8 (Microsoft, 2019) [downloadable]
dotnet6 MS .NET Runtime 6.0 LTS (Microsoft, 2023) [downloadable]
dotnet_verifier MS .NET Verifier (Microsoft, 2016) [downloadable]
dotnetcore2 MS .NET Core Runtime 2.1 LTS (Microsoft, 2020) [downloadable]
dotnetcore3 MS .NET Core Runtime 3.1 LTS (Microsoft, 2020) [downloadable]
dotnetcoredesktop3 MS .NET Core Desktop Runtime 3.1 LTS (Microsoft, 2020) [downloadable]
dotnetdesktop6 MS .NET Desktop Runtime 6.0 LTS (Microsoft, 2023) [downloadable]
dpvoice Microsoft dpvoice dpvvox dpvacm Audio dlls (Microsoft, 2002) [downloadable]
dsdmo MS dsdmo.dll (Microsoft, 2010) [downloadable]
dsound MS DirectSound from DirectX user redistributable (Microsoft, 2010) [downloadable]
......@@ -94,7 +96,7 @@ dxdiag DirectX Diagnostic Tool (Microsoft, 2010) [downloadable
dxdiagn DirectX Diagnostic Library (Microsoft, 2011) [downloadable]
dxdiagn_feb2010 DirectX Diagnostic Library (February 2010) (Microsoft, 2010) [downloadable]
dxtrans MS dxtrans.dll (Microsoft, 2002) [downloadable]
dxvk Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (latest) (Philip Rebohle, 2017) [downloadable]
dxvk Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (latest) (Philip Rebohle, 2023) [downloadable]
dxvk0054 Vulkan-based D3D11 implementation for Linux / Wine (0.54) (Philip Rebohle, 2017) [downloadable]
dxvk0060 Vulkan-based D3D11 implementation for Linux / Wine (0.60) (Philip Rebohle, 2017) [downloadable]
dxvk0061 Vulkan-based D3D11 implementation for Linux / Wine (0.61) (Philip Rebohle, 2017) [downloadable]
......@@ -156,6 +158,10 @@ dxvk1093 Vulkan-based D3D9/D3D10/D3D11 implementation for Linux
dxvk1094 Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.9.4) (Philip Rebohle, 2017) [downloadable]
dxvk1100 Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.10) (Philip Rebohle, 2017) [downloadable]
dxvk1101 Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.10.1) (Philip Rebohle, 2017) [downloadable]
dxvk1102 Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.10.2) (Philip Rebohle, 2017) [downloadable]
dxvk1103 Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.10.3) (Philip Rebohle, 2022) [downloadable]
dxvk2000 Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (2.0) (Philip Rebohle, 2022) [downloadable]
dxvk2010 Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (2.1) (Philip Rebohle, 2023) [downloadable]
esent MS Extensible Storage Engine (Microsoft, 2011) [downloadable]
faudio FAudio (xaudio reimplementation, with xna support) builds for win32 (latest) (Kron4ek, 2019) [downloadable]
faudio1901 FAudio (xaudio reimplementation, with xna support) builds for win32 (19.01) (Kron4ek, 2019) [downloadable]
......@@ -187,6 +193,7 @@ ie6 Internet Explorer 6 (Microsoft, 2002) [downloadable]
ie7 Internet Explorer 7 (Microsoft, 2008) [downloadable]
ie8 Internet Explorer 8 (Microsoft, 2009) [downloadable]
ie8_kb2936068 Cumulative Security Update for Internet Explorer 8 (Microsoft, 2014) [downloadable]
ie8_tls12 TLS 1.1 and 1.2 for Internet Explorer 8 (Microsoft, 2017) [downloadable]
iertutil MS Runtime Utility (Microsoft, 2011) [downloadable]
itircl MS itircl.dll (Microsoft, 1999) [downloadable]
itss MS itss.dll (Microsoft, 1999) [downloadable]
......@@ -225,11 +232,12 @@ msvcirt Visual C++ 6 SP4 msvcirt library; part of vcrun6 (Micro
msvcrt40 fixme (Microsoft, 2011) [downloadable]
msxml3 MS XML Core Services 3.0 (Microsoft, 2005) [downloadable]
msxml4 MS XML Core Services 4.0 (Microsoft, 2009) [downloadable]
msxml6 MS XML Core Services 6.0 sp2 (Microsoft, 2009) [downloadable]
msxml6 MS XML Core Services 6.0 sp2 (Microsoft, 2014) [downloadable]
nuget NuGet Package manager (Outercurve Foundation, 2013) [downloadable]
ogg OpenCodecs 0.85: FLAC, Speex, Theora, Vorbis, WebM (Xiph.Org Foundation, 2011) [downloadable]
ole32 MS ole32 Module (ole32.dll) (Microsoft, 2004) [downloadable]
oleaut32 MS oleaut32.dll (Microsoft, 2011) [downloadable]
openal OpenAL Runtime (Creative, 2023) [downloadable]
pdh MS pdh.dll (Performance Data Helper) (Microsoft, 2011) [downloadable]
pdh_nt4 MS pdh.dll (Performance Data Helper); WinNT 4.0 Version (Microsoft, 1997) [downloadable]
peverify MS peverify (from .NET 2.0 SDK) (Microsoft, 2006) [downloadable]
......@@ -256,6 +264,7 @@ setupapi MS Setup API (Microsoft, 2004) [downloadable]
shockwave Shockwave (Adobe, 2018) [downloadable]
speechsdk MS Speech SDK 5.1 (Microsoft, 2009) [downloadable]
tabctl32 Microsoft Tabbed Dialog Control 6.0 (tabctl32.ocx) (Microsoft, 2012) [downloadable]
ucrtbase2019 Visual C++ 2019 library (ucrtbase.dll) (Microsoft, 2019) [downloadable]
updspapi Windows Update Service API (Microsoft, 2004) [downloadable]
urlmon MS urlmon (Microsoft, 2011) [downloadable]
usp10 Uniscribe (Microsoft, 2011) [downloadable]
......@@ -270,10 +279,10 @@ vcrun2008 Visual C++ 2008 libraries (mfc90,msvcp90,msvcr90) (Micr
vcrun2010 Visual C++ 2010 libraries (mfc100,msvcp100,msvcr100) (Microsoft, 2010) [downloadable]
vcrun2012 Visual C++ 2012 libraries (atl110,mfc110,mfc110u,msvcp110,msvcr110,vcomp110) (Microsoft, 2012) [downloadable]
vcrun2013 Visual C++ 2013 libraries (mfc120,mfc120u,msvcp120,msvcr120,vcomp120) (Microsoft, 2013) [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]
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]
vcrun2015 Visual C++ 2015 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,msvcp140_1.dll,msvcp140_atomic_wait.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll,vcruntime140_1.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,msvcp140_atomic_wait.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll,vcruntime140_1.dll) (Microsoft, 2017) [downloadable]
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]
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]
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]
vjrun20 MS Visual J# 2.0 SE libraries (requires dotnet20) (Microsoft, 2007) [downloadable]
......
......@@ -6,7 +6,6 @@
adobe_diged
adobe_diged4
algodoo_demo
alienswarm_steam
allcodecs
allfonts
amstream
......@@ -20,16 +19,13 @@ autohotkey
avifil32
baekmuk
binkw32
bioshock2_steam
bioshock_demo
borderlands_steam
busybox
cabinet
calibri
cambria
candara
cinepak
civ5_demo_steam
cjkfonts
cmake
cmd
......@@ -82,7 +78,6 @@ d3dx9_43
d3dxof
dbghelp
devenum
digitanks_demo
dinput
dinput8
dirac
......@@ -119,9 +114,11 @@ dotnet462
dotnet471
dotnet472
dotnet48
dotnet6
dotnetcore2
dotnetcore3
dotnetcoredesktop3
dotnetdesktop6
dotnet_verifier
dpvoice
dragonage2_demo
......@@ -133,8 +130,8 @@ dx8vb
dxdiag
dxdiagn
dxdiagn_feb2010
dxsdk_aug2006
dxsdk_jun2010
dxsdk_nov2006
dxtrans
dxvk
dxvk0054
......@@ -198,6 +195,11 @@ dxvk1093
dxvk1094
dxvk1100
dxvk1101
dxvk1102
dxvk1103
dxvk2000
dxvk2010
dxwnd
emu8086
esent
eufonts
......@@ -232,13 +234,13 @@ glut
gmdls
hhw
hid
hon
iceweasel
icodecs
ie6
ie7
ie8
ie8_kb2936068
ie8_tls12
iertutil
impact
ipamona
......@@ -308,8 +310,11 @@ oleaut32
ollydbg110
ollydbg200
ollydbg201
openal
opensymbol
openwatcom
origin
originupdater
pdh
pdh_nt4
penpenxmas
......@@ -335,7 +340,6 @@ quicktime76
riched20
riched30
richtx32
ruse_demo_steam
safari
sapi
sdl
......@@ -348,16 +352,14 @@ sourcehansans
speechsdk
spore_cc_demo
steam
supermeatboy_steam
tabctl32
tahoma
takao
times
tmnationsforever
trebuchet
trine_demo_steam
trine_steam
ubisoftconnect
ucrtbase2019
uff
unifont
updspapi
......@@ -402,6 +404,7 @@ windowscodecs
winhttp
wininet
wininet_win2k
winrar
wme9
wmi
wmp10
......@@ -409,7 +412,6 @@ wmp11
wmp9
wmv9vcm
wog
wormsreloaded_demo_steam
wsh57
xact
xact_x64
......
acreedbro Assassin's Creed Brotherhood (Ubisoft, 2011)
algodoo_demo Algodoo Demo (Algoryx, 2009) [downloadable]
alienswarm_steam Alien Swarm (Steam) (Valve, 2010) [downloadable]
amnesia_tdd_demo Amnesia: The Dark Descent Demo (Frictional Games, 2010)
aoe3_demo Age of Empires III Trial (Microsoft, 2005) [downloadable]
avatar_demo James Camerons Avatar: The Game Demo (Ubisoft, 2009)
bfbc2 Battlefield Bad Company 2 (EA, 2010)
bioshock2 Bioshock 2 (2K Games, 2010)
bioshock2_steam Bioshock 2 (Steam) (2k, 2010) [downloadable]
bioshock_demo Bioshock Demo (2K Games, 2007) [downloadable]
blobby_volley Blobby Volley (Daniel Skoraszewsky, 2000)
borderlands_steam Borderlands (Steam, non-free) (2K Games, 2009) [downloadable]
bttf101 Back to the Future Episode 1 (Telltale, 2011)
cim_demo Cities In Motion Demo (Paradox Interactive, 2010)
civ4_demo Civilization IV Demo (Firaxis Games, 2005)
civ5_demo_steam Civilization V Demo (Steam) (2K Games, 2010) [downloadable]
cnc3_demo Command & Conquer 3 Demo (EA, 2007) [downloadable]
cnc_redalert3_demo Command & Conquer Red Alert 3 Demo (EA, 2008)
cod1 Call of Duty (Activision, 2003)
......@@ -31,7 +27,6 @@ deadspace2 Dead Space 2 (EA, 2011)
demolition_company_demo Demolition Company demo (Giants Software, 2010)
deusex2_demo Deus Ex 2 / Deus Ex: Invisible War Demo (Eidos, 2003)
diablo2 Diablo II (Blizzard, 2000)
digitanks_demo Digitanks Demo (Lunar Workshop, 2011) [downloadable]
dirt2_demo Dirt 2 Demo (Codemasters, 2009)
dragonage Dragon Age: Origins (Bioware / EA, 2009)
dragonage2_demo Dragon Age II demo (EA/Bioware, 2011) [downloadable]
......@@ -40,7 +35,6 @@ eve EVE Online Tyrannis (CCP Games, 2017) [downloadable]
fable_tlc Fable: The Lost Chapters (Microsoft, 2005)
fifa11_demo FIFA 11 Demo (EA Sports, 2010) [downloadable]
gta_vc Grand Theft Auto: Vice City (Rockstar, 2003)
hon Heroes of Newerth (S2 Games, 2018) [downloadable]
hordesoforcs2_demo Hordes of Orcs 2 Demo (Freeverse, 2010)
kotor1 Star Wars: Knights of the Old Republic (LucasArts, 2003)
lemonysnicket Lemony Snicket: A Series of Unfortunate Events (Activision, 2004)
......@@ -62,7 +56,6 @@ penpenxmas Pen-Pen Xmas Olympics (Army of Trolls / Black Cat, 2007
popfs Prince of Persia: The Forgotten Sands (Ubisoft, 2010)
rct3deluxe RollerCoaster Tycoon 3 Deluxe (DRM broken on Wine) (Atari, 2004)
riseofnations_demo Rise of Nations Trial (Microsoft, 2003)
ruse_demo_steam Ruse Demo (Steam) (Ubisoft, 2010) [downloadable]
sammax301_demo Sam & Max 301: The Penal Zone (Telltale Games, 2010)
sammax304_demo Sam & Max 304: Beyond the Alley of the Dolls (Telltale Games, 2010)
secondlife Second Life Viewer (Linden Labs, 2003-2011) [downloadable]
......@@ -74,16 +67,12 @@ splitsecond Split Second (Disney, 2010)
spore Spore (EA, 2008)
spore_cc_demo Spore Creature Creator trial (EA, 2008) [downloadable]
starcraft2_demo Starcraft II Demo (Blizzard, 2010)
supermeatboy_steam Super Meat Boy (Steam, non-free) (Independent, 2010) [downloadable]
theundergarden_demo The UnderGarden Demo (Atari, 2010)
tmnationsforever TrackMania Nations Forever (Nadeo, 2009) [downloadable]
torchlight Torchlight - boxed version (Runic Games, 2009)
trainztcc_2004 Trainz: The Complete Collection: TRS2004 (Paradox Interactive, 2008)
trine_demo_steam Trine Demo (Steam) (Frozenbyte, 2009) [downloadable]
trine_steam Trine (Steam) (Frozenbyte, 2009) [downloadable]
tropico3_demo Tropico 3 Demo (Kalypso Media GmbH, 2009)
twfc Transformers: War for Cybertron (Activision, 2010)
typingofthedead_demo Typing of the Dead Demo (Sega, 1999)
ut3 Unreal Tournament 3 (Midway Games, 2007)
wog World of Goo Demo (2D Boy, 2008) [downloadable]
wormsreloaded_demo_steam Worms Reloaded Demo (Steam) (Team17, 2010) [downloadable]
......@@ -41,16 +41,6 @@ fi
datadir="${TOP}/output/links.d"
mkdir -p "${datadir}"
# ftp.microsoft.com resolves to two different IP addresses, one of which is broken
ftp_microsoft_com=64.4.17.176
w_download() {
# shellcheck disable=SC2016
url="$(echo "$1" | sed -e 's,$ftp_microsoft_com,'${ftp_microsoft_com}',;s, ,%20,g')"
urlkey="$(echo "${url}" | tr / _)"
echo "${url}" > "${datadir}/${urlkey}.url"
}
# Extract list of URLs from winetricks
extract_all() {
# w_linkcheck_ignore=1 is a stupid hack to tell linkcheck.sh to ignore a URL (e.g., because it contains a variable)
......
......@@ -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=20220411-next
WINETRICKS_VERSION=20230212-next
# This is a UTF-8 file
# You should see an o with two dots over it here [ö]
......@@ -192,11 +192,12 @@ w_askpermission()
printf '%s\n%b\n%s\n' "${W_TEXT_LINE}" "${@}" "${W_TEXT_LINE}"
if test "${W_OPT_UNATTENDED}"; then
_W_timeout="--timeout 5"
_W_timeout="--timeout"
_W_timeout_length="5"
fi
case ${WINETRICKS_GUI} in
zenity) ${WINETRICKS_GUI} "${_W_timeout}" --question --title=winetricks --text="$(echo "$@" | sed 's,\\\\,\\\\\\\\,g')" --no-wrap;;
zenity) ${WINETRICKS_GUI} "${_W_timeout}" "${_W_timeout_length}" --question --title=winetricks --text="$(echo "$@" | sed 's,\\\\,\\\\\\\\,g')" --no-wrap;;
kdialog) ${WINETRICKS_GUI} --title winetricks --warningcontinuecancel "$@" ;;
none)
if [ -n "${_W_timeout}" ]; then
......@@ -216,7 +217,6 @@ w_askpermission()
pt*) w_die "Operação cancelada, saindo." ;;
*) w_die "Operation cancelled, quitting." ;;
esac
exec false
fi
unset _W_timeout
......@@ -230,11 +230,20 @@ w_info()
printf '%s\n%b\n%s\n' "${W_TEXT_LINE}" "${@}" "${W_TEXT_LINE}"
fi
case ${WINETRICKS_GUI} in
zenity) ${WINETRICKS_GUI} --timeout=3 --info --width=400 --title=winetricks --text="$(echo "$@" | sed 's,\\\\,\\\\\\\\,g')" --no-wrap;;
kdialog) ${WINETRICKS_GUI} --title winetricks --msgbox "$@" ;;
none) ;;
esac
# kdialog doesn't allow a timeout unless you use --passivepopup
if test "${W_OPT_UNATTENDED}"; then
case ${WINETRICKS_GUI} in
zenity) ${WINETRICKS_GUI} --timeout 5 --info --width=400 --title=winetricks --text="$(echo "$@" | sed 's,\\\\,\\\\\\\\,g')";;
kdialog) ${WINETRICKS_GUI} --passivepopup "$@" 5 --title winetricks;;
none) ;;
esac
else
case ${WINETRICKS_GUI} in
zenity) ${WINETRICKS_GUI} --info --width=400 --title=winetricks --text="$(echo "$@" | sed 's,\\\\,\\\\\\\\,g')";;
kdialog) ${WINETRICKS_GUI} --title winetricks --error "$@";;
none) ;;
esac
fi
}
# Display warning message to stderr (since it is called inside redirected code)
......@@ -245,16 +254,21 @@ w_warn()
printf '%s\nwarning: %b\n%s\n' "${W_TEXT_LINE}" "${*}" "${W_TEXT_LINE}"
fi
# kdialog doesn't allow a timeout unless you use --passivepopup
if test "${W_OPT_UNATTENDED}"; then
_W_timeout="--timeout 5"
case ${WINETRICKS_GUI} in
zenity) ${WINETRICKS_GUI} --timeout 5 --error --width=400 --title=winetricks --text="$(echo "$@" | sed 's,\\\\,\\\\\\\\,g')";;
kdialog) ${WINETRICKS_GUI} --passivepopup "$@" 5 --title winetricks;;
none) ;;
esac
else
case ${WINETRICKS_GUI} in
zenity) ${WINETRICKS_GUI} --error --width=400 --title=winetricks --text="$(echo "$@" | sed 's,\\\\,\\\\\\\\,g')";;
kdialog) ${WINETRICKS_GUI} --title winetricks --error "$@";;
none) ;;
esac
fi
case ${WINETRICKS_GUI} in
zenity) ${WINETRICKS_GUI} "${_W_timeout}" --error --width=400 --title=winetricks --text="$(echo "$@" | sed 's,\\\\,\\\\\\\\,g')";;
kdialog) ${WINETRICKS_GUI} --title winetricks --error "$@" ;;
none) ;;
esac
unset _W_timeout
}
......@@ -266,12 +280,13 @@ w_warn_cancel()
printf '%s\n%b\n%s\n' "${W_TEXT_LINE}" "${@}" "${W_TEXT_LINE}" >&2
if test "${W_OPT_UNATTENDED}"; then
_W_timeout="--timeout 5"
_W_timeout="--timeout"
_W_timeout_length="5"
fi
# Zenity has no cancel button, but will set status to 1 if you click the go-away X
case ${WINETRICKS_GUI} in
zenity) ${WINETRICKS_GUI} "${_W_timeout}" --error --title=winetricks --text="$(echo "$@" | sed 's,\\\\,\\\\\\\\,g')";;
zenity) ${WINETRICKS_GUI} "${_W_timeout}" "${_W_timeout_length}" --error --title=winetricks --text="$(echo "$@" | sed 's,\\\\,\\\\\\\\,g')";;
kdialog) ${WINETRICKS_GUI} --title winetricks --warningcontinuecancel "$@" ;;
none) ;;
esac
......@@ -2318,9 +2333,7 @@ Usage: 'w_override_app_dlls app mode dll ...'." ;;
echo "Using ${_W_mode} override for following DLLs when running ${_W_app}: $*"
(
echo REGEDIT4
echo ""
echo "[HKEY_CURRENT_USER\\Software\\Wine\\AppDefaults\\${_W_app}\\DllOverrides]"
printf 'REGEDIT4\n\n[HKEY_CURRENT_USER\\Software\\Wine\\AppDefaults\\%s\\DllOverrides]\n' "${_W_app}"
) > "${W_TMP}"/override-dll.reg
while test "$1" != ""; do
......@@ -2379,7 +2392,7 @@ w_restore_winver()
w_set_winver "${_W_user_winver}"
unset ${_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
......@@ -2897,7 +2910,7 @@ winetricks_download_setup()
# torify needs --async-dns=false, see https://github.com/tatsuhiro-t/aria2/issues/613
aria2c_torify_opts="--async-dns=false"
if [ ! -x "$(command -v torify 2>/dev/null)" ]; then
w_die "--torify was used, but torify is not installed, please install it." ; exit 1
w_die "--torify was used, but torify is not installed, please install it."
fi ;;
*) torify=
aria2c_torify_opts="" ;;
......@@ -3317,6 +3330,7 @@ winetricks_prefixmenu()
_W_msg_help="View help"
;;
esac
case "${W_OPT_UNATTENDED}" in
1) _W_cmd_unattended=attended; _W_msg_unattended="${_W_msg_unattended0}" ;;
*) _W_cmd_unattended=unattended; _W_msg_unattended="${_W_msg_unattended1}" ;;
......@@ -3632,7 +3646,7 @@ winetricks_mainmenu()
shell "${_W_msg_shell}" off \
folder "${_W_msg_folder}" off \
annihilate "${_W_msg_annihilate}" off \
${_W_cmd_unattended} "${_W_msg_unattended}" off \
"${_W_cmd_unattended}" "${_W_msg_unattended}" off \
;;
esac
......@@ -4033,6 +4047,11 @@ winetricks_showmenu()
installed=TRUE
echo "${code}" >> "${WINETRICKS_WORKDIR}"/installed.txt
fi
if [ "${#title}" -gt 100 ]; then
# Small hysteresis of a few characters to not shorten descriptions that are close to the limit
title=$(printf "%s" "${title}" | head -c 95)
title="${title} ..."
fi
printf %s " ${installed} \
${code} \
\"${title}\" \
......@@ -4444,18 +4463,18 @@ winetricks_cache_iso()
winetricks_detect_optical_drive
# Horrible hack for Gentoo - make sure we can read from the drive
if ! test -r ${WINETRICKS_DEV}; then
if ! test -r "${WINETRICKS_DEV}"; then
case "${WINETRICKS_SUDO}" in
gksu*|kdesudo) ${WINETRICKS_SUDO} "chmod 666 ${WINETRICKS_DEV}" ;;
gksu*|kdesudo) ${WINETRICKS_SUDO} chmod 666 "${WINETRICKS_DEV}" ;;
kdesu) ${WINETRICKS_SUDO} -c "chmod 666 ${WINETRICKS_DEV}" ;;
*) ${WINETRICKS_SUDO} chmod 666 ${WINETRICKS_DEV} ;;
*) ${WINETRICKS_SUDO} chmod 666 "${WINETRICKS_DEV}" ;;
esac
fi
while true; do
# Wait for user to insert disc.
# Sleep long to make it less likely to close the drive during insertion.
while ! dd if=${WINETRICKS_DEV} of=/dev/null count=1; do
while ! dd if="${WINETRICKS_DEV}" of=/dev/null count=1; do
sleep 5
done
......@@ -4464,7 +4483,7 @@ winetricks_cache_iso()
break
fi
# Otherwise try and read it straight from unmounted volume
_W_volname=$(winetricks_volname ${WINETRICKS_DEV})
_W_volname="$(winetricks_volname "${WINETRICKS_DEV}")"
if test "${_W_expected_volname}" != "${_W_volname}"; then
case ${LANG} in
da*) w_warn "Forkert disk [${_W_volname}] indsat. Indsæt venligst disken [${_W_expected_volname}]" ;;
......@@ -4486,9 +4505,9 @@ winetricks_cache_iso()
# Copy disc to .iso file, display progress every 5 seconds
# Use conv=noerror,sync to replace unreadable blocks with zeroes
case ${WINETRICKS_OPT_DD} in
case "${WINETRICKS_OPT_DD}" in
dd)
${WINETRICKS_OPT_DD} if=${WINETRICKS_DEV} of="${W_CACHE}"/temp.iso bs=2048 conv=noerror,sync &
"${WINETRICKS_OPT_DD}" if="${WINETRICKS_DEV}" of="${W_CACHE}"/temp.iso bs=2048 conv=noerror,sync &
WINETRICKS_DD_PID=$!
;;
ddrescue)
......@@ -4496,7 +4515,7 @@ winetricks_cache_iso()
w_die "Please install ddrescue first."
fi
${WINETRICKS_OPT_DD} -v -b 2048 ${WINETRICKS_DEV} "${W_CACHE}"/temp.iso &
"${WINETRICKS_OPT_DD}" -v -b 2048 "${WINETRICKS_DEV}" "${W_CACHE}"/temp.iso &
WINETRICKS_DD_PID=$!
;;
esac
......@@ -4523,7 +4542,7 @@ winetricks_cache_iso()
mv "${W_CACHE}"/temp.iso "${WINETRICKS_IMG}"
eject ${WINETRICKS_DEV} || true # punt if eject not found (as on cygwin)
eject "${WINETRICKS_DEV}" || true # punt if eject not found (as on cygwin)
}
winetricks_load_vcdmount()
......@@ -4656,16 +4675,16 @@ _EOF_
# WINETRICKS_IMG may contain spaces and needs to be quoted
case "${WINETRICKS_SUDO}" in
gksu*|kdesudo)
w_try ${WINETRICKS_SUDO} "mkdir -p ${W_ISO_MOUNT_ROOT}"
w_try ${WINETRICKS_SUDO} "mount -o ro,loop,uid=${_W_USERID},unhide '${WINETRICKS_IMG}' ${W_ISO_MOUNT_ROOT}"
w_try "${WINETRICKS_SUDO}" "mkdir -p ${W_ISO_MOUNT_ROOT}"
w_try "${WINETRICKS_SUDO}" "mount -o ro,loop,uid=${_W_USERID},unhide '${WINETRICKS_IMG}' ${W_ISO_MOUNT_ROOT}"
;;
kdesu)
w_try ${WINETRICKS_SUDO} -c "mkdir -p ${W_ISO_MOUNT_ROOT}"
w_try ${WINETRICKS_SUDO} -c "mount -o ro,loop,uid=${_W_USERID},unhide '${WINETRICKS_IMG}' ${W_ISO_MOUNT_ROOT}"
w_try "${WINETRICKS_SUDO}" -c "mkdir -p ${W_ISO_MOUNT_ROOT}"
w_try "${WINETRICKS_SUDO}" -c "mount -o ro,loop,uid=${_W_USERID},unhide '${WINETRICKS_IMG}' ${W_ISO_MOUNT_ROOT}"
;;
*)
w_try ${WINETRICKS_SUDO} mkdir -p "${W_ISO_MOUNT_ROOT}"
w_try ${WINETRICKS_SUDO} mount -o ro,loop,uid="${_W_USERID}",unhide "${WINETRICKS_IMG}" "${W_ISO_MOUNT_ROOT}"
w_try "${WINETRICKS_SUDO}" mkdir -p "${W_ISO_MOUNT_ROOT}"
w_try "${WINETRICKS_SUDO}" mount -o ro,loop,uid="${_W_USERID}",unhide "${WINETRICKS_IMG}" "${W_ISO_MOUNT_ROOT}"
;;
esac
......@@ -4988,7 +5007,7 @@ winetricks_set_wineprefix()
W_APPDATA_UNIX="$(w_pathconv -u "${W_APPDATA_WIN}")"
case "${W_APPDATA_WIN}" in
"") w_info "$(winetricks_print_wineprefix_info)" ; w_die "${WINE} cmd.exe /c echo '%AppData%' returned empty string, error message \"$(cat ${W_TMP_EARLY}/early_wine.err.txt)\" ";;
"") w_info "$(winetricks_print_wineprefix_info)" ; w_die "${WINE} cmd.exe /c echo '%AppData%' returned empty string, error message \"$(cat "${W_TMP_EARLY}"/early_wine.err.txt)\" ";;
%*) w_info "$(winetricks_print_wineprefix_info)" ; w_die "${WINE} cmd.exe /c echo '%AppData%' returned unexpanded string '${W_PROGRAMS_WIN}' ... this can be caused by a corrupt wineprefix (\`wineboot -u\` may help), by an old wine, or by not owning ${WINEPREFIX}" ;;
esac
......@@ -5823,13 +5842,13 @@ w_metadata cnc_ddraw dlls \
publisher="CnCNet" \
year="2021" \
media="download" \
file1="cnc-ddraw.zip" \
file1="cnc-ddraw-v5.0.0.0.zip" \
installed_file1="${W_SYSTEM32_DLLS_WIN}/Shaders/readme.txt"
load_cnc_ddraw()
{
# Note: only works if ddraw.ini contains settings for the executable
w_download https://github.com/CnCNet/cnc-ddraw/releases/download/v4.6.0.0/cnc-ddraw.zip 1633d30bc80ecae60db97e881a4c804911e300dcb280d58ea8b8ddda2e1dd1ac
w_download https://github.com/CnCNet/cnc-ddraw/releases/download/v5.0.0.0/cnc-ddraw.zip 9f37010bf87aafbe3d97a95f4253460a8f0869fb52bb45bcffbb73182b4b00fe cnc-ddraw-v5.0.0.0.zip
w_try_unzip "${W_SYSTEM32_DLLS}" "${W_CACHE}/${W_PACKAGE}/${file1}"
w_override_dlls native,builtin ddraw
......@@ -15882,7 +15901,7 @@ load_office2007pro()
<PIDKEY Value="${W_KEY}" />
</Configuration>
__EOF__
"${WINE}" ${W_ISO_MOUNT_LETTER}:setup.exe /config "${W_TMP_WIN}"\\config.xml
"${WINE}" "${W_ISO_MOUNT_LETTER}":setup.exe /config "${W_TMP_WIN}"\\config.xml
status=$?
case ${status} in
......@@ -15898,7 +15917,7 @@ __EOF__
esac
else
w_try "${WINE}" ${W_ISO_MOUNT_LETTER}:setup.exe
w_try "${WINE}" "${W_ISO_MOUNT_LETTER}":setup.exe
fi
}
......@@ -16621,7 +16640,7 @@ load_vc2005expresssp1()
w_download https://web.archive.org/web/20110624054336/https://download.microsoft.com/download/7/7/3/7737290f-98e8-45bf-9075-85cc6ae34bf1/VS80sp1-KB926748-X86-INTL.exe a959d1ea52674b5338473be32a1370f9ec80df84629a2ed3471aa911b42d9e50
w_try ${WINE} "${W_CACHE}"/vc2005expresssp1/VS80sp1-KB926748-X86-INTL.exe ${W_OPT_UNATTENDED:+/q}
w_try "${WINE}" "${W_CACHE}"/vc2005expresssp1/VS80sp1-KB926748-X86-INTL.exe ${W_OPT_UNATTENDED:+/q}
}
#----------------------------------------------------------------
......@@ -16747,7 +16766,7 @@ load_vc2010express()
w_try_7z "${W_TMP}" "${W_CACHE}"/vc2010express/VS2010Express1.iso
w_try_cd "${W_TMP}"/VCExpress
w_try ${WINE} setup.exe ${W_OPT_UNATTENDED:+/q}
w_try "${WINE}" setup.exe ${W_OPT_UNATTENDED:+/q}
}
#----------------------------------------------------------------
......@@ -18195,7 +18214,7 @@ load_cod1()
WinWait, Insert CD, Please insert the Call of Duty cd 2
"
"${WINE}" eject ${W_ISO_MOUNT_LETTER}:
"${WINE}" eject "${W_ISO_MOUNT_LETTER}":
w_mount CoD2
w_ahk_do "
......@@ -18206,7 +18225,7 @@ load_cod1()
WinWait, Insert CD, Please insert the Call of Duty cd 1
"
"${WINE}" eject ${W_ISO_MOUNT_LETTER}:
"${WINE}" eject "${W_ISO_MOUNT_LETTER}":
w_mount CoD1
w_ahk_do "
......@@ -18228,7 +18247,7 @@ load_cod1()
}
WinWaitClose
"
"${WINE}" eject ${W_ISO_MOUNT_LETTER}:
"${WINE}" eject "${W_ISO_MOUNT_LETTER}":
if w_workaround_wine_bug 21558; then
# Work around a buffer overflow - not really Wine's fault
......@@ -21229,7 +21248,7 @@ load_trainztcc_2004()
w_read_key
# yup, they got the volume name wrong
w_mount TRS2006DVD
w_try_cd ${W_ISO_MOUNT_ROOT}/TRS2004_SP4_DVD_Installer_BUILD_2370/Installer/Disk1
w_try_cd "${W_ISO_MOUNT_ROOT}/TRS2004_SP4_DVD_Installer_BUILD_2370/Installer/Disk1"
w_ahk_do "
SetTitleMatchMode, 2
SetWinDelay 500
......@@ -21260,7 +21279,7 @@ load_trainztcc_2004()
"
# And, while we're at it, also install the accompanying paint shed app
w_try_cd ${W_ISO_MOUNT_ROOT}/TRAINZ_PAINTSHED
w_try_cd "${W_ISO_MOUNT_ROOT}/TRAINZ_PAINTSHED"
w_ahk_do "
SetTitleMatchMode, 2
SetWinDelay 500
......@@ -23353,7 +23372,7 @@ if ! test "${WINETRICKS_LIB}"; then
# GUI case
# No non-option arguments given, so read them from GUI, and loop until user quits
if [ ${WINETRICKS_GUI} = "none" ]; then
if [ "${WINETRICKS_GUI}" = "none" ]; then
winetricks_detect_gui --gui
fi
winetricks_detect_sudo
......
.\" -*- nroff -*-
.TH WINETRICKS 1 "April 2022" "Winetricks 20220411" "Wine Package Manager"
.TH WINETRICKS 1 "February 2023" "Winetricks 20230212" "Wine Package Manager"
.SH NAME
winetricks \- manage virtual Windows environments using Wine
.SH SYNOPSIS
......
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