Clean up warnings in ddk.
* include/ddk/atm.h (_ATM_AAL_OOB_INFO): Add _ANONYMOUS_UNION, conditional on __cplusplus. * include/ddk/scsi.h: Add _ANONYMOUS_UNION and _ANONYMOUS_STRUCT defines, throughout. (_CDB): Add _ANONYMOUS_UNION, conditional on __cplusplus. * include/ddk/cfg.h (_PNP_VETO_TYPE): Remove extra comma. * include/ddk/cfgmgr32.h: Change C++ comment style to ISO C. * include/ddk/ddkmapi.h (_DDLOCKOUT): Add _ANONYMOUS_UNION defines. * include/ddk/hidpi.h: Add _ANONYMOUS_UNION and _ANONYMOUS_STRUCT defines, throughout. * include/ddk/ndis.h: Add _ANONYMOUS_UNION and _ANONYMOUS_STRUCT defines, throughout. Remove trailing semicolon from *_S 'structure' macro expansion, throughout. Remove trailing semicolon from DECLARE_UNKNOWN_STRUCT macro expansion. * include/ddk/ndiswan.h (_NDIS_WAN_COMPRESS_INFO): Add _ANONYMOUS_UNION. * include/ddk/ntapi.h (_PROCESS_DEVICEMAP_INFORMATION, _PROCESS_SESSION_INFORMATION): Add _ANONYMOUS_UNION. * include/ddk/ntddcdrm.h (CDROM_TOC_CD_TEXT_DATA_BLOCK): Add _ANONYMOUS_UNION. * include/ddk/ntdddisk.h: Add _ANONYMOUS_UNION, throughout. * include/ddk/ntddmou.h: Add _ANONYMOUS_UNION, throughout. * include/ddk/ntifs.h: Add _ANONYMOUS_UNION, throughout. (ZwQueryObject): Change 2nd param to OBJECT_INFORMATION_CLASS, to match proto in ntapi.h. (ZwSetInformationObject): Likewise. * include/ddk/srb.h (SCSI_REQUEST_BLOCK): Add _ANONYMOUS_UNION. (SCSI_ADAPTER_CONTROL_TYPE): Add __extension__. * include/ddk/tdikrnl.h (TDI20_CLIENT_INTERFACE_INFO): Add _ANONYMOUS_UNION and _ANONYMOUS_STRUCT. * include/ddk/usb.h (USB): Add _ANONYMOUS_UNION. * include/ddk/usbcamdi.h (USBCAMD_CamControlFlags): Remove last comma. * include/ddk/video.h (STATUS_BLOCK): Add _ANONYMOUS_UNION. * include/ddk/winddk.h (DECLARE_INTERNAL_OBJECT): Remove trailing semicolon when expanding macro. (GENERAL_LOOKASIDE_S): Likewise. Add _ANONYMOUS_UNION and _ANONYMOUS_STRUCT, throughout. Change inline to __inline, throughout. * include/ddk/winnt4.h: Change inline to __inline, throughout.
This commit is contained in:
@ -701,30 +701,30 @@ typedef struct _DEVICE_MAP {
|
||||
#if (VER_PRODUCTBUILD >= 2600)
|
||||
|
||||
typedef struct _EX_FAST_REF {
|
||||
union {
|
||||
_ANONYMOUS_UNION union {
|
||||
PVOID Object;
|
||||
ULONG RefCnt : 3;
|
||||
ULONG Value;
|
||||
};
|
||||
} DUMMYUNIONNAME;
|
||||
} EX_FAST_REF, *PEX_FAST_REF;
|
||||
|
||||
typedef struct _EX_PUSH_LOCK {
|
||||
union {
|
||||
struct {
|
||||
_ANONYMOUS_UNION union {
|
||||
_ANONYMOUS_STRUCT struct {
|
||||
ULONG Waiting : 1;
|
||||
ULONG Exclusive : 1;
|
||||
ULONG Shared : 30;
|
||||
};
|
||||
} DUMMYSTRUCTNAME;
|
||||
ULONG Value;
|
||||
PVOID Ptr;
|
||||
};
|
||||
} DUMMYUNIONNAME;
|
||||
} EX_PUSH_LOCK, *PEX_PUSH_LOCK;
|
||||
|
||||
typedef struct _EX_RUNDOWN_REF {
|
||||
union {
|
||||
_ANONYMOUS_UNION union {
|
||||
ULONG Count;
|
||||
PVOID Ptr;
|
||||
};
|
||||
} DUMMYUNIONNAME;
|
||||
} EX_RUNDOWN_REF, *PEX_RUNDOWN_REF;
|
||||
|
||||
#endif
|
||||
@ -1115,14 +1115,14 @@ typedef struct _FILE_NAMES_INFORMATION {
|
||||
typedef struct _FILE_OBJECTID_INFORMATION {
|
||||
LONGLONG FileReference;
|
||||
UCHAR ObjectId[16];
|
||||
union {
|
||||
_ANONYMOUS_UNION union {
|
||||
struct {
|
||||
UCHAR BirthVolumeId[16];
|
||||
UCHAR BirthObjectId[16];
|
||||
UCHAR DomainId[16];
|
||||
} ;
|
||||
UCHAR ExtendedInfo[48];
|
||||
};
|
||||
} DUMMYUNIONNAME;
|
||||
} FILE_OBJECTID_INFORMATION, *PFILE_OBJECTID_INFORMATION;
|
||||
|
||||
typedef struct _FILE_OLE_CLASSID_INFORMATION {
|
||||
@ -1440,11 +1440,11 @@ typedef struct _PRIVATE_CACHE_MAP_FLAGS {
|
||||
} PRIVATE_CACHE_MAP_FLAGS, *PPRIVATE_CACHE_MAP_FLAGS;
|
||||
|
||||
typedef struct _PRIVATE_CACHE_MAP {
|
||||
union {
|
||||
_ANONYMOUS_UNION union {
|
||||
CSHORT NodeTypeCode;
|
||||
PRIVATE_CACHE_MAP_FLAGS Flags;
|
||||
ULONG UlongFlags;
|
||||
};
|
||||
} DUMMYUNIONNAME;
|
||||
ULONG ReadAheadMask;
|
||||
PFILE_OBJECT FileObject;
|
||||
LARGE_INTEGER FileOffset1;
|
||||
@ -4435,11 +4435,11 @@ NTSYSAPI
|
||||
NTSTATUS
|
||||
NTAPI
|
||||
ZwQueryObject (
|
||||
IN HANDLE ObjectHandle,
|
||||
IN OBJECT_INFO_CLASS ObjectInformationClass,
|
||||
OUT PVOID ObjectInformation,
|
||||
IN ULONG Length,
|
||||
OUT PULONG ResultLength
|
||||
IN HANDLE ObjectHandle,
|
||||
IN OBJECT_INFORMATION_CLASS ObjectInformationClass,
|
||||
OUT PVOID ObjectInformation,
|
||||
IN ULONG Length,
|
||||
OUT PULONG ResultLength
|
||||
);
|
||||
|
||||
NTSYSAPI
|
||||
@ -4564,10 +4564,10 @@ NTSYSAPI
|
||||
NTSTATUS
|
||||
NTAPI
|
||||
ZwSetInformationObject (
|
||||
IN HANDLE ObjectHandle,
|
||||
IN OBJECT_INFO_CLASS ObjectInformationClass,
|
||||
IN PVOID ObjectInformation,
|
||||
IN ULONG ObjectInformationLength
|
||||
IN HANDLE ObjectHandle,
|
||||
IN OBJECT_INFORMATION_CLASS ObjectInformationClass,
|
||||
IN PVOID ObjectInformation,
|
||||
IN ULONG ObjectInformationLength
|
||||
);
|
||||
|
||||
NTSYSAPI
|
||||
|
Reference in New Issue
Block a user