system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-06 04:40:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

msvcp140: Import __ExceptionPtrCurrentException implementation.

Browse source
This commit is contained in:
Paul Gofman 2022-10-11 15:44:40 -05:00 committed by Alexandre Julliard
parent 58c0d78485
commit 23dd3b27e4
2 changed files with 151 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/msvcp140/msvcp140.spec
View file

@ -1699,8 +1699,8 @@
@ cdecl -arch=win64 ?__ExceptionPtrCopyException@@YAXPEAXPEBX1@Z(ptr ptr ptr) msvcr120.?__ExceptionPtrCopyException@@YAXPEAXPEBX1@Z
@ cdecl -arch=win32 ?__ExceptionPtrCreate@@YAXPAX@Z(ptr) __ExceptionPtrCreate
@ cdecl -arch=win64 ?__ExceptionPtrCreate@@YAXPEAX@Z(ptr) __ExceptionPtrCreate
@ cdecl -arch=win32 ?__ExceptionPtrCurrentException@@YAXPAX@Z(ptr) msvcr120.?__ExceptionPtrCurrentException@@YAXPAX@Z
@ cdecl -arch=win64 ?__ExceptionPtrCurrentException@@YAXPEAX@Z(ptr) msvcr120.?__ExceptionPtrCurrentException@@YAXPEAX@Z
@ cdecl -arch=win32 ?__ExceptionPtrCurrentException@@YAXPAX@Z(ptr) __ExceptionPtrCurrentException
@ cdecl -arch=win64 ?__ExceptionPtrCurrentException@@YAXPEAX@Z(ptr) __ExceptionPtrCurrentException
@ cdecl -arch=win32 ?__ExceptionPtrDestroy@@YAXPAX@Z(ptr) __ExceptionPtrDestroy
@ cdecl -arch=win64 ?__ExceptionPtrDestroy@@YAXPEAX@Z(ptr) __ExceptionPtrDestroy
@ cdecl -arch=win32 ?__ExceptionPtrRethrow@@YAXPBX@Z(ptr) __ExceptionPtrRethrow

149
dlls/msvcp90/exception.c
View file

@ -946,6 +946,55 @@ bool __cdecl MSVCP__uncaught_exception(void)
}
#if _MSVCP_VER >= 140
void** CDECL __current_exception(void);
/* compute the this pointer for a base class of a given type */
static inline void *get_this_pointer( const this_ptr_offsets *off, void *object )
{
if (!object) return NULL;
if (off->vbase_descr >= 0)
{
int *offset_ptr;
/* move this ptr to vbase descriptor */
object = (char *)object + off->vbase_descr;
/* and fetch additional offset from vbase descriptor */
offset_ptr = (int *)(*(char **)object + off->vbase_offset);
object = (char *)object + *offset_ptr;
}
object = (char *)object + off->this_offset;
return object;
}
#ifdef __i386__
extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase );
__ASM_GLOBAL_FUNC( call_copy_ctor,
"pushl %ebp\n\t"
__ASM_CFI(".cfi_adjust_cfa_offset 4\n\t")
__ASM_CFI(".cfi_rel_offset %ebp,0\n\t")
"movl %esp, %ebp\n\t"
__ASM_CFI(".cfi_def_cfa_register %ebp\n\t")
"pushl $1\n\t"
"movl 12(%ebp), %ecx\n\t"
"pushl 16(%ebp)\n\t"
"call *8(%ebp)\n\t"
"leave\n"
__ASM_CFI(".cfi_def_cfa %esp,4\n\t")
__ASM_CFI(".cfi_same_value %ebp\n\t")
"ret" );
#else
static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase )
{
TRACE( "calling copy ctor %p object %p src %p\n", func, this, src );
if (has_vbase)
((void (__cdecl*)(void*, void*, BOOL))func)(this, src, 1);
else
((void (__cdecl*)(void*, void*))func)(this, src);
}
#endif
int __cdecl __uncaught_exceptions(void)
{
return *__processing_throw();
@ -1067,6 +1116,106 @@ void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep)
ep->rec->NumberParameters, ep->rec->ExceptionInformation);
}
/*********************************************************************
* ?__ExceptionPtrCurrentException@@YAXPAX@Z
* ?__ExceptionPtrCurrentException@@YAXPEAX@Z
*/
#ifndef __x86_64__
void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep)
{
void **current_exception = __current_exception();
EXCEPTION_RECORD *rec = current_exception ? *current_exception : NULL;
TRACE("(%p)\n", ep);
if (!rec)
{
ep->rec = NULL;
ep->ref = NULL;
return;
}
ep->rec = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCEPTION_RECORD));
ep->ref = HeapAlloc(GetProcessHeap(), 0, sizeof(int));
*ep->rec = *rec;
*ep->ref = 1;
if (ep->rec->ExceptionCode == CXX_EXCEPTION)
{
const cxx_exception_type *et = (void*)ep->rec->ExceptionInformation[2];
const cxx_type_info *ti;
void **data, *obj;
ti = et->type_info_table->info[0];
data = HeapAlloc(GetProcessHeap(), 0, ti->size);
obj = (void*)ep->rec->ExceptionInformation[1];
if (ti->flags & CLASS_IS_SIMPLE_TYPE)
{
memcpy(data, obj, ti->size);
if (ti->size == sizeof(void *)) *data = get_this_pointer(&ti->offsets, *data);
}
else if (ti->copy_ctor)
{
call_copy_ctor(ti->copy_ctor, data, get_this_pointer(&ti->offsets, obj),
ti->flags & CLASS_HAS_VIRTUAL_BASE_CLASS);
}
else
memcpy(data, get_this_pointer(&ti->offsets, obj), ti->size);
ep->rec->ExceptionInformation[1] = (ULONG_PTR)data;
}
return;
}
#else
void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep)
{
void **current_exception = __current_exception();
EXCEPTION_RECORD *rec = current_exception ? *current_exception : NULL;
TRACE("(%p)\n", ep);
if (!rec)
{
ep->rec = NULL;
ep->ref = NULL;
return;
}
ep->rec = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCEPTION_RECORD));
ep->ref = HeapAlloc(GetProcessHeap(), 0, sizeof(int));
*ep->rec = *rec;
*ep->ref = 1;
if (ep->rec->ExceptionCode == CXX_EXCEPTION)
{
const cxx_exception_type *et = (void*)ep->rec->ExceptionInformation[2];
const cxx_type_info *ti;
void **data, *obj;
char *base = RtlPcToFileHeader((void*)et, (void**)&base);
ti = (const cxx_type_info*)(base + ((const cxx_type_info_table*)(base + et->type_info_table))->info[0]);
data = HeapAlloc(GetProcessHeap(), 0, ti->size);
obj = (void*)ep->rec->ExceptionInformation[1];
if (ti->flags & CLASS_IS_SIMPLE_TYPE)
{
memcpy(data, obj, ti->size);
if (ti->size == sizeof(void *)) *data = get_this_pointer(&ti->offsets, *data);
}
else if (ti->copy_ctor)
{
call_copy_ctor(base + ti->copy_ctor, data, get_this_pointer(&ti->offsets, obj),
ti->flags & CLASS_HAS_VIRTUAL_BASE_CLASS);
}
else
memcpy(data, get_this_pointer(&ti->offsets, obj), ti->size);
ep->rec->ExceptionInformation[1] = (ULONG_PTR)data;
}
return;
}
#endif
#endif
#if _MSVCP_VER >= 70 || defined(_MSVCIRT)