Fix ntsecapi.h so it does not depend on winternl.h.
This commit is contained in:
parent
ea483682c5
commit
5cff5038a9
|
@ -26,7 +26,6 @@
|
|||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "winreg.h"
|
||||
#include "winternl.h"
|
||||
#include "ntsecapi.h"
|
||||
#include "sddl.h"
|
||||
#include "winnls.h"
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
#include "winerror.h"
|
||||
#include "aclapi.h"
|
||||
#include "winnt.h"
|
||||
#include "winternl.h"
|
||||
#include "sddl.h"
|
||||
#include "ntsecapi.h"
|
||||
|
||||
|
|
|
@ -30,7 +30,6 @@
|
|||
#include "lmapibuf.h"
|
||||
#include "lmerr.h"
|
||||
#include "winreg.h"
|
||||
#include "winternl.h"
|
||||
#include "ntsecapi.h"
|
||||
#include "netapi32_misc.h"
|
||||
#include "wine/debug.h"
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "winerror.h"
|
||||
#include "winternl.h"
|
||||
#include "ntsecapi.h"
|
||||
#include "wine/debug.h"
|
||||
#include "dsrole.h"
|
||||
|
|
|
@ -30,7 +30,6 @@
|
|||
#include "lmapibuf.h"
|
||||
#include "lmerr.h"
|
||||
#include "winreg.h"
|
||||
#include "winternl.h"
|
||||
#include "ntsecapi.h"
|
||||
#include "netapi32_misc.h"
|
||||
#include "wine/debug.h"
|
||||
|
|
|
@ -36,7 +36,6 @@
|
|||
#include "iphlpapi.h"
|
||||
#include "winerror.h"
|
||||
#include "winreg.h"
|
||||
#include "winternl.h"
|
||||
#include "ntsecapi.h"
|
||||
#include "netbios.h"
|
||||
#include "wine/debug.h"
|
||||
|
|
|
@ -135,6 +135,36 @@ typedef enum _POLICY_AUDIT_EVENT_TYPE
|
|||
AuditCategoryAccountManagement
|
||||
} POLICY_AUDIT_EVENT_TYPE, *PPOLICY_AUDIT_EVENT_TYPE;
|
||||
|
||||
#ifndef __STRING_DEFINED__
|
||||
#define __STRING_DEFINED__
|
||||
typedef struct _STRING {
|
||||
USHORT Length;
|
||||
USHORT MaximumLength;
|
||||
PCHAR Buffer;
|
||||
} STRING, *PSTRING;
|
||||
#endif
|
||||
|
||||
#ifndef __UNICODE_STRING_DEFINED__
|
||||
#define __UNICODE_STRING_DEFINED__
|
||||
typedef struct _UNICODE_STRING {
|
||||
USHORT Length; /* bytes */
|
||||
USHORT MaximumLength; /* bytes */
|
||||
PWSTR Buffer;
|
||||
} UNICODE_STRING, *PUNICODE_STRING;
|
||||
#endif
|
||||
|
||||
#ifndef __OBJECT_ATTRIBUTES_DEFINED__
|
||||
#define __OBJECT_ATTRIBUTES_DEFINED__
|
||||
typedef struct _OBJECT_ATTRIBUTES {
|
||||
ULONG Length;
|
||||
HANDLE RootDirectory;
|
||||
PUNICODE_STRING ObjectName;
|
||||
ULONG Attributes;
|
||||
PVOID SecurityDescriptor; /* type SECURITY_DESCRIPTOR */
|
||||
PVOID SecurityQualityOfService; /* type SECURITY_QUALITY_OF_SERVICE */
|
||||
} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES;
|
||||
#endif
|
||||
|
||||
typedef UNICODE_STRING LSA_UNICODE_STRING, *PLSA_UNICODE_STRING;
|
||||
typedef STRING LSA_STRING, *PLSA_STRING;
|
||||
typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES;
|
||||
|
|
|
@ -73,6 +73,17 @@ typedef struct _SECURITY_INTEGER
|
|||
} SECURITY_INTEGER, *PSECURITY_INTEGER;
|
||||
typedef SECURITY_INTEGER TimeStamp, *PTimeStamp;
|
||||
|
||||
#ifndef __UNICODE_STRING_DEFINED__
|
||||
#define __UNICODE_STRING_DEFINED__
|
||||
typedef struct _UNICODE_STRING {
|
||||
USHORT Length; /* bytes */
|
||||
USHORT MaximumLength; /* bytes */
|
||||
PWSTR Buffer;
|
||||
} UNICODE_STRING, *PUNICODE_STRING;
|
||||
#endif
|
||||
|
||||
typedef UNICODE_STRING SECURITY_STRING, *PSECURITY_STRING;
|
||||
|
||||
typedef struct _SecPkgInfoA
|
||||
{
|
||||
unsigned long fCapabilities;
|
||||
|
|
|
@ -42,11 +42,14 @@ typedef CONST char *PCSZ;
|
|||
typedef short CSHORT;
|
||||
typedef CSHORT *PCSHORT;
|
||||
|
||||
#ifndef __STRING_DEFINED__
|
||||
#define __STRING_DEFINED__
|
||||
typedef struct _STRING {
|
||||
USHORT Length;
|
||||
USHORT MaximumLength;
|
||||
PCHAR Buffer;
|
||||
} STRING, *PSTRING;
|
||||
#endif
|
||||
|
||||
typedef STRING ANSI_STRING;
|
||||
typedef PSTRING PANSI_STRING;
|
||||
|
@ -56,11 +59,14 @@ typedef STRING OEM_STRING;
|
|||
typedef PSTRING POEM_STRING;
|
||||
typedef const STRING *PCOEM_STRING;
|
||||
|
||||
#ifndef __UNICODE_STRING_DEFINED__
|
||||
#define __UNICODE_STRING_DEFINED__
|
||||
typedef struct _UNICODE_STRING {
|
||||
USHORT Length; /* bytes */
|
||||
USHORT MaximumLength; /* bytes */
|
||||
PWSTR Buffer;
|
||||
} UNICODE_STRING, *PUNICODE_STRING;
|
||||
#endif
|
||||
|
||||
typedef const UNICODE_STRING *PCUNICODE_STRING;
|
||||
|
||||
|
@ -919,6 +925,8 @@ typedef struct _KEY_VALUE_PARTIAL_INFORMATION {
|
|||
UCHAR Data[1];
|
||||
} KEY_VALUE_PARTIAL_INFORMATION, *PKEY_VALUE_PARTIAL_INFORMATION;
|
||||
|
||||
#ifndef __OBJECT_ATTRIBUTES_DEFINED__
|
||||
#define __OBJECT_ATTRIBUTES_DEFINED__
|
||||
typedef struct _OBJECT_ATTRIBUTES {
|
||||
ULONG Length;
|
||||
HANDLE RootDirectory;
|
||||
|
@ -927,6 +935,7 @@ typedef struct _OBJECT_ATTRIBUTES {
|
|||
PVOID SecurityDescriptor; /* type SECURITY_DESCRIPTOR */
|
||||
PVOID SecurityQualityOfService; /* type SECURITY_QUALITY_OF_SERVICE */
|
||||
} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES;
|
||||
#endif
|
||||
|
||||
typedef struct _OBJECT_DATA_INFORMATION {
|
||||
BOOLEAN InheritHandle;
|
||||
|
|
Loading…
Reference in New Issue