Jacek Caban : riched20/tests: Don't use thiscall wrappers on clang MSVC target.
Alexandre Julliard
julliard at winehq.org
Mon Apr 27 15:19:30 CDT 2020
Module: wine
Branch: master
Commit: 270599cc816cb590274cba2d4a6e5432ccdc9bf4
URL: https://source.winehq.org/git/wine.git/?a=commit;h=270599cc816cb590274cba2d4a6e5432ccdc9bf4
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Apr 27 02:31:25 2020 +0200
riched20/tests: Don't use thiscall wrappers on clang MSVC target.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/riched20/tests/txtsrv.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c
index 487b9a02f0..1528bef523 100644
--- a/dlls/riched20/tests/txtsrv.c
+++ b/dlls/riched20/tests/txtsrv.c
@@ -48,7 +48,7 @@ static PCreateTextServices pCreateTextServices;
/* Use a special table for x86 machines to convert the thiscall
* calling convention. This isn't needed on other platforms. */
-#if defined(__i386__) && !defined(__MINGW32__)
+#if defined(__i386__) && !defined(__MINGW32__) && (!defined(_MSC_VER) || !defined(__clang__))
static ITextServicesVtbl itextServicesStdcallVtbl;
#define TXTSERV_VTABLE(This) (&itextServicesStdcallVtbl)
#else /* __i386__ */
@@ -492,7 +492,7 @@ typedef struct
static void setup_thiscall_wrappers(void)
{
-#if defined(__i386__) && !defined(__MINGW32__)
+#if defined(__i386__) && !defined(__MINGW32__) && (!defined(_MSC_VER) || !defined(__clang__))
void** pVtable;
void** pVtableEnd;
THISCALL_TO_STDCALL_THUNK *thunk;
More information about the wine-cvs
mailing list