Hello community,
here is the log from the commit of package wine for openSUSE:Factory checked in
at 2018-03-20 22:01:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wine (Old)
and /work/SRC/openSUSE:Factory/.wine.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wine"
Tue Mar 20 22:01:18 2018 rev:248 rq:589093 version:3.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/wine/wine.changes 2018-03-16
10:44:46.801381755 +0100
+++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2018-03-20
22:02:07.725861205 +0100
@@ -1,0 +2,12 @@
+Fri Mar 16 19:28:06 UTC 2018 - meiss...@suse.com
+
+- Update to 3.4 development release
+ - More Vulkan support, including integration with the X11 driver.
+ - Better handling of privileged instructions on x86-64.
+ - Hex edit dialog improvements in RegEdit.
+ - Assortment of patches merged from wine-staging.
+ - Various bug fixes.
+- updated winetricks
+- updated staging to 3.4
+
+-------------------------------------------------------------------
Old:
----
wine-3.3.tar.xz
wine-3.3.tar.xz.sign
wine-d3d9-patches-3.3.tar.xz
wine-staging-3.3.tar.xz
New:
----
wine-3.4.tar.xz
wine-3.4.tar.xz.sign
wine-d3d9-patches-3.4.tar.xz
wine-staging-3.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wine.spec ++++++
--- /var/tmp/diff_new_pack.2coDpq/_old 2018-03-20 22:02:09.505797122 +0100
+++ /var/tmp/diff_new_pack.2coDpq/_new 2018-03-20 22:02:09.513796834 +0100
@@ -101,8 +101,8 @@
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(xxf86vm)
BuildRequires: pkgconfig(zlib)
-%define realver 3.3
-Version: 3.3
+%define realver 3.4
+Version: 3.4
Release: 0
Summary: An MS Windows Emulator
License: LGPL-2.1-or-later
@@ -140,7 +140,7 @@
ExclusiveArch: %{ix86} x86_64 ppc %arm
%if %{staging}
# upstream patch target version
-%define staging_version 3.3
+%define staging_version 3.4
Source100: wine-staging-%{staging_version}.tar.xz
BuildRequires: gtk3-devel
BuildRequires: libOSMesa-devel
@@ -148,7 +148,7 @@
%endif
%if %{nine}
# upstream patch target version
-%define nine_version 3.3
+%define nine_version 3.4
BuildRequires: Mesa-libd3d-devel
BuildRequires: dri2proto-devel
BuildRequires: libOSMesa-devel
++++++ _service ++++++
--- /var/tmp/diff_new_pack.2coDpq/_old 2018-03-20 22:02:09.585794242 +0100
+++ /var/tmp/diff_new_pack.2coDpq/_new 2018-03-20 22:02:09.585794242 +0100
@@ -3,7 +3,7 @@
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="url">https://github.com/wine-staging/wine-staging.git</param>
- <param name="revision">refs/tags/v3.3</param>
+ <param name="revision">refs/tags/v3.4</param>
<param name="match-tag">v*.*</param>
<param name="scm">git</param>
</service>
@@ -11,7 +11,7 @@
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">wined3d9(.*)</param>
<param name="url">https://github.com/sarnex/wine-d3d9-patches.git</param>
- <param name="revision">refs/tags/wine-d3d9-3.3</param>
+ <param name="revision">refs/tags/wine-d3d9-3.4</param>
<param name="scm">git</param>
</service>
<service name="recompress" mode="disabled">
++++++ wine-3.3.tar.xz -> wine-3.4.tar.xz ++++++
/work/SRC/openSUSE:Factory/wine/wine-3.3.tar.xz
/work/SRC/openSUSE:Factory/.wine.new/wine-3.4.tar.xz differ: char 26, line 1
++++++ wine-d3d9-patches-3.3.tar.xz -> wine-d3d9-patches-3.4.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wine-d3d9-patches-3.3/d3d9-helper.patch
new/wine-d3d9-patches-3.4/d3d9-helper.patch
--- old/wine-d3d9-patches-3.3/d3d9-helper.patch 2018-03-04 18:58:49.000000000
+0100
+++ new/wine-d3d9-patches-3.4/d3d9-helper.patch 2018-03-18 00:30:18.000000000
+0100
@@ -1,6 +1,6 @@
-From 1b441555922dc0d80699de41b52aa0fa51e65aaf Mon Sep 17 00:00:00 2001
+From 5ddf2f0c5e72b819bdc45cc64096fec81d9503ee Mon Sep 17 00:00:00 2001
From: Nick Sarnie <commendsar...@gmail.com>
-Date: Sun, 4 Mar 2018 12:55:12 -0500
+Date: Sat, 17 Mar 2018 19:16:55 -0400
Subject: [PATCH] D3D9 Helper
Signed-off-by: Nick Sarnie <commendsar...@gmail.com>
@@ -18,10 +18,10 @@
create mode 100644 programs/winecfg/staging.c
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index de2cc543bc..b8b990ba70 100644
+index fe5ce9d1e4..ebb7aea4d0 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
-@@ -99,6 +99,7 @@ struct builtin_load_info
+@@ -100,6 +100,7 @@ struct builtin_load_info
{
const WCHAR *load_path;
const WCHAR *filename;
@@ -29,7 +29,7 @@
NTSTATUS status;
WINE_MODREF *wm;
};
-@@ -124,7 +125,8 @@ static WINE_MODREF *cached_modref;
+@@ -125,7 +126,8 @@ static WINE_MODREF *cached_modref;
static WINE_MODREF *current_modref;
static WINE_MODREF *last_failed_modref;
@@ -39,7 +39,7 @@
static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved );
static FARPROC find_ordinal_export( HMODULE module, const
IMAGE_EXPORT_DIRECTORY *exports,
DWORD exp_size, DWORD ordinal, LPCWSTR
load_path );
-@@ -477,7 +479,7 @@ static FARPROC find_forwarded_export( HMODULE module,
const char *forward, LPCWS
+@@ -478,7 +480,7 @@ static FARPROC find_forwarded_export( HMODULE module,
const char *forward, LPCWS
if (!(wm = find_basename_module( mod_name )))
{
TRACE( "delay loading %s for '%s'\n", debugstr_w(mod_name), forward );
@@ -48,7 +48,7 @@
!(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS))
{
if (!imports_fixup_done && current_modref)
-@@ -647,7 +649,7 @@ static BOOL import_dll( HMODULE module, const
IMAGE_IMPORT_DESCRIPTOR *descr, LP
+@@ -649,7 +651,7 @@ static BOOL import_dll( HMODULE module, const
IMAGE_IMPORT_DESCRIPTOR *descr, LP
{
ascii_to_unicode( buffer, name, len );
buffer[len] = 0;
@@ -57,7 +57,7 @@
}
else /* need to allocate a larger buffer */
{
-@@ -655,7 +657,7 @@ static BOOL import_dll( HMODULE module, const
IMAGE_IMPORT_DESCRIPTOR *descr, LP
+@@ -657,7 +659,7 @@ static BOOL import_dll( HMODULE module, const
IMAGE_IMPORT_DESCRIPTOR *descr, LP
if (!ptr) return FALSE;
ascii_to_unicode( ptr, name, len );
ptr[len] = 0;
@@ -66,7 +66,7 @@
RtlFreeHeap( GetProcessHeap(), 0, ptr );
}
-@@ -940,7 +942,7 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm,
LPCWSTR load_path, void *
+@@ -943,7 +945,7 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm,
LPCWSTR load_path, void *
prev = current_modref;
current_modref = wm;
@@ -75,7 +75,7 @@
current_modref = prev;
if (status)
{
-@@ -1023,7 +1025,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR
load_path )
+@@ -1028,7 +1030,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR
load_path )
* Allocate a WINE_MODREF structure and add it to the process list
* The loader_section must be locked while calling this function.
*/
@@ -84,7 +84,7 @@
{
WINE_MODREF *wm;
const WCHAR *p;
-@@ -1037,7 +1039,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule,
LPCWSTR filename )
+@@ -1042,7 +1044,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule,
LPCWSTR filename )
wm->ldr.TlsIndex = -1;
wm->ldr.LoadCount = 1;
@@ -93,7 +93,7 @@
if ((p = strrchrW( wm->ldr.FullDllName.Buffer, '\\' ))) p++;
else p = wm->ldr.FullDllName.Buffer;
RtlInitUnicodeString( &wm->ldr.BaseDllName, p );
-@@ -1649,7 +1651,7 @@ static void load_builtin_callback( void *module, const
char *filename )
+@@ -1654,7 +1656,7 @@ static void load_builtin_callback( void *module, const
char *filename )
return;
}
@@ -102,7 +102,7 @@
RtlFreeHeap( GetProcessHeap(), 0, fullname );
if (!wm)
{
-@@ -1859,8 +1861,8 @@ static BOOL is_valid_binary( HMODULE module, const
pe_image_info_t *info )
+@@ -1864,8 +1866,8 @@ static BOOL is_valid_binary( HMODULE module, const
pe_image_info_t *info )
/******************************************************************************
* load_native_dll (internal)
*/
@@ -113,7 +113,7 @@
{
void *module;
HANDLE mapping;
-@@ -1903,7 +1905,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path,
LPCWSTR name, HANDLE file,
+@@ -1908,7 +1910,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path,
LPCWSTR name, HANDLE file,
/* create the MODREF */
@@ -122,7 +122,7 @@
{
if (module) NtUnmapViewOfSection( NtCurrentProcess(), module );
return STATUS_NO_MEMORY;
-@@ -1967,8 +1969,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path,
LPCWSTR name, HANDLE file,
+@@ -1972,8 +1974,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path,
LPCWSTR name, HANDLE file,
/***********************************************************************
* load_builtin_dll
*/
@@ -133,7 +133,7 @@
{
char error[256], dllname[MAX_PATH];
const WCHAR *name, *p;
-@@ -1988,6 +1990,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path,
LPCWSTR path, HANDLE file,
+@@ -1993,6 +1995,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path,
LPCWSTR path, HANDLE file,
*/
info.load_path = load_path;
info.filename = NULL;
@@ -141,7 +141,7 @@
info.status = STATUS_SUCCESS;
info.wm = NULL;
-@@ -2186,6 +2189,108 @@ done:
+@@ -2191,6 +2194,108 @@ done:
return status;
}
@@ -250,7 +250,7 @@
/***********************************************************************
* open_dll_file
-@@ -2232,7 +2337,7 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name,
WINE_MODREF **pwm, struct
+@@ -2237,7 +2342,7 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name,
WINE_MODREF **pwm, struct
*/
static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname,
WCHAR *filename, ULONG *size, WINE_MODREF
**pwm,
@@ -259,7 +259,7 @@
{
UNICODE_STRING nt_name;
WCHAR *file_part, *ext, *dllname;
-@@ -2277,20 +2382,41 @@ static NTSTATUS find_dll_file( const WCHAR *load_path,
const WCHAR *libname,
+@@ -2282,20 +2387,41 @@ static NTSTATUS find_dll_file( const WCHAR *load_path,
const WCHAR *libname,
if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH)
{
@@ -305,7 +305,7 @@
}
/* not found */
-@@ -2338,8 +2464,10 @@ overflow:
+@@ -2343,8 +2469,10 @@ overflow:
* Load a PE style module according to the load order.
* The loader_section must be locked while calling this function.
*/
@@ -317,7 +317,7 @@
enum loadorder loadorder;
WCHAR buffer[64];
WCHAR *filename;
-@@ -2356,7 +2484,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR
libname, DWORD flags, WINE_
+@@ -2361,7 +2489,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR
libname, DWORD flags, WINE_
size = sizeof(buffer);
for (;;)
{
@@ -326,7 +326,7 @@
if (nts == STATUS_SUCCESS) break;
if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename );
if (nts != STATUS_BUFFER_TOO_SMALL) return nts;
-@@ -2376,6 +2504,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR
libname, DWORD flags, WINE_
+@@ -2381,6 +2509,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR
libname, DWORD flags, WINE_
}
main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress );
@@ -352,7 +352,7 @@
loadorder = get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer :
NULL, filename );
if (handle && is_fake_dll( handle ))
-@@ -2398,22 +2545,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR
libname, DWORD flags, WINE_
+@@ -2403,22 +2550,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR
libname, DWORD flags, WINE_
if (!handle) nts = STATUS_DLL_NOT_FOUND;
else
{
@@ -380,7 +380,7 @@
if (nts == STATUS_SUCCESS && loadorder == LO_DEFAULT &&
(MODULE_InitDLL( *pwm, DLL_WINE_PREATTACH, NULL ) !=
STATUS_SUCCESS))
{
-@@ -2423,7 +2570,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR
libname, DWORD flags, WINE_
+@@ -2428,7 +2575,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR
libname, DWORD flags, WINE_
nts = STATUS_DLL_NOT_FOUND;
}
if (nts == STATUS_DLL_NOT_FOUND && loadorder != LO_BUILTIN)
@@ -389,7 +389,7 @@
break;
}
-@@ -2456,7 +2603,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR
path_name, DWORD flags,
+@@ -2461,7 +2608,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR
path_name, DWORD flags,
RtlEnterCriticalSection( &loader_section );
if (!path_name) path_name =
NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer;
@@ -398,7 +398,7 @@
if (nts == STATUS_SUCCESS && !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS))
{
-@@ -2495,7 +2642,7 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path,
ULONG flags, const UNICODE_S
+@@ -2500,7 +2647,7 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path,
ULONG flags, const UNICODE_S
size = sizeof(buffer);
for (;;)
{
@@ -407,7 +407,7 @@
if (handle) NtClose( handle );
if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename );
if (status != STATUS_BUFFER_TOO_SMALL) break;
-@@ -3420,7 +3567,7 @@ void __wine_process_init(void)
+@@ -3422,7 +3569,7 @@ void __wine_process_init(void)
/* setup the load callback and create ntdll modref */
wine_dll_set_callback( load_builtin_callback );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wine-d3d9-patches-3.3/staging-helper.patch
new/wine-d3d9-patches-3.4/staging-helper.patch
--- old/wine-d3d9-patches-3.3/staging-helper.patch 2018-03-04
18:58:49.000000000 +0100
+++ new/wine-d3d9-patches-3.4/staging-helper.patch 2018-03-18
00:30:18.000000000 +0100
@@ -1,6 +1,6 @@
-From c6243cd8229cbbcb9824cfe1fe4be8229028f34b Mon Sep 17 00:00:00 2001
+From ff5f6994f364f59320ac6fb146238cc6ed6f744d Mon Sep 17 00:00:00 2001
From: Nick Sarnie <commendsar...@gmail.com>
-Date: Sun, 4 Mar 2018 12:16:22 -0500
+Date: Sat, 17 Mar 2018 19:08:26 -0400
Subject: [PATCH] Staging Helper
Signed-off-by: Nick Sarnie <commendsar...@gmail.com>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wine-d3d9-patches-3.3/wine-d3d9.patch
new/wine-d3d9-patches-3.4/wine-d3d9.patch
--- old/wine-d3d9-patches-3.3/wine-d3d9.patch 2018-03-04 18:58:49.000000000
+0100
+++ new/wine-d3d9-patches-3.4/wine-d3d9.patch 2018-03-18 00:30:18.000000000
+0100
@@ -1,6 +1,6 @@
-From 60db98243f61cf283510f81dfd5437d989602b3f Mon Sep 17 00:00:00 2001
+From aa019ab10a175cbbaacf00bd43270b79122685e6 Mon Sep 17 00:00:00 2001
From: Nick Sarnie <commendsar...@gmail.com>
-Date: Sun, 4 Mar 2018 12:17:42 -0500
+Date: Sat, 17 Mar 2018 19:14:34 -0400
Subject: [PATCH] Wine D3D9
Signed-off-by: Nick Sarnie <commendsar...@gmail.com>
@@ -41,7 +41,7 @@
create mode 100644 dlls/d3d9-nine/wndproc.h
diff --git a/configure.ac b/configure.ac
-index 3735c1695e..ed65e21469 100644
+index 04b79d2876..595b17f210 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,14 @@ AC_ARG_WITH(openal,
AS_HELP_STRING([--without-openal],[do not use OpenAL]),
@@ -252,14 +252,14 @@
CPPFLAGS="$ac_save_CPPFLAGS"
else
X_CFLAGS=""
-@@ -3189,6 +3376,7 @@ WINE_CONFIG_DLL(d3d8)
- WINE_CONFIG_TEST(dlls/d3d8/tests)
- WINE_CONFIG_DLL(d3d9)
- WINE_CONFIG_TEST(dlls/d3d9/tests)
-+WINE_CONFIG_DLL(d3d9-nine,,[implib])
- WINE_CONFIG_DLL(d3dcompiler_33)
- WINE_CONFIG_DLL(d3dcompiler_34)
- WINE_CONFIG_DLL(d3dcompiler_35)
+@@ -3199,6 +3386,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d8)
+ WINE_CONFIG_MAKEFILE(dlls/d3d8/tests)
+ WINE_CONFIG_MAKEFILE(dlls/d3d9)
+ WINE_CONFIG_MAKEFILE(dlls/d3d9/tests)
++WINE_CONFIG_MAKEFILE(dlls/d3d9-nine)
+ WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_33)
+ WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_34)
+ WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_35)
diff --git a/dlls/d3d9-nine/Makefile.in b/dlls/d3d9-nine/Makefile.in
new file mode 100644
index 0000000000..c6df8d7dbe
++++++ wine-staging-3.3.tar.xz -> wine-staging-3.4.tar.xz ++++++
/work/SRC/openSUSE:Factory/wine/wine-staging-3.3.tar.xz
/work/SRC/openSUSE:Factory/.wine.new/wine-staging-3.4.tar.xz differ: char 26,
line 1
++++++ winetricks ++++++
--- /var/tmp/diff_new_pack.2coDpq/_old 2018-03-20 22:02:09.877783729 +0100
+++ /var/tmp/diff_new_pack.2coDpq/_new 2018-03-20 22:02:09.885783441 +0100
@@ -5367,7 +5367,7 @@
w_metadata adobeair dlls \
title="Adobe AIR" \
publisher="Adobe" \
- year="2017" \
+ year="2018" \
media="download" \
file1="AdobeAIRInstaller.exe" \
installed_file1="$W_COMMONFILES_X86_WIN/Adobe AIR/Versions/1.0/Adobe
AIR.dll" \
@@ -5377,7 +5377,8 @@
{
# 2017/03/14: 20.0.0.260 (strings 'Adobe AIR.dll' | grep 20\\. ) sha256sum
318770b9a18e59ca4a721a1f5c2b0235cffdbe77a043e99cb2af32074d61de45
# 2018/01/30: 28.0.0.127 (strings 'Adobe AIR.dll' | grep 28\\. ) sha256sum
9076489e273652089a4a53a1d38c6631e8b7477e39426a843e0273f25bfb109f
- w_download
https://airdownload.adobe.com/air/win/download/latest/AdobeAIRInstaller.exe
9076489e273652089a4a53a1d38c6631e8b7477e39426a843e0273f25bfb109f
+ # 2018/03/16: 29.0.0.112 (strings 'Adobe AIR.dll' | grep -E "^29\..+\..+"
) sha256sum 5186b54682644a30f2be61c9b510de9a9a76e301bc1b42f0f1bc50bd809a3625
+ w_download
https://airdownload.adobe.com/air/win/download/latest/AdobeAIRInstaller.exe
5186b54682644a30f2be61c9b510de9a9a76e301bc1b42f0f1bc50bd809a3625
w_try_cd "$W_CACHE/$W_PACKAGE"
# See https://bugs.winehq.org/show_bug.cgi?id=43506
@@ -7588,6 +7589,7 @@
publisher="Microsoft" \
year="2011" \
media="download" \
+ conflicts="dxdiagn_feb2010" \
file1="../win7sp1/windows6.1-KB976932-X86.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/dxdiagn.dll"
@@ -7606,6 +7608,26 @@
#----------------------------------------------------------------
+w_metadata dxdiagn_feb2010 dlls \
+ title="DirectX Diagnostic Library (February 2010)" \
+ publisher="Microsoft" \
+ year="2010" \
+ media="download" \
+ conflicts="dxdiagn" \
+ file1="../directx9/directx_feb2010_redist.exe" \
+ installed_file1="$W_SYSTEM32_DLLS_WIN/dxdiagn.dll"
+
+load_dxdiagn_feb2010()
+{
+ helper_directx_dl
+
+ w_try_cabextract -d "$W_TMP" -L -F dxnt.cab
"$W_CACHE"/directx9/$DIRECTX_NAME
+ w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dxdiagn.dll'
"$W_TMP/dxnt.cab"
+ w_override_dlls native dxdiagn
+}
+
+#----------------------------------------------------------------
+
w_metadata dsound dlls \
title="MS DirectSound from DirectX user redistributable" \
publisher="Microsoft" \
@@ -9237,7 +9259,7 @@
w_metadata shockwave dlls \
title="Shockwave" \
publisher="Adobe" \
- year="2017" \
+ year="2018" \
media="download" \
file1="sw_lic_full_installer.msi" \
installed_file1="$W_SYSTEM32_DLLS_WIN/Adobe/Shockwave
12/shockwave_Projector_Loader.dcr"
@@ -9247,7 +9269,8 @@
# 2017/03/15:
58f2152bf726d52f08fb41f904c62ff00fdf748c8ce413e8c8547da3a21922ba
# 2017/08/03:
bebebaef1644a994179a2e491ce3f55599d768f7c6019729f21e7029b1845b9c
# 2017/12/12:
0a9813ac55a8718440518dc2f5f410a3a065b422fe0618c073bfc631b9abf12c
- w_download
https://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi
0a9813ac55a8718440518dc2f5f410a3a065b422fe0618c073bfc631b9abf12c
+ # 2018/03/16:
4d7b408cf5b65a522b071d7d9ddbc5f6964911a7d55c418e31f393e6055cf796
+ w_download
https://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi
4d7b408cf5b65a522b071d7d9ddbc5f6964911a7d55c418e31f393e6055cf796
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" msiexec /i sw_lic_full_installer.msi $W_UNATTENDED_SLASH_Q
@@ -10000,6 +10023,24 @@
#----------------------------------------------------------------
+w_metadata vulkansdk dlls \
+ title="Vulkan SDK 1.0.68 (developers only)" \
+ publisher="LunarG" \
+ year="2018" \
+ media="download" \
+ file1="VulkanSDK-1.0.68.0-Installer.exe" \
+ installed_file1="C:/VulkanSDK/1.0.68.0/Vulkan.ico"
+
+load_vulkansdk()
+{
+ # https://vulkan.lunarg.com/sdk/home
+ w_download
"https://sdk.lunarg.com/sdk/download/1.0.68.0/windows/VulkanSDK-1.0.68.0-Installer.exe";
8e6401d4f90af1ab384f76cb59f1b7fe9bcd717c92b2080089f893f2de4b33bb
+ w_try_cd "$W_CACHE/$W_PACKAGE"
+ w_try "$WINE" "$file1" $W_UNATTENDED_SLASH_S
+}
+
+#----------------------------------------------------------------
+
w_metadata webio dlls \
title="MS Windows Web I/O" \
publisher="Microsoft" \
@@ -11415,10 +11456,14 @@
w_override_dlls native dxdiag.exe
if w_workaround_wine_bug 1429; then
- w_call dxdiagn
+ w_call dxdiagn_feb2010
fi
if w_workaround_wine_bug 9027; then
- w_call directmusic
+ w_call dmband
+ w_call dmime
+ w_call dmstyle
+ w_call dmsynth
+ w_call dmusic
fi
}
@@ -12791,7 +12836,7 @@
# Originally at:
https://download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso
# Mirror list at: http://www.filewatcher.com/_/?q=VS2010Express1.iso
# Formerly at:
ftp://www.daba.lv/pub/Programmeeshana/VisualStudio/VS2010Express1.iso
a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b
- w_download
https://web.archive.org/web/20140227220734/download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso
a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b
+ w_download https://debian.fmi.uni-sofia.bg/~aangelov/VS2010Express1.iso
a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b
# Unpack ISO
w_try_7z "$W_TMP" "$W_CACHE"/vc2010express/VS2010Express1.iso
