[ros-diffs] [jgardou] 53087: [PSDK] - 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 d...

Author: jgardou
Date: Fri Aug  5 19:35:54 2011
New Revision: 53087

URL: http://svn.reactos.org/svn/reactos?rev=53087&view=rev
Log:
[PSDK]
- 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

Modified:
    trunk/reactos/include/psdk/ntsecapi.h
    trunk/reactos/include/psdk/rpcdce.h
    trunk/reactos/include/psdk/winternl.h

Modified: trunk/reactos/include/psdk/ntsecapi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re…
==============================================================================
--- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Fri Aug  5 19:35:54 2011
@@ -141,11 +141,11 @@
 #define SCESTATUS_NO_MAPPING          18L
 #define SCESTATUS_TRUST_FAIL          19L
 
-#if !defined(_NTDEF_)
+#if !defined(_NTDEF_) && !defined(__WINE_WINTERNL_H)
 typedef LONG NTSTATUS, *PNTSTATUS;
 #endif
 
-#if defined (_NTDEF_)
+#if defined (_NTDEF_) || defined(__WINE_WINTERNL_H)
 typedef UNICODE_STRING LSA_UNICODE_STRING, *PLSA_UNICODE_STRING;
 typedef STRING LSA_STRING, *PLSA_STRING;
 typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES;

Modified: trunk/reactos/include/psdk/rpcdce.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcdce.h?rev=…
==============================================================================
--- trunk/reactos/include/psdk/rpcdce.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/rpcdce.h [iso-8859-1] Fri Aug  5 19:35:54 2011
@@ -279,6 +279,18 @@
     } u;
 } 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 PSEC_WINNT_AUTH_IDENTITY WINELIB_NAME_AW(PSEC_WINNT_AUTH_IDENTITY_)
@@ -290,6 +302,16 @@
 #define RPC_SECURITY_QOS_V2  WINELIB_NAME_AW(RPC_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_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 */
 #define SEC_WINNT_AUTH_IDENTITY_ANSI    0x1

Modified: trunk/reactos/include/psdk/winternl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re…
==============================================================================
--- trunk/reactos/include/psdk/winternl.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winternl.h [iso-8859-1] Fri Aug  5 19:35:54 2011
@@ -32,7 +32,7 @@
  * Fundamental types and data structures
  */
 
-typedef LONG NTSTATUS;
+typedef LONG NTSTATUS, *PNTSTATUS;
 
 typedef CONST char *PCSZ;