mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-14 14:51:28 +00:00
msvcrt: Make a few more exception handling functions i386-specific.
This commit is contained in:
parent
e339872252
commit
bcf1ef3c90
|
@ -77,7 +77,7 @@
|
|||
@ extern _environ_dll msvcrt._environ
|
||||
@ cdecl _eof(long) msvcrt._eof
|
||||
@ cdecl _errno() msvcrt._errno
|
||||
@ cdecl _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2
|
||||
@ cdecl -i386 _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2
|
||||
@ varargs _execl(str str) msvcrt._execl
|
||||
@ varargs _execle(str str) msvcrt._execle
|
||||
@ varargs _execlp(str str) msvcrt._execlp
|
||||
|
@ -128,7 +128,7 @@
|
|||
@ cdecl _getpid() msvcrt._getpid
|
||||
@ cdecl _getsystime(ptr) msvcrt._getsystime
|
||||
@ cdecl _getw(ptr) msvcrt._getw
|
||||
@ cdecl _global_unwind2(ptr) msvcrt._global_unwind2
|
||||
@ cdecl -i386 _global_unwind2(ptr) msvcrt._global_unwind2
|
||||
@ cdecl _heapchk() msvcrt._heapchk
|
||||
@ cdecl _heapmin() msvcrt._heapmin
|
||||
@ cdecl _heapset(long) msvcrt._heapset
|
||||
|
|
|
@ -244,8 +244,8 @@
|
|||
@ extern _environ msvcrt._environ
|
||||
@ cdecl _eof(long) msvcrt._eof
|
||||
@ cdecl _errno() msvcrt._errno
|
||||
@ cdecl _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2
|
||||
@ cdecl _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3
|
||||
@ cdecl -i386 _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2
|
||||
@ cdecl -i386 _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3
|
||||
@ varargs _execl(str str) msvcrt._execl
|
||||
@ varargs _execle(str str) msvcrt._execle
|
||||
@ varargs _execlp(str str) msvcrt._execlp
|
||||
|
@ -311,7 +311,7 @@
|
|||
@ stub _getwch
|
||||
@ stub _getwche
|
||||
@ cdecl _getws(ptr) msvcrt._getws
|
||||
@ cdecl _global_unwind2(ptr) msvcrt._global_unwind2
|
||||
@ cdecl -i386 _global_unwind2(ptr) msvcrt._global_unwind2
|
||||
@ cdecl _gmtime64(ptr) msvcrt._gmtime64
|
||||
@ cdecl _heapadd(ptr long) msvcrt._heapadd
|
||||
@ cdecl _heapchk() msvcrt._heapchk
|
||||
|
|
|
@ -238,8 +238,8 @@
|
|||
@ extern _environ msvcrt._environ
|
||||
@ cdecl _eof(long) msvcrt._eof
|
||||
@ cdecl _errno() msvcrt._errno
|
||||
@ cdecl _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2
|
||||
@ cdecl _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3
|
||||
@ cdecl -i386 _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2
|
||||
@ cdecl -i386 _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3
|
||||
@ varargs _execl(str str) msvcrt._execl
|
||||
@ varargs _execle(str str) msvcrt._execle
|
||||
@ varargs _execlp(str str) msvcrt._execlp
|
||||
|
@ -306,7 +306,7 @@
|
|||
@ stub _getwch
|
||||
@ stub _getwche
|
||||
@ cdecl _getws(ptr) msvcrt._getws
|
||||
@ cdecl _global_unwind2(ptr) msvcrt._global_unwind2
|
||||
@ cdecl -i386 _global_unwind2(ptr) msvcrt._global_unwind2
|
||||
@ cdecl _gmtime64(ptr) msvcrt._gmtime64
|
||||
@ cdecl _heapadd(ptr long) msvcrt._heapadd
|
||||
@ cdecl _heapchk() msvcrt._heapchk
|
||||
|
|
|
@ -377,8 +377,8 @@
|
|||
@ extern _environ msvcrt._environ
|
||||
@ cdecl _eof(long) msvcrt._eof
|
||||
@ cdecl _errno() msvcrt._errno
|
||||
@ cdecl _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2
|
||||
@ cdecl _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3
|
||||
@ cdecl -i386 _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2
|
||||
@ cdecl -i386 _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3
|
||||
@ stub _except_handler4_common
|
||||
@ varargs _execl(str str) msvcrt._execl
|
||||
@ varargs _execle(str str) msvcrt._execle
|
||||
|
@ -510,7 +510,7 @@
|
|||
@ stub _getwche_nolock
|
||||
@ cdecl _getws(ptr) msvcrt._getws
|
||||
@ stub _getws_s
|
||||
@ cdecl _global_unwind2(ptr) msvcrt._global_unwind2
|
||||
@ cdecl -i386 _global_unwind2(ptr) msvcrt._global_unwind2
|
||||
@ cdecl _gmtime32(ptr) msvcrt._gmtime32
|
||||
@ stub _gmtime32_s
|
||||
@ cdecl _gmtime64(ptr) msvcrt._gmtime64
|
||||
|
|
|
@ -369,8 +369,8 @@
|
|||
@ extern _environ msvcrt._environ
|
||||
@ cdecl _eof(long) msvcrt._eof
|
||||
@ cdecl _errno() msvcrt._errno
|
||||
@ cdecl _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2
|
||||
@ cdecl _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3
|
||||
@ cdecl -i386 _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2
|
||||
@ cdecl -i386 _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3
|
||||
@ stub _except_handler4_common
|
||||
@ varargs _execl(str str) msvcrt._execl
|
||||
@ varargs _execle(str str) msvcrt._execle
|
||||
|
@ -498,7 +498,7 @@
|
|||
@ stub _getwche_nolock
|
||||
@ cdecl _getws(ptr) msvcrt._getws
|
||||
@ stub _getws_s
|
||||
@ cdecl _global_unwind2(ptr) msvcrt._global_unwind2
|
||||
@ cdecl -i386 _global_unwind2(ptr) msvcrt._global_unwind2
|
||||
@ cdecl _gmtime32(ptr) msvcrt._gmtime32
|
||||
@ stub _gmtime32_s
|
||||
@ cdecl _gmtime64(ptr) msvcrt._gmtime64
|
||||
|
|
|
@ -166,8 +166,6 @@ void CDECL _local_unwind2(MSVCRT_EXCEPTION_FRAME* frame, int trylevel)
|
|||
msvcrt_local_unwind2( frame, trylevel, &frame->_ebp );
|
||||
}
|
||||
|
||||
#endif /* __i386__ */
|
||||
|
||||
/*******************************************************************
|
||||
* _global_unwind2 (MSVCRT.@)
|
||||
*/
|
||||
|
@ -198,7 +196,6 @@ int CDECL _except_handler3(PEXCEPTION_RECORD rec,
|
|||
MSVCRT_EXCEPTION_FRAME* frame,
|
||||
PCONTEXT context, void* dispatcher)
|
||||
{
|
||||
#if defined(__GNUC__) && defined(__i386__)
|
||||
int retval, trylevel;
|
||||
EXCEPTION_POINTERS exceptPtrs;
|
||||
PSCOPETABLE pScopeTable;
|
||||
|
@ -258,29 +255,15 @@ int CDECL _except_handler3(PEXCEPTION_RECORD rec,
|
|||
trylevel = pScopeTable[trylevel].previousTryLevel;
|
||||
}
|
||||
}
|
||||
#else
|
||||
FIXME("exception %x flags=%x at %p handler=%p %p %p stub\n",
|
||||
rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress,
|
||||
frame->handler, context, dispatcher);
|
||||
#endif
|
||||
TRACE("reached TRYLEVEL_END, returning ExceptionContinueSearch\n");
|
||||
return ExceptionContinueSearch;
|
||||
}
|
||||
|
||||
/*********************************************************************
|
||||
* _abnormal_termination (MSVCRT.@)
|
||||
*/
|
||||
int CDECL _abnormal_termination(void)
|
||||
{
|
||||
FIXME("(void)stub\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* setjmp/longjmp implementation
|
||||
*/
|
||||
|
||||
#ifdef __i386__
|
||||
#define MSVCRT_JMP_MAGIC 0x56433230 /* ID value for new jump structure */
|
||||
typedef void (__stdcall *MSVCRT_unwind_function)(const struct MSVCRT___JUMP_BUFFER *);
|
||||
|
||||
|
@ -651,6 +634,15 @@ int CDECL _XcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr)
|
|||
return msvcrt_exception_filter(ptr);
|
||||
}
|
||||
|
||||
/*********************************************************************
|
||||
* _abnormal_termination (MSVCRT.@)
|
||||
*/
|
||||
int CDECL _abnormal_termination(void)
|
||||
{
|
||||
FIXME("(void)stub\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
/******************************************************************
|
||||
* MSVCRT___uncaught_exception
|
||||
*/
|
||||
|
|
|
@ -346,8 +346,8 @@
|
|||
@ extern _environ MSVCRT__environ
|
||||
@ cdecl _eof(long)
|
||||
@ cdecl _errno() MSVCRT__errno
|
||||
@ cdecl _except_handler2(ptr ptr ptr ptr)
|
||||
@ cdecl _except_handler3(ptr ptr ptr ptr)
|
||||
@ cdecl -i386 _except_handler2(ptr ptr ptr ptr)
|
||||
@ cdecl -i386 _except_handler3(ptr ptr ptr ptr)
|
||||
# stub _except_handler4_common
|
||||
@ varargs _execl(str str)
|
||||
@ varargs _execle(str str)
|
||||
|
@ -458,7 +458,7 @@
|
|||
# stub _getwch
|
||||
# stub _getwche
|
||||
@ cdecl _getws(ptr) MSVCRT__getws
|
||||
@ cdecl _global_unwind2(ptr)
|
||||
@ cdecl -i386 _global_unwind2(ptr)
|
||||
@ cdecl _gmtime32(ptr) MSVCRT__gmtime32
|
||||
# stub _gmtime32_s
|
||||
@ cdecl _gmtime64(ptr) MSVCRT__gmtime64
|
||||
|
|
|
@ -560,8 +560,8 @@
|
|||
@ extern _environ msvcrt._environ
|
||||
@ cdecl _eof(long) msvcrt._eof
|
||||
@ cdecl _errno() msvcrt._errno
|
||||
@ cdecl _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2
|
||||
@ cdecl _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3
|
||||
@ cdecl -i386 _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2
|
||||
@ cdecl -i386 _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3
|
||||
@ varargs _execl(str str) msvcrt._execl
|
||||
@ varargs _execle(str str) msvcrt._execle
|
||||
@ varargs _execlp(str str) msvcrt._execlp
|
||||
|
@ -614,7 +614,7 @@
|
|||
@ cdecl _getsystime(ptr) msvcrt._getsystime
|
||||
@ cdecl _getw(ptr) msvcrt._getw
|
||||
@ cdecl _getws(ptr) msvcrt._getws
|
||||
@ cdecl _global_unwind2(ptr) msvcrt._global_unwind2
|
||||
@ cdecl -i386 _global_unwind2(ptr) msvcrt._global_unwind2
|
||||
@ cdecl _heapadd(ptr long) msvcrt._heapadd
|
||||
@ cdecl _heapchk() msvcrt._heapchk
|
||||
@ cdecl _heapmin() msvcrt._heapmin
|
||||
|
|
|
@ -613,8 +613,8 @@
|
|||
@ extern _environ msvcrt._environ
|
||||
@ cdecl _eof(long) msvcrt._eof
|
||||
@ cdecl _errno() msvcrt._errno
|
||||
@ cdecl _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2
|
||||
@ cdecl _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3
|
||||
@ cdecl -i386 _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2
|
||||
@ cdecl -i386 _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3
|
||||
@ varargs _execl(str str) msvcrt._execl
|
||||
@ varargs _execle(str str) msvcrt._execle
|
||||
@ varargs _execlp(str str) msvcrt._execlp
|
||||
|
@ -672,7 +672,7 @@
|
|||
@ cdecl _getsystime(ptr) msvcrt._getsystime
|
||||
@ cdecl _getw(ptr) msvcrt._getw
|
||||
@ cdecl _getws(ptr) msvcrt._getws
|
||||
@ cdecl _global_unwind2(ptr) msvcrt._global_unwind2
|
||||
@ cdecl -i386 _global_unwind2(ptr) msvcrt._global_unwind2
|
||||
@ cdecl _heapadd(ptr long) msvcrt._heapadd
|
||||
@ cdecl _heapchk() msvcrt._heapchk
|
||||
@ cdecl _heapmin() msvcrt._heapmin
|
||||
|
|
|
@ -231,8 +231,8 @@
|
|||
@ extern _environ msvcrt._environ
|
||||
@ cdecl _eof(long) msvcrt._eof
|
||||
@ cdecl _errno() msvcrt._errno
|
||||
@ cdecl _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2
|
||||
@ cdecl _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3
|
||||
@ cdecl -i386 _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2
|
||||
@ cdecl -i386 _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3
|
||||
@ varargs _execl(str str) msvcrt._execl
|
||||
@ varargs _execle(str str) msvcrt._execle
|
||||
@ varargs _execlp(str str) msvcrt._execlp
|
||||
|
@ -293,7 +293,7 @@
|
|||
@ cdecl _getsystime(ptr) msvcrt._getsystime
|
||||
@ cdecl _getw(ptr) msvcrt._getw
|
||||
@ cdecl _getws(ptr) msvcrt._getws
|
||||
@ cdecl _global_unwind2(ptr) msvcrt._global_unwind2
|
||||
@ cdecl -i386 _global_unwind2(ptr) msvcrt._global_unwind2
|
||||
@ cdecl _heapadd (ptr long) msvcrt._heapadd
|
||||
@ cdecl _heapchk() msvcrt._heapchk
|
||||
@ cdecl _heapmin() msvcrt._heapmin
|
||||
|
|
|
@ -1406,9 +1406,9 @@
|
|||
@ stub _aulldvrm
|
||||
@ stdcall -private -ret64 _aullrem(double double) ntdll._aullrem
|
||||
@ stub _aullshr
|
||||
@ cdecl -private _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2
|
||||
@ cdecl -private _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3
|
||||
@ cdecl -private _global_unwind2(ptr) msvcrt._global_unwind2
|
||||
@ cdecl -private -i386 _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2
|
||||
@ cdecl -private -i386 _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3
|
||||
@ cdecl -private -i386 _global_unwind2(ptr) msvcrt._global_unwind2
|
||||
@ cdecl -private _itoa(long ptr long) msvcrt._itoa
|
||||
@ cdecl -private _itow(long ptr long) msvcrt._itow
|
||||
@ cdecl -private _local_unwind2(ptr long) msvcrt._local_unwind2
|
||||
|
|
Loading…
Reference in a new issue