[ros-diffs] [fireball] 37379: - Remove duplicate, often conflicting, type definitions from IDL (spotted by new widl).

[fireball at svn.reactos.org]

Author: fireball
Date: Sat Nov 15 13:32:13 2008
New Revision: 37379

URL: http://svn.reactos.org/svn/reactos?rev=37379&view=rev
Log:
- Remove duplicate, often conflicting, type definitions from IDL (spotted by new widl).

Modified:
    trunk/reactos/include/reactos/idl/lsa.idl
    trunk/reactos/include/reactos/idl/ms-dtyp.idl
    trunk/reactos/include/reactos/idl/svcctl.idl

Modified: trunk/reactos/include/reactos/idl/lsa.idl
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.idl?rev=37379&r1=37378&r2=37379&view=diff
==============================================================================
--- trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] Sat Nov 15 13:32:13 2008
@@ -10,13 +10,11 @@
 typedef LSAPR_HANDLE *PLSAPR_HANDLE;
 
 cpp_quote("#ifndef _WINNT_H")
-typedef LARGE_INTEGER LUID;
+typedef LARGE_INTEGER LUID, *PLUID;
 cpp_quote("#endif")
 
 cpp_quote("#ifndef _NTDEF_")
-
 typedef long NTSTATUS;
-
 typedef struct _STRING {
     WORD Length;
     WORD MaximumLength;
@@ -74,8 +72,6 @@
     PLSAPR_SECURITY_DESCRIPTOR SecurityDescriptor;
     PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService;
 } LSAPR_OBJECT_ATTRIBUTES, *PLSAPR_OBJECT_ATTRIBUTES;
-
-typedef unsigned long SECURITY_INFORMATION;
 
 typedef struct _LSAPR_POLICY_PRIVILEGE_DEF {
     RPC_UNICODE_STRING Name;
@@ -518,13 +514,6 @@
     [case(TrustedDomainSupportedEncryptionTypes)] TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES TrustedDomainSETs;
 } LSAPR_TRUSTED_DOMAIN_INFO, *PLSAPR_TRUSTED_DOMAIN_INFO;
 
-cpp_quote("#ifndef _WINNT_H")
-typedef struct _LUID {
-    ULONG LowPart;
-    LONG HightPart;
-} LUID, *PLUID;
-cpp_quote("#endif")
-
 typedef struct _LSAPR_LUID_AND_ATTRIBUTES {
     LUID Luid;
     DWORD Attributes;

Modified: trunk/reactos/include/reactos/idl/ms-dtyp.idl
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/ms-dtyp.idl?rev=37379&r1=37378&r2=37379&view=diff
==============================================================================
--- trunk/reactos/include/reactos/idl/ms-dtyp.idl [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/idl/ms-dtyp.idl [iso-8859-1] Sat Nov 15 13:32:13 2008
@@ -17,9 +17,6 @@
 typedef signed __int64 INT64;
 typedef signed int LONG32;
 typedef signed __int64 LONG64;
-cpp_quote("#if 0")
-typedef long NTSTATUS;
-cpp_quote("#endif")
 typedef unsigned __int64 QWORD;
 typedef short SHORT;
 typedef __int64 TIME;
@@ -50,9 +47,6 @@
 typedef ULONG ULONG_PTR;
 #endif
 typedef ULONG_PTR SIZE_T;
-cpp_quote("#if 0")
-typedef UCHAR *STRING;
-cpp_quote("#endif")
 typedef DWORD NET_API_STATUS;
 typedef ULONG_PTR DWORD_PTR;
 typedef ULONGLONG DWORDLONG, *PDWORDLONG;

Modified: trunk/reactos/include/reactos/idl/svcctl.idl
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl.idl?rev=37379&r1=37378&r2=37379&view=diff
==============================================================================
--- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Sat Nov 15 13:32:13 2008
@@ -296,10 +296,7 @@
 [
   uuid(367abb81-9844-35f1-ad32-98f038001003),
   version(2.0),
-  pointer_default(unique),
-  #ifndef __midl
-  ,explicit_handle
-  #endif
+  pointer_default(unique)
 ]
 interface svcctl
 {