diff --git a/_service b/_service
index 67103d8..ff99cbf 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,7 @@
@PARENT_TAG@
v(.*)
https://github.com/wine-staging/wine-staging.git
- refs/tags/v3.20
+ refs/tags/v3.21
v*.*
git
@@ -11,7 +11,7 @@
@PARENT_TAG@
wined3d9(.*)
https://github.com/sarnex/wine-d3d9-patches.git
- refs/tags/wine-d3d9-3.17
+ refs/tags/wine-d3d9-3.20
git
diff --git a/wine-3.20.tar.xz b/wine-3.20.tar.xz
deleted file mode 100644
index 1107342..0000000
--- a/wine-3.20.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:33d61122085056e091042df7d2cbe908ffb9c06e602278611dca2eea6a566f18
-size 21541928
diff --git a/wine-3.20.tar.xz.sign b/wine-3.20.tar.xz.sign
deleted file mode 100644
index a1678bf..0000000
--- a/wine-3.20.tar.xz.sign
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlvl6eUACgkQzvrI6q8X
-UZ2PNQ//Q6bw2O/mrlW46KmBodcT7yhCLD5odO/Ur//Y8dhCeUrWVedc3zlTsUsq
-T8yTU5vKrPmeEzy8b0sslSyhaVHfxII4hEJiemnVzRRazMfjR9N4p+bmpl45TVhd
-58YMywf6pjvyPOvRBveIHKpB9s9+BJA3n77/P9q7GEf0QCanlCN6Jg2s9z3cYrky
-sJ0Wz1mYOxryoL6wvdUaKJ5zawaA26S/JucIv5AEohNwCMc20fvQEVPr+iTXi5vN
-tLaZJniNvsL0nt6xrpe2nw4FmB+jeo9N6mvTwLGYKFbJk9LUBahFUnwncZ6IDezi
-XtaFiWsqx+r7y5ohs8s9PCTLiwHFIVOwOWrMFiHeB8yBDhH/H2/i1DeZYcl0tcMX
-dbd4chV9lZP4JIE4YdbojcMP/vYzg4PWQEyglliuE3bRHJ5K9eK5lHaR0f8LN4iL
-lXytJI5oJaFTcM5NgkeO+1Q+7V8GYmWcg/Bc5SFlZ3LU4gJWEBa94U/UTIZ9fAw4
-pWJW7pUb/HqW8AwsPs9cR9RxqdE3LhYJdz6QEzp1XkKzbjveCYlUOxZX7oAfkKpY
-Sy7tQb2/XSFUhbUGUYp7Hej6lFlRQkSZMZOPNLN60qOt4YbmC2cu50H5MCmOR9gR
-QVpkgVLpUa5tiA/fqmVWPnNrDyd6HvpW4yyQv3hJJuNRXmAhE1g=
-=DcXN
------END PGP SIGNATURE-----
diff --git a/wine-3.21.tar.xz b/wine-3.21.tar.xz
new file mode 100644
index 0000000..2a85e89
--- /dev/null
+++ b/wine-3.21.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a84cc06015df06e12c524213a98d879caa0d63f474b911cdd87f693fcfe2e0c0
+size 21573872
diff --git a/wine-3.21.tar.xz.sign b/wine-3.21.tar.xz.sign
new file mode 100644
index 0000000..e82587e
--- /dev/null
+++ b/wine-3.21.tar.xz.sign
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlv4YFQACgkQzvrI6q8X
+UZ1DCA//auldWePakX4Ur/G+aIB+RGt12hju9E1TVwEhWXRpJ1t/JL3HiISMUltH
+CkncyDEWyMGXEHSv646VPNZ5+f03LEYyRaWce+sC34S01eBKigVuCOxlCS1iv6JN
+CNquRZA7kC1QyIa8pdmWdHxBKET0FKvP0/dl3g8iz3rxSoQM79tLfXhiHfIg9NfR
+4YT7YgFUXOHsq+eQffz+cEDx+LmdWLVXszDM8ySv9lh6sBxoeWY7M+CzrcWE/2+J
+HIQsafRb/9fxbuBVJG/vRejsrEOq6tgY9LCufr/ZgScIl3ayUBDkHQGQd0ZXKXFl
+X2EOB54SK7DSLxotbgII3m+sdyKAQcFBBQvKBArzQfsMjeyYv8oBnoQueP9qDU6p
+gIHfiHpx+0SjpIJQ7nksoAEPLEvyFahPRohF3picX6eOKNuHs4epKZnDBAdC0sIx
+PTmPx1M4NtsCXqbsm40LlRWce/Yd6NdfIxUmK5bRCx77ysmfwvggBgGEG7JZdNSj
+K6o8ONwixG+Idk47BNTnkMn7Lal/tZQ1NkzjLhCRgjQWafU483sOWAT6FTeEwXQw
+ga1+tJ/hy3drKtjuqNvi8VYE6KiIlOOx51mYCnJ2y1yK0JXwcKa0yyc8qfpDr8Tv
+W/ejoA5pdVQvHTvwxIB6KpdNcN7s0yIMinI5ZwcYHGUDYhMzxbY=
+=tG9d
+-----END PGP SIGNATURE-----
diff --git a/wine-d3d9-patches-3.17.tar.xz b/wine-d3d9-patches-3.17.tar.xz
deleted file mode 100644
index 13712a9..0000000
--- a/wine-d3d9-patches-3.17.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:58528d0473c8c6ac1382216cb4b2030141e0955ea23543c874b13a8f54595193
-size 42268
diff --git a/wine-d3d9-patches-3.20.tar.xz b/wine-d3d9-patches-3.20.tar.xz
new file mode 100644
index 0000000..13b88d3
--- /dev/null
+++ b/wine-d3d9-patches-3.20.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:224e40f5490b17e5d0149ed7c748ccf37f716241fc61e33ee4b00bad411dcc8d
+size 42292
diff --git a/wine-staging-3.20.tar.xz b/wine-staging-3.20.tar.xz
deleted file mode 100644
index 218bf93..0000000
--- a/wine-staging-3.20.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cc0f5df4d3510bbf117c78be6696779af7114d8723bd04b4fa85ca2c30ca1435
-size 7474356
diff --git a/wine-staging-3.21.tar.xz b/wine-staging-3.21.tar.xz
new file mode 100644
index 0000000..c167224
--- /dev/null
+++ b/wine-staging-3.21.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eaa08ac8abd5d9329eb6ea831623ccbc9d5857895ab66a937eb8495d4cc296b2
+size 7469036
diff --git a/wine.changes b/wine.changes
index adb944f..fb8a257 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sat Nov 24 08:19:07 UTC 2018 - meissner@suse.com
+
+- Update to 3.21 development release
+ - Typelib marshaller rewrite using NDR functions.
+ - Graphics support on recent Android versions.
+ - Support for memory font resources in DirectWrite.
+ - Joystick support improvements.
+ - Various bug fixes.
+- updated staging to 3.21
+- updated winetricks
+
-------------------------------------------------------------------
Fri Nov 9 20:29:46 UTC 2018 - meissner@suse.com
diff --git a/wine.spec b/wine.spec
index 3268dbc..0bc05a0 100644
--- a/wine.spec
+++ b/wine.spec
@@ -107,8 +107,8 @@ BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(xxf86vm)
BuildRequires: pkgconfig(zlib)
-%define realver 3.20
-Version: 3.20
+%define realver 3.21
+Version: 3.21
Release: 0
Summary: An MS Windows Emulator
License: LGPL-2.1-or-later
@@ -146,7 +146,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %{ix86} x86_64 ppc %arm aarch64
%if %{staging}
# upstream patch target version
-%define staging_version 3.20
+%define staging_version 3.21
Source100: wine-staging-%{staging_version}.tar.xz
BuildRequires: gtk3-devel
BuildRequires: libOSMesa-devel
@@ -154,7 +154,7 @@ BuildRequires: libva-devel
%endif
%if %{nine}
# upstream patch target version
-%define nine_version 3.17
+%define nine_version 3.20
BuildRequires: Mesa-libd3d-devel
BuildRequires: libOSMesa-devel
BuildRequires: pkgconfig(dri2proto)
diff --git a/winetricks b/winetricks
index 9c4fc3b..06ab293 100644
--- a/winetricks
+++ b/winetricks
@@ -47,8 +47,8 @@ WINETRICKS_VERSION=20180815-next
# sudo dnf install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
# sudo dnf install binutils cabextract p7zip-plugins unrar unzip wget wine zenity
#
-# See http://winetricks.org for documentation and tutorials, including
-# how to contribute changes to winetricks.
+# See https://github.com/Winetricks/winetricks for documentation and tutorials,
+# including how to contribute changes to winetricks.
#
#--------------------------------------------------------------------
#
@@ -99,7 +99,7 @@ WINETRICKS_VERSION=20180815-next
# - Portability matters, as this script is run on many operating systems
# - No bash, zsh, or csh extensions; only use features from
# the POSIX standard shell and utilities; see
-# http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html
+# https://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html
# - 'checkbashisms -p -x winetricks' should show no warnings (per Debian policy)
# - Prefer classic sh idioms as described in e.g.
# "Portable Shell Programming" by Bruce Blinn, ISBN: 0-13-451494-7
@@ -4870,7 +4870,7 @@ winetricks_set_unattended()
# We shouldn't use all these extra variables. Instead, we should
# use ${foo:+bar} to jam in commandline options for silent install
# only if W_OPT_UNATTENDED is nonempty. See
- # http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_06_02
+ # https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_06_02
# So in attended mode, W_OPT_UNATTENDED should be empty.
case "$1" in
@@ -5313,9 +5313,10 @@ winetricks_init()
# wine-2.8
_wine_version_stripped="$(echo "$WINETRICKS_WINE_VERSION" | cut -d ' ' -f1 | sed -e 's/wine-//' -e 's/-rc.*//')"
- # If WINE is < 2.0, warn user:
- if w_wine_version_in 2.0, ; then
- w_warn "Your version of wine $_wine_version_stripped is no longer supported upstream. You should upgrade to 2.x"
+ # If WINE is < 3.0, warn user:
+ # 3.0 doesn't do what I thought it would
+ if w_wine_version_in 2.99, ; then
+ w_warn "Your version of wine $_wine_version_stripped is no longer supported upstream. You should upgrade to 3.x"
fi
if [ ! "$WINETRICKS_SUPER_QUIET" ] ; then
@@ -5667,8 +5668,9 @@ load_adobeair()
# See https://bugs.winehq.org/show_bug.cgi?id=43506
# and https://github.com/Winetricks/winetricks/issues/821
+ # Note: must be -silent, not /silent. /silent gives error 'too many arguments'
if w_workaround_wine_bug 43506 "Forcing quiet install"; then
- w_try "$WINE" AdobeAIRInstaller.exe -silent
+ w_try "$WINE" AdobeAIRInstaller.exe $W_UNATTENDED_DASH_SILENT
else
w_try "$WINE" AdobeAIRInstaller.exe $W_UNATTENDED_DASH_SILENT
fi
@@ -7004,7 +7006,10 @@ w_metadata dxvk80 dlls \
load_dxvk80()
{
# https://github.com/doitsujin/dxvk
- w_download "https://github.com/doitsujin/dxvk/releases/download/v0.80/dxvk-0.80.tar.gz" f9e736cdbf1e83e45ca748652a94a3a189fc5accde1eac549b2ba5af8f7acacb
+ # 2018/09/23: f9e736cdbf1e83e45ca748652a94a3a189fc5accde1eac549b2ba5af8f7acacb
+ # 2018/11/17: 7058a834bb006cad5462933110449b434df561e67d83f68d3965ecc74e2e1cbc
+ # See: https://github.com/doitsujin/dxvk/issues/773
+ w_download "https://github.com/doitsujin/dxvk/releases/download/v0.80/dxvk-0.80.tar.gz" 7058a834bb006cad5462933110449b434df561e67d83f68d3965ecc74e2e1cbc
helper_dxvk "$file1" "d3d10_enabled" "3.10" "1.0.76"
}
@@ -7065,6 +7070,44 @@ load_dxvk91()
helper_dxvk "$file1" "d3d10_enabled" "3.19" "1.1.88"
}
+w_metadata dxvk92 dlls \
+ title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.92)" \
+ publisher="Philip Rebohle" \
+ year="2018" \
+ media="download" \
+ file1="dxvk-0.92.tar.gz" \
+ installed_file1="$W_SYSTEM32_DLLS_WIN/d3d10.dll" \
+ installed_file2="$W_SYSTEM32_DLLS_WIN/d3d10_1.dll" \
+ installed_file3="$W_SYSTEM32_DLLS_WIN/d3d10core.dll" \
+ installed_file4="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
+ installed_file5="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
+
+load_dxvk92()
+{
+ # https://github.com/doitsujin/dxvk
+ w_download "https://github.com/doitsujin/dxvk/releases/download/v0.92/dxvk-0.92.tar.gz" e22c0ae4693aac88562c7a9a97b3316e086b9048c9f8f9e128923ac1611a5c49
+ helper_dxvk "$file1" "d3d10_enabled" "3.19" "1.1.88"
+}
+
+w_metadata dxvk93 dlls \
+ title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.93)" \
+ publisher="Philip Rebohle" \
+ year="2018" \
+ media="download" \
+ file1="dxvk-0.93.tar.gz" \
+ installed_file1="$W_SYSTEM32_DLLS_WIN/d3d10.dll" \
+ installed_file2="$W_SYSTEM32_DLLS_WIN/d3d10_1.dll" \
+ installed_file3="$W_SYSTEM32_DLLS_WIN/d3d10core.dll" \
+ installed_file4="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
+ installed_file5="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
+
+load_dxvk93()
+{
+ # https://github.com/doitsujin/dxvk
+ w_download "https://github.com/doitsujin/dxvk/releases/download/v0.93/dxvk-0.93.tar.gz" 4d964e4e10e67ba7705312496e472ae9859520a78d8742d6d377886318c95e53
+ helper_dxvk "$file1" "d3d10_enabled" "3.19" "1.1.88"
+}
+
#----------------------------------------------------------------
@@ -7440,8 +7483,7 @@ load_dotnet20()
w_call remove_mono
w_call fontfix
- # Recipe from https://bugs.winehq.org/show_bug.cgi?id=10467#c57
- # and https://bugs.winehq.org/show_bug.cgi?id=30845#c10
+ # Needed for https://bugs.winehq.org/show_bug.cgi?id=12401
w_set_winver win2k
w_try_cd "$W_CACHE"/"$W_PACKAGE"
@@ -7555,16 +7597,11 @@ load_dotnet20sp1()
w_call remove_mono
- w_call dotnet20
-
WINEDLLOVERRIDES=
w_warn "Setting windows version so installer works"
- # Stop services
- # Recipe from https://bugs.winehq.org/show_bug.cgi?id=16956
- w_wineserver -k
- # Fight a race condition, see bug 16956 comment 43
+
w_set_winver win2k
- w_wineserver -w
+
WINEDLLOVERRIDES=ngen.exe,regsvcs.exe,mscorsvw.exe=b
export WINEDLLOVERRIDES
@@ -7621,30 +7658,10 @@ load_dotnet20sp2()
w_call remove_mono
- w_call dotnet20
- w_wineserver -w
+ w_set_winver winxp
w_try_cd "$W_CACHE/$W_PACKAGE"
- w_ahk_do "
- SetTitleMatchMode, 2
- run, NetFx20SP2_x86.exe ${W_OPT_UNATTENDED:+ /q /c:"install.exe /q"}
-
- Loop
- {
- sleep 1000
- ifwinexist,, cannot be uninstalled
- {
- WinClose,, cannot be uninstalled
- continue
- }
- Process, exist, NetFx20SP2_x86.exe
- dotnet_pid = %ErrorLevel%
- if dotnet_pid = 0
- {
- break
- }
- }
- "
+ w_try "$WINE" NetFx20SP2_x86.exe ${W_OPT_UNATTENDED:+ /q /c:"install.exe /q"}
status=$?
case $status in
@@ -7703,8 +7720,6 @@ load_dotnet30()
;;
esac
- w_call dotnet20
-
# AF's workaround to avoid long pause
LANGPACKS_BASE_PATH="${W_WINDIR_UNIX}/SYSMSICache/Framework/v3.0"
test -d "${LANGPACKS_BASE_PATH}" || mkdir -p "${LANGPACKS_BASE_PATH}"
@@ -7810,8 +7825,7 @@ load_dotnet35()
w_call remove_mono
- w_call dotnet30sp1
- w_wineserver -w
+ w_set_winver winxp
# See also https://blogs.msdn.microsoft.com/astebner/2008/07/17/scenarios-where-net-framework-3-5-setup-tries-to-connect-to-the-internet-and-how-to-avoid-them/
w_try_cd "$W_TMP"
@@ -7855,36 +7869,10 @@ load_dotnet35sp1()
w_call remove_mono
- w_call dotnet35
- w_wineserver -w
- w_call dotnet20sp2
- w_wineserver -w
-
- # Work around hang in https://bugs.winehq.org/show_bug.cgi?id=25060#c19
- WINEDLLOVERRIDES=ngen.exe,mscorsvw.exe=b
- export WINEDLLOVERRIDES
+ w_set_winver winxp
w_try_cd "$W_CACHE/$W_PACKAGE"
- w_ahk_do "
- SetTitleMatchMode, 2
- run, dotnetfx35.exe /lang:ENU $W_UNATTENDED_SLASH_Q
-
- Loop
- {
- sleep 1000
- ifwinexist,, cannot be uninstalled
- {
- WinClose,, cannot be uninstalled
- continue
- }
- Process, exist, dotnetfx35.exe
- dotnet_pid = %ErrorLevel%
- if dotnet_pid = 0
- {
- break
- }
- }
- "
+ "$WINE" dotnetfx35.exe /lang:ENU $W_UNATTENDED_SLASH_Q
# Doesn't install any ngen.exe
# W_NGEN_CMD=""
@@ -8165,17 +8153,10 @@ load_dotnet462()
{
w_package_warn_win64
- if w_workaround_wine_bug 42170 "Running un-official repacked .NET 4.6.2 setup until the official version is fixed."; then
- # Un-official slim version. See https://repacks.net/forum/viewtopic.php?t=7
- file_package="dotNetFx462_Full_x86_x64_Slim.exe"
- w_download https://www.dropbox.com/s/1bdocgbate8hc8z/dotNetFx462_Full_x86_x64_Slim.exe?dl=1 8f03c8a9b2f4666c3707abe2d70145f200cb2f0f3b792626e64d167d1ad0565f $file_package
- unattended_args="/ai /gm2"
- else
- # Official version. See https://www.microsoft.com/en-us/download/details.aspx?id=53344
- w_download https://download.microsoft.com/download/F/9/4/F942F07D-F26F-4F30-B4E3-EBD54FABA377/NDP462-KB3151800-x86-x64-AllOS-ENU.exe 28886593e3b32f018241a4c0b745e564526dbb3295cb2635944e3a393f4278d4
- file_package="NDP462-KB3151800-x86-x64-AllOS-ENU.exe"
- unattended_args="/sfxlang:1027 /q /norestart"
- fi
+ # Official version. See https://www.microsoft.com/en-us/download/details.aspx?id=53344
+ w_download https://download.microsoft.com/download/F/9/4/F942F07D-F26F-4F30-B4E3-EBD54FABA377/NDP462-KB3151800-x86-x64-AllOS-ENU.exe 28886593e3b32f018241a4c0b745e564526dbb3295cb2635944e3a393f4278d4
+ file_package="NDP462-KB3151800-x86-x64-AllOS-ENU.exe"
+ unattended_args="/sfxlang:1027 /q /norestart"
w_call remove_mono
@@ -10045,7 +10026,8 @@ load_vb2run()
# See ftp://ftp.microsoft.com/Softlib/index.txt
# 2014/05/31: Microsoft FTP is down ftp://$ftp_microsoft_com/Softlib/MSLFILES/VBRUN200.EXE
# 2015/08/10: chatnfiles is down, conradshome.com is up (and has a LOT of old MS installers archived!)
- w_download https://www.conradshome.com/win31/archive/softlib/vbrun200.exe 4b0811d8fdcac1fd9411786c9119dc8d98d0540948211bdbc1ac682fbe5c0228
+ # 2018/11/15: now conradshome is down ,but quaddicted.com also has it (and a lot more)
+ w_download https://www.quaddicted.com/files/mirrors/ftp.planetquake.com/aoe/downloads/VBRUN200.EXE 4b0811d8fdcac1fd9411786c9119dc8d98d0540948211bdbc1ac682fbe5c0228
w_try_unzip "$W_TMP" "$W_CACHE"/vb2run/VBRUN200.EXE
w_try cp -f "$W_TMP/VBRUN200.DLL" "$W_SYSTEM32_DLLS"
}
@@ -10833,6 +10815,34 @@ load_winhttp()
#----------------------------------------------------------------
w_metadata wininet dlls \
+ title="MS Windows Internet API" \
+ publisher="Microsoft" \
+ year="2011" \
+ media="download" \
+ file1="../win7sp1/windows6.1-KB976932-X86.exe" \
+ installed_file1="$W_SYSTEM32_DLLS_WIN/wininet.dll"
+
+load_wininet()
+{
+ helper_win7sp1 x86_microsoft-windows-i..tocolimplementation_31bf3856ad364e35_8.0.7601.17514_none_1eaaa4a07717236e/wininet.dll
+ w_try cp "$W_TMP/x86_microsoft-windows-i..tocolimplementation_31bf3856ad364e35_8.0.7601.17514_none_1eaaa4a07717236e/wininet.dll" "$W_SYSTEM32_DLLS/wininet.dll"
+ helper_win7sp1 x86_microsoft-windows-ie-runtimeutilities_31bf3856ad364e35_8.0.7601.17514_none_64655b7c61c841cb/iertutil.dll
+ w_try cp "$W_TMP/x86_microsoft-windows-ie-runtimeutilities_31bf3856ad364e35_8.0.7601.17514_none_64655b7c61c841cb/iertutil.dll" "$W_SYSTEM32_DLLS/iertutil.dll"
+
+ if [ "$W_ARCH" = "win64" ]; then
+ helper_win7sp1_x64 amd64_microsoft-windows-i..tocolimplementation_31bf3856ad364e35_8.0.7601.17514_none_7ac940242f7494a4/wininet.dll
+ w_try cp "$W_TMP/amd64_microsoft-windows-i..tocolimplementation_31bf3856ad364e35_8.0.7601.17514_none_7ac940242f7494a4/wininet.dll" "$W_SYSTEM64_DLLS/wininet.dll"
+ helper_win7sp1_x64 amd64_microsoft-windows-ie-runtimeutilities_31bf3856ad364e35_8.0.7601.17514_none_c083f7001a25b301/iertutil.dll
+ w_try cp "$W_TMP/amd64_microsoft-windows-ie-runtimeutilities_31bf3856ad364e35_8.0.7601.17514_none_c083f7001a25b301/iertutil.dll" "$W_SYSTEM64_DLLS/iertutil.dll"
+ fi
+
+ w_override_dlls native,builtin wininet
+ w_override_dlls native,builtin iertutil
+}
+
+#----------------------------------------------------------------
+
+w_metadata wininet_win2k dlls \
title="MS Windows Internet API" \
publisher="Microsoft" \
year="2008" \
@@ -10840,10 +10850,11 @@ w_metadata wininet dlls \
file1="../win2ksp4/W2KSP4_EN.EXE" \
installed_file1="$W_SYSTEM32_DLLS_WIN/wininet.dll"
-load_wininet()
+load_wininet_win2k()
{
helper_win2ksp4 i386/wininet.dl_
w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/wininet.dl_
+
w_override_dlls native,builtin wininet
}
@@ -11105,7 +11116,7 @@ load_baekmuk()
{
# See http://kldp.net/projects/baekmuk for project page
# Need to download from Debian as the project page has unique captcha tokens per visitor
- w_download "http://http.debian.net/debian/pool/main/f/fonts-baekmuk/fonts-baekmuk_2.2.orig.tar.gz" 08ab7dffb55d5887cc942ce370f5e33b756a55fbb4eaf0b90f244070e8d51882
+ w_download "https://deb.debian.org/debian/pool/main/f/fonts-baekmuk/fonts-baekmuk_2.2.orig.tar.gz" 08ab7dffb55d5887cc942ce370f5e33b756a55fbb4eaf0b90f244070e8d51882
w_try_cd "$W_TMP"
w_try tar -zxf "$W_CACHE/$W_PACKAGE/$file1" baekmuk-ttf-2.2/ttf
@@ -11860,7 +11871,7 @@ load_opensymbol()
# The OpenSymbol fonts are a replacement for the Windows Wingdings font from OpenOffice.org.
# Need to w_download Debian since I can't find a standalone download from OpenOffice
# Note: The source download package on debian is for _all_ of OpenOffice, which is 266 MB.
- w_download "http://security.debian.org/debian-security/pool/updates/main/libr/libreoffice/fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u11_all.deb" b105ec27c738f92bd9801962f10fd05125c38224c92e702f84b00cbb482dfce7
+ w_download "https://deb.debian.org/debian-security/pool/updates/main/libr/libreoffice/fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u11_all.deb" b105ec27c738f92bd9801962f10fd05125c38224c92e702f84b00cbb482dfce7
w_try_cd "$W_TMP"
w_try_ar "$W_CACHE/$W_PACKAGE/$file1" data.tar.xz
@@ -11881,7 +11892,7 @@ w_metadata tahoma fonts \
load_tahoma()
{
- # Formerly at http://download.microsoft.com/download/ie55sp2/Install/5.5_SP2/WIN98Me/EN-US/IELPKTH.CAB
+ # Formerly at https://download.microsoft.com/download/ie55sp2/Install/5.5_SP2/WIN98Me/EN-US/IELPKTH.CAB
w_download https://downloads.sourceforge.net/corefonts/OldFiles/IELPKTH.CAB c1be3fb8f0042570be76ec6daa03a99142c88367c1bc810240b85827c715961a
w_try_cabextract -d "$W_TMP" "$W_CACHE/$W_PACKAGE/$file1"
@@ -12776,7 +12787,7 @@ load_ie8()
w_call msls31
# Change the override to the native so we are sure we use and register them
- w_override_dlls native,builtin itircl itss jscript msctf mshtml shdoclc shdocvw shlwapi urlmon wininet xmllite
+ w_override_dlls native,builtin ieproxy itircl itss jscript msctf mshtml shdoclc shdocvw shlwapi urlmon wininet xmllite
# IE8 installer will check the version number of iexplore.exe which causes IE8 installer to fail on wine-1.9.0+
w_override_dlls native iexplore.exe
@@ -12850,6 +12861,12 @@ _EOF_
w_try_regedit "$W_TMP_WIN"\\set-tabprocgrowth.reg
fi
+ # Builtin ieproxy is in system32, but ie8's lives in Program Files. Native
+ # CLSID path will get overwritten on prefix update. Setting ieproxy to
+ # native doesn't help because setupapi ignores DLL overrides. To work
+ # around this problem, copy native ieproxy to system32.
+ w_try cp -f "${W_PROGRAMS_X86_UNIX}/Internet Explorer/ieproxy.dll" "$W_SYSTEM32_DLLS"
+
# Seeing is believing
case $WINETRICKS_GUI in
none)
@@ -13657,7 +13674,7 @@ w_metadata qq apps \
file1="QQ8.9.1.exe" \
file2="QQ.tar.gz"\
installed_exe1="$W_PROGRAMS_X86_WIN/Tencent/QQ/Bin/QQScLauncher.exe" \
- homepage="http://www.qq.com" \
+ homepage="https://www.qq.com/" \
unattended="no"
load_qq()
@@ -13882,7 +13899,7 @@ w_metadata uplay apps \
load_uplay()
{
# Changes too frequently, don't check anymore
- w_download http://static3.cdn.ubi.com/orbit/launcher_installer/UplayInstaller.exe
+ w_download https://static3.cdn.ubi.com/orbit/launcher_installer/UplayInstaller.exe
w_try_cd "$W_CACHE/$W_PACKAGE"
# NSIS installer
@@ -14148,7 +14165,7 @@ w_metadata winamp apps \
media="download" \
file1="winamp5666_full_all_redux.exe" \
installed_exe1="$W_PROGRAMS_X86_WIN/Winamp/winamp.exe" \
- homepage="http://www.winamp.com"
+ homepage="https://www.winamp.com/"
load_winamp()
{
@@ -14588,7 +14605,7 @@ load_stalker_pripyat_bench()
{
# Much faster
w_download_manual http://www.bigdownload.com/games/stalker-call-of-pripyat/pc/stalker-call-of-pripyat-benchmark stkcop-bench-setup.exe 8c810fba1bbb9c58fc01f4f602479886680c9f4b491dd0afe935e27083f54845
- #w_download http://files.gsc-game.com/st/bench/stkcop-bench-setup.exe 8c810fba1bbb9c58fc01f4f602479886680c9f4b491dd0afe935e27083f54845
+ #w_download https://files.gsc-game.com/st/bench/stkcop-bench-setup.exe 8c810fba1bbb9c58fc01f4f602479886680c9f4b491dd0afe935e27083f54845
w_try_cd "$W_CACHE/$W_PACKAGE"
@@ -14881,7 +14898,7 @@ load_acreedbro()
WinWaitClose
"
- w_download http://static3.cdn.ubi.com/ac_brotherhood/ac_brotherhood_1.01_ww.exe a8027b08840a7438a0bd1a1c17f962fcc386a2cb9fd1d3055de2486bf95778c2
+ w_download https://static3.cdn.ubi.com/ac_brotherhood/ac_brotherhood_1.01_ww.exe a8027b08840a7438a0bd1a1c17f962fcc386a2cb9fd1d3055de2486bf95778c2
# FIXME: figure out why these executables don't exit, and do a proper workaround or fix
sleep 10
@@ -15246,69 +15263,6 @@ load_bfbc2()
#----------------------------------------------------------------
-w_metadata cnc_tiberian_sun games \
- title="Command & Conquer: Tiberian Sun (2010 edition)" \
- publisher="EA" \
- year="1999" \
- media="download" \
- file1="OfficialCnCTiberianSun.rar" \
- installed_exe1="$W_PROGRAMS_X86_WIN\\EA Games\\Command & Conquer The First Decade\\Command & Conquer(tm) Tiberian Sun(tm)\\SUN\\Game.exe"
-
-load_cnc_tiberian_sun()
-{
- w_download http://download.fileplanet.com/ftp1/022010/OfficialCnCTiberianSun.rar b04219e715511de9baa2feb9827013c8e106f8d6b9b563936b8a2f650305dec5
-
- w_try_cd "$W_PROGRAMS_X86_UNIX"
- # FIXME: we need a progress indicator when unpacking large archives
- w_info "Unpacking rar file. This will take a minute."
- w_try_unrar "$W_CACHE/$W_PACKAGE/$file1"
-}
-
-#----------------------------------------------------------------
-
-w_metadata cnc3_demo games \
- title="Command & Conquer 3 Demo" \
- publisher="EA" \
- year="2007" \
- media="download" \
- file1="CnC3Demo.exe" \
- installed_exe1="$W_PROGRAMS_X86_WIN/Electronic Arts/Command & Conquer 3 Tiberium Wars Demo/CNC3Demo.exe"
-
-load_cnc3_demo()
-{
- w_download "http://largedownloads.ea.com/pub/demos/CommandandConquer3/CnC3Demo.exe" 1e2499f441ef1fc3cbe447ac16361ad4247a02b9b8ec05f504161e7b5b1254e5
-
- w_try_cd "$W_CACHE/$W_PACKAGE"
- w_ahk_do "
- SetTitleMatchMode, 2
- run, CnC3Demo.exe
- winwait, Conquer 3, free space to install
- if ( w_opt_unattended > 0 ) {
- controlclick, button1
- winwait, WinZip, After installation
- controlclick, button1
- winwait, Conquer 3, InstallShield
- controlclick, button1
- winwait, Conquer 3, license
- controlclick, button3
- controlclick, button5
- winwait, Conquer 3, setup type
- controlclick, button5
- winwait, Conquer 3, EA Link
- controlclick, button1
- winwait, Conquer 3, GameSpy
- controlclick, button1
- }
- winwait, Conquer 3, Launch the program
- if ( w_opt_unattended > 0 )
- controlclick, button1
-
- winwaitclose, Conquer 3, Launch the program
- "
-}
-
-#----------------------------------------------------------------
-
w_metadata cnc_redalert3_demo games \
title="Command & Conquer Red Alert 3 Demo" \
publisher="EA" \
@@ -17086,54 +17040,6 @@ load_gta_vc()
#----------------------------------------------------------------
-w_metadata hphbp_demo games \
- title="Harry Potter and the Half-Blood Prince Demo" \
- publisher="EA" \
- year="2009" \
- media="download" \
- file1="Release_HBP_demo_PC_DD_DEMO_Final_348428.exe" \
- installed_exe1="$W_PROGRAMS_X86_WIN/Electronic Arts/Harry Potter and the Half-Blood Prince Demo/pc/hp6_demo.exe"
-
-load_hphbp_demo()
-{
- case "$LANG" in
- ""|"C") w_die "Harry Potter will not install in the POSIX locale; please do 'export LANG=en_US.UTF-8' or something like that" ;;
- esac
-
- w_download http://largedownloads.ea.com/pub/demos/HarryPotter/Release_HBP_demo_PC_DD_DEMO_Final_348428.exe eca6c5eb49dc2f778175a36e07b0b1d3f33db75fdb5fda8bfefd2c1648fbbd53
-
- w_try_cd "$W_CACHE/$W_PACKAGE"
- w_ahk_do "
- SetTitleMatchMode, 2
- run, Release_HBP_demo_PC_DD_DEMO_FINAL_348428.exe
- winwait, Harry Potter, Install
- if ( w_opt_unattended > 0 ) {
- controlclick, Button1, Harry Potter
- winwait, Setup, License
- controlclick, Button1
- controlclick, Button3
- winwait, Setup, License
- controlclick, Button1
- controlclick, Button3
- winwait, Setup, Destination
- controlclick, Button1
- winwait, Setup, begin
- controlclick, Button1
- }
- winwait, Setup, Finish
- if ( w_opt_unattended > 0 )
- controlclick, Button1
- winwaitclose
- "
-
- # Work around locale issues by symlinking the app's directory to not have a funny char
- # Won't really work on Cygwin, but that's ok.
- w_try_cd "$W_PROGRAMS_X86_UNIX/Electronic Arts"
- ln -s "Harry Potter and the Half-Blood Prince"* "Harry Potter and the Half-Blood Prince Demo"
-}
-
-#----------------------------------------------------------------
-
w_metadata kotor1 games \
title="Star Wars: Knights of the Old Republic" \
publisher="LucasArts" \
diff --git a/winetricks.1 b/winetricks.1
index 67275ba..2960df2 100644
--- a/winetricks.1
+++ b/winetricks.1
@@ -162,13 +162,13 @@ See .
.SH BUGS
.PP
Bugs may be reported at
-.I http://winetricks.org
+.I https://github.com/Winetricks/winetricks
.PP
.SH AVAILABILITY
The most recent version of
.B winetricks
can be downloaded from
-.I http://winetricks.org/download/releases/
+.I https://github.com/Winetricks/winetricks/releases
.PP
The latest snapshot of the code may be obtained via git; see
.I https://github.com/Winetricks/winetricks/
@@ -176,7 +176,7 @@ The latest snapshot of the code may be obtained via git; see
For further information about
.B winetricks
see
-.I http://winetricks.org
+.I https://github.com/Winetricks/winetricks/
.SH "SEE ALSO"
.BR wine (1)