Hello community,
here is the log from the commit of package wine for openSUSE:Factory checked in at 2018-05-01 23:27:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wine (Old)
and /work/SRC/openSUSE:Factory/.wine.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wine"
Tue May 1 23:27:11 2018 rev:253 rq:602592 version:3.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/wine/wine.changes 2018-04-16 12:50:03.714770779 +0200
+++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2018-05-01 23:27:17.928516952 +0200
@@ -1,0 +2,12 @@
+Fri Apr 27 18:55:43 UTC 2018 - meissner@suse.com
+
+- Update to 3.7 development release
+ - MSI custom actions run in a separate process.
+ - Support for job files in the Task Scheduler.
+ - Improved viewport support in Direct 3D.
+ - Larger resolution version of the standard icons.
+ - Various bug fixes.
+- updated winetricks
+- updated staging to 3.7
+
+-------------------------------------------------------------------
Old:
----
wine-3.6.tar.xz
wine-3.6.tar.xz.sign
wine-d3d9-patches-3.5.tar.xz
wine-staging-3.6.tar.xz
New:
----
wine-3.7.tar.xz
wine-3.7.tar.xz.sign
wine-d3d9-patches-3.6.tar.xz
wine-staging-3.7.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wine.spec ++++++
--- /var/tmp/diff_new_pack.AJehyi/_old 2018-05-01 23:27:19.216470123 +0200
+++ /var/tmp/diff_new_pack.AJehyi/_new 2018-05-01 23:27:19.216470123 +0200
@@ -101,8 +101,8 @@
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(xxf86vm)
BuildRequires: pkgconfig(zlib)
-%define realver 3.6
-Version: 3.6
+%define realver 3.7
+Version: 3.7
Release: 0
Summary: An MS Windows Emulator
License: LGPL-2.1-or-later
@@ -140,7 +140,7 @@
ExclusiveArch: %{ix86} x86_64 ppc %arm aarch64
%if %{staging}
# upstream patch target version
-%define staging_version 3.6
+%define staging_version 3.7
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.5
+%define nine_version 3.6
BuildRequires: Mesa-libd3d-devel
BuildRequires: dri2proto-devel
BuildRequires: libOSMesa-devel
++++++ _service ++++++
--- /var/tmp/diff_new_pack.AJehyi/_old 2018-05-01 23:27:19.280467796 +0200
+++ /var/tmp/diff_new_pack.AJehyi/_new 2018-05-01 23:27:19.284467650 +0200
@@ -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.6</param>
+ <param name="revision">refs/tags/v3.7</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.5</param>
+ <param name="revision">refs/tags/wine-d3d9-3.6</param>
<param name="scm">git</param>
</service>
<service name="recompress" mode="disabled">
++++++ wine-3.6.tar.xz -> wine-3.7.tar.xz ++++++
/work/SRC/openSUSE:Factory/wine/wine-3.6.tar.xz /work/SRC/openSUSE:Factory/.wine.new/wine-3.7.tar.xz differ: char 26, line 1
++++++ wine-d3d9-patches-3.5.tar.xz -> wine-d3d9-patches-3.6.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wine-d3d9-patches-3.5/d3d9-helper.patch new/wine-d3d9-patches-3.6/d3d9-helper.patch
--- old/wine-d3d9-patches-3.5/d3d9-helper.patch 2018-03-31 16:06:36.000000000 +0200
+++ new/wine-d3d9-patches-3.6/d3d9-helper.patch 2018-04-14 17:56:48.000000000 +0200
@@ -1,24 +1,24 @@
-From 763e579985e27ab80f276e93a3e2f609c3e02d83 Mon Sep 17 00:00:00 2001
+From 00aa62a47250f4a0655784eb1a22e7ee7816a3bc Mon Sep 17 00:00:00 2001
From: Nick Sarnie
-Date: Sat, 31 Mar 2018 10:05:28 -0400
+Date: Sat, 14 Apr 2018 11:53:44 -0400
Subject: [PATCH] D3D9 Helper
Signed-off-by: Nick Sarnie
---
- dlls/ntdll/loader.c | 205 ++++++++++++++++++++++++-----
- dlls/ntdll/loadorder.c | 298 ++++++++++++++++++++++++++++++++-----------
+ dlls/ntdll/loader.c | 205 ++++++++++++++++++++----
+ dlls/ntdll/loadorder.c | 298 ++++++++++++++++++++++++++---------
dlls/ntdll/ntdll_misc.h | 1 +
programs/winecfg/Makefile.in | 1 +
programs/winecfg/main.c | 12 +-
programs/winecfg/resource.h | 5 +
- programs/winecfg/staging.c | 93 ++++++++++++++
+ programs/winecfg/staging.c | 93 +++++++++++
programs/winecfg/winecfg.h | 1 +
programs/winecfg/winecfg.rc | 10 ++
9 files changed, 522 insertions(+), 104 deletions(-)
create mode 100644 programs/winecfg/staging.c
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index fe5ce9d1e4..ebb7aea4d0 100644
+index 1a3dd801a1..9276b5b17d 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -100,6 +100,7 @@ struct builtin_load_info
@@ -75,7 +75,7 @@
current_modref = prev;
if (status)
{
-@@ -1028,7 +1030,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path )
+@@ -1031,7 +1033,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;
-@@ -1042,7 +1044,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename )
+@@ -1045,7 +1047,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 );
-@@ -1654,7 +1656,7 @@ static void load_builtin_callback( void *module, const char *filename )
+@@ -1657,7 +1659,7 @@ static void load_builtin_callback( void *module, const char *filename )
return;
}
@@ -102,7 +102,7 @@
RtlFreeHeap( GetProcessHeap(), 0, fullname );
if (!wm)
{
-@@ -1864,8 +1866,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info )
+@@ -1867,8 +1869,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;
-@@ -1908,7 +1910,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file,
+@@ -1911,7 +1913,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;
-@@ -1972,8 +1974,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file,
+@@ -1979,8 +1981,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;
-@@ -1993,6 +1995,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file,
+@@ -2000,6 +2002,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;
-@@ -2191,6 +2194,108 @@ done:
+@@ -2198,6 +2201,108 @@ done:
return status;
}
@@ -250,7 +250,7 @@
/***********************************************************************
* open_dll_file
-@@ -2237,7 +2342,7 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct
+@@ -2244,7 +2349,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;
-@@ -2282,20 +2387,41 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname,
+@@ -2289,20 +2394,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 */
-@@ -2343,8 +2469,10 @@ overflow:
+@@ -2350,8 +2476,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;
-@@ -2361,7 +2489,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
+@@ -2368,7 +2496,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;
-@@ -2381,6 +2509,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
+@@ -2388,6 +2516,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 ))
-@@ -2403,22 +2550,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
+@@ -2410,22 +2557,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))
{
-@@ -2428,7 +2575,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
+@@ -2435,7 +2582,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;
}
-@@ -2461,7 +2608,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags,
+@@ -2468,7 +2615,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))
{
-@@ -2500,7 +2647,7 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S
+@@ -2507,7 +2654,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;
-@@ -3422,7 +3569,7 @@ void __wine_process_init(void)
+@@ -3429,7 +3576,7 @@ void __wine_process_init(void)
/* setup the load callback and create ntdll modref */
wine_dll_set_callback( load_builtin_callback );
@@ -1025,5 +1025,5 @@
/* @makedep: winecfg.ico */
--
-2.16.3
+2.17.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wine-d3d9-patches-3.5/staging-helper.patch new/wine-d3d9-patches-3.6/staging-helper.patch
--- old/wine-d3d9-patches-3.5/staging-helper.patch 2018-03-31 16:06:36.000000000 +0200
+++ new/wine-d3d9-patches-3.6/staging-helper.patch 2018-04-14 17:56:48.000000000 +0200
@@ -1,6 +1,6 @@
-From 390a5a66bb1fd749885fbea3d3b6ab2cd9ed69f6 Mon Sep 17 00:00:00 2001
+From e85e98ed34ed9009e7f380955da0e4a5d82e17ac Mon Sep 17 00:00:00 2001
From: Nick Sarnie
-Date: Sat, 31 Mar 2018 10:03:56 -0400
+Date: Sat, 14 Apr 2018 11:56:11 -0400
Subject: [PATCH] Staging Helper
Signed-off-by: Nick Sarnie
@@ -39,10 +39,10 @@
/* About tab */
#define IDC_ABT_OWNER 8432
diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c
-index a96bdcaab4..7eec5e9608 100644
+index df9bf0f1ad..e010be1c73 100644
--- a/programs/winecfg/staging.c
+++ b/programs/winecfg/staging.c
-@@ -122,6 +122,23 @@ static void gtk3_set(BOOL status)
+@@ -121,6 +121,23 @@ static void gtk3_set(BOOL status)
#endif
}
@@ -66,7 +66,7 @@
static void load_staging_settings(HWND dialog)
{
CheckDlgButton(dialog, IDC_ENABLE_CSMT, csmt_get() ? BST_CHECKED : BST_UNCHECKED);
-@@ -129,6 +146,7 @@ static void load_staging_settings(HWND dialog)
+@@ -128,6 +145,7 @@ static void load_staging_settings(HWND dialog)
CheckDlgButton(dialog, IDC_ENABLE_EAX, eax_get() ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(dialog, IDC_ENABLE_HIDEWINE, hidewine_get() ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(dialog, IDC_ENABLE_GTK3, gtk3_get() ? BST_CHECKED : BST_UNCHECKED);
@@ -74,7 +74,7 @@
#ifndef HAVE_VAAPI
disable(IDC_ENABLE_VAAPI);
-@@ -136,6 +154,9 @@ static void load_staging_settings(HWND dialog)
+@@ -135,6 +153,9 @@ static void load_staging_settings(HWND dialog)
#ifndef HAVE_GTK3
disable(IDC_ENABLE_GTK3);
#endif
@@ -84,7 +84,7 @@
}
INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-@@ -163,6 +184,8 @@ INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
+@@ -162,6 +183,8 @@ INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
{
case IDC_ENABLE_CSMT:
csmt_set(IsDlgButtonChecked(hDlg, IDC_ENABLE_CSMT) == BST_CHECKED);
@@ -93,7 +93,7 @@
SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0);
return TRUE;
case IDC_ENABLE_VAAPI:
-@@ -181,6 +204,12 @@ INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
+@@ -180,6 +203,12 @@ INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
gtk3_set(IsDlgButtonChecked(hDlg, IDC_ENABLE_GTK3) == BST_CHECKED);
SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0);
return TRUE;
@@ -107,7 +107,7 @@
break;
}
diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
-index 314e9858ea..596dc27447 100644
+index f838a04a4e..7003bded4a 100644
--- a/programs/winecfg/winecfg.rc
+++ b/programs/winecfg/winecfg.rc
@@ -320,6 +320,7 @@ BEGIN
@@ -119,5 +119,5 @@
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
--
-2.16.3
+2.17.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wine-d3d9-patches-3.5/wine-d3d9.patch new/wine-d3d9-patches-3.6/wine-d3d9.patch
--- old/wine-d3d9-patches-3.5/wine-d3d9.patch 2018-03-31 16:06:36.000000000 +0200
+++ new/wine-d3d9-patches-3.6/wine-d3d9.patch 2018-04-14 17:56:48.000000000 +0200
@@ -1,26 +1,26 @@
-From 6f18703feb2f89042a25fb09e7d07d48a8f9c125 Mon Sep 17 00:00:00 2001
+From 695c0020836ef99c924c5d33de81bf52c1fb617a Mon Sep 17 00:00:00 2001
From: Nick Sarnie
-Date: Sat, 31 Mar 2018 10:04:12 -0400
-Subject: [PATCH] Wine D3D9
+Date: Sat, 14 Apr 2018 11:53:04 -0400
+Subject: [PATCH 2/2] Wine D3D9
Signed-off-by: Nick Sarnie
---
configure.ac | 188 ++++
dlls/d3d9-nine/Makefile.in | 15 +
dlls/d3d9-nine/d3d9-nine.spec | 14 +
- dlls/d3d9-nine/d3d9_main.c | 173 ++++
- dlls/d3d9-nine/d3dadapter9.c | 898 +++++++++++++++++++
+ dlls/d3d9-nine/d3d9_main.c | 173 +++
+ dlls/d3d9-nine/d3dadapter9.c | 898 +++++++++++++++
dlls/d3d9-nine/d3dadapter9.h | 32 +
- dlls/d3d9-nine/device_wrap.c | 500 +++++++++++
+ dlls/d3d9-nine/device_wrap.c | 500 +++++++++
dlls/d3d9-nine/device_wrap.h | 26 +
- dlls/d3d9-nine/dri3.c | 1426 ++++++++++++++++++++++++++++++
+ dlls/d3d9-nine/dri3.c | 1426 +++++++++++++++++++++++
dlls/d3d9-nine/dri3.h | 91 ++
- dlls/d3d9-nine/present.c | 1748 +++++++++++++++++++++++++++++++++++++
+ dlls/d3d9-nine/present.c | 1748 +++++++++++++++++++++++++++++
dlls/d3d9-nine/present.h | 40 +
dlls/d3d9-nine/shader_validator.c | 88 ++
dlls/d3d9-nine/shader_validator.h | 29 +
dlls/d3d9-nine/version.rc | 26 +
- dlls/d3d9-nine/wndproc.c | 277 ++++++
+ dlls/d3d9-nine/wndproc.c | 277 +++++
dlls/d3d9-nine/wndproc.h | 41 +
17 files changed, 5612 insertions(+)
create mode 100644 dlls/d3d9-nine/Makefile.in
@@ -41,7 +41,7 @@
create mode 100644 dlls/d3d9-nine/wndproc.h
diff --git a/configure.ac b/configure.ac
-index 0a365d9c43..93c9d823fd 100644
+index 8e76cd6086..10c1a8c03e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,14 @@ AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]),
@@ -5781,5 +5781,5 @@
+
+#endif
--
-2.16.3
+2.17.0
++++++ wine-staging-3.6.tar.xz -> wine-staging-3.7.tar.xz ++++++
/work/SRC/openSUSE:Factory/wine/wine-staging-3.6.tar.xz /work/SRC/openSUSE:Factory/.wine.new/wine-staging-3.7.tar.xz differ: char 26, line 1
++++++ winetricks ++++++
--- /var/tmp/diff_new_pack.AJehyi/_old 2018-05-01 23:27:19.492460088 +0200
+++ /var/tmp/diff_new_pack.AJehyi/_new 2018-05-01 23:27:19.496459942 +0200
@@ -5342,7 +5342,8 @@
# https://www.microsoft.com/en-us/download/details.aspx?id=24
# https://download.microsoft.com/download/d/3/0/d30e32d8-418a-469d-b600-f32ce3...
# Mirror list: http://www.filewatcher.com/m/WindowsXP-KB936929-SP3-x86-ENU.exe.331805736-0....
- w_download_to winxpsp3 ftp://ftp.gnome.org/mirror/archive/ftp.sunet.se/pub/security/vendor/microsoft/winxp/Service_Packs/WindowsXP-KB936929-SP3-x86-ENU.exe 62e524a552db9f6fd22d469010ea4d7e28ee06fa615a1c34362129f808916654
+ # 2018/04/04: http://www.download.windowsupdate.com/msdownload/update/software/dflt/2008/0...
+ w_download_to winxpsp3 ftp://ftp.emacinc.com/LegacyProducts/SBC/drivers/vdx/WINXP/WindowsXP-KB936929-SP3-x86-ENU.exe 62e524a552db9f6fd22d469010ea4d7e28ee06fa615a1c34362129f808916654
w_try_cabextract -d "$W_TMP" -L -F "$filename" "$W_CACHE"/winxpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe
}
@@ -5417,6 +5418,8 @@
w_try cp "$W_TMP/amd64_microsoft-windows-directshow-other_31bf3856ad364e35_6.1.7601.17514_none_6b778d68f75a1a54/amstream.dll" "$W_SYSTEM64_DLLS/amstream.dll"
fi
+ w_try_regsvr amstream.dll
+
w_override_dlls native,builtin amstream
}
@@ -12319,53 +12322,6 @@
#----------------------------------------------------------------
-w_metadata picasa39 apps \
- title="Picasa 3.9" \
- publisher="Google" \
- year="2014" \
- file1="picasa39-setup.exe" \
- installed_exe1="$W_PROGRAMS_X86_WIN/Google/Picasa3/Picasa3.exe"
-
-load_picasa39()
-{
- # 2016/01/02: 482c1a547d8d3aa25ee446d30ea986de63ef8c8d68b8d1109dd3d9b714e73e08
-
- w_download https://dl.google.com/picasa/picasa39-setup.exe 482c1a547d8d3aa25ee446d30ea986de63ef8c8d68b8d1109dd3d9b714e73e08
- if w_workaround_wine_bug 29434 "Picasa 3.9 fails to authenticate with Google"; then
- w_warn "Picasa 3.9 authentication to the Google account is currently broken under wine. See https://bugs.winehq.org/show_bug.cgi?id=29434 for more details."
- fi
- w_try_cd "$W_CACHE/$W_PACKAGE"
- w_ahk_do "
- SetTitleMatchMode, 2
- run picasa39-setup.exe
- WinWait, Picasa 3 Setup
- if ( w_opt_unattended > 0 ) {
- Sleep 1000
- ControlClick Button2 ;I Agree - License
- Sleep 1000
- WinWait, Picasa 3 Setup, Choose Install Location
- ControlClick Button2 ;Install
- Sleep 1000
- WinWait, Picasa 3 Setup, Picasa 3 has been installed on your computer
- Sleep 500
- ControlClick Button5 ; Desktop Icon
- Sleep 500
- ControlClick Button6 ; Quick Launch
- Sleep 500
- ControlClick Button7 ; Default search off
- Sleep 500
- ControlClick Button8 ; Usage statistics sent
- Sleep 500
- ControlClick Button4 ; Run Picasa
- Sleep 500
- ControlClick Button2 ; Finish
- }
- WinWaitClose
- "
-}
-
-#----------------------------------------------------------------
-
w_metadata protectionid apps \
title="Protection ID" \
publisher="CDKiLLER & TippeX" \
@@ -16753,40 +16709,6 @@
}
#----------------------------------------------------------------
-
-w_metadata plantsvszombies games \
- title="Plants vs. Zombies" \
- publisher="PopCap Games" \
- year="2009" \
- media="download" \
- file1="PlantsVsZombiesSetup.exe" \
- installed_file1="$W_PROGRAMS_X86_WIN/PopCap Games/Plants vs. Zombies/PlantsVsZombies.exe"
-
-load_plantsvszombies()
-{
- w_download "https://downloads.popcap.com/www/popcap_downloads/PlantsVsZombiesSetup.exe" 4b4bb4d19fb639e5698983e39d7ad061c7667bcec19056560532c7ad0d67d0e4
-
- w_try_cd "$W_CACHE/$W_PACKAGE"
- w_ahk_do "
- run PlantsVsZombiesSetup.exe
- winwait, Plants vs. Zombies Installer
- if ( w_opt_unattended > 0 ) {
- sleep 1000
- send {Enter}
- winwait, Plants vs. Zombies License Agreement
- ControlClick Button1
- }
- winwait, Plants vs. Zombies Installation Complete!
- if ( w_opt_unattended > 0 ) {
- sleep 1000
- send {Space}{Enter}
- ControlClick, x309 y278, Plants vs. Zombies Installation Complete!,,,, Pos
- }
- WinWaitClose
- "
-}
-
-#----------------------------------------------------------------
w_metadata popfs games \
title="Prince of Persia: The Forgotten Sands" \