Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
07a9909c
Commit
07a9909c
authored
Dec 15, 2011
by
Piotr Caban
Committed by
Alexandre Julliard
Dec 15, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcp90: Removed __ASM_EXCEPTION_VTABLE macro.
parent
dc8467fe
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
17 deletions
+10
-17
exception.c
dlls/msvcp90/exception.c
+6
-17
msvcp90.h
dlls/msvcp90/msvcp90.h
+4
-0
No files found.
dlls/msvcp90/exception.c
View file @
07a9909c
...
...
@@ -61,17 +61,6 @@ typedef struct __cxx_exception_type
void
WINAPI
_CxxThrowException
(
exception
*
,
const
cxx_exception_type
*
);
/* vtables */
#ifdef _WIN64
#define __ASM_EXCEPTION_VTABLE(name, what_func) \
__ASM_VTABLE(name, "\t.quad " THISCALL_NAME(what_func) )
#else
#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
;
extern
const
vtable_ptr
MSVCP_logic_error_vtable
;
extern
const
vtable_ptr
MSVCP_length_error_vtable
;
...
...
@@ -806,12 +795,12 @@ const char* __thiscall MSVCP_runtime_error_what(runtime_error *this)
#ifndef __GNUC__
void
__asm_dummy_vtables
(
void
)
{
#endif
__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
);
__ASM_
EXCEPTION_VTABLE
(
runtime_error
,
MSVCP_runtime_error_what
);
__ASM_
VTABLE
(
bad_alloc
,
VTABLE_ADD_FUNC
(
MSVCP_what_exception
)
);
__ASM_
VTABLE
(
logic_error
,
VTABLE_ADD_FUNC
(
MSVCP_logic_error_what
)
);
__ASM_
VTABLE
(
length_error
,
VTABLE_ADD_FUNC
(
MSVCP_logic_error_what
)
);
__ASM_
VTABLE
(
out_of_range
,
VTABLE_ADD_FUNC
(
MSVCP_logic_error_what
)
);
__ASM_
VTABLE
(
invalid_argument
,
VTABLE_ADD_FUNC
(
MSVCP_logic_error_what
)
);
__ASM_
VTABLE
(
runtime_error
,
VTABLE_ADD_FUNC
(
MSVCP_runtime_error_what
)
);
#ifndef __GNUC__
}
#endif
...
...
dlls/msvcp90/msvcp90.h
View file @
07a9909c
...
...
@@ -66,6 +66,8 @@ extern void* (__cdecl *MSVCRT_set_new_handler)(void*);
#ifdef _WIN64
#define VTABLE_ADD_FUNC(name) "\t.quad " THISCALL_NAME(name) "\n"
#define __ASM_VTABLE(name,funcs) \
__asm__(".data\n" \
"\t.align 8\n" \
...
...
@@ -77,6 +79,8 @@ extern void* (__cdecl *MSVCRT_set_new_handler)(void*);
#else
#define VTABLE_ADD_FUNC(name) "\t.long " THISCALL_NAME(name) "\n"
#define __ASM_VTABLE(name,funcs) \
__asm__(".data\n" \
"\t.align 4\n" \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment