From 5263c29479231293a543804bf88ee2ac382a1d78 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 21 Nov 2017 16:54:53 +0100 Subject: [PATCH] oleaut32-x86_64_Marshaller: Fix compilation on x86_64. --- ...t32-Implement-TMStubImpl_Invoke-on-x86_64.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 4bb8746f..a903545a 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 d730880a8d80a1df53c3f2786a6a8474320cf1d3 Mon Sep 17 00:00:00 2001 +From b1f80a39d2034c62bbbf8a3e79e1d41e4b6257c4 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. @@ -22,12 +22,12 @@ index 9fd0f0374ba..95bf2a7489a 100644 const FUNCDESC *fdesc; TMStubImpl *This = impl_from_IRpcStubBuffer(iface); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c -index 037c7034ed2..61d6e8040d8 100644 +index a575597f1f7..b328db924e6 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c -@@ -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; +@@ -6422,6 +6422,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; +DWORD _invoke(FARPROC func, CALLCONV callconv, int nrargs, DWORD_PTR *args) +{ @@ -57,9 +57,9 @@ index 037c7034ed2..61d6e8040d8 100644 + return res; +} + - #endif /* __x86_64__ */ + #elif defined(__arm__) - static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt) + extern LONGLONG CDECL call_method( void *func, int nb_stk_args, const DWORD *stk_args, const DWORD *reg_args ); -- 2.14.2