From 67f066c79bf58ea5df87d6ad3b7aae4147583f0c Mon Sep 17 00:00:00 2001
From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Tue, 9 Sep 2008 16:11:24 +0000
Subject: [PATCH] fix some syntax errors in idl files, deleted unused
 wtypes.idl

svn path=/trunk/; revision=36086
---
 reactos/include/reactos/idl/lsa.idl     | 70 ++++++++++++-------------
 reactos/include/reactos/idl/ms-dtyp.idl | 34 ++++++------
 reactos/include/reactos/idl/svcctl.idl  |  3 +-
 reactos/include/reactos/idl/wtypes.idl  | 26 ---------
 4 files changed, 52 insertions(+), 81 deletions(-)
 delete mode 100644 reactos/include/reactos/idl/wtypes.idl

diff --git a/reactos/include/reactos/idl/lsa.idl b/reactos/include/reactos/idl/lsa.idl
index b886527505c..3d69187ca24 100644
--- a/reactos/include/reactos/idl/lsa.idl
+++ b/reactos/include/reactos/idl/lsa.idl
@@ -7,11 +7,11 @@
 typedef [context_handle] unsigned long LSAPR_HANDLE;
 typedef LSAPR_HANDLE *PLSAPR_HANDLE;
 
-cpp_quote("#ifndef _WINNT_H");
+cpp_quote("#ifndef _WINNT_H")
 typedef LARGE_INTEGER LUID;
-cpp_quote("#endif");
+cpp_quote("#endif")
 
-cpp_quote("#ifndef _NTDEF_");
+cpp_quote("#ifndef _NTDEF_")
 
 typedef long NTSTATUS;
 
@@ -21,7 +21,7 @@ typedef struct _STRING {
     [size_is(MaximumLength), length_is(Length)] LPSTR Buffer;
 } STRING, *PSTRING;
 
-cpp_quote("#endif");
+cpp_quote("#endif")
 
 typedef struct _LSAPR_ACL {
     BYTE AclRevision;
@@ -44,7 +44,7 @@ typedef struct _LSAPR_SECURITY_DESCRIPTOR {
     /* FIXME: should be PLSAPR_ACL Dacl; */
 } LSAPR_SECURITY_DESCRIPTOR, *PLSAPR_SECURITY_DESCRIPTOR;
 
-cpp_quote("#if 0");
+cpp_quote("#if 0")
 
 typedef enum _SECURITY_IMPERSONATION_LEVEL {
     SecurityAnonymous = 0,
@@ -62,7 +62,7 @@ typedef struct _SECURITY_QUALITY_OF_SERVICE {
     BYTE EffectiveOnly;
 } SECURITY_QUALITY_OF_SERVICE, *PSECURITY_QUALITY_OF_SERVICE;
 
-cpp_quote("#endif");
+cpp_quote("#endif")
 
 typedef struct _LSAPR_OBJECT_ATTRIBUTES {
     DWORD Length;
@@ -73,8 +73,6 @@ typedef struct _LSAPR_OBJECT_ATTRIBUTES {
     PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService;
 } LSAPR_OBJECT_ATTRIBUTES, *PLSAPR_OBJECT_ATTRIBUTES;
 
-typedef unsigned long ACCESS_MASK;
-
 typedef unsigned long SECURITY_INFORMATION;
 
 typedef struct _LSAPR_POLICY_PRIVILEGE_DEF {
@@ -96,9 +94,9 @@ typedef struct _LSAPR_ACCOUNT_ENUM_BUFFER {
     [size_is(EntriesRead)] PLSAPR_ACCOUNT_INFORMATION Information;
 } LSAPR_ACCOUNT_ENUM_BUFFER, *PLSAPR_ACCOUNT_ENUM_BUFFER;
 
-cpp_quote("#ifndef _NTSECAPI_H");
+cpp_quote("#ifndef _NTSECAPI_H")
 typedef RPC_UNICODE_STRING LSA_UNICODE_STRING, *PLSA_UNICODE_STRING;
-cpp_quote("#endif");
+cpp_quote("#endif")
 
 typedef struct _LSAPR_TRUST_INFORMATION {
     RPC_UNICODE_STRING Name;
@@ -111,7 +109,7 @@ typedef struct _LSAPR_REFERENCED_DOMAIN_LIST {
     DWORD MaxEntries;
 } LSAPR_REFERENCED_DOMAIN_LIST, *PLSAPR_REFERENCED_DOMAIN_LIST;
 
-cpp_quote("#if 0");
+cpp_quote("#if 0")
 
 typedef enum _SID_NAME_USE {
     SidTypeUser = 1,
@@ -126,9 +124,9 @@ typedef enum _SID_NAME_USE {
     SidTypeLabel,
 } SID_NAME_USE, *PSID_NAME_USE;
 
-cpp_quote("#endif");
+cpp_quote("#endif")
 
-cpp_quote("#ifndef _NTDEF_");
+cpp_quote("#ifndef _NTDEF_")
 
 typedef struct _LSA_TRANSLATED_SID {
     SID_NAME_USE Use;
@@ -136,7 +134,7 @@ typedef struct _LSA_TRANSLATED_SID {
     LONG DomainIndex;
 } LSA_TRANSLATED_SID, *PLSA_TRANSLATED_SID;
 
-cpp_quote("#endif");
+cpp_quote("#endif")
 
 typedef struct _LSAPR_TRANSLATED_SIDS {
     DWORD Entries;
@@ -216,7 +214,7 @@ typedef struct _LSAPR_SR_SECURITY_DESCRIPTOR {
     [size_is(Length)] BYTE *SecurityDescriptor;
 } LSAPR_SR_SECURITY_DESCRIPTOR, *PLSAPR_SR_SECURITY_DESCRIPTOR;
 
-cpp_quote("#ifndef _NTSECAPI_H");
+cpp_quote("#ifndef _NTSECAPI_H")
 typedef enum _POLICY_INFORMATION_CLASS {
     PolicyAuditLogInformation = 1,
     PolicyAuditEventsInformation,
@@ -243,7 +241,7 @@ typedef struct _POLICY_AUDIT_LOG_INFO {
     LARGE_INTEGER TimeToShutdown;
     DWORD NextAuditRecordId;
 } POLICY_AUDIT_LOG_INFO, *PPOLICY_AUDIT_LOG_INFO;
-cpp_quote("#endif");
+cpp_quote("#endif")
 
 typedef struct _LSAPR_POLICY_AUDIT_EVENTS_INFO {
     BYTE AuditingMode;
@@ -265,7 +263,7 @@ typedef struct _LSAPR_POLICY_PD_ACCOUNT_INFO {
     RPC_UNICODE_STRING Name;
 } LSAPR_POLICY_PD_ACCOUNT_INFO, *PLSAPR_POLICY_PD_ACCOUNT_INFO;
 
-cpp_quote("#ifndef _NTSECAPI_H");
+cpp_quote("#ifndef _NTSECAPI_H")
 typedef enum _POLICY_LSA_SERVER_ROLE {
     PolicyServerRoleBackup = 2,
     PolicyServerRolePrimary,
@@ -274,14 +272,14 @@ typedef enum _POLICY_LSA_SERVER_ROLE {
 typedef struct _POLICY_LSA_SERVER_ROLE_INFO {
     POLICY_LSA_SERVER_ROLE LsaServerRole;
 } POLICY_LSA_SERVER_ROLE_INFO, *PPOLICY_LSA_SERVER_ROLE_INFO;
-cpp_quote("#endif");
+cpp_quote("#endif")
 
 typedef struct _POLICY_LSA_REPLICA_SRCE_INFO {
     RPC_UNICODE_STRING ReplicaSource;
     RPC_UNICODE_STRING ReplicaAccountName;
 } POLICY_LSA_REPLICA_SRCE_INFO, *PPOLICY_LSA_REPLICA_SRCE_INFO;
 
-cpp_quote("#ifndef _WINNT_H");
+cpp_quote("#ifndef _WINNT_H")
 typedef struct _QUOTA_LIMITS {
     INT64 PagedPoolLimit;
     INT64 NonPagedPoolLimit;
@@ -290,9 +288,9 @@ typedef struct _QUOTA_LIMITS {
     INT64 PagefileLimit;
     LARGE_INTEGER TimeLimit;
 } QUOTA_LIMITS, *PQUOTA_LIMITS;
-cpp_quote("#endif");
+cpp_quote("#endif")
 
-cpp_quote("#ifndef _NTSECAPI_H");
+cpp_quote("#ifndef _NTSECAPI_H")
 typedef struct _POLICY_DEFAULT_QUOTA_INFO {
     QUOTA_LIMITS QuotaLimits;
 } POLICY_DEFAULT_QUOTA_INFO, *PPOLICY_DEFAULT_QUOTA_INFO;
@@ -301,18 +299,18 @@ typedef struct _POLICY_MODIFICATION_INFO {
     LARGE_INTEGER ModifiedId;
     LARGE_INTEGER DatabaseCreationTime;
 } POLICY_MODIFICATION_INFO, *PPOLICY_MODIFICATION_INFO;
-cpp_quote("#endif");
+cpp_quote("#endif")
 
 typedef struct _POLICY_FULL_SET_INFO {
     BOOL ShutDownOnFull;
 } POLICY_FULL_SET_INFO, *PPOLICY_FULL_SET_INFO;
 
-cpp_quote("#ifndef _NTSECAPI_H");
+cpp_quote("#ifndef _NTSECAPI_H")
 typedef struct _POLICY_AUDIT_FULL_QUERY_INFO {
     BOOL ShutDownOnFull;
     BOOL LogIsFull;
 } POLICY_AUDIT_FULL_QUERY_INFO, *PPOLICY_AUDIT_FULL_QUERY_INFO;
-cpp_quote("#endif");
+cpp_quote("#endif")
 
 typedef struct _LSAPR_POLICY_DNS_DOMAIN_INFO {
     RPC_UNICODE_STRING Name;
@@ -345,7 +343,7 @@ typedef struct _LSAPR_TRUSTED_ENUM_BUFFER {
     [size_is(EntriesRead)] PLSAPR_TRUST_INFORMATION Information;
 } LSAPR_TRUSTED_ENUM_BUFFER, *PLSAPR_TRUSTED_ENUM_BUFFER;
 
-cpp_quote("#ifndef _NTSECAPI_H");
+cpp_quote("#ifndef _NTSECAPI_H")
 typedef enum _TRUSTED_INFORMATION_CLASS {
     TrustedDomainNameInformation = 1,
     TrustedControllersInformation,
@@ -361,7 +359,7 @@ typedef enum _TRUSTED_INFORMATION_CLASS {
     TrustedDomainFullInformation2Internal,
     TrustedDomainSupportedEncryptionTypes,
 } TRUSTED_INFORMATION_CLASS, *PTRUSTED_INFORMATION_CLASS;
-cpp_quote("#endif");
+cpp_quote("#endif")
 
 typedef struct _LSAPR_TRUSTED_DOMAIN_NAME_INFO {
     RPC_UNICODE_STRING Name;
@@ -372,11 +370,11 @@ typedef struct _LSAPR_TRUSTED_CONTROLLERS_INFO {
     [size_is(Entries)] PRPC_UNICODE_STRING Names;
 } LSAPR_TRUSTED_CONTROLLERS_INFO, *PLSAPR_TRUSTED_CONTROLLERS_INFO;
 
-cpp_quote("#ifndef _NTSECAPI_H");
+cpp_quote("#ifndef _NTSECAPI_H")
 typedef struct _TRUSTED_POSIX_OFFSET_INFO {
     DWORD Offset;
 } TRUSTED_POSIX_OFFSET_INFO, *PTRUSTED_POSIX_OFFSET_INFO;
-cpp_quote("#endif");
+cpp_quote("#endif")
 
 typedef struct _LSAPR_CR_CIPHER_VALUE {
     DWORD Length;
@@ -394,7 +392,7 @@ typedef struct _LSAPR_USER_RIGHT_SET {
     [size_is(Entries)] PRPC_UNICODE_STRING UserRights;
 } LSAPR_USER_RIGHT_SET, *PLSAPR_USER_RIGHT_SET;
 
-cpp_quote("#ifndef _NTSECAPI_H");
+cpp_quote("#ifndef _NTSECAPI_H")
 typedef enum _POLICY_DOMAIN_INFORMATION_CLASS {
     PolicyDomainQualityOfServiceInformation = 1,
     PolicyDomainEfsInformation = 2,
@@ -404,14 +402,14 @@ typedef enum _POLICY_DOMAIN_INFORMATION_CLASS {
 typedef struct _POLICY_DOMAIN_QUALITY_OF_SERVICE_INFO {
     DWORD QualityOfService;
 } POLICY_DOMAIN_QUALITY_OF_SERVICE_INFO, *PPOLICY_DOMAIN_QUALITY_OF_SERVICE_INFO;
-cpp_quote("#endif");
+cpp_quote("#endif")
 
 typedef struct _LSAPR_POLICY_DOMAIN_EFS_INFO {
     DWORD InfoLength;
     [size_is(InfoLength)] BYTE *EfsBlob;
 } LSAPR_POLICY_DOMAIN_EFS_INFO, *PLSAPR_POLICY_DOMAIN_EFS_INFO;
 
-cpp_quote("#ifndef _NTSECAPI_H");
+cpp_quote("#ifndef _NTSECAPI_H")
 typedef struct _POLICY_DOMAIN_KERBEROS_TICKET_INFO {
     DWORD AuthenticationOptions;
     LARGE_INTEGER MaxServiceTicketAge;
@@ -420,7 +418,7 @@ typedef struct _POLICY_DOMAIN_KERBEROS_TICKET_INFO {
     LARGE_INTEGER MaxClockSkew;
     LARGE_INTEGER Reserved;
 } POLICY_DOMAIN_KERBEROS_TICKET_INFO, *PPOLICY_DOMAIN_KERBEROS_TICKET_INFO;
-cpp_quote("#endif");
+cpp_quote("#endif")
 
 typedef
 [switch_type(POLICY_DOMAIN_INFORMATION_CLASS)] union _LSAPR_POLICY_DOMAIN_INFORMATION {
@@ -518,12 +516,12 @@ typedef
     [case(TrustedDomainSupportedEncryptionTypes)] TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES TrustedDomainSETs;
 } LSAPR_TRUSTED_DOMAIN_INFO, *PLSAPR_TRUSTED_DOMAIN_INFO;
 
-cpp_quote("#ifndef _WINNT_H");
+cpp_quote("#ifndef _WINNT_H")
 typedef struct _LUID {
     ULONG LowPart;
     LONG HightPart;
 } LUID, *PLUID;
-cpp_quote("#endif");
+cpp_quote("#endif")
 
 typedef struct _LSAPR_LUID_AND_ATTRIBUTES {
     LUID Luid;
@@ -536,7 +534,7 @@ typedef struct _LSAPR_PRIVILEGE_SET {
     [size_is(PrivilegeCount)] LSAPR_LUID_AND_ATTRIBUTES Privilege[*];
 } LSAPR_PRIVILEGE_SET, *PLSAPR_PRIVILEGE_SET;
 
-cpp_quote("#ifndef _NTSECAPI_H");
+cpp_quote("#ifndef _NTSECAPI_H")
 typedef enum _LSA_FOREST_TRUST_RECORD_TYPE {
     ForestTrustTopLevelName = 0,
     ForestTrustTopLevelNameEx = 1,
@@ -587,7 +585,7 @@ typedef struct _LSA_FOREST_TRUST_COLLISION_INFORMATION {
     DWORD RecordCount;
     [size_is(RecordCount)] PLSA_FOREST_TRUST_COLLISION_RECORD *Entries;
 } LSA_FOREST_TRUST_COLLISION_INFORMATION, *PLSA_FOREST_TRUST_COLLISION_INFORMATION;
-cpp_quote("#endif");
+cpp_quote("#endif")
 
 [
   uuid(12345778-1234-abcd-ef00-0123456789ab),
diff --git a/reactos/include/reactos/idl/ms-dtyp.idl b/reactos/include/reactos/idl/ms-dtyp.idl
index 29190ecb10e..89c0625ba5d 100644
--- a/reactos/include/reactos/idl/ms-dtyp.idl
+++ b/reactos/include/reactos/idl/ms-dtyp.idl
@@ -1,5 +1,5 @@
-cpp_quote("#ifndef _DTYP_IDL");
-cpp_quote("#define _DTYP_IDL");
+cpp_quote("#ifndef _DTYP_IDL")
+cpp_quote("#define _DTYP_IDL")
 
 /* Common data types */
 
@@ -17,9 +17,9 @@ typedef signed int INT32;
 typedef signed __int64 INT64;
 typedef signed int LONG32;
 typedef signed __int64 LONG64;
-cpp_quote("#if 0");
+cpp_quote("#if 0")
 typedef long NTSTATUS;
-cpp_quote("#endif");
+cpp_quote("#endif")
 typedef unsigned __int64 QWORD;
 typedef short SHORT;
 typedef __int64 TIME;
@@ -50,9 +50,9 @@ typedef LONG LONG_PTR;
 typedef ULONG ULONG_PTR;
 #endif
 typedef ULONG_PTR SIZE_T;
-cpp_quote("#if 0");
+cpp_quote("#if 0")
 typedef UCHAR *STRING;
-cpp_quote("#endif");
+cpp_quote("#endif")
 typedef DWORD NET_API_STATUS;
 typedef ULONG_PTR DWORD_PTR;
 typedef ULONGLONG DWORDLONG, *PDWORDLONG;
@@ -65,9 +65,9 @@ typedef void *RPC_BINDING_HANDLE;
 typedef [context_handle] void *PCONTEXT_HANDLE, *PPCONTEXT_HANDLE;
 
 typedef wchar_t WCHAR, *PWCHAR;
-cpp_quote("#if 0");
+cpp_quote("#if 0")
 typedef wchar_t UNICODE;
-cpp_quote("#endif");
+cpp_quote("#endif")
 typedef const char *LPCSTR;
 typedef const wchar_t *LPCWSTR;
 typedef char *PSTR, *LPSTR;
@@ -76,7 +76,7 @@ typedef const wchar_t *LMCSTR;
 typedef WCHAR *LMSTR;
 typedef WCHAR *BSTR;
 
-cpp_quote("#if 0");
+cpp_quote("#if 0")
 #ifdef Unicode
 typedef LPCWSTR LPCTSTR;
 typedef LPWSTR LPTSTR;
@@ -86,11 +86,11 @@ typedef LPCSTR LPCTSTR;
 typedef LPSTR LPTSTR;
 typedef CHAR TCHAR;
 #endif
-cpp_quote("#endif");
+cpp_quote("#endif")
 
 /* Common data structures */
 
-cpp_quote("#if 0");
+cpp_quote("#if 0")
 
 typedef struct _FILETIME {
     DWORD dwLowDateTime;
@@ -110,7 +110,7 @@ typedef struct _LARGE_INTEGER {
 
 typedef DWORD LCID;
 
-cpp_quote("#endif");
+cpp_quote("#endif")
 
 typedef struct _RPC_UNICODE_STRING {
     USHORT Length;
@@ -118,7 +118,7 @@ typedef struct _RPC_UNICODE_STRING {
     [size_is(MaximumLength/2), length_is(Length/2)] LPWSTR Buffer;
 } RPC_UNICODE_STRING, *PRPC_UNICODE_STRING;
 
-cpp_quote("#if 0");
+cpp_quote("#if 0")
 
 typedef struct _SYSTEMTIME {
     WORD wYear;
@@ -146,11 +146,11 @@ typedef struct _UNICODE_STRING {
     [size_is(MaximumLength/2), length_is(Length/2)] LPWSTR Buffer;
 } UNICODE_STRING, *PUNICODE_STRING;
 
-cpp_quote("#endif");
+cpp_quote("#endif")
 
 /* Constructed security types */
 
-cpp_quote("#if 0");
+cpp_quote("#if 0")
 
 typedef struct _SID_IDENTIFIER_AUTHORITY {
     BYTE Value[6];
@@ -271,7 +271,7 @@ typedef struct _SECURITY_DESCRIPTOR {
 
 typedef DWORD SECURITY_INFORMATION, *PSECURITY_INFORMATION;
 
-cpp_quote("#endif");
+cpp_quote("#endif")
 
 typedef struct _RPC_SID {
     UCHAR Revision;
@@ -280,4 +280,4 @@ typedef struct _RPC_SID {
     [size_is(SubAuthorityCount)] DWORD SubAuthority[];
 } RPC_SID, *PRPC_SID;
 
-cpp_quote("#endif /* _DTYP_IDL */");
+cpp_quote("#endif /* _DTYP_IDL */")
diff --git a/reactos/include/reactos/idl/svcctl.idl b/reactos/include/reactos/idl/svcctl.idl
index 2f737a5a489..ada0eefe012 100644
--- a/reactos/include/reactos/idl/svcctl.idl
+++ b/reactos/include/reactos/idl/svcctl.idl
@@ -15,7 +15,6 @@ const unsigned short SC_MAX_COMMENT_LENGTH = 128;
 const unsigned short SC_MAX_ARGUMENT_LENGTH = 1024;
 const unsigned short SC_MAX_ARGUMENTS = 1024;
 
-typedef unsigned long SECURITY_INFORMATION;
 typedef [handle] LPSTR SVCCTL_HANDLEA;
 typedef [handle] LPWSTR SVCCTL_HANDLEW;
 typedef [context_handle] unsigned long SC_RPC_HANDLE;
@@ -187,7 +186,7 @@ typedef struct _SC_RPC_CONFIG_INFOA {
         [case(4)] LPSERVICE_FAILURE_ACTIONS_FLAG psfaf;
         [case(5)] LPSERVICE_SID_INFO pssid;
         [case(6)] LPSERVICE_RPC_REQUIRED_PRIVILEGES_INFO psrp;
-        [case(7)] LPSERVICE_PRESHUTDOWN_INFO psps;;
+        [case(7)] LPSERVICE_PRESHUTDOWN_INFO psps;
     };
 } SC_RPC_CONFIG_INFOA, *LPSC_RPC_CONFIG_INFOA;
 
diff --git a/reactos/include/reactos/idl/wtypes.idl b/reactos/include/reactos/idl/wtypes.idl
deleted file mode 100644
index 1be9c303ba9..00000000000
--- a/reactos/include/reactos/idl/wtypes.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-#define BYTE unsigned char
-#define UCHAR unsigned char
-#define WORD unsigned short
-
-#define BOOL int
-typedef wchar_t WCHAR;
-typedef char CHAR;
-
-typedef void *PVOID;
-typedef BOOL *PBOOL;
-typedef unsigned char *LPBYTE;
-typedef unsigned long DWORD, *LPDWORD;
-typedef CHAR *LPSTR;
-typedef WCHAR *LPWSTR;
-
-#define LPCSTR LPSTR
-#define LPCWSTR LPWSTR
-#define ULONG unsigned long
-#define PBYTE unsigned char*
-#define PWSTR wchar_t*
-
-#define NTSTATUS long
-cpp_quote("#if 0")
-typedef int GUID;
-typedef unsigned long ULONGLONG;
-cpp_quote("#endif")