diff --git a/wine-1.9.0.tar.bz2 b/wine-1.9.0.tar.bz2 deleted file mode 100644 index c560320..0000000 --- a/wine-1.9.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b72221ac97e77616a4fee39961e26d6714109aa35d7e465ab83e2eb42663d5f9 -size 22849440 diff --git a/wine-1.9.0.tar.bz2.sign b/wine-1.9.0.tar.bz2.sign deleted file mode 100644 index 1c7aa92..0000000 --- a/wine-1.9.0.tar.bz2.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJWfXiJAAoJEM76yOqvF1Gd0cMQAKRu7h8Jvx3KINRTz15OOjtA -Qf7qN4g12cxBTo3miP/qJT6FWI1S+QjL4KQt+0+1TiKdA4Dlz4Rck9vYQq3WIjAc -1lr8D7AmNCCZhrCBHgdzfzqCiRoFoZ0QWt4vKVt2CBXVKfx0S+rzvvFlGkGtOXGO -aLV6tJh3n39OEY2xz9IRxb98+NA76Ctj3Cm1CTEiQOuYgZUCHWcO0Lx5C1CRJ0IT -ICpgwr6+hZgyNurnjTH9pt56qKKdo+cDfPwV72y27XYShrXaFEkETyoJoVgC7DGh -ZbKe2vvGkfmK3ALP/qd8LwYPOtqovqdbmrsYQnUdyO0FBSPzdH1xy6iWYiXhRv7u -0gSiVaWY/jBGJ67ki0kMfJsp593EOr3eX8wc/59XW0CWXgiGNlE4wWiFEEGmVV8q -dezUSrymwfvyPAf3OH6EBNiJd8AGYe6Cmn3z/QgxvBe3/AscIzq9D6U+/Eq5Gy8I -aPICiXsoDe7zuMN2kUwXxSBYNe6r1KgNIncnnCk4ZTVhRJ2QfrTPu8SoNrevRZ5s -6BeECYra9mPsY0vh9F+pHpb+v/8apHAXHI5SgMs1xcEyGHqUOCrKLeX/GBS/6oSX -Gm2gmtUAFJE7kCF5ehHxU7zV/RO1KPafs6tYE9zdKnWdHEyf4+Lym6Txom98BYIk -wLtMCk3SoOWhnDXznhSA -=jyxe ------END PGP SIGNATURE----- diff --git a/wine-1.9.1.tar.bz2 b/wine-1.9.1.tar.bz2 new file mode 100644 index 0000000..cb0b338 --- /dev/null +++ b/wine-1.9.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b3265fb9ae82ddf1b3629bac61bd2340b7b4cfa7210f696c679e8e4a5b80bb6 +size 22909563 diff --git a/wine-1.9.1.tar.bz2.sign b/wine-1.9.1.tar.bz2.sign new file mode 100644 index 0000000..dd3cf10 --- /dev/null +++ b/wine-1.9.1.tar.bz2.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJWkNNhAAoJEM76yOqvF1Gdg6MP/Rp6euY1HMsw6X5pfbEndZKb +mzQ8q2xy0uINj11T5PQR3tFdBiTe87ukPL8l9G/sVuYVA/1DG7RtiPC6YeD6LAry +2DwNqyxcqdxQlZ/7tWhcMXd6/sDZKj/DgVC1wBtMPdfPcTB1cMsVnFE67+rzrzdv +f0ONEEGEAUcD2Xjpt0fdV6l8KXLMeeM6QfYJJas7qR/ENjhj2rjGIT+A8maW2TVG +A+SkhzrPODz+3yOKnMsZgM0P9sGFiLgw4cw7GJ1v7ksvIatAfM5Krdj5nldNOf9J +E8BBqaseXYx7P2nQ1UQDeQ70qEOovGUxpaDlqrnK3TkmITMWM23qJr56XLuRNCbG +g/BMF6zYnmj7AbjLd7em410yQQlZx2n6QbLBT7RxUtp4a8jFzXZ7KjvHqx5Qwc/i ++8MoqTg5JmL3IcPTec0WVARzAA6wyxwlqrgfORtJ3909QD+fnQO8sSTY7ayjsYyg +AauyEzTcZQHyAKPCW2jgRtuOTRc3yXWPqNAQJsP7j9KntPkytwn7cts+mtWP7zWz +RNQQHK1lJWBRB/IUT0fBo+Sp8cCvbvwimVIBt/ldKE/6f8Q0YwleABvxxTZcfIW+ +ydyfv1caLNP0JCbhhNszUh1HUVFcZ8Bh4oDbbSAqwb/rmZnIU0i5khiVWQYneqI5 ++3RQnJ1DXcOLD3Xle27z +=V0+/ +-----END PGP SIGNATURE----- diff --git a/wine.changes b/wine.changes index 1072b09..e948999 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Jan 9 10:22:46 UTC 2016 - meissner@suse.com + +- Updated to 1.9.1 development snapshot + - A few more deferred fixes. + - Support for debug registers on x86-64. + - More Shader Model 4 instructions. + - Support for the Mingw ARM toolchain. + - Various bug fixes. +- updated winetricks + ------------------------------------------------------------------- Fri Dec 25 18:20:27 UTC 2015 - meissner@suse.com diff --git a/wine.spec b/wine.spec index 09d7855..df057f9 100644 --- a/wine.spec +++ b/wine.spec @@ -1,7 +1,7 @@ # # spec file for package wine # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -53,8 +53,8 @@ BuildRequires: sane-backends-devel BuildRequires: update-desktop-files BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel -%define realver 1.9.0 -Version: 1.9.0 +%define realver 1.9.1 +Version: 1.9.1 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ diff --git a/winetricks b/winetricks index eb4fd52..8b0bf79 100644 --- a/winetricks +++ b/winetricks @@ -2,7 +2,7 @@ # Name of this version of winetricks (YYYYMMDD) # (This doesn't change often, use the sha1sum of the file when reporting problems) -WINETRICKS_VERSION=20151110 +WINETRICKS_VERSION=20151227 # This is a utf-8 file # You should see an o with two dots over it here [รถ] @@ -573,6 +573,7 @@ w_dotnet_verify() dotnet35sp1) version="3.5 SP1" ;; dotnet40) version="4 Client" ;; dotnet45) version="4.5" ;; + dotnet452) version="4.5.2" ;; *) echo error ; exit 1 ;; esac w_call dotnet_verifier @@ -1929,6 +1930,7 @@ w_wine_version() 1.6|1.6-rc*) _W_minor=6; _W_micro=0;; 1.6.*) _W_minor=6; _W_micro=`echo $2 | sed 's/.*\.//'`;; 1.7.*) _W_minor=7; _W_micro=`echo $2 | sed 's/.*\.//'`;; + 1.8.*) _W_minor=8; _W_micro=`echo $2 | sed 's/.*\.//'`;; *) w_die "bug: unrecognized version $2";; esac @@ -4385,9 +4387,11 @@ load_adobeair() # 2014-03-01: 4.0 sha1sum 0034bdd4e0b2ce0fa6198b0b715fba85754d9a57 # http://helpx.adobe.com/en/flash-player/release-note/fp_12_air_4_release_notes.html # 2014-09-30: 15.0 sha1sum 46341f1358bc6e0b9ddeae3591662a2ac68dc360 - # 2014-11-24: i15.0.0.356 sha1sum c0e6b8b1ed5ffa282945d21b21f8a5e03febc904 + # 2014-11-24: 15.0.0.356 sha1sum c0e6b8b1ed5ffa282945d21b21f8a5e03febc904 # 2015-11-06: 19.x sha1sum 3bc2a568204a3a9b59ca347ab49585f0c5fab279 - w_download http://airdownload.adobe.com/air/win/download/19.0/AdobeAIRInstaller.exe 3bc2a568204a3a9b59ca347ab49585f0c5fab279 + # 2015-12-27: 20.0 sha1sum 9c10b7be43771869c381c73197c9a0fcd1b727cf + # 2015-12-29: 20.0.0.233 (had to check with strings on Adobe AIR.dll) sha1sum 7161fb8b47721485882f52720f8b41dbfe3b69d0 + w_download http://airdownload.adobe.com/air/win/download/20.0/AdobeAIRInstaller.exe 7161fb8b47721485882f52720f8b41dbfe3b69d0 cd "$W_CACHE"/adobeair w_try "$WINE" AdobeAIRInstaller.exe $W_UNATTENDED_DASH_SILENT } @@ -4516,9 +4520,11 @@ 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 $WINETRICKS_SOURCEFORGE/pocmin/Win%2095_98%20Controls/Win%2095_98%20Controls/CC32inst.exe 94c3c494258cc54bd65d2f0153815737644bffde cc32inst.exe + # 2011-01-17: http://www.microsoft.com/downloads/details.aspx?familyid=6f94d31a-d1e0-4658-a566-93af0d8d4a1e + # 2012-08-11: w_download http://download.microsoft.com/download/platformsdk/redist/5.80.2614.3600/w9xnt4/en-us/cc32inst.exe 94c3c494258cc54bd65d2f0153815737644bffde + # 2016/01/07: w_download ftp://ftp.ie.debian.org/disk1/download.sourceforge.net/pub/sourceforge/p/po/pocmin/Win%2095_98%20Controls/Win%2095_98%20Controls/CC32inst.exe + + w_download ftp://ftp.ie.debian.org/disk1/download.sourceforge.net/pub/sourceforge/p/po/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 "$W_TMP" "$W_TMP"/comctl32.exe @@ -4614,8 +4620,12 @@ w_metadata binkw32 dlls \ load_binkw32() { # Mirror: http://www.dlldump.com/download-dll-files_new.php/dllfiles/B/binkw32.dll/1.0q/download.html - # Checksum of the decompressed file: 613f81f82e12131e86ae60dd318941f40db2200f - w_download http://www.down-dll.com/dll/b/__32-binkw32.dll3.0.0.0.zip 991f77e8df513ccb8663dc4a2753fbf90338ef5c + # Sha1sum of the decompressed file: 613f81f82e12131e86ae60dd318941f40db2200f + # + # Zip sha1sum: + # 2015-03-28: 991f77e8df513ccb8663dc4a2753fbf90338ef5c + # 2015-12-27: 6a30900885390ef361dbb67444a7944143db36bf + w_download http://www.down-dll.com/dll/b/__32-binkw32.dll3.0.0.0.zip 6a30900885390ef361dbb67444a7944143db36bf w_try_unzip "$W_TMP" "$W_CACHE"/binkw32/__32-binkw32.dll3.0.0.0.zip w_try cp "$W_TMP"/binkw32.dll "$W_SYSTEM32_DLLS"/binkw32.dll @@ -5685,7 +5695,7 @@ w_metadata dotnet30 dlls \ publisher="Microsoft" \ year="2006" \ media="download" \ - conflicts="dotnet11 dotnet20sp1 dotnet20sp2 dotnet30sp1 dotnet35 dotnet35sp1 dotnet45" \ + conflicts="dotnet11 dotnet20sp1 dotnet20sp2 dotnet30sp1 dotnet35 dotnet35sp1 dotnet45 dotnet452" \ file1="dotnetfx3.exe" \ installed_file1="c:/windows/Microsoft.NET/Framework/v3.0/Microsoft .NET Framework 3.0/logo.bmp" @@ -6042,6 +6052,63 @@ verify_dotnet45() w_dotnet_verify dotnet45 } +#---------------------------------------------------------------- + +w_metadata dotnet452 dlls \ + title="MS .NET 4.5.2" \ + publisher="Microsoft" \ + year="2012" \ + media="download" \ + conflicts="dotnet20 dotnet20sdk dotnet20sp1 dotnet20sp2 dotnet35sp1 dotnet40 dotnet45 vjrun20" \ + file1="dotnetfx45_full_x86_x64.exe" \ + installed_file1="c:/windows/Microsoft.NET/Framework/v4.0.30319/Microsoft.Windows.ApplicationServer.Applications.45.man" + +load_dotnet452() +{ + if [ $W_ARCH = win64 ] + then + w_warn "This package may not work on a 64-bit installation" + fi + + # http://www.microsoft.com/download/en/details.aspx?id=17718 + w_download http://download.microsoft.com/download/E/2/1/E21644B5-2DF2-47C2-91BD-63C560427900/NDP452-KB2901907-x86-x64-AllOS-ENU.exe 89f86f9522dc7a8a965facce839abb790a285a63 + + w_call remove_mono + + # Remove Mono registry entry: + "$WINE" reg delete "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4" /f + + w_try rm -f "$W_WINDIR_UNIX/system32/mscoree.dll" + + # See https://appdb.winehq.org/objectManager.php?sClass=version&iId=25478 for Focht's recipe + w_call dotnet35 + w_call dotnet40 + w_set_winver win7 + + cd "$W_CACHE/$W_PACKAGE" + + WINEDLLOVERRIDES=fusion=b "$WINE" NDP452-KB2901907-x86-x64-AllOS-ENU.exe ${W_OPT_UNATTENDED:+/q /c:"install.exe /q"} + status=$? + + case $status in + 0) ;; + 105) echo "exit status $status - normal, user selected 'restart now'" ;; + 194) echo "exit status $status - normal, user selected 'restart later'" ;; + *) w_die "exit status $status - $W_PACKAGE installation failed" ;; + esac + + w_override_dlls native mscoree + + w_warn "Setting Windows version to 2003, otherwise applications using .NET 4.5 will subtly fail" + w_set_winver win2k3 +} + +verify_dotnet452() +{ + w_dotnet_verify dotnet452 +} + + #---------------------------------------------------------------- w_metadata dotnet_verifier dlls \ @@ -6059,7 +6126,8 @@ load_dotnet_verifier() # 2014/01/23: sha1sum 8818f3460826145e2a66bb91727afa7cd531037b # 2014/11/22: sha1sum 47de0b849c4c3d354df23588c709108e7816d788 # 2015/07/31: sha1sum 32f24526a5716737281dc260451b60a641b23c7e - w_download http://blogs.msdn.com/cfs-file.ashx/__key/CommunityServer-Components-PostAttachments/00-08-99-90-04/netfx_5F00_setupverifier_5F00_new.zip 32f24526a5716737281dc260451b60a641b23c7e + # 2015/12/27: sha1sum b9712da2943e057668f21f68c473657a205c5cb8 + w_download http://blogs.msdn.com/cfs-file.ashx/__key/CommunityServer-Components-PostAttachments/00-08-99-90-04/netfx_5F00_setupverifier_5F00_new.zip b9712da2943e057668f21f68c473657a205c5cb8 cd "$W_CACHE"/dotnet_verifier @@ -7594,8 +7662,9 @@ load_shockwave() { # 2015-04-27 sha1sum: 244e6a5c5fa2dd26c136bc5b402f6cad588763d7 # 2015-08-02 sha1sum: e2efa2eb7db0a6de08905cd61bb3efcf58fda994 # 2015-11-09 sha1sum: d13420a6fdc4f8d9c45c5ee6767974f0f0054cdc + # 2015-12-27 sha1sum: 3ac6d85e54dffb2940c89fc10e63363a47ec96d0 - w_download http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi d13420a6fdc4f8d9c45c5ee6767974f0f0054cdc + w_download http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi 3ac6d85e54dffb2940c89fc10e63363a47ec96d0 cd "$W_CACHE"/shockwave w_try "$WINE" msiexec /i sw_lic_full_installer.msi $W_UNATTENDED_SLASH_Q } @@ -8793,17 +8862,17 @@ w_metadata corefonts fonts \ load_corefonts() { # FIXME: why is this commented out? Should be removed or enabled. - #w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/andale32.exe c4db8cbe42c566d12468f5fdad38c43721844c69 - w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/arial32.exe 6d75f8436f39ab2da5c31ce651b7443b4ad2916e - w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/arialb32.exe d45cdab84b7f4c1efd6d1b369f50ed0390e3d344 - w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/comic32.exe 2371d0327683dcc5ec1684fe7c275a8de1ef9a51 - w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/courie32.exe 06a745023c034f88b4135f5e294fece1a3c1b057 - w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/georgi32.exe 90e4070cb356f1d811acb943080bf97e419a8f1e - w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/impact32.exe 86b34d650cfbbe5d3512d49d2545f7509a55aad2 - w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/times32.exe 20b79e65cdef4e2d7195f84da202499e3aa83060 - w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/trebuc32.exe 50aab0988423efcc9cf21fac7d64d534d6d0a34a - w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/verdan32.exe f5b93cedf500edc67502f116578123618c64a42a - w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/webdin32.exe 2fb4a42c53e50bc70707a7b3c57baf62ba58398f + #w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/andale32.exe c4db8cbe42c566d12468f5fdad38c43721844c69 + w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/arial32.exe 6d75f8436f39ab2da5c31ce651b7443b4ad2916e + w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/arialb32.exe d45cdab84b7f4c1efd6d1b369f50ed0390e3d344 + w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/comic32.exe 2371d0327683dcc5ec1684fe7c275a8de1ef9a51 + w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/courie32.exe 06a745023c034f88b4135f5e294fece1a3c1b057 + w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/georgi32.exe 90e4070cb356f1d811acb943080bf97e419a8f1e + w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/impact32.exe 86b34d650cfbbe5d3512d49d2545f7509a55aad2 + w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/times32.exe 20b79e65cdef4e2d7195f84da202499e3aa83060 + w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/trebuc32.exe 50aab0988423efcc9cf21fac7d64d534d6d0a34a + w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/verdan32.exe f5b93cedf500edc67502f116578123618c64a42a + w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/webdin32.exe 2fb4a42c53e50bc70707a7b3c57baf62ba58398f # Natively installed versions of these fonts will cause the installers # to exit silently. Because there are apps out there that depend on the @@ -9884,6 +9953,7 @@ load_ie6() # Unregister Wine IE if [ ! -f "$W_SYSTEM32_DLLS"/plugin.ocx ] then + w_override_dlls builtin iexplore.exe w_try "$WINE" iexplore -unregserver fi @@ -9964,24 +10034,27 @@ w_metadata ie7 dlls \ load_ie7() { - if w_workaround_wine_bug 21947 "Working around heap corruption (see also bug 26016)" 1.7.19, - then - echo "This fails in about 1 of 30 runs (see bug 26016), just retry if that happens" - fi - # Unregister Wine IE if grep -q -i "wine placeholder" "$W_PROGRAMS_X86_UNIX/Internet Explorer/iexplore.exe" then + w_override_dlls builtin iexplore.exe w_try "$WINE" iexplore -unregserver fi # Change the override to the native so we are sure we use and register them - w_override_dlls native,builtin iexplore.exe itircl itss jscript mshtml msimtf shdoclc shdocvw shlwapi urlmon wininet xmllite + w_override_dlls native,builtin itircl itss jscript mshtml msimtf shdoclc shdocvw shlwapi urlmon wininet xmllite + + # IE7 installer will check version the number of iexplore.exe which causes IE7 installer to fail on wine-1.9.0+ + w_override_dlls native iexplore.exe # Bundled updspapi cannot work on wine w_override_dlls builtin updspapi # Remove the fake dlls from the existing WINEPREFIX + if [ -f "$W_PROGRAMS_X86_UNIX/Internet Explorer/iexplore.exe" ] + then + mv "$W_PROGRAMS_X86_UNIX/Internet Explorer/iexplore.exe" "$W_PROGRAMS_X86_UNIX/Internet Explorer/iexplore.exe.bak" + fi for dll in itircl itss jscript mshtml msimtf shdoclc shdocvw shlwapi urlmon do test -f "$W_SYSTEM32_DLLS"/$dll.dll && @@ -9996,6 +10069,15 @@ load_ie7() mkdir -p "$W_SYSTEM32_DLLS"/catroot/\{f750e6c3-38ee-11d1-85e5-00c04fc295ee\} w_try cp -f "$W_CACHE"/ie7/winetest.cat "$W_SYSTEM32_DLLS"/catroot/\{f750e6c3-38ee-11d1-85e5-00c04fc295ee\}/oem0.cat + # KLUDGE: if / is writable (as on MacOSX?), having a z: mapping to it + # causes ie7 to put temporary directories on Z:\ + # so hide it temporarily. This is not very robust! + if test -w / + then + rm -f "$WINEPREFIX/dosdevices/z:.bak_wt" + mv "$WINEPREFIX/dosdevices/z:" "$WINEPREFIX/dosdevices/z:.bak_wt" + fi + # Install w_download http://download.microsoft.com/download/3/8/8/38889DC1-848C-4BF2-8335-86C573AD86D9/IE7-WindowsXP-x86-enu.exe d39b89c360fbaa9706b5181ae4718100687a5326 if test "$W_UNATTENDED_SLASH_Q" = "" @@ -10006,21 +10088,7 @@ load_ie7() fi cd "$W_CACHE"/ie7 - # KLUDGE: if / is writable (as on MacOSX?), having a z: mapping to it - # causes ie7 to put temporary directories on Z:\ - # so hide it temporarily. This is not very robust! - if test -w / - then - rm -f "$WINEPREFIX/dosdevices/z:.bak_wt" - mv "$WINEPREFIX/dosdevices/z:" "$WINEPREFIX/dosdevices/z:.bak_wt" - fi - - if w_workaround_wine_bug 21947 "Working around heap corruption (see also bug 26016)" 1.7.19, - then - WINEDEBUG=warn+heap "$WINE" IE7-WindowsXP-x86-enu.exe $quiet - else - "$WINE" IE7-WindowsXP-x86-enu.exe $quiet - fi + "$WINE" IE7-WindowsXP-x86-enu.exe $quiet # IE7 exits with 194 to signal a reboot status=$? @@ -10031,7 +10099,6 @@ load_ie7() *) w_die "exit status $status - $W_PACKAGE installation failed" ;; esac - if test -w / then # END KLUDGE: restore z:, assuming user didn't kill us @@ -10083,18 +10150,26 @@ load_ie8() if grep -q -i "wine placeholder" "$W_PROGRAMS_X86_UNIX/Internet Explorer/iexplore.exe" #if [ ! -f "$W_SYSTEM32_DLLS"/plugin.ocx ] then + w_override_dlls builtin iexplore.exe w_try "$WINE" iexplore -unregserver fi w_call msls31 # Change the override to the native so we are sure we use and register them - w_override_dlls native,builtin iexplore.exe itircl itss jscript msctf mshtml shdoclc shdocvw shlwapi urlmon wininet xmllite + w_override_dlls native,builtin itircl itss jscript msctf mshtml shdoclc shdocvw shlwapi urlmon wininet xmllite + + # IE8 installer will check version the number of iexplore.exe which causes IE8 installer to fail on wine-1.9.0+ + w_override_dlls native iexplore.exe # Bundled updspapi cannot work on wine w_override_dlls builtin updspapi # Remove the fake dlls from the existing WINEPREFIX + if [ -f "$W_PROGRAMS_X86_UNIX/Internet Explorer/iexplore.exe" ] + then + mv "$W_PROGRAMS_X86_UNIX/Internet Explorer/iexplore.exe" "$W_PROGRAMS_X86_UNIX/Internet Explorer/iexplore.exe.bak" + fi for dll in browseui.dll inseng.dll itircl itss jscript msctf mshtml shdoclc shdocvw shlwapi urlmon do test -f "$W_SYSTEM32_DLLS"/$dll.dll && @@ -10902,7 +10977,8 @@ load_steam() # 11 Dec 2014 7ad8fbeffa6c963b821f80129c15c9d8e85f9a4a # 6 Jan 2015 e04aefe8bc894f11f211edec8e8a008abe0147d2 # 21 Jun 2015 0e8046d40c38d817338135ec73a5b217cc340cf5 - w_download http://media.steampowered.com/client/installer/SteamSetup.exe 0e8046d40c38d817338135ec73a5b217cc340cf5 + # 29 Dec 2015 728e3c82fd57c68cbbdb64965719081ffee6272c + w_download http://media.steampowered.com/client/installer/SteamSetup.exe 728e3c82fd57c68cbbdb64965719081ffee6272c cd "$W_CACHE"/steam # Install corefonts first, so if the user doesn't have cabextract/Wine with cab support, we abort before installing Steam.