Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

OK I must be having a bad coding day or something. This should finally fix the build problems.

Browse source 
svn path=/trunk/; revision=5658
This commit is contained in:
Andrew Greenwood 2003-08-18 23:10:44 +00:00
parent 0768d3a18b
commit 5f8d059303
2 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/lib/advapi32/sec/sec.c
View file

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

16
reactos/lib/msvcrt/except/unwind.c
View file

@ -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);
}