From 37631715672670f6c6ac1afc9f5c07f0de70e2f67ecb36fcd06582d7cb573ae5 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 11 Sep 2012 14:26:48 +0000 Subject: [PATCH] exclusivearch intel and ppc32 openssl-devel and pkgconfig buildrequires 1.5.12 update winetricks update OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=159 --- wine-1.5.12.tar.bz2 | 3 + wine-1.5.6.tar.bz2 | 3 - wine.changes | 74 ++++++ wine.spec | 9 +- winetricks | 622 +++++++++++++++++++++++++++----------------- 5 files changed, 465 insertions(+), 246 deletions(-) create mode 100644 wine-1.5.12.tar.bz2 delete mode 100644 wine-1.5.6.tar.bz2 diff --git a/wine-1.5.12.tar.bz2 b/wine-1.5.12.tar.bz2 new file mode 100644 index 0000000..ee30068 --- /dev/null +++ b/wine-1.5.12.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5af1499f1628ff89842f3961958323bdd2bd9c78055313d1b7eae4f36c8587a8 +size 20652499 diff --git a/wine-1.5.6.tar.bz2 b/wine-1.5.6.tar.bz2 deleted file mode 100644 index 00e4179..0000000 --- a/wine-1.5.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b178bc34a69341a8f0a7ff73f7dadf2562ed2e5eb03dc0522b7c4d6002e53994 -size 20380981 diff --git a/wine.changes b/wine.changes index 2c9a001..f601cdd 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Aug 31 18:59:58 UTC 2012 - meissner@suse.com + +- Updated to 1.5.12 development snapshot + - Support for disabling individual joysticks. + - Better support for D3DX9 constant tables. + - Some XRandR improvements. + - Various bug fixes. + +------------------------------------------------------------------- +Tue Aug 21 11:02:45 UTC 2012 - meissner@suse.com + +- updated winetricks + ------------------------------------------------------------------- Mon Aug 20 11:27:40 UTC 2012 - dmueller@suse.com @@ -5,6 +19,66 @@ Mon Aug 20 11:27:40 UTC 2012 - dmueller@suse.com - prelink is only needed for %ix86 and x86_64 (win32 and win64) (not yet for ARM) +------------------------------------------------------------------- +Fri Aug 17 19:33:11 UTC 2012 - meissner@suse.com + +- Updated to 1.5.11 development snapshot + - Multi-channel support in the ALSA driver. + - Removal of the big X11 lock. + - Support for pair positioning adjustments in Uniscribe. + - More I/O stream implementations in the C++ runtime. + - Various bug fixes. + +------------------------------------------------------------------- +Tue Jul 31 20:08:50 UTC 2012 - meissner@suse.com + +- Updated to 1.5.10 development snapshot + - New version of the Gecko engine based on Firefox 14. + - Support for OpenGL in the DIB engine using libOSMesa. + - Off-screen rendering is now the default in Direct3D. + - Some more WMI infrastructure. + - Various bug fixes. + +------------------------------------------------------------------- +Wed Jul 18 09:07:07 UTC 2012 - meissner@suse.com + +- Updated to 1.5.9 development snapshot + - Support for GPOS font tables in Uniscribe. + - Support for XRandr 1.2 and 1.3. + - Parser improvements for the HLSL compiler. + - More key exchange algorithms supported on Mac OS. + - Relay tracing on ARM. + - Various bug fixes. + +------------------------------------------------------------------- +Tue Jul 3 19:28:03 UTC 2012 - meissner@suse.com + +- Updated to 1.5.8 development snapshot + - More stream functionality in the C++ runtime. + - A number of Windows Codecs improvements. + - More WBEM classes and properties. + - Some HTML Help fixes. + - Support for printing fake italic fonts. + - Various bug fixes. + +------------------------------------------------------------------- +Tue Jul 3 15:51:50 UTC 2012 - meissner@suse.com + +- updated winetricks to current version + +------------------------------------------------------------------- +Sun Jun 24 20:16:19 UTC 2012 - meissner@suse.com + +- Updated to 1.5.7 development snapshot + - New version of the Gecko engine based on Firefox 13. + - Dynamic device support with UDisks2. + - More stream classes implemented in the C++ runtime. + - Support for metadata in TIFF files. + - Fleshed out WBEM implementation. + - Improved support for printer paper sizes. + - Various bug fixes. +- wine gecko 1.6 now required (see above) + ------------------------------------------------------------------- Mon Jun 11 20:30:12 UTC 2012 - meissner@suse.com diff --git a/wine.spec b/wine.spec index c177988..436493c 100644 --- a/wine.spec +++ b/wine.spec @@ -45,6 +45,8 @@ BuildRequires: libxslt-devel BuildRequires: ncurses-devel BuildRequires: openal-soft-devel BuildRequires: openldap2-devel +BuildRequires: openssl-devel +BuildRequires: pkgconfig %ifarch %{ix86} x86_64 # only used on win32 and win64 today BuildRequires: prelink @@ -53,7 +55,7 @@ BuildRequires: sane-backends-devel BuildRequires: update-desktop-files BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel -Version: 1.5.6 +Version: 1.5.12 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ @@ -69,13 +71,12 @@ Source7: baselibs.conf # SUSE specific patches # - currently none, but add them here #Patch0: susepatches.patch -Recommends: wine-gecko >= 1.5 +Recommends: wine-gecko >= 1.7 Recommends: wine-mp3 # not packaged in distro... Recommends: wine-mono Recommends: dosbox Conflicts: wine-gecko < 1.3 - %ifarch x86_64 Requires: %{name}-32bit = %{version} %endif @@ -83,6 +84,8 @@ Requires: %{name}-32bit = %{version} Requires: cabextract Requires: unzip BuildRoot: %{_tmppath}/%{name}-%{version}-build +# Perhaps arm later... +ExclusiveArch: %{ix86} x86_64 ppc %description An MS Windows emulator, consisting of both runtime and source diff --git a/winetricks b/winetricks index 34da8ff..381d8c3 100644 --- a/winetricks +++ b/winetricks @@ -137,6 +137,9 @@ WINETRICKS_VERSION=20120308 # FIXME: maybe obey XDG_DATA_HOME W_PREFIXES_ROOT="${WINE_PREFIXES:-$HOME/.local/share/wineprefixes}" +# ftp.microsoft.com resolves to two different IP addresses, one of which is broken +ftp_microsoft_com=64.4.17.176 + #---- Public Functions ---- # Ask permission to continue @@ -3445,13 +3448,15 @@ winetricks_init() WINE="${WINE:-wine}" # Find wineserver. Some distros (Debian) don't have it on the path, # on the mistaken understanding that user scripts never need it :-( + # FIXME: get packagers to put wineserver on the path. for x in \ "$WINESERVER" \ "${WINE}server" \ - "`which wineserver`" \ - /usr/lib32/wine-unstable/wineserver \ - /usr/lib/wine-unstable/wineserver \ - /usr/lib/wine/wineserver \ + "`which wineserver 2> /dev/null`" \ + /usr/lib*/wine-unstable/wineserver \ + /usr/lib*/wine/wineserver \ + /usr/lib/*/wine-unstable/wineserver \ + /usr/lib/*/wine/wineserver \ "`dirname $WINE`/server/wineserver" \ file-not-found do @@ -3577,6 +3582,7 @@ Options: Commands: list list categories +list-all list all categories and their verbs apps list list verbs in category 'applications' benchmarks list list verbs in category 'benchmarks' dlls list list verbs in category 'dlls' @@ -3693,6 +3699,15 @@ helper_d3dx9_xx() w_override_dlls native $dllname } +helper_xpsp2() +{ + filename=$1 + + w_download_to xpsp2 http://download.microsoft.com/download/1/6/5/165b076b-aaa9-443d-84f0-73cf11fdcdf8/WindowsXP-KB835935-SP2-ENU.exe 33a8fef60d48ae1f2c4feea27111af5ceca3c4f6 + + w_try_cabextract -d "$W_TMP" -L -F $filename "$W_CACHE"/xpsp2/WindowsXP-KB835935-SP2-ENU.exe +} + #---------------------------------------------------------------- w_metadata adobeair dlls \ @@ -3780,21 +3795,38 @@ load_atmlib() #---------------------------------------------------------------- +w_metadata cabinet dlls \ + title="Microsoft cabinet.dll" \ + publisher="Microsoft" \ + year="2002" \ + media="manual_download" \ + file1="mdac_typ.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/cabinet.dll" + +load_cabinet() +{ + # http://www.microsoft.com/downloads/en/details.aspx?FamilyId=9AD000F2-CAE7-493D-B0F3-AE36C570ADE8&displaylang=en + w_download_manual http://download.cnet.com/Microsoft-Data-Access-Components-MDAC-2-7-Service-Pack-1-Refresh/3000-10250_4-10729498.html mdac_typ.exe f68594d1f578c3b47bf0639c46c11c5da161feee + w_try_cabextract --directory="$W_TMP" "$W_CACHE"/cabinet/$file1 + w_try cp "$W_TMP"/cabinet.dll "$W_SYSTEM32_DLLS"/cabinet.dll + + w_override_dlls native,builtin cabinet +} + +#---------------------------------------------------------------- + w_metadata cmd dlls \ title="MS cmd.exe" \ publisher="Microsoft" \ - year="2000" \ + year="2004" \ media="download" \ - file1="Q259622_W2K_SP1_x86_en.EXE" \ + file1="Q811493_W2K_SP4_X86_EN.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/cmd.exe" load_cmd() { - # http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=7541 - w_download http://download.microsoft.com/download/win2000platform/Patch/Q259622/NT5/EN-US/Q259622_W2K_SP1_x86_en.EXE ab545df50287c26aea7705039cf00471bfeb043c - - w_try_cabextract --directory="$W_TMP" "$W_CACHE"/cmd/$file1 - w_try cp "$W_TMP"/cmd.exe "$W_SYSTEM32_DLLS"/cmd.exe + w_download http://download.microsoft.com/download/8/d/c/8dc79965-dfbc-4b25-9546-e23bc4b791c6/Q811493_W2K_SP4_X86_EN.exe ac6e28cfd12942e74aa08bddf7715705edb85b6b + w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_CACHE"/cmd/Q811493_W2K_SP4_X86_EN.exe -F cmd.exe w_override_dlls native,builtin cmd.exe } @@ -3812,7 +3844,8 @@ w_metadata comctl32 dlls \ load_comctl32() { # http://www.microsoft.com/downloads/details.aspx?familyid=6f94d31a-d1e0-4658-a566-93af0d8d4a1e - w_download http://download.microsoft.com/download/platformsdk/redist/5.80.2614.3600/w9xnt4/en-us/cc32inst.exe 94c3c494258cc54bd65d2f0153815737644bffde + #w_download http://download.microsoft.com/download/platformsdk/redist/5.80.2614.3600/w9xnt4/en-us/cc32inst.exe 94c3c494258cc54bd65d2f0153815737644bffde + w_download $WINETRICKS_SOURCEFORGE/pocmin/Win%2095_98%20Controls/Win%2095_98%20Controls/CC32inst.exe 94c3c494258cc54bd65d2f0153815737644bffde cc32inst.exe w_try $WINE "$W_CACHE"/comctl32/cc32inst.exe "/T:$W_TMP_WIN" /c $W_UNATTENDED_SLASH_Q w_try_unzip -d "$W_TMP" "$W_TMP"/comctl32.exe @@ -4352,6 +4385,71 @@ load_directx9() #---------------------------------------------------------------- +w_metadata dx8sdk dlls \ + title="MS DirectX 8 SDK (developers only)" \ + publisher="Microsoft" \ + year="2001" \ + media="download" \ + file1="dx81sdk_full.exe" \ + installed_file1="c:/DXSDK/include/d3dx8math.h" + +load_dx8sdk() +{ + # http://download.microsoft.com/download/whistler/dx/8.1/w982kmexp/en-us/DX81SDK_FULL.exe + w_download http://www.darwinbots.com/numsgil/dx81sdk_full.exe 61b5733209205e942f37431ee40da712e1f50e6a + + cd "$W_TMP" + w_try_unzip "$W_CACHE"/dx8sdk/dx81sdk_full.exe + cd DXF + w_try $WINE setup.exe # /S/v/qn for silent mode, but it's broken? +} + +#---------------------------------------------------------------- + +w_metadata dxsdk_nov2006 dlls \ + title="MS DirectX SDK, November 2006 (developers only)" \ + publisher="Microsoft" \ + year="2006" \ + media="download" \ + file1="dxsdk_aug2006.exe" \ + installed_file1="$W_PROGRAMS_X86_WIN/Microsoft DirectX SDK (August 2006)/Lib/x86/d3d10.lib" + +load_dxsdk_nov2006() +{ + w_download http://download.microsoft.com/download/9/e/5/9e5bfc66-a621-4e0d-8bfe-6688058c3f00/dxsdk_aug2006.exe 1e9cdbef391ebfbf781e6c87a375138d8c195c57 + + # dxview.dll uses mfc42u while registering + w_call mfc42 + + cd "$W_TMP" + w_try_cabextract "$W_CACHE"/dxsdk_nov2006/dxsdk_aug2006.exe + w_try_unzip dxsdk.exe + w_try $WINE msiexec /i Microsoft_DirectX_SDK.msi $W_UNATTENDED_SLASH_Q +} + +#---------------------------------------------------------------- + +w_metadata dxsdk_jun2010 dlls \ + title="MS DirectX SDK, June 2010 (developers only)" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="DXSDK_Jun10.exe" \ + installed_file1="$W_PROGRAMS_X86_WIN/Microsoft DirectX SDK (June 2010)/Lib/x86/d3d11.lib" + +load_dxsdk_jun2010() +{ + w_download http://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe 8fe98c00fde0f524760bb9021f438bd7d9304a69 + + # Without dotnet20, install aborts halfway through + w_call dotnet20 + + cd "$W_TMP" + w_try $WINE "$W_CACHE"/dxsdk_jun2010/DXSDK_Jun10.exe ${W_OPT_UNATTENDED:+/U} +} + +#---------------------------------------------------------------- + w_metadata dmsynth dlls \ title="MS midi synthesizer from DirectX user redistributable" \ publisher="Microsoft" \ @@ -4419,7 +4517,7 @@ w_metadata dotnet11sp1 dlls \ year="2004" \ media="download" \ file1="NDP1.1sp1-KB867460-X86.exe" \ - installed_file1="c:/windows/Microsoft.NET/Framework/v1.1.4322/CONFIG/security.config" + installed_file1="c:/windows/Microsoft.NET/Framework/v1.1.4322/CONFIG/web_hightrust.config.default" # fixme: sometimes security.config is missing after install, see # http://blogs.msdn.com/b/shawnfa/archive/2006/02/09/527688.aspx @@ -4431,10 +4529,37 @@ load_dotnet11sp1() if test $W_OPT_UNATTENDED then - WINEDLLOVERRIDES="regsvcs.exe=b" w_try $WINE "$W_CACHE"/dotnet11sp1/NDP1.1sp1-KB867460-X86.exe /q /C:"install /q" + WINEDLLOVERRIDES="regsvcs.exe=b" $WINE "$W_CACHE"/dotnet11sp1/NDP1.1sp1-KB867460-X86.exe /q /C:"install /q" else - WINEDLLOVERRIDES="regsvcs.exe=b" w_try $WINE "$W_CACHE"/dotnet11sp1/NDP1.1sp1-KB867460-X86.exe + WINEDLLOVERRIDES="regsvcs.exe=b" $WINE "$W_CACHE"/dotnet11sp1/NDP1.1sp1-KB867460-X86.exe fi + status=$? + + case $status in + 0) ;; + 105|194) echo "exit status $status - normal, system needs simulated reboot" ;; + *) w_die "exit status $status - $W_PACKAGE installation failed" ;; + esac +} + +#---------------------------------------------------------------- + +w_metadata dotnet_verifier dlls \ + title="MS .NET Verifier" \ + publisher="Microsoft" \ + year="2012" \ + media="download" \ + file1="netfx_5F00_setupverifier_5F00_new.zip" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/netfx_setupverifier.exe" + +load_dotnet_verifier() +{ + # http://blogs.msdn.com/b/astebner/archive/2008/10/13/8999004.aspx + w_download http://blogs.msdn.com/cfs-file.ashx/__key/CommunityServer-Components-PostAttachments/00-08-99-90-04/netfx_5F00_setupverifier_5F00_new.zip c41b866bb760ec0530a29a16ed89444f413a0b6c + + cd "$W_CACHE"/dotnet_verifier + + w_try_unzip -d "$W_SYSTEM32_DLLS" netfx_5F00_setupverifier_5F00_new.zip netfx_setupverifier.exe } #---------------------------------------------------------------- @@ -4449,14 +4574,16 @@ w_metadata dotnet20 dlls \ load_dotnet20() { + w_call remove_mono w_call fontfix # Recipe from http://bugs.winehq.org/show_bug.cgi?id=10467#c57 + # and http://bugs.winehq.org/show_bug.cgi?id=30845#c10 w_set_winver win2k cd "$W_CACHE"/dotnet20 - if test ! -f l_intl.nls + if test ! -f l_intl.nls && w_workaround_wine_bug 10467 "Install l_intl.nls" 1.1.44, then # See http://kegel.com/wine/l_intl-sh.txt for how l_intl.nls was generated # Use zip rather than naked file to get past strange web proxies @@ -4468,15 +4595,27 @@ load_dotnet20() fi # Hans' workaround to avoid winehq nonbug 26464, crash in servicemodelreg.exe - rm -rf "$W_WINDIR_UNIX"/Microsoft.NET/Framework/v2.0.50727 - - # Delete registry keys used to indicate .net 2.x's presence - # Breaks .net 3.5 install, leave it out until we figure that out - #$WINE reg delete "HKLM\\Software\Microsoft\NET Framework Setup\NDP\v2.0.50727" + if test -d "$W_WINDIR_UNIX"/Microsoft.NET/Framework/v2.0.50727 + then + rm -rf "$W_WINDIR_UNIX"/Microsoft.NET/Framework/v2.0.50727 + fi # http://www.microsoft.com/downloads/details.aspx?FamilyID=0856eacb-4362-4b0d-8edd-aab15c5e04f5 w_download http://download.microsoft.com/download/5/6/7/567758a3-759e-473e-bf8f-52154438565a/dotnetfx.exe a3625c59d7a2995fb60877b5f5324892a1693b2a - w_try $WINE dotnetfx.exe ${W_OPT_UNATTENDED:+/q /c:"install.exe /q"} + + # A bug that popped up in 1.5.3 was fixed in 1.5.7; until then a + # crappy workaround helps + if w_workaround_wine_bug 30845 "Adding .NETFramework registry key. Ignore fatal error dialog if it pops up." ,1.5.3 1.5.7, + then + $WINE reg add 'HKLM\Software\Microsoft\.NETFramework' /v InstallRoot /d 'C:\Windows\Microsoft.NET\Framework\' /f + fi + + if w_workaround_wine_bug 30845 "Using native fusion while installing..." ,1.5.6 + then + w_try env WINEDLLOVERRIDES=mscoree,fusion=n $WINE dotnetfx.exe ${W_OPT_UNATTENDED:+/q /c:"install.exe /q"} + else + w_try $WINE dotnetfx.exe ${W_OPT_UNATTENDED:+/q /c:"install.exe /q"} + fi w_unset_winver # We can't stop installing dotnet20 in win2K mode until wine supports @@ -4608,6 +4747,14 @@ w_metadata dotnet30 dlls \ load_dotnet30() { + if test -f /proc/sys/kernel/yama/ptrace_scope + then + case `cat /proc/sys/kernel/yama/ptrace_scope` in + 0) ;; + *) echo "=== Warning: /proc/sys/kernel/yama/ptrace_scope is not 0. If install fails, see http://bugs.winehq.org/show_bug.cgi?id=30410 ===" ;; + esac + fi + case "$OS" in "Windows_NT") osver=`cmd /c ver` @@ -4617,6 +4764,8 @@ load_dotnet30() ;; esac + # dotnet20 does this: + # w_call remove_mono w_call dotnet20 # Delete files and registry keys related to .net 3.x @@ -4663,6 +4812,8 @@ load_dotnet30sp1() *) w_warn "dotnet30sp1 does not yet fully work or install on wine. Caveat emptor." ;; esac + # dotnet20 does this, which is called by dotnet30: + # w_call remove_mono w_call dotnet30 w_download http://download.microsoft.com/download/8/F/E/8FEEE89D-9E4F-4BA3-993E-0FFEA8E21E1B/NetFx30SP1_x86.exe 8d779e337920b097aa0c01859912950606e9fc12 @@ -4740,6 +4891,10 @@ load_dotnet35sp1() # http://www.microsoft.com/download/en/details.aspx?id=25150 w_download http://download.microsoft.com/download/2/0/e/20e90413-712f-438c-988e-fdaa79a8ac3d/dotnetfx35.exe 3dce66bae0dd71284ac7a971baed07030a186918 + # Work around hang in http://bugs.winehq.org/show_bug.cgi?id=25060#c19 + WINEDLLOVERRIDES=ngen.exe,mscorsvw.exe=b + export WINEDLLOVERRIDES + cd "$W_CACHE"/dotnet35sp1 $WINE dotnetfx35.exe /lang:ENU $W_UNATTENDED_SLASH_Q } @@ -4769,22 +4924,16 @@ load_dotnet40() w_download_manual http://www.mediafire.com/?v8rw5h1ra7maod4 gacutil-net40.tar.bz2 d40cc1249ea051338c064aff5ba0f1a5f24b59a5 fi - # Remove wine-mono if present - $WINE uninstaller --remove '{E45D8920-A758-4088-B6C6-31DBB276992E}' || true + w_call remove_mono # Remove Mono registry entry: $WINE reg delete "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4" /f - case "$OS" in - "Windows_NT") ;; - *) w_warn "The installer will fail after the first try, don't freak out." ;; - esac - - w_try rm "$W_WINDIR_UNIX/system32/mscoree.dll" + w_try rm -f "$W_WINDIR_UNIX/system32/mscoree.dll" cd "$W_CACHE/$W_PACKAGE" - $WINE dotNetFx40_Full_x86_x64.exe ${W_OPT_UNATTENDED:+/q /c:"install.exe /q"} || true + WINEDLLOVERRIDES=fusion=b $WINE dotNetFx40_Full_x86_x64.exe ${W_OPT_UNATTENDED:+/q /c:"install.exe /q"} || true w_override_dlls native mscoree @@ -4806,11 +4955,10 @@ load_dotnet40() # Some of the dlls aren't assemblies. FIXME: Should filter them based on that.. $WINE "$W_TMP/gacutil.exe" /i "$(w_pathconv -w $assembly)" /f || true done + + mkdir -p "$W_WINDIR_UNIX/Microsoft.NET/assembly/GAC_32/System.EnterpriseServices/v4.0_4.0.0.0__b03f5f7f11d50a3a" + cp "$W_WINDIR_UNIX/Microsoft.NET/Framework/v4.0.30319/System.EnterpriseServices.dll" "$W_WINDIR_UNIX/Microsoft.NET/assembly/GAC_32/System.EnterpriseServices/v4.0_4.0.0.0__b03f5f7f11d50a3a" fi - - mkdir -p "$W_WINDIR_UNIX/Microsoft.NET/assembly/GAC_32/System.EnterpriseServices/v4.0_4.0.0.0__b03f5f7f11d50a3a" - cp "$W_WINDIR_UNIX/Microsoft.NET/Framework/v4.0.30319/System.EnterpriseServices.dll" "$W_WINDIR_UNIX/Microsoft.NET/assembly/GAC_32/System.EnterpriseServices/v4.0_4.0.0.0__b03f5f7f11d50a3a" - } @@ -4865,8 +5013,8 @@ w_metadata flash dlls \ media="download" \ file1="install_flash_player_10_plugin.exe" \ file2="install_flash_player_10_active_x.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/FlashUtil10zd_Plugin.exe" \ - installed_file2="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/FlashUtil10zd_ActiveX.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/FlashUtil10ze_Plugin.exe" \ + installed_file2="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/FlashUtil10ze_ActiveX.exe" \ homepage="http://www.adobe.com/products/flashplayer/" load_flash() @@ -4889,7 +5037,8 @@ load_flash() # 2012-02-23: sha1sum 3e9a3d8d7e5fef87ad449c93fa72d4799306ff07 # 2012-03-08: sha1sum ccbf24ab0dfa3635fb12d895eb55c5e888879c5d # 2012-05-02: sha1sum d86ca46afc312b14375aad483d1c7e5f12c707a4 - w_download http://fpdownload.macromedia.com/get/flashplayer/current/licensing/win/install_flash_player_10_active_x.exe d86ca46afc312b14375aad483d1c7e5f12c707a4 + # 2012-05-11: sha1sum 4020135dfbfe4b49067bb679000e0a6b7c7ed8bc + w_download http://fpdownload.macromedia.com/get/flashplayer/current/licensing/win/install_flash_player_10_active_x.exe 4020135dfbfe4b49067bb679000e0a6b7c7ed8bc cd "$W_CACHE"/flash w_try $WINE install_flash_player_10_active_x.exe ${W_OPT_UNATTENDED:+ /install} @@ -4908,7 +5057,8 @@ load_flash() # 2012-02-23: sha1sum 49ee6230f2ba47bcb5f978cf7a97721fb0f3db78 # 2012-03-08: sha1sum aeddca4eddb0ad91c1b8bc32f8c543069b519325 # 2102-05-02: sha1sum 0a7a7b9b8b6b834e452b456205e33210fb3b544c, name change - w_download http://fpdownload.macromedia.com/get/flashplayer/current/licensing/win/install_flash_player_10_plugin.exe 0a7a7b9b8b6b834e452b456205e33210fb3b544c + # 2102-05-11: sha1sum 060f11d5479863af609272a24dea82e6b04e0641 + w_download http://fpdownload.macromedia.com/get/flashplayer/current/licensing/win/install_flash_player_10_plugin.exe 060f11d5479863af609272a24dea82e6b04e0641 w_try $WINE install_flash_player_10_plugin.exe ${W_OPT_UNATTENDED:+ /install} } @@ -4953,26 +5103,17 @@ load_flash11() w_metadata gdiplus dlls \ title="MS GDI+" \ publisher="Microsoft" \ - year="2009" \ - media="download" \ - file1="WindowsXP-KB975337-x86-ENU.exe" \ + year="2004" \ + media="manual_download" \ + file1="NDP1.0sp2-KB830348-X86-Enu.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/gdiplus.dll" load_gdiplus() { - # FIXME: do newer versions of windows install a gdiplus in winsxs? - # If so, and one is present, perhaps we should return without doing - # anything here. - - # http://www.microsoft.com/downloads/details.aspx?familyid=6A63AB9C-DF12-4D41-933C-BE590FEAA05A&displaylang=en - w_download http://download.microsoft.com/download/a/b/c/abc45517-97a0-4cee-a362-1957be2f24e1/WindowsXP-KB975337-x86-ENU.exe b9a84bc3de92863bba1f5eb1d598446567fbc646 - # Used to use $W_UNATTENDED_SLASH_Q, but that mean that in non-q - # mode, a mysterious "Extraction Complete" dialog was all user saw. - # Showing that isn't useful, so always use /q. + w_download_manual http://download.cnet.com/NET-Framework-1-0-GDIPLUS-DLL-Security-Update/3000-10250_4-10732223.html NDP1.0sp2-KB830348-X86-Enu.exe 6113cd89d77525958295ccbd73b5fb8b89abd0aa cd "$W_CACHE"/gdiplus - w_try $WINE WindowsXP-KB975337-x86-ENU.exe /extract:$W_TMP_WIN /q - # And then make it globally available. - w_try cp "$W_TMP/asms/10/msft/windows/gdiplus/gdiplus.dll" "$W_SYSTEM32_DLLS" + w_try_cabextract -d "$W_TMP" -F FL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8 "$W_CACHE"/gdiplus/$file1 + w_try cp "$W_TMP/FL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8" "$W_SYSTEM32_DLLS/gdiplus.dll" # For some reason, native,builtin isn't good enough...? w_override_dlls native gdiplus @@ -5392,38 +5533,6 @@ load_mfc40() #---------------------------------------------------------------- -w_metadata mono26 dlls \ - title="Mono 2.6 (.NET compatability)" \ - publisher="Novell" \ - year="2009" \ - media="download" \ - file1="mono-2.6.7-gtksharp-2.12.10-win32-2.exe" \ - installed_file1="$W_PROGRAMS_X86_WIN/Mono-2.6.7/bin/mono.dll" - -load_mono26() -{ - # Load Mono, have it handle all .net requests - w_download http://ftp.novell.com/pub/mono/archive/2.6.7/windows-installer/2/mono-2.6.7-gtksharp-2.12.10-win32-2.exe c31c06063aa82006dff2f8df22dcc6ba046afbc2 - w_try $WINE "$W_CACHE"/mono26/mono-2.6.7-gtksharp-2.12.10-win32-2.exe $W_UNATTENDED_SLASH_SILENT -} - -#---------------------------------------------------------------- - -w_metadata mono28 dlls \ - title="Mono 2.8 (.NET compatability)" \ - publisher="Novell" \ - year="2010" \ - media="download" \ - file1="mono-2.8.2-gtksharp-2.12.10-win32-1.exe" \ - installed_file1="$W_PROGRAMS_X86_WIN/Mono-2.8.2/bin/mono-2.0.dll" - -load_mono28() -{ - # Load Mono, have it handle all .net requests - w_download http://ftp.novell.com/pub/mono/archive/2.8.2/windows-installer/1/mono-2.8.2-gtksharp-2.12.10-win32-1.exe d0ee2360b6fb7f16c35b54ee67044ff22bb1487e - w_try $WINE "$W_CACHE"/mono28/mono-2.8.2-gtksharp-2.12.10-win32-1.exe $W_UNATTENDED_SLASH_SILENT -} - #---------------------------------------------------------------- w_metadata mono210 dlls \ @@ -5568,18 +5677,15 @@ load_msi2() w_metadata mspatcha dlls \ title="MS mspatcha" \ publisher="Microsoft" \ - year="2001" \ + year="2004" \ media="download" \ - file1="InstMsiA.exe" \ + file1="../xpsp2/WindowsXP-KB835935-SP2-ENU.exe" \ installed_exe1="$W_SYSTEM32_DLLS_WIN/mspatcha.dll" load_mspatcha() { - # http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=CEBBACD8-C094-4255-B702-DE3BB768148F - w_download http://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US/InstMsiA.exe e739c40d747e7c27aacdb07b50925b1635ee7366 - - w_try_cabextract --directory="$W_TMP" "$W_CACHE"/mspatcha/InstMsiA.exe - w_try cp -f "$W_TMP"/mspatcha.dll "$W_SYSTEM32_DLLS" + helper_xpsp2 i386/mspatcha.dl_ + w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/mspatcha.dl_ w_override_dlls native,builtin mspatcha } @@ -5611,14 +5717,14 @@ w_metadata msls31 dlls \ publisher="Microsoft" \ year="2001" \ media="download" \ - file1="../msi2/InstMsiA.exe" \ + file1="InstMsiW.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/msls31.dll" load_msls31() { # Needed by native richedit and internet explorer - w_download http://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US/InstMsiA.exe e739c40d747e7c27aacdb07b50925b1635ee7366 - w_try_cabextract --directory="$W_TMP" "$W_CACHE"/msls31/InstMsiA.exe + w_download http://download.microsoft.com/download/WindowsInstaller/Install/2.0/NT45/EN-US/InstMsiW.exe 4fc3bf0dc96b5cf5ab26430fac1c33c5c50bd142 + w_try_cabextract --directory="$W_TMP" "$W_CACHE"/msls31/InstMsiW.exe w_try cp -f "$W_TMP"/msls31.dll "$W_SYSTEM32_DLLS" } @@ -5958,23 +6064,41 @@ load_quicktime76() fi fi } + +#---------------------------------------------------------------- + +w_metadata remove_mono settings \ + title="Remove builtin wine-mono" + +load_remove_mono() +{ + # FIXME: fold other .NET cleanups here (registry entries). + # Probably should only do that for wine >= 1.5.6 + mono_uuid="`$WINE uninstaller --list | grep Mono | cut -f1 -d\|`" + if test "$mono_uuid" + then + $WINE uninstaller --remove $mono_uuid + else + w_warn "Mono does not appear to be installed." + fi +} + #---------------------------------------------------------------- w_metadata riched20 dlls \ - title="MS RichEdit Control version 2.0 (riched20.dll, riched32.dll)" \ + title="MS RichEdit Control version 2.0 (riched20.dll)" \ publisher="Microsoft" \ - year="1999" \ + year="2004" \ media="download" \ - file1="Q249973i.EXE" \ + file1="../xpsp2/WindowsXP-KB835935-SP2-ENU.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/riched20.dll" load_riched20() { - # http://support.microsoft.com/?kbid=249973 - w_download http://download.microsoft.com/download/winntsp/Patch/RTF/NT4/EN-US/Q249973i.EXE f0b7663f15dbd31410435483ba832318c7a70470 - w_try_cabextract --directory="$W_TMP" "$W_CACHE"/riched20/Q249973i.EXE - w_try cp -f "$W_TMP"/riched??.dll "$W_SYSTEM32_DLLS" - w_override_dlls native,builtin riched20 riched32 + # FIXME: this verb used to also install riched32. Does anyone need that? + helper_xpsp2 i386/riched20.dl_ + w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/riched20.dl_ + w_override_dlls native,builtin riched20 } #---------------------------------------------------------------- @@ -6083,8 +6207,9 @@ load_shockwave() { # 2011-06-13 sha1sum: 7fd6cc61bb20d0bef654a44f4501a5a65b55b0c9 # 2011-11-10 sha1sum: b55974b471c516f13fb032424247c07390baf380 # 2012-03-07 sha1sum: 3b10f645ba1a6815fa97924a6bde4eda3177ff68 + # 2012-04-26 sha1sum: 48b1a44b2c12c486916d641f3b4e20abffb3d6e4 - w_download http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi 3b10f645ba1a6815fa97924a6bde4eda3177ff68 + w_download http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi 48b1a44b2c12c486916d641f3b4e20abffb3d6e4 cd "$W_CACHE"/shockwave w_try $WINE msiexec /i sw_lic_full_installer.msi $W_UNATTENDED_SLASH_Q } @@ -6149,7 +6274,7 @@ load_vb2run() { # Not referenced on MS web anymore, but the old Microsoft Software Library FTP still has it. # See ftp://ftp.microsoft.com/Softlib/index.txt - w_download ftp://ftp.microsoft.com/Softlib/MSLFILES/VBRUN200.EXE ac0568b73ee375408778e9b505df995f79ab907e + w_download ftp://$ftp_microsoft_com/Softlib/MSLFILES/VBRUN200.EXE ac0568b73ee375408778e9b505df995f79ab907e w_try_unzip -d "$W_TMP" "$W_CACHE"/vb2run/VBRUN200.EXE w_try cp -f "$W_TMP/VBRUN200.DLL" "$W_SYSTEM32_DLLS" } @@ -6255,9 +6380,9 @@ load_vb6run() winetricks_vcrun6_helper() { if test ! -f "$W_CACHE"/vcrun6/vcredist.exe then - w_download_to vcrun6 http://download.microsoft.com/download/vc60pro/update/1/w9xnt4/en-us/vc6redistsetup_enu.exe 382c8f5a7f41189af8d4165cf441f274b7e2a457 + w_download_to vcrun6 http://download.microsoft.com/download/vc60pro/Update/2/W9XNT4/EN-US/VC6RedistSetup_deu.exe a8c4dd33e281c166488846a10edf97ff0ce37044 - w_try $WINE "$W_CACHE"/vcrun6/vc6redistsetup_enu.exe "/T:$W_TMP_WIN" /c $W_UNATTENDED_SLASH_Q + w_try $WINE "$W_CACHE"/vcrun6/vc6redistsetup_deu.exe "/T:$W_TMP_WIN" /c $W_UNATTENDED_SLASH_Q if test ! -f "$W_TMP"/vcredist.exe then w_die vcredist.exe not found @@ -6271,7 +6396,7 @@ w_metadata vcrun6 dlls \ publisher="Microsoft" \ year="2000" \ media="download" \ - file1="vc6redistsetup_enu.exe" \ + file1="vc6redistsetup_deu.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/mfc42.dll" load_vcrun6() @@ -6303,7 +6428,7 @@ w_metadata mfc42 dlls \ publisher="Microsoft" \ year="2000" \ media="download" \ - file1="../vcrun6/vc6redistsetup_enu.exe" \ + file1="../vcrun6/vc6redistsetup_deu.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/mfc42u.dll" load_mfc42() @@ -6318,7 +6443,7 @@ w_metadata msvcirt dlls \ publisher="Microsoft" \ year="2000" \ media="download" \ - file1="../vcrun6/vc6redistsetup_enu.exe" \ + file1="../vcrun6/vc6redistsetup_deu.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/msvcirt.dll" load_msvcirt() @@ -6422,7 +6547,7 @@ w_metadata vcrun2008 dlls \ year="2011" \ media="download" \ file1="vcredist_x86.exe" \ - installed_file1="C:/windows/winsxs/x86_Microsoft.VC90.MFC_1fc8b3b9a1e18e3b_9.0.30729.6161_x-ww_028bc148/mfc90.dll" + installed_file1="$W_PROGRAMS_X86_WIN/Common Files/Microsoft Shared/VC/msdia90.dll" load_vcrun2008() { @@ -6556,19 +6681,20 @@ load_winhttp() w_metadata wininet dlls \ title="MS Windows Internet API" \ publisher="Microsoft" \ - year="1999" \ + year="2008" \ media="download" \ - file1="3725.exe" \ + file1="IE-KB884931-v2-x86-enu.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/wininet.dll" load_wininet() { - # This is an updated wininet from IE 5.0.1. - # (Good enough for Active Worlds browser. Also helps "Avatar - Legends of the Arena" get to login screen.) - # See http://www.microsoft.com/downloads/details.aspx?familyid=6DEE32AB-B618-4FB3-9A45-CDD08162E167 - w_download http://download.microsoft.com/download/ie5/Update/1/WIN98/EN-US/3725.exe b048e0b4e303298de3317b16f7008c43ca71ddfe - w_try_cabextract --directory="$W_TMP" "$W_CACHE/wininet/3725.exe" - w_try cp -f "$W_TMP"/Wininet.dll "$W_SYSTEM32_DLLS"/wininet.dll + # This is the debug version of wininet. + # See http://www.microsoft.com/en-us/download/details.aspx?id=11434 + w_download http://download.microsoft.com/download/6/f/c/6fcc07f8-62e1-459e-aab3-06faa3adacff/IE-KB884931-v2-x86-enu.exe 02e865922a436dce8a7b2da6785d6f4256aae1e4 + w_try_cabextract --directory="$W_TMP" "$W_CACHE/wininet/$file1" + # FIXME: install 64 bit version, too + # FIXME: there's a urlmon there, too, is that of interest? + w_try cp -f "$W_TMP"/wininet.x86.5.0.3700.6713.dll "$W_SYSTEM32_DLLS"/wininet.dll w_override_dlls native,builtin wininet } @@ -6665,7 +6791,7 @@ load_wsh57() w_try_cabextract -d "$W_SYSTEM32_DLLS" "$W_CACHE"/wsh57/scripten.exe # Wine doesn't provide the other dll's (yet?) - w_override_dlls native,builtin jscript + w_override_dlls native,builtin jscript scrrun vbscript w_try_regsvr dispex.dll jscript.dll scrobj.dll scrrun.dll vbscript.dll wshcon.dll wshext.dll } @@ -6907,6 +7033,28 @@ load_cjkfonts() #---------------------------------------------------------------- +w_metadata consolas fonts \ + title="MS Consolas Console font" \ + publisher="Microsoft" \ + year="2011" \ + media="download" \ + file1="PowerPointViewer.exe" \ + installed_file1="$W_FONTSDIR_WIN/consola.ttf" + +load_consolas() +{ + # http://www.microsoft.com/en-us/download/details.aspx?id=13 + w_download http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe ab48a8ebac88219c84f293c6c1e81f1a0f420da6 + w_try_cabextract -d "$W_TMP" -L -F ppviewer.cab "$W_CACHE"/consolas/PowerPointViewer.exe + w_try_cabextract -d "$W_FONTSDIR_UNIX" -L -F 'CONSOL*.TTF' "$W_TMP"/ppviewer.cab + w_register_font consola.ttf "Consoleas" + w_register_font consolab.ttf "Consoleas Bold" + w_register_font consolai.ttf "Consoleas Italic" + w_register_font consolaz.ttf "Consoleas Bold Italic" +} + +#---------------------------------------------------------------- + w_metadata corefonts fonts \ title="MS Arial, Courier, Times fonts" \ publisher="Microsoft" \ @@ -7031,7 +7179,7 @@ load_droid() DROID_URL='https://github.com/android/platform_frameworks_base/blob/master/data/fonts/' do_droid DroidSans-Bold.ttf "Droid Sans Bold" 560e4bcafdebaf29645fbf92633a2ae0d2f9801f - do_droid DroidSansFallback.ttf "Droid Sans Fallback" 2cbe4cc389294d1c43e662c4d98c64dab28fb9cb + do_droid DroidSansFallback.ttf "Droid Sans Fallback" 0da957b8ca2e7535d991b04b46a62fb52d2d54e8 do_droid DroidSansJapanese.ttf "Droid Sans Japanese" b3a248c11692aa88a30eb25df425b8910fe05dc5 do_droid DroidSansMono.ttf "Droid Sans Mono" 133fb6cf26ea073b456fb557b94ce8c46143b117 do_droid DroidSans.ttf "Droid Sans" 62f2841f61e4be66a0303cd1567ed2d300b4e31c @@ -7248,7 +7396,7 @@ w_metadata lucida fonts \ load_lucida() { - w_download ftp://ftp.microsoft.com/bussys/winnt/winnt-public/fixes/usa/NT40TSE/hotfixes-postSP3/Euro-fix/eurofixi.exe 64c47ad92265f6f10b0fd909a703d4fd1b05b2d5 + w_download ftp://$ftp_microsoft_com/bussys/winnt/winnt-public/fixes/usa/NT40TSE/hotfixes-postSP3/Euro-fix/eurofixi.exe 64c47ad92265f6f10b0fd909a703d4fd1b05b2d5 w_try_cabextract -d "$W_FONTSDIR_UNIX" -L -F 'lucon.ttf' "$W_CACHE"/lucida/eurofixi.exe w_register_font lucon.ttf "Lucida Console" } @@ -7291,7 +7439,7 @@ load_tahoma() { # The tahoma and tahomabd fonts are needed by e.g. Steam - w_download http://download.microsoft.com/download/office97pro/fonts/1/w95/en-us/tahoma32.exe 888ce7b7ab5fd41f9802f3a65fd0622eb651a068 + w_download ftp://$ftp_microsoft_com/Softlib/MSLFILES/tahoma32.exe 888ce7b7ab5fd41f9802f3a65fd0622eb651a068 w_try_cabextract --directory="$W_TMP" "$W_CACHE"/tahoma/tahoma32.exe w_try cp -f "$W_TMP"/Tahoma.TTF "$W_FONTSDIR_UNIX"/tahoma.ttf w_try cp -f "$W_TMP"/Tahomabd.TTF "$W_FONTSDIR_UNIX"/tahomabd.ttf @@ -7667,7 +7815,7 @@ w_metadata cygwin apps \ load_cygwin() { - if w_workaround_wine_bug 21206 + if w_workaround_wine_bug 24018 then # Wine can't handle current cygwin, so use some random verison of cygwin's setup from mid-2009 w_download http://kegel.com/cygwin/1.5/setup.exe 5cfb8ebe4f385b0fcffa04d22d607ec75ea05180 @@ -7675,7 +7823,7 @@ load_cygwin() # -X option is insecure, but we have to use it because fruitbat.org didn't archive .sig files :-( _W_cygopts="-X" else - w_download http://cygwin.com/setup.exe aaa2552de78e14891937c1fde86032e811cf3c3a + w_download http://cygwin.com/setup.exe 9a24bcbcf58d8ab25d9e915399c9be51ac1837c3 _W_cygopts= fi @@ -7839,7 +7987,7 @@ w_metadata fontxplorer apps \ load_fontxplorer() { - w_download http://www.moonsoftware.com/files/Font_Xplorer_122_Free.exe 22feb63be28730cbfad5458b139464490a25a68d + w_download http://www.moonsoftware.com/files/legacy/Font_Xplorer_122_Free.exe 22feb63be28730cbfad5458b139464490a25a68d cd "$W_CACHE/fontxplorer" w_try $WINE Font_Xplorer_122_Free.exe $W_UNATTENDED_SLASH_S @@ -7851,16 +7999,15 @@ load_fontxplorer() w_metadata irfanview apps \ title="Irfanview" \ publisher="Irfan Skiljan" \ - year="2011" \ - media="download" \ - file1="iview428_setup.exe" \ + year="2012" \ + media="manual_download" \ + file1="iview433_setup.exe" \ installed_file1="$W_PROGRAMS_X86_WIN/IrfanView/i_view32.exe" \ homepage="http://www.irfanview.com/" load_irfanview() { - w_download http://www.software.com/files/iview428_setup.exe \ - a51c3f5fbb651c4c00f13c59d3de9d0f0552ea46 + w_download_manual http://download.cnet.com/IrfanView/3000-2192_4-10021962.html iview433_setup.exe 79a7ebe2325ad204712761aa3c3a072025b07784 if w_workaround_wine_bug 657 "Installing mfc42" then @@ -8660,6 +8807,11 @@ load_spotify() cp Spotify%20Installer.exe SpotifyInstaller.exe fi + if w_workaround_wine_bug 27476 "Installing winhttp to work around a facebook integration crash on login and install" + then + w_call ie7 + fi + # Install is silent by default, and always starts app # So all we have to do here is close app if we want unattended install w_ahk_do " @@ -8672,10 +8824,10 @@ load_spotify() WinWaitClose " - if w_workaround_wine_bug 27476 "Installing winhttp to work around a facebook integration crash on login" - then - w_call winhttp - fi + # Kill the background task started if "Allow Spotify to be started from the Web" is specified + # or should we just do $WINESERVER -k, like fable_tlc does? + PID=`ps augxw | grep SpotifyWebHelper.exe | grep -v grep | awk '{print $2}'` + kill $PID w_declare_exe "c:\\users\\$USERNAME\\Application Data\\Spotify" spotify.exe } @@ -8734,7 +8886,7 @@ w_metadata sketchup apps \ load_sketchup() { - w_download http://dl.google.com/sketchup/GoogleSketchUpWEN.exe a86dbeb9148118407992828457dba4660febb9f4 + w_download http://dl.google.com/sketchup/GoogleSketchUpWEN.exe 8a7e270c54eb3b6def797547becd02809ef6e439 cd "$W_CACHE/$W_PACKAGE" w_ahk_do " @@ -8742,23 +8894,23 @@ load_sketchup() run GoogleSketchUpWEN.exe WinWait, SketchUp, Welcome if ( w_opt_unattended > 0 ) { - Sleep 2000 + Sleep 4000 Send {Enter} WinWait, SketchUp, License - Sleep 500 + Sleep 1000 ControlClick Button1 ; accept - Sleep 500 - ControlClick Button3 ; Next + Sleep 1000 + ControlClick Button4 ; Next WinWait, SketchUp, Destination - Sleep 500 + Sleep 1000 ControlClick Button1 ; Next WinWait, SketchUp, Ready - Sleep 500 + Sleep 1000 ControlClick Button1 ; Install } WinWait, SketchUp, Completed if ( w_opt_unattended > 0 ) { - Sleep 500 + Sleep 1000 ControlClick Button1 ; Finish } WinWaitClose @@ -8832,6 +8984,11 @@ load_steam() w_override_dlls disabled gameoverlayrenderer fi + if w_workaround_wine_bug 31320 "Disabling dwrite.dll to prevent a Steam crash." + then + w_override_dlls disabled dwrite + fi + w_declare_exe "$W_PROGRAMS_X86_WIN\\Steam" "Steam.exe" } @@ -9027,6 +9184,34 @@ load_vc2005trial() #---------------------------------------------------------------- +w_metadata vc2008express apps \ + title="MS Visual C++ 2008 Express" \ + publisher="Microsoft" \ + year="2008" \ + media="download" \ + file1="VS2008ExpressENUX1397868.iso" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Microsoft Visual Studio 9.0/Common7/IDE/VCExpress.exe" + +load_vc2008express() +{ + w_call dotnet35 + + # This is the version without sp1 baked in. (sp1 requires dotnet35sp1, which doesn't work yet.) + w_download http://download.microsoft.com/download/8/B/5/8B5804AD-4990-40D0-A6AA-CE894CBBB3DC/VS2008ExpressENUX1397868.iso 76c6d28274a67741da720744026ea991a70867d1 + + # Unpack ISO + cd "$W_TMP" + w_try_7z x "$W_CACHE"/vc2008express/VS2008ExpressENUX1397868.iso + cd VCExpress + + # See also http://blogs.msdn.com/b/astebner/archive/2008/04/25/8425198.aspx + w_try $WINE setup.exe $W_UNATTENDED_SLASH_Q + + w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Visual Studio 9.0\\Common7\\IDE" "VCExpress.exe" +} + +#---------------------------------------------------------------- + w_metadata vlc apps \ title="VLC media player" \ publisher="videolan.org" \ @@ -9189,6 +9374,13 @@ load_wmp9() # See also http://www.microsoft.com/windows/windowsmedia/player/9series/default.aspx w_download http://download.microsoft.com/download/1/b/c/1bc0b1a3-c839-4b36-8f3c-19847ba09299/MPSetup.exe 580536d10657fa3868de2869a3902d31a0de791b + # Wine's wmvcore crashes when the installer asks it to register itself? + w_override_dlls native wmvcore + # FIXME: should we override quartz? Builtin crashes when you play + # anything, but maybe that's bug 30557 and only affects new systems? + # Wine's pidgen is too stubby, crashes, see wine bug 31111 + w_override_app_dlls MPSetup.exe native pidgen + # Have to run twice; see http://bugs.winehq.org/show_bug.cgi?id=1886 cd "$W_CACHE"/wmp9 w_try $WINE MPSetup.exe $W_UNATTENDED_SLASH_Q @@ -14214,100 +14406,6 @@ load_nfsworld() #---------------------------------------------------------------- -w_metadata nfsworld_mono games \ - title="Need For Speed World (using Mono)" \ - publisher="EA" \ - year="2011" \ - media="download" \ - file1="setup_659.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/Electronic Arts/Need For Speed World/GameLauncher.exe" - -load_nfsworld_mono() -{ - w_download http://static.cdn.ea.com/blackbox/u/f/NFSWO/Launcher/weblaunch_1.8.40.659/akamai/setup_659.exe b1f10af09350e2b3f5ccbc679dbea628e9f432d0 - - if w_workaround_wine_bug 25658 "Installing Mono 2.6" - then - # newer mono fails? - w_call mono26 - # Work around bug fixed in later versions of mono (thanks, Vincent) - w_download http://madewokherd.nfshost.com/omgsecret/mono-winebug23458.tar.gz \ - 156a7d79e70864b67af22315ae257dc798cb2a2e - w_try tar -C "$W_PROGRAMS_X86_UNIX/Mono-2.6.7/lib" -xvf "$W_CACHE/$W_PACKAGE"/mono-winebug23458.tar.gz - fi - - if test "$W_OPT_UNATTENDED" && w_workaround_wine_bug 25961 - then - w_call vcrun2008 - fi - - if w_workaround_wine_bug 26915 "installing corefonts so help works" - then - w_call corefonts - fi - - cd "$W_CACHE/$W_PACKAGE" - w_ahk_do " - SetWinDelay 500 - SetTitleMatchMode, 2 - run $file1 - winwait Setup - Need For Speed - if ( w_opt_unattended > 0 ) { - ControlClick TNewButton1 ; Next - winwait Setup - Need For Speed, License - ControlClick TNewRadioButton1 ; Accept - sleep 1000 - ControlClick TNewButton2 ; Next - winwait Setup - Need For Speed, be installed - ControlClick TNewButton3 ; Next - winwait Setup - Need For Speed, be downloaded - ControlClick TNewButton4 ; Next - winwait Setup - Need For Speed, shortcuts - ControlClick TNewButton5 ; Next - winwait Setup - Need For Speed, Tasks - ControlClick TNewButton5 ; Next - winwait Setup - Need For Speed, Ready to Install - ControlClick TNewButton5 ; Next - ;winwait Setup, do not have Microsoft .NET 2.0 ; only on old wine - ;send {Enter} - } - winwait Setup - Need For Speed, Completing - if ( w_opt_unattended > 0 ) { - send {Space} ; uncheck readme - send {Tab} - send {Space} ; uncheck launch (Vincent says let it launch?) - sleep 1000 ; let launch uncheck take effect? - ControlClick TNewButton5 ; Finish - } - winwaitclose - " - - # Work around winebrowser snafu mentioned in http://bugs.winehq.org/show_bug.cgi?id=13891 - # else you'll quickly get a dialog saying the app is broken - # FIXME: file a bug for this - if w_workaround_wine_bug 0000 "Kludging registry entry for winebrowser so patcher starts" - then - $WINE reg add "HKCR\\http\\shell\\open\\command" /ve /d "C:\\windows\\system32\\winebrowser.exe -nohome \"%1\"" /f - fi - - # Create custom start batch file - # FIXME: Before wine-1.3.22, del /s will crash, see http://bugs.winehq.org/show_bug.cgi?id=26885 - cat > "$W_DRIVE_C/run-$W_PACKAGE.bat" <<__EOF__ -c: - -rem Work around mono bug mentioned by Vincent -cd "c:\\users\\%USERNAME%\\Local Settings\\Application Data" -if exist "Electronic Arts Inc" del /s "Electronic Arts Inc\\user.config" - -echo Warning, do not move window, Vincent says it will break keyboard input -cd "C:\\Program Files\\Electronic Arts\\Need For Speed World" -GameLauncher.exe -__EOF__ - -} - -#---------------------------------------------------------------- - w_metadata njcwp_trial apps \ title="NJStar Chinese Word Processor trial" \ publisher="NJStar" \ @@ -16104,6 +16202,43 @@ load_twfc() #---------------------------------------------------------------- +w_metadata typingofthedead_demo games \ + title="Typing of the Dead Demo" \ + publisher="Sega" \ + year="1999" \ + media="download" \ + file1="Tod_e_demo.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/SEGA/TOD-Demo/Tod_e_demo.exe" + +load_typingofthedead_demo() +{ + w_download "http://downloads.pcworld.com/pub/new/fun_and_games/other/tod-demo.zip" 96fe3edb2431210932af840e29c59bce6b7fc80f + + cd "$W_CACHE/$W_PACKAGE" + mkdir "$W_TMP" + cd "$W_TMP" + w_try_unzip "$W_CACHE/$W_PACKAGE/tod-demo.zip" + + w_ahk_do " + SetTitleMatchMode, 2 + run SETUP.EXE + if ( w_opt_unattended > 0 ) { + WinWait,InstallShield Wizard,where + sleep 1000 + ControlClick Button1 ; Next + WinWait,InstallShield Wizard,icons + sleep 1000 + ControlClick Button2 ; Next + } + ; installer crashes here? + Sleep 20000 + " + + w_declare_exe "$W_PROGRAMS_X86_WIN\\SEGA\\TOD-Demo" "Tod_e_demo.exe" +} + +#---------------------------------------------------------------- + w_metadata ut3 games \ title="Unreal Tournament 3" \ publisher="Midway Games" \ @@ -17394,8 +17529,6 @@ for data in \ mfc42:size_MB=47,time_sec=1 \ mingw:size_MB=132,time_sec=3 \ mono210:size_MB=463,time_sec=26 \ - mono26:size_MB=434,time_sec=26 \ - mono28:size_MB=550,time_sec=28 \ mozillabuild:size_MB=891,time_sec=26 \ mpc:size_MB=87,time_sec=2 \ msasn1:size_MB=178,time_sec=3 \ @@ -17659,6 +17792,15 @@ execute_command() list-download) winetricks_list_download ;; list-manual-download) winetricks_list_manual_download ;; list-installed) winetricks_list_installed ;; + list-all) + old_menu="$WINETRICKS_CURMENU" + for WINETRICKS_CURMENU in apps benchmarks dlls fonts games prefix settings + do + echo "===== $WINETRICKS_CURMENU =====" + winetricks_list_all + done + WINETRICKS_CURMENU="$old_menu" + ;; unattended) winetricks_set_unattended 1 ;; attended) winetricks_set_unattended 0 ;; showbroken) W_OPT_SHOWBROKEN=1 ;;