Moved some exception definitions to winnt.h and ntddk.h.
This commit is contained in:
parent
9a6fbe49ca
commit
89fae7eb30
|
@ -11,32 +11,6 @@
|
|||
#include "winnt.h"
|
||||
#include "thread.h"
|
||||
|
||||
/*
|
||||
* the function pointer to a exception handler
|
||||
*/
|
||||
|
||||
/* forward definition */
|
||||
struct __EXCEPTION_FRAME;
|
||||
|
||||
typedef DWORD (CALLBACK *PEXCEPTION_HANDLER)( PEXCEPTION_RECORD pexcrec,
|
||||
struct __EXCEPTION_FRAME *pestframe,
|
||||
PCONTEXT pcontext,
|
||||
struct __EXCEPTION_FRAME **pdispatcher);
|
||||
|
||||
/*
|
||||
* The exception frame, used for registering exception handlers
|
||||
* Win32 cares only about this, but compilers generally emit
|
||||
* larger exception frames for their own use.
|
||||
*/
|
||||
|
||||
typedef struct __EXCEPTION_FRAME
|
||||
{
|
||||
struct __EXCEPTION_FRAME *Prev;
|
||||
PEXCEPTION_HANDLER Handler;
|
||||
} EXCEPTION_FRAME, *PEXCEPTION_FRAME;
|
||||
|
||||
|
||||
void WINAPI RtlUnwind(PEXCEPTION_FRAME,LPVOID,PEXCEPTION_RECORD,DWORD);
|
||||
|
||||
static inline EXCEPTION_FRAME *EXC_push_frame( EXCEPTION_FRAME *frame )
|
||||
{
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
#ifndef __WINE_NTDDK_H
|
||||
#define __WINE_NTDDK_H
|
||||
|
||||
#include <ntdef.h>
|
||||
#include <winnt.h>
|
||||
#include "ntdef.h"
|
||||
#include "winnt.h"
|
||||
#include "winbase.h" /* fixme: should be taken out sometimes */
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
@ -575,6 +575,8 @@ BOOLEAN WINAPI RtlFreeHeap(
|
|||
void __cdecl DbgPrint(LPCSTR fmt,LPVOID args);
|
||||
DWORD WINAPI NtRaiseException(PEXCEPTION_RECORD,PCONTEXT,BOOL);
|
||||
void WINAPI RtlRaiseException(PEXCEPTION_RECORD);
|
||||
void WINAPI RtlRaiseStatus(NTSTATUS);
|
||||
void WINAPI RtlUnwind(PEXCEPTION_FRAME,LPVOID,PEXCEPTION_RECORD,DWORD);
|
||||
VOID WINAPI RtlAcquirePebLock(void);
|
||||
VOID WINAPI RtlReleasePebLock(void);
|
||||
DWORD WINAPI RtlAdjustPrivilege(DWORD x1,DWORD x2,DWORD x3,DWORD x4);
|
||||
|
|
|
@ -321,6 +321,24 @@ typedef struct _EXCEPTION_POINTERS
|
|||
PCONTEXT ContextRecord;
|
||||
} EXCEPTION_POINTERS, *PEXCEPTION_POINTERS;
|
||||
|
||||
|
||||
/*
|
||||
* The exception frame, used for registering exception handlers
|
||||
* Win32 cares only about this, but compilers generally emit
|
||||
* larger exception frames for their own use.
|
||||
*/
|
||||
|
||||
struct __EXCEPTION_FRAME;
|
||||
|
||||
typedef DWORD (CALLBACK *PEXCEPTION_HANDLER)(PEXCEPTION_RECORD,struct __EXCEPTION_FRAME*,
|
||||
PCONTEXT,struct __EXCEPTION_FRAME **);
|
||||
|
||||
typedef struct __EXCEPTION_FRAME
|
||||
{
|
||||
struct __EXCEPTION_FRAME *Prev;
|
||||
PEXCEPTION_HANDLER Handler;
|
||||
} EXCEPTION_FRAME, *PEXCEPTION_FRAME;
|
||||
|
||||
#include "poppack.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -41,13 +41,13 @@ AJ 990101:
|
|||
#include "winbase.h"
|
||||
#include "winuser.h"
|
||||
#include "winerror.h"
|
||||
#include "ntddk.h"
|
||||
#include "debug.h"
|
||||
#include "module.h"
|
||||
#include "heap.h"
|
||||
#include "crtdll.h"
|
||||
#include "drive.h"
|
||||
#include "file.h"
|
||||
#include "except.h"
|
||||
#include "options.h"
|
||||
#include "winnls.h"
|
||||
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#include <stdlib.h>
|
||||
#include "winerror.h"
|
||||
#include "wine/winestring.h"
|
||||
#include "except.h"
|
||||
#include "heap.h"
|
||||
#include "task.h"
|
||||
#include "debug.h"
|
||||
|
|
Loading…
Reference in New Issue