Skip to content

W
wine-cw
Commit 11ccffea authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

msvcrt: Add __CxxRegisterExceptionObject implementation.

Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 29f547d2
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 12 deletions
dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec
View file @ 11ccffea
......@@ -22,7 +22,7 @@
@ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) ucrtbase.__CxxFrameHandler3
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) ucrtbase.__CxxLongjmpUnwind
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() ucrtbase.__CxxQueryExceptionSize
@ stub __CxxRegisterExceptionObject
@ cdecl __CxxRegisterExceptionObject(ptr ptr) ucrtbase.__CxxRegisterExceptionObject
@ stub __CxxUnregisterExceptionObject
@ stub __DestructExceptionObject
@ stub __FrameUnwindFilter
......
dlls/msvcr100/msvcr100.spec
View file @ 11ccffea
......@@ -554,7 +554,7 @@
@ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
@ stub __CxxRegisterExceptionObject
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
@ stub __CxxUnregisterExceptionObject
@ stub __DestructExceptionObject
@ stub __FrameUnwindFilter
......
dlls/msvcr110/msvcr110.spec
View file @ 11ccffea
......@@ -881,7 +881,7 @@
@ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
@ stub __CxxRegisterExceptionObject
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
@ stub __CxxUnregisterExceptionObject
@ stub __DestructExceptionObject
@ stub __FrameUnwindFilter
......
dlls/msvcr120/msvcr120.spec
View file @ 11ccffea
......@@ -865,7 +865,7 @@
@ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
@ stub __CxxRegisterExceptionObject
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
@ stub __CxxUnregisterExceptionObject
@ stub __DestructExceptionObject
@ stub __FrameUnwindFilter
......
dlls/msvcr120_app/msvcr120_app.spec
View file @ 11ccffea
......@@ -859,7 +859,7 @@
@ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) msvcr120.__CxxFrameHandler3
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) msvcr120.__CxxLongjmpUnwind
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() msvcr120.__CxxQueryExceptionSize
@ stub __CxxRegisterExceptionObject
@ cdecl __CxxRegisterExceptionObject(ptr ptr) msvcr120.__CxxRegisterExceptionObject
@ stub __CxxUnregisterExceptionObject
@ stub __DestructExceptionObject
@ stub __FrameUnwindFilter
......
dlls/msvcr70/msvcr70.spec
View file @ 11ccffea
......@@ -123,7 +123,7 @@
@ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler(ptr ptr ptr ptr)
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
@ stub __CxxRegisterExceptionObject
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
@ stub __CxxUnregisterExceptionObject
@ stub __DestructExceptionObject
@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid
......
dlls/msvcr71/msvcr71.spec
View file @ 11ccffea
......@@ -118,7 +118,7 @@
@ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler(ptr ptr ptr ptr)
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
@ stub __CxxRegisterExceptionObject
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
@ stub __CxxUnregisterExceptionObject
@ stub __DestructExceptionObject
@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid
......
dlls/msvcr80/msvcr80.spec
View file @ 11ccffea
......@@ -188,7 +188,7 @@
@ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
@ stub __CxxRegisterExceptionObject
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
@ stub __CxxUnregisterExceptionObject
@ stub __DestructExceptionObject
@ stub __FrameUnwindFilter
......
dlls/msvcr90/msvcr90.spec
View file @ 11ccffea
......@@ -179,7 +179,7 @@
@ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
@ stub __CxxRegisterExceptionObject
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
@ stub __CxxUnregisterExceptionObject
@ stub __DestructExceptionObject
@ stub __FrameUnwindFilter
......
dlls/msvcrt/except.c
View file @ 11ccffea
......@@ -369,3 +369,26 @@ void CDECL _FindAndUnlinkFrame(frame_info *fi)
ERR("frame not found, native crashes in this case\n");
}
/*********************************************************************
* __CxxRegisterExceptionObject (MSVCRT.@)
*/
BOOL CDECL __CxxRegisterExceptionObject(EXCEPTION_RECORD **rec, cxx_frame_info *frame_info)
{
thread_data_t *data = msvcrt_get_thread_data();
TRACE("(%p, %p)\n", rec, frame_info);
if (!rec || !*rec)
{
frame_info->rec = (void*)-1;
frame_info->unk = (void*)-1;
return TRUE;
}
frame_info->rec = data->exc_record;
frame_info->unk = 0;
data->exc_record = *rec;
_CreateFrameInfo(&frame_info->frame_info, (void*)(*rec)->ExceptionInformation[1]);
return TRUE;
}
dlls/msvcrt/msvcrt.h
View file @ 11ccffea
......@@ -210,6 +210,13 @@ typedef struct _frame_info
struct _frame_info *next;
} frame_info;
typedef struct
{
frame_info frame_info;
EXCEPTION_RECORD *rec;
void *unk;
} cxx_frame_info;
/* TLS data */
extern DWORD msvcrt_tls_index DECLSPEC_HIDDEN;
......
dlls/msvcrt/msvcrt.spec
View file @ 11ccffea
......@@ -184,7 +184,7 @@
@ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
# stub __CxxRegisterExceptionObject
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
# stub __CxxUnregisterExceptionObject
# stub __DestructExceptionObject
@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid
......
dlls/ucrtbase/ucrtbase.spec
View file @ 11ccffea
......@@ -56,7 +56,7 @@
@ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize()
@ stub __CxxRegisterExceptionObject
@ cdecl __CxxRegisterExceptionObject(ptr ptr)
@ stub __CxxUnregisterExceptionObject
@ stub __DestructExceptionObject
@ stub __FrameUnwindFilter
......
dlls/vcruntime140/vcruntime140.spec
View file @ 11ccffea
......@@ -19,7 +19,7 @@
@ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) ucrtbase.__CxxFrameHandler3
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) ucrtbase.__CxxLongjmpUnwind
@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() ucrtbase.__CxxQueryExceptionSize
@ stub __CxxRegisterExceptionObject
@ cdecl __CxxRegisterExceptionObject(ptr ptr) ucrtbase.__CxxRegisterExceptionObject
@ stub __CxxUnregisterExceptionObject
@ stub __DestructExceptionObject
@ stub __FrameUnwindFilter
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment