Module: wine Branch: master Commit: 650aebadb7ade8b95766b5f2a9062c2210b0eca1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=650aebadb7ade8b95766b5f2a...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Apr 27 02:31:39 2020 +0200
riched20: Use __ASM_USE_THISCALL_WRAPPER macro.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/riched20/editor.h | 2 +- dlls/riched20/editstr.h | 2 +- dlls/riched20/txthost.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 1f033b4187..02bff7cceb 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -276,7 +276,7 @@ void ME_InitTableDef(ME_TextEditor *editor, struct RTFTable *tableDef) DECLSPEC_
/* txthost.c */ ITextHost *ME_CreateTextHost(HWND hwnd, CREATESTRUCTW *cs, BOOL bEmulateVersion10) DECLSPEC_HIDDEN; -#if defined(__i386__) && !defined(__MINGW32__) /* Use wrappers to perform thiscall on i386 */ +#ifdef __ASM_USE_THISCALL_WRAPPER #define TXTHOST_VTABLE(This) (&itextHostStdcallVtbl) #else /* __i386__ */ #define TXTHOST_VTABLE(This) (This)->lpVtbl diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 608901a5e2..a65169056e 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -47,7 +47,7 @@ #include "wine/heap.h" #include "wine/list.h"
-#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER extern const struct ITextHostVtbl itextHostStdcallVtbl DECLSPEC_HIDDEN; #endif /* __i386__ */
diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 3f25625ed5..5992fc0b06 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -522,7 +522,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetSelectionBarWidth(ITextHos }
-#if defined(__i386__) && !defined(__MINGW32__) /* thiscall functions are i386-specific */ +#ifdef __ASM_USE_THISCALL_WRAPPER
#define STDCALL(func) (void *) __stdcall_ ## func #ifdef _MSC_VER