rpm/wine
SHA256
1
0
Fork 0
forked from pool/wine
Code Pull Requests Activity

- Updated to 1.5.15 development snapshot

Browse Source 
- Full support for layered windows.
  - New version of the Gecko engine based on Firefox 16.
  - Support for broadcast sockets used by networked games.
  - Downloaded add-ons installers are now cached.
  - Support for persistent Internet cookies.
  - String optimizations in JavaScript.
  - Various bug fixes.

- Updated to 1.5.14 development snapshot
  - Much better behavior of the URL cache.
  - Improved GIF image support.
  - More parser features in the shader compiler.
  - Optimizations in JavaScript.
  - Various bug fixes.
- updated winetricks to 20120912

- Updated to 1.5.13 development snapshot
  - Client-side window rendering using the DIB engine.
  - Raw input support for keyboard and mouse.
  - Support for transparent window areas using color keying.
  - Proper C++ RTTI support on 64-bit.
  - Implementation of logical processor information.
  - Support for fonts with localized names.
  - Various bug fixes.

OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=161
This commit is contained in:
Marcus Meissner 2012-10-13 09:22:15 +00:00 committed by Git OBS Bridge
parent 3763171567
commit dcf2a33d4e
5 changed files with 186 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wine-1.5.12.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5af1499f1628ff89842f3961958323bdd2bd9c78055313d1b7eae4f36c8587a8
size 20652499

3
wine-1.5.15.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2642698204bbc5d9fd04c30f3507fa08a62fa3b0a21e53cdfd2c5a4530b69454
size 20844051

35
wine.changes
View File

@ -1,3 +1,38 @@
-------------------------------------------------------------------
Fri Oct 12 18:48:04 UTC 2012 - meissner@suse.com
- Updated to 1.5.15 development snapshot
- Full support for layered windows.
- New version of the Gecko engine based on Firefox 16.
- Support for broadcast sockets used by networked games.
- Downloaded add-ons installers are now cached.
- Support for persistent Internet cookies.
- String optimizations in JavaScript.
- Various bug fixes.
-------------------------------------------------------------------
Fri Sep 28 21:25:04 UTC 2012 - meissner@suse.com
- Updated to 1.5.14 development snapshot
- Much better behavior of the URL cache.
- Improved GIF image support.
- More parser features in the shader compiler.
- Optimizations in JavaScript.
- Various bug fixes.
- updated winetricks to 20120912
-------------------------------------------------------------------
Fri Sep 14 22:29:43 UTC 2012 - meissner@suse.com
- Updated to 1.5.13 development snapshot
- Client-side window rendering using the DIB engine.
- Raw input support for keyboard and mouse.
- Support for transparent window areas using color keying.
- Proper C++ RTTI support on 64-bit.
- Implementation of logical processor information.
- Support for fonts with localized names.
- Various bug fixes.
-------------------------------------------------------------------
Fri Aug 31 18:59:58 UTC 2012 - meissner@suse.com

4
wine.spec
View File

@ -55,13 +55,13 @@ BuildRequires: sane-backends-devel
BuildRequires: update-desktop-files
BuildRequires: valgrind-devel
BuildRequires: xorg-x11-devel
Version: 1.5.12
Version: 1.5.15
Release: 0
Summary: An MS Windows Emulator
License: LGPL-2.1+
Group: System/Emulators/PC
Url: http://www.winehq.org/
Source0: %name-%version.tar.bz2
Source0: http://downloads.sourceforge.net/project/wine/Source/%{name}-%{version}.tar.bz2
Source1: http://kegel.com/wine/winetricks
Source2: http://kegel.com/wine/wisotool
Source3: README.SuSE

309
winetricks
View File

@ -1,7 +1,8 @@
#!/bin/sh
# Name of this version of winetricks (YYYYMMDD)
WINETRICKS_VERSION=20120308
# (This doesn't change often, use the sha1sum of the file when reporting problems)
WINETRICKS_VERSION=20120912
# This is a utf-8 file
# You should see an o with two dots over it here [ö]
@ -43,7 +44,7 @@ WINETRICKS_VERSION=20120308
# Copyright (C) 2007-2012 Dan Kegel <dank!kegel.com>
# Copyright (C) 2008-2012 Austin English <austinenglish!gmail.com>
# Copyright (C) 2010-2011 Phil Blankenship <phillip.e.blankenship!gmail.com>
# Copyright (C) 2010-2011 Shannon VanWagner <shannon.vanwagner!gmail.com>
# Copyright (C) 2010-2012 Shannon VanWagner <shannon.vanwagner!gmail.com>
# Copyright (C) 2010 Belhorma Bendebiche <amro256!gmail.com>
# Copyright (C) 2010 Eleazar Galano <eg.galano!gmail.com>
# Copyright (C) 2010 Travis Athougies <iammisc!gmail.com>
@ -2028,7 +2029,9 @@ winetricks_detect_gui()
echo "Zenity not found! Using kdialog as poor substitute."
WINETRICKS_GUI=kdialog
else
echo "Please install zenity if you want a graphical interface."
echo "No arguments given, so tried to start GUI, but zenity not found."
echo "Please install zenity if you want a graphical interface, or "
echo "run with --help for more options."
exit 1
fi
}
@ -3699,16 +3702,26 @@ helper_d3dx9_xx()
w_override_dlls native $dllname
}
helper_win2ksp4()
{
filename=$1
# http://www.microsoft.com/downloads/details.aspx?FamilyID=1001AAF1-749F-49F4-8010-297BD6CA33A0&displaylang=en
w_download_to win2ksp4 http://download.microsoft.com/download/E/6/A/E6A04295-D2A8-40D0-A0C5-241BFECD095E/W2KSP4_EN.EXE fadea6d94a014b039839fecc6e6a11c20afa4fa8
w_try_cabextract -d "$W_TMP" -L -F $filename "$W_CACHE"/win2ksp4/W2KSP4_EN.EXE
}
helper_xpsp2()
{
filename=$1
# http://www.microsoft.com/en-us/download/details.aspx?id=28
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 \
title="Adobe AIR 2.7" \
@ -3779,18 +3792,13 @@ w_metadata atmlib dlls \
publisher="Adobe" \
year="2009" \
media="download" \
file1="W2KSP4_EN.EXE" \
file1="../win2ksp4/W2KSP4_EN.EXE" \
installed_file1="$W_SYSTEM32_DLLS_WIN/atmlib.dll"
load_atmlib()
{
# http://www.microsoft.com/downloads/details.aspx?FamilyID=1001AAF1-749F-49F4-8010-297BD6CA33A0&displaylang=en
# FIXME: This is a huge download for a single dll.
# FIXME: This download is also used to get msasn1.dll, but we can't download into common cache directory until the file1 metadata download check is extended to handle that. It'd be better to not need the huge download.
w_download http://download.microsoft.com/download/E/6/A/E6A04295-D2A8-40D0-A0C5-241BFECD095E/W2KSP4_EN.EXE fadea6d94a014b039839fecc6e6a11c20afa4fa8
cd "$W_TMP"
w_try_cabextract "$W_CACHE"/atmlib/W2KSP4_EN.EXE i386/atmlib.dl_
w_try cp atmlib.dll "$W_SYSTEM32_DLLS"
helper_win2ksp4 i386/atmlib.dl_
w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/atmlib.dl_
}
#----------------------------------------------------------------
@ -3908,17 +3916,16 @@ w_metadata crypt32 dlls \
publisher="Microsoft" \
year="2003" \
media="download" \
file1="Q823182_XPE_SP2_X86_ENU.EXE" \
file1="../xpsp2/WindowsXP-KB835935-SP2-ENU.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/crypt32.dll"
load_crypt32()
{
w_call msasn1
# https://www.microsoft.com/downloads/en/details.aspx?FamilyID=3d733ddd-1182-4d46-87c1-3357ca3fed28&DisplayLang=en
w_download http://download.microsoft.com/download/1/6/2/1629d13a-dc5e-4dc6-a2a4-a6784942b94e/Q823182_XPE_SP2_X86_ENU.EXE c3e0aa35ab5197ede0d495c0edc242cf0fade54a
w_try_cabextract -d "$W_SYSTEM32_DLLS" "$W_CACHE"/crypt32/Q823182_XPE_SP2_X86_ENU.EXE -F rep/329115_crypt32.dll
mv "$W_SYSTEM32_DLLS"/rep/329115_crypt32.dll "$W_SYSTEM32_DLLS"/crypt32.dll
helper_win2ksp4 i386/crypt32.dl_
w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/crypt32.dl_
w_override_dlls native crypt32
}
@ -4568,7 +4575,7 @@ w_metadata dotnet20 dlls \
title="MS .NET 2.0" \
publisher="Microsoft" \
year="2006" \
media="download" \
media="manual_download" \
file1="dotnetfx.exe" \
installed_file1="c:/windows/Microsoft.NET/Framework/v2.0.50727/mscorlib.dll"
@ -4581,9 +4588,7 @@ load_dotnet20()
# 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 && w_workaround_wine_bug 10467 "Install l_intl.nls" 1.1.44,
if test ! -f "$W_CACHE"/dotnet20/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
@ -4601,7 +4606,7 @@ load_dotnet20()
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_download_manual http://download.cnet.com/Microsoft-NET-Framework-Redistributable-Package-x86/3000-10250_4-10726028.html dotnetfx.exe a3625c59d7a2995fb60877b5f5324892a1693b2a
# A bug that popped up in 1.5.3 was fixed in 1.5.7; until then a
# crappy workaround helps
@ -4610,6 +4615,7 @@ load_dotnet20()
$WINE reg add 'HKLM\Software\Microsoft\.NETFramework' /v InstallRoot /d 'C:\Windows\Microsoft.NET\Framework\' /f
fi
cd "$W_CACHE"/dotnet20
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"}
@ -4741,8 +4747,8 @@ w_metadata dotnet30 dlls \
title="MS .NET 3.0" \
publisher="Microsoft" \
year="2006" \
media="download" \
file1="dotnetfx3.exe" \
media="manual_download" \
file1="netframework3.exe" \
installed_file1="c:/windows/Microsoft.NET/Framework/v3.0/Microsoft .NET Framework 3.0/logo.bmp"
load_dotnet30()
@ -4751,7 +4757,7 @@ load_dotnet30()
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 ===" ;;
*) w_warn "If install fails, set /proc/sys/kernel/yama/ptrace_scope to 0. See http://bugs.winehq.org/show_bug.cgi?id=30410" ;;
esac
fi
@ -4775,7 +4781,7 @@ load_dotnet30()
w_warn "Installing .net 3.0 runtime takes 3 minutes on a very fast machine, and the Finished dialog may hide in the taskbar."
# http://msdn.microsoft.com/en-us/netframework/bb264589.aspx
w_download http://download.microsoft.com/download/3/F/0/3F0A922C-F239-4B9B-9CB0-DF53621C57D9/dotnetfx3.exe f3d2c3c7e4c0c35450cf6dab1f9f2e9e7ff50039
w_download_manual http://www.oldversion.com/download-.Net-Framework-3.0.html netframework3.exe f3d2c3c7e4c0c35450cf6dab1f9f2e9e7ff50039
# AF's workaround to avoid long pause
LANGPACKS_BASE_PATH="${W_WINDIR_UNIX}/SYSMSICache/Framework/v3.0"
@ -4791,6 +4797,18 @@ load_dotnet30()
# Delete FontCache 3.0 service, it's in Wine for Mono, breaks native .NET
# OK if this fails, that just means you have an older wine.
$WINE sc delete "FontCache3.0.0.0"
if w_workaround_wine_bug 30845 "Using native fusion..." ,1.5.6
then
# Either adding this registry key
#$WINE reg add 'HKLM\Software\Microsoft\.NETFramework' /v InstallRoot /d 'C:\Windows\Microsoft.NET\Framework\' /f
# or using native mscoree and fusion
WINEDLLOVERRIDES=mscoree,fusion=n
export WINEDLLOVERRIDES
# will let install start
fi
WINEDLLOVERRIDES="ngen.exe,mscorsvw.exe=b;$WINEDLLOVERRIDES"
cd "$W_CACHE"/dotnet30
w_try $WINE $file1 ${W_OPT_UNATTENDED:+ /q /c:"install.exe /q"}
}
@ -5013,8 +5031,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/FlashUtil10ze_Plugin.exe" \
installed_file2="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/FlashUtil10ze_ActiveX.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/FlashUtil10zf_Plugin.exe" \
installed_file2="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/FlashUtil10zf_ActiveX.exe" \
homepage="http://www.adobe.com/products/flashplayer/"
load_flash()
@ -5038,7 +5056,8 @@ load_flash()
# 2012-03-08: sha1sum ccbf24ab0dfa3635fb12d895eb55c5e888879c5d
# 2012-05-02: sha1sum 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
# 2012-08-12: sha1sum 3cd65d71ba26b829255e44a1af708fc060282bc6
w_download http://fpdownload.macromedia.com/get/flashplayer/current/licensing/win/install_flash_player_10_active_x.exe 3cd65d71ba26b829255e44a1af708fc060282bc6
cd "$W_CACHE"/flash
w_try $WINE install_flash_player_10_active_x.exe ${W_OPT_UNATTENDED:+ /install}
@ -5058,7 +5077,8 @@ load_flash()
# 2012-03-08: sha1sum aeddca4eddb0ad91c1b8bc32f8c543069b519325
# 2102-05-02: sha1sum 0a7a7b9b8b6b834e452b456205e33210fb3b544c, name change
# 2102-05-11: sha1sum 060f11d5479863af609272a24dea82e6b04e0641
w_download http://fpdownload.macromedia.com/get/flashplayer/current/licensing/win/install_flash_player_10_plugin.exe 060f11d5479863af609272a24dea82e6b04e0641
# 2012-08-12: sha1sum 3909ee6078bdae2157f595b8d7c4f1484fef710b
w_download http://fpdownload.macromedia.com/get/flashplayer/current/licensing/win/install_flash_player_10_plugin.exe 3909ee6078bdae2157f595b8d7c4f1484fef710b
w_try $WINE install_flash_player_10_plugin.exe ${W_OPT_UNATTENDED:+ /install}
}
@ -5395,7 +5415,7 @@ load_jet40()
# http://support.microsoft.com/kb/239114
# See also http://bugs.winehq.org/show_bug.cgi?id=6085
# FIXME: "failed with error 2"
w_download http://download.microsoft.com/download/4/3/9/4393c9ac-e69e-458d-9f6d-2fe191c51469/jet40sp8_9xnt.exe 8cd25342030857969ede2d8fcc34f3f7bcc2d6d4
w_download http://www.autoxplorer.com/exe/Jet40SP8_9xNT.exe 8cd25342030857969ede2d8fcc34f3f7bcc2d6d4
cd "$W_CACHE"/jet40
w_try $WINE jet40sp8_9xnt.exe $W_UNATTENDED_SLASH_Q
}
@ -5518,17 +5538,16 @@ load_mdac28()
w_metadata mfc40 dlls \
title="MS mfc40 (Microsoft Foundation Classes from Visual C++ 4.0)" \
publisher="Microsoft" \
year="2004" \
year="1999" \
media="download" \
file1="ole2v.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/MFC40.DLL"
file1="mfc40.cab" \
installed_file1="$W_SYSTEM32_DLLS_WIN/mfc40.dll"
load_mfc40()
{
# See http://support.microsoft.com/kb/122244
w_download http://download.microsoft.com/download/ole/ole2v/3.5/w351/en-us/ole2v.exe c6cac71f32405ccb09c6f375e0738e6e13f073e4
w_try_unzip -d "$W_TMP" "$W_CACHE"/mfc40/ole2v.exe
w_try cp -f "$W_TMP"/MFC40.DLL "$W_SYSTEM32_DLLS"
w_download http://activex.microsoft.com/controls/vc/mfc40.cab 53c570e2c811674d6e4fa46cff5a3a04cd0ffc24
w_try_cabextract -d "$W_TMP" "$W_CACHE"/mfc40/mfc40.cab
w_try_cabextract -d "$W_SYSTEM32_DLLS" -F *40.dll "$W_TMP"/mfc40.exe
}
#----------------------------------------------------------------
@ -5575,19 +5594,13 @@ w_metadata msasn1 dlls \
publisher="Microsoft" \
year="2003" \
media="download" \
file1="W2KSP4_EN.EXE" \
file1="../win2ksp4/W2KSP4_EN.EXE" \
installed_file1="$W_SYSTEM32_DLLS_WIN/msasn1.dll"
load_msasn1()
{
# http://www.microsoft.com/downloads/details.aspx?FamilyID=1001AAF1-749F-49F4-8010-297BD6CA33A0&displaylang=en
# FIXME: This is a huge download for a single dll.
w_download http://download.microsoft.com/download/E/6/A/E6A04295-D2A8-40D0-A0C5-241BFECD095E/W2KSP4_EN.EXE fadea6d94a014b039839fecc6e6a11c20afa4fa8
cd "$W_TMP"
w_try_cabextract -F i386/msasn1.dl_ "$W_CACHE"/msasn1/W2KSP4_EN.EXE
w_try_cabextract i386/msasn1.dl_
w_try cp msasn1.dll "$W_SYSTEM32_DLLS"
w_try rm -rf i386
helper_win2ksp4 i386/msasn1.dl_
w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/msasn1.dl_
}
#----------------------------------------------------------------
@ -5636,55 +5649,17 @@ load_mshflxgd()
#----------------------------------------------------------------
w_metadata msi2 dlls \
title="Windows Installer 2.0" \
publisher="Microsoft" \
year="2001" \
media="download" \
file1="InstMsiA.exe" \
installed_exe1="$W_SYSTEM32_DLLS_WIN/msiexec.exe"
load_msi2()
{
# Install native msi per http://wiki.winehq.org/NativeMsi
# 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
# Pick win98 so we can install native msi
w_set_winver win98
# Avoid "err:setupapi:SetupDefaultQueueCallbackA copy error 5 ..."
rm -f "$W_SYSTEM32_DLLS"/msi.dll
rm -f "$W_SYSTEM32_DLLS"/msiexec.exe
# Avoid "instMSIA.exe returned status 20. Aborting."
if w_workaround_wine_bug 26816 "Removing fake mspatcha to skip version check" ,1.3.16
then
rm -f "$W_SYSTEM32_DLLS"/mspatcha.dll
fi
cd "$W_CACHE"/msi2
WINEDLLOVERRIDES="msi,msiexec.exe=n" w_try $WINE InstMSIA.exe $W_UNATTENDED_SLASH_Q
w_override_dlls native,builtin msi msiexec.exe
# and undo version win98
w_unset_winver
}
#----------------------------------------------------------------
w_metadata mspatcha dlls \
title="MS mspatcha" \
publisher="Microsoft" \
year="2004" \
media="download" \
file1="../xpsp2/WindowsXP-KB835935-SP2-ENU.exe" \
file1="../win2ksp4/W2KSP4_EN.EXE" \
installed_exe1="$W_SYSTEM32_DLLS_WIN/mspatcha.dll"
load_mspatcha()
{
helper_xpsp2 i386/mspatcha.dl_
helper_win2ksp4 i386/mspatcha.dl_
w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/mspatcha.dl_
w_override_dlls native,builtin mspatcha
@ -5917,18 +5892,18 @@ load_physx()
#----------------------------------------------------------------
w_metadata pngfilt dlls \
title="pngfilt.dll (from ie6)" \
title="pngfilt.dll (from ie5)" \
publisher="Microsoft" \
year="2002" \
year="2004" \
media="download" \
file1="q328970.exe" \
file1="IE5.01sp4-KB871260-Windows2000sp4-x86-ENU.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/pngfilt.dll"
load_pngfilt()
{
# http://support.microsoft.com/kb/328970
w_download http://download.microsoft.com/download/IE60/30secpac/6/W98NT42KMeXP/EN-US/q328970.exe 5fd84a335c43d194c0138a091dc0ea151ecc331c
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F pngfilt.dll "$W_CACHE"/pngfilt/q328970.exe
# http://www.microsoft.com/en-us/download/details.aspx?id=3907
w_download http://download.microsoft.com/download/5/0/c/50c42d0e-07a8-4a2b-befb-1a403bd0df96/IE5.01sp4-KB871260-Windows2000sp4-x86-ENU.exe 6f5db296ebf58e81c49bc667049a3f88a3f1ec3d
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F pngfilt.dll "$W_CACHE"/pngfilt/IE5.01sp4-KB871260-Windows2000sp4-x86-ENU.exe
w_try_regsvr pngfilt.dll
}
@ -6090,13 +6065,13 @@ w_metadata riched20 dlls \
publisher="Microsoft" \
year="2004" \
media="download" \
file1="../xpsp2/WindowsXP-KB835935-SP2-ENU.exe" \
file1="../win2ksp4/W2KSP4_EN.EXE" \
installed_file1="$W_SYSTEM32_DLLS_WIN/riched20.dll"
load_riched20()
{
# FIXME: this verb used to also install riched32. Does anyone need that?
helper_xpsp2 i386/riched20.dl_
helper_win2ksp4 i386/riched20.dl_
w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/riched20.dl_
w_override_dlls native,builtin riched20
}
@ -6208,8 +6183,9 @@ load_shockwave() {
# 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 48b1a44b2c12c486916d641f3b4e20abffb3d6e4
# 2012-08-08 sha1sum: 3c4d531ccf0bb5788f1c197c63e9c0aa89885ee6
w_download http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi 3c4d531ccf0bb5788f1c197c63e9c0aa89885ee6
cd "$W_CACHE"/shockwave
w_try $WINE msiexec /i sw_lic_full_installer.msi $W_UNATTENDED_SLASH_Q
}
@ -6339,7 +6315,7 @@ w_metadata vb6run dlls \
title="MS Visual Basic 6 runtime sp6" \
publisher="Microsoft" \
year="2004" \
media="download" \
media="manual_download" \
file1="vbrun60sp6.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/MSVBVM60.DLL"
@ -6348,7 +6324,7 @@ load_vb6run()
# http://support.microsoft.com/kb/290887
if test ! -f "$W_CACHE"/vb6run/vbrun60sp6.exe
then
w_download http://download.microsoft.com/download/5/a/d/5ad868a0-8ecd-4bb0-a882-fe53eb7ef348/VB6.0-KB290887-X86.exe 73ef177008005675134d2f02c6f580515ab0d842
w_download_manual "http://download.cnet.com/Service-Pack-6-for-Visual-Basic-6-0-Run-Time-Redistribution-Pack-vbrun60sp6-exe/3000-2206_4-10726557.html?tag=downloadRatingModule;summaryRatings" VB6.0-KB290887-X86.exe 73ef177008005675134d2f02c6f580515ab0d842
w_try $WINE "$W_CACHE"/vb6run/VB6.0-KB290887-X86.exe "/T:$W_TMP_WIN" /c $W_UNATTENDED_SLASH_Q
if test ! -f "$W_TMP"/vbrun60sp6.exe
@ -6463,13 +6439,13 @@ w_metadata vcrun6sp6 dlls \
title="Visual C++ 6 sp6 libraries (with fixes in atl and mfc)" \
publisher="Microsoft" \
year="2004" \
media="download" \
media="manual_download" \
file1="Vs6sp6.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/mfc42.dll"
load_vcrun6sp6()
{
w_download http://download.microsoft.com/download/1/9/f/19fe4660-5792-4683-99e0-8d48c22eed74/Vs6sp6.exe 2292437a8967349261c810ae8b456592eeb76620
w_download_manual "http://download.cnet.com/Service-Pack-6-for-Visual-Basic-6-0-Visual-C-6-0-with-Visual-Source-Safe-6-0d/3000-2206_4-10726553.html?tag=rb_content;contentBody" Vs6sp6.exe 2292437a8967349261c810ae8b456592eeb76620
# No EULA is presented when passing command-line extraction arguments,
# so we'll simplify extraction with cabextract.
@ -6665,14 +6641,13 @@ w_metadata winhttp dlls \
publisher="Microsoft" \
year="2005" \
media="download" \
file1="Windows2000-KB842773-x86-ENU.EXE" \
file1="../win2ksp4/W2KSP4_EN.EXE" \
installed_file1="$W_SYSTEM32_DLLS_WIN/winhttp.dll"
load_winhttp()
{
# See https://www.microsoft.com/downloads/en/details.aspx?FamilyID=3ee866a0-3a09-4fdf-8bdb-c906850ab9f2
w_download http://download.microsoft.com/download/5/d/8/5d802926-6bab-45fa-b96e-bee15413523b/Windows2000-KB842773-x86-ENU.EXE e676d47e065a314bbf1d15b096a67aede6b0539a
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F winhttp.dll "$W_CACHE"/winhttp/Windows2000-KB842773-x86-ENU.EXE
helper_win2ksp4 i386/new/winhttp.dl_
w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/new/winhttp.dl_
w_override_dlls native,builtin winhttp
}
@ -6683,18 +6658,13 @@ w_metadata wininet dlls \
publisher="Microsoft" \
year="2008" \
media="download" \
file1="IE-KB884931-v2-x86-enu.exe" \
file1="../win2ksp4/W2KSP4_EN.EXE" \
installed_file1="$W_SYSTEM32_DLLS_WIN/wininet.dll"
load_wininet()
{
# 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
helper_win2ksp4 i386/wininet.dl_
w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/wininet.dl_
w_override_dlls native,builtin wininet
}
@ -7904,7 +7874,7 @@ w_metadata firefox36 apps \
load_firefox36()
{
w_download "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.28/win32/en-US/Firefox%20Setup%203.6.28.exe" 3657287c2cff34f5edc237de954a9cc6f2ca465a "$file1"
w_download "ftp://ftp.mozilla.org/pub/firefox/releases/3.6.28/win32/en-US/Firefox%20Setup%203.6.28.exe" 3657287c2cff34f5edc237de954a9cc6f2ca465a "$file1"
cd "$W_CACHE"/firefox36
w_try $WINE "$file1" ${W_OPT_UNATTENDED:+ -ms}
@ -8065,54 +8035,14 @@ load_irfanview()
#----------------------------------------------------------------
w_metadata ie3 dlls \
title="Internet Explorer 3" \
publisher="Microsoft" \
year="1996" \
media="download" \
file1="msie302m95.exe" \
installed_file1="c:/Program Files/Internet Explorer/INST32.DLL"
load_ie3()
{
w_warn "This is for debugging purposes only, DO NOT INSTALL."
w_set_winver win95
# FIXME: /q is quiet, but still has some promps..
w_download http://www.mirrorservice.org/sites/browsers.evolt.org/browsers/ie/win32/3.02/win95full/msie302m95.exe a55c3834860347342c0b91e0f572124b440eb195
cat > "$W_TMP"/override-dll.reg <<_EOF_
REGEDIT4
[HKEY_CURRENT_USER\Software\Wine\AppDefaults\infinst2.exe\DllOverrides]
"shell32"="native"
_EOF_
w_try_regedit "$W_TMP_WIN"\\override-dll.reg
cd "$W_CACHE/$W_PACKAGE"
$WINE msie302m95.exe
# IE3 exits with 194 to signal a reboot
status=$?
case $status in
0|194) ;;
*) w_die ie6 installation failed
esac
# FIXME: installer reboots and has a failure, not sure how to detect that cleanly.
}
#----------------------------------------------------------------
# FIXME: ie6 always installs to C:/Program Files even if LANG is de_DE.utf-8,
# so we have to hard code that, but that breaks on 64 bit windows.
w_metadata ie6 dlls \
title="Internet Explorer 6" \
publisher="Microsoft" \
year="2002" \
media="download" \
file1="ie60.exe" \
media="manual_download" \
file1="msie60.exe" \
installed_file1="c:/Program Files/Internet Explorer/iedetect.dll"
load_ie6()
@ -8123,10 +8053,10 @@ load_ie6()
w_die "This package does not work on a 64-bit installation"
fi
w_download http://download.oldapps.com/Internet_Explorer/ie60.exe 8e483db28ff01a7cabd39147ab6c59753ea1f533
w_download_manual http://www.oldversion.com/download-Internet-Explorer-6.0.html msie60.exe 8e483db28ff01a7cabd39147ab6c59753ea1f533
cd "$W_TMP"
$WINE "$W_CACHE"/ie6/ie60.exe
$WINE "$W_CACHE"/ie6/$file1
w_call msls31
@ -8879,14 +8809,14 @@ _EOF_
w_metadata sketchup apps \
title="Sketchup 8" \
publisher="Google" \
year="2010" \
year="2012" \
media="download" \
file1="GoogleSketchUpWEN.exe" \
installed_exe1="$W_PROGRAMS_X86_WIN/Google/Google SketchUp 8/SketchUp.exe"
load_sketchup()
{
w_download http://dl.google.com/sketchup/GoogleSketchUpWEN.exe 8a7e270c54eb3b6def797547becd02809ef6e439
w_download http://dl.google.com/sketchup/GoogleSketchUpWEN.exe f0628e6f05241f91e4f36d6be3b8685a408ad12b
cd "$W_CACHE/$W_PACKAGE"
w_ahk_do "
@ -9336,7 +9266,8 @@ load_wm9codecs()
# See http://www.microsoft.com/downloads/details.aspx?FamilyID=06fcaab7-dcc9-466b-b0c4-04db144bb601
# Used by direct calls from load_wmp9, so have to specify cache directory.
w_download_to wm9codecs http://download.microsoft.com/download/5/c/2/5c29d825-61eb-4b16-8eb8-58367d0464d5/WM9Codecs9x.exe 8b76bdcbea0057eb12b7966edab4b942ddacc253
# http://birds.camden.rutgers.edu/
w_download_to wm9codecs http://birds.camden.rutgers.edu/WM9Codecs9x.exe 8b76bdcbea0057eb12b7966edab4b942ddacc253
cd "$W_CACHE/wm9codecs"
w_set_winver win2k
w_try $WINE WM9Codecs9x.exe $W_UNATTENDED_SLASH_Q
@ -9403,7 +9334,7 @@ w_metadata wmp10 dlls \
title="Windows Media Player 10" \
publisher="Microsoft" \
year="2006" \
media="download" \
media="manual_download" \
file1="MP10Setup.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/l3codecp.acm"
@ -9416,7 +9347,7 @@ load_wmp10()
w_call wsh57
# http://www.microsoft.com/downloads/en/details.aspx?FamilyID=b446ae53-3759-40cf-80d5-cde4bbe07999
w_download http://download.microsoft.com/download/1/2/A/12A31F29-2FA9-4F50-B95D-E45EF7013F87/MP10Setup.exe 69862273a5d9d97b4a2e5a3bd93898d259e86657
w_download_manual http://www.softpedia.com/get/Multimedia/Audio/Audio-Players/Windows-Media-Player.shtml MP10Setup.exe 69862273a5d9d97b4a2e5a3bd93898d259e86657
# Crashes on exit, but otherwise ok; see http://bugs.winehq.org/show_bug.cgi?id=12633
cd "$W_CACHE"/wmp10
@ -16993,6 +16924,52 @@ _EOF_
w_try_regedit "$W_TMP"/set-gfs.reg
}
w_metadata windowmanagerdecorated=y settings \
title="Allow the window manager to decorate windows (default)"
w_metadata windowmanagerdecorated=n settings \
title="Prevent the window manager from decorating windows"
load_windowmanagerdecorated()
{
case $1 in
y|n) arg=$1;;
*) w_die "illegal value $1 for Decorated";;
esac
echo "Setting Decorated to $arg"
cat > "$W_TMP"/set-wmd.reg <<_EOF_
REGEDIT4
[HKEY_CURRENT_USER\Software\Wine\X11 Driver]
"Decorated"="$arg"
_EOF_
w_try_regedit "$W_TMP"/set-wmd.reg
}
w_metadata windowmanagermanaged=y settings \
title="Allow the window manager to control windows (default)"
w_metadata windowmanagermanaged=n settings \
title="Prevent the window manager from controling windows"
load_windowmanagermanaged()
{
case $1 in
y|n) arg=$1;;
*) w_die "illegal value $1 for Managed";;
esac
echo "Setting Managed to $arg"
cat > "$W_TMP"/set-wmm.reg <<_EOF_
REGEDIT4
[HKEY_CURRENT_USER\Software\Wine\X11 Driver]
"Managed"="$arg"
_EOF_
w_try_regedit "$W_TMP"/set-wmm.reg
}
#----------------------------------------------------------------
# Other settings
@ -17899,6 +17876,12 @@ then
winetricks_volname ${1#volnameof=}
;;
"")
if test x"$DISPLAY" = x""
then
echo "DISPLAY not set, not defaulting to gui"
winetricks_usage
exit 0
fi
# GUI case
# No non-option arguments given, so read them from GUI, and loop until user quits
winetricks_detect_gui