diff --git a/patches/oleaut32-x86_64_Marshaller/0002-oleaut32-Implement-TMStubImpl_Invoke-on-x86_64.patch b/patches/oleaut32-x86_64_Marshaller/0002-oleaut32-Implement-TMStubImpl_Invoke-on-x86_64.patch index ecf9908a..4bb8746f 100644 --- a/patches/oleaut32-x86_64_Marshaller/0002-oleaut32-Implement-TMStubImpl_Invoke-on-x86_64.patch +++ b/patches/oleaut32-x86_64_Marshaller/0002-oleaut32-Implement-TMStubImpl_Invoke-on-x86_64.patch @@ -1,4 +1,4 @@ -From 371486a6f5257c287886543b1d0c76ad60993998 Mon Sep 17 00:00:00 2001 +From d730880a8d80a1df53c3f2786a6a8474320cf1d3 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 15 Nov 2015 05:06:30 +0100 Subject: oleaut32: Implement TMStubImpl_Invoke on x86_64. @@ -9,10 +9,10 @@ Subject: oleaut32: Implement TMStubImpl_Invoke on x86_64. 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c -index c5aa374..bcea046 100644 +index 9fd0f0374ba..95bf2a7489a 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c -@@ -2071,7 +2071,7 @@ static HRESULT WINAPI +@@ -2073,7 +2073,7 @@ static HRESULT WINAPI TMStubImpl_Invoke( LPRPCSTUBBUFFER iface, RPCOLEMESSAGE* xmsg,IRpcChannelBuffer*rpcchanbuf) { @@ -22,12 +22,12 @@ index c5aa374..bcea046 100644 const FUNCDESC *fdesc; TMStubImpl *This = impl_from_IRpcStubBuffer(iface); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c -index 97f40bc..2d0768b 100644 +index 037c7034ed2..61d6e8040d8 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c -@@ -6475,6 +6475,34 @@ __ASM_GLOBAL_FUNC( call_method, - /* same function but returning floating point */ - static double (CDECL * const call_double_method)(void*,int,const DWORD_PTR*) = (void *)call_method; +@@ -6457,6 +6457,34 @@ __ASM_GLOBAL_FUNC( call_method, + static float (CDECL * const call_float_method)(void *, int, const DWORD *, const DWORD *) = (void *)call_method; + static double (CDECL * const call_double_method)(void *, int, const DWORD *, const DWORD *) = (void *)call_method; +DWORD _invoke(FARPROC func, CALLCONV callconv, int nrargs, DWORD_PTR *args) +{ @@ -61,5 +61,5 @@ index 97f40bc..2d0768b 100644 static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt) -- -2.6.2 +2.14.2 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index bfc4b58c..6f9c7611 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,13 +52,13 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "40b7831cd80607e42b9e1c910a62f022c45ac884" + echo "039d267b0925273197a9edcf7664c4a42dca932d" } # Show version information version() { - echo "Wine Staging 2.20" + echo "Wine Staging 2.21 (unreleased)" echo "Copyright (C) 2014-2017 the Wine Staging project authors." echo "" echo "Patchset to be applied on upstream Wine:" diff --git a/staging/VERSION b/staging/VERSION index 1e345935..c7b64c57 100644 --- a/staging/VERSION +++ b/staging/VERSION @@ -1 +1 @@ -Wine Staging 2.20 +Wine Staging 2.21 (unreleased)