Piotr Caban : msvcp90: Remove type_info_dtor helper from CREATE_TYPE_INFO_VTABLE macro.
Alexandre Julliard
julliard at winehq.org
Wed Aug 18 16:22:10 CDT 2021
Module: wine
Branch: master
Commit: a2d8a0ce4e4d9858d8f46e77b0f76c2931c1cd52
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2d8a0ce4e4d9858d8f46e77b0f76c2931c1cd52
Author: Piotr Caban <piotr at codeweavers.com>
Date: Wed Aug 18 16:09:02 2021 +0200
msvcp90: Remove type_info_dtor helper from CREATE_TYPE_INFO_VTABLE macro.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcp90/cxx.h | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h
index 9c6c70e375c..012354ac9c8 100644
--- a/dlls/msvcp90/cxx.h
+++ b/dlls/msvcp90/cxx.h
@@ -464,12 +464,7 @@ typedef struct
#endif
-#define CREATE_TYPE_INFO_VTABLE\
- static void type_info_dtor(type_info * _this) \
-{ \
- free(_this->name); \
-} \
-\
+#define CREATE_TYPE_INFO_VTABLE \
DEFINE_THISCALL_WRAPPER(type_info_vector_dtor,8) \
void * __thiscall type_info_vector_dtor(type_info * _this, unsigned int flags) \
{ \
@@ -478,12 +473,12 @@ void * __thiscall type_info_vector_dtor(type_info * _this, unsigned int flags) \
/* we have an array, with the number of elements stored before the first object */ \
INT_PTR i, *ptr = (INT_PTR *)_this - 1; \
\
- for (i = *ptr - 1; i >= 0; i--) type_info_dtor(_this + i); \
+ for (i = *ptr - 1; i >= 0; i--) free(_this->name); \
free(ptr); \
} \
else \
{ \
- type_info_dtor(_this); \
+ free(_this->name); \
if (flags & 1) free(_this); \
} \
return _this; \
More information about the wine-cvs
mailing list