diff -Nru winetricks-0.0+20100618/debian/changelog winetricks-0.0+20100731/debian/changelog --- winetricks-0.0+20100618/debian/changelog 2010-06-20 07:03:34.000000000 +0100 +++ winetricks-0.0+20100731/debian/changelog 2010-08-01 04:43:41.000000000 +0100 @@ -1,3 +1,9 @@ +winetricks (0.0+20100731-0ubuntu1) lucid; urgency=low + + * New upstream version + + -- Scott Ritchie Sat, 31 Jul 2010 20:43:20 -0700 + winetricks (0.0+20100618-0ubuntu1) lucid; urgency=low * New upstream version diff -Nru winetricks-0.0+20100618/winetricks winetricks-0.0+20100731/winetricks --- winetricks-0.0+20100618/winetricks 2010-06-19 00:13:54.000000000 +0100 +++ winetricks-0.0+20100731/winetricks 2010-08-01 00:26:32.000000000 +0100 @@ -20,7 +20,7 @@ #---- Constants ------------------------------------------------- # Name of this version of winetricks (YYYYMMDD) -VERSION=20100618 +VERSION=20100731 early_wine() { @@ -56,8 +56,8 @@ mkdir -p $WINETRICKS_TMP # Handle case where z: doesn't exist -if test "$WINETRICKS_CACHE_WIN" = "" -then +case "$WINETRICKS_CACHE_WIN" in +""|*\?\\unix*) # WINETRICKS_CACHE isn't accessible via a drive letter mapping, so make one, # but be sure to clean it up later. for letter in y x w v u t s r q @@ -69,7 +69,8 @@ break fi done -fi + ;; +esac # Overridden for windows ISO_MOUNT_ROOT=/mnt/winetricks @@ -190,7 +191,7 @@ echo " d3dxof MS d3dxof.dll (from DirectX user redistributable)" echo " dcom98 MS DCOM (ole32, oleaut32); requires Windows 98 license, but does not check for one" echo " dinput8 MS dinput8.dll (from DirectX 9 user redistributable)" - echo " dirac0.8 the obsolete Dirac 0.8 directshow filter" + echo " dirac the Dirac directshow filter" echo " directmusic MS DirectMusic (from DirectX 9 user redistributable)" echo " directplay MS DirectPlay (from DirectX 9 user redistributable)" echo " directx9 MS DirectX 9 user redistributable (not recommended! use d3dx9 instead)" @@ -206,6 +207,8 @@ echo " dotnet30 MS .NET 3.0 (requires Windows license, but does not check for one, might not work yet)" echo " droid Droid fonts (on LCD, looks better with fontsmooth-rgb)" echo " dxsdk_nov2006 DirectX Software Development Kit, November 2006 version" + echo " eadm EA Download Manager" + echo " eufonts Updated fonts for Romanian and Bulgarian" echo " ffdshow ffdshow video codecs" echo " firefox Firefox web browser" echo " flash Adobe Flash Player ActiveX and firefox plugins" @@ -218,9 +221,12 @@ echo " gdiplus MS gdiplus.dll" echo " gecko-dbg The HTML rendering Engine (Mozilla), with debugging symbols" echo " gecko The HTML rendering Engine (Mozilla)" + echo " gfw MS Game For Windows Live (xlive.dll)" + echo " glut The glut utility library" echo " hosts Adds empty C:\windows\system32\drivers\etc\{hosts,services} files" echo " ie6 Microsoft Internet Explorer 6.0" echo " ie7 Microsoft Internet Explorer 7.0" + echo " ie8 Microsoft Internet Explorer 8.0" echo " jet40 MS Jet 4.0 Service Pack 8" echo " kde KDE for Windows installer" echo " liberation Red Hat Liberation fonts (Sans, Serif, Mono)" @@ -261,6 +267,8 @@ echo " riched20 MS riched20 and riched32" echo " riched30 MS riched30" echo " richtx32 MS Rich TextBox Control 6.0" + echo " safari Apple Safari web browser" + echo " secur32 MS secur32" echo " shockwave Adobe Shockwave Player" echo " steam Steam Client App from Valve" echo " tahoma MS Tahoma font (not part of corefonts)" @@ -298,7 +306,7 @@ echo "Pseudopackages:" echo " alldlls=builtin Force use of builtin dlls (even if loaded with absolute path) (except for msvcp80 and d3dx9_*)" echo " alldlls=default Remove all DLL overrides" - echo " allfonts All listed fonts (corefonts, tahoma, liberation)" + echo " allfonts All listed fonts (corefonts, droid, eufonts, tahoma, liberation)" echo " allcodecs All listed codecs (xvid, ffdshow)" echo " ddr=gdi Set DirectDrawRenderer to GDI (default)" echo " ddr=opengl Set DirectDrawRenderer to OpenGL" @@ -343,7 +351,7 @@ echo " volnum Rename drive_c to harddiskvolume0 (needed by some installers)" echo " mwo=force Set MouseWarpOverride to force (needded by some games" echo " mwo=enabled Set MouseWarpOverride to enabled (default)" - echo " mwo=disabled Set MouseWarpOverride to disabled" + echo " mwo=disable Set MouseWarpOverride to disable" echo " npm-repack Set NonPower2Mode to repack" echo " psm=on Set PixelShaderMode to enabled" echo " psm=off Set PixelShaderMode to disabled" @@ -943,10 +951,11 @@ # corefonts is necessary to avoid an installer crash. load_corefonts - # Adobe AIR 1.5.3 runtime + # Adobe AIR 2.0.2 runtime # 2010-02-02: sha1sum 5c95f51a680f8c175a92755238127be4ad22c53b # 2010-02-20: sha1sum 6f03e723bd855abbe00eb8fdf22da54fb49c62db - download . http://airdownload.adobe.com/air/win/download/1.5.3/AdobeAIRInstaller.exe 6f03e723bd855abbe00eb8fdf22da54fb49c62db + # 2010-07-29: sha1sum 7b93aedaf48ad7854940e7a4e7d9394a255e888b + download . http://airdownload.adobe.com/air/win/download/2.0.2/AdobeAIRInstaller.exe 7b93aedaf48ad7854940e7a4e7d9394a255e888b try $WINE "$WINETRICKS_CACHE"/AdobeAIRInstaller.exe $WINETRICKS_UNIXSILENT } @@ -1004,8 +1013,8 @@ #---------------------------------------------------------------- load_cmake() { - download . http://www.cmake.org/files/v2.6/cmake-2.6.4-win32-x86.exe 00bd502423546b8bce19ffc180ea78e0e2f396cf - try $WINE "$WINETRICKS_CACHE"/cmake-2.6.4-win32-x86.exe + download . http://www.cmake.org/files/v2.8/cmake-2.8.2-win32-x86.exe 2c46f4e804787b231c2f45e1b43f1838462e8dfe + try $WINE "$WINETRICKS_CACHE"/cmake-2.8.2-win32-x86.exe } #---------------------------------------------------------------- @@ -1234,9 +1243,9 @@ #---------------------------------------------------------------- -load_dirac08() { - download . http://codecpack.nl/dirac_dsfilter_080.exe aacfcddf6b2636de5f0a50422ba9155e395318af - try $WINE "$WINETRICKS_CACHE"/dirac_dsfilter_080.exe $WINETRICKS_SILENT +load_dirac() { + download . $SOURCEFORGE/dirac/Dirac%20Directshow%20Filter/Diract%20Direct%20Show%20Filter%201.0.2/DiracDirectShowFilter-1.0.2.exe c912d30a8fa500c7841444559feb1f49301611c4 + try $WINE "$WINETRICKS_CACHE"/DiracDirectShowFilter-1.0.2.exe } #---------------------------------------------------------------- @@ -1357,8 +1366,8 @@ # 7.0.? ad420bf8bf72e924e658c9c6ad6bba76b848fb79 as of 23 Sep 2009 as http://download.divx.com/divx/DivXInstaller.exe # 7.0.? 3385aa8f6ba64ae32e06f651bbbea247bcc1a44d as of 12 Dec 2009 as http://download.divx.com/divx/DivXInstaller.exe # d59422969a72790e92b6795e24e332f91ffacf94 as of 26 May 2010 as http://download.divx.com/divx/DivXInstaller.exe - - download divx-7 http://download.divx.com/divx/DivXInstaller.exe d59422969a72790e92b6795e24e332f91ffacf94 + # 3a2fe8ff2f9c5b5e527662af3badb42b460f6e62 as of 29 July 2010 as http://download.divx.com/divx/DivXInstaller.exe + download divx-7 http://download.divx.com/divx/DivXInstaller.exe 3a2fe8ff2f9c5b5e527662af3badb42b460f6e62 try $WINE "$WINETRICKS_CACHE"/divx-7/DivXInstaller } @@ -1566,7 +1575,7 @@ DROID_URL='http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts/' do_droid DroidSans-Bold.ttf "Droid Sans Bold" ada4e79c592f3c54546b7587b48f2b232d95ce2f - do_droid DroidSansFallback.ttf "Droid Sans Fallback" 2f8a266389a8e22f68f402b775731eec6b760334 + do_droid DroidSansFallback.ttf "Droid Sans Fallback" 5065cce92e8420232db95ab3ba421e462b09b965 do_droid DroidSansJapanese.ttf "Droid Sans Japanese" b3a248c11692aa88a30eb25df425b8910fe05dc5 do_droid DroidSansMono.ttf "Droid Sans Mono" f0815c6f36c72be1d0f2f5e2b82fa85c8bf95655 do_droid DroidSans.ttf "Droid Sans" da5b3c7758a2c8fbc4775beb69d7150493c7d312 @@ -1601,6 +1610,40 @@ #---------------------------------------------------------------- +load_eadm() { + download . http://akamai.cdn.ea.com/eamaster/u/f/eaonline/eadm/eadm-installer.exe 6b3d1a328af2d44033c24b84444992f56107b27f + load_adobeair + try $WINE "$WINETRICKS_CACHE"/eadm-installer.exe $WINETRICKS_S +} + +#---------------------------------------------------------------- + +load_eufonts() { + # https://www.microsoft.com/downloads/details.aspx?FamilyID=0ec6f335-c3de-44c5-a13d-a1e7cea5ddea&displaylang=en + download . http://download.microsoft.com/download/a/1/8/a180e21e-9c2b-4b54-9c32-bf7fd7429970/EUupdate.EXE 9b076c40cb63aa0d8512aa8e610ba11d3466e441 + try_cabextract -q --directory="$WINETRICKS_TMP" "$WINETRICKS_CACHE"/EUupdate.EXE + try cp -f "$WINETRICKS_TMP"/*.ttf "$winefontsdir" + + register_font ArialBI.ttf "Arial Bold Italic (TrueType)" + register_font ArialI.ttf "Arial Italic (TrueType)" + register_font Arial.ttf "Arial (TrueType)" + register_font TimesBd.ttf "Times New Roman Bold (TrueType)" + register_font TimesBI.ttf "Times New Roman Bold Italic (TrueType)" + register_font TimesI.ttf "Times New Roman Italic (TrueType)" + register_font Times.ttf "Times New Roman (TrueType)" + register_font trebucbd.ttf "Trebuchet Bold (TrueType)" + register_font trebucbi.ttf "Trebuchet Bold Italic (TrueType)" + register_font trebucit.ttf "Trebuchet Italic (TrueType)" + register_font trebuc.ttf "Trebuchet (TrueType)" + register_font Verdanab.ttf "Verdana Bold (TrueType)" + register_font Verdanai.ttf "Verdana Italian (TrueType)" + register_font Verdana.ttf "Verdana (TrueType)" + register_font Verdanaz.ttf "Verdana Bold Italic (TrueType)" + +} + +#---------------------------------------------------------------- + # Fake IE per workaround in http://bugs.winehq.org/show_bug.cgi?id=3453 # Just the first registry key works for most apps. # The App Paths part is required by a few apps, like Quickbooks Pro; @@ -1642,12 +1685,12 @@ #---------------------------------------------------------------- load_firefox() { - download . "http://releases.mozilla.org//pub/mozilla.org/firefox/releases/3.6.3/win32/en-US/Firefox%20Setup%203.6.3.exe" d9b028293fe56ff32f2c596fe9f2841100e701b6 "Firefox Setup 3.6.3.exe" + download . "http://releases.mozilla.org//pub/mozilla.org/firefox/releases/3.6.6/win32/en-US/Firefox%20Setup%203.6.6.exe" 16e35488871390cdb7b91bc20b1e85c452b418cb "Firefox Setup 3.6.6.exe" if [ "$WINETRICKS_QUIET"x = ""x ] then - try $WINE "$WINETRICKS_CACHE"/"Firefox Setup 3.6.3.exe" + try $WINE "$WINETRICKS_CACHE"/"Firefox Setup 3.6.6.exe" else - try $WINE "$WINETRICKS_CACHE"/"Firefox Setup 3.6.3.exe" -ms + try $WINE "$WINETRICKS_CACHE"/"Firefox Setup 3.6.6.exe" -ms fi } @@ -1683,9 +1726,14 @@ # 2009-12-09: sha1sum f4ec0e95099e354fd01cd3bb27c202f54932dc70 # 2010-02-20: sha1sum e05ca1999e820b3fa2ca16fc27bc65183d275681 # 2010-03-15: sha1sum 901b53ebe26c62c0bd7fc7dc400552ce335685bb - - download . http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_ax.exe 901b53ebe26c62c0bd7fc7dc400552ce335685bb - try $WINE "$WINETRICKS_CACHE"/install_flash_player_ax.exe $WINETRICKS_S + # 2010-06-24: sha1sum 6de519569137ec2ba3a4eed59f4052c4d944869c + download . http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_ax.exe 6de519569137ec2ba3a4eed59f4052c4d944869c + if [ $WINETRICKS_QUIET ] + then + try $WINE "$WINETRICKS_CACHE"/install_flash_player_ax.exe /install + else + try $WINE "$WINETRICKS_CACHE"/install_flash_player_ax.exe + fi # Mozilla / Firefox plugin # 2008-07-22: sha1sum 1e6f7627784a5b791e99ae9ad63133dc11c7940b @@ -1695,9 +1743,14 @@ # 2009-12-09: sha1sum ccb4811b1cc26721c4abb2e5a080868acdee7b87 # 2010-02-20: sha1sum f1df1ab84b61e7f2c3eea0a959d2115dd001816b # 2010-03-16: sha1sum e2fe55927c4068b0a07636742814682c0a2aa0fe - - download . http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player.exe e2fe55927c4068b0a07636742814682c0a2aa0fe - try $WINE "$WINETRICKS_CACHE"/install_flash_player.exe $WINETRICKS_S + # 2010-06-24: sha1sum a419339ada03076ea0a197b28011b87055c45478 + download . http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player.exe a419339ada03076ea0a197b28011b87055c45478 + if [ $WINETRICKS_QUIET ] + then + try $WINE "$WINETRICKS_CACHE"/install_flash_player.exe /install + else + try $WINE "$WINETRICKS_CACHE"/install_flash_player.exe + fi } #---------------------------------------------------------------- @@ -1985,6 +2038,26 @@ #---------------------------------------------------------------- +load_gfw() { + # http://www.microsoft.com/games/en-us/live/pages/livejoin.aspx + download . http://download.microsoft.com/download/5/5/8/55846E20-4A46-4EF8-B272-7F988BC9090A/gfwlivesetupmin.exe 6f9e0ba052c68c8b51bb0e3ce6024d0e1c7b20b2 + + # FIXME: Depends on .Net 20, but is it really needed? For now, skip it. + try $WINE "$WINETRICKS_CACHE"/gfwlivesetupmin.exe /nodotnet $WINETRICKS_QUIET + + # Now get msasn1.dll, which xlive.dll depends on: + # 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. + download . http://download.microsoft.com/download/E/6/A/E6A04295-D2A8-40D0-A0C5-241BFECD095E/W2KSP4_EN.EXE fadea6d94a014b039839fecc6e6a11c20afa4fa8 + cd "$WINETRICKS_TMP" + try_cabextract "$WINETRICKS_CACHE"/W2KSP4_EN.EXE i386/msasn1.dl_ + try cp msasn1.dll "$WINDIR"/system32 + try rm -rf i386 + cd "$olddir" +} + +#---------------------------------------------------------------- + load_glsl_disable() { echo "Disabling GLSL" cat > "$WINETRICKS_TMP"/disableglsl.reg <<_EOF_ @@ -2013,6 +2086,15 @@ #---------------------------------------------------------------- +load_glut() { + download . http://www.xmission.com/~nate/glut/glut-3.7.6-bin.zip fb4731885c05b3cf2c79e85aabe8fc9949616ef4 + try_unzip -o $WINETRICKS_UNIXQUIET -d "$DRIVE_C" "$WINETRICKS_CACHE"/glut-3.7.6-bin.zip + try cp "$DRIVE_C"/glut-3.7.6-bin/glut32.dll "$WINDIR"/system32 + warn "If you want to compile glut programs, add c:/glut-3.7.6-bin to LIB and INCLUDE" +} + +#---------------------------------------------------------------- + load_hosts() { # Create fake system32\drivers\etc\hosts and system32\drivers\etc\services files. # The hosts file is used to map network names to IP addresses without DNS. @@ -2057,7 +2139,10 @@ load_msls31 # Unregister Wine IE - try $WINE iexplore -unregserver + if [ ! -f "$WINDIR"/system32/plugin.ocx ] + then + try $WINE iexplore -unregserver + fi # Change the override to the native so we are sure we use and register them override_dlls native,builtin iexplore.exe itircl itss jscript mlang mshtml msimtf shdoclc shdocvw shlwapi urlmon @@ -2128,8 +2213,11 @@ load_ie7() { # Unregister Wine IE - try $WINE iexplore -unregserver - + if [ ! -f "$WINDIR"/system32/plugin.ocx ] + then + try $WINE iexplore -unregserver + fi + # Change the override to the native so we are sure we use and register them override_dlls native,builtin iexplore.exe itircl itss jscript mshtml msimtf shdoclc shdocvw shlwapi urlmon xmllite @@ -2189,6 +2277,79 @@ #---------------------------------------------------------------- +load_ie8() { + # Unregister Wine IE + if [ ! -f "$WINDIR"/system32/plugin.ocx ] + then + try $WINE iexplore -unregserver + fi + + load_msls31 + + # Change the override to the native so we are sure we use and register them + override_dlls native,builtin iexplore.exe itircl itss jscript msctf mshtml shdoclc shdocvw shlwapi urlmon xmllite + + # Bundled updspapi cannot work on wine + override_dlls builtin updspapi + + # Remove the fake dlls from the existing WINEPREFIX + for dll in browseui.dll inseng.dll itircl itss jscript msctf mshtml shdoclc shdocvw shlwapi urlmon + do + test -f "$WINDIR"/system32/$dll.dll && + mv "$WINDIR"/system32/$dll.dll "$WINDIR"/system32/$dll.dll.bak + done + + # See http://bugs.winehq.org/show_bug.cgi?id=16013 + # Find instructions to create this file in dlls/wintrust/tests/crypt.c + download . http://winezeug.googlecode.com/svn/trunk/winetricks_files/winetest.cat ac8f50dd54d011f3bb1dd79240dae9378748449f + + # Put a dummy catalog file in place + mkdir -p "$WINDIR"/system32/catroot/\{f750e6c3-38ee-11d1-85e5-00c04fc295ee\} + try cp -f "$WINETRICKS_CACHE"/winetest.cat "$WINDIR"/system32/catroot/\{f750e6c3-38ee-11d1-85e5-00c04fc295ee\}/oem0.cat + + # FIXME: According to http://www.wine-reviews.net/wine-reviews/microsoft/internet-explorer-8-on-linux-with-wine.html + # may also need native msctf, msimtf, and uxtheme + + # Install + download . http://download.microsoft.com/download/C/C/0/CC0BD555-33DD-411E-936B-73AC6F95AE11/IE8-WindowsXP-x86-ENU.exe e489483e5001f95da04e1ebf3c664173baef3e26 + if [ $WINETRICKS_QUIET ] + then + # FIXME: There's an option for /updates-noupdates to disable checking for updates, but that + # forces the install to fail on Wine. Not sure if it's an IE8 or Wine bug... + $WINE "$WINETRICKS_CACHE"/IE8-WindowsXP-x86-ENU.exe /quiet /forcerestart + else + $WINE "$WINETRICKS_CACHE"/IE8-WindowsXP-x86-ENU.exe + fi + + # Work around DLL registration bug until ierunonce/RunOnce/wineboot is fixed + # FIXME: whittle down this list + cd "$WINDIR"/system32/ + for i in actxprxy.dll browseui.dll browsewm.dll cdfview.dll ddraw.dll \ + dispex.dll dsound.dll iedkcs32.dll iepeers.dll iesetup.dll \ + imgutil.dll inetcomm.dll isetup.dll jscript.dll laprxy.dll \ + mlang.dll msctf.dll mshtml.dll mshtmled.dll msi.dll msimtf.dll msident.dll \ + msoeacct.dll msrating.dll mstime.dll msxml3.dll occache.dll \ + ole32.dll oleaut32.dll olepro32.dll pngfilt.dll quartz.dll \ + rpcrt4.dll rsabase.dll rsaenh.dll scrobj.dll scrrun.dll \ + shdocvw.dll shell32.dll urlmon.dll vbscript.dll webcheck.dll \ + wshcon.dll wshext.dll asctrls.ocx hhctrl.ocx mscomct2.ocx \ + plugin.ocx proctexe.ocx tdc.ocx uxtheme.dll webcheck.dll wshom.ocx + do + $WINE regsvr32 /i $i > /dev/null 2>&1 + done + + # Seeing is believing + if [ "$WINETRICKS_QUIET" = "" ] + then + warn "Starting ie8. To start it later, use the command $WINE '${programfilesdir_win}\\\\Internet Explorer\\\\iexplore'" + $WINE "${programfilesdir_win}\\Internet Explorer\\iexplore" http://www.winehq.org/ > /dev/null 2>&1 & + else + warn "To start ie8, use the command $WINE '${programfilesdir_win}\\\\Internet Explorer\\\\iexplore'. It doesn't work well yet though, see: http://bugs.winehq.org/show_bug.cgi?id=12433" + fi +} + +#---------------------------------------------------------------- + load_jet40() { # http://support.microsoft.com/kb/239114 # See also http://bugs.winehq.org/show_bug.cgi?id=6085 @@ -2411,8 +2572,8 @@ load_mono26() { # Load Mono, have it handle all .net requests - download . http://ftp.novell.com/pub/mono/archive/2.6.4/windows-installer/3/mono-2.6.4-gtksharp-2.12.10-win32-3.exe 08be379d1fe34c9ae1d389e60647506950cb07ba - try $WINE "$WINETRICKS_CACHE"/mono-2.6.4-gtksharp-2.12.10-win32-3.exe $WINETRICKS_SILENT + 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 + try $WINE "$WINETRICKS_CACHE"/mono-2.6.7-gtksharp-2.12.10-win32-2.exe $WINETRICKS_SILENT # FIXME: what should this be for mono 2.6? cat > "$WINETRICKS_TMP"/mono_2.0.reg <<_EOF_ @@ -2581,18 +2742,14 @@ load_ogg() { # flac, ogg, speex, vorbis, ogm source, ogg source - download . http://cross-lfs.org/~mlankhorst/oggcodecs_0.81.2.exe c9d10a8f1b65b9f3824e227333d66247e14fad4c - #try $WINE "$WINETRICKS_CACHE"/oggcodecs_0.81.2.exe $WINETRICKS_QUIET - # oh, and the new schroedinger direct show filter, too # see following URLs for more info + # http://xiph.org/dshow/ # http://www.diracvideo.org/ # http://cross-lfs.org/~mlankhorst/direct-schro.txt # http://www.diracvideo.org/git?p=direct-schro.git;a=summary - # Requires wine-1.1.1 - download . http://cross-lfs.org/~mlankhorst/direct-schro.dll - try cp "$WINETRICKS_CACHE"/direct-schro.dll "$WINDIR"/system32/direct-schro.dll - # This is currently broken. Maarten's not sure why. - try $WINE regsvr32 direct-schro.dll + + download . http://downloads.xiph.org/releases/oggdsf/opencodecs_0.84.17338.exe 6151ab79e6ae246208cdf707e080f01c93d95deb + try $WINE "$WINETRICKS_CACHE"/opencodecs_0.84.17338.exe $WINETRICKS_S } #---------------------------------------------------------------- @@ -2873,6 +3030,45 @@ #---------------------------------------------------------------- +load_secur32(){ + # http://www.microsoft.com/downloads/details.aspx?familyid=c4e408d7-6716-4a12-ad3a-8029667f5c84 + download . http://download.microsoft.com/download/6/9/5/69501788-B62F-44D8-933F-B6FAA576CA87/Windows2000-KB959426-x86-ENU.EXE bf930a4d2982165a0793465bb255d494ba5b4cf7 + try_cabextract "$WINETRICKS_CACHE"/Windows2000-KB959426-x86-ENU.EXE -d "$WINDIR"/system32 -F secur32.dll + override_dlls native,builtin secur32 +} + +#---------------------------------------------------------------- + +load_safari() { + + download . http://appldnld.apple.com.edgesuite.net/content.info.apple.com/Safari5/061-7138.20100607.Y7U87/SafariSetup.exe e56d5d79d9cfbb85ac46ac78aa497d7f3d8dbc3d + cd "$WINETRICKS_CACHE" + # Workaround http://bugs.winehq.org/show_bug.cgi?id=21146 + # FIXME: is this localized? + try mkdir -p "$DRIVE_C/users/$USER/Application Data/Apple Computer/Preferences" + cat > "$DRIVE_C/users/$USER/Application Data/Apple Computer/Preferences/com.apple.Safari.plist" <<_EOF_ + + + + + LastDisplayedWelcomePageVersionString + 4.0 + + +_EOF_ + + if test "$WINETRICKS_QUIET" + then + warn "Safari's silent install is broken under wine. See http://bugs.winehq.org/show_bug.cgi?id=23493. You should do a regular install if you want to use Safari." + try $WINE SafariSetup.exe /qn + else + try $WINE SafariSetup.exe + fi +} + + +#---------------------------------------------------------------- + load_shockwave() { # Not silent enough, use msi instead #download . http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/Shockwave_Installer_Full.exe 840e34e9b067cf247bfa9092665b8966158f38e3 @@ -2892,7 +3088,11 @@ load_steam() { download . http://storefront.steampowered.com/download/SteamInstall.msi a0ca8791b7b2e96665ee059e03eebbfb3d95be55 try $WINE msiexec /i "$WINETRICKS_CACHE"/SteamInstall.msi $WINETRICKS_QUIET - warn "Before running Steam, make sure you have corefonts installed, or it may crash; see wine bug 22751" + if ! test -f "$WINDIR/Fonts/Times.TTF" + then + warn "Installing corefonts to prvent a Steam crash; see wine bug 22751" + load_corefonts + fi warn "Once Steam is running, disable player notifications and in-game chat in Settings, or games will crash on launch; see wine bug 22053" } @@ -3581,8 +3781,8 @@ #---------------------------------------------------------------- load_vlc() { - download . http://www.videolan.org/mirror-geo-redirect.php?file=vlc/0.8.6f/win32/vlc-0.8.6f-win32.exe b83558e4232c47a385dbc93ebdc2e6b942fbcfbf - try $WINE "$WINETRICKS_CACHE"/vlc-0.8.6f-win32.exe $WINETRICKS_S + download . $SOURCEFORGE/vlc/vlc-1.1.0-win32.exe 501b6cb12d4916ed11ec9dac9e394add9227b3be + try $WINE "$WINETRICKS_CACHE"/vlc-1.1.0-win32.exe $WINETRICKS_S } #---------------------------------------------------------------- @@ -3900,7 +4100,7 @@ d3dxof) load_d3dxof;; dcom98) load_dcom98;; dinput8) load_dinput8;; - dirac|dirac0.8) load_dirac08;; + dirac) load_dirac;; directmusic) load_directmusic;; directplay|dxplay|dplay) load_directplay;; directx9) DIRECTX_WINDOWS=win2k ; load_directx9;; @@ -3915,6 +4115,8 @@ dotnet35) load_dotnet35; load_fontfix;; droid) load_droid;; dxsdk_nov2006) load_dxsdk_nov2006;; + eadm) load_eadm;; + eufonts) load_eufonts;; ffdshow) load_ffdshow;; firefox|firefox3) load_firefox;; flash) load_flash;; @@ -3926,11 +4128,14 @@ gdiplus) load_gdiplus;; gecko) load_gecko;; gecko-dbg|geckodbg|gecko_dbg|geckodebug|gecko_debug|gecko-debug) load_gecko_dbg;; + gfw|xlive) load_gfw;; glsl-disable) load_glsl_disable;; glsl-enable) load_glsl_enable;; + glut) load_glut;; hosts) load_hosts;; ie6) load_ie6;; ie7) load_ie7;; + ie8) load_ie8;; jet40) load_jet40;; kde) load_kde;; liberation) load_liberation;; @@ -3970,6 +4175,8 @@ riched20) load_riched20;; riched30) load_riched30;; richtx32) load_richtx32;; + safari) load_safari;; + secur32) load_secur32;; shockwave) load_shockwave;; steam) load_steam;; tahoma) load_tahoma;; @@ -4011,7 +4218,7 @@ xvid) load_xvid;; allcodecs|allvcodecs) load_vcrun6; load_ffdshow; load_xvid;; - allfonts) load_corefonts; load_tahoma; load_liberation; load_droid; load_wenquanyi;; + allfonts) load_corefonts; load_droid; load_eufonts; load_liberation; load_tahoma; load_wenquanyi;; alldlls=builtin) override_all_dlls;; alldlls=default) override_no_dlls;; ddr=gdi) set_ddr gdi;; @@ -4054,7 +4261,7 @@ videomemorysize=default) set_videomemorysize default;; volnum) volnum;; mwo=force)set_mwo force;; - mwo=disabled) set_mwo disabled;; + mwo=disable|mwo=disabled) set_mwo disable;; mwo=enabled) set_mwo enabled;; npm-repack) npm_repack;; psm=on) set_psm enabled;;