- do not redefine UNICODE_STRING and NTSTATUS if wintrnl.h has already been included
- define PNTSTATUS in wintrnl.h
- add RPC_PROTSEC_VECTOR and RPC_MGMT_AUTHORIZATION_FN definitions

svn path=/trunk/; revision=53087
This commit is contained in:
Jérôme Gardou 2011-08-05 19:35:54 +00:00
parent 02fa32bc59
commit ef2548095f
3 changed files with 25 additions and 3 deletions

View file

@ -141,11 +141,11 @@ extern "C" {
#define SCESTATUS_NO_MAPPING 18L #define SCESTATUS_NO_MAPPING 18L
#define SCESTATUS_TRUST_FAIL 19L #define SCESTATUS_TRUST_FAIL 19L
#if !defined(_NTDEF_) #if !defined(_NTDEF_) && !defined(__WINE_WINTERNL_H)
typedef LONG NTSTATUS, *PNTSTATUS; typedef LONG NTSTATUS, *PNTSTATUS;
#endif #endif
#if defined (_NTDEF_) #if defined (_NTDEF_) || defined(__WINE_WINTERNL_H)
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;

View file

@ -279,6 +279,18 @@ typedef struct _RPC_SECURITY_QOS_V2_A
} u; } u;
} RPC_SECURITY_QOS_V2_A, *PRPC_SECURITY_QOS_V2_A; } RPC_SECURITY_QOS_V2_A, *PRPC_SECURITY_QOS_V2_A;
typedef struct _RPC_PROTSEQ_VECTORA
{
unsigned int Count;
unsigned char __RPC_FAR * Protseq[1];
} RPC_PROTSEQ_VECTORA;
typedef struct _RPC_PROTSEQ_VECTORW
{
unsigned int Count;
unsigned short __RPC_FAR * Protseq[1];
} RPC_PROTSEQ_VECTORW;
#define _SEC_WINNT_AUTH_IDENTITY WINELIB_NAME_AW(_SEC_WINNT_AUTH_IDENTITY_) #define _SEC_WINNT_AUTH_IDENTITY WINELIB_NAME_AW(_SEC_WINNT_AUTH_IDENTITY_)
#define SEC_WINNT_AUTH_IDENTITY WINELIB_NAME_AW(SEC_WINNT_AUTH_IDENTITY_) #define SEC_WINNT_AUTH_IDENTITY WINELIB_NAME_AW(SEC_WINNT_AUTH_IDENTITY_)
#define PSEC_WINNT_AUTH_IDENTITY WINELIB_NAME_AW(PSEC_WINNT_AUTH_IDENTITY_) #define PSEC_WINNT_AUTH_IDENTITY WINELIB_NAME_AW(PSEC_WINNT_AUTH_IDENTITY_)
@ -291,6 +303,16 @@ typedef struct _RPC_SECURITY_QOS_V2_A
#define PRPC_SECURITY_QOS_V2 WINELIB_NAME_AW(PRPC_SECURITY_QOS_V2_) #define PRPC_SECURITY_QOS_V2 WINELIB_NAME_AW(PRPC_SECURITY_QOS_V2_)
#define _RPC_SECURITY_QOS_V2 WINELIB_NAME_AW(_RPC_SECURITY_QOS_V2_) #define _RPC_SECURITY_QOS_V2 WINELIB_NAME_AW(_RPC_SECURITY_QOS_V2_)
#define RPC_PROTSEQ_VECTOR WINELIB_NAME_AW(RPC_PROTSEQ_VECTOR)
#define _RPC_PROTSEQ_VECTOR WINELIB_NAME_AW(_RPC_PROTSEQ_VECTOR)
typedef int
(__RPC_API * RPC_MGMT_AUTHORIZATION_FN) (
IN RPC_BINDING_HANDLE ClientBinding,
IN unsigned long RequestedMgmtOperation,
OUT RPC_STATUS __RPC_FAR * Status
);
/* SEC_WINNT_AUTH Flags */ /* SEC_WINNT_AUTH Flags */
#define SEC_WINNT_AUTH_IDENTITY_ANSI 0x1 #define SEC_WINNT_AUTH_IDENTITY_ANSI 0x1
#define SEC_WINNT_AUTH_IDENTITY_UNICODE 0x2 #define SEC_WINNT_AUTH_IDENTITY_UNICODE 0x2

View file

@ -32,7 +32,7 @@ extern "C" {
* Fundamental types and data structures * Fundamental types and data structures
*/ */
typedef LONG NTSTATUS; typedef LONG NTSTATUS, *PNTSTATUS;
typedef CONST char *PCSZ; typedef CONST char *PCSZ;