ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix ntsecapi.h so it does not depend on winternl.h.

This commit is contained in:
Francois Gouget 2006-11-08 01:20:40 +01:00 committed by Alexandre Julliard
parent ea483682c5
commit 5cff5038a9
9 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/advapi32/tests/lsa.c
View File

@ -26,7 +26,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h" #include "winreg.h"
#include "winternl.h"
#include "ntsecapi.h" #include "ntsecapi.h"
#include "sddl.h" #include "sddl.h"
#include "winnls.h" #include "winnls.h"

1
dlls/advapi32/tests/security.c
View File

@ -28,7 +28,6 @@
#include "winerror.h" #include "winerror.h"
#include "aclapi.h" #include "aclapi.h"
#include "winnt.h" #include "winnt.h"
#include "winternl.h"
#include "sddl.h" #include "sddl.h"
#include "ntsecapi.h" #include "ntsecapi.h"

1
dlls/netapi32/access.c
View File

@ -30,7 +30,6 @@
#include "lmapibuf.h" #include "lmapibuf.h"
#include "lmerr.h" #include "lmerr.h"
#include "winreg.h" #include "winreg.h"
#include "winternl.h"
#include "ntsecapi.h" #include "ntsecapi.h"
#include "netapi32_misc.h" #include "netapi32_misc.h"
#include "wine/debug.h" #include "wine/debug.h"

1
dlls/netapi32/ds.c
View File

@ -25,7 +25,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "winternl.h"
#include "ntsecapi.h" #include "ntsecapi.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "dsrole.h" #include "dsrole.h"

1
dlls/netapi32/local_group.c
View File

@ -30,7 +30,6 @@
#include "lmapibuf.h" #include "lmapibuf.h"
#include "lmerr.h" #include "lmerr.h"
#include "winreg.h" #include "winreg.h"
#include "winternl.h"
#include "ntsecapi.h" #include "ntsecapi.h"
#include "netapi32_misc.h" #include "netapi32_misc.h"
#include "wine/debug.h" #include "wine/debug.h"

1
dlls/netapi32/wksta.c
View File

@ -36,7 +36,6 @@
#include "iphlpapi.h" #include "iphlpapi.h"
#include "winerror.h" #include "winerror.h"
#include "winreg.h" #include "winreg.h"
#include "winternl.h"
#include "ntsecapi.h" #include "ntsecapi.h"
#include "netbios.h" #include "netbios.h"
#include "wine/debug.h" #include "wine/debug.h"

30
include/ntsecapi.h
View File

@ -135,6 +135,36 @@ typedef enum _POLICY_AUDIT_EVENT_TYPE
AuditCategoryAccountManagement AuditCategoryAccountManagement
} POLICY_AUDIT_EVENT_TYPE, *PPOLICY_AUDIT_EVENT_TYPE; } 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 UNICODE_STRING LSA_UNICODE_STRING, *PLSA_UNICODE_STRING;
typedef STRING LSA_STRING, *PLSA_STRING; typedef STRING LSA_STRING, *PLSA_STRING;
typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES; typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES;

11
include/sspi.h
View File

@ -73,6 +73,17 @@ typedef struct _SECURITY_INTEGER
} SECURITY_INTEGER, *PSECURITY_INTEGER; } SECURITY_INTEGER, *PSECURITY_INTEGER;
typedef SECURITY_INTEGER TimeStamp, *PTimeStamp; 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 typedef struct _SecPkgInfoA
{ {
unsigned long fCapabilities; unsigned long fCapabilities;

9
include/winternl.h
View File

@ -42,11 +42,14 @@ typedef CONST char *PCSZ;
typedef short CSHORT; typedef short CSHORT;
typedef CSHORT *PCSHORT; typedef CSHORT *PCSHORT;
#ifndef __STRING_DEFINED__
#define __STRING_DEFINED__
typedef struct _STRING { typedef struct _STRING {
USHORT Length; USHORT Length;
USHORT MaximumLength; USHORT MaximumLength;
PCHAR Buffer; PCHAR Buffer;
} STRING, *PSTRING; } STRING, *PSTRING;
#endif
typedef STRING ANSI_STRING; typedef STRING ANSI_STRING;
typedef PSTRING PANSI_STRING; typedef PSTRING PANSI_STRING;
@ -56,11 +59,14 @@ typedef STRING OEM_STRING;
typedef PSTRING POEM_STRING; typedef PSTRING POEM_STRING;
typedef const STRING *PCOEM_STRING; typedef const STRING *PCOEM_STRING;
#ifndef __UNICODE_STRING_DEFINED__
#define __UNICODE_STRING_DEFINED__
typedef struct _UNICODE_STRING { typedef struct _UNICODE_STRING {
USHORT Length; /* bytes */ USHORT Length; /* bytes */
USHORT MaximumLength; /* bytes */ USHORT MaximumLength; /* bytes */
PWSTR Buffer; PWSTR Buffer;
} UNICODE_STRING, *PUNICODE_STRING; } UNICODE_STRING, *PUNICODE_STRING;
#endif
typedef const UNICODE_STRING *PCUNICODE_STRING; typedef const UNICODE_STRING *PCUNICODE_STRING;
@ -919,6 +925,8 @@ typedef struct _KEY_VALUE_PARTIAL_INFORMATION {
UCHAR Data[1]; UCHAR Data[1];
} KEY_VALUE_PARTIAL_INFORMATION, *PKEY_VALUE_PARTIAL_INFORMATION; } KEY_VALUE_PARTIAL_INFORMATION, *PKEY_VALUE_PARTIAL_INFORMATION;
#ifndef __OBJECT_ATTRIBUTES_DEFINED__
#define __OBJECT_ATTRIBUTES_DEFINED__
typedef struct _OBJECT_ATTRIBUTES { typedef struct _OBJECT_ATTRIBUTES {
ULONG Length; ULONG Length;
HANDLE RootDirectory; HANDLE RootDirectory;
@ -927,6 +935,7 @@ typedef struct _OBJECT_ATTRIBUTES {
PVOID SecurityDescriptor; /* type SECURITY_DESCRIPTOR */ PVOID SecurityDescriptor; /* type SECURITY_DESCRIPTOR */
PVOID SecurityQualityOfService; /* type SECURITY_QUALITY_OF_SERVICE */ PVOID SecurityQualityOfService; /* type SECURITY_QUALITY_OF_SERVICE */
} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; } OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES;
#endif
typedef struct _OBJECT_DATA_INFORMATION { typedef struct _OBJECT_DATA_INFORMATION {
BOOLEAN InheritHandle; BOOLEAN InheritHandle;