- Remove duplicate, often conflicting, type definitions from IDL (spotted by new widl).

svn path=/trunk/; revision=37379
This commit is contained in:
Aleksey Bragin 2008-11-15 19:32:13 +00:00
parent a1ba38503c
commit 0ba5018676
3 changed files with 2 additions and 22 deletions

View file

@ -10,13 +10,11 @@ typedef [context_handle] PVOID LSAPR_HANDLE;
typedef LSAPR_HANDLE *PLSAPR_HANDLE; typedef LSAPR_HANDLE *PLSAPR_HANDLE;
cpp_quote("#ifndef _WINNT_H") cpp_quote("#ifndef _WINNT_H")
typedef LARGE_INTEGER LUID; typedef LARGE_INTEGER LUID, *PLUID;
cpp_quote("#endif") cpp_quote("#endif")
cpp_quote("#ifndef _NTDEF_") cpp_quote("#ifndef _NTDEF_")
typedef long NTSTATUS; typedef long NTSTATUS;
typedef struct _STRING { typedef struct _STRING {
WORD Length; WORD Length;
WORD MaximumLength; WORD MaximumLength;
@ -75,8 +73,6 @@ typedef struct _LSAPR_OBJECT_ATTRIBUTES {
PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService; PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService;
} LSAPR_OBJECT_ATTRIBUTES, *PLSAPR_OBJECT_ATTRIBUTES; } LSAPR_OBJECT_ATTRIBUTES, *PLSAPR_OBJECT_ATTRIBUTES;
typedef unsigned long SECURITY_INFORMATION;
typedef struct _LSAPR_POLICY_PRIVILEGE_DEF { typedef struct _LSAPR_POLICY_PRIVILEGE_DEF {
RPC_UNICODE_STRING Name; RPC_UNICODE_STRING Name;
LUID LocalValue; LUID LocalValue;
@ -518,13 +514,6 @@ typedef
[case(TrustedDomainSupportedEncryptionTypes)] TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES TrustedDomainSETs; [case(TrustedDomainSupportedEncryptionTypes)] TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES TrustedDomainSETs;
} LSAPR_TRUSTED_DOMAIN_INFO, *PLSAPR_TRUSTED_DOMAIN_INFO; } 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 { typedef struct _LSAPR_LUID_AND_ATTRIBUTES {
LUID Luid; LUID Luid;
DWORD Attributes; DWORD Attributes;

View file

@ -17,9 +17,6 @@ typedef signed int INT32;
typedef signed __int64 INT64; typedef signed __int64 INT64;
typedef signed int LONG32; typedef signed int LONG32;
typedef signed __int64 LONG64; typedef signed __int64 LONG64;
cpp_quote("#if 0")
typedef long NTSTATUS;
cpp_quote("#endif")
typedef unsigned __int64 QWORD; typedef unsigned __int64 QWORD;
typedef short SHORT; typedef short SHORT;
typedef __int64 TIME; typedef __int64 TIME;
@ -50,9 +47,6 @@ typedef LONG LONG_PTR;
typedef ULONG ULONG_PTR; typedef ULONG ULONG_PTR;
#endif #endif
typedef ULONG_PTR SIZE_T; typedef ULONG_PTR SIZE_T;
cpp_quote("#if 0")
typedef UCHAR *STRING;
cpp_quote("#endif")
typedef DWORD NET_API_STATUS; typedef DWORD NET_API_STATUS;
typedef ULONG_PTR DWORD_PTR; typedef ULONG_PTR DWORD_PTR;
typedef ULONGLONG DWORDLONG, *PDWORDLONG; typedef ULONGLONG DWORDLONG, *PDWORDLONG;

View file

@ -296,10 +296,7 @@ typedef struct _STRING_PTRSW {
[ [
uuid(367abb81-9844-35f1-ad32-98f038001003), uuid(367abb81-9844-35f1-ad32-98f038001003),
version(2.0), version(2.0),
pointer_default(unique), pointer_default(unique)
#ifndef __midl
,explicit_handle
#endif
] ]
interface svcctl interface svcctl
{ {