mirror of
https://github.com/reactos/reactos.git
synced 2024-08-08 04:08:29 +00:00
Oops... Sorry guys, the last commit I made broke the build, so I've just reversed most of what I did. Just commented out my changes in unwind.c
svn path=/trunk/; revision=5657
This commit is contained in:
parent
ce4a563fbf
commit
0768d3a18b
|
@ -45,8 +45,8 @@
|
||||||
#define SE_SELF_RELATIVE (32768)
|
#define SE_SELF_RELATIVE (32768)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// This is defined in W32API:
|
// This is defined in the Win 32 API headers as something else:
|
||||||
// typedef ULONG ACCESS_MODE, *PACCESS_MODE;
|
typedef ULONG ACCESS_MODE, *PACCESS_MODE;
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
typedef struct _ACE_HEADER
|
typedef struct _ACE_HEADER
|
||||||
|
|
|
@ -16,16 +16,17 @@ __ret_label:
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// THIS SHOULD BE FOR 386 ONLY :
|
// This is broken, and dragged over from WINE:
|
||||||
|
/*
|
||||||
|
|
||||||
typedef struct __EXCEPTION_FRAME
|
typedef struct __EXCEPTION_FRAME
|
||||||
{
|
{
|
||||||
struct __EXCEPTION_FRAME *Prev;
|
struct __EXCEPTION_FRAME *Prev;
|
||||||
PEXCEPTION_HANDLER Handler;
|
PEXCEPTION_HANDLER Handler;
|
||||||
} EXCEPTION_FRAME, *PEXCEPTION_FRAME;
|
} EXCEPTION_FRAME, *PEXCEPTION_FRAME;
|
||||||
|
*/
|
||||||
/* VC++ extensions to Win32 SEH */
|
/* VC++ extensions to Win32 SEH */
|
||||||
typedef struct _SCOPETABLE
|
/*typedef struct _SCOPETABLE
|
||||||
{
|
{
|
||||||
int previousTryLevel;
|
int previousTryLevel;
|
||||||
int (*lpfnFilter)(PEXCEPTION_POINTERS);
|
int (*lpfnFilter)(PEXCEPTION_POINTERS);
|
||||||
|
@ -54,16 +55,17 @@ typedef struct __JUMP_BUFFER
|
||||||
unsigned long Eip;
|
unsigned long Eip;
|
||||||
unsigned long Registration;
|
unsigned long Registration;
|
||||||
unsigned long TryLevel;
|
unsigned long TryLevel;
|
||||||
/* Start of new struct members */
|
*/ /* Start of new struct members */
|
||||||
unsigned long Cookie;
|
/* unsigned long Cookie;
|
||||||
unsigned long UnwindFunc;
|
unsigned long UnwindFunc;
|
||||||
unsigned long UnwindData[6];
|
unsigned long UnwindData[6];
|
||||||
} _JUMP_BUFFER;
|
} _JUMP_BUFFER;
|
||||||
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* @implemented
|
* @unimplemented
|
||||||
*/
|
*/
|
||||||
void __stdcall _seh_longjmp_unwind(_JUMP_BUFFER *jmp)
|
void __stdcall _seh_longjmp_unwind(_JUMP_BUFFER *jmp)
|
||||||
{
|
{
|
||||||
_local_unwind2((MSVCRT_EXCEPTION_FRAME*) jmp->Registration, jmp->TryLevel);
|
// _local_unwind2((MSVCRT_EXCEPTION_FRAME*) jmp->Registration, jmp->TryLevel);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue