msvcrt: Add __CxxUnregisterExceptionObject partial implementation.
Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
76411c8dc5
commit
8348d4b40e
|
@ -23,7 +23,7 @@
|
||||||
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) ucrtbase.__CxxLongjmpUnwind
|
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) ucrtbase.__CxxLongjmpUnwind
|
||||||
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() ucrtbase.__CxxQueryExceptionSize
|
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() ucrtbase.__CxxQueryExceptionSize
|
||||||
@ cdecl __CxxRegisterExceptionObject(ptr ptr) ucrtbase.__CxxRegisterExceptionObject
|
@ cdecl __CxxRegisterExceptionObject(ptr ptr) ucrtbase.__CxxRegisterExceptionObject
|
||||||
@ stub __CxxUnregisterExceptionObject
|
@ cdecl __CxxUnregisterExceptionObject(ptr long) ucrtbase.__CxxUnregisterExceptionObject
|
||||||
@ cdecl __DestructExceptionObject(ptr) ucrtbase.__DestructExceptionObject
|
@ cdecl __DestructExceptionObject(ptr) ucrtbase.__DestructExceptionObject
|
||||||
@ stub __FrameUnwindFilter
|
@ stub __FrameUnwindFilter
|
||||||
@ stub __GetPlatformExceptionInfo
|
@ stub __GetPlatformExceptionInfo
|
||||||
|
|
|
@ -555,7 +555,7 @@
|
||||||
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
|
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
|
||||||
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
|
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
|
||||||
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
|
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
|
||||||
@ stub __CxxUnregisterExceptionObject
|
@ cdecl __CxxUnregisterExceptionObject(ptr long)
|
||||||
@ cdecl __DestructExceptionObject(ptr)
|
@ cdecl __DestructExceptionObject(ptr)
|
||||||
@ stub __FrameUnwindFilter
|
@ stub __FrameUnwindFilter
|
||||||
@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid
|
@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid
|
||||||
|
|
|
@ -882,7 +882,7 @@
|
||||||
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
|
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
|
||||||
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
|
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
|
||||||
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
|
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
|
||||||
@ stub __CxxUnregisterExceptionObject
|
@ cdecl __CxxUnregisterExceptionObject(ptr long)
|
||||||
@ cdecl __DestructExceptionObject(ptr)
|
@ cdecl __DestructExceptionObject(ptr)
|
||||||
@ stub __FrameUnwindFilter
|
@ stub __FrameUnwindFilter
|
||||||
@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid
|
@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid
|
||||||
|
|
|
@ -866,7 +866,7 @@
|
||||||
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
|
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
|
||||||
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
|
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
|
||||||
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
|
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
|
||||||
@ stub __CxxUnregisterExceptionObject
|
@ cdecl __CxxUnregisterExceptionObject(ptr long)
|
||||||
@ cdecl __DestructExceptionObject(ptr)
|
@ cdecl __DestructExceptionObject(ptr)
|
||||||
@ stub __FrameUnwindFilter
|
@ stub __FrameUnwindFilter
|
||||||
@ stub __GetPlatformExceptionInfo
|
@ stub __GetPlatformExceptionInfo
|
||||||
|
|
|
@ -860,7 +860,7 @@
|
||||||
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) msvcr120.__CxxLongjmpUnwind
|
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) msvcr120.__CxxLongjmpUnwind
|
||||||
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() msvcr120.__CxxQueryExceptionSize
|
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() msvcr120.__CxxQueryExceptionSize
|
||||||
@ cdecl __CxxRegisterExceptionObject(ptr ptr) msvcr120.__CxxRegisterExceptionObject
|
@ cdecl __CxxRegisterExceptionObject(ptr ptr) msvcr120.__CxxRegisterExceptionObject
|
||||||
@ stub __CxxUnregisterExceptionObject
|
@ cdecl __CxxUnregisterExceptionObject(ptr long) msvcr120.__CxxUnregisterExceptionObject
|
||||||
@ cdecl __DestructExceptionObject(ptr) msvcr120.__DestructExceptionObject
|
@ cdecl __DestructExceptionObject(ptr) msvcr120.__DestructExceptionObject
|
||||||
@ stub __FrameUnwindFilter
|
@ stub __FrameUnwindFilter
|
||||||
@ stub __GetPlatformExceptionInfo
|
@ stub __GetPlatformExceptionInfo
|
||||||
|
|
|
@ -124,7 +124,7 @@
|
||||||
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
|
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
|
||||||
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
|
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
|
||||||
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
|
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
|
||||||
@ stub __CxxUnregisterExceptionObject
|
@ cdecl __CxxUnregisterExceptionObject(ptr long)
|
||||||
@ cdecl __DestructExceptionObject(ptr)
|
@ cdecl __DestructExceptionObject(ptr)
|
||||||
@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid
|
@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid
|
||||||
@ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast
|
@ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast
|
||||||
|
|
|
@ -119,7 +119,7 @@
|
||||||
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
|
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
|
||||||
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
|
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
|
||||||
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
|
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
|
||||||
@ stub __CxxUnregisterExceptionObject
|
@ cdecl __CxxUnregisterExceptionObject(ptr long)
|
||||||
@ cdecl __DestructExceptionObject(ptr)
|
@ cdecl __DestructExceptionObject(ptr)
|
||||||
@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid
|
@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid
|
||||||
@ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast
|
@ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast
|
||||||
|
|
|
@ -189,7 +189,7 @@
|
||||||
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
|
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
|
||||||
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
|
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
|
||||||
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
|
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
|
||||||
@ stub __CxxUnregisterExceptionObject
|
@ cdecl __CxxUnregisterExceptionObject(ptr long)
|
||||||
@ cdecl __DestructExceptionObject(ptr)
|
@ cdecl __DestructExceptionObject(ptr)
|
||||||
@ stub __FrameUnwindFilter
|
@ stub __FrameUnwindFilter
|
||||||
@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid
|
@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid
|
||||||
|
|
|
@ -180,7 +180,7 @@
|
||||||
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
|
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
|
||||||
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
|
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
|
||||||
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
|
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
|
||||||
@ stub __CxxUnregisterExceptionObject
|
@ cdecl __CxxUnregisterExceptionObject(ptr long)
|
||||||
@ cdecl __DestructExceptionObject(ptr)
|
@ cdecl __DestructExceptionObject(ptr)
|
||||||
@ stub __FrameUnwindFilter
|
@ stub __FrameUnwindFilter
|
||||||
@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid
|
@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid
|
||||||
|
|
|
@ -416,3 +416,21 @@ BOOL CDECL __CxxRegisterExceptionObject(EXCEPTION_RECORD **rec, cxx_frame_info *
|
||||||
_CreateFrameInfo(&frame_info->frame_info, (void*)(*rec)->ExceptionInformation[1]);
|
_CreateFrameInfo(&frame_info->frame_info, (void*)(*rec)->ExceptionInformation[1]);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*********************************************************************
|
||||||
|
* __CxxUnregisterExceptionObject (MSVCRT.@)
|
||||||
|
*/
|
||||||
|
void CDECL __CxxUnregisterExceptionObject(cxx_frame_info *frame_info, BOOL in_use)
|
||||||
|
{
|
||||||
|
thread_data_t *data = msvcrt_get_thread_data();
|
||||||
|
|
||||||
|
FIXME("(%p) semi-stub\n", frame_info);
|
||||||
|
|
||||||
|
if(frame_info->rec == (void*)-1)
|
||||||
|
return;
|
||||||
|
|
||||||
|
_FindAndUnlinkFrame(&frame_info->frame_info);
|
||||||
|
if(data->exc_record->ExceptionCode == CXX_EXCEPTION && !in_use) /* FIXME: use _IsExceptionObjectToBeDestroyed here */
|
||||||
|
__DestructExceptionObject(data->exc_record);
|
||||||
|
data->exc_record = frame_info->rec;
|
||||||
|
}
|
||||||
|
|
|
@ -185,7 +185,7 @@
|
||||||
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
|
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
|
||||||
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
|
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
|
||||||
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
|
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
|
||||||
# stub __CxxUnregisterExceptionObject
|
@ cdecl __CxxUnregisterExceptionObject(ptr long)
|
||||||
@ cdecl __DestructExceptionObject(ptr)
|
@ cdecl __DestructExceptionObject(ptr)
|
||||||
@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid
|
@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid
|
||||||
@ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast
|
@ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast
|
||||||
|
|
|
@ -57,7 +57,7 @@
|
||||||
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
|
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
|
||||||
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
|
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
|
||||||
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
|
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
|
||||||
@ stub __CxxUnregisterExceptionObject
|
@ cdecl __CxxUnregisterExceptionObject(ptr long)
|
||||||
@ cdecl __DestructExceptionObject(ptr)
|
@ cdecl __DestructExceptionObject(ptr)
|
||||||
@ stub __FrameUnwindFilter
|
@ stub __FrameUnwindFilter
|
||||||
@ stub __GetPlatformExceptionInfo
|
@ stub __GetPlatformExceptionInfo
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) ucrtbase.__CxxLongjmpUnwind
|
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) ucrtbase.__CxxLongjmpUnwind
|
||||||
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() ucrtbase.__CxxQueryExceptionSize
|
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() ucrtbase.__CxxQueryExceptionSize
|
||||||
@ cdecl __CxxRegisterExceptionObject(ptr ptr) ucrtbase.__CxxRegisterExceptionObject
|
@ cdecl __CxxRegisterExceptionObject(ptr ptr) ucrtbase.__CxxRegisterExceptionObject
|
||||||
@ stub __CxxUnregisterExceptionObject
|
@ cdecl __CxxUnregisterExceptionObject(ptr long) ucrtbase.__CxxUnregisterExceptionObject
|
||||||
@ cdecl __DestructExceptionObject(ptr) ucrtbase.__DestructExceptionObject
|
@ cdecl __DestructExceptionObject(ptr) ucrtbase.__DestructExceptionObject
|
||||||
@ stub __FrameUnwindFilter
|
@ stub __FrameUnwindFilter
|
||||||
@ stub __GetPlatformExceptionInfo
|
@ stub __GetPlatformExceptionInfo
|
||||||
|
|
Loading…
Reference in New Issue