From 0ba501867647f570256b9930b11d511ff0350226 Mon Sep 17 00:00:00 2001
From: Aleksey Bragin <aleksey@reactos.org>
Date: Sat, 15 Nov 2008 19:32:13 +0000
Subject: [PATCH] - Remove duplicate, often conflicting, type definitions from
 IDL (spotted by new widl).

svn path=/trunk/; revision=37379
---
 reactos/include/reactos/idl/lsa.idl     | 13 +------------
 reactos/include/reactos/idl/ms-dtyp.idl |  6 ------
 reactos/include/reactos/idl/svcctl.idl  |  5 +----
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/reactos/include/reactos/idl/lsa.idl b/reactos/include/reactos/idl/lsa.idl
index 621bf27907c..99942b0ed50 100644
--- a/reactos/include/reactos/idl/lsa.idl
+++ b/reactos/include/reactos/idl/lsa.idl
@@ -10,13 +10,11 @@ typedef [context_handle] PVOID LSAPR_HANDLE;
 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;
@@ -75,8 +73,6 @@ typedef struct _LSAPR_OBJECT_ATTRIBUTES {
     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;
     LUID LocalValue;
@@ -518,13 +514,6 @@ typedef
     [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;
diff --git a/reactos/include/reactos/idl/ms-dtyp.idl b/reactos/include/reactos/idl/ms-dtyp.idl
index 89c0625ba5d..ab762edd242 100644
--- a/reactos/include/reactos/idl/ms-dtyp.idl
+++ b/reactos/include/reactos/idl/ms-dtyp.idl
@@ -17,9 +17,6 @@ typedef signed int INT32;
 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 LONG LONG_PTR;
 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;
diff --git a/reactos/include/reactos/idl/svcctl.idl b/reactos/include/reactos/idl/svcctl.idl
index 1ec61a2d8c2..e3acfa65c46 100644
--- a/reactos/include/reactos/idl/svcctl.idl
+++ b/reactos/include/reactos/idl/svcctl.idl
@@ -296,10 +296,7 @@ typedef struct _STRING_PTRSW {
 [
   uuid(367abb81-9844-35f1-ad32-98f038001003),
   version(2.0),
-  pointer_default(unique),
-  #ifndef __midl
-  ,explicit_handle
-  #endif
+  pointer_default(unique)
 ]
 interface svcctl
 {