diff --git a/susepatches.patch b/susepatches.patch new file mode 100644 index 0000000..22b40f0 --- /dev/null +++ b/susepatches.patch @@ -0,0 +1,116 @@ +From 329b3307e628f4deec732f4d2261aa8cd0fd81ea Mon Sep 17 00:00:00 2001 +From: Marcus Meissner +Date: Fri, 8 Jul 2011 22:10:36 +0200 +Subject: [PATCH] libv4l: Fixed videodev.h header moving away from glibc to libv4l-devel + +--- + configure.ac | 9 +++++++++ + dlls/avicap32/avicap32_main.c | 10 +++++++--- + dlls/qcap/v4l.c | 8 ++++++-- + dlls/qcap/yuv.c | 2 +- + 4 files changed, 23 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0e86713..8df9993 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -651,6 +651,15 @@ AC_CHECK_HEADERS([linux/videodev.h],,, + #include + #endif]) + ++AC_CHECK_HEADERS([libv4l1-videodev.h],,, ++[#ifdef HAVE_SYS_TIME_H ++#include ++#endif ++#include ++#ifdef HAVE_ASM_TYPES_H ++#include ++#endif]) ++ + dnl Check for broken kernel header that doesn't define __user + AC_CHECK_HEADERS([linux/capi.h],,,[#define __user]) + +diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c +index 349ee5d..d6a9609 100644 +--- a/dlls/avicap32/avicap32_main.c ++++ b/dlls/avicap32/avicap32_main.c +@@ -40,6 +40,10 @@ + #endif + #ifdef HAVE_LINUX_VIDEODEV_H + # include ++#else ++# ifdef HAVE_LIBV4L1_VIDEODEV_H ++# include ++# endif + #endif + #ifdef HAVE_UNISTD_H + # include +@@ -91,7 +95,7 @@ HWND VFWAPI capCreateCaptureWindowA(LPCSTR lpszWindowName, DWORD dwStyle, INT x, + return retW; + } + +-#ifdef HAVE_LINUX_VIDEODEV_H ++#if defined(HAVE_LINUX_VIDEODEV_H) || defined(HAVE_LIBV4L1_VIDEODEV_H) + + static int xioctl(int fd, int request, void * arg) + { +@@ -163,7 +167,7 @@ static BOOL query_video_device(int devnum, char *name, int namesize, char *versi + return TRUE; + } + +-#else /* HAVE_LINUX_VIDEODEV_H */ ++#else /* HAVE_LINUX_VIDEODEV_H || HAVE_LIBV4L1_VIDEODEV_H */ + + static BOOL query_video_device(int devnum, char *name, int namesize, char *version, int versionsize) + { +@@ -171,7 +175,7 @@ static BOOL query_video_device(int devnum, char *name, int namesize, char *versi + return FALSE; + } + +-#endif /* HAVE_LINUX_VIDEODEV_H */ ++#endif /* HAVE_LINUX_VIDEODEV_H | HAVE_LIBV4L1_VIDEODEV_H */ + + /*********************************************************************** + * capGetDriverDescriptionA (AVICAP32.@) +diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c +index fadcd49..0d35cfe 100644 +--- a/dlls/qcap/v4l.c ++++ b/dlls/qcap/v4l.c +@@ -63,7 +63,11 @@ + #include + #endif + #ifdef HAVE_LINUX_VIDEODEV_H +-#include ++# include ++#else ++# ifdef HAVE_LIBV4L1_VIDEODEV_H ++# include ++# endif + #endif + #ifdef HAVE_UNISTD_H + #include +@@ -71,7 +75,7 @@ + + WINE_DEFAULT_DEBUG_CHANNEL(qcap_v4l); + +-#ifdef HAVE_LINUX_VIDEODEV_H ++#if defined(HAVE_LINUX_VIDEODEV_H) || defined(HAVE_LIBV4L1_VIDEODEV_H) + + static typeof(open) *video_open = open; + static typeof(close) *video_close = close; +diff --git a/dlls/qcap/yuv.c b/dlls/qcap/yuv.c +index 608e571..bbc1b50 100644 +--- a/dlls/qcap/yuv.c ++++ b/dlls/qcap/yuv.c +@@ -32,7 +32,7 @@ + #include "wine/debug.h" + + /* This is not used if V4L support is missing */ +-#ifdef HAVE_LINUX_VIDEODEV_H ++#if defined(HAVE_LINUX_VIDEODEV_H) || defined(HAVE_LIBV4L1_VIDEODEV_H) + + WINE_DEFAULT_DEBUG_CHANNEL(qcap); + +-- +1.7.3.4 + diff --git a/wine-1.3.23.tar.bz2 b/wine-1.3.23.tar.bz2 deleted file mode 100644 index 9b44c6a..0000000 --- a/wine-1.3.23.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17fc85b4d3edde123768f069e9f061bf60d87efa7a607633fb435a4388ea5519 -size 19475016 diff --git a/wine-1.3.24.tar.bz2 b/wine-1.3.24.tar.bz2 new file mode 100644 index 0000000..9df8272 --- /dev/null +++ b/wine-1.3.24.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:942872dbe4746e7eace1bda070a32c16afbb7e06acd14530cbe6f956bcf48a5d +size 19525589 diff --git a/wine.changes b/wine.changes index 62a0eb1..e5ca876 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Jul 8 22:34:27 CEST 2011 - meissner@suse.de + +- Updated to 1.3.24 development snapshot + - Various DirectInput improvements. + - Support for line breaking in Uniscribe. + - More UI elements in builtin Shell Explorer. + - Some more D3DX9 functions. + - Improved support for shell known folders. + - Various bug fixes. +- libv4l headers no longer are in glibc, but in libv4l on factory +- updated winetricks to 20110629 + ------------------------------------------------------------------- Wed Jun 29 16:46:15 CEST 2011 - meissner@suse.de diff --git a/wine.spec b/wine.spec index 389a0fe..a14a2ea 100644 --- a/wine.spec +++ b/wine.spec @@ -34,7 +34,7 @@ BuildRequires: gstreamer-0_10-plugins-base-devel License: LGPLv2.1+ Group: System/Emulators/PC AutoReqProv: on -Version: 1.3.23 +Version: 1.3.24 Release: 1 Summary: An MS Windows Emulator Url: http://www.winehq.com @@ -47,7 +47,7 @@ Source4: wine.desktop Source5: ubuntuwine.tar.bz2 # SUSE specific patches # - currently none, but add them here -#Patch0: susepatches.patch +Patch0: susepatches.patch Recommends: wine-gecko wine-mp3 %ifarch %ix86 x86_64 Requires: wine-32bit = %version @@ -104,7 +104,7 @@ libraries. %prep %setup -q -#%patch0 -p1 +%patch0 -p1 # cp %{S:3} . # diff --git a/winetricks b/winetricks index 4a90c5d..a501256 100644 --- a/winetricks +++ b/winetricks @@ -1,7 +1,7 @@ #!/bin/sh # Name of this version of winetricks (YYYYMMDD) -WINETRICKS_VERSION=20110429 +WINETRICKS_VERSION=20110629 # This is a utf-8 file # You should see an o with two dots over it here [ö] @@ -47,11 +47,17 @@ WINETRICKS_VERSION=20110429 # Copyright (C) 2010 Belhorma Bendebiche # Copyright (C) 2010 Eleazar Galano # Copyright (C) 2010 Travis Athougies +# Copyright (C) 2010 Andrew Nguyen +# Copyright (C) 2010 Detlef Riekenberg +# Copyright (C) 2010 Maarten Lankhorst +# Copyright (C) 2010 Rico Schüller # Copyright (C) 2011 Scott Jackson # Copyright (C) 2011 Trevor Johnson # Copyright (C) 2011 Franco Junio # Copyright (C) 2011 Craig Sanders # Copyright (C) 2011 Matthew Bauer +# Copyright (C) 2011 Giuseppe Dia +# Copyright (C) 2011 Łukasz Wojniłowicz # # License # This program is free software; you can redistribute it and/or @@ -239,7 +245,7 @@ w_try() # This is a problem when trying to pass environment variables to e.g. wine. # Adding an explicit export here works around it, so add any we use. export WINEDLLOVERRIDES - echo Executing "$@" + printf '%s\n' "Executing $*" # On Vista, we need to jump through a few hoops to run commands in cygwin. # First, .exe's need to have the executable bit set. @@ -309,7 +315,14 @@ w_read_key() fi mkdir -p "$W_CACHE/$W_PACKAGE" + + # backwards compatibile location + # Auth doesn't belong in cache, since restoring it requires user input _W_keyfile="$W_CACHE/$W_PACKAGE/key.txt" + if ! test -f "$_W_keyfile" + then + _W_keyfile="$WINETRICKS_AUTH/$W_PACKAGE/key.txt" + fi if ! test -f "$_W_keyfile" then # read key from user @@ -320,6 +333,9 @@ w_read_key() de*) _W_keymsg="Bitte einen Key für Pakete '$W_PACKAGE' eingeben" _W_nokeymsg="Keinen Key eingegeben?" ;; + pl*) _W_keymsg="Proszę podać klucz dla programu '$W_PACKAGE'" + _W_nokeymsg="Nie podano klucza" + ;; *) _W_keymsg="Please enter the key for app '$W_PACKAGE'" _W_nokeymsg="No key given" ;; @@ -363,7 +379,8 @@ w_pathconv() { case "$OS" in "Windows_NT") - cygpath "$@" + # for some reason, cygpath turns some spaces into newlines?! + cygpath "$@" | tr '\012' '\040' | sed 's/ $//' ;; *) case "$@" in @@ -374,6 +391,12 @@ w_pathconv() esac } +# Expand an environment variable and print it to stdout +w_expand_env() +{ + winetricks_early_wine cmd.exe /c echo "%$1%" +} + # verify an sha1sum w_verify_sha1sum() { @@ -383,7 +406,7 @@ w_verify_sha1sum() _W_vs_gotsum=`$WINETRICKS_SHA1SUM < $_W_vs_file | sed 's/ .*//'` if [ "$_W_vs_gotsum"x != "$_W_vs_wantsum"x ] then - w_die "sha1sum mismatch! Rename $_W_vs_file and try again." + w_die "sha1sum mismatch! Rename $_W_vs_file and try again." fi unset _W_vs_wantsum _W_vs_file _W_vs_gotsum } @@ -525,10 +548,9 @@ w_download_to() # [*] --read-timeout is useful on the adobe server that doesn't # close the connection unless you tell it to (control-C or closing # the socket) - # Disable retries for gog.com (which requires higher level retries) winetricks_wget_progress \ -O "$_W_file" -nd \ - -c --read-timeout=300 --tries=1 --retry-connrefused \ + -c --read-timeout=300 --retry-connrefused \ --header "Accept-Encoding: gzip,deflate" \ ${_W_cookiejar:+--load-cookies "$_W_cookiejar"} \ ${_W_agent:+--user-agent="$_W_agent"} \ @@ -582,13 +604,14 @@ w_open_webpage() # See http://www.dwheeler.com/essays/open-files-urls.html for _W_cmd in xdg-open sdtwebclient cygstart open firefox true do - if test -n `which $_W_cmd` + _W_cmdpath=`which $_W_cmd` + if test -n "$_W_cmdpath" then break fi done $_W_cmd "$1" & - unset _W_cmd + unset _W_cmd _W_cmdpath } # Download a file @@ -672,14 +695,16 @@ w_download_manual_to() _W_file="$3" _W_sha1sum="$4" - if test media="download" - then + case "$media" in + "download") w_info "FAIL: bug: media type is download, but w_download_manual was called. Programmer, please change verb's media type to manual_download." - fi + ;; + esac case $LANG in da*) _W_dlmsg="Hent venligst filen $_W_file fra $_W_url og placér den i $W_CACHE/$_W_packagename, kør derefter dette skript.";; de*) _W_dlmsg="Bitte laden Sie $_W_file von $_W_url runter, stellen Sie's in $W_CACHE/$_W_packagename, dann wiederholen Sie diesen Kommando.";; + pl*) _W_dlmsg="Proszę pobrać plik $_W_file z $_W_url, następnie umieścić go w $W_CACHE/$_W_packagename, a na końcu uruchomić ponownie ten skrytp.";; *) _W_dlmsg="Please download $_W_file from $_W_url, place it in $W_CACHE/$_W_packagename, then re-run this script.";; esac @@ -888,22 +913,22 @@ w_steam_install_game() winwaitclose winwait Steam ; wait for small <> window winwaitclose - " + " if [ "$STEAM_DVD" = "TRUE" ] then - w_ahk_do " + w_ahk_do " ; Run a fourth time, have it install the app. run steam.exe -install ${W_ISO_MOUNT_LETTER}:\\ - " + " else - w_ahk_do " + w_ahk_do " ; Run a fourth time, have it install the app. run steam.exe -applaunch $_W_steamid - " + " fi - w_ahk_do " + w_ahk_do " winwait Install - $_W_steamtitle if ( w_opt_unattended > 0 ) { send {enter} ; next (for 1st of 3 pages of install dialog) @@ -974,6 +999,137 @@ fi unset _W_steamid _W_steamtitle } +#---------------------------------------------------------------- + +# Generic GOG.com installer +# Usage: game_id game_title [other_files,size [reader_control [run_command [download_id [install_dir [installer_size_and_sha1]]]]]] +# game_id +# Used for main installer name and download url. +# game_title +# Used for AutoHotKey and installation path in bat script. +# other_files +# Extra installer files, in one string, space-separated. +# reader_control +# If set, the control id of the configuration pannel checkbox controling +# Adobe Reader installation. +# Some games don't have it, some games do with different ids. +# run_command +# Used for bat script, relative to installation path. +# download_id +# For games which download url doesn't match their game_id +# install_dir +# If different from game_title +# installer_size_and_sha1 +# exe file SHA1. +winetricks_load_gog() +{ + game_id="$1" + game_title="$2" + other_files="$3" + reader_control="$4" + run_command="$5" + download_id="$6" + install_dir="$7" + installer_size_and_sha1="$8" + + if [ "$download_id"x = ""x ] + then + download_id="$game_id" + fi + if [ "$install_dir"x = ""x ] + then + install_dir="$game_title" + fi + + installer_path="$W_CACHE/$W_PACKAGE" + mkdir -p "$installer_path" + installer="setup_$game_id.exe" + + if test "$installer_size_and_sha1"x = ""x + then + files="$installer $other_files" + else + files="$installer,$installer_size_and_sha1 $other_files" + fi + + file_id=0 + for file_and_size_and_sha1 in $files + do + case "$file_and_size_and_sha1" in + *,*,*) + sha1sum=`echo $file_and_size_and_sha1 | sed "s/.*,//"` + minsize=`echo $file_and_size_and_sha1 | sed 's/[^,]*,\([^,]*\),.*/\1/'` + file=`echo $file_and_size_and_sha1 | sed 's/,.*//'` + ;; + *,*) + sha1sum="" + minsize=`echo $file_and_size_and_sha1 | sed 's/.*,//'` + file=`echo $file_and_size_and_sha1 | sed 's/,.*//'` + ;; + *) + sha1sum="" + minsize=1 + file=$file_and_size_and_sha1 + ;; + esac + file_path="$installer_path/$file" + if ! test -s "$file_path" || test `stat -Lc%s "$file_path"` -lt $minsize + then + # FIXME: bring back automated download + w_download_manual "https://www.gog.com/en/download/game/$download_id/$file_id" "$file" + check_sha1=1 + filesize=`stat -Lc%s "$file_path"` + if test $minsize -gt 1 -a $filesize -ne $minsize + then + check_sha1="" + w_warn "Expected file size $minsize, please report new size $filesize." + fi + if test "$check_sha1" != "" -a "$sha1sum"x != ""x + then + w_verify_sha1sum "$sha1sum" "$file_path" + fi + fi + file_id=`expr $file_id + 1` + done + + cd "$installer_path" + w_ahk_do " + run $installer + WinWait, Setup - $game_title, Start installation + ControlGet, checkbox_state, Checked,, TCheckBox1 ; EULA + if (checkbox_state != 1) { + ControlClick, TCheckBox1 + } + if (\"$reader_control\") { + ControlClick, TMCoPShadowButton1 ; Options + Loop, 10 + { + ControlGet, visible, Visible,, $reader_control + if (visible) + { + break + } + Sleep, 1000 + } + ControlGet, checkbox_state, Checked,, $reader_control ; Unckeck Adobe/Foxit Reader + if (checkbox_state != 0) { + ControlClick, $reader_control + } + } + ControlClick, TMCoPShadowButton2 ; Start Installation + WinWait, Setup - $game_title, Exit Installer + ControlClick, TMCoPShadowButton1 ; Exit Installer + " + + if test "$run_command"x != ""x + then + w_declare_exe "$W_PROGRAMS_X86_WIN\\GOG.com\\$install_dir" "$run_command" + fi +} + +#---------------------------------------------------------------- + + # Usage: w_mount "volume name" [filename-to-check [discnum]] # Some games have two volumes with identical volume names. # For these, please specify discnum 1 for first disc, discnum 2 for 2nd, etc., @@ -1058,7 +1214,7 @@ w_ahk_do() w_opt_unattended = ${W_OPT_UNATTENDED:-0} $@ _EOF_ - $WINE "$W_CACHE_WIN/ahk/AutoHotkey.exe" "$W_TMP_WIN"\\tmp.ahk + w_try $WINE "$W_CACHE_WIN\\ahk\\AutoHotkey.exe" "$W_TMP_WIN"\\tmp.ahk unset _W_CR } @@ -1075,9 +1231,9 @@ w_skip_windows() { case "$OS" in "Windows_NT") - echo "Skipping operation '$1' on Windows" - return 0 - ;; + echo "Skipping operation '$1' on Windows" + return 0 + ;; esac return 1 } @@ -1131,16 +1287,25 @@ w_override_no_dlls() w_override_all_dlls() { - # Disable all but the commonly used DLLs Wine doesn't have a credible alternative for - # i.e. Don't disallow msvcp80 or d3dx9_* for now - # d3dx9_24.dll d3dx9_25.dll d3dx9_26.dll d3dx9_27.dll d3dx9_28.dll d3dx9_29.dll d3dx9_30.dll d3dx9_31.dll d3dx9_32.dll d3dx9_33.dll d3dx9_34.dll d3dx9_35.dll d3dx9_36.dll d3dx9_37.dll d3dx9_38.dll d3dx9_39.dll d3dx9_40.dll d3dx9_41.dll d3dx9_42.dll d3dxof.dll + # Disable all known native Microsoft DLLs in favor of Wine's builtin ones w_override_dlls builtin \ acledit aclui activeds actxprxy advapi32 advpack amstream atl authz avicap32 \ avifil32 avifilebavrt bcrypt browseui cabinet capi2032 cards cfgmgr32 clusapi \ comcat comctl32 comdlg32 commdlg compobj compstui credui crtdll crypt32 cryptdlg \ - cryptdll cryptnet cryptui ctapi32 ctl3d ctl3d32 ctl3dv2 d3d10 \ - d3d10core d3d8 d3d9 d3dim d3drm \ - d3dxof dbghelp dciman32 ddeml ddraw ddrawex \ + cryptdll cryptnet cryptui ctapi32 ctl3d ctl3d32 ctl3dv2 \ + d3d10 d3d10core d3d8 d3d9 \ + d3dcompiler_33 d3dcompiler_34 d3dcompiler_35 d3dcompiler_36 \ + d3dcompiler_37 d3dcompiler_38 d3dcompiler_39 d3dcompiler_40 \ + d3dcompiler_41 d3dcompiler_42 d3dcompiler_43 \ + d3dim d3drm \ + d3dx10_33 d3dx10_34 d3dx10_35 d3dx10_36 d3dx10_37 d3dx10_38 \ + d3dx10_39 d3dx10_40 d3dx10_41 d3dx10_42 d3dx10_43 \ + d3dx9_24 d3dx9_25 d3dx9_26 d3dx9_27 d3dx9_28 d3dx9_29 \ + d3dx9_30 d3dx9_31 d3dx9_32 d3dx9_33 d3dx9_34 d3dx9_35 \ + d3dx9_36 d3dx9_37 d3dx9_38 d3dx9_39 d3dx9_40 d3dx9_41 \ + d3dx9_42 d3dx9_43 \ + d3dxof \ + dbghelp dciman32 ddeml ddraw ddrawex \ devenum dinput dinput8 dispdib dispex dmband dmcompos dmime dmloader dmscript \ dmstyle dmsynth dmusic dmusic32 dnsapi dplay dplayx dpnaddr dpnet dpnhpast \ dpnlobby dpwsockx drmclien dsound dssenh dswave dwmapi dxdiagn dxgi faultrep \ @@ -1150,8 +1315,11 @@ w_override_all_dlls() localui lz32 lzexpand mapi32 mapistub mciavi32 mcicda mciqtz32 mciseq mciwave \ midimap mlang mmdevapi mmsystem mpr mprapi msacm msacm32 mscat32 mscms \ mscoree msctf msdaps msdmo msftedit mshtml msi msimg32 msimtf msisip \ - msnet32 msrle32 mssign32 mssip32 mstask msvcirt msvcr70 msvcr71 msvcr80 \ - msvcr90 msvcrt msvcrt20 msvcrt40 msvcrtd msvfw32 msvidc32 msvideo mswsock msxml3 \ + msnet32 msrle32 mssign32 mssip32 mstask msvcirt \ + msvcr70 msvcr71 msvcr80 msvcr90 msvcr100 \ + msvcp70 msvcp71 msvcp80 msvcp90 msvcp100 \ + msvcrt msvcrt20 msvcrt40 msvcrtd \ + msvfw32 msvidc32 msvideo mswsock msxml3 \ msxml4 nddeapi netapi32 newdev ntdll ntdsapi ntprint objsel odbc32 odbccp32 \ ole2 ole2conv ole2disp ole2nls ole2prox ole2thk ole32 oleacc oleaut32 olecli \ olecli32 oledb32 oledlg olepro32 olesvr olesvr32 olethk32 openal32 opengl32 pdh \ @@ -1463,6 +1631,7 @@ w_workaround_wine_bug() case $LANG in da*) w_warn "Arbejder uden om wine-fejl ${1} $_W_msg" ;; de*) w_warn "Wine-Fehler ${1} wird umgegangen $_W_msg" ;; + pl*) w_warn "Obchodzenie błędu w wine ${1} $_W_msg" ;; *) w_warn "Working around wine bug ${1} $_W_msg" ;; esac winetricks_stats_log_command w_workaround_wine_bug-$1 @@ -1471,7 +1640,7 @@ w_workaround_wine_bug() # Function for verbs to register themselves so they show up in the menu. # Example: -# w_metadata wog games \ +# w_metadata wog games \ # title="World of Goo Demo" \ # pub="2D Boy" \ # year="2008" \ @@ -1503,6 +1672,8 @@ w_metadata() w_die "bug: w_metadata $_W_md_cmd has a unix path for installed_exe1, should be a windows path";; installed_file1=/*) w_die "bug: w_metadata $_W_md_cmd has a unix path for installed_file1, should be a windows path";; + media=download_manual) + w_die "bug: verb $_W_md_cmd has media=download_manual, should be manual_download" ;; esac # Use longest match when stripping value, # and shortest match when stripping name, @@ -1711,7 +1882,7 @@ w_append_path() # Prepend $1 to the windows path in the registry. # Use printf %s to avoid interpreting backslashes. _W_NEW_PATH="`printf %s $1| sed 's,\\\\,\\\\\\\\,g'`" - _W_WIN_PATH="`winetricks_early_wine cmd.exe /c echo "%PATH%" | tr -d '\r' | sed 's,\\\\,\\\\\\\\,g'`" + _W_WIN_PATH="`w_expand_env PATH | sed 's,\\\\,\\\\\\\\,g'`" sed 's/$/\r/' > "$W_TMP"/path.reg <<_EOF_ REGEDIT4 @@ -1742,7 +1913,9 @@ winetricks_early_wine() # We used to use WINEDLLOVERRIDES=mshtml= here to suppress the gecko # autoinstall, but that yielded wineprefixes that *never* autoinstalled # gecko (winezeug bug 223). - WINEDEBUG=-all $WINE "$@" 2>/dev/null | sed 's/.*1h.=//' + # The tr removes carriage returns so expanded variables don't have crud on the end + # The grep works around using new wineprefixes with old wine + WINEDEBUG=-all $WINE "$@" 2>/dev/null | ( sed 's/.*1h.=//' | tr -d '\r' | grep -v "Module not found" || true) } winetricks_detect_gui() @@ -1922,6 +2095,18 @@ winetricks_mainmenu() _W_msg_folder='Browse files' _W_msg_annihilate="Delete ALL DATA AND APPLICATIONS INSIDE THIS WINEPREFIX" ;; + pl*) _W_msg_title="Winetricks - obecny prefiks to \"$WINEPREFIX\"" + _W_msg_body='What would you like to do to this wineprefix?' + _W_msg_dlls="Zainstaluj Windowsową bibliotekę DLL lub komponent" + _W_msg_fonts='Zainstaluj czcionkę' + _W_msg_settings='Zmień ustawienia' + _W_msg_winecfg='Uruchom winecfg' + _W_msg_regedit='Uruchom regedit' + _W_msg_taskmgr='Uruchom taskmgr' + _W_msg_shell='Uruchom powłokę wiersza poleceń (dla debugowania)' + _W_msg_folder='Przeglądaj pliki' + _W_msg_annihilate="Usuń WSZYSTKIE DANE I APLIKACJE WEWNĄTRZ TEGO WINEPREFIXA" + ;; *) _W_msg_title="Winetricks - current prefix is \"$WINEPREFIX\"" _W_msg_body='What would you like to do to this wineprefix?' _W_msg_dlls="Install a Windows DLL or component" @@ -2008,8 +2193,8 @@ winetricks_settings_menu() --height $WINETRICKS_MENU_HEIGHT \ --width $WINETRICKS_MENU_WIDTH \ " - ;; - de*) printf %s "zenity \ + ;; + de*) printf %s "zenity \ --title '$_W_msg_title' \ --text '$_W_msg_body' \ --list \ @@ -2020,7 +2205,19 @@ winetricks_settings_menu() --height $WINETRICKS_MENU_HEIGHT \ --width $WINETRICKS_MENU_WIDTH \ " - ;; + ;; + pl*) printf %s "zenity \ + --title '$_W_msg_title' \ + --text '$_W_msg_body' \ + --list \ + --checklist \ + --column '' \ + --column Ustawienie \ + --column Nazwa \ + --height $WINETRICKS_MENU_HEIGHT \ + --width $WINETRICKS_MENU_WIDTH \ + " + ;; *) printf %s "zenity \ --title '$_W_msg_title' \ --text '$_W_msg_body' \ @@ -2032,7 +2229,7 @@ winetricks_settings_menu() --height $WINETRICKS_MENU_HEIGHT \ --width $WINETRICKS_MENU_WIDTH \ " - ;; + ;; esac > "$WINETRICKS_WORKDIR"/zenity.sh for metadatafile in "$WINETRICKS_METADATA"/$WINETRICKS_CURMENU/*.vars @@ -2075,6 +2272,10 @@ winetricks_showmenu() _W_msg_body='Welche Pakete möchten Sie installieren?' _W_cached="gecached" ;; + pl*) _W_msg_title="Winetricks - obecny prefiks to \"$WINEPREFIX\"" + _W_msg_body='Które paczki chesz zainstalować?' + _W_cached="zarchiwizowane" + ;; *) _W_msg_title="Winetricks - current prefix is \"$WINEPREFIX\"" _W_msg_body='Which package(s) would you like to install?' _W_cached="cached" @@ -2102,8 +2303,8 @@ winetricks_showmenu() --height $WINETRICKS_MENU_HEIGHT \ --width $WINETRICKS_MENU_WIDTH \ " - ;; - de*) printf %s "zenity \ + ;; + de*) printf %s "zenity \ --title '$_W_msg_title' \ --text '$_W_msg_body' \ --list \ @@ -2121,6 +2322,24 @@ winetricks_showmenu() --width $WINETRICKS_MENU_WIDTH \ " ;; + pl*) printf %s "zenity \ + --title '$_W_msg_title' \ + --text '$_W_msg_body' \ + --list \ + --checklist \ + --column '' \ + --column Paczka \ + --column Nazwa \ + --column Wydawca \ + --column Rok \ + --column Media \ + --column Status \ + --column 'Rozmiar (MB)' \ + --column 'Czas (sek)' \ + --height $WINETRICKS_MENU_HEIGHT \ + --width $WINETRICKS_MENU_WIDTH \ + " + ;; *) printf %s "zenity \ --title '$_W_msg_title' \ --text '$_W_msg_body' \ @@ -2209,7 +2428,7 @@ winetricks_metadata_basename() # Returns true if given verb has been registered winetricks_metadata_exists() { - test -f "$WINETRICKS_METADATA"/*/$1.vars + test -f "$WINETRICKS_METADATA"/*/$1.vars } # Returns true if given verb has been cached @@ -2362,6 +2581,7 @@ winetricks_list_all() case $LANG in da*) _W_cached="cached" ; _W_download="kan hentes" ;; de*) _W_cached="gecached" ; _W_download="herunterladbar";; + pl*) _W_cached="zarchiwizowane" ; _W_download="do pobrania" ;; *) _W_cached="cached" ; _W_download="downloadable" ;; esac @@ -2424,8 +2644,8 @@ winetricks_read_bytes() winetricks_read_hex() { od -j $1 -N $2 -t x1 $3 | # offset $1, count $2, single byte hex format, file $3 - sed 's/^[^ ]* //' | # remove address - sed '$d' # remove final line which is just final offset + sed 's/^[^ ]* //' | # remove address + sed '$d' # remove final line which is just final offset } # Usage: read_decimal offset device @@ -2435,8 +2655,8 @@ winetricks_read_hex() winetricks_read_decimal() { od -j $1 -N 4 -t u4 $2 | # offset $1, byte count 4, four byte decimal format, file $2 - sed 's/^[^ ]* //' | # remove address - sed '$d' # remove final line which is just final offset + sed 's/^[^ ]* //' | # remove address + sed '$d' # remove final line which is just final offset } winetricks_read_udf_volume_name() @@ -2597,6 +2817,7 @@ winetricks_cache_iso() case $LANG in da*) w_warn "Forkert disk [$_W_volname] indsat. Indsæt venligst disken [$_W_expected_volname]" ;; de*) w_warn "Falsche Disk [$_W_volname] eingelegt. Bitte legen Sie Disk [$_W_expected_volname] ein!" ;; + pl*) w_warn "Włożono zły dysk [$_W_volname]. Proszę włożyć dysk [$_W_expected_volname]" ;; *) w_warn "Wrong disc [$_W_volname] inserted. Please insert disc [$_W_expected_volname]" ;; esac @@ -2813,6 +3034,7 @@ winetricks_mount_real_volume() case $LANG in da*)_W_mountmsg="Indsæt venligst disken '$_W_expected_volname' (krævet af pakken '$_PACKAGE')" ;; de*)_W_mountmsg="Disc '$_W_expected_volname' bitte einlegen (für Pakete '$W_PACKAGE')" ;; + pl*) _W_mountmsg="Proszę włożyć dysk '$_W_expected_volname' (potrzebny paczce '$W_PACKAGE')" ;; *) _W_mountmsg="Please insert volume '$_W_expected_volname' (needed for package '$W_PACKAGE')" ;; esac @@ -2907,10 +3129,10 @@ winetricks_set_wineprefix() # Run wine here to force creation of the wineprefix so it's there when we want to make the cache symlink a bit later. # The folder-name is localized! - W_PROGRAMS_WIN="`$WINE cmd.exe /c echo "%ProgramFiles%" | tr -d '\015'`" + W_PROGRAMS_WIN="`w_expand_env ProgramFiles`" case "$W_PROGRAMS_WIN" in "") w_die "$WINE cmd.exe /c echo '%ProgramFiles%' returned empty string" ;; - %*) w_die "$WINE cmd.exe /c echo '%ProgramFiles%' returned unexpanded string... do you own the parent of $WINEPREFIX ?" ;; + %*) w_die "$WINE cmd.exe /c echo '%ProgramFiles%' returned unexpanded string '$W_PROGRAMS_WIN' ... can be caused a corrupt wineprefix, an old wine, or by not owning $WINEPREFIX" ;; *unknown*) w_die "$WINE cmd.exe /c echo '%ProgramFiles%' returned a string containing the word 'unknown', as if a voice had cried out in terror, and was suddenly silenced." ;; esac @@ -2957,12 +3179,12 @@ winetricks_set_wineprefix() esac # FIXME wrong on 64 bit windows for now - W_COMMONFILES_X86_WIN="`$WINE cmd.exe /c echo "%CommonProgramFiles%" | tr -d '\015'`" + W_COMMONFILES_X86_WIN="`w_expand_env CommonProgramFiles`" W_WINDIR_UNIX="$W_DRIVE_C/windows" # FIXME: move that tr into w_pathconv, if it's still needed? - W_PROGRAMS_UNIX="`w_pathconv -u "$W_PROGRAMS_WIN" | tr -d '\015' `" + W_PROGRAMS_UNIX="`w_pathconv -u "$W_PROGRAMS_WIN"`" # 64 bit windows has a second directory for program files W_PROGRAMS_X86_WIN="${W_PROGRAMS_WIN} (x86)" @@ -2973,8 +3195,8 @@ winetricks_set_wineprefix() W_PROGRAMS_X86_UNIX="${W_PROGRAMS_UNIX}" fi - W_APPDATA_WIN="`winetricks_early_wine cmd.exe /c echo "%AppData%" | tr -d '\015'`" - W_APPDATA_UNIX="`w_pathconv -u "$W_APPDATA_WIN" | tr -d '\015' `" + W_APPDATA_WIN="`w_expand_env AppData`" + W_APPDATA_UNIX="`w_pathconv -u "$W_APPDATA_WIN"`" # FIXME: get fonts path from SHGetFolderPath # See also http://blogs.msdn.com/oldnewthing/archive/2003/11/03/55532.aspx @@ -3069,19 +3291,19 @@ winetricks_init() # Mac folks tend to not have sha1sum, but we can make do with openssl if [ -x "`which sha1sum 2>/dev/null`" ] then - WINETRICKS_SHA1SUM="sha1sum" + WINETRICKS_SHA1SUM="sha1sum" elif [ -x "`which openssl 2>/dev/null`" ] then - WINETRICKS_SHA1SUM="openssl dgst -sha1" + WINETRICKS_SHA1SUM="openssl dgst -sha1" else - w_die "No sha1sum utility available." + w_die "No sha1sum utility available." fi # Which sourceforge mirror to use. Rotate based on time, since # their mirror picker sometimes persistantly sends you to a broken # mirror. case `date +%S` in - *[3]) WINETRICKS_SOURCEFORGE=http://easynews.dl.sourceforge.net/sourceforge ;; + *[3]) WINETRICKS_SOURCEFORGE=http://surfnet.dl.sourceforge.net/sourceforge ;; *) WINETRICKS_SOURCEFORGE=http://downloads.sourceforge.net;; esac @@ -3116,6 +3338,7 @@ winetricks_init() WINETRICKS_POST="${WINETRICKS_POST:-$HOME/.local/share/winetricks/postinstall}" fi test -d "$W_CACHE" || mkdir -p "$W_CACHE" + WINETRICKS_AUTH="${WINETRICKS_AUTH:-$HOME/.local/share/winetricks/auth}" # System-specific variables case "$OS" in @@ -3276,6 +3499,7 @@ winetricks_install_app() case $LANG in da*) fail_msg="Installationen af pakken $1 fejlede" ;; de*) fail_msg="Installieren von Pakete $1 gescheitert" ;; + pl*) fail_msg="Niepowodzenie przy instalacji paczki $1" ;; *) fail_msg="Failed to install package $1" ;; esac @@ -3333,20 +3557,22 @@ helper_d3dx9_xx() #---------------------------------------------------------------- w_metadata adobeair dlls \ - title="Adobe AIR 2.5.1" \ - publisher="Adobe" \ - year="2010" \ - media="download" \ - file1="AdobeAIRInstaller.exe" \ - installed_file1="$W_COMMONFILES_X86_WIN/Adobe AIR/Versions/1.0/Adobe AIR.dll" + title="Adobe AIR 2.6" \ + publisher="Adobe" \ + year="2011" \ + media="download" \ + file1="AdobeAIRInstaller.exe" \ + installed_file1="$W_COMMONFILES_X86_WIN/Adobe AIR/Versions/1.0/Adobe AIR.dll" \ + homepage="http://www.adobe.com/products/air/" load_adobeair() { # 2010-02-02: sha1sum 5c95f51a680f8c175a92755238127be4ad22c53b # 2010-02-20: sha1sum 6f03e723bd855abbe00eb8fdf22da54fb49c62db # 2010-07-29: 2.0.2 sha1sum 7b93aedaf48ad7854940e7a4e7d9394a255e888b - # 2010-12-08: 2.1.5 sha1sum 2664207ca8e836f5070ee356064829a39785a92e - w_download http://airdownload.adobe.com/air/win/download/2.5.1/AdobeAIRInstaller.exe 2664207ca8e836f5070ee356064829a39785a92e + # 2010-12-08: 2.5.1 sha1sum 2664207ca8e836f5070ee356064829a39785a92e + # 2011-04-13: 2.6 sha1sum 3d9c2f9d8f3533424cfea84d61fcb9464278d9fc + w_download http://airdownload.adobe.com/air/win/download/2.6/AdobeAIRInstaller.exe 3d9c2f9d8f3533424cfea84d61fcb9464278d9fc cd "$W_CACHE"/adobeair w_try $WINE AdobeAIRInstaller.exe $W_UNATTENDED_DASH_SILENT } @@ -3354,12 +3580,12 @@ load_adobeair() #---------------------------------------------------------------- w_metadata amstream dlls \ - title="MS amstream.dll" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/amstream.dll" + title="MS amstream.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/amstream.dll" load_amstream() { @@ -3375,13 +3601,13 @@ load_amstream() #---------------------------------------------------------------- -w_metadata art2kmin dlls \ - title="MS Access 2007 runtime" \ - publisher="Microsoft" \ - year="2007" \ - media="download" \ - file1="AccessRuntime.exe" \ - installed_file1="$W_COMMONFILES_X86_WIN/Microsoft Shared/OFFICE12/ACEES.DLL" +w_metadata art2kmin dlls \ + title="MS Access 2007 runtime" \ + publisher="Microsoft" \ + year="2007" \ + media="download" \ + file1="AccessRuntime.exe" \ + installed_file1="$W_COMMONFILES_X86_WIN/Microsoft Shared/OFFICE12/ACEES.DLL" load_art2kmin() { @@ -3393,13 +3619,13 @@ load_art2kmin() #---------------------------------------------------------------- -w_metadata atmlib dlls \ - title="Adobe Type Manager" \ - publisher="Adobe" \ - year="2009" \ - media="download" \ - file1="W2KSP4_EN.EXE" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/atmlib.dll" +w_metadata atmlib dlls \ + title="Adobe Type Manager" \ + publisher="Adobe" \ + year="2009" \ + media="download" \ + file1="W2KSP4_EN.EXE" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/atmlib.dll" load_atmlib() { @@ -3414,13 +3640,13 @@ load_atmlib() #---------------------------------------------------------------- -w_metadata comctl32 dlls \ - title="MS common controls 5.80" \ - publisher="Microsoft" \ - year="2001" \ - media="download" \ - file1="cc32inst.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/comctl32.dll" +w_metadata comctl32 dlls \ + title="MS common controls 5.80" \ + publisher="Microsoft" \ + year="2001" \ + media="download" \ + file1="cc32inst.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/comctl32.dll" load_comctl32() { @@ -3442,13 +3668,13 @@ load_comctl32() #---------------------------------------------------------------- -w_metadata comdlg32ocx dlls \ - title="Common Dialog ActiveX Control for VB6" \ - publisher="Microsoft" \ - year="2009" \ - media="download" \ - file1="comdlg32.cab" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/comdlg32.ocx" +w_metadata comdlg32ocx dlls \ + title="Common Dialog ActiveX Control for VB6" \ + publisher="Microsoft" \ + year="2009" \ + media="download" \ + file1="comdlg32.cab" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/comdlg32.ocx" load_comdlg32ocx() { @@ -3461,13 +3687,13 @@ load_comdlg32ocx() #---------------------------------------------------------------- -w_metadata crypt32 dlls \ - title="MS crypt32" \ - publisher="Microsoft" \ - year="2003" \ - media="download" \ - file1="Q823182_XPE_SP2_X86_ENU.EXE" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/crypt32.dll" +w_metadata crypt32 dlls \ + title="MS crypt32" \ + publisher="Microsoft" \ + year="2003" \ + media="download" \ + file1="Q823182_XPE_SP2_X86_ENU.EXE" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/crypt32.dll" load_crypt32() { @@ -3483,13 +3709,13 @@ load_crypt32() #---------------------------------------------------------------- w_metadata d3dcompiler_43 dlls \ - title="MS d3dcompiler_43.dll" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_Jun2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/d3dcompiler_43.dll" \ - wine_showstoppers="24013" # list a showstopper to hide this from average users for now + title="MS d3dcompiler_43.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_Jun2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dcompiler_43.dll" \ + wine_showstoppers="24013" # list a showstopper to hide this from average users for now load_d3dcompiler_43() { @@ -3509,12 +3735,12 @@ load_d3dcompiler_43() #---------------------------------------------------------------- w_metadata d3dx9 dlls \ - title="MS d3dx9_??.dll from DirectX 9 redistributable" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_24.dll" + title="MS d3dx9_??.dll from DirectX 9 redistributable" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_24.dll" load_d3dx9() { @@ -3536,12 +3762,12 @@ load_d3dx9() #---------------------------------------------------------------- w_metadata d3dx9_26 dlls \ - title="MS d3dx9_26.dll" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_26.dll" + title="MS d3dx9_26.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_26.dll" load_d3dx9_26() { @@ -3551,12 +3777,12 @@ load_d3dx9_26() #---------------------------------------------------------------- w_metadata d3dx9_28 dlls \ - title="MS d3dx9_28.dll" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_28.dll" + title="MS d3dx9_28.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_28.dll" load_d3dx9_28() { @@ -3566,12 +3792,12 @@ load_d3dx9_28() #---------------------------------------------------------------- w_metadata d3dx9_31 dlls \ - title="MS d3dx9_31.dll" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_31.dll" + title="MS d3dx9_31.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_31.dll" load_d3dx9_31() { @@ -3581,12 +3807,12 @@ load_d3dx9_31() #---------------------------------------------------------------- w_metadata d3dx9_35 dlls \ - title="MS d3dx9_35.dll" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_35.dll" + title="MS d3dx9_35.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_35.dll" load_d3dx9_35() { @@ -3596,12 +3822,12 @@ load_d3dx9_35() #---------------------------------------------------------------- w_metadata d3dx9_36 dlls \ - title="MS d3dx9_36.dll" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_36.dll" + title="MS d3dx9_36.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_36.dll" load_d3dx9_36() { @@ -3610,13 +3836,28 @@ load_d3dx9_36() #---------------------------------------------------------------- +w_metadata d3dx9_39 dlls \ + title="MS d3dx9_39.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_39.dll" + +load_d3dx9_39() +{ + helper_d3dx9_xx 39 +} + +#---------------------------------------------------------------- + w_metadata d3dx9_42 dlls \ - title="MS d3dx9_42.dll" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_42.dll" + title="MS d3dx9_42.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_42.dll" load_d3dx9_42() { @@ -3625,13 +3866,38 @@ load_d3dx9_42() #---------------------------------------------------------------- +w_metadata d3dx9_43 dlls \ + title="MS d3dx9_43.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_Jun2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_43.dll" + +load_d3dx9_43() +{ + dllname=d3dx9_43 + + helper_directx_Jun2010 + + w_try_cabextract -d "$W_TMP" -L -F "*$dllname*x86*" "$W_CACHE"/directx9/$DIRECTX_NAME + for x in "$W_TMP"/*.cab + do + w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F "$dllname.dll" "$x" + done + + w_override_dlls native $dllname +} + +#---------------------------------------------------------------- + w_metadata d3dx11_42 dlls \ - title="MS d3dx11_42.dll" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_Jun2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx11_42.dll" + title="MS d3dx11_42.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_Jun2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx11_42.dll" load_d3dx11_42() { @@ -3651,12 +3917,12 @@ load_d3dx11_42() #---------------------------------------------------------------- w_metadata d3dx11_43 dlls \ - title="MS d3dx11_43.dll" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_Jun2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx11_43.dll" + title="MS d3dx11_43.dll" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_Jun2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx11_43.dll" load_d3dx11_43() { @@ -3676,12 +3942,12 @@ load_d3dx11_43() #---------------------------------------------------------------- w_metadata d3dx10 dlls \ - title="MS d3dx10_??.dll from DirectX user redistributable" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx10_33.dll" + title="MS d3dx10_??.dll from DirectX user redistributable" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx10_33.dll" load_d3dx10() { @@ -3702,12 +3968,12 @@ load_d3dx10() #---------------------------------------------------------------- w_metadata d3dxof dlls \ - title="MS d3dxof.dll from DirectX user redistributable" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/d3dxof.dll" + title="MS d3dxof.dll from DirectX user redistributable" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dxof.dll" load_d3dxof() { @@ -3722,12 +3988,12 @@ load_d3dxof() #---------------------------------------------------------------- w_metadata devenum dlls \ - title="MS devenum.dll from DirectX user redistributable" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/devenum.dll" + title="MS devenum.dll from DirectX user redistributable" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/devenum.dll" load_devenum() { @@ -3742,12 +4008,12 @@ load_devenum() #---------------------------------------------------------------- w_metadata dinput dlls \ - title="MS dinput.dll; breaks mouse, use only on Rayman 2 etc." \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/dinput.dll" + title="MS dinput.dll; breaks mouse, use only on Rayman 2 etc." \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/dinput.dll" load_dinput() { @@ -3762,12 +4028,12 @@ load_dinput() #---------------------------------------------------------------- w_metadata dinput8 dlls \ - title="MS DirectInput 8 from DirectX user redistributable" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/dinput8.dll" + title="MS DirectInput 8 from DirectX user redistributable" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/dinput8.dll" load_dinput8() { @@ -3782,12 +4048,12 @@ load_dinput8() #---------------------------------------------------------------- w_metadata directmusic dlls \ - title="MS DirectMusic from DirectX user redistributable" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/dmusic.dll" + title="MS DirectMusic from DirectX user redistributable" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/dmusic.dll" load_directmusic() { @@ -3827,12 +4093,12 @@ load_directmusic() #---------------------------------------------------------------- w_metadata directplay dlls \ - title="MS DirectPlay from DirectX user redistributable" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/dplayx.dll" + title="MS DirectPlay from DirectX user redistributable" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/dplayx.dll" load_directplay() { @@ -3855,12 +4121,12 @@ load_directplay() #---------------------------------------------------------------- w_metadata directx9 dlls \ - title="MS DirectX 9 (Usually overkill. Try d3dx9_36 first)" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx10_33.dll" + title="MS DirectX 9 (Usually overkill. Try d3dx9_36 first)" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx10_33.dll" load_directx9() { @@ -3882,7 +4148,7 @@ load_directx9() cd "$W_CACHE"/directx9 WINEDLLOVERRIDES="wintrust=b,mscoree=,ddraw,d3d8,d3d9,dsound,dinput=n" \ - w_try $WINE $DIRECTX_NAME /t:"$W_TMP_WIN" $W_UNATTENDED_SLASH_Q + w_try $WINE $DIRECTX_NAME /t:"$W_TMP_WIN" $W_UNATTENDED_SLASH_Q # How many of these do we really need? # We should probably remove most of these...? @@ -3901,12 +4167,12 @@ load_directx9() #---------------------------------------------------------------- w_metadata dmsynth dlls \ - title="MS midi synthesizer from DirectX user redistributable" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/dmsynth.dll" + title="MS midi synthesizer from DirectX user redistributable" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/dmsynth.dll" load_dmsynth() { @@ -3923,12 +4189,12 @@ load_dmsynth() #---------------------------------------------------------------- w_metadata dotnet11 dlls \ - title="MS .NET 1.1" \ - publisher="Microsoft" \ - year="2003" \ - media="download" \ - file1="dotnetfx.exe" \ - installed_file1="c:/windows/Microsoft.NET/Framework/v1.1.4322/ndpsetup.ico" + title="MS .NET 1.1" \ + publisher="Microsoft" \ + year="2003" \ + media="download" \ + file1="dotnetfx.exe" \ + installed_file1="c:/windows/Microsoft.NET/Framework/v1.1.4322/ndpsetup.ico" load_dotnet11() { @@ -3962,13 +4228,16 @@ load_dotnet11() #---------------------------------------------------------------- w_metadata dotnet11sp1 dlls \ - title="MS .NET 1.1 SP1" \ - publisher="Microsoft" \ - year="2004" \ - media="download" \ - file1="NDP1.1sp1-KB867460-X86.exe" \ - installed_file1="c:/windows/Microsoft.NET/Framework/v1.1.4322/CONFIG/security.config" + title="MS .NET 1.1 SP1" \ + publisher="Microsoft" \ + year="2004" \ + media="download" \ + file1="NDP1.1sp1-KB867460-X86.exe" \ + installed_file1="c:/windows/Microsoft.NET/Framework/v1.1.4322/CONFIG/security.config" +# fixme: sometimes security.config is missing after install, see +# http://blogs.msdn.com/b/shawnfa/archive/2006/02/09/527688.aspx +# If this happens often, we may need to change the install check. load_dotnet11sp1() { w_call dotnet11 @@ -3985,12 +4254,12 @@ load_dotnet11sp1() #---------------------------------------------------------------- w_metadata dotnet20 dlls \ - title="MS .NET 2.0" \ - publisher="Microsoft" \ - year="2006" \ - media="download" \ - file1="dotnetfx.exe" \ - installed_file1="c:/windows/Microsoft.NET/Framework/v2.0.50727/mscorlib.dll" + title="MS .NET 2.0" \ + publisher="Microsoft" \ + year="2006" \ + media="download" \ + file1="dotnetfx.exe" \ + installed_file1="c:/windows/Microsoft.NET/Framework/v2.0.50727/mscorlib.dll" load_dotnet20() { @@ -3998,11 +4267,19 @@ load_dotnet20() # Recipe from http://bugs.winehq.org/show_bug.cgi?id=10467#c57 w_set_winver win2k - # 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 - w_download http://kegel.com/wine/l_intl.zip 5cc2665e9a518a2e560d3aeac6758d0cd8ec3a2a - w_try_unzip -d "$W_SYSTEM32_DLLS" "$W_CACHE"/dotnet20/l_intl.zip + cd "$W_CACHE"/dotnet20 + + if test ! -f l_intl.nls + 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 + w_download http://kegel.com/wine/l_intl.zip 5cc2665e9a518a2e560d3aeac6758d0cd8ec3a2a + # FIXME: w_download changes current directory + cd "$W_CACHE"/dotnet20 + + w_try_unzip -d "$W_SYSTEM32_DLLS" l_intl.zip + fi # Hans' workaround to avoid winehq nonbug 26464, crash in servicemodelreg.exe rm -rf "$W_WINDIR_UNIX"/Microsoft.NET/Framework/v2.0.50727 @@ -4011,9 +4288,9 @@ load_dotnet20() w_download http://download.microsoft.com/download/5/6/7/567758a3-759e-473e-bf8f-52154438565a/dotnetfx.exe a3625c59d7a2995fb60877b5f5324892a1693b2a if [ "$W_UNATTENDED_SLASH_Q"x = ""x ] then - w_try $WINE "$W_CACHE"/dotnet20/dotnetfx.exe + w_try $WINE dotnetfx.exe else - w_try $WINE "$W_CACHE"/dotnet20/dotnetfx.exe /q /c:"install.exe /q" + w_try $WINE dotnetfx.exe /q /c:"install.exe /q" fi w_unset_winver @@ -4029,12 +4306,12 @@ load_dotnet20() #---------------------------------------------------------------- w_metadata dotnet20sp2 dlls \ - title="MS .NET 2.0 SP2 (experimental)" \ - publisher="Microsoft" \ - year="2009" \ - media="download" \ - file1="NetFx20SP2_x86.exe" \ - installed_file1="c:/windows/winsxs/manifests/x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.3053_x-ww_b80fa8ca.cat" + title="MS .NET 2.0 SP2 (experimental)" \ + publisher="Microsoft" \ + year="2009" \ + media="download" \ + file1="NetFx20SP2_x86.exe" \ + installed_file1="c:/windows/winsxs/manifests/x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.3053_x-ww_b80fa8ca.cat" load_dotnet20sp2() { @@ -4067,12 +4344,12 @@ load_dotnet20sp2() #---------------------------------------------------------------- w_metadata dotnet30 dlls \ - title="MS .NET 3.0" \ - publisher="Microsoft" \ - year="2006" \ - media="download" \ - file1="dotnetfx3.exe" \ - installed_file1="c:/windows/Microsoft.NET/Framework/v3.0/Microsoft .NET Framework 3.0/logo.bmp" + title="MS .NET 3.0" \ + publisher="Microsoft" \ + year="2006" \ + media="download" \ + file1="dotnetfx3.exe" \ + installed_file1="c:/windows/Microsoft.NET/Framework/v3.0/Microsoft .NET Framework 3.0/logo.bmp" load_dotnet30() { @@ -4097,7 +4374,7 @@ load_dotnet30() for lang in ar cs da de el es fi fr he it jp ko nb nl pl pt-BR pt-PT ru \ sv tr zh-CHS zh-CHT do - ln -sf "${W_SYSTEM32_DLLS}/spupdsvc.exe" "${LANGPACKS_BASE_PATH}/dotnetfx3langpack${lang}.exe" + ln -sf "${W_SYSTEM32_DLLS}/spupdsvc.exe" "${LANGPACKS_BASE_PATH}/dotnetfx3langpack${lang}.exe" done w_set_winver winxp @@ -4114,12 +4391,12 @@ load_dotnet30() #---------------------------------------------------------------- w_metadata dotnet35 dlls \ - title="MS .NET 3.5" \ - publisher="Microsoft" \ - year="2007" \ - media="download" \ - file1="dotnetfx35.exe" \ - installed_file1="c:/windows/Microsoft.NET/Framework/v3.5/MSBuild.exe" + title="MS .NET 3.5" \ + publisher="Microsoft" \ + year="2007" \ + media="download" \ + file1="dotnetfx35.exe" \ + installed_file1="c:/windows/Microsoft.NET/Framework/v3.5/MSBuild.exe" load_dotnet35() { @@ -4162,12 +4439,12 @@ _EOF_ #---------------------------------------------------------------- w_metadata dxdiagn dlls \ - title="DirectX Diagnostic Library" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/dxdiagn.dll" + title="DirectX Diagnostic Library" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/dxdiagn.dll" load_dxdiagn() { @@ -4181,12 +4458,12 @@ load_dxdiagn() #---------------------------------------------------------------- w_metadata dsound dlls \ - title="MS DirectSound from DirectX user redistributable" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/dsound.dll" + title="MS DirectSound from DirectX user redistributable" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/dsound.dll" load_dsound() { @@ -4204,15 +4481,15 @@ load_dsound() # FIXME: update winetricks_is_installed to look at installed_file2 w_metadata flash dlls \ - title="Flash Player 10" \ - publisher="Adobe" \ - year="2011" \ - media="download" \ - file1="install_flash_player.exe" \ - file2="install_flash_player_ax.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/FlashUtil10p_Plugin.exe" \ - installed_file2="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/FlashUtil10p_ActiveX.exe" \ - homepage="http://www.adobe.com/products/flashplayer/" + title="Flash Player 10" \ + publisher="Adobe" \ + year="2011" \ + media="download" \ + file1="install_flash_player.exe" \ + file2="install_flash_player_ax.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/FlashUtil10u_Plugin.exe" \ + installed_file2="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/FlashUtil10u_ActiveX.exe" \ + homepage="http://www.adobe.com/products/flashplayer/" load_flash() { @@ -4224,8 +4501,10 @@ load_flash() # 2011-02-24: sha1sum f2e6a3f486423d6c1be48ad80fb3b7d4cdafd29d # 2011-03-15: sha1sum 07908231028f68098902d5aa52812b7e27f8497a # 2011-04-12: sha1sum 80b547dde20c0e80f739c3ba66be1065a94e4244 - w_download http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_ax.exe \ - 80b547dde20c0e80f739c3ba66be1065a94e4244 + # 2011-05-13: sha1sum ae401aa3ba54ebe12c2fb3b94cd1bb5881074169 + # 2011-06-13: sha1sum 2c1ae9cf04f67ca611af7df695d3ea4337fb73fc + # 2011-06-23: sha1sum da3f4b28f77a44b25cfb1453278683b888904714 + w_download http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_ax.exe da3f4b28f77a44b25cfb1453278683b888904714 cd "$W_CACHE"/flash w_try $WINE install_flash_player_ax.exe ${W_OPT_UNATTENDED:+ /install} @@ -4236,8 +4515,11 @@ load_flash() # 2011-02-24: sha1sum 009c908cdb73fba18b34e798b1f601ed964102a1 # 2011-03-15: sha1sum 487b7003386ba80da00fa56cfd1d33241b8a0e41 # 2011-04-12: sha1sum 706523aa1af2e77f9ae7727202ebe0f0f5e71a39 - w_download http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player.exe \ - 706523aa1af2e77f9ae7727202ebe0f0f5e71a39 + # 2011-05-13: sha1sum 4d800cbf339f8d4f2a524da1aa79d10a785da42e + # 3aefb5132f7c326b046e4bc82e41bf399fc7cf5f + # 2011-06-13: sha1sum f6248cdda8c5b3d36bb414d67d2373f205e257c7 + # 2011-06-23: sha1sum 8c14f60fa625d26698afceb1e234eaae4637389e + w_download http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player.exe 8c14f60fa625d26698afceb1e234eaae4637389e w_try $WINE install_flash_player.exe ${W_OPT_UNATTENDED:+ /install} } @@ -4245,12 +4527,12 @@ load_flash() #---------------------------------------------------------------- w_metadata gdiplus dlls \ - title="MS GDI+" \ - publisher="Microsoft" \ - year="2009" \ - media="download" \ - file1="WindowsXP-KB975337-x86-ENU.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/gdiplus.dll" + title="MS GDI+" \ + publisher="Microsoft" \ + year="2009" \ + media="download" \ + file1="WindowsXP-KB975337-x86-ENU.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/gdiplus.dll" load_gdiplus() { @@ -4274,9 +4556,27 @@ load_gdiplus() #---------------------------------------------------------------- +w_metadata glidewrapper dlls \ + title="GlideWrapper" \ + publisher="Rolf Neuberger" \ + year="2005" \ + media="download" \ + file1="GlideWrapper084c.exe" \ + installed_file1="c:/windows/glide3x.dll" + +load_glidewrapper() +{ + w_download http://www.zeckensack.de/glide/archive/GlideWrapper084c.exe 7a9d60a18b660473742b476465e9aea7bd5ab6f8 + cd "$W_CACHE/$W_PACKAGE" + # NSIS installer + w_try $WINE $file1 ${W_OPT_UNATTENDED:+ /S} +} + +#---------------------------------------------------------------- + w_metadata gecko dlls \ - title="Gecko (usually installed by distro)" \ - publisher="WineHQ/Mozilla" + title="Gecko (usually installed by distro)" \ + publisher="WineHQ/Mozilla" load_gecko() { @@ -4291,12 +4591,12 @@ load_gecko() #---------------------------------------------------------------- w_metadata gecko110 dlls \ - title="Gecko 1.1.0 (not normally needed)" \ - publisher="WineHQ/Mozilla" \ - year="2010" \ - media="download" \ - file1="wine_gecko-1.1.0-x86.cab" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/gecko/1.1.0/wine_gecko/nspr4.dll" + title="Gecko 1.1.0 (not normally needed)" \ + publisher="WineHQ/Mozilla" \ + year="2010" \ + media="download" \ + file1="wine_gecko-1.1.0-x86.cab" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/gecko/1.1.0/wine_gecko/nspr4.dll" load_gecko110() { @@ -4329,12 +4629,12 @@ _EOF_ } w_metadata gecko120 dlls \ - title="Gecko 1.2.0 (not normally needed)" \ - publisher="WineHQ/Mozilla" \ - year="2011" \ - media="download" \ - file1="wine_gecko-1.2.0-x86.msi" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/gecko/1.2.0/wine_gecko/nspr4.dll" + title="Gecko 1.2.0 (not normally needed)" \ + publisher="WineHQ/Mozilla" \ + year="2011" \ + media="download" \ + file1="wine_gecko-1.2.0-x86.msi" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/gecko/1.2.0/wine_gecko/nspr4.dll" load_gecko120() { @@ -4355,13 +4655,13 @@ load_gecko120() #---------------------------------------------------------------- -w_metadata gfw dlls \ - title="MS Games For Windows Live (xlive.dll)" \ - publisher="Microsoft" \ - year="2008" \ - media="download" \ - file1="gfwlivesetupmin.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/xlive.dll" +w_metadata gfw dlls \ + title="MS Games For Windows Live (xlive.dll)" \ + publisher="Microsoft" \ + year="2008" \ + media="download" \ + file1="gfwlivesetupmin.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/xlive.dll" load_gfw() { @@ -4378,13 +4678,13 @@ load_gfw() #---------------------------------------------------------------- -w_metadata glut dlls \ - title="The glut utility library for OpenGL" \ - publisher="Mark J. Kilgard" \ - year="2001" \ - media="download" \ - file1="glut-3.7.6-bin.zip" \ - installed_file1="c:/glut-3.7.6-bin/glut32.lib" +w_metadata glut dlls \ + title="The glut utility library for OpenGL" \ + publisher="Mark J. Kilgard" \ + year="2001" \ + media="download" \ + file1="glut-3.7.6-bin.zip" \ + installed_file1="c:/glut-3.7.6-bin/glut32.lib" load_glut() { @@ -4398,10 +4698,10 @@ load_glut() # um, codecs are kind of clustered here. They probably deserve their own real category. w_metadata allcodecs dlls \ - title="All codecs (dirac, ffdshow, icodecs, l3codecx, xvid) except wmp" \ - publisher="various" \ - year="1998-2009" \ - media="download" + title="All codecs (dirac, ffdshow, icodecs, l3codecx, xvid) except wmp" \ + publisher="various" \ + year="1998-2009" \ + media="download" load_allcodecs() { @@ -4415,12 +4715,12 @@ load_allcodecs() #---------------------------------------------------------------- w_metadata dirac dlls \ - title="The Dirac directshow filter v1.0.2" \ - publisher="Dirac" \ - year="2009" \ - media="download" \ - file1="DiracDirectShowFilter-1.0.2.exe" \ - installed_file1="$W_PROGRAMS_X86_WIN/Dirac/DiracDecoder.dll" + title="The Dirac directshow filter v1.0.2" \ + publisher="Dirac" \ + year="2009" \ + media="download" \ + file1="DiracDirectShowFilter-1.0.2.exe" \ + installed_file1="$W_PROGRAMS_X86_WIN/Dirac/DiracDecoder.dll" load_dirac() { @@ -4454,13 +4754,13 @@ load_dirac() #---------------------------------------------------------------- w_metadata ffdshow dlls \ - title="ffdshow video codecs" \ - publisher="doom9 folks" \ - year="2010" \ - media="download" \ - file1="ffdshow_beta7_rev3154_20091209.exe" \ - installed_file1="$W_PROGRAMS_X86_WIN/ffdshow/ff_liba52.dll" \ - homepage="http://ffdshow-tryout.sourceforge.net" + title="ffdshow video codecs" \ + publisher="doom9 folks" \ + year="2010" \ + media="download" \ + file1="ffdshow_beta7_rev3154_20091209.exe" \ + installed_file1="$W_PROGRAMS_X86_WIN/ffdshow/ff_liba52.dll" \ + homepage="http://ffdshow-tryout.sourceforge.net" load_ffdshow() { @@ -4472,12 +4772,12 @@ load_ffdshow() #---------------------------------------------------------------- w_metadata icodecs dlls \ - title="Indeo codecs" \ - publisher="Intel" \ - year="1998" \ - media="download" \ - file1="codinstl.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/ir50_32.dll" + title="Indeo codecs" \ + publisher="Intel" \ + year="1998" \ + media="download" \ + file1="codinstl.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/ir50_32.dll" load_icodecs() { @@ -4516,12 +4816,12 @@ load_icodecs() #---------------------------------------------------------------- w_metadata jet40 dlls \ - title="MS Jet 4.0 Service Pack 8" \ - publisher="Microsoft" \ - year="2003" \ - media="download" \ - file1="jet40sp8_9xnt.exe" \ - installed_file1="$W_COMMONFILES_X86_WIN/Microsoft shared/dao/dao360.dll" + title="MS Jet 4.0 Service Pack 8" \ + publisher="Microsoft" \ + year="2003" \ + media="download" \ + file1="jet40sp8_9xnt.exe" \ + installed_file1="$W_COMMONFILES_X86_WIN/Microsoft shared/dao/dao360.dll" load_jet40() { @@ -4572,19 +4872,20 @@ load_kindle() { w_download http://kindleforpc.amazon.com/32337/KindleForPC-installer.exe \ 2ad916877f418ceb8bdc4ae13b0c5e9099ffb8d7 - w_try $WINE $W_CACHE/kindle/$file1 ${W_OPT_UNATTENDED:+ /S} + cd "$W_CACHE"/kindle + w_try $WINE $file1 ${W_OPT_UNATTENDED:+ /S} w_declare_exe "$W_PROGRAMS_WIN\\Amazon\\Kindle For PC" Kindle.exe } #---------------------------------------------------------------- w_metadata l3codecx dlls \ - title="MPEG Layer-3 Audio Codec for Microsoft DirectShow" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/l3codecx.ax" + title="MPEG Layer-3 Audio Codec for Microsoft DirectShow" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/l3codecx.ax" load_l3codecx() { @@ -4602,13 +4903,13 @@ load_l3codecx() # $W_PROGRAMS_X86_WIN/Gemeinsame Dateien/System/ADO/msado26.tlb # in German... need a variable W_COMMONFILES or something like that -w_metadata mdac27 dlls \ - title="Microsoft Data Access Components 2.7 sp1" \ - publisher="Microsoft" \ - year="2006" \ - media="download" \ - file1="mdac_typ.exe" \ - installed_file1="$W_COMMONFILES_X86_WIN/System/ADO/msado26.tlb" +w_metadata mdac27 dlls \ + title="Microsoft Data Access Components 2.7 sp1" \ + publisher="Microsoft" \ + year="2006" \ + media="manual_download" \ + file1="mdac_typ.exe" \ + installed_file1="$W_COMMONFILES_X86_WIN/System/ADO/msado26.tlb" load_mdac27() { @@ -4622,13 +4923,13 @@ load_mdac27() #---------------------------------------------------------------- -w_metadata mdac28 dlls \ - title="Microsoft Data Access Components 2.8 sp1" \ - publisher="Microsoft" \ - year="2005" \ - media="download" \ - file1="MDAC_TYP.EXE" \ - installed_file1="$W_COMMONFILES_X86_WIN/System/ADO/msado27.tlb" +w_metadata mdac28 dlls \ + title="Microsoft Data Access Components 2.8 sp1" \ + publisher="Microsoft" \ + year="2005" \ + media="download" \ + file1="MDAC_TYP.EXE" \ + installed_file1="$W_COMMONFILES_X86_WIN/System/ADO/msado27.tlb" load_mdac28() { @@ -4648,13 +4949,13 @@ load_mdac28() #---------------------------------------------------------------- -w_metadata mfc40 dlls \ - title="MS mfc40 (Microsoft Foundation Classes from Visual C++ 4.0)" \ - publisher="Microsoft" \ - year="2004" \ - media="download" \ - file1="ole2v.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/MFC40.DLL" +w_metadata mfc40 dlls \ + title="MS mfc40 (Microsoft Foundation Classes from Visual C++ 4.0)" \ + publisher="Microsoft" \ + year="2004" \ + media="download" \ + file1="ole2v.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/MFC40.DLL" load_mfc40() { @@ -4667,12 +4968,12 @@ 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" + 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() { @@ -4684,12 +4985,12 @@ load_mono26() #---------------------------------------------------------------- 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" + 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() { @@ -4701,18 +5002,18 @@ load_mono28() #---------------------------------------------------------------- w_metadata mono210 dlls \ - title="Mono 2.10 (.NET compatability)" \ - publisher="Novell" \ - year="2011" \ - media="download" \ - file1="mono-2.10.1-gtksharp-2.12.10-win32-2.exe" \ - installed_file1="$W_PROGRAMS_X86_WIN/Mono-2.10.1/bin/mono-2.0.dll" + title="Mono 2.10 (.NET compatability)" \ + publisher="Novell" \ + year="2011" \ + media="download" \ + file1="mono-2.10.2-gtksharp-2.12.10-win32-5.exe" \ + installed_file1="$W_PROGRAMS_X86_WIN/Mono-2.10.2/bin/mono-2.0.dll" load_mono210() { - w_download http://ftp.novell.com/pub/mono/archive/2.10.1/windows-installer/2/mono-2.10.1-gtksharp-2.12.10-win32-2.exe 7067b1c6cc530738bfd63c3ef38271c2dcc387fe + w_download http://ftp.novell.com/pub/mono/archive/2.10.2/windows-installer/5/mono-2.10.2-gtksharp-2.12.10-win32-5.exe 630769a5bf70d025308c994920d3826dbadb03f5 cd "$W_CACHE"/mono210 - w_try $WINE mono-2.10.1-gtksharp-2.12.10-win32-2.exe $W_UNATTENDED_SLASH_SILENT + w_try $WINE mono-2.10.2-gtksharp-2.12.10-win32-5.exe $W_UNATTENDED_SLASH_SILENT } #---------------------------------------------------------------- @@ -4736,12 +5037,12 @@ load_mozillabuild() #---------------------------------------------------------------- w_metadata msasn1 dlls \ - title="MS ASN1" \ - publisher="Microsoft" \ - year="2003" \ - media="download" \ - file1="W2KSP4_EN.EXE" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/msasn1.dll" + title="MS ASN1" \ + publisher="Microsoft" \ + year="2003" \ + media="download" \ + file1="W2KSP4_EN.EXE" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/msasn1.dll" load_msasn1() { @@ -4757,13 +5058,34 @@ load_msasn1() #---------------------------------------------------------------- +w_metadata msflxgrd dlls \ + title="MS FlexGrid Control (msflxgrd.ocx)" \ + publisher="Microsoft" \ + year="2009" \ + media="download" \ + file1="msflxgrd.cab" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/MSFlxGrd.Ocx" + +load_msflxgrd() +{ + # http://msdn.microsoft.com/en-us/library/aa240864(VS.60).aspx + # may 2011: f497c3b390cd80d5bcd1f13d5c0c68b206369aa7 + w_download http://activex.microsoft.com/controls/vb6/msflxgrd.cab f497c3b390cd80d5bcd1f13d5c0c68b206369aa7 + + w_try_cabextract --directory="$W_TMP" "$W_CACHE"/msflxgrd/msflxgrd.cab + w_try cp -f "$W_TMP"/[Mm][Ss][Ff][Ll][Xx][Gg][Rr][Dd].[Oo][Cc][Xx] "$W_SYSTEM32_DLLS" + w_try_regsvr MSFlxGrd.Ocx +} + +#---------------------------------------------------------------- + w_metadata mshflxgd dlls \ - title="MS Hierarchical FlexGrid Control (mshflxgd.ocx)" \ - publisher="Microsoft" \ - year="2009" \ - media="download" \ - file1="MSHFLXGD.CAB" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/mshflxgd.ocx" + title="MS Hierarchical FlexGrid Control (mshflxgd.ocx)" \ + publisher="Microsoft" \ + year="2009" \ + media="download" \ + file1="MSHFLXGD.CAB" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/mshflxgd.ocx" load_mshflxgd() { @@ -4781,12 +5103,12 @@ 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" + title="Windows Installer 2.0" \ + publisher="Microsoft" \ + year="2001" \ + media="download" \ + file1="InstMsiA.exe" \ + installed_exe1="$W_SYSTEM32_DLLS_WIN/msiexec.exe" load_msi2() { @@ -4819,12 +5141,12 @@ load_msi2() #---------------------------------------------------------------- w_metadata msscript dlls \ - title="MS Windows Script Control" \ - publisher="Microsoft" \ - year="2004" \ - media="download" \ - file1="sct10en.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/msscript.ocx" + title="MS Windows Script Control" \ + publisher="Microsoft" \ + year="2004" \ + media="download" \ + file1="sct10en.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/msscript.ocx" load_msscript() { @@ -4839,12 +5161,12 @@ load_msscript() #---------------------------------------------------------------- w_metadata msls31 dlls \ - title="MS Line Services" \ - publisher="Microsoft" \ - year="2001" \ - media="download" \ - file1="../msi2/InstMsiA.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/msls31.dll" + title="MS Line Services" \ + publisher="Microsoft" \ + year="2001" \ + media="download" \ + file1="../msi2/InstMsiA.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/msls31.dll" load_msls31() { @@ -4879,12 +5201,12 @@ load_msmask() #---------------------------------------------------------------- w_metadata msxml3 dlls \ - title="MS XML Core Services 3.0" \ - publisher="Microsoft" \ - year="2005" \ - media="manual_download" \ - file1="msxml3.msi" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/msxml3.dll" + title="MS XML Core Services 3.0" \ + publisher="Microsoft" \ + year="2005" \ + media="manual_download" \ + file1="msxml3.msi" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/msxml3.dll" load_msxml3() { @@ -4905,12 +5227,12 @@ load_msxml3() #---------------------------------------------------------------- w_metadata msxml4 dlls \ - title="MS XML Core Services 4.0" \ - publisher="Microsoft" \ - year="2009" \ - media="download" \ - file1="msxml.msi" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/msxml4.dll" + title="MS XML Core Services 4.0" \ + publisher="Microsoft" \ + year="2009" \ + media="download" \ + file1="msxml.msi" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/msxml4.dll" load_msxml4() { @@ -4928,12 +5250,12 @@ load_msxml4() #---------------------------------------------------------------- w_metadata msxml6 dlls \ - title="MS XML Core Services 6.0 sp1" \ - publisher="Microsoft" \ - year="2007" \ - media="download" \ - file1="msxml6_x86.msi" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/msxml6.dll" + title="MS XML Core Services 6.0 sp1" \ + publisher="Microsoft" \ + year="2007" \ + media="download" \ + file1="msxml6_x86.msi" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/msxml6.dll" load_msxml6() { @@ -4948,18 +5270,19 @@ load_msxml6() #---------------------------------------------------------------- w_metadata ogg dlls \ - title="OpenCodecs 0.84: flac, speex, theora, vorbis, WebM" \ - publisher="xiph.org" \ - year="2010" \ - media="download" \ - file1="opencodecs_0.84.17338.exe" \ - installed_file1="$W_PROGRAMS_X86_WIN/Xiph.Org/Open Codecs/AxPlayer.dll" \ - homepage="http://xiph.org/dshow" + title="OpenCodecs 0.85: flac, speex, theora, vorbis, WebM" \ + publisher="xiph.org" \ + year="2011" \ + media="download" \ + file1="opencodecs_0.85.17777.exe" \ + installed_file1="$W_PROGRAMS_X86_WIN/Xiph.Org/Open Codecs/AxPlayer.dll" \ + homepage="http://xiph.org/dshow" load_ogg() { - w_download http://downloads.xiph.org/releases/oggdsf/opencodecs_0.84.17338.exe 6151ab79e6ae246208cdf707e080f01c93d95deb - w_try $WINE "$W_CACHE"/ogg/opencodecs_0.84.17338.exe $W_UNATTENDED_SLASH_S + w_download http://downloads.xiph.org/releases/oggdsf/opencodecs_0.85.17777.exe 386cf7cd29ffcbf8705eff8c8233de448ecf33ab + cd "$W_CACHE"/ogg + w_try $WINE $file1 $W_UNATTENDED_SLASH_S } #---------------------------------------------------------------- @@ -5022,12 +5345,12 @@ load_pdh() #---------------------------------------------------------------- w_metadata physx dlls \ - title="PhysX" \ - publisher="NVidia" \ - year="2010" \ - media="download" \ - file1="PhysX_9.10.0129_SystemSoftware.exe" \ - installed_file1="$W_PROGRAMS_WIN/NVIDIA Corporation/PhysX/Engine/v2.8.3/PhysXCore.dll" + title="PhysX" \ + publisher="NVidia" \ + year="2010" \ + media="download" \ + file1="PhysX_9.10.0129_SystemSoftware.exe" \ + installed_file1="$W_PROGRAMS_WIN/NVIDIA Corporation/PhysX/Engine/v2.8.3/PhysXCore.dll" load_physx() { @@ -5042,12 +5365,12 @@ load_physx() #---------------------------------------------------------------- w_metadata pngfilt dlls \ - title="pngfilt.dll (from ie6)" \ - publisher="Microsoft" \ - year="2002" \ - media="download" \ - file1="q328970.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/pngfilt.dll" + title="pngfilt.dll (from ie6)" \ + publisher="Microsoft" \ + year="2002" \ + media="download" \ + file1="q328970.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/pngfilt.dll" load_pngfilt() { @@ -5060,12 +5383,12 @@ load_pngfilt() #---------------------------------------------------------------- w_metadata quartz dlls \ - title="quartz.dll (from Directx 9 user redistributable)" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/quartz.dll" + title="quartz.dll (from Directx 9 user redistributable)" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/quartz.dll" load_quartz() { @@ -5082,12 +5405,12 @@ load_quartz() #---------------------------------------------------------------- w_metadata quicktime72 dlls \ - title="Apple Quicktime 7.2" \ - publisher="Apple" \ - year="2010" \ - media="download" \ - file1="quicktimeplayer72.exe" \ - installed_file1="c:/windows/Installer/{95A890AA-B3B1-44B6-9C18-A8F7AB3EE7FC}/QTPlayer.ico" + title="Apple Quicktime 7.2" \ + publisher="Apple" \ + year="2010" \ + media="download" \ + file1="quicktimeplayer72.exe" \ + installed_file1="c:/windows/Installer/{95A890AA-B3B1-44B6-9C18-A8F7AB3EE7FC}/QTPlayer.ico" load_quicktime72() { @@ -5098,7 +5421,7 @@ load_quicktime72() unset QUICKTIME_QUIET if test "$W_UNATTENDED_SLASH_Q" != "" then - QUICKTIME_QUIET="/qn" # ISSETUPDRIVEN=0 + QUICKTIME_QUIET="/qn" # ISSETUPDRIVEN=0 fi if w_workaround_wine_bug 9366 "" 1.1.22, @@ -5138,12 +5461,12 @@ load_quicktime72() #---------------------------------------------------------------- w_metadata quicktime76 dlls \ - title="Apple Quicktime 7.6" \ - publisher="Apple" \ - year="2010" \ - media="download" \ - file1="QuickTimeInstaller.exe" \ - installed_file1="c:/windows/Installer/{57752979-A1C9-4C02-856B-FBB27AC4E02C}/QTPlayer.ico" + title="Apple Quicktime 7.6" \ + publisher="Apple" \ + year="2010" \ + media="download" \ + file1="QuickTimeInstaller.exe" \ + installed_file1="c:/windows/Installer/{57752979-A1C9-4C02-856B-FBB27AC4E02C}/QTPlayer.ico" load_quicktime76() { @@ -5153,7 +5476,7 @@ load_quicktime76() unset QUICKTIME_QUIET if test "$W_UNATTENDED_SLASH_Q" then - QUICKTIME_QUIET="/qn" # ISSETUPDRIVEN=0 + QUICKTIME_QUIET="/qn" # ISSETUPDRIVEN=0 fi if w_workaround_wine_bug 9366 "" 1.1.22, @@ -5192,12 +5515,12 @@ load_quicktime76() #---------------------------------------------------------------- w_metadata riched20 dlls \ - title="MS RichEdit Control version 2.0 (riched20.dll, riched32.dll)" \ - publisher="Microsoft" \ - year="1999" \ - media="download" \ - file1="Q249973i.EXE" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/riched20.dll" + title="MS RichEdit Control version 2.0 (riched20.dll, riched32.dll)" \ + publisher="Microsoft" \ + year="1999" \ + media="download" \ + file1="Q249973i.EXE" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/riched20.dll" load_riched20() { @@ -5214,13 +5537,13 @@ load_riched20() # We may need a better way to distinguish between installed files. w_metadata riched30 dlls \ - title="MS RichEdit Control version 3.0 (riched20.dll, msls31.dll)" \ - publisher="Microsoft" \ - year="2001" \ - media="download" \ - file1="InstMsiA.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/riched20.dll" \ - installed_file2="$W_SYSTEM32_DLLS_WIN/msls31.dll" + title="MS RichEdit Control version 3.0 (riched20.dll, msls31.dll)" \ + publisher="Microsoft" \ + year="2001" \ + media="download" \ + file1="InstMsiA.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/riched20.dll" \ + installed_file2="$W_SYSTEM32_DLLS_WIN/msls31.dll" load_riched30() { @@ -5240,12 +5563,12 @@ load_riched30() #---------------------------------------------------------------- w_metadata richtx32 dlls \ - title="MS Rich TextBox Control 6.0" \ - publisher="Microsoft" \ - year="2009" \ - media="download" \ - file1="richtx32.cab" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/RichTx32.Ocx" + title="MS Rich TextBox Control 6.0" \ + publisher="Microsoft" \ + year="2009" \ + media="download" \ + file1="richtx32.cab" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/RichTx32.Ocx" load_richtx32() { @@ -5257,12 +5580,12 @@ load_richtx32() #---------------------------------------------------------------- w_metadata secur32 dlls \ - title="MS Security Support Provider Interface" \ - publisher="Microsoft" \ - year="2009" \ - media="download" \ - file1="Windows2000-KB959426-x86-ENU.EXE" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/secur32.dll" + title="MS Security Support Provider Interface" \ + publisher="Microsoft" \ + year="2009" \ + media="download" \ + file1="Windows2000-KB959426-x86-ENU.EXE" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/secur32.dll" load_secur32() { @@ -5275,12 +5598,12 @@ load_secur32() #---------------------------------------------------------------- w_metadata shockwave dlls \ - title="Shockwave" \ - publisher="Adobe" \ - year="2010" \ - media="download" \ - file1="sw_lic_full_installer.msi" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/Adobe/Shockwave 11/shockwave_Projector_Loader.dcr" + title="Shockwave" \ + publisher="Adobe" \ + year="2010" \ + media="download" \ + file1="sw_lic_full_installer.msi" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/Adobe/Shockwave 11/shockwave_Projector_Loader.dcr" load_shockwave() { # Not silent enough, use msi instead @@ -5294,21 +5617,22 @@ load_shockwave() { # 2010-09-02 sha1sum: fed20eccc29fec2f64162b7265343514d43884bc # 2010-11-03 sha1sum: 2ff28665543e80f3bd4ff1933ac05ec9314aaac6 # 2011-02-03 sha1sum: e71ddc4fa42662208b2f52c1bd34a40e7775ad75 + # 2011-06-13 sha1sum: 7fd6cc61bb20d0bef654a44f4501a5a65b55b0c9 - w_download http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi e71ddc4fa42662208b2f52c1bd34a40e7775ad75 + w_download http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi 7fd6cc61bb20d0bef654a44f4501a5a65b55b0c9 cd "$W_CACHE"/shockwave w_try $WINE msiexec /i sw_lic_full_installer.msi $W_UNATTENDED_SLASH_Q } #---------------------------------------------------------------- -w_metadata usp10 dlls \ - title="Uniscribe 1.325 " \ - publisher="Microsoft" \ - year="2001" \ - media="download" \ - file1="../msi2/InstMsiA.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/usp10.dll" +w_metadata usp10 dlls \ + title="Uniscribe 1.325 " \ + publisher="Microsoft" \ + year="2001" \ + media="download" \ + file1="../msi2/InstMsiA.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/usp10.dll" load_usp10() { @@ -5322,13 +5646,13 @@ load_usp10() #---------------------------------------------------------------- -w_metadata vb2run dlls \ - title="MS Visual Basic 2 runtime" \ - publisher="Microsoft" \ - year="1993" \ - media="download" \ - file1="VBRUN200.EXE" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/VBRUN200.DLL" +w_metadata vb2run dlls \ + title="MS Visual Basic 2 runtime" \ + publisher="Microsoft" \ + year="1993" \ + media="download" \ + file1="VBRUN200.EXE" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/VBRUN200.DLL" load_vb2run() { @@ -5341,13 +5665,13 @@ load_vb2run() #---------------------------------------------------------------- -w_metadata vb3run dlls \ - title="MS Visual Basic 3 runtime" \ - publisher="Microsoft" \ - year="1998" \ - media="download" \ - file1="vb3run.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/Vbrun300.dll" +w_metadata vb3run dlls \ + title="MS Visual Basic 3 runtime" \ + publisher="Microsoft" \ + year="1998" \ + media="download" \ + file1="vb3run.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/Vbrun300.dll" load_vb3run() { @@ -5359,13 +5683,13 @@ load_vb3run() #---------------------------------------------------------------- -w_metadata vb4run dlls \ - title="MS Visual Basic 4 runtime" \ - publisher="Microsoft" \ - year="1998" \ - media="download" \ - file1="vb4run.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/Vb40032.dll" +w_metadata vb4run dlls \ + title="MS Visual Basic 4 runtime" \ + publisher="Microsoft" \ + year="1998" \ + media="download" \ + file1="vb4run.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/Vb40032.dll" load_vb4run() { @@ -5378,13 +5702,13 @@ load_vb4run() #---------------------------------------------------------------- -w_metadata vb5run dlls \ - title="MS Visual Basic 5 runtime" \ - publisher="Microsoft" \ - year="2001" \ - media="download" \ - file1="msvbvm50.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/msvbvm50.dll" +w_metadata vb5run dlls \ + title="MS Visual Basic 5 runtime" \ + publisher="Microsoft" \ + year="2001" \ + media="download" \ + file1="msvbvm50.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/msvbvm50.dll" load_vb5run() { @@ -5395,13 +5719,13 @@ load_vb5run() #---------------------------------------------------------------- -w_metadata vb6run dlls \ - title="MS Visual Basic 6 runtime sp6" \ - publisher="Microsoft" \ - year="2004" \ - media="download" \ - file1="vbrun60sp6.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/MSVBVM60.DLL" +w_metadata vb6run dlls \ + title="MS Visual Basic 6 runtime sp6" \ + publisher="Microsoft" \ + year="2004" \ + media="download" \ + file1="vbrun60sp6.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/MSVBVM60.DLL" load_vb6run() { @@ -5440,24 +5764,24 @@ 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/1/w9xnt4/en-us/vc6redistsetup_enu.exe 382c8f5a7f41189af8d4165cf441f274b7e2a457 - w_try $WINE "$W_CACHE"/vcrun6/vc6redistsetup_enu.exe "/T:$W_TMP_WIN" /c $W_UNATTENDED_SLASH_Q - if test ! -f "$W_TMP"/vcredist.exe - then - w_die vcredist.exe not found - fi - mv "$W_TMP"/vcredist.exe "$W_CACHE"/vcrun6 + w_try $WINE "$W_CACHE"/vcrun6/vc6redistsetup_enu.exe "/T:$W_TMP_WIN" /c $W_UNATTENDED_SLASH_Q + if test ! -f "$W_TMP"/vcredist.exe + then + w_die vcredist.exe not found + fi + mv "$W_TMP"/vcredist.exe "$W_CACHE"/vcrun6 fi } -w_metadata vcrun6 dlls \ - title="Visual C++ 6 sp4 libraries (mfc42, msvcp60, msvcrt)" \ - publisher="Microsoft" \ - year="2000" \ - media="download" \ - file1="vc6redistsetup_enu.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/msvcrt.dll" +w_metadata vcrun6 dlls \ + title="Visual C++ 6 sp4 libraries (mfc42, msvcp60, msvcrt)" \ + publisher="Microsoft" \ + year="2000" \ + media="download" \ + file1="vc6redistsetup_enu.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/msvcrt.dll" load_vcrun6() { @@ -5485,13 +5809,13 @@ load_vcrun6() w_override_dlls native,builtin msvcrt } -w_metadata mfc42 dlls \ - title="Visual C++ 6 sp4 mfc42 library (mfc42); same as vcrun6" \ - publisher="Microsoft" \ - year="2000" \ - media="download" \ - file1="../vcrun6/vc6redistsetup_enu.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/mfc42u.dll" +w_metadata mfc42 dlls \ + title="Visual C++ 6 sp4 mfc42 library (mfc42); same as vcrun6" \ + publisher="Microsoft" \ + year="2000" \ + media="download" \ + file1="../vcrun6/vc6redistsetup_enu.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/mfc42u.dll" load_mfc42() { @@ -5506,13 +5830,13 @@ load_mfc42() # between sp4 and sp6, it would have to check size or version of a file, # or maybe a registry key. -w_metadata vcrun6sp6 dlls \ - title="Visual C++ 6 sp6 libraries (with fixes in atl and mfc)" \ - publisher="Microsoft" \ - year="2004" \ - media="download" \ - file1="Vs6sp6.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/msvcrt.dll" +w_metadata vcrun6sp6 dlls \ + title="Visual C++ 6 sp6 libraries (with fixes in atl and mfc)" \ + publisher="Microsoft" \ + year="2004" \ + media="download" \ + file1="Vs6sp6.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/msvcrt.dll" load_vcrun6sp6() { @@ -5548,13 +5872,13 @@ load_vcrun6sp6() #---------------------------------------------------------------- -w_metadata vcrun2003 dlls \ - title="Visual C++ 2003 libraries (mfc71,msvcp71,msvcr71)" \ - publisher="Microsoft" \ - year="2003" \ - media="download" \ - file1="BZEditW32_1.6.5_Installer.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/msvcp71.dll" +w_metadata vcrun2003 dlls \ + title="Visual C++ 2003 libraries (mfc71,msvcp71,msvcr71)" \ + publisher="Microsoft" \ + year="2003" \ + media="download" \ + file1="BZEditW32_1.6.5_Installer.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/msvcp71.dll" load_vcrun2003() { @@ -5569,54 +5893,55 @@ load_vcrun2003() #---------------------------------------------------------------- w_metadata vcrun2005 dlls \ - title="Visual C++ 2005 libraries (mfc80,msvcp80,msvcr80)" \ - publisher="Microsoft" \ - year="2011" \ - media="download" \ - file1="vcredist_x86.exe" \ - installed_file1="c:/windows/winsxs/x86_Microsoft.VC80.MFC_1fc8b3b9a1e18e3b_8.0.50727.5592_x-ww_e87e0bcd/mfc80.dll" + title="Visual C++ 2005 libraries (mfc80,msvcp80,msvcr80)" \ + publisher="Microsoft" \ + year="2011" \ + media="download" \ + file1="vcredist_x86.EXE" \ + installed_file1="c:/windows/winsxs/x86_Microsoft.VC80.MFC_1fc8b3b9a1e18e3b_8.0.50727.6195_x-ww_150c9e8b/mfc80.dll" load_vcrun2005() { - # build 5592, April 2011 security update, see - # http://www.microsoft.com/technet/security/bulletin/MS11-025.mspx and - # http://support.microsoft.com/kb/2467175 - w_download http://download.microsoft.com/download/3/0/5/305BF178-5F7C-489E-8F39-C3257429E832/vcredist_x86.exe 3badcd6e356c9511ad2e71010fa4684954091e09 + # June 2011 security update, see + # http://www.microsoft.com/technet/security/bulletin/MS11-025.mspx or + # http://support.microsoft.com/kb/2538242 + w_download http://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE b8fab0bb7f62a24ddfe77b19cd9a1451abd7b847 + cd "$W_CACHE"/vcrun2005 w_override_dlls native,builtin msvcr80 - w_try $WINE vcredist_x86.exe $W_UNATTENDED_SLASH_Q + w_try $WINE $file1 $W_UNATTENDED_SLASH_Q } #---------------------------------------------------------------- w_metadata vcrun2008 dlls \ - title="Visual C++ 2008 libraries (mfc90,msvcp90,msvcr90)" \ - publisher="Microsoft" \ - year="2011" \ - media="download" \ - file1="vcredist_x86.exe" \ - installed_file1="C:/windows/winsxs/x86_Microsoft.VC90.MFC_1fc8b3b9a1e18e3b_9.0.30729.5570_x-ww_d5fe2ecb/mfc90.dll" + title="Visual C++ 2008 libraries (mfc90,msvcp90,msvcr90)" \ + publisher="Microsoft" \ + 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" load_vcrun2008() { - # build 5570, April 2011 security update, see - # http://www.microsoft.com/technet/security/bulletin/MS11-025.mspx and - # http://support.microsoft.com/kb/2467174 - w_download http://download.microsoft.com/download/7/E/D/7ED72B8A-D457-4DF0-B455-42A85FA157FF/vcredist_x86.exe 0361fcefc78b0ab4896ca1837551aeda5175f6fd + # June 2011 security update, see + # http://www.microsoft.com/technet/security/bulletin/MS11-025.mspx or + # http://support.microsoft.com/kb/2538242 + w_download http://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x86.exe 470640aa4bb7db8e69196b5edb0010933569e98d w_override_dlls native,builtin msvcr90 cd "$W_CACHE"/vcrun2008 - w_try $WINE vcredist_x86.exe $W_UNATTENDED_SLASH_Q + w_try $WINE $file1 $W_UNATTENDED_SLASH_Q } #---------------------------------------------------------------- w_metadata vcrun2010 dlls \ - title="Visual C++ 2010 libraries (mfc100,msvcp100,msvcr100)" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="vcredist_x86.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/mfc100.dll" + title="Visual C++ 2010 libraries (mfc100,msvcp100,msvcr100)" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="vcredist_x86.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/mfc100.dll" load_vcrun2010() { @@ -5636,12 +5961,12 @@ load_vcrun2010() #---------------------------------------------------------------- w_metadata vjrun20 dlls \ - title="MS Visual J# 2.0 SE libraries (requires dotnet20)" \ - publisher="Microsoft" \ - year="2007" \ - media="download" \ - file1="vjredist.exe" \ - installed_file1="c:/windows/Microsoft.NET/Framework/VJSharp/VJSharpSxS10.dll" + title="MS Visual J# 2.0 SE libraries (requires dotnet20)" \ + publisher="Microsoft" \ + year="2007" \ + media="download" \ + file1="vjredist.exe" \ + installed_file1="c:/windows/Microsoft.NET/Framework/VJSharp/VJSharpSxS10.dll" load_vjrun20() { @@ -5667,12 +5992,12 @@ load_vjrun20() #---------------------------------------------------------------- w_metadata windowscodecs dlls \ - title="MS Windows Imaging Component" \ - publisher="Microsoft" \ - year="2006" \ - media="download" \ - file1="wic_x86_enu.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/WindowsCodecs.dll" + title="MS Windows Imaging Component" \ + publisher="Microsoft" \ + year="2006" \ + media="download" \ + file1="wic_x86_enu.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/WindowsCodecs.dll" load_windowscodecs() { @@ -5692,12 +6017,12 @@ load_windowscodecs() #---------------------------------------------------------------- w_metadata winhttp dlls \ - title="MS Windows HTTP Services" \ - publisher="Microsoft" \ - year="2005" \ - media="download" \ - file1="Windows2000-KB842773-x86-ENU.EXE" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/winhttp.dll" + title="MS Windows HTTP Services" \ + publisher="Microsoft" \ + year="2005" \ + media="download" \ + file1="Windows2000-KB842773-x86-ENU.EXE" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/winhttp.dll" load_winhttp() { @@ -5710,12 +6035,12 @@ load_winhttp() #---------------------------------------------------------------- w_metadata wininet dlls \ - title="MS Windows Internet API" \ - publisher="Microsoft" \ - year="1999" \ - media="download" \ - file1="3725.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/wininet.dll" + title="MS Windows Internet API" \ + publisher="Microsoft" \ + year="1999" \ + media="download" \ + file1="3725.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/wininet.dll" load_wininet() { @@ -5731,12 +6056,12 @@ load_wininet() #---------------------------------------------------------------- w_metadata wmi dlls \ - title="Windows Management Instrumentation (aka WBEM) Core 1.5" \ - publisher="Microsoft" \ - year="2000" \ - media="download" \ - file1="wmi9x.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/wbem/wbemcore.dll" + title="Windows Management Instrumentation (aka WBEM) Core 1.5" \ + publisher="Microsoft" \ + year="2000" \ + media="download" \ + file1="wmi9x.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/wbem/wbemcore.dll" load_wmi() { @@ -5760,12 +6085,12 @@ load_wmi() #---------------------------------------------------------------- w_metadata wsh56js dlls \ - title="MS Windows scripting 5.6, jscript only, no cscript" \ - publisher="Microsoft" \ - year="2006" \ - media="download" \ - file1="Windows2000-KB917344-56-x86-enu.exe" \ - installed_file1="c:/windows/inf/jscren.inf" + title="MS Windows scripting 5.6, jscript only, no cscript" \ + publisher="Microsoft" \ + year="2006" \ + media="download" \ + file1="Windows2000-KB917344-56-x86-enu.exe" \ + installed_file1="c:/windows/inf/jscren.inf" load_wsh56js() { @@ -5780,12 +6105,12 @@ load_wsh56js() #---------------------------------------------------------------- w_metadata wsh56vb dlls \ - title="MS Windows scripting 5.6, vbscript only, no cscript" \ - publisher="Microsoft" \ - year="2007" \ - media="download" \ - file1="vbs56men.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/vbscript.dll" + title="MS Windows scripting 5.6, vbscript only, no cscript" \ + publisher="Microsoft" \ + year="2007" \ + media="download" \ + file1="vbs56men.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/vbscript.dll" load_wsh56vb() { @@ -5800,12 +6125,12 @@ load_wsh56vb() #---------------------------------------------------------------- w_metadata wsh57 dlls \ - title="MS Windows Scripting Host 5.7" \ - publisher="Microsoft" \ - year="2007" \ - media="download" \ - file1="scripten.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/scrrun.dll" + title="MS Windows Scripting Host 5.7" \ + publisher="Microsoft" \ + year="2007" \ + media="download" \ + file1="scripten.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/scrrun.dll" load_wsh57() { @@ -5822,12 +6147,12 @@ load_wsh57() #---------------------------------------------------------------- w_metadata xact dlls \ - title="MS XACT Engine" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/xactengine2_0.dll" + title="MS XACT Engine" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/xactengine2_0.dll" load_xact() { @@ -5855,12 +6180,12 @@ load_xact() #---------------------------------------------------------------- w_metadata xact_jun2010 dlls \ - title="MS XACT Engine" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_Jun2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/xactengine2_0.dll" + title="MS XACT Engine" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_Jun2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/xactengine2_0.dll" load_xact_jun2010() { @@ -5888,12 +6213,12 @@ load_xact_jun2010() #---------------------------------------------------------------- w_metadata xinput dlls \ - title="Microsoft XInput (Xbox controller support)" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/xinput1_1.dll" + title="Microsoft XInput (Xbox controller support)" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/xinput1_1.dll" load_xinput() { @@ -5916,17 +6241,21 @@ load_xinput() #---------------------------------------------------------------- +# FIXME: extend metadata to allow file1_en, file1_fr, etc. w_metadata xmllite dlls \ title="MS xmllite dll" \ publisher="Microsoft" \ year="2006" \ media="download" \ - file1="WindowsXP-KB915865-v11-x86-ENU.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/xmllite.dll" load_xmllite() { - w_download http://download.microsoft.com/download/f/9/6/f964059a-3747-4ed8-9326-ba1e639031b1/WindowsXP-KB915865-v11-x86-ENU.exe 226d246a1c64e693791de5c727509002d089b0d5 + case $LANG in + en*) w_download http://download.microsoft.com/download/f/9/6/f964059a-3747-4ed8-9326-ba1e639031b1/WindowsXP-KB915865-v11-x86-ENU.exe 226d246a1c64e693791de5c727509002d089b0d5 ;; + fr*) w_download http://download.microsoft.com/download/4/1/d/41de58a0-6715-4d3e-99e7-ff0c11283d1b/WindowsXP-KB915865-v11-x86-FRA.exe abb70b6a96be7dce453b00877739e90c6f3efba0 ;; + *) w_die "sorry, xmllite install not yet implemented for language $LANG" ;; + esac if w_workaround_wine_bug 16013 then @@ -5943,25 +6272,32 @@ load_xmllite() cd "$W_CACHE"/xmllite w_override_dlls native xmllite - w_try $WINE WindowsXP-KB915865-v11-x86-ENU.exe $W_UNATTENDED_SLASH_Q + case $LANG in + en*) w_try $WINE WindowsXP-KB915865-v11-x86-ENU.exe $W_UNATTENDED_SLASH_Q ;; + fr*) w_try $WINE WindowsXP-KB915865-v11-x86-FRA.exe $W_UNATTENDED_SLASH_Q ;; + esac } #---------------------------------------------------------------- -w_metadata xvid dlls \ +w_metadata xvid dlls \ title="Xvid Video Codec" \ publisher="xvid.org" \ year="2009" \ media="download" \ - file1="Xvid-1.2.2-07062009.exe" \ + file1="Xvid-1.3.2-20110601.exe" \ installed_file1="$W_PROGRAMS_X86_WIN/Xvid/xvid.ico" load_xvid() { w_call vcrun6 - w_download http://www.koepi.info/Xvid-1.2.2-07062009.exe 435203e7f713c4484ca4f50f43e847f3dc118962 + w_download http://www.koepi.info/Xvid-1.3.2-20110601.exe 0a11498a96f75ad019c4c7d06161504140337dc0 cd "$W_CACHE"/xvid - w_try $WINE Xvid-1.2.2-07062009.exe $W_UNATTENDED_SLASH_SILENT + if w_workaround_wine_bug 27380 "Installing msvcr80 to avoid crash in setavi32.exe" + then + w_call vcrun2008 + fi + w_try $WINE $file1 ${W_OPT_UNATTENDED:+ --mode unattended --decode_divx 1 --decode_3ivx 1 --decode_other 1} } #---------------------------------------------------------------- @@ -5969,12 +6305,12 @@ load_xvid() #---------------------------------------------------------------- w_metadata baekmuk fonts \ - title="Baekmuk Korean fonts" \ - publisher="Wooderart Inc. / kldp.net" \ - year="1999" \ - media="download" \ - file1="ttf-baekmuk_2.2.orig.tar.gz" \ - installed_file1="$W_FONTSDIR_WIN/batang.ttf" + title="Baekmuk Korean fonts" \ + publisher="Wooderart Inc. / kldp.net" \ + year="1999" \ + media="download" \ + file1="ttf-baekmuk_2.2.orig.tar.gz" \ + installed_file1="$W_FONTSDIR_WIN/batang.ttf" load_baekmuk() { @@ -5993,10 +6329,10 @@ load_baekmuk() #---------------------------------------------------------------- w_metadata cjkfonts fonts \ - title="All Chinese, Japanese, Korean fonts and aliases" \ - publisher="various" \ - date="1999-2010" \ - media="download" + title="All Chinese, Japanese, Korean fonts and aliases" \ + publisher="various" \ + date="1999-2010" \ + media="download" load_cjkfonts() { @@ -6009,12 +6345,12 @@ load_cjkfonts() #---------------------------------------------------------------- w_metadata corefonts fonts \ - title="MS Arial, Courier, Times fonts" \ - publisher="Microsoft" \ - year="2008" \ - media="download" \ - file1="arial32.exe" \ - installed_file1="$W_FONTSDIR_WIN/Arial.TTF" + title="MS Arial, Courier, Times fonts" \ + publisher="Microsoft" \ + year="2008" \ + media="download" \ + file1="arial32.exe" \ + installed_file1="$W_FONTSDIR_WIN/Arial.TTF" load_corefonts() { @@ -6112,12 +6448,12 @@ load_corefonts() #---------------------------------------------------------------- w_metadata droid fonts \ - title="Droid fonts" \ - publisher="Ascender Corporation" \ - year="2009" \ - media="download" \ - file1="DroidSans-Bold.ttf" \ - installed_file1="$W_FONTSDIR_WIN/DroidSans-Bold.ttf" + title="Droid fonts" \ + publisher="Ascender Corporation" \ + year="2009" \ + media="download" \ + file1="DroidSans-Bold.ttf" \ + installed_file1="$W_FONTSDIR_WIN/DroidSans-Bold.ttf" do_droid() { w_download ${DROID_URL}$1';hb=HEAD' $3 $1 @@ -6144,12 +6480,12 @@ load_droid() #---------------------------------------------------------------- w_metadata eufonts fonts \ - title="Updated fonts for Romanian and Bulgarian" \ - publisher="Microsoft" \ - year="2008" \ - media="download" \ - file1="EUupdate.EXE" \ - installed_file1="$W_FONTSDIR_WIN/trebucbd.ttf" + title="Updated fonts for Romanian and Bulgarian" \ + publisher="Microsoft" \ + year="2008" \ + media="download" \ + file1="EUupdate.EXE" \ + installed_file1="$W_FONTSDIR_WIN/trebucbd.ttf" load_eufonts() { @@ -6178,9 +6514,9 @@ load_eufonts() #---------------------------------------------------------------- w_metadata fakechinese fonts \ - title="Creates aliases for Chinese fonts using WenQuanYi fonts" \ - publisher="wenq.org" \ - year="2009" + title="Creates aliases for Chinese fonts using WenQuanYi fonts" \ + publisher="wenq.org" \ + year="2009" load_fakechinese() { @@ -6199,9 +6535,9 @@ load_fakechinese() #---------------------------------------------------------------- w_metadata fakejapanese fonts \ - title="Creates aliases for Japanese fonts using Takao fonts" \ - publisher="Jun Kobayashi" \ - year="2010" + title="Creates aliases for Japanese fonts using Takao fonts" \ + publisher="Jun Kobayashi" \ + year="2010" load_fakejapanese() { @@ -6223,9 +6559,9 @@ load_fakejapanese() #---------------------------------------------------------------- w_metadata fakekorean fonts \ - title="Creates aliases for Korean fonts using Baekmuk fonts" \ - publisher="Wooderart Inc. / kldp.net" \ - year="1999" + title="Creates aliases for Korean fonts using Baekmuk fonts" \ + publisher="Wooderart Inc. / kldp.net" \ + year="1999" load_fakekorean() { @@ -6250,11 +6586,11 @@ load_fakekorean() #---------------------------------------------------------------- w_metadata fontfix fonts \ - title="Updated Arphic fonts" \ - publisher="Arphic" \ - year="2007" \ - media="download" \ - file1="ttf-arphic-ukai_0.1.20060108.orig.tar.gz" + title="Updated Arphic fonts" \ + publisher="Arphic" \ + year="2007" \ + media="download" \ + file1="ttf-arphic-ukai_0.1.20060108.orig.tar.gz" load_fontfix() { @@ -6298,12 +6634,12 @@ load_fontfix() #---------------------------------------------------------------- w_metadata liberation fonts \ - title="Red Hat Liberation fonts (Sans, Serif, Mono)" \ - publisher="Red Hat" \ - year="2008" \ - media="download" \ - file1="liberation-fonts-1.04.tar.gz" \ - installed_file1="$W_FONTSDIR_WIN/LiberationMono-BoldItalic.ttf" + title="Red Hat Liberation fonts (Sans, Serif, Mono)" \ + publisher="Red Hat" \ + year="2008" \ + media="download" \ + file1="liberation-fonts-1.04.tar.gz" \ + installed_file1="$W_FONTSDIR_WIN/LiberationMono-BoldItalic.ttf" load_liberation() { @@ -6339,12 +6675,12 @@ load_liberation() #---------------------------------------------------------------- w_metadata lucida fonts \ - title="MS Lucida Console font" \ - publisher="Microsoft" \ - year="1998" \ - media="download" \ - file1="eurofixi.exe" \ - installed_file1="$W_FONTSDIR_WIN/lucon.ttf" + title="MS Lucida Console font" \ + publisher="Microsoft" \ + year="1998" \ + media="download" \ + file1="eurofixi.exe" \ + installed_file1="$W_FONTSDIR_WIN/lucon.ttf" load_lucida() { @@ -6356,12 +6692,12 @@ load_lucida() #---------------------------------------------------------------- w_metadata opensymbol fonts \ - title="OpenSymbol fonts (replacement for Wingdings)" \ - publisher="OpenOffice.org" \ - year="2010" \ - media="download" \ - file1="ttf-opensymbol_3.2.1-11+squeeze2_all.deb" \ - installed_file1="$W_FONTSDIR_WIN/opens___.ttf" + title="OpenSymbol fonts (replacement for Wingdings)" \ + publisher="OpenOffice.org" \ + year="2010" \ + media="download" \ + file1="ttf-opensymbol_3.2.1-11+squeeze2_all.deb" \ + installed_file1="$W_FONTSDIR_WIN/opens___.ttf" load_opensymbol() { @@ -6380,12 +6716,12 @@ load_opensymbol() #---------------------------------------------------------------- w_metadata tahoma fonts \ - title="MS Tahoma font (not part of corefonts)" \ - publisher="Microsoft" \ - year="2007" \ - media="download" \ - file1="tahoma32.exe" \ - installed_file1="$W_FONTSDIR_WIN/tahoma.ttf" + title="MS Tahoma font (not part of corefonts)" \ + publisher="Microsoft" \ + year="2007" \ + media="download" \ + file1="tahoma32.exe" \ + installed_file1="$W_FONTSDIR_WIN/tahoma.ttf" load_tahoma() { @@ -6407,12 +6743,12 @@ load_tahoma() #---------------------------------------------------------------- w_metadata takao fonts \ - title="Takao Japanese fonts" \ - publisher="Jun Kobayashi" \ - year="2010" \ - media="download" \ - file1="takao-fonts-ttf-003.02.01.zip" \ - installed_file1="$W_FONTSDIR_WIN/TakaoGothic.ttf" + title="Takao Japanese fonts" \ + publisher="Jun Kobayashi" \ + year="2010" \ + media="download" \ + file1="takao-fonts-ttf-003.02.01.zip" \ + installed_file1="$W_FONTSDIR_WIN/TakaoGothic.ttf" load_takao() { @@ -6434,13 +6770,13 @@ load_takao() #---------------------------------------------------------------- w_metadata uff fonts \ - title="Ubuntu Font Family" \ - publisher="Ubuntu" \ - year="2010" \ - media="download" \ - file1="ubuntu-font-family-0.70.1.zip" \ - installed_file1="$W_FONTSDIR_WIN/Ubuntu-R.ttf" \ - homepage="https://launchpad.net/ubuntu-font-family" + title="Ubuntu Font Family" \ + publisher="Ubuntu" \ + year="2010" \ + media="download" \ + file1="ubuntu-font-family-0.70.1.zip" \ + installed_file1="$W_FONTSDIR_WIN/Ubuntu-R.ttf" \ + homepage="https://launchpad.net/ubuntu-font-family" load_uff() { @@ -6458,12 +6794,12 @@ load_uff() #---------------------------------------------------------------- w_metadata wenquanyi fonts \ - title="WenQuanYi CJK font" \ - publisher="wenq.org" \ - year="2009" \ - media="download" \ - file1="wqy-microhei-0.2.0-beta.tar.gz" \ - installed_file1="$W_FONTSDIR_WIN/wqy-microhei.ttc" + title="WenQuanYi CJK font" \ + publisher="wenq.org" \ + year="2009" \ + media="download" \ + file1="wqy-microhei-0.2.0-beta.tar.gz" \ + installed_file1="$W_FONTSDIR_WIN/wqy-microhei.ttc" load_wenquanyi() { @@ -6479,12 +6815,12 @@ load_wenquanyi() #---------------------------------------------------------------- w_metadata unifont fonts \ - title="Unifont alternative to Arial Unicode MS" \ - publisher="Roman Czyborra / GNU" \ - year="2008" \ - media="download" \ - file1="unifont-5.1.20080907.zip" \ - installed_file1="$W_FONTSDIR_WIN/unifont.ttf" + title="Unifont alternative to Arial Unicode MS" \ + publisher="Roman Czyborra / GNU" \ + year="2008" \ + media="download" \ + file1="unifont-5.1.20080907.zip" \ + installed_file1="$W_FONTSDIR_WIN/unifont.ttf" load_unifont() { @@ -6502,10 +6838,10 @@ load_unifont() #---------------------------------------------------------------- w_metadata allfonts fonts \ - title="All fonts" \ - publisher="various" \ - year="1998-2010" \ - media="download" + title="All fonts" \ + publisher="various" \ + year="1998-2010" \ + media="download" load_allfonts() { @@ -6525,12 +6861,12 @@ load_allfonts() #---------------------------------------------------------------- w_metadata 7zip apps \ - title="7-Zip" \ - publisher="Igor Pavlov" \ - year="1999" \ - media="download" \ - file1="7z465.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/7-Zip/7z.exe" + title="7-Zip" \ + publisher="Igor Pavlov" \ + year="1999" \ + media="download" \ + file1="7z465.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/7-Zip/7z.exe" load_7zip() { @@ -6543,13 +6879,13 @@ load_7zip() #---------------------------------------------------------------- -w_metadata abiword apps \ - title="AbiWord 2.8.6" \ - publisher="AbiSource" \ - year="2010" \ - media="download" \ - file1="abiword-setup-2.8.6.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/AbiWord/bin/AbiWord.exe" +w_metadata abiword apps \ + title="AbiWord 2.8.6" \ + publisher="AbiSource" \ + year="2010" \ + media="download" \ + file1="abiword-setup-2.8.6.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/AbiWord/bin/AbiWord.exe" load_abiword() { @@ -6561,13 +6897,97 @@ load_abiword() #---------------------------------------------------------------- +w_metadata adobe_diged apps \ + title="Adobe Digital Editions" \ + publisher="Adobe" \ + year="2011" \ + media="download" \ + file1="setup.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Adobe/Adobe Digital Editions/digitaleditions.exe" \ + homepage="http://www.adobe.com/products/digitaleditions/" + +load_adobe_diged() +{ + w_download http://kb2.adobe.com/cps/403/kb403051/attachments/setup.exe 4c79685408fa6ca12ef8bb0e0eaa4a846e21f915 + # NSIS installer + w_try $WINE "$W_CACHE"/$W_PACKAGE/setup.exe ${W_OPT_UNATTENDED:+ /S} + w_declare_exe "$W_PROGRAMS_X86_WIN\\Adobe\\Adobe Digital Editions" \ + digitaleditions.exe +} + +#---------------------------------------------------------------- + +w_metadata audible apps \ + title="Audible.com Manager / Player" \ + publisher="Audible" \ + year="2011" \ + media="download" \ + file1="ActiveSetupN.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Audible/Bin/Manager.exe" \ + homepage="http://www.audible.com" + +load_audible() +{ + w_download http://download.audible.com/AM50/ActiveSetupN.exe 49f501471912ccca442bcc1c8f2c69160579f712 + cd "$W_CACHE/$W_PACKAGE" + w_ahk_do " + SetWinDelay 500 + SetTitleMatchMode, 2 + Run, $file1 + WinWait, AudibleManager Setup + ControlClick, Button3 ; accept + WinWait, AudibleManager Setup, Start by + ControlClick, Button6 ; OK + WinWaitClose + WinWait, AudibleManager ; the dang thing starts up + WinKill + " + w_declare_exe "$W_PROGRAMS_X86_WIN\\Audible\\Bin" Manager.exe +} + +#---------------------------------------------------------------- + +w_metadata audibledm apps \ + title="Audible.com Download Manager" \ + publisher="Audible" \ + year="2011" \ + media="download" \ + file1="AudibleDM_iTunesSetup.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Audible/Bin/AudibleDownloadHelper.exe" \ + homepage="http://www.audible.com" + +load_audibledm() +{ + w_download http://download.audible.com/AM50/AudibleDM_iTunesSetup.exe 03261d77a59ebbceedf6683b5301c162bc0c7788 + cd "$W_CACHE/$W_PACKAGE" + w_ahk_do " + SetWinDelay 500 + SetTitleMatchMode, 2 + Run, AudibleDM_iTunesSetup.exe + WinWait, Audible Download Manager Setup + ControlClick, Button2 ; accept + WinWait, Audible Download Manager Setup, Choose where + ControlClick, Button1 ; OK + WinWait, Audible Download Manager Setup, Manage + ControlClick, Button1 ; OK + WinWait, Audible Download Manager Setup, success + ControlClick, Button1 ; OK + WinWaitClose + WinWait, Audible Download Manager ; the dang thing starts up + WinKill + " + w_declare_exe "$W_PROGRAMS_X86_WIN\\Audible\\Bin" AudibleDownloadHelper.exe +} + +#---------------------------------------------------------------- + w_metadata autohotkey apps \ - title="Autohotkey" \ - publisher="autohotkey.org" \ - year="2010" \ - media="download" \ - file1="AutoHotkey104805_Install.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/AutoHotkey/AutoHotkey.exe" + title="Autohotkey" \ + publisher="autohotkey.org" \ + year="2010" \ + media="download" \ + file1="AutoHotkey104805_Install.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/AutoHotkey/AutoHotkey.exe" load_autohotkey() { @@ -6580,13 +7000,13 @@ load_autohotkey() #---------------------------------------------------------------- w_metadata borders apps \ - title="Borders Desktop (Kobo e-book reader)" \ - publisher="Kobo" \ - year="2011" \ - media="download" \ - file1="KoboSetup.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/Borders Desktop/Borders Desktop.exe" \ - homepage="http://www.borders.com/online/store/MediaView_ereaderapps" + title="Borders Desktop (Kobo e-book reader)" \ + publisher="Kobo" \ + year="2011" \ + media="download" \ + file1="KoboSetup.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Borders Desktop/Borders Desktop.exe" \ + homepage="http://www.borders.com/online/store/MediaView_ereaderapps" load_borders() { @@ -6599,12 +7019,12 @@ load_borders() #---------------------------------------------------------------- w_metadata cmake apps \ - title="CMake 2.8" \ - publisher="Kitware" \ - year="2010" \ - media="download" \ - file1="cmake-2.8.2-win32-x86.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/CMake 2.8/bin/cmake-gui.exe" + title="CMake 2.8" \ + publisher="Kitware" \ + year="2010" \ + media="download" \ + file1="cmake-2.8.2-win32-x86.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/CMake 2.8/bin/cmake-gui.exe" load_cmake() { @@ -6618,12 +7038,12 @@ load_cmake() #---------------------------------------------------------------- w_metadata colorprofile apps \ - title="Standard RGB color profile" \ - publisher="Microsoft" \ - year="2005" \ - media="download" \ - file1="ColorProfile.exe" \ - installed_exe1="c:/windows/system32/spool/drivers/color/sRGB Color Space Profile.icm" + title="Standard RGB color profile" \ + publisher="Microsoft" \ + year="2005" \ + media="download" \ + file1="ColorProfile.exe" \ + installed_exe1="c:/windows/system32/spool/drivers/color/sRGB Color Space Profile.icm" load_colorprofile() { @@ -6638,12 +7058,12 @@ load_colorprofile() #---------------------------------------------------------------- w_metadata controlpad apps \ - title="MS ActiveX Control Pad" \ - publisher="Microsoft" \ - year="1997" \ - media="download" \ - file1="setuppad.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/ActiveX Control Pad/PED.EXE" + title="MS ActiveX Control Pad" \ + publisher="Microsoft" \ + year="1997" \ + media="download" \ + file1="setuppad.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/ActiveX Control Pad/PED.EXE" load_controlpad() { @@ -6672,12 +7092,12 @@ load_controlpad() #---------------------------------------------------------------- w_metadata cygwin apps \ - title="cygwin" \ - publisher="Red Hat" \ - year="2009" \ - media="download" \ - file1="setup.exe" \ - installed_exe1="C:/cygwin/bin/sh.exe" + title="cygwin" \ + publisher="Red Hat" \ + year="2009" \ + media="download" \ + file1="setup.exe" \ + installed_exe1="C:/cygwin/bin/sh.exe" load_cygwin() { @@ -6708,12 +7128,12 @@ load_cygwin() # dxdiag is a system component that one usually adds to an existing wineprefix, # so it belongs in 'dlls', not apps. w_metadata dxdiag dlls \ - title="DirectX Diagnostic Tool" \ - publisher="Microsoft" \ - year="2010" \ - media="download" \ - file1="../directx9/directx_feb2010_redist.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/dxdiag.exe" + title="DirectX Diagnostic Tool" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="../directx9/directx_feb2010_redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/dxdiag.exe" load_dxdiag() { @@ -6741,19 +7161,46 @@ load_dxdiag() #---------------------------------------------------------------- -w_metadata firefox3 apps \ - title="Firefox 3.6.17" \ - publisher="Mozilla" \ - year="2011" \ - media="download" \ - file1="Firefox Setup 3.6.17.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/Mozilla Firefox/firefox.exe" +w_metadata firefox35 apps \ + title="Firefox 3.5" \ + publisher="Mozilla" \ + year="2011" \ + media="download" \ + file1="Firefox Setup 3.5.19.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Mozilla Firefox/firefox.exe" -load_firefox3() +load_firefox35() { - w_download "http://download.mozilla.org/?product=firefox-3.6.17&os=win&lang=en-US" 193ea12732e52d8195e96ba22289e83afbed09f4 "Firefox Setup 3.6.17.exe" - cd "$W_CACHE"/firefox3 - w_try $WINE "Firefox Setup 3.6.17.exe" ${W_OPT_UNATTENDED:+ -ms} + w_download "ftp://archive.mozilla.org/pub/mozilla.org/firefox/releases/3.5.19/win32/en-US/Firefox%20Setup%203.5.19.exe" 14c3852e9693b5f17982fa01a0d29f9d1422be79 "$file1" + cd "$W_CACHE"/firefox35 + w_try $WINE "$file1" ${W_OPT_UNATTENDED:+ -ms} + + w_declare_exe "$W_PROGRAMS_X86_WIN\\Mozilla Firefox" firefox.exe + + myexec="Exec=env WINEPREFIX=\"$HOME/.local/share/wineprefixes/firefox\" wine cmd /c 'C:\\\\\\Run-firefox.bat'" + mymenu="$HOME/.local/share/applications/wine/Programs/Mozilla Firefox/Mozilla Firefox.desktop" + if test -f "$mymenu" && w_workaround_wine_bug 26304 "Fixing system menu" + then + # this is a hack, hopefully the wine bug will be fixed soon + sed -i "s,Exec=.*,$myexec," "$mymenu" + fi +} + +#---------------------------------------------------------------- + +w_metadata firefox36 apps \ + title="Firefox 3.6 (broken in wine)" \ + publisher="Mozilla" \ + year="2011" \ + media="download" \ + file1="Firefox Setup 3.6.18.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Mozilla Firefox/firefox.exe" + +load_firefox36() +{ + w_download "http://download.mozilla.org/?product=firefox-3.6.18&os=win&lang=en-US" c6673047eec8b909fad67f387e3ef8f8f43d54e3 "$file1" + cd "$W_CACHE"/firefox36 + w_try $WINE "$file1" ${W_OPT_UNATTENDED:+ -ms} w_declare_exe "$W_PROGRAMS_X86_WIN\\Mozilla Firefox" firefox.exe @@ -6769,12 +7216,12 @@ load_firefox3() #---------------------------------------------------------------- w_metadata firefox apps \ - title="Firefox 4.0.1" \ - publisher="Mozilla" \ - year="2011" \ - media="download" \ - file1="Firefox Setup 4.0.1.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/Mozilla Firefox/firefox.exe" + title="Firefox 5 (broken in wine)" \ + publisher="Mozilla" \ + year="2011" \ + media="download" \ + file1="Firefox Setup 5.0.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Mozilla Firefox/firefox.exe" load_firefox() { @@ -6783,9 +7230,9 @@ load_firefox() w_die "Requires wine-1.3.0 or later to install" fi - w_download "http://download.mozilla.org/?product=firefox-4.0.1&os=win&lang=en-US" 54a5d25ae3a4e342268fbc91d240770e9b17fbaf "Firefox Setup 4.0.1.exe" + w_download "http://download.mozilla.org/?product=firefox-5.0&os=win&lang=en-US" 288895db0a58b91801c5c1dfc0017131300dba00 "$file1" cd "$W_CACHE"/firefox - w_try $WINE "Firefox Setup 4.0.1.exe" ${W_OPT_UNATTENDED:+ -ms} + w_try $WINE "$file1" ${W_OPT_UNATTENDED:+ -ms} w_declare_exe "$W_PROGRAMS_X86_WIN\\Mozilla Firefox" firefox.exe } @@ -6793,13 +7240,13 @@ load_firefox() #---------------------------------------------------------------- w_metadata fontxplorer apps \ - title="Font Xplorer 1.2.2" \ - publisher="Moon Software" \ - year="2001" \ - media="download" \ - file1="Font_Xplorer_122_Free.exe" \ - installed_file1="$W_PROGRAMS_X86_WIN/Font Xplorer/FXplorer.exe" \ - homepage="http://www.moonsoftware.com/fxplorer.asp" + title="Font Xplorer 1.2.2" \ + publisher="Moon Software" \ + year="2001" \ + media="download" \ + file1="Font_Xplorer_122_Free.exe" \ + installed_file1="$W_PROGRAMS_X86_WIN/Font Xplorer/FXplorer.exe" \ + homepage="http://www.moonsoftware.com/fxplorer.asp" load_fontxplorer() { @@ -6812,15 +7259,85 @@ load_fontxplorer() #---------------------------------------------------------------- +w_metadata irfanview apps \ + title="Irfanview" \ + publisher="Irfan Skiljan" \ + year="2011" \ + media="download" \ + file1="iview428_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 + + if w_workaround_wine_bug 657 "Installing mfc42" + then + w_call mfc42 + fi + + cd "$W_CACHE/$W_PACKAGE" + if test "$W_OPT_UNATTENDED" + then + w_ahk_do " + SetWinDelay 200 + SetTitleMatchMode, 2 + run $file1 + winwait, Setup, This program will install + winactivate, Setup, This program will install + winwaitactive, Setup, This program will install + send !a ; set up for all users + send n ; next + winwait, Setup, new in this version + winactivate, Setup, new in this version + winwaitactive, Setup, new in this version + send n ; skip release notes + winwait, Setup, Do you want to associate extensions + winactivate, Setup, Do you want to associate extensions + winwaitactive, Setup, Do you want to associate extensions + send n ; don't associate any extensions (default) + Loop + { + ifWinExist, Setup, Ready to install + { + break + } + ifWinExist, Setup, Google Chrome + { + winactivate, Setup, Google Chrome + winwaitactive, Setup, Google Chrome + send !c ; decline Chrome + send !n + continue + } + sleep 500 + } + winwait, Setup, Ready to install + send n ; default .ini folder + WinWait, IrfanView Setup, successfull ; sic + send !s ; do not launch + send d ; done + winwaitclose + " + else + w_try "$WINE" $file1 + fi + w_declare_exe "$W_PROGRAMS_X86_WIN\\IrfanView" "i_view32.exe" +} + +#---------------------------------------------------------------- + # 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" \ - installed_file1="c:/Program Files/Internet Explorer/iedetect.dll" + title="Internet Explorer 6" \ + publisher="Microsoft" \ + year="2002" \ + media="download" \ + file1="ie60.exe" \ + installed_file1="c:/Program Files/Internet Explorer/iedetect.dll" load_ie6() { @@ -6844,7 +7361,7 @@ load_ie6() 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 mlang mshtml msimtf shdoclc shdocvw shlwapi urlmon + w_override_dlls native,builtin iexplore.exe inetcpl.cpl itircl itss jscript mlang mshtml msimtf shdoclc shdocvw shlwapi urlmon # Remove the fake dlls, if any mv "$W_PROGRAMS_UNIX"/"Internet Explorer"/iexplore.exe "$W_PROGRAMS_UNIX"/"Internet Explorer"/iexplore.exe.bak @@ -6859,7 +7376,10 @@ load_ie6() # Workaround http://bugs.winehq.org/show_bug.cgi?id=21009 # See also http://code.google.com/p/winezeug/issues/detail?id=78 - rm -f "$W_SYSTEM32_DLLS"/browseui.dll "$W_SYSTEM32_DLLS"/inseng.dll + rm -f "$W_SYSTEM32_DLLS"/browseui.dll "$W_SYSTEM32_DLLS"/inseng.dll + + # Otherwise regsvr32 crashes later + rm -f "$W_SYSTEM32_DLLS"/inetcpl.cpl # Work around http://bugs.winehq.org/show_bug.cgi?id=25432 w_try_cabextract -F inseng.dll "$W_TMP/IE 6.0 Full/ACTSETUP.CAB" @@ -6885,8 +7405,8 @@ load_ie6() # FIXME: whittle down this list cd "$W_SYSTEM32_DLLS" 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 inseng.dll isetup.dll jscript.dll laprxy.dll \ + dispex.dll dsound.dll iedkcs32.dll iepeers.dll iesetup.dll imgutil.dll \ + inetcomm.dll inetcpl.cpl inseng.dll isetup.dll jscript.dll laprxy.dll \ mlang.dll mshtml.dll mshtmled.dll msi.dll msident.dll \ msoeacct.dll msrating.dll mstime.dll msxml3.dll occache.dll \ ole32.dll oleaut32.dll olepro32.dll pngfilt.dll quartz.dll \ @@ -6908,12 +7428,12 @@ load_ie6() #---------------------------------------------------------------- w_metadata ie7 dlls \ - title="Internet Explorer 7" \ - publisher="Microsoft" \ - year="2008" \ - media="download" \ - file1="IE7-WindowsXP-x86-enu.exe" \ - installed_file1="c:/windows/ie7.log" + title="Internet Explorer 7" \ + publisher="Microsoft" \ + year="2008" \ + media="download" \ + file1="IE7-WindowsXP-x86-enu.exe" \ + installed_file1="c:/windows/ie7.log" load_ie7() { @@ -7002,12 +7522,12 @@ load_ie7() #---------------------------------------------------------------- w_metadata ie8 dlls \ - title="Internet Explorer 8" \ - publisher="Microsoft" \ - year="2009" \ - media="download" \ - file1="IE8-WindowsXP-x86-ENU.exe" \ - installed_file1="c:/windows/ie8_main.log" + title="Internet Explorer 8" \ + publisher="Microsoft" \ + year="2009" \ + media="download" \ + file1="IE8-WindowsXP-x86-ENU.exe" \ + installed_file1="c:/windows/ie8_main.log" load_ie8() { @@ -7106,13 +7626,13 @@ _EOF_ #---------------------------------------------------------------- w_metadata mingw apps \ - title="Minimalist GNU for Windows, including GCC for Windows" \ - publisher="GNU" \ - year="2010-2011" \ - media="download" \ - file1="binutils-2.21-2-mingw32-bin.tar.lzma" \ - installed_exe1="c:/MinGW/bin/gcc.exe" \ - homepage="http://mingw.org/wiki/Getting_Started" + title="Minimalist GNU for Windows, including GCC for Windows" \ + publisher="GNU" \ + year="2010-2011" \ + media="download" \ + file1="binutils-2.21-2-mingw32-bin.tar.lzma" \ + installed_exe1="c:/MinGW/bin/gcc.exe" \ + homepage="http://mingw.org/wiki/Getting_Started" load_mingw() { @@ -7150,13 +7670,13 @@ load_mingw() #---------------------------------------------------------------- w_metadata mpc apps \ - title="Media Player Classic - Home Cinema" \ - publisher="doom9 folks" \ - year="2010" \ - media="download" \ - file1="MPC-HomeCinema.1.4.2499.0.x86.zip" \ - installed_file1="$W_PROGRAMS_X86_WIN/Media Player Classic/mpc-hc.exe" \ - homepage="http://mpc-hc.sourceforge.net" + title="Media Player Classic - Home Cinema" \ + publisher="doom9 folks" \ + year="2010" \ + media="download" \ + file1="MPC-HomeCinema.1.4.2499.0.x86.zip" \ + installed_file1="$W_PROGRAMS_X86_WIN/Media Player Classic/mpc-hc.exe" \ + homepage="http://mpc-hc.sourceforge.net" load_mpc() { @@ -7172,12 +7692,12 @@ load_mpc() #---------------------------------------------------------------- w_metadata mspaint apps \ - title="MS Paint" \ - publisher="Microsoft" \ - year="2001" \ - media="download" \ - file1="paintnt.exe" \ - installed_exe1="c:/windows/MSPAINT.EXE" + title="MS Paint" \ + publisher="Microsoft" \ + year="2001" \ + media="download" \ + file1="paintnt.exe" \ + installed_exe1="c:/windows/MSPAINT.EXE" load_mspaint() { @@ -7191,13 +7711,13 @@ load_mspaint() #---------------------------------------------------------------- w_metadata nook apps \ - title="Nook for PC (e-book reader)" \ - publisher="Barnes & Noble" \ - year="2011" \ - media="download" \ - file1="bndr2_setup_latest.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/Barnes & Noble/BNDesktopReader/BNDReader.exe" \ - homepage="http://www.barnesandnoble.com/u/free-nook-apps/379002321/" + title="Nook for PC (e-book reader)" \ + publisher="Barnes & Noble" \ + year="2011" \ + media="download" \ + file1="bndr2_setup_latest.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Barnes & Noble/BNDesktopReader/BNDReader.exe" \ + homepage="http://www.barnesandnoble.com/u/free-nook-apps/379002321/" load_nook() { @@ -7206,7 +7726,8 @@ load_nook() w_download \ http://images.barnesandnoble.com/PResources/download/eReader2/bndr2_setup_latest.exe \ 4a06a529b93ed33c3518326d874b40d8d7b70e7a - $WINE $W_CACHE/nook/$file1 ${W_OPT_UNATTENDED:+ /S} + cd "$W_CACHE"/nook + $WINE $file1 ${W_OPT_UNATTENDED:+ /S} # normally has exit status 199? w_declare_exe "$W_PROGRAMS_WIN\\Barnes & Noble\\BNDesktopReader" "BNDReader.exe" } @@ -7214,12 +7735,12 @@ load_nook() #---------------------------------------------------------------- w_metadata office2003pro apps \ - title="Microsoft Office 2003 Professional" \ - publisher="Microsoft" \ - year="2002" \ - media="cd" \ - file1="setup.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/Microsoft Office/Office11/WINWORD.EXE" + title="Microsoft Office 2003 Professional" \ + publisher="Microsoft" \ + year="2002" \ + media="cd" \ + file1="setup.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Microsoft Office/Office11/WINWORD.EXE" load_office2003pro() { @@ -7271,24 +7792,24 @@ load_office2003pro() #---------------------------------------------------------------- w_metadata office2007pro apps \ - title="Microsoft Office 2007 Professional" \ - publisher="Microsoft" \ - year="2006" \ - media="cd" \ - file1="setup.exe" \ - installed_file1="$W_PROGRAMS_X86_WIN/Microsoft Office/Office12/WINWORD.EXE" + title="Microsoft Office 2007 Professional" \ + publisher="Microsoft" \ + year="2006" \ + media="cd" \ + file1="setup.exe" \ + installed_file1="$W_PROGRAMS_X86_WIN/Microsoft Office/Office12/WINWORD.EXE" load_office2007pro() { if w_workaround_wine_bug 14980 "Using native riched20" then - w_override_app_dlls winword.exe n riched20 - w_override_app_dlls excel.exe n riched20 - w_override_app_dlls powerpnt.exe n riched20 - w_override_app_dlls msaccess.exe n riched20 - w_override_app_dlls outlook.exe n riched20 - w_override_app_dlls mspub.exe n riched20 - w_override_app_dlls infopath.exe n riched20 + w_override_app_dlls winword.exe n riched20 + w_override_app_dlls excel.exe n riched20 + w_override_app_dlls powerpnt.exe n riched20 + w_override_app_dlls msaccess.exe n riched20 + w_override_app_dlls outlook.exe n riched20 + w_override_app_dlls mspub.exe n riched20 + w_override_app_dlls infopath.exe n riched20 fi w_mount OFFICE12 @@ -7336,16 +7857,16 @@ $W_CACHE/$W_PACKAGE/key.txt and rerun." #---------------------------------------------------------------- w_metadata opera apps \ - title="Opera 11" \ - publisher="Opera Software" \ - year="2011" \ - media="download" \ - file1="Opera_1110_en_Setup.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/Opera/opera.exe" + title="Opera 11" \ + publisher="Opera Software" \ + year="2011" \ + media="download" \ + file1="Opera_1111_en_Setup.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Opera/opera.exe" load_opera() { - w_download "ftp://ftp.opera.com/pub/opera/win/1110/en/Opera_1110_en_Setup.exe" e0aa457b0fbe3d2caca1eb1d9a311dcd85ba7e14 + w_download ftp://ftp.opera.com/pub/opera/win/1111/en/Opera_1111_en_Setup.exe 36c34feb0fa7e4611bb0480a38d51a16bc9443d8 cd "$W_CACHE"/$W_PACKAGE w_try $WINE $file1 ${W_OPT_UNATTENDED:+ /silent /launchopera 0 /allusers} w_declare_exe "$W_PROGRAMS_X86_WIN\\Opera" opera.exe @@ -7354,12 +7875,12 @@ load_opera() #---------------------------------------------------------------- w_metadata psdk2003 apps \ - title="MS Platform SDK 2003" \ - publisher="Microsoft" \ - year="2003" \ - media="download" \ - file1="PSDK-x86.exe" \ - installed_file1="$W_PROGRAMS_X86_WIN/Microsoft Platform SDK for Windows Server 2003 R2/SetEnv.Cmd" + title="MS Platform SDK 2003" \ + publisher="Microsoft" \ + year="2003" \ + media="download" \ + file1="PSDK-x86.exe" \ + installed_file1="$W_PROGRAMS_X86_WIN/Microsoft Platform SDK for Windows Server 2003 R2/SetEnv.Cmd" load_psdk2003() { @@ -7379,12 +7900,12 @@ load_psdk2003() #---------------------------------------------------------------- w_metadata psdkwin7 apps \ - title="MS Windows 7 SDK" \ - publisher="Microsoft" \ - year="2009" \ - media="download" \ - file1="winsdk_web.exe" \ - installed_exe1="C:/Program Files/Microsoft SDKs/Windows/v7.0/Bin/SetEnv.Cmd" + title="MS Windows 7 SDK" \ + publisher="Microsoft" \ + year="2009" \ + media="download" \ + file1="winsdk_web.exe" \ + installed_exe1="C:/Program Files/Microsoft SDKs/Windows/v7.0/Bin/SetEnv.Cmd" load_psdkwin7() { @@ -7430,12 +7951,12 @@ _EOF_ #---------------------------------------------------------------- w_metadata python26 apps \ - title="Python Interpreter, version 2.6.2" \ - publisher="Python Software Foundaton" \ - year="2009" \ - media="download" \ - file1="python-2.6.2.msi" \ - installed_exe1="c:/Python26/python.exe" + title="Python Interpreter, version 2.6.2" \ + publisher="Python Software Foundaton" \ + year="2009" \ + media="download" \ + file1="python-2.6.2.msi" \ + installed_exe1="c:/Python26/python.exe" load_python26() { @@ -7487,20 +8008,28 @@ load_python26_comtypes() #---------------------------------------------------------------- w_metadata spotify apps \ - title="Spotify - All the music, all the time" \ - publisher="Spotify" \ - year="2011" \ - media="download" \ - file1="SpotifyInstaller.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/Spotify/spotify.exe" + title="Spotify - All the music, all the time" \ + publisher="Spotify" \ + year="2011" \ + media="download" \ + file1="SpotifyInstaller.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Spotify/spotify.exe" load_spotify() { # 0.4.9 f26712b576baa1c78112a05474293deef39f7f62 # 29 Apr 2011 0.4.10 4becb04f8ad08a3ff59d6830bf1d998fcca1815b - w_download http://www.spotify.com/download/Spotify%20Installer.exe 4becb04f8ad08a3ff59d6830bf1d998fcca1815b SpotifyInstaller.exe + # 7 may 2011 a3c7daecf1051c4aaab544e6b66753617c0706b1 + # updates too frequently to check checksum :-( + w_download http://www.spotify.com/download/Spotify%20Installer.exe cd "$W_CACHE"/spotify + # w_download doesn't handle renaming for us without a checksum, tsk. + # And autohotkey thinks % is a variable reference. + if test ! -f SpotifyInstaller.exe + then + cp Spotify%20Installer.exe SpotifyInstaller.exe + fi w_ahk_do " SetTitleMatchMode, 2 @@ -7523,13 +8052,13 @@ load_spotify() #---------------------------------------------------------------- -w_metadata safari apps \ - title="Safari" \ - publisher="Apple" \ - year="2010" \ - media="download" \ - file1="SafariSetup.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/Safari/Safari.exe" +w_metadata safari apps \ + title="Safari" \ + publisher="Apple" \ + year="2010" \ + media="download" \ + file1="SafariSetup.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Safari/Safari.exe" load_safari() { @@ -7566,12 +8095,12 @@ _EOF_ #---------------------------------------------------------------- w_metadata sketchup apps \ - title="Sketchup 8" \ - publisher="Google" \ - year="2010" \ - media="download" \ - file1="GoogleSketchUpWEN.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/Google/Google SketchUp 8/SketchUp.exe" + title="Sketchup 8" \ + publisher="Google" \ + year="2010" \ + media="download" \ + file1="GoogleSketchUpWEN.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Google/Google SketchUp 8/SketchUp.exe" load_sketchup() { @@ -7645,12 +8174,12 @@ load_songbird() #---------------------------------------------------------------- w_metadata steam apps \ - title="Steam" \ - publisher="Valve" \ - year="2010" \ - media="download" \ - file1="SteamInstall.msi" \ - installed_exe1="$W_PROGRAMS_X86_WIN/Steam/Steam.exe" + title="Steam" \ + publisher="Valve" \ + year="2010" \ + media="download" \ + file1="SteamInstall.msi" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Steam/Steam.exe" load_steam() { @@ -7659,7 +8188,7 @@ load_steam() cd "$W_CACHE"/steam w_try $WINE msiexec /i SteamInstall.msi $W_UNATTENDED_SLASH_Q if ! test -f "$W_FONTSDIR_UNIX/Times.TTF" && \ - w_workaround_wine_bug 22751 "Installing corefonts to prevent a Steam crash" + w_workaround_wine_bug 22751 "Installing corefonts to prevent a Steam crash" then w_call corefonts fi @@ -7675,12 +8204,12 @@ load_steam() #---------------------------------------------------------------- w_metadata utorrent apps \ - title="µTorrent 2.2.1" \ - publisher="BitTorrent" \ - year="2011" \ - media="download" \ - file1="utorrent.exe" \ - installed_exe1="c:/windows/utorrent.exe" + title="µTorrent 2.2.1" \ + publisher="BitTorrent" \ + year="2011" \ + media="download" \ + file1="utorrent.exe" \ + installed_exe1="c:/windows/utorrent.exe" load_utorrent() { @@ -7691,7 +8220,9 @@ load_utorrent() # Feb 11 2011 2.2.1beta sha1sum 82e81e1484b4e8654b83908509f3777532c6fcb3 # Mar 28 2011 2.2.1 sha1sum 7049109e4d3f72338d54b42ae37ecf38fafed46f # Apr 14 2011 2.2.1 sha1sum b1378d7cbe5d1e1b168ce44def8f59facdc046d5 - w_download http://download.utorrent.com/2.2.1/utorrent.exe b1378d7cbe5d1e1b168ce44def8f59facdc046d5 + # 7 May 2011 sha1sum 2932c9ed1c1225e485f7e3dd2ed267aa7d568c80 + # 14 May 2011 removed checksum, updates too quickly to track :-( + w_download http://download.utorrent.com/2.2.1/utorrent.exe w_try cp -f "$W_CACHE/utorrent/utorrent.exe" "$W_WINDIR_UNIX"/utorrent.exe @@ -7701,18 +8232,20 @@ load_utorrent() #---------------------------------------------------------------- w_metadata utorrent3 apps \ - title="µTorrent 3.0" \ - publisher="BitTorrent" \ - year="2011" \ - media="download" \ - file1="utorrent-3.0-latest.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/uTorrent/uTorrent.exe" + title="µTorrent 3.0" \ + publisher="BitTorrent" \ + year="2011" \ + media="download" \ + file1="utorrent-3.0-latest.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/uTorrent/uTorrent.exe" load_utorrent3() { # 15 Apr 2011: sha1sum a5f198207919e8f2091a9b4459d7d6fc8a63e874 # 27 Apr 2011: sha1sum d969f0c61cf2b2afaea4121f097ef690dffbf771 - w_download http://download.utorrent.com/beta/utorrent-3.0-latest.exe d969f0c61cf2b2afaea4121f097ef690dffbf771 + # 7 May 2011: sha1sum 1793a7b15d905a9fa82f9a969a96fa53abaac04c + # 14 May: removed checksum, changes too often to track + w_download http://download.utorrent.com/beta/utorrent-3.0-latest.exe case "$W_OPT_UNATTENDED" in 0) _W_opt="" ;; @@ -7767,7 +8300,7 @@ load_vc2005express() chmod +x Ixpvc.exe # Add /qn after ReallySuppress for a really silent install (but then you won't see any errors) - w_try $WINE Ixpvc /t:"$W_TMP_WIN" /q:a /c:"msiexec /i vcsetup.msi VSEXTUI=1 ADDLOCAL=ALL REBOOT=ReallySuppress" + w_try $WINE Ixpvc.exe /t:"$W_TMP_WIN" /q:a /c:"msiexec /i vcsetup.msi VSEXTUI=1 ADDLOCAL=ALL REBOOT=ReallySuppress" else if w_workaround_wine_bug 25331 @@ -7855,13 +8388,13 @@ load_vc2005trial() #---------------------------------------------------------------- w_metadata vlc apps \ - title="VLC media player" \ - publisher="videolan.org" \ - year="2010" \ - media="download" \ - file1="vlc-1.1.9-win32.exe" \ - installed_file1="$W_PROGRAMS_X86_WIN/VideoLAN/VLC/vlc.exe" \ - homepage="http://www.videolan.org/vlc/" + title="VLC media player" \ + publisher="videolan.org" \ + year="2010" \ + media="download" \ + file1="vlc-1.1.9-win32.exe" \ + installed_file1="$W_PROGRAMS_X86_WIN/VideoLAN/VLC/vlc.exe" \ + homepage="http://www.videolan.org/vlc/" load_vlc() { @@ -7873,13 +8406,86 @@ load_vlc() #---------------------------------------------------------------- +w_metadata winamp apps \ + title="Winamp" \ + publisher="AOL (Nullsoft)" \ + year="2011" \ + media="download" \ + file1="winamp561_full_emusic-7plus_en-us.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Winamp/winamp.exe" \ + homepage="http://www.winamp.com" + +load_winamp() +{ + w_info "may send information while installing, see http://www.microsoft.com/security/portal/Threat/Encyclopedia/Entry.aspx?threatid=159633" + w_download \ + http://download.nullsoft.com/winamp/client/winamp561_full_emusic-7plus_en-us.exe 21eeab7c68beba0acd59ec452b772641ae784d0a + cd "$W_CACHE/$W_PACKAGE" + if test $W_OPT_UNATTENDED + then + w_ahk_do " + SetWinDelay 500 + SetTitleMatchMode, 2 + Run $file1 + WinWait, Winamp Installer, Welcome to the Winamp installer + ControlClick, Button2 + WinWait, Winamp Installer, License Agreement + ControlClick, Button2 + WinWait, Winamp Installer, Choose Install Location + ControlClick, Button2 + WinWait, Winamp Installer, Choose Components + ControlClick, Button2 + WinWait, Winamp Installer, Choose Start Options + ControlClick, Button2 + WinWait, Winamp Installer, Get the Most Out of Winamp + ControlClick, Button4 ; decline Winamp toolbar + Sleep 200 + ControlClick, Button5 ; decline AOL Search + Sleep 200 + ControlClick, Button6 ; decline eMusic + Sleep 200 + ControlClick, Button2 + Loop + { + ifWinExist, Winamp Installer, Installation Complete + { + break + } + ifWinExist, Winamp Installer, Recommended + { + WinActivate, Winamp Installer, Recommended + WinWaitActive, Winamp Installer, Recommended + MouseClick, left, 32, 279 ; decline OpenCandy offers + Sleep 200 + ControlClick, Button2 + WinWaitClose, Winamp Installer, Recommended + continue + } + Sleep 200 + } + WinWait, Winamp Installer, Installation Complete + WinActivate, Winamp Installer, Installation Complete + WinWaitActive, Winamp Installer, Installation Complete + send {Tab}{Tab}{Tab}{Space} ; don't launch + Sleep 500 + send {Enter} ; Finish + WinWaitClose + " + else + w_try "$WINE" "$file1" + fi + w_declare_exe "$W_PROGRAMS_X86_WIN\\Winamp" "winamp.exe" +} + +#---------------------------------------------------------------- + w_metadata wme9 apps \ - title="MS Windows Media Encoder 9 (broken in wine)" \ - publisher="Microsoft" \ - year="2002" \ - media="download" \ - file1="WMEncoder.exe" \ - installed_file1="$W_PROGRAMS_X86_WIN/Windows Media Components/Encoder/wmenc.exe" + title="MS Windows Media Encoder 9 (broken in wine)" \ + publisher="Microsoft" \ + year="2002" \ + media="download" \ + file1="WMEncoder.exe" \ + installed_file1="$W_PROGRAMS_X86_WIN/Windows Media Components/Encoder/wmenc.exe" load_wme9() { @@ -7912,12 +8518,12 @@ load_wm9codecs() } w_metadata wmp9 dlls \ - title="Windows Media Player 9" \ - publisher="Microsoft" \ - year="2003" \ - media="download" \ - file1="MPSetup.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN"/l3codeca.acm + title="Windows Media Player 9" \ + publisher="Microsoft" \ + year="2003" \ + media="download" \ + file1="MPSetup.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN"/l3codeca.acm load_wmp9() { @@ -7957,12 +8563,12 @@ load_wmp9() #---------------------------------------------------------------- w_metadata wmp10 dlls \ - title="Windows Media Player 10" \ - publisher="Microsoft" \ - year="2006" \ - media="download" \ - file1="MP10Setup.exe" \ - installed_file1="$W_SYSTEM32_DLLS_WIN/l3codecp.acm" + title="Windows Media Player 10" \ + publisher="Microsoft" \ + year="2006" \ + media="download" \ + file1="MP10Setup.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/l3codecp.acm" load_wmp10() { @@ -8074,6 +8680,7 @@ load_3dmark2001() cd "$W_CACHE/$W_PACKAGE" w_ahk_do " + SetWinDelay 1000 SetTitleMatchMode, 2 run 3dmark2001se_330_100308.exe WinWait ahk_class #32770 ; welcome @@ -8081,21 +8688,16 @@ load_3dmark2001() ControlClick Button2 ; Next sleep 5000 WinWait ahk_class #32770 ; License - sleep 500 ControlClick Button2 ; Next WinWait ahk_class #32770, Destination - sleep 500 ControlClick Button1 ; Next WinWait ahk_class #32770, Start - sleep 500 ControlClick Button1 ; Next WinWait,, Registration - sleep 500 ControlClick Button2 ; Next } WinWait,, Complete if ( w_opt_unattended > 0 ) { - sleep 500 ControlClick Button1 ; Unclick View Readme ControlClick Button4 ; Finish } @@ -8111,7 +8713,7 @@ w_metadata 3dmark03 benchmarks \ title="3D Mark 03" \ publisher="Futuremark" \ year="2003" \ - media="download" \ + media="manual_download" \ file1="3DMark03_v360_1901.exe" \ installed_exe1="$W_PROGRAMS_X86_WIN/Futuremark/3DMark03/3DMark03.exe" @@ -8172,7 +8774,7 @@ w_metadata 3dmark05 benchmarks \ publisher="Futuremark" \ year="2005" \ media="download" \ - file1="3DMark05_v130_1901.exe" \ + file1="3dmark05_v130_1901.exe" \ installed_exe1="$W_PROGRAMS_X86_WIN/Futuremark/3DMark05/3DMark05.exe" load_3dmark05() @@ -8223,7 +8825,7 @@ w_metadata 3dmark06 benchmarks \ publisher="Futuremark" \ year="2006" \ media="download" \ - file1="3DMark06_v120_1901.exe" \ + file1="3dmark06_v120_1901.exe" \ installed_exe1="$W_PROGRAMS_X86_WIN/Futuremark/3DMark06/3DMark06.exe" \ wine_showstoppers="9210" @@ -8360,33 +8962,43 @@ load_amnesia_tdd_demo() cd "$W_CACHE/$W_PACKAGE" w_ahk_do " - SetWinDelay 500 + SetWinDelay 1000 SetTitleMatchMode, 2 run amnesia_tdd_demo_1.0.1.exe WinWait,Select Setup Language,language if ( w_opt_unattended > 0 ) { WinActivate - ControlClick, TNewButton1 ; OK + ;ControlClick, TNewButton1; OK + send {Enter} ; OK WinWait,Setup - Amnesia - The Dark Descent Demo,Welcome - ControlClick TNewButton1 ; Next + ;ControlClick TNewButton1 ; Next + send {Enter} ; Next WinWait,Setup - Amnesia - The Dark Descent Demo,License ControlClick TNewRadioButton1 ; agree - Sleep 500 - ControlClick TNewButton2 ; Next + Sleep 1000 + send !n ; Next + ;send {Enter} ; Next + ;ControlClick TNewButton2 ; Next WinWait,Setup - Amnesia - The Dark Descent Demo,Destination - ControlClick TNewButton3 ; Next + ;ControlClick TNewButton3 ; Next + send {Enter} ; Next WinWait,Folder Does Not Exist,created - ControlClick Button1 ; OK - WinWait,Setup - Amnesia - The Dark Descent Demo,should - ControlClick TNewButton4 ; Next - WinWait,Setup - Amnesia - The Dark Descent Demo,should - ControlClick TNewButton4 ; Next + ;ControlClick Button1 ; OK + send {Enter} ; OK + WinWait,Setup - Amnesia - The Dark Descent Demo,shortcuts + ;ControlClick TNewButton4 ; Next + send {Enter} ; Next + WinWait,Setup - Amnesia - The Dark Descent Demo,additional tasks + ;ControlClick TNewButton4 ; Next + send {Enter} ; Next WinWait,Setup - Amnesia - The Dark Descent Demo,installing - ControlClick TNewButton4 ; Install + ;ControlClick TNewButton4 ; Install + send {Enter} ; Install } WinWait,Setup - Amnesia - The Dark Descent Demo,finished if ( w_opt_unattended > 0 ) { - ControlClick TNewButton4 ; Finish + ;ControlClick TNewButton4 ; Finish + send {Enter} ; Finish } WinWaitClose,Setup - Amnesia - The Dark Descent Demo,finished " @@ -8397,7 +9009,7 @@ load_amnesia_tdd_demo() #---------------------------------------------------------------- w_metadata aoe3_demo games \ - title="Age of Empires III" \ + title="Age of Empires III Trial" \ publisher="Microsoft" \ year="2005" \ media="download" \ @@ -8410,7 +9022,7 @@ load_aoe3_demo() w_download "http://download.microsoft.com/download/a/5/2/a525997e-8423-435b-b694-08118d235064/aoe3trial.exe" \ 2b0a123243092d79f910db5691d99d469f7c17c3 - if w_workaround_wine_bug 24897 + if w_workaround_wine_bug 24897 "Installing msxml4 to avoid font problem" 1.3.9, then w_call msxml4 fi @@ -8436,7 +9048,7 @@ load_aoe3_demo() WinWaitClose " - if w_workaround_wine_bug 24911 + if w_workaround_wine_bug 24911 "Installing devnum, dmsynth, and quartz to get sound working" 1.3.9, then # On some systems, only quartz is needed? # appdb says that l3codecx is also needed? @@ -8620,7 +9232,7 @@ load_acreedbro() fi fi else - w_workaround_wine_bug 6971 "See http://wiki.winehq.org/Bug6971 for wine patch to fix mouse" + w_workaround_wine_bug 6971 "Please upgrade to wine-1.3.23 or later; see http://wiki.winehq.org/Bug6971" 1.3.23, fi } @@ -8680,13 +9292,13 @@ w_metadata avatar_demo games \ title="James Camerons Avatar: The Game Demo" \ publisher="Ubisoft" \ year="2009" \ - media="download" \ + media="manual_download" \ file1="Avatar_The_Game_Demo.exe" \ installed_exe1="$W_PROGRAMS_X86_WIN/Ubisoft/Demo/James Cameron's AVATAR - THE GAME (Demo)/bin/AvatarDemo.exe" load_avatar_demo() { - w_download http://gamedaily.newaol.com/pub/Avatar_The_Game_Demo.exe 8d8e4c82312962706bd2620406d592db4f0fa9c1 + w_download_manual http://www.fileplanet.com/207386/200000/fileinfo/Avatar:-The-Game-Demo Avatar_The_Game_Demo.exe 8d8e4c82312962706bd2620406d592db4f0fa9c1 if w_workaround_wine_bug 23094 "Installing Visual C++ 2005 runtime to avoid installer crash" then @@ -8795,6 +9407,11 @@ w_metadata bioshock_demo games \ load_bioshock_demo() { + if w_workaround_wine_bug 6971 "Setting mwo=force... please upgrade to wine-1.3.23" 1.3.23, + then + w_call mwo=force + fi + w_download http://us.download.nvidia.com/downloads/nZone/demos/nzd_BioShockPC.zip 7a19186602cec5210e4505b58965e8c04945b3cf w_info "Unzipping demo, installer will start in about 30 seconds." @@ -8834,22 +9451,61 @@ load_bioshock_demo() sleep 3000 ; wait for splash screen to close " - if w_workaround_wine_bug 6971 - then - w_call mwo=force - fi - w_declare_exe "$W_PROGRAMS_X86_WIN\\2K Games\\BioShock Demo\\Builds\\Release" "Bioshock.exe" } #---------------------------------------------------------------- -w_metadata bfbc2 games \ - title="Battlefield Bad Company 2" \ - publisher="EA" \ - year="2010" \ - media="dvd" \ - file1="BFBC2.iso" +w_metadata bioshock2 games \ + title="Bioshock 2" \ + publisher="2K Games" \ + year="2010" \ + media="dvd" \ + file1="BIOSHOCK_2.iso" \ + wine_showstoppers="7065" \ + installed_exe1="$W_PROGRAMS_X86_WIN/2K Games/BioShock 2/SP/Builds/Binaries/Bioshock2Launcher.exe" \ + installed_exe2="$W_PROGRAMS_X86_WIN/2K Games/BioShock 2/MP/Builds/Binaries/Bioshock2Launcher.exe" + +load_bioshock2() +{ + w_workaround_wine_bug 7065 "This game won't work in Wine because its disc check fails." + + w_mount BIOSHOCK_2 + w_ahk_do " + SetWinDelay 1000 + SetTitleMatchMode, 2 + run ${W_ISO_MOUNT_LETTER}:setup.exe + if ( w_opt_unattended > 0 ) { + winwait BioShock 2, Language + controlclick Button3 + winwait BioShock 2, Welcome + controlclick Button1 ; Accept + winwait BioShock 2, License + controlclick Button3 ; Accept + sleep 500 + controlclick Button1 ; Next + winwait BioShock 2, Setup Type + controlclick Button4 ; Next + winwait BioShock 2, Ready to Install + controlclick Button1 ; Install + } + winwait BioShock 2, Complete + if ( w_opt_unattended > 0 ) { + controlclick Button4 ; Finish + } + " + w_declare_exe "$W_PROGRAMS_X86_WIN\\2K Games\\BioShock 2\\SP\\Builds\\Binaries" Bioshock2Launcher.exe + w_declare_exe "$W_PROGRAMS_X86_WIN\\2K Games\\BioShock 2\\MP\\Builds\\Binaries" Bioshock2Launcher.exe bioshock2_mp +} + +#---------------------------------------------------------------- + +w_metadata bfbc2 games \ + title="Battlefield Bad Company 2" \ + publisher="EA" \ + year="2010" \ + media="dvd" \ + file1="BFBC2.iso" load_bfbc2() { @@ -9198,22 +9854,23 @@ w_metadata cnc_redalert3_demo games \ title="Command & Conquer Red Alert 3 Demo" \ publisher="EA" \ year="2008" \ - media="download" \ + media="manual_download" \ file1="RedAlert3Demo.exe" \ installed_exe1="$W_PROGRAMS_X86_WIN/Electronic Arts/Red Alert 3 Demo/RA3Demo.exe" load_cnc_redalert3_demo() { - w_download http://gamedaily.newaol.com/pub/RedAlert3Demo.exe f909b87cc12e386a51be51ede708634348c8af48 + w_download_manual 'http://www.fileplanet.com/194888/190000/fileinfo/Command-&-Conquer:-Red-Alert-3-Demo' RedAlert3Demo.exe f909b87cc12e386a51be51ede708634348c8af48 + cd "$W_CACHE/$W_PACKAGE" if test ! "$W_OPT_UNATTENDED" then - w_try "$WINE" "$W_CACHE/$W_PACKAGE/$file1" + w_try "$WINE" $file1 else w_ahk_do " SetWinDelay 1000 SetTitleMatchMode, 2 - run $W_CACHE/$W_PACKAGE/$file1 + run $file1 winwait, Demo, readme send {enter} ; Install button winwait, Demo, Agreement @@ -9242,13 +9899,13 @@ load_cnc_redalert3_demo() #---------------------------------------------------------------- # http://appdb.winehq.org/objectManager.php?sClass=version&iId=9320 -w_metadata blobby_volley games \ - title="Blobby Volley" \ - publisher="Daniel Skoraszewsky" \ - year="2000" \ - media="manual_download" \ - file1="blobby.zip" \ - installed_exe1="c:/BlobbyVolley/volley.exe" +w_metadata blobby_volley games \ + title="Blobby Volley" \ + publisher="Daniel Skoraszewsky" \ + year="2000" \ + media="manual_download" \ + file1="blobby.zip" \ + installed_exe1="c:/BlobbyVolley/volley.exe" load_blobby_volley() { @@ -9291,13 +9948,13 @@ w_metadata cod_demo games \ title="Call of Duty demo" \ publisher="Activision" \ year="2003" \ - media="download" \ - file1="Call_Of_Duty_Demo.exe" \ + media="manual_download" \ + file1="call_of_duty_demo.exe" \ installed_exe1="$W_PROGRAMS_X86_WIN/Call of Duty Single Player Demo/CoDSP.exe" load_cod_demo() { - w_download "http://gamedaily.newaol.com/pub/Call_Of_Duty_Demo.exe" 1c480a1e64a80f7f97fd0acd9582fe190c64ad8e + w_download_manual http://www.gamefront.com/files/968870/call_of_duty_demo_exe Call_Of_Duty_Demo.exe 1c480a1e64a80f7f97fd0acd9582fe190c64ad8e cd "$W_CACHE/$W_PACKAGE" w_ahk_do " @@ -9451,13 +10108,13 @@ w_metadata cod4mw_demo games \ title="Call of Duty 4 Modern Warfare" \ publisher="Activision" \ year="2007" \ - media="download" \ + media="manual_download" \ file1="CoD4MWDemoSetup_v2.exe" \ installed_exe1="$W_PROGRAMS_X86_WIN/Activision/Call of Duty 4 - Modern Warfare Demo/iw3sp.exe" load_cod4mw_demo() { - w_download "http://gamedaily.newaol.com/pub/CoD4MWDemoSetup_v2.exe" 690a5f789a44437ed10784acfdd6418ca4a21886 + w_download http://download.cnet.com/Call-of-Duty-4-Modern-Warfare/3000-7441_4-11277584.html CoD4MWDemoSetup_v2.exe 690a5f789a44437ed10784acfdd6418ca4a21886 cd "$W_CACHE/$W_PACKAGE" w_ahk_do " @@ -9581,13 +10238,13 @@ w_metadata cojbib_demo games \ title="Call of Juarez: Bound in Blood Demo" \ publisher="Ubisoft" \ year="2009" \ - media="download" \ + media="manual_download" \ file1="CoJ2PC_20090713_DEMO_16_buy_now_INSTALLER.exe" \ installed_exe1="$W_PROGRAMS_X86_WIN/Ubisoft/Demo/Techland/Call of Juarez - Bound in Blood SP Demo/CoJBiBDemo_x86.exe" load_cojbib_demo() { - w_download http://gamedaily.newaol.com/pub/CoJ2PC_20090713_DEMO_16_buy_now_INSTALLER.exe 6426101f6c77bacd57c8449b12a3c76db7f761f0 + w_download_manual http://www.gamefront.com/files/14274183/CoJ2PC-20090713-DEMO-16-buy-now-INSTALLER.exe/ CoJ2PC_20090713_DEMO_16_buy_now_INSTALLER.exe 6426101f6c77bacd57c8449b12a3c76db7f761f0 cd "$W_CACHE/$W_PACKAGE" w_ahk_do " @@ -9624,12 +10281,12 @@ load_cojbib_demo() #---------------------------------------------------------------- w_metadata civ4_demo games \ - title="Civilization IV Demo" \ - publisher="Firaxis Games" \ - year="2005" \ - media="manual_download" \ - file1="Civilization4_Demo.zip" \ - installed_file1="$W_PROGRAMS_X86_WIN/Firaxis Games/Sid Meier's Civilization 4 Demo/Civilization4.exe" + title="Civilization IV Demo" \ + publisher="Firaxis Games" \ + year="2005" \ + media="manual_download" \ + file1="Civilization4_Demo.zip" \ + installed_file1="$W_PROGRAMS_X86_WIN/Firaxis Games/Sid Meier's Civilization 4 Demo/Civilization4.exe" load_civ4_demo() { @@ -9697,12 +10354,12 @@ load_crayonphysics_demo() #---------------------------------------------------------------- w_metadata crysis2 games \ - title="Crysis 2" \ - publisher="EA" \ - year="2011" \ - media="dvd" \ - file1="Crysis2.exe" \ - installed_file1="$W_PROGRAMS_X86_WIN/Electronic Arts/Crytek/Crysis 2/bin32/Crysis2.exe" + title="Crysis 2" \ + publisher="EA" \ + year="2011" \ + media="dvd" \ + file1="Crysis2.exe" \ + installed_file1="$W_PROGRAMS_X86_WIN/Electronic Arts/Crytek/Crysis 2/bin32/Crysis2.exe" load_crysis2() { @@ -10115,10 +10772,7 @@ load_deusex2_demo() { w_download_manual "http://www.techpowerup.com/downloads/1730/Deus_Ex:_Invisible_War_Demo.html" dxiw_demo.zip ccae48fb046d912b3714ea1b4be4294e74bb3092 - if w_workaround_wine_bug 6971 - then - w_warn "Patch wine as described in bug 6971 to use xinput2" - fi + w_workaround_wine_bug 6971 "Please upgrade to wine-1.3.23 or later; see http://wiki.winehq.org/Bug6971" 1.3.23, w_try unzip "$W_CACHE/$W_PACKAGE/dxiw_demo.zip" -d "$W_TMP" cd "$W_TMP" @@ -10238,8 +10892,9 @@ w_metadata digitanks_demo games \ load_digitanks_demo() { + # 8 june 2011: f204b13dc64c1a54fb1aaf27187c6083ebb16acf w_download "http://static.digitanks.com/files/digitanks.exe" \ - 4c5c956473e46c7d82765ae97e3218dd751097e5 + f204b13dc64c1a54fb1aaf27187c6083ebb16acf cd "$W_CACHE/$W_PACKAGE" w_try "$WINE" $file1 ${W_OPT_UNATTENDED:+ /S} if w_workaround_wine_bug 26915 "installing corefonts" @@ -10253,20 +10908,20 @@ w_metadata dirt2_demo games \ title="Dirt 2 Demo" \ publisher="Codemasters" \ year="2009" \ - media="download" \ + media="manual_download" \ file1="Dirt2Demo.zip" \ installed_exe1="$W_PROGRAMS_X86_WIN/Codemasters/DiRT2 Demo/dirt2.exe" load_dirt2_demo() { - w_download "http://gamedaily.newaol.com/pub/Dirt2Demo.zip" 13af1beb8c4f6300e4655045b66aea1f8a29f2b3 + w_download_manual http://www.joystiq.com/game/dirt-2/download/dirt-2-demo/ Dirt2Demo.zip 13af1beb8c4f6300e4655045b66aea1f8a29f2b3 mkdir "$W_TMP/$W_PACKAGE" w_try_unzip -d "$W_TMP/$W_PACKAGE" "$W_CACHE/$W_PACKAGE/Dirt2Demo.zip" if w_workaround_wine_bug 23532 then - w_call gfw + w_call gfw fi if w_workaround_wine_bug 24868 @@ -10393,76 +11048,6 @@ load_divinity2_demo() #---------------------------------------------------------------- -w_metadata dc2ba_demo games \ - title="Doras Carnival 2: Boardwalk Adventure Demo" \ - publisher="Nickelodeon" \ - year="2008" \ - media="download" \ - file1="InstallDorasCarnival2BoardwalkAdventure.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/Shockwave.com/Dora's Carnival 2 - Boardwalk Adventure/Dora's Carnival 2 - Boardwalk Adventure.exe" - -load_dc2ba_demo() -{ - # http://www.nickjr.com/games/p-doras-carnival-2-adventure.jhtml - # b90fcca3837faafbd7ad0cd8f776976fbd146787 16 Sept 2010 - # 5517302b63871ed86761c64ef28f3eb0123b4f89 7 Jan 2011 - # 2c4906a0c472032369ac82747a721ca0064d81b5 23 mar 2011 - # c6fef578083a9fc4c4cb1996554a058287adc838 28 apr 2011 - w_download http://downloadcdn.shockwave.com/pub/doras-carnival-2-boardwalk-adventure/InstallDorasCarnival2BoardwalkAdventure.exe c6fef578083a9fc4c4cb1996554a058287adc838 - - if w_workaround_wine_bug 23749 - then - w_call ie6 - fi - - cd "$W_CACHE/$W_PACKAGE" - w_ahk_do " - SetTitleMatchMode, 2 - run InstallDorasCarnival2BoardwalkAdventure.exe - winwait, Welcome - if ( w_opt_unattended > 0 ) { - sleep 1000 - controlclick, Button1, Welcome - sleep 1000 - winwait, End User License - sleep 1000 - controlclick, Button1, End User License - winwait, Choose Destination Location - sleep 1000 - controlclick, Button1, Choose Destination Location - winwait, FREE Toolbar - sleep 1000 - controlclick, Button5, FREE Toolbar - sleep 1000 - controlclick, Button1, FREE Toolbar - winwait, Start Installation - sleep 1000 - controlclick, Button1, Start Installation - } - winwait, Installation Complete - if ( w_opt_unattended > 0 ) { - sleep 1000 - controlclick, Button1, Installation Complete - } - winwaitclose, Installation Complete - " - case "$OS" in - "Windows_NT") ;; - *) sleep 5 - killall winefile.exe - ;; - esac - - w_declare_exe "$W_PROGRAMS_X86_WIN\\Shockwave.com\\Dora's Carnival 2 - Boardwalk Adventure" "Dora's Carnival 2 - Boardwalk Adventure.exe" - - if w_workaround_wine_bug 13496 - then - w_call vcrun6 - fi -} - -#---------------------------------------------------------------- - w_metadata demolition_company_demo games \ title="Demolition Company demo" \ publisher="Giants Software" \ @@ -10529,8 +11114,8 @@ load_dragonage() fi if test "$WINETRICKS_OPT_KEEPISOS" != 1 && \ - test ! -f "$W_CACHE/dragonage/DragonAge.iso" && \ - w_workaround_wine_bug 26459 "Making and mounting an .iso to work around 'Failed to authenticate the disk' error. After each reboot, you'll need to do [sudo mount -o ro,loop '$W_CACHE/dragonage/DragonAge.iso' /mnt/winetricks] to play Dragon Age. Someday this will be automated." + test ! -f "$W_CACHE/dragonage/DragonAge.iso" && \ + w_workaround_wine_bug 26459 "Making and mounting an .iso to work around 'Failed to authenticate the disk' error. After each reboot, you'll need to do [sudo mount -o ro,loop '$W_CACHE/dragonage/DragonAge.iso' /mnt/winetricks] to play Dragon Age. Someday this will be automated." then WINETRICKS_OPT_KEEPISOS=1 w_mount DragonAge else @@ -10746,14 +11331,15 @@ load_dragonage2_demo() w_metadata eve games \ title="EVE Online Tyrannis" \ publisher="CCP Games" \ - year="2010" \ + year="2011" \ media="download" \ - file1="EVE_Premium_Setup_237081_m.exe" \ + file1="EVE_Premium_Setup_264377_m.exe" \ installed_exe1="$W_PROGRAMS_X86_WIN/CCP/EVE/eve.exe" load_eve() { - w_download "http://content.eveonline.com/EVE_Premium_Setup_237081_m.exe" 37934c14d4cdcccf36da35ed4562e1b2fa2a1cd5 + # http://www.eveonline.com/download/?fallback=1& + w_download http://content.eveonline.com/EVE_Premium_Setup_264377_m.exe 00d930853c68d2a75f29558b344f885f6c2ff6a7 if w_workaround_wine_bug 18221 then @@ -10762,7 +11348,7 @@ load_eve() cd "$W_CACHE/$W_PACKAGE" w_ahk_do " - run, EVE_Premium_Setup_237081_m.exe + run, $file1 WinWait, EVE Online Installer if ( w_opt_unattended > 0 ) { WinActivate @@ -11022,6 +11608,46 @@ load_fifa11_demo() #---------------------------------------------------------------- +w_metadata hon games \ + title="Heroes of Newerth" \ + publisher="S2 Games" \ + year="2010" \ + media="download" \ + file1="HoNClient-2.0.36v2.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Heroes of Newerth/hon.exe" + +load_hon() +{ + w_download http://dl.heroesofnewerth.com/HoNClient-2.0.36v2.exe \ + 0e1889279dc07179eeb59e29f803b64d75b688c4 + + cd "$W_CACHE/$W_PACKAGE" + w_ahk_do " + SetTitleMatchMode, 2 + run, $file1 + winwait, Heroes of Newerth + u = $W_OPT_UNATTENDED + if ( u > 0 ) { + controlclick, Button2, Heroes of Newerth + winwait, Heroes of Newerth, License + controlclick, Button2, Heroes of Newerth, License + winwait, Heroes of Newerth, Components + controlclick, Button2, Heroes of Newerth, Components + winwait, Heroes of Newerth, Install Location + controlclick, Button2, Heroes of Newerth, Install Location + winwait, Heroes of Newerth, Start Menu + controlclick, Button2, Heroes of Newerth, Start Menu + winwait, Heroes of Newerth, Finish + controlclick, Button2, Heroes of Newerth, Finish + } + winwaitclose, Heroes of Newerth, Finish + " + + w_declare_exe "$W_PROGRAMS_X86_WIN\\Heroes of Newerth" "hon.exe" +} + +#---------------------------------------------------------------- + w_metadata hordesoforcs2_demo games \ title="Hordes of Orcs 2 Demo" \ publisher="Freeverse" \ @@ -11203,7 +11829,7 @@ w_metadata gothic4_demo games \ title="Gothic 4 demo (drm broken on wine)" \ publisher="Jowood" \ year="2010" \ - media="download" \ + media="manual_download" \ file1="ArcaniA_Gothic4_Demo_Setup.zip" \ installed_exe1="$W_PROGRAMS_X86_WIN/JoWooD Entertainment AG/ArcaniA - Gothic 4 Demo/Arcania.exe" \ wine_showstoppers="7065" @@ -11217,7 +11843,7 @@ load_gothic4_demo() w_warn "Non-steam versions of this game do not run on Wine because Wine does not support the version of SecuROM they use. Proceed only if you want to run into this problem." fi - w_download http://gamedaily.newaol.com/pub/ArcaniA_Gothic4_Demo_Setup.zip + w_download_manual http://www.gamershell.com/download_63874.shtml ArcaniA_Gothic4_Demo_Setup.zip d36024c0235878c4589234a56cc8b6e05da5c593 cd "$W_TMP" w_try unzip "$W_CACHE/$W_PACKAGE"/ArcaniA_Gothic4_Demo_Setup.zip @@ -11396,7 +12022,7 @@ load_guildwars() w_metadata hegemonygold_demo games \ title="Hegemony Gold beta 13" \ publisher="Longbow Games" \ - year="2010" \ + year="2011" \ media="download" \ file1="HegemonyGoldInstaller.exe" \ installed_exe1="$W_PROGRAMS_X86_WIN/Longbow Digital Arts/Hegemony Gold/Hegemony Gold.exe" \ @@ -11412,7 +12038,8 @@ load_hegemonygold_demo() # 6 Mar 2011: 8c4d8aa8f997b106c78b065a4b200e5e1ab846a8 # 28 Apr 2011: 93677013fc17f014b1640bed070e8bb1b2a17445 - w_download "http://www.longbowgames.com/downloads/Hegemony%20Gold%20Installer.exe" 93677013fc17f014b1640bed070e8bb1b2a17445 HegemonyGoldInstaller.exe + # 25 Jun 2011: 4069656ea3c3760b67d1c5adff37de7472955f72 + w_download "http://www.longbowgames.com/downloads/Hegemony%20Gold%20Installer.exe" 4069656ea3c3760b67d1c5adff37de7472955f72 HegemonyGoldInstaller.exe cd "$W_CACHE/$W_PACKAGE" @@ -11572,25 +12199,26 @@ w_metadata imvu games \ publisher="IMVU" \ year="2004" \ media="download" \ - file1="InstallIMVU_453.0.exe" \ + file1="InstallIMVU_460.0_st_c.exe" \ installed_exe1="c:/users/$LOGNAME/Application Data/IMVUClient/IMVUClient.exe" load_imvu() { - w_download http://static-akm.imvu.com/imvufiles/installers/InstallIMVU_453.0.exe 78c6ea5366b617c4d1418be164e40616412b8fc2 + w_download http://static-akm.imvu.com/imvufiles/installers/InstallIMVU_460.0_st_c.exe cd "$W_CACHE/$W_PACKAGE" w_ahk_do " - Run, InstallIMVU_453.0.exe SetTitleMatchMode, 2 + SetWinDelay 500 + Run, $file1 if ( w_opt_unattended > 0 ) { - WinWait,IMVU Setup, Welcome + WinWait,IMVU Setup, IMVU Extension + ControlClick Button4 ; Don't install extension Sleep 500 - ControlClick Button2 ; Install + ControlClick Button2 ; Finish ; There's no way to tell it not to launch WinWait,IMVU Login, chrome - Sleep 500 Click, Left, 29, 230 ; Uncheck [run on startup] Sleep 500 Click, Left, 416, 11 ; Click X on window decoration to close @@ -11879,6 +12507,66 @@ load_losthorizon_demo() #---------------------------------------------------------------- +w_metadata lego_potc_demo games \ + title="Lego Pirates of the Caribbean Demo" \ + publisher="Travellers Tales" \ + year="2011" \ + media="manual_download" \ + file1="LPOTC_PC_Demo.zip" \ + installed_file1="$W_PROGRAMS_X86_WIN/Disney Interactive Studios/LEGO Pirates DEMO/LEGOPiratesDEMO.exe" + +load_lego_potc_demo() +{ + w_download_manual http://www.gamershell.com/download_73976.shtml LPOTC_PC_Demo.zip 3025dcbbee9ff2d74d7837a78ef5b7aceae15d8f + cd "$W_TMP" + w_info "Unpacking $file1" + w_try_unzip "$W_CACHE/$W_PACKAGE/$file1" LPOTC_PC_Demo.exe + w_ahk_do " + SetWinDelay, 500 + SetTitleMatchMode, 2 + SetTitleMatchMode, slow ; since word English in first dialog can only be read 'slowly' + run LPOTC_PC_Demo.exe + if ( w_opt_unattended > 0 ) { + winwait,LEGO,English + sleep 500 + winactivate + send {Tab}{Tab}{Enter} + winwaitclose,LEGO,English + + winwait, LEGO, License + winactivate + send {Space} + sleep 500 + send {Enter} + winwaitclose, LEGO, License + + winwait, DirectX + ControlClick, Button1 ; next + ;send {Enter} ; next + winwaitclose, DirectX + + winwait, LEGO, License ; DIRECTX shows up in slow text, could wait for that + winactivate + sleep 500 + ControlClick, Button1 ; accept + ;send {Tab}{Tab}{Space} ; accept + sleep 500 + send {Enter} + winwaitclose, LEGO, License + } + winwait, LEGO, continue + if ( w_opt_unattended > 0 ) { + ControlClick, Button2 + sleep 1000 + } + winwaitclose, LEGO + " + + w_declare_exe "$W_PROGRAMS_X86_WIN\\Disney Interactive Studios\\LEGO Pirates DEMO" LEGOPiratesDEMO.exe +} + +#---------------------------------------------------------------- + w_metadata lhp_demo games \ title="LEGO Harry Potter Demo [Years 1-4]" \ publisher="Travellers Tales / WB" \ @@ -11940,7 +12628,8 @@ w_metadata lswcs games \ publisher="Lucasarts" \ year="2009" \ media="dvd" \ - file1="LEGOSAGA.iso" + file1="LEGOSAGA.iso" \ + installed_file1="$W_PROGRAMS_X86_WIN/LucasArts/LEGO Star Wars - The Complete Saga/LEGOStarWarsSaga.exe" load_lswcs() { @@ -11972,12 +12661,12 @@ load_lswcs() #---------------------------------------------------------------- -w_metadata lemonysnicket games \ - title="Lemony Snicket: A Series of Unfortunate Events" \ - publisher="Activision" \ - year="2004" \ - media="cd" \ - file1="Lemony Snicket.iso" +w_metadata lemonysnicket games \ + title="Lemony Snicket: A Series of Unfortunate Events" \ + publisher="Activision" \ + year="2004" \ + media="cd" \ + file1="Lemony Snicket.iso" load_lemonysnicket() { @@ -12153,10 +12842,7 @@ load_masseffect2() sleep 1000 } " - if w_workaround_wine_bug 6971 "See http://wiki.winehq.org/Bug6971 for wine patch to fix mouse" - then - : - fi + w_workaround_wine_bug 6971 "Please upgrade to wine-1.3.23 or later; see http://wiki.winehq.org/Bug6971" 1.3.23, w_declare_exe "$W_PROGRAMS_X86_WIN\\Mass Effect 2\\Binaries" "MassEffect2.EXE" } @@ -12274,7 +12960,7 @@ load_masseffect2_demo() fi fi else - w_workaround_wine_bug 6971 "See http://wiki.winehq.org/Bug6971 for wine patch to fix mouse" + w_workaround_wine_bug 6971 "Please upgrade to wine-1.3.23 or later; see http://wiki.winehq.org/Bug6971" 1.3.23, fi } @@ -12304,6 +12990,71 @@ load_maxmagicmarker_demo() #---------------------------------------------------------------- +w_metadata mdk games \ + title="MDK (3dfx)" \ + publisher="Playmates International" \ + year="1997" \ + media="cd" \ + file1="MDK.iso" \ + installed_exe1="C:/SHINY/MDK/MDK3DFX.EXE" + +load_mdk() +{ + # Needed even on Windows, some people say. Haven't tried the D3D version on win7 yet. + w_call glidewrapper + + w_download http://www.falconfly.de/downloads/patch-mdk3dfx.zip edcff0160c62d23b00c55c0bdfa38a6e90d925b0 + + w_mount MDK + cd "$W_ISO_MOUNT_ROOT" + w_ahk_do " + SetTitleMatchMode, 2 + SetTitleMatchMode, slow + run ${W_ISO_MOUNT_LETTER}:setup.exe + winwait, MDK + if ( w_opt_unattended > 0 ) { + click, left, 80, 80 ; USA + winwait, Welcome, purchasing MDK + ControlClick, Button1 ; Next + winwait, Select Target Platform + ControlClick, Button6 ; Next + winwait, Select Installation Options + ControlClick, Button3 ; Large + ControlClick, Button6 ; Next + winwait, Destination + ControlClick, Button1 ; Next + winwait, Program Folder + ControlClick, Button2 ; Next + winwait, Start + ControlClick, Button1 ; Next + Loop { + IfWinExist, Setup, ProgramFolder + send {Enter} + IfWinExist, Setup Complete + break + sleep 500 + } + } + WinWait, Setup Complete + if ( w_opt_unattended > 0 ) { + ControlClick, Button1 ; uncheck readme + ControlClick, Button4 ; Finish + WinWait, Question, DirectX + ControlClick, Button2 ; No + WinWait, Information, complete + ControlClick, Button1 ; No + } + WinWaitClose + " + cd "$W_DRIVE_C/SHINY/MDK" + w_try_unzip "$W_CACHE/$W_PACKAGE"/patch-mdk3dfx.zip + + w_declare_exe "C:\\SHINY\\MDK" "MDK3DFX.EXE" + # TODO: wine fails to install menu items, add a workaround for that +} + +#---------------------------------------------------------------- + w_metadata menofwar games \ title="Men of War" \ publisher="Aspyr Media" \ @@ -12358,14 +13109,12 @@ w_metadata mb_warband_demo games \ load_mb_warband_demo() { - if w_workaround_wine_bug 6971 + if w_workaround_wine_bug 23207 "" 1.3.23, then - w_warn "Patch wine as described in bug 6971 to use xinput2" - fi - if grep -q -i nvidia /proc/bus/pci/devices && w_workaround_wine_bug 13490 "" 1.2, - then - w_warn "This game crashes on startup in wine with nvidia unless you apply the patch from wine bug 13490, run with wine-1.1.38, or use WINEDEBUG=+relay wine mw_warband.exe 2>&1 > /dev/null" + w_die "Please upgrade to wine-1.3.23 or later, built with gcc-4.4.5 or later, else game crashes on startup." fi + w_workaround_wine_bug 6971 "Please upgrade to wine-1.3.23 or later; see http://wiki.winehq.org/Bug6971" 1.3.23, + # Mouse still doesn't work quite right after picking menu, see bug 25705. w_download "http://download.taleworlds.com/mb_warband_setup_1134.exe" 1aac92b6c97869350b80fe7a08f559719deb37d7 @@ -12460,8 +13209,8 @@ load_mise() ControlClick Button4 ; Activate Online winwait, Product Activation, SUCCESSFUL winClose - sleep 1000 - Process, Close, MISE.exe + sleep 1000 + Process, Close, MISE.exe " elif test -f "$W_CACHE"/$W_PACKAGE/unlockcode.txt then @@ -12485,18 +13234,22 @@ load_mise() #---------------------------------------------------------------- w_metadata myth2_demo games \ - title="Myth II: Soulblighter demo" \ - publisher="Bungie Studios" \ - year="1998" \ + title="Myth II demo 1.7.2" \ + publisher="Project Magma" \ + year="2011" \ media="download" \ - file1="Myth2_Demo_171.exe" \ + file1="Myth2_Demo_172.exe" \ installed_exe1="$W_PROGRAMS_X86_WIN/Myth II Demo/Myth II Demo.exe" \ - homepage="http://www.bungie.net/Projects/Myth/" + homepage="http://projectmagma.net/" load_myth2_demo() { + # Originally a 1998 game by Bungie; according to Wikipedia, they handed the + # source code to Project Magma for further development. + + # 1 May 2011 1.7.2 sha1sum e0a8f707377e71314a471a09ad2a55179ea44588 w_download http://tain.totalcodex.net/items/download/myth-ii-demo-windows \ - 598621565e2bb82473579e3a1f9533f131ba8ad7 $file1 + e0a8f707377e71314a471a09ad2a55179ea44588 $file1 cd "$W_CACHE/$W_PACKAGE" w_ahk_do " @@ -12505,6 +13258,7 @@ load_myth2_demo() run, $file1 winwait, Setup, Welcome if ( w_opt_unattended > 0 ) { + winactivate send {Enter} ; next winwait, Setup, Components send {Enter} ; next @@ -12528,20 +13282,20 @@ w_metadata nfsshift_demo games \ publisher="EA" \ year="2009" \ media="download" \ - file1="SHIFTDemo_0018_alpha_18_PC-DVD_DEMO.exe" \ + file1="NFSSHIFTPCDEMO.exe" \ installed_exe1="$W_PROGRAMS_X86_WIN/Electronic Arts/Need for Speed SHIFT Demo/shiftdemo.exe" load_nfsshift_demo() { - w_download "http://gamedaily.newaol.com/pub/SHIFTDemo_0018_alpha_18_PC-DVD_DEMO.exe" 7b267654d08c54f15813f2917d9d74ec40905db7 + w_download http://cdn.needforspeed.com/data/downloads/shift/NFSSHIFTPCDEMO.exe 7b267654d08c54f15813f2917d9d74ec40905db7 - cp "$W_CACHE/$W_PACKAGE/SHIFTDemo_0018_alpha_18_PC-DVD_DEMO.exe" "$W_TMP" + w_try cp "$W_CACHE/$W_PACKAGE/$file1" "$W_TMP" cd "$W_TMP" w_ahk_do " SetTitleMatchMode, 2 SetTitleMatchMode, slow - run, SHIFTDemo_0018_alpha_18_PC-DVD_DEMO.exe + run, $file1 winwait, WinRAR if ( w_opt_unattended > 0 ) { ControlClick, Button2 @@ -12592,6 +13346,158 @@ load_nfsshift_demo() #---------------------------------------------------------------- +w_metadata nfsworld games \ + title="Need For Speed World" \ + publisher="EA" \ + year="2011" \ + media="download" \ + file1="setup_441.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Electronic Arts/Need For Speed World/GameLauncher.exe" + +load_nfsworld() +{ + w_workaround_wine_bug 27047 "Game fails with corrupt executable error in wine-1.3.19 and earlier" 1.3.20, + + # This changes frequently, I'm afraid + # Be careful to update $file1 when you update the url + w_download http://static.cdn.ea.com/blackbox/u/f/NFSWO/Launcher/weblaunch_1.8.35.441/setup_441.exe 0f75ea12fc3fe40dd97bf0b6556ed146de435edf + + w_workaround_wine_bug 27048 "The patcher hangs a lot. When it does, retry the patch (you may need to kill it first). After five or ten tries, it should work." + + # FIXME: file bugs for these + w_call ie7 + w_call dotnet20 + + 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 - Need For Speed, Completing + if ( w_opt_unattended > 0 ) { + send {Space} ; uncheck readme + send {Tab} + send {Space} ; uncheck launch + ControlClick TNewButton5 ; Finish + } + winwaitclose + " + w_declare_exe "$W_PROGRAMS_X86_WIN\\Electronic Arts\\Need For Speed World" GameLauncher.exe +} + +#---------------------------------------------------------------- + +w_metadata nfsworld_mono games \ + title="Need For Speed World (using Mono)" \ + publisher="EA" \ + year="2011" \ + media="download" \ + file1="setup_441.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.35.441/setup_441.exe 0f75ea12fc3fe40dd97bf0b6556ed146de435edf + + 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 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?) + 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 oblivion games \ title="Elder Scrolls: Oblivion" \ publisher="Bethesda Game Studios" \ @@ -12649,15 +13555,15 @@ w_metadata osmos_demo games \ publisher="Hemisphere Games" \ year="2009" \ media="download" \ - file1="OsmosDemo_Installer_1.5.6.exe" \ + file1="OsmosDemo_Installer_1.6.0.exe" \ installed_exe1="$W_PROGRAMS_X86_WIN/OsmosDemo/OsmosDemo.exe" load_osmos_demo() { - w_download http://gamedaily.newaol.com/pub/OsmosDemo_Installer_1.5.6.exe 7568f97100a73985a0fd625b63b205f4477578e8 + w_download http://www.hemispheregames.com/blog/wp-content/uploads/2010/01/OsmosDemo_Installer_1.6.0.exe 4880eb20ff850bf337bbae20455ee90f614e507e cd "$W_CACHE/$W_PACKAGE" - w_try $WINE OsmosDemo_Installer_1.5.6.exe ${W_OPT_UNATTENDED:+ /S} + w_try $WINE $file1 ${W_OPT_UNATTENDED:+ /S} if w_workaround_wine_bug 24416 "installing C runtime library" 1.3.8, then @@ -13049,7 +13955,7 @@ w_metadata sims3 games \ year="2009" \ media="dvd" \ file1="Sims3.iso" \ - installed_exe1="$W_PROGRAMS_X86_WIN/Electronic Arts/The Sims 3/Game/Bin/TS3.EXE" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Electronic Arts/The Sims 3/Game/Bin/TS3.exe" \ wine_showstoppers="26273" load_sims3() @@ -13116,7 +14022,7 @@ load_sims3() winwaitclose " - w_declare_exe "$W_PROGRAMS_X86_WIN\\Electronic Arts\\The Sims 3\\Game\\Bin" "TS3.EXE" + w_declare_exe "$W_PROGRAMS_X86_WIN\\Electronic Arts\\The Sims 3\\Game\\Bin" "TS3.exe" } #---------------------------------------------------------------- @@ -13143,13 +14049,13 @@ load_simsmed() # Default lang, USA, accept defaults, uncheck EA dl mgr, uncheck readme w_ahk_do " SetTitleMatchMode, 2 + SetWinDelay 1000 run ${W_ISO_MOUNT_LETTER}:SimsMedievalSetup.exe winwait, Choose Setup Language if ( w_opt_unattended > 0 ) { send {Enter} SetTitleMatchMode, 2 winwait, - InstallShield Wizard - sleep 1000 ControlClick &Next >, - InstallShield Wizard sleep 1000 send uuuuuu{Tab}{Tab}{Enter} @@ -13166,7 +14072,7 @@ load_simsmed() winwait, - InstallShield Wizard, Click Install to begin send {Enter} - ; Handle possible error messages + ; Handle optional dialogs ; In Wine-1.3.16 and lower, before ; http://www.winehq.org/pipermail/wine-cvs/2011-March/076262.html, ; wine didn't claim to already have .net 4 installed, @@ -13183,15 +14089,14 @@ load_simsmed() { send {Enter} } - ; When we see this, we're past the rash of error messages ifWinExist, Sims, Customer Experience Improvement + { + send {Enter} ; Next + } + ifWinExist, - InstallShield Wizard, Complete break sleep 1000 } - - ; Back to normal flow - winwait, Sims, Customer Experience Improvement - send {Enter} ; Next } winwait, - InstallShield Wizard, Complete if ( w_opt_unattended > 0 ) { @@ -13243,6 +14148,86 @@ load_simsmed() #---------------------------------------------------------------- +w_metadata sims3_gen games \ + title="The Sims 3: Generations (drm broken on Wine)" \ + publisher="EA" \ + year="2011" \ + media="dvd" \ + file1="Sims3EP04.iso" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Electronic Arts/The Sims 3 Generations/Game/Bin/TS3EP04.exe" \ + wine_showstoppers="26273" + +load_sims3_gen() +{ + if [ ! -f "$W_PROGRAMS_X86_WIN/Electronic Arts/The Sims 3/Game/Bin/TS3.exe" ] + then + die "You must have sims3 installed to install sims3_gen!" + fi + + w_read_key + w_mount Sims3EP04 + + # Default lang, USA, accept defaults, uncheck EA dl mgr, uncheck readme + w_ahk_do " + SetTitleMatchMode, 2 + SetWinDelay 1000 + run ${W_ISO_MOUNT_LETTER}:Sims3EP04Setup.exe + winwait, - InstallShield Wizard + if ( w_opt_unattended > 0 ) { + send {Enter} + loop + { + SetTitleMatchMode, 2 + ifwinexist, - InstallShield Wizard, Setup will now attempt to update + { + ControlClick, Button1, - InstallShield Wizard + sleep 1000 + winwait, - InstallShield Wizard, Setup has finished updating The Sims + sleep 1000 + controlclick, Button1, - InstallShield Wizard + sleep 1000 + } + ifwinexist, Sims, License + { + winactivate, Sims, License + sleep 1000 + ControlClick, Button3 + sleep 1000 + ControlClick, Button1 + sleep 1000 + break + } + sleep 1000 + } + winwait, Sims, Please enter the entire Registration Code + sleep 1000 + send {Raw}$W_KEY + send {Enter} + winwait, - InstallShield Wizard, Setup Type + ControlClick &Complete ; was not defaulting to complete? + send {Enter} + winwait, - InstallShield Wizard, Click Install to begin + send {Enter} + winwait, - InstallShield Wizard, Would you like to install the latest + sleep 1000 + ControlClick, Button4 ; No thanks + sleep 1000 + ControlClick, Button1 + sleep 1000 + } + winwait, - InstallShield Wizard, Complete + if ( w_opt_unattended > 0 ) { + ControlClick Button1 ; Do not view readme + send {Enter} ; Finish + } + winwaitclose + " + + w_declare_exe "$W_PROGRAMS_X86_WIN\\Electronic Arts\\The Sims 3 Generations/Game/Bin" "TS3EP04.exe" +} + +#---------------------------------------------------------------- + w_metadata splitsecond games \ title="Split Second" \ publisher="Disney" \ @@ -13425,6 +14410,59 @@ load_spore() #---------------------------------------------------------------- +w_metadata spore_cc_demo games \ + title="Spore Creature Creator trial" \ + publisher="EA" \ + year="2008" \ + media="download" \ + file1="792248d6ad421d577132c2b648bbed45_scc_trial_na.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Electronic Arts/SPORE/Sporebin/SporeCreatureCreator.exe" + +load_spore_cc_demo() +{ + w_download http://na.llnet.cdn.ea.com/u/f/eagames/spore/scc/promo/792248d6ad421d577132c2b648bbed45_scc_trial_na.exe 06da5558e6ebbc39d2fac955eceab78cf8470e07 + + w_info "The installer runs on for about a minute after it's done." + + cd "$W_CACHE/$W_PACKAGE" + if test "$W_OPT_UNATTENDED" + then + w_ahk_do " + SetWinDelay 1000 + SetTitleMatchMode, 2 + run $file1 + winwait, Wizard, Welcome to the SPORE + send N + winwait, Wizard, Please read the following + send a + send N + winwait, Wizard, your setup + send N + winwait, Wizard, options below + send N + winwait, Wizard, We're ready + ;send i ; didn't take once? + ControlClick, Button1 + winwait, Question, do not install the latest + send N ; reject EA Download Manager + winwait, Wizard, Launch + send {SPACE}{DOWN}{SPACE}{ENTER} + winwaitclose + " + while ps | grep $file1 | grep -v grep > /dev/null + do + w_info "Waiting for installer to finish." + sleep 2 + done + else + w_try "$WINE" "$file1" + fi + w_declare_exe "$W_PROGRAMS_X86_WIN\\Electronic Arts\\SPORE\\Sporebin" \ + "SporeCreatureCreator.exe" +} + +#---------------------------------------------------------------- + w_metadata starcraft2_demo games \ title="Starcraft II Demo" \ publisher="Blizzard" \ @@ -13435,7 +14473,7 @@ w_metadata starcraft2_demo games \ load_starcraft2_demo() { - w_download http://gamedaily.newaol.com/pub/SC2-WingsOfLiberty-enUS-Demo-Installer.zip 4c06ad755fbde73f135a7359bf6bfdbd2c6eb00e + w_download_manual http://www.fileplanet.com/217982/210000/fileinfo/Starcraft-2-Demo SC2-WingsOfLiberty-enUS-Demo-Installer.zip 4c06ad755fbde73f135a7359bf6bfdbd2c6eb00e cd "$W_TMP" w_try_unzip "$W_CACHE/$W_PACKAGE"/SC2-WingsOfLiberty-enUS-Demo-Installer.zip @@ -13492,85 +14530,6 @@ load_starcraft2_demo() w_declare_exe "$W_PROGRAMS_X86_WIN\\StarCraft II Demo" "StarCraft II.exe" } -#---------------------------------------------------------------- - -w_metadata smbx games \ - title="Super Mario Bros. X 1.2.2" \ - publisher="SuperMarioBrothers.org" \ - year="2010" \ - media="download" \ - file1="smbx122.exe" \ - installed_exe1="c:/SMBX/smbx.exe" - -load_smbx() -{ - w_download http://www.tehgamez.com/a/smbx122.exe 269eb60d502e57fdfae9c3601ad9ee22801cb5d1 - - w_call vb6run - - if w_workaround_wine_bug 23821 "Installing native quartz and devenum to avoid hang" - then - w_call quartz - w_call devenum - fi - - cd "$W_CACHE"/smbx - - w_ahk_do " - SetTitleMatchMode, 2 - run $file1 - - WinWait, Setup - Super Mario Bros. X, Welcome - u = $W_OPT_UNATTENDED - if ( u > 0 ) { - Send {Enter} - WinWait, Setup - Super Mario Bros. X, Information - Send {Enter} - WinWait, Setup - Super Mario Bros. X, Select Destination Location - Send {Enter} - WinWait, Setup - Super Mario Bros. X, Select Start Menu Folder - Send {Enter} - WinWait, Setup - Super Mario Bros. X, Additional Tasks - Send {Enter} - ; Do not install bloatware - WinWait, Setup - Super Mario Bros. X, Recommended by - IfWinExist, Setup - Super Mario Bros. X, AVG - { - MouseMove, 30,280 - Click - Send {Enter} - } - IfWinExist, Setup - Super Mario Bros. X, RealPlayer - { - MouseMove, 35,245 - Click - Send {Enter} - } - SetTitleMatchMode RegEx - ; the darn thing alternates between ARO and Advanced Registry Optimizer - IfWinExist, Setup - Super Mario Bros. X, A.*R.*O.*2011 - { - MouseMove, 31,277 - Click - Send {Enter} - } - WinWait, Setup - Super Mario Bros. X, Ready to Install - Send {Enter} - WinWait, Setup - Super Mario Bros. X, Information - Send {Enter} - } - WinWait, Setup - Super Mario Bros. X, Completing - if ( u > 0 ) { - Send {Space} ; Don't run game - Send {Enter} - } - WinWaitClose - " - - w_declare_exe c:\\SMBX smbx.exe -} - - #---------------------------------------------------------------- w_metadata theundergarden_demo games \ @@ -13807,19 +14766,19 @@ w_metadata sammax301_demo games \ title="Sam & Max 301: The Penal Zone" \ publisher="Telltale Games" \ year="2010" \ - media="download" \ - file1="SamMax301_PC_setup.exe" \ + media="manual_download" \ + file1="SamMax301_PC_Setup.exe" \ installed_exe1="$W_PROGRAMS_X86_WIN/Telltale Games/Sam and Max - The Devil's Playhouse/The Penal Zone/SamMax301.exe" load_sammax301_demo() { - w_download http://gamedaily.newaol.com/pub/SamMax301_PC_Setup.exe 83f47b7f3a5074a6e29bdc9b4f1fd2c4471d9641 + w_download_manual "http://www.fileplanet.com/211314/210000/fileinfo/Sam-&-Max:-Devil's-Playhouse---Episode-One-Demo" SamMax301_PC_Setup.exe 83f47b7f3a5074a6e29bdc9b4f1fd2c4471d9641 cd "$W_CACHE/$W_PACKAGE" w_ahk_do " SetTitleMatchMode, 2 SetWinDelay 500 - run SamMax301_PC_setup.exe + run SamMax301_PC_Setup.exe winwait Sam and Max The Penal Zone Setup, Welcome if ( w_opt_unattended > 0 ) { controlclick button2 ; Next @@ -13846,24 +14805,18 @@ w_metadata sammax304_demo games \ title="Sam & Max 304: Beyond the Alley of the Dolls" \ publisher="Telltale Games" \ year="2010" \ - media="download" \ - file1="SamMax304_v02.18_unlockable_securom_pa_BigDownload.exe" \ + media="manual_download" \ + file1="SamMax304_PC_setup.exe" \ installed_exe1="$W_PROGRAMS_X86_WIN/Telltale Games/Sam and Max - The Devil's Playhouse/Beyond the Alley of the Dolls/SamMax304.exe" load_sammax304_demo() { - if ! test -f "$W_CACHE/$W_PACKAGE"/SamMax304_v02.18_unlockable_securom_pa_BigDownload.exe - then - w_download "http://gamedaily.newaol.com/pub/SamMax304_BigDownload.exe.zip" 5d3cefcf0c654d3646105e14cb3d06c61feb32f3 - cd "$W_CACHE/$W_PACKAGE" - w_try_unzip SamMax304_BigDownload.exe.zip - rm -f SamMax304_BigDownload.exe.zip - fi + w_download_manual "http://www.fileplanet.com/214770/210000/fileinfo/Sam-&-Max:-The-Devi's-Playhouse---Beyond-the-Alley-of-the-Dolls-Demo" SamMax304_PC_setup.exe 1a385a1f1e83770c973e6457b923b7a44bbe44d8 cd "$W_CACHE/$W_PACKAGE" w_ahk_do " SetTitleMatchMode, 2 - Run, SamMax304_v02.18_unlockable_securom_pa_BigDownload.exe + Run, $file1 WinWait,Sam and Max Beyond the Alley of the Dolls Setup if ( w_opt_unattended > 0 ) { ControlClick Button2 ; Next @@ -14002,7 +14955,7 @@ load_singularity() } " - if w_workaround_wine_bug 6971 + if w_workaround_wine_bug 6971 "Setting mwo=force... please upgrade to wine-1.3.23" 1.3.23, then w_call mwo=force fi @@ -14112,12 +15065,12 @@ load_stalker_pripyat_bench() #---------------------------------------------------------------- -w_metadata torchlight games \ - title="Torchlight - boxed version" \ - publisher="Runic Games" \ - year="2009" \ - media="dvd" \ - file1="Torchlight.iso" +w_metadata torchlight games \ + title="Torchlight - boxed version" \ + publisher="Runic Games" \ + year="2009" \ + media="dvd" \ + file1="Torchlight.iso" load_torchlight() { @@ -14151,7 +15104,7 @@ load_torchlight() #---------------------------------------------------------------- -w_metadata twfc games \ +w_metadata twfc games \ title="Transformers: War for Cybertron" \ publisher="Activision" \ year="2010" \ @@ -14209,7 +15162,7 @@ load_twfc() } " - if w_workaround_wine_bug 6971 + if w_workaround_wine_bug 6971 "Setting mwo=force... please upgrade to wine-1.3.23" 1.3.23, then w_call mwo=force fi @@ -14286,7 +15239,7 @@ load_ut3() WinWaitClose " - if w_workaround_wine_bug 6971 + if w_workaround_wine_bug 6971 "Setting mwo=force... please upgrade to wine-1.3.23" 1.3.23, then w_call mwo=force w_warn "Mouse will be disabled in in-game menu. Must use keyboard to navigate. Alternately, patch wine as described in bug 6971 to use xinput2." @@ -14298,7 +15251,7 @@ load_ut3() #---------------------------------------------------------------- -w_metadata wog games \ +w_metadata wog games \ title="World of Goo Demo" \ publisher="2D Boy" \ year="2008" \ @@ -14321,6 +15274,7 @@ load_wog() cd "$W_CACHE/$W_PACKAGE" w_ahk_do " + SetWinDelay 500 run WorldOfGooDemo.1.0.exe winwait, World of Goo Setup, License Agreement if ( w_opt_unattended > 0 ) { @@ -14442,6 +15396,54 @@ load_zootycoon2_demo() w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Games\\Zoo Tycoon 2 Trial Version" "zt2demoretail.exe" } +#---------------------------------------------------------------- +# Gog.com games +#---------------------------------------------------------------- + +w_metadata beneath_a_steel_sky_gog games \ + title="Beneath a Steel Sky (GOG.com, free)" \ + publisher="Virgin Interactive" \ + year="1994" \ + file1="setup_beneath_a_steel_sky.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/GOG.com/Beneath a Steel Sky/ScummVM/scummvm.exe" + +load_beneath_a_steel_sky_gog() +{ + winetricks_load_gog "beneath_a_steel_sky" "Beneath a Steel Sky" "" "TsCheckBox4" "ScummVM\\scummvm.exe -c \"C:\\Program Files\\GOG.com\\Beneath a Steel Sky\\beneath.ini\" beneath" "" "" "75176395,1f99e12643529baa91fecfb206139a8921d9589c" +} + +w_metadata sacrifice_gog games \ + title="Sacrifice (GOG.com)" \ + publisher="Interplay" \ + year="2000" \ + media="manual_download" \ + file1="setup_sacrifice.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/GOG.com/Sacrifice/Sacrifice.exe" + +load_sacrifice_gog() +{ + winetricks_load_gog "sacrifice" "Sacrifice" "" "TsCheckBox2" "sacrifice" "" "" "591161642,63e77685599ce20c08b004a9fa3324e466ce1679" +} + +# Brief HOWTO for adding a GOG game: +# - "beneath_a_steel_sky" is the installer exe name, minus "setup_" and ".exe" +# - "Beneath a Steel Sky" is installer window title, minus "Setup - " +# - There are no other files for this game, so this parameter is empty. +# Otherwise it should be of the following form: +# file_name[,length[,sha1sum]] [...] +# - "TsCheckBox4" is the control name for the checkbox deciding whether it will +# install some reader (Foxit in this case, could be acrobat reader). That +# installation is enabled by default, and would just bloat the generic +# AutoHotKey script, so it gets disabled. +# - "ScummVM\\[...]" is the command line to run the game, as fetched from the +# shortcut/launcher installer/wine creates, which will be used in BAT scripts +# created by wisotool +# - The part in the url which is specific to this game is identical to its "id" +# (first parameter), so this parameter is left out. +# - The install directory is the same as installer window title (second +# parameter), so this parameter is left out. +# - Main installer size and sha1sum, separated by a comma. + #---------------------------------------------------------------- # Steam Games #---------------------------------------------------------------- @@ -14460,6 +15462,21 @@ load_alienswarm_steam() #---------------------------------------------------------------- +w_metadata bioshock2_steam games \ + title="Bioshock 2 (Steam)" \ + publisher="2k" \ + year="2010" \ + media="download" \ + wine_showstoppers="7065" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Steam/steamapps/common/bioshock2/blort.exe" + +load_bioshock2_steam() +{ + w_steam_install_game 8850 "BioShock 2" +} + +#---------------------------------------------------------------- + w_metadata borderlands_steam games \ title="Borderlands (Steam, nonfree)" \ publisher="2K Games" \ @@ -14804,6 +15821,32 @@ _EOF_ w_try_regedit "$W_TMP"/set-mwo.reg } +#---------------------------------------------------------------- +# X11 Driver settings + +w_metadata grabfullscreen=y settings \ + title="Force cursor clipping for full-screen windows (needed by some games)" +w_metadata grabfullscreen=n settings \ + title="Disable cursor clipping for full-screen windows (default)" + +load_grabfullscreen() +{ + case $1 in + y|n) arg=$1;; + *) w_die "illegal value $1 for GrabFullscreen";; + esac + + echo "Setting GrabFullscreen to $arg" + cat > "$W_TMP"/set-gfs.reg <<_EOF_ +REGEDIT4 + +[HKEY_CURRENT_USER\Software\Wine\X11 Driver] +"GrabFullscreen"="$arg" + +_EOF_ + w_try_regedit "$W_TMP"/set-gfs.reg +} + #---------------------------------------------------------------- # Other settings @@ -14812,7 +15855,7 @@ _EOF_ w_metadata alldlls=default settings \ title="Remove all DLL overrides" w_metadata alldlls=builtin settings \ - title="Override most common DLLs to builtin (except msvcp90 and d3d9x_xx)" + title="Override most common DLLs to builtin" load_alldlls() { @@ -14968,19 +16011,24 @@ load_sandbox() # Might want to unpack gecko first, since Wine won't be able to get to /usr/lib/wine after this rm -f "$WINEPREFIX/dosdevices/z:" - # FIXME: these are language-specific, we probably need to localize these - # remove symlinks (won't do anything if they're already directories) - rm -f "$WINEPREFIX/drive_c/users/$USER/Desktop" - rm -f "$WINEPREFIX/drive_c/users/$USER/My Documents" - rm -f "$WINEPREFIX/drive_c/users/$USER/My Music" - rm -f "$WINEPREFIX/drive_c/users/$USER/My Pictures" - rm -f "$WINEPREFIX/drive_c/users/$USER/My Videos" - # create replacement directories if needed - mkdir -p "$WINEPREFIX/drive_c/users/$USER/Desktop" - mkdir -p "$WINEPREFIX/drive_c/users/$USER/My Documents" - mkdir -p "$WINEPREFIX/drive_c/users/$USER/My Music" - mkdir -p "$WINEPREFIX/drive_c/users/$USER/My Pictures" - mkdir -p "$WINEPREFIX/drive_c/users/$USER/My Videos" + if test -d "$WINEPREFIX/drive_c/users/$USER/Documents" + then + for dir in Desktop Documents Music Pictures Videos + do + rm -f "$WINEPREFIX/drive_c/users/$USER/$dir" > /dev/null 2>&1 + mkdir -p "$WINEPREFIX/drive_c/users/$USER/$dir" + done + elif test -d "$WINEPREFIX/drive_c/users/$USER/My Documents" + then + for dir in Desktop "My Documents" "My Music" "My Pictures" "My Videos" + do + rm -f "$WINEPREFIX/drive_c/users/$USER/$dir" > /dev/null 2>&1 + mkdir -p "$WINEPREFIX/drive_c/users/$USER/$dir" + done + else + w_die "don't know name of My Documents folder, can't sandbox" + fi + # Disable unixfs # Unfortunately, when you run with a different version of wine, wine will recreate this key. @@ -15251,7 +16299,6 @@ for data in \ comctl32:size_MB=49,time_sec=1 \ comdlg32ocx:size_MB=49,time_sec=1 \ controlpad:size_MB=69,time_sec=4 \ - corefonts:size_MB=52,time_sec=4 \ corefonts:size_MB=62,time_sec=2 \ crypt32:size_MB=178,time_sec=71 \ crysis2:size_MB=8259,time_sec=1200 \ @@ -15443,7 +16490,7 @@ winetricks_stats_save() # Save opt-in status if test "$WINETRICKS_STATS_REPORT" then - echo "$WINETRICKS_STATS_REPORT" > $W_CACHE/track_usage + echo "$WINETRICKS_STATS_REPORT" > "$W_CACHE"/track_usage fi } @@ -15635,7 +16682,7 @@ execute_command() comdlg32.ocx) w_call comdlg32ocx ;; dotnet1) w_call dotnet11 ;; dotnet2) w_call dotnet20 ;; - firefox4) w_call firefox ;; + firefox3) w_call firefox35 ;; # the one that works fm20) w_call controlpad ;; # art2kmin also comes with fm20.dll fontsmooth-bgr) w_call fontsmooth=bgr ;; fontsmooth-disable) w_call fontsmooth=disable ;;