From 984f5c5f35b098748da17afe8ce4918d5aebeab8 Mon Sep 17 00:00:00 2001 From: Serge Gautherie Date: Fri, 21 Aug 2020 00:40:42 +0200 Subject: [PATCH] [RICHED20_WINETEST] txtsrv.c: Workaround for 'thiscall' handling Pseudo-revert a part of 76cf09c. ROSTESTS-355 --- modules/rostests/winetests/riched20/txtsrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/winetests/riched20/txtsrv.c b/modules/rostests/winetests/riched20/txtsrv.c index 5a59c871815..59ba64ac076 100644 --- a/modules/rostests/winetests/riched20/txtsrv.c +++ b/modules/rostests/winetests/riched20/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(__REACTOS__) || !defined(__MINGW32__)) static ITextServicesVtbl itextServicesStdcallVtbl; #define TXTSERV_VTABLE(This) (&itextServicesStdcallVtbl) #else /* __i386__ */ @@ -535,7 +535,7 @@ typedef struct static void setup_thiscall_wrappers(void) { -#if defined(__i386__) && !defined(__MINGW32__) +#if defined(__i386__) && (defined(__REACTOS__) || !defined(__MINGW32__)) void** pVtable; void** pVtableEnd; THISCALL_TO_STDCALL_THUNK *thunk;