From 0768d3a18bc23c2b5485f0cdd3f2670be4a20895 Mon Sep 17 00:00:00 2001
From: Andrew Greenwood <silverblade@reactos.org>
Date: Mon, 18 Aug 2003 22:55:15 +0000
Subject: [PATCH] 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
---
 reactos/include/ntos/security.h    |  4 ++--
 reactos/lib/msvcrt/except/unwind.c | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/reactos/include/ntos/security.h b/reactos/include/ntos/security.h
index c5096cff980..71956c48f7b 100644
--- a/reactos/include/ntos/security.h
+++ b/reactos/include/ntos/security.h
@@ -45,8 +45,8 @@
 #define SE_SELF_RELATIVE	(32768)
 #endif
 
-// This is defined in W32API:
-// typedef ULONG ACCESS_MODE, *PACCESS_MODE;
+// This is defined in the Win 32 API headers as something else:
+typedef ULONG ACCESS_MODE, *PACCESS_MODE;
 
 #if 0
 typedef struct _ACE_HEADER
diff --git a/reactos/lib/msvcrt/except/unwind.c b/reactos/lib/msvcrt/except/unwind.c
index 02b523984fa..d7209387187 100644
--- a/reactos/lib/msvcrt/except/unwind.c
+++ b/reactos/lib/msvcrt/except/unwind.c
@@ -16,16 +16,17 @@ __ret_label:
 }
 
 
-// THIS SHOULD BE FOR 386 ONLY :
+// This is broken, and dragged over from WINE:
+/*
 
 typedef struct __EXCEPTION_FRAME
 {
   struct __EXCEPTION_FRAME *Prev;
   PEXCEPTION_HANDLER       Handler;
 } EXCEPTION_FRAME, *PEXCEPTION_FRAME;
-
+*/
 /* VC++ extensions to Win32 SEH */
-typedef struct _SCOPETABLE
+/*typedef struct _SCOPETABLE
 {
   int previousTryLevel;
   int (*lpfnFilter)(PEXCEPTION_POINTERS);
@@ -54,16 +55,17 @@ typedef struct __JUMP_BUFFER
     unsigned long Eip;
     unsigned long Registration;
     unsigned long TryLevel;
-    /* Start of new struct members */
-    unsigned long Cookie;
+*/    /* Start of new struct members */
+/*    unsigned long Cookie;
     unsigned long UnwindFunc;
     unsigned long UnwindData[6];
 } _JUMP_BUFFER;
+*/
 
 /*
- * @implemented
+ * @unimplemented
 */
 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);
 }