wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

oleaut32-x86_64_Marshaller: Fix compilation on x86_64.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-11-21 16:54:53 +01:00
parent aa9bb78434
commit 5263c29479
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
patches/oleaut32-x86_64_Marshaller/0002-oleaut32-Implement-TMStubImpl_Invoke-on-x86_64.patch
View File

@ -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 <sebastian@fds-team.de>
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