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

msvcrt: Make a few more exception handling functions i386-specific.

Browse source
This commit is contained in:
Alexandre Julliard 2010-04-12 17:52:32 +02:00
parent e339872252
commit bcf1ef3c90
11 changed files with 38 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/crtdll/crtdll.spec
View file

@ -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

6
dlls/msvcr70/msvcr70.spec
View file

@ -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

6
dlls/msvcr71/msvcr71.spec
View file

@ -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

6
dlls/msvcr80/msvcr80.spec
View file

@ -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

6
dlls/msvcr90/msvcr90.spec
View file

@ -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

26
dlls/msvcrt/except.c
View file

@ -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
*/

6
dlls/msvcrt/msvcrt.spec
View file

@ -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

6
dlls/msvcrt20/msvcrt20.spec
View file

@ -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

6
dlls/msvcrt40/msvcrt40.spec
View file

@ -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

6
dlls/msvcrtd/msvcrtd.spec
View file

@ -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

6
dlls/ntoskrnl.exe/ntoskrnl.exe.spec
View file

@ -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