From 5f8d059303244167336daf731f21f51ee6dac5a3 Mon Sep 17 00:00:00 2001
From: Andrew Greenwood <silverblade@reactos.org>
Date: Mon, 18 Aug 2003 23:10:44 +0000
Subject: [PATCH] OK I must be having a bad coding day or something. This
 should finally fix the build problems.

svn path=/trunk/; revision=5658
---
 reactos/lib/advapi32/sec/sec.c     | 16 ++++++++--------
 reactos/lib/msvcrt/except/unwind.c | 16 +++++++---------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/reactos/lib/advapi32/sec/sec.c b/reactos/lib/advapi32/sec/sec.c
index b6ea83cc6a5..ba22fc6dee1 100644
--- a/reactos/lib/advapi32/sec/sec.c
+++ b/reactos/lib/advapi32/sec/sec.c
@@ -14,7 +14,7 @@
 
 #define NTOS_MODE_USER
 #include <windows.h>
-#include <accctrl.h>
+// #include <accctrl.h>
 #include <ntos.h>
 
 
@@ -474,7 +474,7 @@ SetFileSecurityA (
  */
 STDCALL DWORD GetSecurityInfo (
     HANDLE handle,
-    SE_OBJECT_TYPE ObjectType,
+    UINT ObjectType,        // SE_OBJECT_TYPE
     SECURITY_INFORMATION SecurityInfo,
     PSID *ppsidOwner,
     PSID *ppsidGroup,
@@ -492,12 +492,12 @@ STDCALL DWORD GetSecurityInfo (
  */
 STDCALL DWORD GetSecurityInfoExA(
     HANDLE hObject,
-    SE_OBJECT_TYPE ObjectType,
+    UINT ObjectType,        // SE_OBJECT_TYPE
     SECURITY_INFORMATION SecurityInfo,
     LPCSTR lpProvider,
     LPCSTR lpProperty,
-    PACTRL_ACCESS *ppAccessList,
-    PACTRL_AUDIT *ppAuditList,
+    VOID *ppAccessList,     // PACTRL_ACCESS
+    VOID *ppAuditList,      // PACTRL_AUDIT
     LPCSTR *lppOwner,
     LPCSTR *lppGroup
     )
@@ -511,12 +511,12 @@ STDCALL DWORD GetSecurityInfoExA(
  */
 STDCALL DWORD GetSecurityInfoExW(
     HANDLE hObject,
-    SE_OBJECT_TYPE ObjectType,
+    UINT ObjectType,        // SE_OBJECT_TYPE
     SECURITY_INFORMATION SecurityInfo,
     LPCWSTR lpProvider,
     LPCWSTR lpProperty,
-    PACTRL_ACCESS *ppAccessList,
-    PACTRL_AUDIT *ppAuditList,
+    VOID *ppAccessList,     // PACTRL_ACCESS
+    VOID *ppAuditList,      // PACTRL_AUDIT
     LPWSTR *lppOwner,
     LPWSTR *lppGroup
     )
diff --git a/reactos/lib/msvcrt/except/unwind.c b/reactos/lib/msvcrt/except/unwind.c
index d7209387187..3cebce48489 100644
--- a/reactos/lib/msvcrt/except/unwind.c
+++ b/reactos/lib/msvcrt/except/unwind.c
@@ -16,17 +16,16 @@ __ret_label:
 }
 
 
-// This is broken, and dragged over from WINE:
-/*
+// This is 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);
@@ -55,17 +54,16 @@ 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;
-*/
 
 /*
- * @unimplemented
+ * @implemented
 */
 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);
 }