msvcp: Use __ASM_USE_THISCALL_WRAPPER macro.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcp: Use __ASM_USE_THISCALL_WRAPPER macro.
12ead674 · Jacek Caban · Alexandre Julliard · 4e44edd2 · 12ead674 · 12ead674
Commit 12ead674 authored Apr 27, 2020 by Jacek Caban Committed by Alexandre Julliard Apr 27, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

cxx.h dlls/msvcp90/cxx.h +1 -1

exception.c dlls/msvcp90/exception.c +1 -1

misc.c dlls/msvcp90/misc.c +1 -1

msvcp_main.c dlls/msvcp90/msvcp_main.c +1 -1

No files found.
--- a/dlls/msvcp90/cxx.h
+++ b/dlls/msvcp90/cxx.h
@@ -263,7 +263,7 @@ static void init_ ## type ## _cxx(char *base) \
 #define DEFINE_CXX_DATA4(name, cl1, cl2, cl3, cl4, dtor) \
    DEFINE_CXX_DATA(name, 4, cl1, cl2, cl3, cl4, dtor)

-#if defined(__i386__) && !defined(__MINGW32__)
+#ifdef __ASM_USE_THISCALL_WRAPPER

 #define CALL_VTBL_FUNC(this, off, ret, type, args) ((ret (WINAPI*)type)&vtbl_wrapper_##off)args


--- a/dlls/msvcp90/exception.c
+++ b/dlls/msvcp90/exception.c
@@ -969,7 +969,7 @@ void __cdecl __ExceptionPtrCreate(exception_ptr *ep)
    ep->ref = NULL;
 }

-#if defined(__i386__) && !defined(__MINGW32__)
+#ifdef __ASM_USE_THISCALL_WRAPPER
 extern void call_dtor(const cxx_exception_type *type, void *func, void *object);

 __ASM_GLOBAL_FUNC( call_dtor,

--- a/dlls/msvcp90/misc.c
+++ b/dlls/msvcp90/misc.c
@@ -711,7 +711,7 @@ unsigned int __cdecl _Random_device(void)
 #endif

 #if _MSVCP_VER >= 110
-#if defined(__i386__) && !defined(__MINGW32__)
+#ifdef __ASM_USE_THISCALL_WRAPPER

 extern void *call_thiscall_func;
 __ASM_GLOBAL_FUNC(call_thiscall_func,

--- a/dlls/msvcp90/msvcp_main.c
+++ b/dlls/msvcp90/msvcp_main.c
@@ -26,7 +26,7 @@

 WINE_DEFAULT_DEBUG_CHANNEL(msvcp);

-#if defined(__i386__) && !defined(__MINGW32__)
+#ifdef __ASM_USE_THISCALL_WRAPPER

 #define DEFINE_VTBL_WRAPPER(off)            \
    __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \