Piotr Caban : msvcp90: Reorganize __ASM_EXCEPTION_VTABLE macro.
Alexandre Julliard
julliard at winehq.org
Fri Nov 25 10:27:32 CST 2011
Module: wine
Branch: master
Commit: 1c04cbfd336cc8867162468c8027f31492938a0f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c04cbfd336cc8867162468c8027f31492938a0f
Author: Piotr Caban <piotr at codeweavers.com>
Date: Fri Nov 25 10:46:30 2011 +0100
msvcp90: Reorganize __ASM_EXCEPTION_VTABLE macro.
---
dlls/msvcp90/exception.c | 26 +++++++++-----------------
1 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c
index 00fb0f0..77e1e60 100644
--- a/dlls/msvcp90/exception.c
+++ b/dlls/msvcp90/exception.c
@@ -64,20 +64,12 @@ void WINAPI _CxxThrowException(exception*,const cxx_exception_type*);
#ifdef _WIN64
-#define __ASM_EXCEPTION_VTABLE(name) \
- __ASM_VTABLE(name, "\t.quad " THISCALL_NAME(MSVCP_what_exception) )
-
-#define __ASM_EXCEPTION_STRING_VTABLE(name) \
- __ASM_VTABLE(name, "\t.quad " THISCALL_NAME(MSVCP_logic_error_what) )
-
+#define __ASM_EXCEPTION_VTABLE(name, what_func) \
+ __ASM_VTABLE(name, "\t.quad " THISCALL_NAME(what_func) )
#else
-#define __ASM_EXCEPTION_VTABLE(name) \
- __ASM_VTABLE(name, "\t.long " THISCALL_NAME(MSVCP_what_exception) )
-
-#define __ASM_EXCEPTION_STRING_VTABLE(name) \
- __ASM_VTABLE(name, "\t.long " THISCALL_NAME(MSVCP_logic_error_what) )
-
+#define __ASM_EXCEPTION_VTABLE(name, what_func) \
+ __ASM_VTABLE(name, "\t.long " THISCALL_NAME(what_func) )
#endif /* _WIN64 */
extern const vtable_ptr MSVCP_bad_alloc_vtable;
@@ -688,11 +680,11 @@ static const cxx_exception_type invalid_argument_cxx_type = {
#ifndef __GNUC__
void __asm_dummy_vtables(void) {
#endif
- __ASM_EXCEPTION_VTABLE(bad_alloc);
- __ASM_EXCEPTION_STRING_VTABLE(logic_error);
- __ASM_EXCEPTION_STRING_VTABLE(length_error);
- __ASM_EXCEPTION_STRING_VTABLE(out_of_range);
- __ASM_EXCEPTION_STRING_VTABLE(invalid_argument);
+ __ASM_EXCEPTION_VTABLE(bad_alloc, MSVCP_what_exception);
+ __ASM_EXCEPTION_VTABLE(logic_error, MSVCP_logic_error_what);
+ __ASM_EXCEPTION_VTABLE(length_error, MSVCP_logic_error_what);
+ __ASM_EXCEPTION_VTABLE(out_of_range, MSVCP_logic_error_what);
+ __ASM_EXCEPTION_VTABLE(invalid_argument, MSVCP_logic_error_what);
#ifndef __GNUC__
}
#endif
More information about the wine-cvs
mailing list