mirrors/mingw-w64
1
0
Fork 0
mirror of https://git.code.sf.net/p/mingw-w64/mingw-w64 synced 2024-11-23 18:04:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do some adjustments about struct/union nameless extension markers.

Browse Source 
Necessary to ease synchronization with wine headers...


git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@4031 4407c894-4637-0410-b4f5-ada5f102cad1
This commit is contained in:
Kai Tietz 2011-02-11 13:14:13 +00:00
parent 2fd2030150
commit 9605cb4cd7
110 changed files with 602 additions and 756 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mingw-w64-headers/include/accctrl.h
View File

@ -348,7 +348,7 @@ extern "C" {
#define ACTRL_WIN_EXIT ACTRL_PERM_9
typedef struct _ACTRL_OVERLAPPED {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PVOID Provider;
ULONG Reserved1;
} DUMMYUNIONNAME;

4
mingw-w64-headers/include/adtgen.h
View File

@ -51,7 +51,7 @@ typedef struct _AUDIT_PARAM {
AUDIT_PARAM_TYPE Type;
ULONG Length;
DWORD Flags;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG_PTR Data0;
PWSTR String;
ULONG_PTR u;
@ -60,7 +60,7 @@ typedef struct _AUDIT_PARAM {
ULONG LogonId_LowPart;
AUDIT_OBJECT_TYPES *pObjectTypes;
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG_PTR Data1;
LONG LogonId_HighPart;
};

2
mingw-w64-headers/include/authif.h
View File

@ -42,7 +42,7 @@ typedef struct _RADIUS_ATTRIBUTE {
DWORD dwAttrType;
RADIUS_DATA_TYPE fDataType;
DWORD cbDataLength;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD dwValue;
PCSTR lpValue;
};

8
mingw-w64-headers/include/bdamedia.h
View File

@ -30,7 +30,7 @@ typedef struct _KSP_BDA_NODE_PIN {
typedef struct _KSM_BDA_PIN {
KSMETHOD Method;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG PinId;
ULONG PinType;
};
@ -39,11 +39,11 @@ typedef struct _KSM_BDA_PIN {
typedef struct _KSM_BDA_PIN_PAIR {
KSMETHOD Method;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG InputPinId;
ULONG InputPinType;
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG OutputPinId;
ULONG OutputPinType;
};
@ -358,7 +358,7 @@ typedef struct _ChannelChangeInfo {
typedef struct _ChannelInfo {
LONG lFrequency;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
LONG lONID;
LONG lTSID;

6
mingw-w64-headers/include/bluetoothapis.h
View File

@ -22,7 +22,7 @@ typedef LPVOID HBLUETOOTH_AUTHENTICATION_REGISTRATION;
typedef LPVOID HBLUETOOTH_CONTAINER_ELEMENT;
typedef struct _BLUETOOTH_ADDRESS {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
BTH_ADDR ullLong;
BYTE rgBytes[6];
};
@ -100,7 +100,7 @@ typedef struct _BLUETOOTH_AUTHENTICATION_CALLBACK_PARAMS {
BLUETOOTH_AUTHENTICATION_METHOD authenticationMethod;
BLUETOOTH_IO_CAPABILITY ioCapability;
BLUETOOTH_AUTHENTICATION_REQUIREMENTS authenticationRequirements;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG Numeric_Value;
ULONG Passkey;
} ;
@ -137,7 +137,7 @@ typedef struct _BLUETOOTH_PASSKEY_INFO {
typedef struct _BLUETOOTH_AUTHENTICATE_RESPONSE {
BLUETOOTH_ADDRESS bthAddressRemote;
BLUETOOTH_AUTHENTICATION_METHOD authMethod;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
BLUETOOTH_PIN_INFO pinInfo;
BLUETOOTH_OOB_DATA_INFO oobInfo;
BLUETOOTH_NUMERIC_COMPARISON_INFO numericCompInfo;

2
mingw-w64-headers/include/bthsdpdef.h
View File

@ -70,7 +70,7 @@ typedef struct _SDP_ULARGE_INTEGER_16 {
typedef struct _SPD_ELEMENT_DATA {
SDP_TYPE type;
SDP_SPECIFICTYPE specificType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
SDP_LARGE_INTEGER_16 int128;
LONGLONG int64;
LONG int32;

2
mingw-w64-headers/include/celib.h
View File

@ -89,7 +89,7 @@ enum ENUM_PERIOD {
};
typedef struct _LLFILETIME {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LONGLONG ll;
FILETIME ft;
};

14
mingw-w64-headers/include/clusapi.h
View File

@ -724,7 +724,7 @@ extern "C" {
typedef union CLUSPROP_SYNTAX {
DWORD dw;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
WORD wFormat;
WORD wType;
};
@ -823,16 +823,16 @@ extern "C" {
#ifndef __cplusplus
CLUSPROP_VALUE;
#endif
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
SECURITY_DESCRIPTOR_RELATIVE sd;
BYTE rgbSecurityDescriptor[1];
};
} CLUSPROP_SECURITY_DESCRIPTOR,*PCLUSPROP_SECURITY_DESCRIPTOR;
typedef struct CLUS_RESOURCE_CLASS_INFO {
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
__C89_NAMELESSUNION union {
DWORD dw;
CLUSTER_RESOURCE_CLASS rc;
};
@ -925,8 +925,8 @@ extern "C" {
typedef CLUSPROP_DWORD CLUSPROP_DISK_SIGNATURE,*PCLUSPROP_DISK_SIGNATURE;
typedef struct CLUS_SCSI_ADDRESS {
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
UCHAR PortNumber;
UCHAR PathId;
UCHAR TargetId;

2
mingw-w64-headers/include/cmnquery.h
View File

@ -103,7 +103,7 @@ typedef struct {
LPVOID pHandlerParameters;
CLSID clsidDefaultForm;
IPersistQuery *pPersistQuery;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
void *pFormParameters;
IPropertyBag *ppbFormParameters;
};

4
mingw-w64-headers/include/commctrl.h
View File

@ -3115,7 +3115,7 @@ extern "C" {
typedef struct tagTVINSERTSTRUCTA {
HTREEITEM hParent;
HTREEITEM hInsertAfter;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
TVITEMEXA itemex;
TV_ITEMA item;
} DUMMYUNIONNAME;
@ -3124,7 +3124,7 @@ extern "C" {
typedef struct tagTVINSERTSTRUCTW {
HTREEITEM hParent;
HTREEITEM hInsertAfter;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
TVITEMEXW itemex;
TV_ITEMW item;
} DUMMYUNIONNAME;

14
mingw-w64-headers/include/compstui.h
View File

@ -734,12 +734,12 @@ typedef struct _EXTPUSH {
WORD cbSize;
WORD Flags;
LPTSTR pTitle;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DLGPROC DlgProc;
FARPROC pfnCallBack;
} DUMMYUNIONNAME;
ULONG_PTR IconID;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
WORD DlgTemplateID;
HANDLE hDlgTemplate;
} DUMMYUNIONNAME2;
@ -772,11 +772,11 @@ typedef struct _OPTITEM {
DWORD Flags;
ULONG_PTR UserData;
LPTSTR pName;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LONG Sel;
LPTSTR pSel;
} DUMMYUNIONNAME;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PEXTCHKBOX pExtChkBox;
PEXTPUSH pExtPush;
} DUMMYUNIONNAME2;
@ -797,7 +797,7 @@ typedef struct _CPSUICBPARAM {
WORD cOptItem;
WORD Flags;
POPTITEM pCurItem;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LONG OldSel;
LPTSTR pOldSel;
} DUMMYUNIONNAME;
@ -817,7 +817,7 @@ typedef struct _DLGPAGE {
DLGPROC DlgProc;
LPTSTR pTabName;
ULONG_PTR IconID;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
WORD DlgTemplateID;
HANDLE hDlgTemplate;
} DUMMYUNIONNAME;
@ -912,7 +912,7 @@ typedef struct _PROPSHEETUI_INFO_HEADER {
LPTSTR pTitle;
HWND hWndParent;
HINSTANCE hInst;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
HICON hIcon;
ULONG_PTR IconID;
} DUMMYUNIONNAME;

14
mingw-w64-headers/include/cryptuiapi.h
View File

@ -80,7 +80,7 @@ extern "C" {
DWORD dwSize;
LPWSTR pwszSigningCertFileName;
DWORD dwPvkChoice;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PCCRYPTUI_WIZ_DIGITAL_SIGN_PVK_FILE_INFO pPvkFileInfo;
PCRYPT_KEY_PROV_INFO pPvkProvInfo;
};
@ -116,12 +116,12 @@ extern "C" {
typedef struct _CRYPTUI_WIZ_DIGITAL_SIGN_INFO {
DWORD dwSize;
DWORD dwSubjectChoice;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LPCWSTR pwszFileName;
PCCRYPTUI_WIZ_DIGITAL_SIGN_BLOB_INFO pSignBlobInfo;
};
DWORD dwSigningCertChoice;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PCCERT_CONTEXT pSigningCertContext;
PCCRYPTUI_WIZ_DIGITAL_SIGN_STORE_INFO pSigningCertStore;
PCCRYPTUI_WIZ_DIGITAL_SIGN_CERT_PVK_INFO pSigningCertPvkInfo;
@ -180,7 +180,7 @@ extern "C" {
PCCERT_CONTEXT pCertContext;
LPCSTR *rgszPurposes;
DWORD cPurposes;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
CRYPT_PROVIDER_DATA const *pCryptProviderData;
HANDLE hWVTStateData;
};
@ -206,7 +206,7 @@ extern "C" {
PCCERT_CONTEXT pCertContext;
LPCSTR *rgszPurposes;
DWORD cPurposes;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
CRYPT_PROVIDER_DATA const *pCryptProviderData;
HANDLE hWVTStateData;
};
@ -243,7 +243,7 @@ extern "C" {
DWORD dwSize;
LPCWSTR pwszExportFileName;
DWORD dwSubjectChoice;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PCCERT_CONTEXT pCertContext;
PCCTL_CONTEXT pCTLContext;
PCCRL_CONTEXT pCRLContext;
@ -283,7 +283,7 @@ extern "C" {
typedef struct _CRYPTUI_WIZ_IMPORT_SUBJECT_INFO {
DWORD dwSize;
DWORD dwSubjectChoice;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LPCWSTR pwszFileName;
PCCERT_CONTEXT pCertContext;
PCCTL_CONTEXT pCTLContext;

6
mingw-w64-headers/include/cryptxml.h
View File

@ -257,7 +257,7 @@ typedef struct _CRYPT_XML_ISSUER_SERIAL {
typedef struct _CRYPT_XML_X509DATA_ITEM {
DWORD dwType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
CRYPT_XML_ISSUER_SERIAL IssuerSerial;
CRYPT_XML_DATA_BLOB SKI;
LPCWSTR wszSubjectName;
@ -281,7 +281,7 @@ typedef struct _CRYPT_XML_X509DATA {
typedef struct _CRYPT_XML_KEY_INFO_ITEM {
DWORD dwType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LPCWSTR wszKeyName;
CRYPT_XML_KEY_VALUE KeyValue;
CRYPT_XML_BLOB RetrievalMethod;
@ -320,7 +320,7 @@ typedef struct _CRYPT_XML_KEY_ECDSA_KEY_VALUE {
typedef struct _CRYPT_XML_KEY_VALUE {
DWORD dwType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
CRYPT_XML_KEY_DSA_KEY_VALUE DSAKeyValue;
CRYPT_XML_KEY_RSA_KEY_VALUE RSAKeyValue;
CRYPT_XML_KEY_ECDSA_KEY_VALUE ECDSAKeyValue;

4
mingw-w64-headers/include/dbgeng.h
View File

@ -664,11 +664,11 @@ extern "C" {
#define DEBUG_VALUE_TYPES 12
typedef struct _DEBUG_VALUE {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
UCHAR I8;
USHORT I16;
ULONG I32;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG64 I64;
WINBOOL Nat;
};

2
mingw-w64-headers/include/delayimp.h
View File

@ -39,7 +39,7 @@ enum {
typedef struct DelayLoadProc {
WINBOOL fImportByName;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LPCSTR szProcName;
DWORD dwOrdinal;
};

2
mingw-w64-headers/include/dimm.h
View File

@ -95,7 +95,7 @@ extern "C"{
POINT ptSoftKbdPos;
DWORD fdwConversion;
DWORD fdwSentence;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LOGFONTA A;
LOGFONTW W;
} lfFont;

16
mingw-w64-headers/include/dxva2api.h
View File

@ -181,8 +181,8 @@ typedef struct _DXVA2_DecodeExecuteParams {
} DXVA2_DecodeExecuteParams;
typedef struct {
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
UINT SampleFormat :8;
UINT VideoChromaSubsampling :4;
UINT NominalRange :3;
@ -196,8 +196,8 @@ typedef struct {
} DXVA2_ExtendedFormat;
typedef struct _DXVA2_Fixed32 {
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
USHORT Fraction;
SHORT Value;
} DUMMYSTRUCTNAME;
@ -342,8 +342,8 @@ typedef struct _DXVA2_VideoSample {
/* DXVA H264 */
typedef struct {
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
UCHAR Index7Bits : 7;
UCHAR AssociatedFlag : 1;
};
@ -440,8 +440,8 @@ typedef struct {
USHORT wFrameHeightInMbsMinus1;
DXVA_PicEntry_H264 CurrPic;
UCHAR num_ref_frames;
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
USHORT field_pic_flag : 1;
USHORT MbaffFrameFlag : 1;
USHORT residual_colour_transform_flag : 1;

32
mingw-w64-headers/include/esent.h
View File

@ -539,9 +539,9 @@ typedef struct _JET_BKLOGTIME {
char bMonth;
char bYear;
char bFiller1;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
char bFiller2;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
unsigned char fOSSnapshot :1;
unsigned char fReserved :7;
};
@ -569,7 +569,7 @@ typedef struct tagJET_TUPLELIMITS {
typedef struct _JET_BKINFO {
JET_LGPOS lgposMark;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
JET_LOGTIME logtimeMark;
JET_BKLOGTIME bklogtimeMark;
};
@ -683,9 +683,9 @@ typedef struct tagJET_CONDITIONALCOLUMN_W {
typedef struct tagCONVERT_A {
char* SzOldDll;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
unsigned long fFlags;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
unsigned long fSchemaChangesOnly :1;
};
};
@ -693,9 +693,9 @@ typedef struct tagCONVERT_A {
typedef struct tagCONVERT_W {
WCHAR* SzOldDll;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
unsigned long fFlags;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
unsigned long fSchemaChangesOnly :1;
};
};
@ -740,9 +740,9 @@ typedef struct _JET_DBINFOUPGRADE {
unsigned long cbFreeSpaceRequiredLow;
unsigned long cbFreeSpaceRequiredHigh;
unsigned long csecToUpgrade;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
unsigned long ulFlags;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
unsigned long fUpgradable :1;
unsigned long fAlreadyUpgraded :1;
};
@ -759,12 +759,12 @@ typedef struct _JET_ENUMCOLUMNVALUE {
typedef struct _JET_ENUMCOLUMN {
JET_COLUMNID columnid;
JET_ERR err;
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
unsigned long cEnumColumnValue;
JET_ENUMCOLUMNVALUE rgEnumColumnValue;
};
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
unsigned long cbData;
void* pvData;
};
@ -784,11 +784,11 @@ typedef struct tagJET_INDEXCREATE_A {
unsigned long cbKey;
JET_GRBIT grbit;
unsigned long ulDensity;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
unsigned long lcid;
JET_UNICODEINDEX* pidxunicode;
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
unsigned long cbVarSegMac;
JET_TUPLELIMITS* ptuplelimits;
};
@ -805,11 +805,11 @@ typedef struct tagJET_INDEXCREATE_W {
unsigned long cbKey;
JET_GRBIT grbit;
unsigned long ulDensity;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
unsigned long lcid;
JET_UNICODEINDEX* pidxunicode;
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
unsigned long cbVarSegMac;
JET_TUPLELIMITS* ptuplelimits;
};

2
mingw-w64-headers/include/evcoll.h
View File

@ -93,7 +93,7 @@ typedef enum _EC_SUBSCRIPTION_RUNTIME_STATUS_INFO_ID {
} EC_SUBSCRIPTION_RUNTIME_STATUS_INFO_ID;
typedef struct _EC_VARIANT {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
BOOL BooleanVal;
UINT32 UInt32Val;
ULONGLONG DateTimeVal;

6
mingw-w64-headers/include/evntcons.h
View File

@ -39,7 +39,7 @@ typedef struct _EVENT_EXTENDED_ITEM_RELATED_ACTIVITYID {
typedef struct _EVENT_HEADER_EXTENDED_DATA_ITEM {
USHORT Reserved1;
USHORT ExtType;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
USHORT Linkage : 1;
USHORT Reserved2 :15;
} DUMMYSTRUCTNAME;
@ -57,8 +57,8 @@ typedef struct _EVENT_HEADER {
LARGE_INTEGER TimeStamp;
GUID ProviderId;
EVENT_DESCRIPTOR EventDescriptor;
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
ULONG KernelTime;
ULONG UserTime;
} DUMMYSTRUCTNAME;

54
mingw-w64-headers/include/evntrace.h
View File

@ -286,14 +286,14 @@ typedef ULONG64 TRACEHANDLE,*PTRACEHANDLE;
typedef struct _EVENT_TRACE_HEADER {
USHORT Size;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
USHORT FieldTypeFlags;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
UCHAR HeaderType;
UCHAR MarkerFlags;
} DUMMYSTRUCTNAME;
} DUMMYUNIONNAME;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG Version;
struct {
UCHAR Type;
@ -304,17 +304,17 @@ typedef struct _EVENT_TRACE_HEADER {
ULONG ThreadId;
ULONG ProcessId;
LARGE_INTEGER TimeStamp;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
GUID Guid;
ULONGLONG GuidPtr;
} DUMMYUNIONNAME3;
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
ULONG KernelTime;
ULONG UserTime;
} DUMMYSTRUCTNAME;
ULONG64 ProcessorTime;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG ClientContext;
ULONG Flags;
} DUMMYSTRUCTNAME2;
@ -323,14 +323,14 @@ typedef struct _EVENT_TRACE_HEADER {
typedef struct _EVENT_INSTANCE_HEADER {
USHORT Size;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
USHORT FieldTypeFlags;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
UCHAR HeaderType;
UCHAR MarkerFlags;
} DUMMYSTRUCTNAME;
} DUMMYUNIONNAME;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG Version;
struct {
UCHAR Type;
@ -344,13 +344,13 @@ typedef struct _EVENT_INSTANCE_HEADER {
ULONGLONG RegHandle;
ULONG InstanceId;
ULONG ParentInstanceId;
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
ULONG KernelTime;
ULONG UserTime;
} DUMMYSTRUCTNAME;
ULONG64 ProcessorTime;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG EventId;
ULONG Flags;
} DUMMYSTRUCTNAME2;
@ -373,7 +373,7 @@ typedef struct _MOF_FIELD {
typedef struct _TRACE_LOGFILE_HEADER {
ULONG BufferSize;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG Version;
struct {
UCHAR MajorVersion;
@ -389,9 +389,9 @@ typedef struct _TRACE_LOGFILE_HEADER {
ULONG MaximumFileSize;
ULONG LogFileMode;
ULONG BuffersWritten;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
GUID LogInstanceGuid;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG StartBuffers;
ULONG PointerSize;
ULONG EventsLost;
@ -416,7 +416,7 @@ typedef struct _TRACE_LOGFILE_HEADER {
typedef struct _TRACE_LOGFILE_HEADER32 {
ULONG BufferSize;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG Version;
struct {
UCHAR MajorVersion;
@ -432,9 +432,9 @@ typedef struct _TRACE_LOGFILE_HEADER32 {
ULONG MaximumFileSize;
ULONG LogFileMode;
ULONG BuffersWritten;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
GUID LogInstanceGuid;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG StartBuffers;
ULONG PointerSize;
ULONG EventsLost;
@ -459,7 +459,7 @@ typedef struct _TRACE_LOGFILE_HEADER32 {
typedef struct _TRACE_LOGFILE_HEADER64 {
ULONG BufferSize;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG Version;
struct {
UCHAR MajorVersion;
@ -475,9 +475,9 @@ typedef struct _TRACE_LOGFILE_HEADER64 {
ULONG MaximumFileSize;
ULONG LogFileMode;
ULONG BuffersWritten;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
GUID LogInstanceGuid;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG StartBuffers;
ULONG PointerSize;
ULONG EventsLost;
@ -583,7 +583,7 @@ typedef struct _EVENT_TRACE {
GUID ParentGuid;
PVOID MofData;
ULONG MofLength;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG ClientContext;
ETW_BUFFER_CONTEXT BufferContext; /* MSDN says ULONG, for XP and older? */
} DUMMYUNIONNAME;
@ -612,7 +612,7 @@ struct _EVENT_TRACE_LOGFILEW {
LPWSTR LoggerName;
LONGLONG CurrentTime;
ULONG BuffersRead;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG LogFileMode;
ULONG ProcessTraceMode;
} DUMMYUNIONNAME;
@ -622,7 +622,7 @@ struct _EVENT_TRACE_LOGFILEW {
ULONG BufferSize;
ULONG Filled;
ULONG EventsLost;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PEVENT_CALLBACK EventCallback;
PEVENT_RECORD_CALLBACK EventRecordCallback;
} DUMMYUNIONNAME2;
@ -635,7 +635,7 @@ struct _EVENT_TRACE_LOGFILEA {
LPSTR LoggerName;
LONGLONG CurrentTime;
ULONG BuffersRead;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG LogFileMode;
ULONG ProcessTraceMode;
} DUMMYUNIONNAME;
@ -645,7 +645,7 @@ struct _EVENT_TRACE_LOGFILEA {
ULONG BufferSize;
ULONG Filled;
ULONG EventsLost;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PEVENT_CALLBACK EventCallback;
PEVENT_RECORD_CALLBACK EventRecordCallback;
} DUMMYUNIONNAME2;

2
mingw-w64-headers/include/fdi.h
View File

@ -166,7 +166,7 @@ extern "C" {
typedef struct {
FDIDECRYPTTYPE fdidt;
void *pvUser;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
void *pHeaderReserve;
USHORT cbHeaderReserve;

20
mingw-w64-headers/include/fwpmtypes.h
View File

@ -42,7 +42,7 @@ typedef enum FWPM_NET_EVENT_TYPE_ {
typedef struct FWPM_ACTION0_ {
FWP_ACTION_TYPE type;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
GUID filterType;
GUID calloutKey;
};
@ -174,7 +174,7 @@ typedef struct FWPM_FILTER0_ {
UINT32 numFilterConditions;
FWPM_FILTER_CONDITION0 *filterCondition;
FWPM_ACTION0 action;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
UINT64 rawContext;
GUID providerContextKey;
};
@ -214,11 +214,11 @@ typedef struct FWPM_NET_EVENT_HEADER0_ {
UINT32 flags;
FWP_IP_VERSION ipVersion;
UINT8 ipProtocol;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
UINT32 localAddrV4;
FWP_BYTE_ARRAY16 localAddrV6;
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
UINT32 remoteAddrV4;
FWP_BYTE_ARRAY16 remoteAddrV6;
};
@ -263,10 +263,10 @@ typedef struct FWPM_NET_EVENT_IKEEXT_QM_FAILURE0 {
IKEEXT_QM_SA_STATE qmState;
IKEEXT_SA_ROLE saRole;
IPSEC_TRAFFIC_TYPE saTrafficType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
FWP_CONDITION_VALUE0 localSubNet;
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
FWP_CONDITION_VALUE0 remoteSubNet;
};
UINT64 qmFilterId;
@ -284,11 +284,11 @@ typedef struct FWPM_NET_EVENT_IPSEC_KERNEL_DROP0_ {
typedef struct FWPM_NET_EVENT_IPSEC_DOSP_DROP0_ {
FWP_IP_VERSION ipVersion;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
UINT32 publicHostV4Addr;
UINT8 publicHostV6Addr[16];
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
UINT32 internalHostV4Addr;
UINT8 internalHostV6Addr[16];
};
@ -299,7 +299,7 @@ typedef struct FWPM_NET_EVENT_IPSEC_DOSP_DROP0_ {
typedef struct FWPM_NET_EVENT0_ {
FWPM_NET_EVENT_HEADER0 header;
FWPM_NET_EVENT_TYPE type;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
FWPM_NET_EVENT_IKEEXT_MM_FAILURE0 *ikeMmFailure;
FWPM_NET_EVENT_IKEEXT_QM_FAILURE0 *ikeQmFailure;
FWPM_NET_EVENT_IKEEXT_EM_FAILURE0 *ikeEmFailure;
@ -333,7 +333,7 @@ typedef struct FWPM_PROVIDER_CONTEXT0_ {
GUID *providerKey;
FWP_BYTE_BLOB providerData;
FWPM_PROVIDER_CONTEXT_TYPE type;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
IPSEC_KEYING_POLICY0 *keyingPolicy;
IPSEC_TRANSPORT_POLICY0 *ikeQmTransportPolicy;
IPSEC_TUNNEL_POLICY0 *ikeQmTunnelPolicy;

4
mingw-w64-headers/include/fwptypes.h
View File

@ -123,7 +123,7 @@ typedef struct _FWP_TOKEN_INFORMATION {
typedef struct FWP_VALUE0_ {
FWP_DATA_TYPE type;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LPVOID EMPTY; // case(FWP_EMPTY)
UINT8 uint8;
UINT16 uint16;
@ -153,7 +153,7 @@ typedef struct FWP_RANGE0_ {
typedef struct FWP_CONDITION_VALUE0_ {
FWP_DATA_TYPE type;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
UINT8 uint8;
UINT16 uint16;
UINT32 uint32;

2
mingw-w64-headers/include/http.h
View File

@ -101,7 +101,7 @@ extern "C" {
typedef struct _HTTP_DATA_CHUNK {
HTTP_DATA_CHUNK_TYPE DataChunkType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
PVOID pBuffer;
ULONG BufferLength;

2
mingw-w64-headers/include/iads.h
View File

@ -742,7 +742,7 @@ extern "C"{
typedef struct _adsvalue {
ADSTYPE dwType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ADS_DN_STRING DNString;
ADS_CASE_EXACT_STRING CaseExactString;
ADS_CASE_IGNORE_STRING CaseIgnoreString;

2
mingw-w64-headers/include/ifdef.h
View File

@ -86,7 +86,7 @@ typedef enum _TUNNEL_TYPE {
#include <pshpack1.h>
typedef union _NET_LUID {
ULONG64 Value;
__MINGW_EXTENSION struct { /* bitfield with 64 bit types. */
__C89_NAMELESSSTRUCT struct { /* bitfield with 64 bit types. */
ULONG64 Reserved :24;
ULONG64 NetLuidIndex :24;
ULONG64 IfType :16;

18
mingw-w64-headers/include/iketypes.h
View File

@ -159,8 +159,8 @@ typedef struct IKEEXT_PRESHARED_KEY_AUTHENTICATION0__ {
typedef struct IKEEXT_CERTIFICATE_AUTHENTICATION0_ {
IKEEXT_CERT_CONFIG_TYPE inboundConfigType;
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
UINT32 inboundRootArraySize;
IKEEXT_CERT_ROOT_CONFIG0 *inboundRootArray;
};
@ -168,8 +168,8 @@ typedef struct IKEEXT_CERTIFICATE_AUTHENTICATION0_ {
IKEEXT_CERT_ROOT_CONFIG0 *inboundTrustedRootStoreConfig;
};
IKEEXT_CERT_CONFIG_TYPE outboundConfigType;
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
UINT32 outboundRootArraySize;
IKEEXT_CERT_ROOT_CONFIG0 *outboundRootArray;
};
@ -181,7 +181,7 @@ typedef struct IKEEXT_CERTIFICATE_AUTHENTICATION0_ {
typedef struct IKEEXT_AUTHENTICATION_METHOD0_ {
IKEEXT_AUTHENTICATION_METHOD_TYPE authenticationMethodType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
IKEEXT_PRESHARED_KEY_AUTHENTICATION0 presharedKeyAuthentication;
IKEEXT_CERTIFICATE_AUTHENTICATION0 certificateAuthentication;
IKEEXT_KERBEROS_AUTHENTICATION0 kerberosAuthentication;
@ -264,7 +264,7 @@ typedef struct IKEEXT_NAME_CREDENTIAL0_ {
typedef struct IKEEXT_CREDENTIAL0_ {
IKEEXT_AUTHENTICATION_METHOD_TYPE authenticationMethodType;
IKEEXT_AUTHENTICATION_IMPERSONATION_TYPE impersonationType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
IKEEXT_PRESHARED_KEY_AUTHENTICATION0 *presharedKey;
IKEEXT_CERTIFICATE_CREDENTIAL0 *certificate;
IKEEXT_NAME_CREDENTIAL0 *name;
@ -315,11 +315,11 @@ typedef struct IKEEXT_KEYMODULE_STATISTICS0_ {
typedef struct IKEEXT_TRAFFIC0_ {
FWP_IP_VERSION ipVersion;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
UINT32 localV4Address;
UINT8 localV6Address[16];
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
UINT32 remoteV4Address;
UINT8 remoteV6Address[16];
};
@ -330,7 +330,7 @@ typedef struct IKEEXT_SA_DETAILS0_ {
UINT64 saId;
IKEEXT_KEY_MODULE_TYPE keyModuleType;
FWP_IP_VERSION ipVersion;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
IPSEC_V4_UDP_ENCAPSULATION0 *v4UdpEncapsulation;
};
IKEEXT_TRAFFIC0 ikeTraffic;

2
mingw-w64-headers/include/iphlpapi.h
View File

@ -138,7 +138,7 @@ typedef enum _NET_ADDRESS_FORMAT {
typedef struct _NET_ADDRESS_INFO {
NET_ADDRESS_FORMAT Format;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
WCHAR Address[DNS_MAX_NAME_BUFFER_LENGTH];
WCHAR Port[6];

2
mingw-w64-headers/include/ipmsp.h
View File

@ -206,7 +206,7 @@ extern "C"{
typedef struct tagTAPI_STREAM_CONFIG_CAPS {
StreamConfigCapsType CapsType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
TAPI_VIDEO_STREAM_CONFIG_CAPS VideoCap;
TAPI_AUDIO_STREAM_CONFIG_CAPS AudioCap;
};

12
mingw-w64-headers/include/iprtrmib.h
View File

@ -181,8 +181,8 @@ typedef struct _MIB_UDPROW_OWNER_MODULE {
DWORD dwLocalPort;
DWORD dwOwningPid;
LARGE_INTEGER liCreateTimestamp;
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
DWORD SpecificPortBind : 1;
};
DWORD dwFlags;
@ -203,8 +203,8 @@ typedef struct _MIB_UDP6ROW_OWNER_MODULE {
DWORD dwLocalPort;
DWORD dwOwningPid;
LARGE_INTEGER liCreateTimestamp;
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
DWORD SpecificPortBind : 1;
};
DWORD dwFlags;
@ -690,7 +690,7 @@ typedef struct _MIB_IPDESTROW {
#ifdef __cplusplus
MIB_IPFORWARDROW ForwardRow;
#else
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD dwForwardDest;
DWORD dwForwardMask;
DWORD dwForwardPolicy;
@ -741,7 +741,7 @@ typedef struct _MIB_ROUTESTATE {
typedef struct _MIB_OPAQUE_INFO {
DWORD dwId;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONGLONG ullAlign;
BYTE rgbyData[1];
};

6
mingw-w64-headers/include/ipsectypes.h
View File

@ -147,7 +147,7 @@ typedef struct IPSEC_CIPHER_TRANSFORM0_ {
typedef struct IPSEC_SA_TRANSFORM0_ {
IPSEC_TRANSFORM_TYPE ipsecTransformType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
IPSEC_AUTH_TRANSFORM0 *ahTransform;
IPSEC_AUTH_TRANSFORM0 *espAuthTransform;
IPSEC_CIPHER_TRANSFORM0 *espCipherTransform;
@ -177,11 +177,11 @@ typedef struct IPSEC_TUNNEL_POLICY0_ {
typedef struct IPSEC_TUNNEL_ENDPOINTS0_ {
FWP_IP_VERSION ipVersion;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
UINT32 localV4Address;
UINT8 localV6Address[16];
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
UINT32 remoteV4Address;
UINT8 remoteV6Address[16];
};

44
mingw-w64-headers/include/iptypes.h
View File

@ -68,9 +68,9 @@ extern "C" {
typedef NL_DAD_STATE IP_DAD_STATE;
typedef struct _IP_ADAPTER_UNICAST_ADDRESS_XP {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONGLONG Alignment;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG Length;
DWORD Flags;
};
@ -86,9 +86,9 @@ extern "C" {
} IP_ADAPTER_UNICAST_ADDRESS_XP,*PIP_ADAPTER_UNICAST_ADDRESS_XP;
typedef struct _IP_ADAPTER_UNICAST_ADDRESS_LH {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONGLONG Alignment;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG Length;
DWORD Flags;
};
@ -113,9 +113,9 @@ extern "C" {
#endif
typedef struct _IP_ADAPTER_ANYCAST_ADDRESS_XP {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONGLONG Alignment;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG Length;
DWORD Flags;
};
@ -127,9 +127,9 @@ extern "C" {
typedef IP_ADAPTER_ANYCAST_ADDRESS_XP *PIP_ADAPTER_ANYCAST_ADDRESS;
typedef struct _IP_ADAPTER_MULTICAST_ADDRESS_XP {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONGLONG Alignment;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG Length;
DWORD Flags;
};
@ -145,9 +145,9 @@ extern "C" {
#define IP_ADAPTER_ADDRESS_PRIMARY 0x04
typedef struct _IP_ADAPTER_DNS_SERVER_ADDRESS_XP {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONGLONG Alignment;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG Length;
DWORD Reserved;
};
@ -159,9 +159,9 @@ extern "C" {
typedef IP_ADAPTER_DNS_SERVER_ADDRESS_XP *PIP_ADAPTER_DNS_SERVER_ADDRESS;
typedef struct _IP_ADAPTER_PREFIX_XP {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONGLONG Alignment;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG Length;
DWORD Flags;
};
@ -174,9 +174,9 @@ extern "C" {
typedef IP_ADAPTER_PREFIX_XP *PIP_ADAPTER_PREFIX;
typedef struct _IP_ADAPTER_WINS_SERVER_ADDRESS_LH {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONGLONG Alignment;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG Length;
DWORD Reserved;
};
@ -190,9 +190,9 @@ extern "C" {
#endif
typedef struct _IP_ADAPTER_GATEWAY_ADDRESS_LH {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONGLONG Alignment;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG Length;
DWORD Reserved;
};
@ -222,9 +222,9 @@ extern "C" {
#define IP_ADAPTER_IPV6_MANAGE_ADDRESS_CONFIG 0x200
typedef struct _IP_ADAPTER_ADDRESSES_LH {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONGLONG Alignment;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG Length;
IF_INDEX IfIndex;
};
@ -240,9 +240,9 @@ extern "C" {
PWCHAR FriendlyName;
BYTE PhysicalAddress[MAX_ADAPTER_ADDRESS_LENGTH];
ULONG PhysicalAddressLength;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG Flags;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG DdnsEnabled : 1;
ULONG RegisterAdapterSuffix : 1;
ULONG Dhcpv4Enabled : 1;
@ -285,9 +285,9 @@ extern "C" {
} IP_ADAPTER_ADDRESSES_LH;
typedef struct _IP_ADAPTER_ADDRESSES_XP {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONGLONG Alignment;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG Length;
DWORD IfIndex;
};

4
mingw-w64-headers/include/ipxrtdef.h
View File

@ -63,7 +63,7 @@ typedef struct _IPXWAN_IF_INFO {
} IPXWAN_IF_INFO,*PIPXWAN_IF_INFO;
typedef struct _IPX_STATIC_ROUTE_INFO {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG DwordAlign;
UCHAR Network[4];
};
@ -75,7 +75,7 @@ typedef struct _IPX_STATIC_ROUTE_INFO {
typedef IPX_SERVER_ENTRY IPX_STATIC_SERVICE_INFO,*PIPX_STATIC_SERVICE_INFO;
typedef struct _IPX_STATIC_NETBIOS_NAME_INFO {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG DwordAlign;
UCHAR Name[16];
};

2
mingw-w64-headers/include/ipxsap.h
View File

@ -24,7 +24,7 @@ typedef struct _SAP_IF_INFO {
} SAP_IF_INFO,*PSAP_IF_INFO;
typedef struct _SAP_SERVICE_FILTER_INFO {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
USHORT ServiceType;
ULONG ServiceType_align;
};

2
mingw-w64-headers/include/iscsidsc.h
View File

@ -203,7 +203,7 @@ typedef struct _IKE_AUTHENTICATION_PRESHARED_KEY {
typedef struct _IKE_AUTHENTICATION_INFORMATION {
IKE_AUTHENTICATION_METHOD AuthMethod;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
IKE_AUTHENTICATION_PRESHARED_KEY PsKey;
};
} IKE_AUTHENTICATION_INFORMATION, *PIKE_AUTHENTICATION_INFORMATION;

32
mingw-w64-headers/include/ks.h
View File

@ -13,7 +13,7 @@
#ifdef _KS_NO_ANONYMOUS_STRUCTURES_
#define _KS_ANON_STRUCT(X) struct X
#else
#define _KS_ANON_STRUCT(X) __MINGW_EXTENSION struct
#define _KS_ANON_STRUCT(X) __C89_NAMELESSSTRUCT struct
#endif
#ifndef _NTRTL_
@ -69,7 +69,7 @@ typedef struct {
} KSPRIORITY,*PKSPRIORITY;
typedef struct {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
_KS_ANON_STRUCT(_IDENTIFIER)
{
GUID Set;
@ -226,7 +226,7 @@ typedef PVOID PKSWORKER;
typedef struct {
ULONG NotificationType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
HANDLE Event;
ULONG_PTR Reserved[2];
@ -298,7 +298,7 @@ typedef struct {
typedef struct {
ULONG Size;
ULONG Flags;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
HANDLE ObjectHandle;
PVOID ObjectPointer;
};
@ -783,7 +783,7 @@ typedef enum {
#define KSDATARANGE_REQUIRED_ATTRIBUTES (1 << KSDATARANGE_BIT_REQUIRED_ATTRIBUTES)
typedef union {
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG FormatSize;
ULONG Flags;
ULONG SampleSize;
@ -1061,9 +1061,9 @@ typedef struct {
KSPIN_COMMUNICATION Communication;
const GUID *Category;
const GUID *Name;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LONGLONG Reserved;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG ConstrainedDataRangesCount;
PKSDATARANGE *ConstrainedDataRanges;
};
@ -1258,7 +1258,7 @@ typedef enum {
#define KSALLOCATOR_FLAG_ATTENTION_STEPPING 0x00002000
typedef struct {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG OptionsFlags;
ULONG RequirementsFlags;
};
@ -1966,13 +1966,13 @@ typedef struct {
typedef struct {
ULONG PropertyId;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PFNKSHANDLER GetPropertyHandler;
BOOLEAN GetSupported;
};
ULONG MinProperty;
ULONG MinData;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PFNKSHANDLER SetPropertyHandler;
BOOLEAN SetSupported;
};
@ -1991,11 +1991,11 @@ typedef struct {
typedef struct {
ULONG PropertyId;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PFNKSFASTHANDLER GetPropertyHandler;
BOOLEAN GetSupported;
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PFNKSFASTHANDLER SetPropertyHandler;
BOOLEAN SetSupported;
};
@ -2032,7 +2032,7 @@ typedef struct {
typedef struct {
ULONG MethodId;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PFNKSHANDLER MethodHandler;
BOOLEAN MethodSupported;
};
@ -2049,7 +2049,7 @@ typedef struct {
typedef struct {
ULONG MethodId;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PFNKSFASTHANDLER MethodHandler;
BOOLEAN MethodSupported;
};
@ -2130,7 +2130,7 @@ typedef struct {
struct _KSEVENT_ENTRY {
LIST_ENTRY ListEntry;
PVOID Object;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PKSDPC_ITEM DpcItem;
PKSBUFFER_ITEM BufferItem;
};
@ -2850,7 +2850,7 @@ struct _KSMAPPING {
struct _KSSTREAM_POINTER_OFFSET
{
#if defined(_NTDDK_)
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PUCHAR Data;
PKSMAPPING Mappings;
};

18
mingw-w64-headers/include/ksmedia.h
View File

@ -717,15 +717,15 @@ typedef struct {
} KSAUDIO_POSITION,*PKSAUDIO_POSITION;
typedef struct _DS3DVECTOR {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
FLOAT x;
FLOAT dvX;
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
FLOAT y;
FLOAT dvY;
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
FLOAT z;
FLOAT dvZ;
};
@ -2474,7 +2474,7 @@ typedef struct tagKS_VIDEOINFO {
DWORD dwBitErrorRate;
REFERENCE_TIME AvgTimePerFrame;
KS_BITMAPINFOHEADER bmiHeader;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
KS_RGBQUAD bmiColors[KS_iPALETTE_COLORS];
DWORD dwBitMasks[KS_iMASK_COLORS];
KS_TRUECOLORINFO TrueColorInfo;
@ -4156,29 +4156,29 @@ typedef struct _DDPIXELFORMAT
DWORD dwSize;
DWORD dwFlags;
DWORD dwFourCC;
__MINGW_EXTENSION union
__C89_NAMELESSUNION union
{
DWORD dwRGBBitCount;
DWORD dwYUVBitCount;
DWORD dwZBufferBitDepth;
DWORD dwAlphaBitDepth;
};
__MINGW_EXTENSION union
__C89_NAMELESSUNION union
{
DWORD dwRBitMask;
DWORD dwYBitMask;
};
__MINGW_EXTENSION union
__C89_NAMELESSUNION union
{
DWORD dwGBitMask;
DWORD dwUBitMask;
};
__MINGW_EXTENSION union
__C89_NAMELESSUNION union
{
DWORD dwBBitMask;
DWORD dwVBitMask;
};
__MINGW_EXTENSION union
__C89_NAMELESSUNION union
{
DWORD dwRGBAlphaBitMask;
DWORD dwYUVAlphaBitMask;

2
mingw-w64-headers/include/mapiutil.h
View File

@ -148,7 +148,7 @@ extern "C" {
typedef struct {
ULONG cctl;
LPTSTR lpszResourceName;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LPTSTR lpszComponent;
ULONG ulItemID;
};

10
mingw-w64-headers/include/mmc.h
View File

@ -1971,7 +1971,7 @@ extern "C" {
typedef struct _MMC_TASK_DISPLAY_OBJECT {
MMC_TASK_DISPLAY_TYPE eDisplayType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
MMC_TASK_DISPLAY_BITMAP uBitmap;
MMC_TASK_DISPLAY_SYMBOL uSymbol;
};
@ -1986,7 +1986,7 @@ extern "C" {
LPOLESTR szText;
LPOLESTR szHelpString;
MMC_ACTION_TYPE eActionType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LONG_PTR nCommandID;
LPOLESTR szActionURL;
LPOLESTR szScript;
@ -2506,13 +2506,13 @@ extern "C" {
LPOLESTR pstrPersistableViewDescription;
MMC_VIEW_TYPE eViewType;
DWORD dwMiscOptions;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD dwListOptions;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
DWORD dwHTMLOptions;
LPOLESTR pstrURL;
};
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
DWORD dwOCXOptions;
LPUNKNOWN pUnkControl;
};

14
mingw-w64-headers/include/mmsystem.h
View File

@ -1128,11 +1128,11 @@ extern "C" {
CHAR szShortName[MIXER_SHORT_NAME_CHARS];
CHAR szName[MIXER_LONG_NAME_CHARS];
union {
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
LONG lMinimum;
LONG lMaximum;
} DUMMYSTRUCTNAME;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
DWORD dwMinimum;
DWORD dwMaximum;
} DUMMYSTRUCTNAME2;
@ -1154,11 +1154,11 @@ extern "C" {
WCHAR szShortName[MIXER_SHORT_NAME_CHARS];
WCHAR szName[MIXER_LONG_NAME_CHARS];
union {
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
LONG lMinimum;
LONG lMaximum;
} DUMMYSTRUCTNAME;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
DWORD dwMinimum;
DWORD dwMaximum;
} DUMMYSTRUCTNAME2;
@ -1245,7 +1245,7 @@ extern "C" {
typedef struct tagMIXERLINECONTROLSA {
DWORD cbStruct;
DWORD dwLineID;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD dwControlID;
DWORD dwControlType;
} DUMMYUNIONNAME;
@ -1257,7 +1257,7 @@ extern "C" {
typedef struct tagMIXERLINECONTROLSW {
DWORD cbStruct;
DWORD dwLineID;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD dwControlID;
DWORD dwControlType;
} DUMMYUNIONNAME;
@ -1285,7 +1285,7 @@ extern "C" {
DWORD cbStruct;
DWORD dwControlID;
DWORD cChannels;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
HWND hwndOwner;
DWORD cMultipleItems;
} DUMMYUNIONNAME;

2
mingw-w64-headers/include/mprapi.h
View File

@ -812,7 +812,7 @@ typedef struct _IKEV2_PROJECTION_INFO {
typedef struct _PROJECTION_INFO {
UCHAR projectionInfoType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
IKEV2_PROJECTION_INFO Ikev2ProjectionInfo;
PPP_PROJECTION_INFO PppProjectionInfo;
} DUMMYUNIONNAME;

2
mingw-w64-headers/include/mqmail.h
View File

@ -95,7 +95,7 @@ extern "C" {
LPFILETIME pftDate;
LPMQMailRecipList pRecips;
MQMailEMailType iType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
MQMailFormData form;
MQMailMessageData message;
MQMailTnefData tnef;

6
mingw-w64-headers/include/msasn1.h
View File

@ -139,7 +139,7 @@ extern "C" {
typedef struct tagASN1open_t {
ASN1uint32_t length;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
void *encoded;
void *value;
};
@ -204,7 +204,7 @@ extern "C" {
ASN1uint32_t cPDUs;
const ASN1FreeFun_t *apfnFreeMemory;
const ASN1uint32_t *acbStructSize;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ASN1PerFunArr_t PER;
ASN1BerFunArr_t BER;
};
@ -275,7 +275,7 @@ extern "C" {
typedef struct tagASN1optionparam_t {
ASN1option_e eOption;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ASN1encodingrule_e eRule;
ASN1uint32_t cbRequiredDecodedBufSize;
struct {

2
mingw-w64-headers/include/msp.h
View File

@ -77,7 +77,7 @@ extern "C" {
DWORD dwSize;
MSP_EVENT Event;
MSP_HANDLE hCall;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
MSP_ADDRESS_EVENT Type;
ITTerminal *pTerminal;

2
mingw-w64-headers/include/mssip.h
View File

@ -43,7 +43,7 @@ extern "C" {
#define MSSIP_ADDINFO_CATMEMBER 2
#define MSSIP_ADDINFO_BLOB 3
#define MSSIP_ADDINFO_NONMSSIP 500
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct MS_ADDINFO_FLAT_ *psFlat;
struct MS_ADDINFO_CATALOGMEMBER_ *psCatMember;
struct MS_ADDINFO_BLOB_ *psBlob;

4
mingw-w64-headers/include/mswsock.h
View File

@ -87,8 +87,8 @@ extern "C" {
#define TP_ELEMENT_FILE 2
#define TP_ELEMENT_EOP 4
ULONG cLength;
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
LARGE_INTEGER nFileOffset;
HANDLE hFile;
};

4
mingw-w64-headers/include/ndattrib.h
View File

@ -88,7 +88,7 @@ typedef struct tagOCTET_STRING {
typedef struct tagUiInfo {
UI_INFO_TYPE type;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LPWSTR pwzNull;
ShellCommandInfo ShellInfo;
LPWSTR pwzHelpURL;
@ -119,7 +119,7 @@ typedef struct tagShellCommandInfo {
typedef struct tagHELPER_ATTRIBUTE {
LPWSTR pwszName;
ATTRIBUTE_TYPE type;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
WINBOOL Boolean;
char Char;
byte Byte;

6
mingw-w64-headers/include/netioapi.h
View File

@ -81,8 +81,8 @@ typedef struct _MIB_IPNET_ROW2 {
UCHAR PhysicalAddress[IF_MAX_PHYS_ADDRESS_LENGTH];
ULONG PhysicalAddressLength;
NL_NEIGHBOR_STATE State;
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
BOOLEAN IsRouter :1;
BOOLEAN IsUnreachable :1;
};
@ -254,7 +254,7 @@ typedef struct _MIB_IPPATH_ROW {
ULONG PathMtu;
ULONG RttMean;
ULONG RttDeviation;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG LastReachable;
ULONG LastUnreachable;
};

42
mingw-w64-headers/include/netmon.h
View File

@ -203,7 +203,7 @@ extern "C"{
typedef struct _ADDRESS2 {
DWORD Type;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
BYTE MACAddress[MAC_ADDRESS_SIZE];
BYTE IPAddress[IP_ADDRESS_SIZE];
BYTE IP6Address[IP6_ADDRESS_SIZE];
@ -563,7 +563,7 @@ extern "C"{
#define UPDATE_ACTION_PAUSE_CAPTURE (0x3)
#define UPDATE_ACTION_RTC_BUFFER_SWITCH (0x4)
__MINGW_EXTENSION typedef struct _UPDATE_EVENT {
__C89_NAMELESSSTRUCT typedef struct _UPDATE_EVENT {
USHORT Event;
DWORD Action;
DWORD Status;
@ -572,7 +572,7 @@ extern "C"{
DWORD_PTR lpUserContext;
DWORD_PTR lpReserved;
UINT FramesDropped;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD Reserved;
LPFRAMETABLE lpFrameTable;
DWORD_PTR lpPacketQueue;
@ -658,7 +658,7 @@ extern "C"{
#pragma pack(push,1)
typedef struct _CAPTUREFILE_HEADER {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
CAPTUREFILE_HEADER_VALUES ActualHeader;
BYTE Buffer[72];
};
@ -806,7 +806,7 @@ extern "C"{
typedef struct _ADDRESS {
DWORD Type;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
BYTE MACAddress[MAC_ADDRESS_SIZE];
BYTE IPAddress[IP_ADDRESS_SIZE];
BYTE IPXRawAddress[IPX_ADDR_SIZE];
@ -1251,7 +1251,7 @@ extern "C"{
typedef struct _SET {
DWORD nEntries;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LPVOID lpVoidTable;
LPBYTE lpByteTable;
LPWORD lpWordTable;
@ -1299,7 +1299,7 @@ extern "C"{
LPSTR Comment;
BYTE DataType;
BYTE DataQualifier;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LPVOID lpExtendedInfo;
LPRANGE lpRange;
LPSET lpSet;
@ -1318,7 +1318,7 @@ extern "C"{
WORD Length;
WORD LengthEx;
ULPVOID lpData;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
BYTE Byte[1];
WORD Word[1];
DWORD Dword[1];
@ -1335,7 +1335,7 @@ extern "C"{
typedef struct _PROPERTYINST {
LPPROPERTYINFO lpPropertyInfo;
LPSTR szPropertyText;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LPVOID lpData;
ULPBYTE lpByte;
ULPWORD lpWord;
@ -1645,7 +1645,7 @@ extern "C"{
typedef struct _FILTEROBJECT2 {
FILTERACTIONTYPE Action;
HPROPERTY hProperty;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
VALUETYPE Value;
HPROTOCOL hProtocol;
LPVOID lpArray;
@ -1655,7 +1655,7 @@ extern "C"{
ULPTIME lpTime;
LPOBJECT_IDENTIFIER lpOID;
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
WORD ByteCount;
WORD ByteOffset;
};
@ -1683,7 +1683,7 @@ extern "C"{
typedef struct _FILTEROBJECT {
FILTERACTIONTYPE Action;
HPROPERTY hProperty;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
VALUETYPE Value;
HPROTOCOL hProtocol;
LPVOID lpArray;
@ -1693,7 +1693,7 @@ extern "C"{
ULPTIME lpTime;
LPOBJECT_IDENTIFIER lpOID;
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
WORD ByteCount;
WORD ByteOffset;
};
@ -1803,7 +1803,7 @@ extern "C"{
typedef struct _ETHERNET {
BYTE DstAddr[MAX_ADDR_LENGTH];
BYTE SrcAddr[MAX_ADDR_LENGTH];
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
WORD Length;
WORD Type;
};
@ -1850,7 +1850,7 @@ extern "C"{
BYTE FrameCtrl;
BYTE DstAddr[MAX_ADDR_LENGTH];
BYTE SrcAddr[MAX_ADDR_LENGTH];
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
BYTE Info[0];
WORD RoutingInfo[0];
};
@ -1900,11 +1900,11 @@ extern "C"{
BYTE dsap;
BYTE ssap;
struct {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
BYTE Command;
BYTE NextSend;
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
BYTE NextRecv;
BYTE Data[1];
};
@ -2451,14 +2451,14 @@ extern "C"{
#pragma pack(push,1)
typedef struct _IP {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
BYTE Version;
BYTE HdrLen;
};
BYTE ServiceType;
WORD TotalLen;
WORD ID;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
WORD Flags;
WORD FragOff;
};
@ -2770,14 +2770,14 @@ extern "C"{
BYTE Type;
BYTE Code;
WORD Checksum;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD Unused;
DWORD Address;
ReqReply RR;
ParmProb PP;
RouterAH RAH;
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
TS Time;
IP IP;
RouterAE RAE[0];

4
mingw-w64-headers/include/ntddmou.h
View File

@ -76,9 +76,9 @@ DEFINE_GUID(GUID_DEVINTERFACE_MOUSE, \
typedef struct _MOUSE_INPUT_DATA {
USHORT UnitId;
USHORT Flags;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG Buttons;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
USHORT ButtonFlags;
USHORT ButtonData;
} DUMMYSTRUCTNAME;

4
mingw-w64-headers/include/ntddndis.h
View File

@ -853,7 +853,7 @@ extern "C" {
typedef struct _NDIS_802_11_TEST {
ULONG Length;
ULONG Type;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
NDIS_802_11_AUTHENTICATION_EVENT AuthenticationEvent;
NDIS_802_11_RSSI RssiTrigger;
};
@ -1351,7 +1351,7 @@ extern "C" {
typedef struct _NDIS_GUID {
GUID Guid;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
NDIS_OID Oid;
NDIS_STATUS Status;
};

2
mingw-w64-headers/include/ntddstor.h
View File

@ -628,7 +628,7 @@ typedef struct _STORAGE_MEDIA_SERIAL_NUMBER_DATA {
typedef struct _PERSISTENT_RESERVE_COMMAND {
ULONG Version;
ULONG Size;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
UCHAR ServiceAction:5;
UCHAR Reserved1:3;

6
mingw-w64-headers/include/ntdef.h
View File

@ -374,7 +374,7 @@ typedef USHORT LANGID;
/* Used to store a non-float 8 byte aligned structure */
typedef struct _QUAD {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
__MINGW_EXTENSION __int64 UseThisFieldToCopy;
double DoNotUseThisField;
} DUMMYUNIONNAME;
@ -387,7 +387,7 @@ typedef struct _QUAD {
typedef struct _LARGE_INTEGER {
#else
typedef union _LARGE_INTEGER {
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG LowPart;
LONG HighPart;
} DUMMYSTRUCTNAME;
@ -403,7 +403,7 @@ typedef union _LARGE_INTEGER {
typedef struct _ULARGE_INTEGER {
#else
typedef union _ULARGE_INTEGER {
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG LowPart;
ULONG HighPart;
} DUMMYSTRUCTNAME;

2
mingw-w64-headers/include/ntsecapi.h
View File

@ -1346,7 +1346,7 @@ extern "C" {
typedef struct _KERB_SMARTCARD_CSP_INFO {
DWORD dwCspInfoLen;
DWORD MessageType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PVOID ContextInformation;
ULONG64 SpaceHolderForWow64;
};

14
mingw-w64-headers/include/oaidl.h
View File

@ -258,14 +258,14 @@ extern "C" {
typedef struct tagVARIANT VARIANT;
struct tagVARIANT {
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct __tagVARIANT
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct __tagVARIANT
{
VARTYPE vt;
WORD wReserved1;
WORD wReserved2;
WORD wReserved3;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LONGLONG llVal;
LONG lVal;
BYTE bVal;
@ -338,7 +338,7 @@ extern "C" {
USHORT wReserved1;
USHORT wReserved2;
USHORT wReserved3;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LONGLONG llVal;
LONG lVal;
BYTE bVal;
@ -399,7 +399,7 @@ extern "C" {
} TYPEKIND;
typedef struct tagTYPEDESC {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct tagTYPEDESC *lptdesc;
struct tagARRAYDESC *lpadesc;
HREFTYPE hreftype;
@ -451,7 +451,7 @@ extern "C" {
typedef struct tagELEMDESC {
TYPEDESC tdesc;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
IDLDESC idldesc;
PARAMDESC paramdesc;
} DUMMYUNIONNAME;
@ -556,7 +556,7 @@ extern "C" {
typedef struct tagVARDESC {
MEMBERID memid;
LPOLESTR lpstrSchema;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG oInst;
VARIANT *lpvarValue;
} DUMMYUNIONNAME;

2
mingw-w64-headers/include/objidl.h
View File

@ -2187,7 +2187,7 @@ extern "C" {
typedef struct tagSTGMEDIUM {
DWORD tymed;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
HBITMAP hBitmap;
HMETAFILEPICT hMetaFilePict;
HENHMETAFILE hEnhMetaFile;

2
mingw-w64-headers/include/olectl.h
View File

@ -94,7 +94,7 @@ typedef struct tagFONTDESC {
typedef struct tagPICTDESC {
UINT cbSizeofstruct;
UINT picType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
HBITMAP hbitmap;
HPALETTE hpal;

8
mingw-w64-headers/include/oledb.h
View File

@ -531,16 +531,16 @@ extern "C" {
#ifndef DECIMAL_SETZERO
typedef struct tagDEC {
USHORT wReserved;
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
BYTE scale;
BYTE sign;
};
USHORT signscale;
};
ULONG Hi32;
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
ULONG Lo32;
ULONG Mid32;
};

2
mingw-w64-headers/include/p2p.h
View File

@ -173,7 +173,7 @@ typedef const PEER_INVITATION *PCPEER_INVITATION;
typedef union _PEER_COLLAB_EVENT_DATA {
PEER_COLLAB_EVENT_TYPE eventType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PEER_EVENT_WATCHLIST_CHANGED_DATA watchlistChangedData;
PEER_EVENT_PRESENCE_CHANGED_DATA presenceChangedData;
PEER_EVENT_APPLICATION_CHANGED_DATA applicationChangedData;

2
mingw-w64-headers/include/patchapi.h
View File

@ -101,7 +101,7 @@ extern "C" {
typedef struct _PATCH_OLD_FILE_INFO {
ULONG SizeOfThisStruct;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LPCSTR OldFileNameA;
LPCWSTR OldFileNameW;
HANDLE OldFileHandle;

22
mingw-w64-headers/include/pdh.h
View File

@ -73,7 +73,7 @@ extern "C" {
typedef struct _PDH_FMT_COUNTERVALUE {
DWORD CStatus;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LONG longValue;
double doubleValue;
LONGLONG largeValue;
@ -142,10 +142,10 @@ extern "C" {
DWORD_PTR dwUserData;
DWORD_PTR dwQueryUserData;
LPSTR szFullPath;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PDH_DATA_ITEM_PATH_ELEMENTS_A DataItemPath;
PDH_COUNTER_PATH_ELEMENTS_A CounterPath;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
LPSTR szMachineName;
LPSTR szObjectName;
LPSTR szInstanceName;
@ -168,10 +168,10 @@ extern "C" {
DWORD_PTR dwUserData;
DWORD_PTR dwQueryUserData;
LPWSTR szFullPath;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PDH_DATA_ITEM_PATH_ELEMENTS_W DataItemPath;
PDH_COUNTER_PATH_ELEMENTS_W CounterPath;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
LPWSTR szMachineName;
LPWSTR szObjectName;
LPWSTR szInstanceName;
@ -206,8 +206,8 @@ extern "C" {
LPSTR szBaseFileName;
DWORD dwFileType;
DWORD dwReserved;
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
DWORD PdlAutoNameInterval;
DWORD PdlAutoNameUnits;
LPSTR PdlCommandFilename;
@ -217,7 +217,7 @@ extern "C" {
FILETIME PdlLogStartTime;
FILETIME PdlLogEndTime;
};
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
DWORD TlNumberOfBuffers;
DWORD TlMinimumBuffers;
DWORD TlMaximumBuffers;
@ -241,8 +241,8 @@ extern "C" {
LPWSTR szBaseFileName;
DWORD dwFileType;
DWORD dwReserved;
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
DWORD PdlAutoNameInterval;
DWORD PdlAutoNameUnits;
LPWSTR PdlCommandFilename;
@ -252,7 +252,7 @@ extern "C" {
FILETIME PdlLogStartTime;
FILETIME PdlLogEndTime;
};
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
DWORD TlNumberOfBuffers;
DWORD TlMinimumBuffers;
DWORD TlMaximumBuffers;

8
mingw-w64-headers/include/propidl.h
View File

@ -187,13 +187,13 @@ extern "C"{
#define tag_inner_PROPVARIANT
struct tagPROPVARIANT {
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct tag_inner_PROPVARIANT {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct tag_inner_PROPVARIANT {
VARTYPE vt;
PROPVAR_PAD1 wReserved1;
PROPVAR_PAD2 wReserved2;
PROPVAR_PAD3 wReserved3;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
CHAR cVal;
UCHAR bVal;
SHORT iVal;
@ -347,7 +347,7 @@ extern "C"{
typedef struct tagPROPSPEC {
ULONG ulKind;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PROPID propid;
LPOLESTR lpwstr;
} DUMMYUNIONNAME;

28
mingw-w64-headers/include/prsht.h
View File

@ -88,10 +88,10 @@ extern "C" {
#define PROPSHEETPAGEA_V1_FIELDS \
DWORD dwSize,dwFlags; \
HINSTANCE hInstance; \
__MINGW_EXTENSION union { \
__C89_NAMELESSUNION union { \
LPCSTR pszTemplate; PROPSHEETPAGE_RESOURCE pResource; \
} DUMMYUNIONNAME; \
__MINGW_EXTENSION union { \
__C89_NAMELESSUNION union { \
HICON hIcon; LPCSTR pszIcon; \
} DUMMYUNIONNAME2; \
LPCSTR pszTitle; \
@ -103,10 +103,10 @@ extern "C" {
#define PROPSHEETPAGEW_V1_FIELDS \
DWORD dwSize, dwFlags; \
HINSTANCE hInstance; \
__MINGW_EXTENSION union { \
__C89_NAMELESSUNION union { \
LPCWSTR pszTemplate; PROPSHEETPAGE_RESOURCE pResource; \
} DUMMYUNIONNAME; \
__MINGW_EXTENSION union { \
__C89_NAMELESSUNION union { \
HICON hIcon; LPCWSTR pszIcon; \
} DUMMYUNIONNAME2; \
LPCWSTR pszTitle; \
@ -237,27 +237,27 @@ extern "C" {
DWORD dwFlags;
HWND hwndParent;
HINSTANCE hInstance;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
HICON hIcon;
LPCSTR pszIcon;
} DUMMYUNIONNAME;
LPCSTR pszCaption;
UINT nPages;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
UINT nStartPage;
LPCSTR pStartPage;
} DUMMYUNIONNAME2;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LPCPROPSHEETPAGEA ppsp;
HPROPSHEETPAGE *phpage;
} DUMMYUNIONNAME3;
PFNPROPSHEETCALLBACK pfnCallback;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
HBITMAP hbmWatermark;
LPCSTR pszbmWatermark;
} DUMMYUNIONNAME4;
HPALETTE hplWatermark;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
HBITMAP hbmHeader;
LPCSTR pszbmHeader;
} DUMMYUNIONNAME5;
@ -270,27 +270,27 @@ extern "C" {
DWORD dwFlags;
HWND hwndParent;
HINSTANCE hInstance;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
HICON hIcon;
LPCWSTR pszIcon;
} DUMMYUNIONNAME;
LPCWSTR pszCaption;
UINT nPages;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
UINT nStartPage;
LPCWSTR pStartPage;
} DUMMYUNIONNAME2;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LPCPROPSHEETPAGEW ppsp;
HPROPSHEETPAGE *phpage;
} DUMMYUNIONNAME3;
PFNPROPSHEETCALLBACK pfnCallback;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
HBITMAP hbmWatermark;
LPCWSTR pszbmWatermark;
} DUMMYUNIONNAME4;
HPALETTE hplWatermark;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
HBITMAP hbmHeader;
LPCWSTR pszbmHeader;
} DUMMYUNIONNAME5;

2
mingw-w64-headers/include/psapi.h
View File

@ -143,7 +143,7 @@ WINBOOL WINAPI EnumProcessModulesEx(
#if (_WIN32_WINNT >= 0x0600)
typedef union _PSAPI_WORKING_SET_EX_BLOCK {
ULONG_PTR Flags;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG_PTR Valid :1;
ULONG_PTR ShareCount :3;
ULONG_PTR Win32Protection :11;

20
mingw-w64-headers/include/psdk_inc/_dbg_common.h
View File

@ -1091,7 +1091,7 @@ typedef struct _SYMSRV_INDEX_INFOW {
ULONG32 NumberOfStreams;
RVA StreamDirectoryRva;
ULONG32 CheckSum;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG32 Reserved;
ULONG32 TimeDateStamp;
};
@ -1144,9 +1144,9 @@ typedef struct _SYMSRV_INDEX_INFOW {
USHORT ProcessorArchitecture;
USHORT ProcessorLevel;
USHORT ProcessorRevision;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
USHORT Reserved0;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
UCHAR NumberOfProcessors;
UCHAR ProductType;
};
@ -1156,9 +1156,9 @@ typedef struct _SYMSRV_INDEX_INFOW {
ULONG32 BuildNumber;
ULONG32 PlatformId;
RVA CSDVersionRva;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG32 Reserved1;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
USHORT SuiteMask;
USHORT Reserved2;
};
@ -1413,7 +1413,7 @@ typedef struct _SYMSRV_INDEX_INFOW {
ULONG ProcessId;
HANDLE ProcessHandle;
ULONG CallbackType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
MINIDUMP_THREAD_CALLBACK Thread;
MINIDUMP_THREAD_EX_CALLBACK ThreadEx;
MINIDUMP_MODULE_CALLBACK Module;
@ -1455,21 +1455,21 @@ typedef struct _MINIDUMP_MEMORY_INFO_LIST {
} MINIDUMP_MEMORY_INFO_LIST, *PMINIDUMP_MEMORY_INFO_LIST;
typedef struct _MINIDUMP_CALLBACK_OUTPUT {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG ModuleWriteFlags;
ULONG ThreadWriteFlags;
ULONG SecondaryFlags;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG64 MemoryBase;
ULONG MemorySize;
};
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
WINBOOL CheckCancel;
WINBOOL Cancel;
};
HANDLE Handle;
};
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
MINIDUMP_MEMORY_INFO VmRegion;
WINBOOL Continue;
};

4
mingw-w64-headers/include/qossp.h
View File

@ -58,7 +58,7 @@ typedef enum {
typedef struct _RSVP_FILTERSPEC {
FilterType Type;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
RSVP_FILTERSPEC_V4 FilterSpecV4;
RSVP_FILTERSPEC_V6 FilterSpecV6;
RSVP_FILTERSPEC_V6_FLOW FilterSpecV6Flow;
@ -151,7 +151,7 @@ typedef struct _CONTROL_SERVICE {
ULONG Length;
SERVICETYPE Service;
AD_GENERAL_PARAMS Overrides;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
AD_GUARANTEED Guaranteed;
PARAM_BUFFER ParamBuffer[1];
};

2
mingw-w64-headers/include/ras.h
View File

@ -1015,7 +1015,7 @@ typedef enum {
typedef struct _RASTUNNELENDPOINT {
DWORD dwType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
RASIPV4ADDR ipv4;
RASIPV6ADDR ipv6;
} DUMMYUNIONNAME;

4
mingw-w64-headers/include/resapi.h
View File

@ -91,7 +91,7 @@ extern "C" {
typedef struct CLRES_FUNCTION_TABLE {
DWORD TableSize;
DWORD Version;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
CLRES_V1_FUNCTIONS V1Functions;
};
} CLRES_FUNCTION_TABLE,*PCLRES_FUNCTION_TABLE;
@ -120,7 +120,7 @@ extern "C" {
LPWSTR Name;
LPWSTR KeyName;
DWORD Format;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD_PTR DefaultPtr;
DWORD Default;
LPVOID lpDefault;

4
mingw-w64-headers/include/routprot.h
View File

@ -36,9 +36,9 @@ extern "C" {
#define IR_PROMISCUOUS_MULTICAST 1
typedef struct _SUPPORT_FUNCTIONS {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONGLONG _Align8;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
DWORD dwVersion;
DWORD dwReserved;
};

2
mingw-w64-headers/include/rpcndr.h
View File

@ -747,7 +747,7 @@ typedef unsigned long error_status_t;
typedef struct _NDR_USER_MARSHAL_INFO {
unsigned long InformationLevel;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
NDR_USER_MARSHAL_INFO_LEVEL1 Level1;
};
} NDR_USER_MARSHAL_INFO;

4
mingw-w64-headers/include/rtmv2.h
View File

@ -152,8 +152,8 @@ extern "C" {
#define RTM_NEXTHOP_FLAGS_DOWN 0x0002
typedef struct _RTM_ENTITY_ID {
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
ULONG EntityProtocolId;
ULONG EntityInstanceId;
};

2
mingw-w64-headers/include/setupapi.h
View File

@ -68,7 +68,7 @@ extern "C" {
DWORD MajorVersion;
DWORD MinorVersion;
WORD ProcessorArchitecture;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
WORD Reserved;
WORD Flags;
};

8
mingw-w64-headers/include/shellapi.h
View File

@ -277,7 +277,7 @@ extern "C" {
LPCSTR lpClass;
HKEY hkeyClass;
DWORD dwHotKey;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
HANDLE hIcon;
HANDLE hMonitor;
} DUMMYUNIONNAME;
@ -298,7 +298,7 @@ extern "C" {
LPCWSTR lpClass;
HKEY hkeyClass;
DWORD dwHotKey;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
HANDLE hIcon;
HANDLE hMonitor;
} DUMMYUNIONNAME;
@ -363,7 +363,7 @@ extern "C" {
DWORD dwState;
DWORD dwStateMask;
CHAR szInfo[256];
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
UINT uTimeout;
UINT uVersion;
} DUMMYUNIONNAME;
@ -385,7 +385,7 @@ extern "C" {
DWORD dwState;
DWORD dwStateMask;
WCHAR szInfo[256];
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
UINT uTimeout;
UINT uVersion;
} DUMMYUNIONNAME;

6
mingw-w64-headers/include/shlobj.h
View File

@ -389,7 +389,7 @@ extern "C" {
DATABLOCK_HEADER dbh;
#else
/* DATABLOCK_HEADER; */
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
DWORD cbSize;
DWORD dwSignature;
};
@ -422,7 +422,7 @@ extern "C" {
DATABLOCK_HEADER dbh;
#else
/* DATABLOCK_HEADER; */
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
DWORD cbSize;
DWORD dwSignature;
};
@ -436,7 +436,7 @@ extern "C" {
DATABLOCK_HEADER dbh;
#else
/* DATABLOCK_HEADER; */
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
DWORD cbSize;
DWORD dwSignature;
};

2
mingw-w64-headers/include/shtypes.h
View File

@ -72,7 +72,7 @@ extern "C" {
#include <pshpack8.h>
typedef struct _STRRET {
UINT uType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LPWSTR pOleStr;
UINT uOffset;
char cStr[260 ];

6
mingw-w64-headers/include/softpub.h
View File

@ -41,7 +41,7 @@ extern "C" {
WTD_GENERIC_CHAIN_POLICY_SIGNER_INFO,*PWTD_GENERIC_CHAIN_POLICY_SIGNER_INFO;
struct _WTD_GENERIC_CHAIN_POLICY_SIGNER_INFO {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD cbStruct;
DWORD cbSize;
};
@ -56,7 +56,7 @@ extern "C" {
typedef HRESULT (WINAPI *PFN_WTD_GENERIC_CHAIN_POLICY_CALLBACK)(PCRYPT_PROVIDER_DATA pProvData,DWORD dwStepError,DWORD dwRegPolicySettings,DWORD cSigner,PWTD_GENERIC_CHAIN_POLICY_SIGNER_INFO *rgpSigner,void *pvPolicyArg);
typedef struct _WTD_GENERIC_CHAIN_POLICY_CREATE_INFO {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD cbStruct;
DWORD cbSize;
};
@ -67,7 +67,7 @@ extern "C" {
} WTD_GENERIC_CHAIN_POLICY_CREATE_INFO,*PWTD_GENERIC_CHAIN_POLICY_CREATE_INFO;
typedef struct _WTD_GENERIC_CHAIN_POLICY_DATA {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD cbStruct;
DWORD cbSize;
};

4
mingw-w64-headers/include/sqlext.h
View File

@ -1511,11 +1511,11 @@ extern "C" {
typedef struct tagODBC_VS_ARGS {
const GUID *pguidEvent;
DWORD dwFlags;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
WCHAR *wszArg;
CHAR *szArg;
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
WCHAR *wszCorrelation;
CHAR *szCorrelation;
};

2
mingw-w64-headers/include/sqloledb.h
View File

@ -197,7 +197,7 @@ struct SSVARIANT {
SSVARTYPE vt;
DWORD dwReserved1;
DWORD dwReserved2;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
BYTE bTinyIntVal;
SHORT sShortIntVal;
LONG lIntVal;

8
mingw-w64-headers/include/strmif.h
View File

@ -2095,12 +2095,12 @@ typedef LONGLONG REFERENCE_TIME;
typedef struct __MIDL___MIDL_itf_strmif_0138_0006 {
DWORD dwVersion;
DWORD dwMerit;
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
ULONG cPins;
const REGFILTERPINS *rgPins;
};
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG cPins2;
const REGFILTERPINS2 *rgPins2;
};
@ -5093,7 +5093,7 @@ typedef LONGLONG REFERENCE_TIME;
#ifndef TIMECODE_DEFINED
#define TIMECODE_DEFINED
typedef union _timecode {
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
WORD wFrameRate;
WORD wFrameFract;
DWORD dwFrames;

422
mingw-w64-headers/include/strsafe.h
View File

@ -136,17 +136,12 @@ STRSAFEAPI StringCchCopyW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR
#ifndef __CRT__NO_INLINE
STRSAFEAPI StringCchCopyA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPCSTR pszSrc) {
HRESULT hr;
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCopyWorkerA(pszDest,cchDest,pszSrc);
return hr;
return (cchDest > STRSAFE_MAX_CCH ? STRSAFE_E_INVALID_PARAMETER : StringCopyWorkerA(pszDest,cchDest,pszSrc));
}
STRSAFEAPI StringCchCopyW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszSrc) {
HRESULT hr;
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCopyWorkerW(pszDest,cchDest,pszSrc);
return hr;
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringCopyWorkerW(pszDest,cchDest,pszSrc);
}
#endif /* !__CRT__NO_INLINE */
@ -157,21 +152,14 @@ STRSAFEAPI StringCbCopyW(STRSAFE_LPWSTR pszDest,size_t cbDest,STRSAFE_LPCWSTR ps
#ifndef __CRT__NO_INLINE
STRSAFEAPI StringCbCopyA(STRSAFE_LPSTR pszDest,size_t cbDest,STRSAFE_LPCSTR pszSrc) {
HRESULT hr;
size_t cchDest;
cchDest = cbDest / sizeof(char);
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCopyWorkerA(pszDest,cchDest,pszSrc);
return hr;
if(cbDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringCopyWorkerA(pszDest,cbDest,pszSrc);
}
STRSAFEAPI StringCbCopyW(STRSAFE_LPWSTR pszDest,size_t cbDest,STRSAFE_LPCWSTR pszSrc) {
HRESULT hr;
size_t cchDest;
cchDest = cbDest / sizeof(wchar_t);
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCopyWorkerW(pszDest,cchDest,pszSrc);
return hr;
size_t cchDest = cbDest / sizeof(wchar_t);
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringCopyWorkerW(pszDest,cchDest,pszSrc);
}
#endif /* !__CRT__NO_INLINE */
@ -182,25 +170,15 @@ STRSAFEAPI StringCchCopyExW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWST
#ifndef __CRT__NO_INLINE
STRSAFEAPI StringCchCopyExA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPCSTR pszSrc,STRSAFE_LPSTR *ppszDestEnd,size_t *pcchRemaining,unsigned long dwFlags) {
HRESULT hr;
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else {
size_t cbDest;
cbDest = cchDest*sizeof(char);
hr = StringCopyExWorkerA(pszDest,cchDest,cbDest,pszSrc,ppszDestEnd,pcchRemaining,dwFlags);
}
return hr;
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringCopyExWorkerA(pszDest,cchDest,cchDest,pszSrc,ppszDestEnd,pcchRemaining,dwFlags);
}
STRSAFEAPI StringCchCopyExW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszSrc,STRSAFE_LPWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned long dwFlags) {
HRESULT hr;
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else {
size_t cbDest;
cbDest = cchDest*sizeof(wchar_t);
hr = StringCopyExWorkerW(pszDest,cchDest,cbDest,pszSrc,ppszDestEnd,pcchRemaining,dwFlags);
}
return hr;
size_t cbDest;
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
cbDest = cchDest * sizeof(wchar_t);
return StringCopyExWorkerW(pszDest,cchDest,cbDest,pszSrc,ppszDestEnd,pcchRemaining,dwFlags);
}
#endif /* !__CRT__NO_INLINE */
@ -212,30 +190,26 @@ STRSAFEAPI StringCbCopyExW(STRSAFE_LPWSTR pszDest,size_t cbDest,STRSAFE_LPCWSTR
#ifndef __CRT__NO_INLINE
STRSAFEAPI StringCbCopyExA(STRSAFE_LPSTR pszDest,size_t cbDest,STRSAFE_LPCSTR pszSrc,STRSAFE_LPSTR *ppszDestEnd,size_t *pcbRemaining,unsigned long dwFlags) {
HRESULT hr;
size_t cchDest;
size_t cchRemaining = 0;
cchDest = cbDest / sizeof(char);
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCopyExWorkerA(pszDest,cchDest,cbDest,pszSrc,ppszDestEnd,&cchRemaining,dwFlags);
if(SUCCEEDED(hr) || (hr==STRSAFE_E_INSUFFICIENT_BUFFER)) {
if(pcbRemaining) {
if(cbDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
hr = StringCopyExWorkerA(pszDest,cbDest,cbDest,pszSrc,ppszDestEnd,&cchRemaining,dwFlags);
if(SUCCEEDED(hr) || hr == STRSAFE_E_INSUFFICIENT_BUFFER) {
if(pcbRemaining)
*pcbRemaining = (cchRemaining*sizeof(char)) + (cbDest % sizeof(char));
}
}
return hr;
}
STRSAFEAPI StringCbCopyExW(STRSAFE_LPWSTR pszDest,size_t cbDest,STRSAFE_LPCWSTR pszSrc,STRSAFE_LPWSTR *ppszDestEnd,size_t *pcbRemaining,unsigned long dwFlags) {
HRESULT hr;
size_t cchDest;
size_t cchDest = cbDest / sizeof(wchar_t);
size_t cchRemaining = 0;
cchDest = cbDest / sizeof(wchar_t);
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCopyExWorkerW(pszDest,cchDest,cbDest,pszSrc,ppszDestEnd,&cchRemaining,dwFlags);
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
hr = StringCopyExWorkerW(pszDest,cchDest,cbDest,pszSrc,ppszDestEnd,&cchRemaining,dwFlags);
if(SUCCEEDED(hr) || (hr==STRSAFE_E_INSUFFICIENT_BUFFER)) {
if(pcbRemaining) {
if(pcbRemaining)
*pcbRemaining = (cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t));
}
}
return hr;
}
@ -247,17 +221,15 @@ STRSAFEAPI StringCchCopyNW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR
#ifndef __CRT__NO_INLINE
STRSAFEAPI StringCchCopyNA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPCSTR pszSrc,size_t cchToCopy) {
HRESULT hr;
if((cchDest > STRSAFE_MAX_CCH) || (cchToCopy > STRSAFE_MAX_CCH)) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCopyNWorkerA(pszDest,cchDest,pszSrc,cchToCopy);
return hr;
if(cchDest > STRSAFE_MAX_CCH || cchToCopy > STRSAFE_MAX_CCH)
return STRSAFE_E_INVALID_PARAMETER;
return StringCopyNWorkerA(pszDest,cchDest,pszSrc,cchToCopy);
}
STRSAFEAPI StringCchCopyNW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszSrc,size_t cchToCopy) {
HRESULT hr;
if((cchDest > STRSAFE_MAX_CCH) || (cchToCopy > STRSAFE_MAX_CCH)) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCopyNWorkerW(pszDest,cchDest,pszSrc,cchToCopy);
return hr;
if(cchDest > STRSAFE_MAX_CCH || cchToCopy > STRSAFE_MAX_CCH)
return STRSAFE_E_INVALID_PARAMETER;
return StringCopyNWorkerW(pszDest,cchDest,pszSrc,cchToCopy);
}
#endif /* !__CRT__NO_INLINE */
@ -268,25 +240,17 @@ STRSAFEAPI StringCbCopyNW(STRSAFE_LPWSTR pszDest,size_t cbDest,STRSAFE_LPCWSTR p
#ifndef __CRT__NO_INLINE
STRSAFEAPI StringCbCopyNA(STRSAFE_LPSTR pszDest,size_t cbDest,STRSAFE_LPCSTR pszSrc,size_t cbToCopy) {
HRESULT hr;
size_t cchDest;
size_t cchToCopy;
cchDest = cbDest / sizeof(char);
cchToCopy = cbToCopy / sizeof(char);
if((cchDest > STRSAFE_MAX_CCH) || (cchToCopy > STRSAFE_MAX_CCH)) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCopyNWorkerA(pszDest,cchDest,pszSrc,cchToCopy);
return hr;
if(cbDest > STRSAFE_MAX_CCH || cbToCopy > STRSAFE_MAX_CCH)
return STRSAFE_E_INVALID_PARAMETER;
return StringCopyNWorkerA(pszDest,cbDest,pszSrc,cbToCopy);
}
STRSAFEAPI StringCbCopyNW(STRSAFE_LPWSTR pszDest,size_t cbDest,STRSAFE_LPCWSTR pszSrc,size_t cbToCopy) {
HRESULT hr;
size_t cchDest;
size_t cchToCopy;
cchDest = cbDest / sizeof(wchar_t);
cchToCopy = cbToCopy / sizeof(wchar_t);
if((cchDest > STRSAFE_MAX_CCH) || (cchToCopy > STRSAFE_MAX_CCH)) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCopyNWorkerW(pszDest,cchDest,pszSrc,cchToCopy);
return hr;
size_t cchDest = cbDest / sizeof(wchar_t);
size_t cchToCopy = cbToCopy / sizeof(wchar_t);
if(cchDest > STRSAFE_MAX_CCH || cchToCopy > STRSAFE_MAX_CCH)
return STRSAFE_E_INVALID_PARAMETER;
return StringCopyNWorkerW(pszDest,cchDest,pszSrc,cchToCopy);
}
#endif /* !__CRT__NO_INLINE */
@ -297,25 +261,13 @@ STRSAFEAPI StringCchCopyNExW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWS
#ifndef __CRT__NO_INLINE
STRSAFEAPI StringCchCopyNExA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPCSTR pszSrc,size_t cchToCopy,STRSAFE_LPSTR *ppszDestEnd,size_t *pcchRemaining,unsigned long dwFlags) {
HRESULT hr;
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else {
size_t cbDest;
cbDest = cchDest*sizeof(char);
hr = StringCopyNExWorkerA(pszDest,cchDest,cbDest,pszSrc,cchToCopy,ppszDestEnd,pcchRemaining,dwFlags);
}
return hr;
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringCopyNExWorkerA(pszDest,cchDest,cchDest,pszSrc,cchToCopy,ppszDestEnd,pcchRemaining,dwFlags);
}
STRSAFEAPI StringCchCopyNExW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszSrc,size_t cchToCopy,STRSAFE_LPWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned long dwFlags) {
HRESULT hr;
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else {
size_t cbDest;
cbDest = cchDest*sizeof(wchar_t);
hr = StringCopyNExWorkerW(pszDest,cchDest,cbDest,pszSrc,cchToCopy,ppszDestEnd,pcchRemaining,dwFlags);
}
return hr;
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringCopyNExWorkerW(pszDest,cchDest,cchDest * sizeof(wchar_t),pszSrc,cchToCopy,ppszDestEnd,pcchRemaining,dwFlags);
}
#endif /* !__CRT__NO_INLINE */
@ -327,18 +279,13 @@ STRSAFEAPI StringCbCopyNExW(STRSAFE_LPWSTR pszDest,size_t cbDest,STRSAFE_LPCWSTR
#ifndef __CRT__NO_INLINE
STRSAFEAPI StringCbCopyNExA(STRSAFE_LPSTR pszDest,size_t cbDest,STRSAFE_LPCSTR pszSrc,size_t cbToCopy,STRSAFE_LPSTR *ppszDestEnd,size_t *pcbRemaining,unsigned long dwFlags) {
HRESULT hr;
size_t cchDest;
size_t cchToCopy;
size_t cchRemaining = 0;
cchDest = cbDest / sizeof(char);
cchToCopy = cbToCopy / sizeof(char);
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCopyNExWorkerA(pszDest,cchDest,cbDest,pszSrc,cchToCopy,ppszDestEnd,&cchRemaining,dwFlags);
if(SUCCEEDED(hr) || (hr==STRSAFE_E_INSUFFICIENT_BUFFER)) {
if(pcbRemaining) {
*pcbRemaining = (cchRemaining*sizeof(char)) + (cbDest % sizeof(char));
}
}
if(cbDest > STRSAFE_MAX_CCH)
hr = STRSAFE_E_INVALID_PARAMETER;
else
hr = StringCopyNExWorkerA(pszDest,cbDest,cbDest,pszSrc,cbToCopy,ppszDestEnd,&cchRemaining,dwFlags);
if((SUCCEEDED(hr) || hr == STRSAFE_E_INSUFFICIENT_BUFFER) && pcbRemaining)
*pcbRemaining = cchRemaining;
return hr;
}
@ -351,11 +298,8 @@ STRSAFEAPI StringCbCopyNExW(STRSAFE_LPWSTR pszDest,size_t cbDest,STRSAFE_LPCWSTR
cchToCopy = cbToCopy / sizeof(wchar_t);
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCopyNExWorkerW(pszDest,cchDest,cbDest,pszSrc,cchToCopy,ppszDestEnd,&cchRemaining,dwFlags);
if(SUCCEEDED(hr) || (hr==STRSAFE_E_INSUFFICIENT_BUFFER)) {
if(pcbRemaining) {
*pcbRemaining = (cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t));
}
}
if((SUCCEEDED(hr) || hr == STRSAFE_E_INSUFFICIENT_BUFFER) && pcbRemaining)
*pcbRemaining = (cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t));
return hr;
}
#endif /* !__CRT__NO_INLINE */
@ -367,17 +311,13 @@ STRSAFEAPI StringCchCatW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR p
#ifndef __CRT__NO_INLINE
STRSAFEAPI StringCchCatA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPCSTR pszSrc) {
HRESULT hr;
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCatWorkerA(pszDest,cchDest,pszSrc);
return hr;
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringCatWorkerA(pszDest,cchDest,pszSrc);
}
STRSAFEAPI StringCchCatW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszSrc) {
HRESULT hr;
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCatWorkerW(pszDest,cchDest,pszSrc);
return hr;
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringCatWorkerW(pszDest,cchDest,pszSrc);
}
#endif /* !__CRT__NO_INLINE */
@ -388,21 +328,14 @@ STRSAFEAPI StringCbCatW(STRSAFE_LPWSTR pszDest,size_t cbDest,STRSAFE_LPCWSTR psz
#ifndef __CRT__NO_INLINE
STRSAFEAPI StringCbCatA(STRSAFE_LPSTR pszDest,size_t cbDest,STRSAFE_LPCSTR pszSrc) {
HRESULT hr;
size_t cchDest;
cchDest = cbDest / sizeof(char);
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCatWorkerA(pszDest,cchDest,pszSrc);
return hr;
if(cbDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringCatWorkerA(pszDest,cbDest,pszSrc);
}
STRSAFEAPI StringCbCatW(STRSAFE_LPWSTR pszDest,size_t cbDest,STRSAFE_LPCWSTR pszSrc) {
HRESULT hr;
size_t cchDest;
cchDest = cbDest / sizeof(wchar_t);
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCatWorkerW(pszDest,cchDest,pszSrc);
return hr;
size_t cchDest = cbDest / sizeof(wchar_t);
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringCatWorkerW(pszDest,cchDest,pszSrc);
}
#endif /* !__CRT__NO_INLINE */
@ -413,25 +346,14 @@ STRSAFEAPI StringCchCatExW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR
#ifndef __CRT__NO_INLINE
STRSAFEAPI StringCchCatExA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPCSTR pszSrc,STRSAFE_LPSTR *ppszDestEnd,size_t *pcchRemaining,unsigned long dwFlags) {
HRESULT hr;
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else {
size_t cbDest;
cbDest = cchDest*sizeof(char);
hr = StringCatExWorkerA(pszDest,cchDest,cbDest,pszSrc,ppszDestEnd,pcchRemaining,dwFlags);
}
return hr;
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringCatExWorkerA(pszDest,cchDest,cchDest,pszSrc,ppszDestEnd,pcchRemaining,dwFlags);
}
STRSAFEAPI StringCchCatExW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszSrc,STRSAFE_LPWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned long dwFlags) {
HRESULT hr;
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else {
size_t cbDest;
cbDest = cchDest*sizeof(wchar_t);
hr = StringCatExWorkerW(pszDest,cchDest,cbDest,pszSrc,ppszDestEnd,pcchRemaining,dwFlags);
}
return hr;
size_t cbDest = cchDest*sizeof(wchar_t);
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringCatExWorkerW(pszDest,cchDest,cbDest,pszSrc,ppszDestEnd,pcchRemaining,dwFlags);
}
#endif /* !__CRT__NO_INLINE */
@ -443,31 +365,23 @@ STRSAFEAPI StringCbCatExW(STRSAFE_LPWSTR pszDest,size_t cbDest,STRSAFE_LPCWSTR p
#ifndef __CRT__NO_INLINE
STRSAFEAPI StringCbCatExA(STRSAFE_LPSTR pszDest,size_t cbDest,STRSAFE_LPCSTR pszSrc,STRSAFE_LPSTR *ppszDestEnd,size_t *pcbRemaining,unsigned long dwFlags) {
HRESULT hr;
size_t cchDest;
size_t cchRemaining = 0;
cchDest = cbDest / sizeof(char);
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCatExWorkerA(pszDest,cchDest,cbDest,pszSrc,ppszDestEnd,&cchRemaining,dwFlags);
if(SUCCEEDED(hr) || (hr==STRSAFE_E_INSUFFICIENT_BUFFER)) {
if(pcbRemaining) {
*pcbRemaining = (cchRemaining*sizeof(char)) + (cbDest % sizeof(char));
}
}
if(cbDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCatExWorkerA(pszDest,cbDest,cbDest,pszSrc,ppszDestEnd,&cchRemaining,dwFlags);
if((SUCCEEDED(hr) || hr == STRSAFE_E_INSUFFICIENT_BUFFER) && pcbRemaining)
*pcbRemaining = (cchRemaining*sizeof(char)) + (cbDest % sizeof(char));
return hr;
}
STRSAFEAPI StringCbCatExW(STRSAFE_LPWSTR pszDest,size_t cbDest,STRSAFE_LPCWSTR pszSrc,STRSAFE_LPWSTR *ppszDestEnd,size_t *pcbRemaining,unsigned long dwFlags) {
HRESULT hr;
size_t cchDest;
size_t cchDest = cbDest / sizeof(wchar_t);
size_t cchRemaining = 0;
cchDest = cbDest / sizeof(wchar_t);
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCatExWorkerW(pszDest,cchDest,cbDest,pszSrc,ppszDestEnd,&cchRemaining,dwFlags);
if(SUCCEEDED(hr) || (hr==STRSAFE_E_INSUFFICIENT_BUFFER)) {
if(pcbRemaining) {
*pcbRemaining = (cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t));
}
}
if((SUCCEEDED(hr) || hr == STRSAFE_E_INSUFFICIENT_BUFFER) && pcbRemaining)
*pcbRemaining = (cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t));
return hr;
}
#endif /* !__CRT__NO_INLINE */
@ -479,17 +393,13 @@ STRSAFEAPI StringCchCatNW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR
#ifndef __CRT__NO_INLINE
STRSAFEAPI StringCchCatNA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPCSTR pszSrc,size_t cchToAppend) {
HRESULT hr;
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCatNWorkerA(pszDest,cchDest,pszSrc,cchToAppend);
return hr;
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringCatNWorkerA(pszDest,cchDest,pszSrc,cchToAppend);
}
STRSAFEAPI StringCchCatNW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszSrc,size_t cchToAppend) {
HRESULT hr;
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCatNWorkerW(pszDest,cchDest,pszSrc,cchToAppend);
return hr;
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringCatNWorkerW(pszDest,cchDest,pszSrc,cchToAppend);
}
#endif /* !__CRT__NO_INLINE */
@ -500,25 +410,16 @@ STRSAFEAPI StringCbCatNW(STRSAFE_LPWSTR pszDest,size_t cbDest,STRSAFE_LPCWSTR ps
#ifndef __CRT__NO_INLINE
STRSAFEAPI StringCbCatNA(STRSAFE_LPSTR pszDest,size_t cbDest,STRSAFE_LPCSTR pszSrc,size_t cbToAppend) {
HRESULT hr;
size_t cchDest;
size_t cchToAppend;
cchDest = cbDest / sizeof(char);
cchToAppend = cbToAppend / sizeof(char);
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCatNWorkerA(pszDest,cchDest,pszSrc,cchToAppend);
return hr;
if(cbDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringCatNWorkerA(pszDest,cbDest,pszSrc,cbToAppend);
}
STRSAFEAPI StringCbCatNW(STRSAFE_LPWSTR pszDest,size_t cbDest,STRSAFE_LPCWSTR pszSrc,size_t cbToAppend) {
HRESULT hr;
size_t cchDest;
size_t cchToAppend;
cchDest = cbDest / sizeof(wchar_t);
cchToAppend = cbToAppend / sizeof(wchar_t);
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCatNWorkerW(pszDest,cchDest,pszSrc,cchToAppend);
return hr;
size_t cchDest = cbDest / sizeof(wchar_t);
size_t cchToAppend = cbToAppend / sizeof(wchar_t);
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringCatNWorkerW(pszDest,cchDest,pszSrc,cchToAppend);
}
#endif /* !__CRT__NO_INLINE */
@ -529,25 +430,13 @@ STRSAFEAPI StringCchCatNExW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWST
#ifndef __CRT__NO_INLINE
STRSAFEAPI StringCchCatNExA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPCSTR pszSrc,size_t cchToAppend,STRSAFE_LPSTR *ppszDestEnd,size_t *pcchRemaining,unsigned long dwFlags) {
HRESULT hr;
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else {
size_t cbDest;
cbDest = cchDest*sizeof(char);
hr = StringCatNExWorkerA(pszDest,cchDest,cbDest,pszSrc,cchToAppend,ppszDestEnd,pcchRemaining,dwFlags);
}
return hr;
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringCatNExWorkerA(pszDest,cchDest,cchDest,pszSrc,cchToAppend,ppszDestEnd,pcchRemaining,dwFlags);
}
STRSAFEAPI StringCchCatNExW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszSrc,size_t cchToAppend,STRSAFE_LPWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned long dwFlags) {
HRESULT hr;
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else {
size_t cbDest;
cbDest = cchDest*sizeof(wchar_t);
hr = StringCatNExWorkerW(pszDest,cchDest,cbDest,pszSrc,cchToAppend,ppszDestEnd,pcchRemaining,dwFlags);
}
return hr;
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringCatNExWorkerW(pszDest,cchDest,(cchDest*sizeof(wchar_t)),pszSrc,cchToAppend,ppszDestEnd,pcchRemaining,dwFlags);
}
#endif
@ -559,35 +448,23 @@ STRSAFEAPI StringCbCatNExW(STRSAFE_LPWSTR pszDest,size_t cbDest,STRSAFE_LPCWSTR
#ifndef __CRT__NO_INLINE
STRSAFEAPI StringCbCatNExA(STRSAFE_LPSTR pszDest,size_t cbDest,STRSAFE_LPCSTR pszSrc,size_t cbToAppend,STRSAFE_LPSTR *ppszDestEnd,size_t *pcbRemaining,unsigned long dwFlags) {
HRESULT hr;
size_t cchDest;
size_t cchToAppend;
size_t cchRemaining = 0;
cchDest = cbDest / sizeof(char);
cchToAppend = cbToAppend / sizeof(char);
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCatNExWorkerA(pszDest,cchDest,cbDest,pszSrc,cchToAppend,ppszDestEnd,&cchRemaining,dwFlags);
if(SUCCEEDED(hr) || (hr==STRSAFE_E_INSUFFICIENT_BUFFER)) {
if(pcbRemaining) {
*pcbRemaining = (cchRemaining*sizeof(char)) + (cbDest % sizeof(char));
}
}
if(cbDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCatNExWorkerA(pszDest,cbDest,cbDest,pszSrc,cbToAppend,ppszDestEnd,&cchRemaining,dwFlags);
if((SUCCEEDED(hr) || hr == STRSAFE_E_INSUFFICIENT_BUFFER) && pcbRemaining)
*pcbRemaining = (cchRemaining*sizeof(char)) + (cbDest % sizeof(char));
return hr;
}
STRSAFEAPI StringCbCatNExW(STRSAFE_LPWSTR pszDest,size_t cbDest,STRSAFE_LPCWSTR pszSrc,size_t cbToAppend,STRSAFE_LPWSTR *ppszDestEnd,size_t *pcbRemaining,unsigned long dwFlags) {
HRESULT hr;
size_t cchDest;
size_t cchToAppend;
size_t cchDest = cbDest / sizeof(wchar_t);
size_t cchToAppend = cbToAppend / sizeof(wchar_t);
size_t cchRemaining = 0;
cchDest = cbDest / sizeof(wchar_t);
cchToAppend = cbToAppend / sizeof(wchar_t);
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringCatNExWorkerW(pszDest,cchDest,cbDest,pszSrc,cchToAppend,ppszDestEnd,&cchRemaining,dwFlags);
if(SUCCEEDED(hr) || (hr==STRSAFE_E_INSUFFICIENT_BUFFER)) {
if(pcbRemaining) {
*pcbRemaining = (cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t));
}
}
if((SUCCEEDED(hr) || hr == STRSAFE_E_INSUFFICIENT_BUFFER) && pcbRemaining)
*pcbRemaining = (cchRemaining*sizeof(wchar_t)) + (cbDest % sizeof(wchar_t));
return hr;
}
#endif /* !__CRT__NO_INLINE */
@ -599,17 +476,13 @@ STRSAFEAPI StringCchVPrintfW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWS
#ifndef __CRT__NO_INLINE
STRSAFEAPI StringCchVPrintfA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPCSTR pszFormat,va_list argList) {
HRESULT hr;
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringVPrintfWorkerA(pszDest,cchDest,pszFormat,argList);
return hr;
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringVPrintfWorkerA(pszDest,cchDest,pszFormat,argList);
}
STRSAFEAPI StringCchVPrintfW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszFormat,va_list argList) {
HRESULT hr;
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringVPrintfWorkerW(pszDest,cchDest,pszFormat,argList);
return hr;
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringVPrintfWorkerW(pszDest,cchDest,pszFormat,argList);
}
#endif /* !__CRT__NO_INLINE */
@ -620,21 +493,14 @@ STRSAFEAPI StringCbVPrintfW(STRSAFE_LPWSTR pszDest,size_t cbDest,STRSAFE_LPCWSTR
#ifndef __CRT__NO_INLINE
STRSAFEAPI StringCbVPrintfA(STRSAFE_LPSTR pszDest,size_t cbDest,STRSAFE_LPCSTR pszFormat,va_list argList) {
HRESULT hr;
size_t cchDest;
cchDest = cbDest / sizeof(char);
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringVPrintfWorkerA(pszDest,cchDest,pszFormat,argList);
return hr;
if(cbDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringVPrintfWorkerA(pszDest,cbDest,pszFormat,argList);
}
STRSAFEAPI StringCbVPrintfW(STRSAFE_LPWSTR pszDest,size_t cbDest,STRSAFE_LPCWSTR pszFormat,va_list argList) {
HRESULT hr;
size_t cchDest;
cchDest = cbDest / sizeof(wchar_t);
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else hr = StringVPrintfWorkerW(pszDest,cchDest,pszFormat,argList);
return hr;
size_t cchDest = cbDest / sizeof(wchar_t);
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
return StringVPrintfWorkerW(pszDest,cchDest,pszFormat,argList);
}
#endif /* !__CRT__NO_INLINE */
@ -646,25 +512,21 @@ STRSAFEAPI StringCchPrintfW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWST
#ifndef __CRT__NO_INLINE
STRSAFEAPI StringCchPrintfA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPCSTR pszFormat,...) {
HRESULT hr;
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else {
va_list argList;
va_start(argList,pszFormat);
hr = StringVPrintfWorkerA(pszDest,cchDest,pszFormat,argList);
va_end(argList);
}
va_list argList;
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
va_start(argList,pszFormat);
hr = StringVPrintfWorkerA(pszDest,cchDest,pszFormat,argList);
va_end(argList);
return hr;
}
STRSAFEAPI StringCchPrintfW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPCWSTR pszFormat,...) {
HRESULT hr;
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else {
va_list argList;
va_start(argList,pszFormat);
hr = StringVPrintfWorkerW(pszDest,cchDest,pszFormat,argList);
va_end(argList);
}
va_list argList;
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
va_start(argList,pszFormat);
hr = StringVPrintfWorkerW(pszDest,cchDest,pszFormat,argList);
va_end(argList);
return hr;
}
#endif /* !__CRT__NO_INLINE */
@ -677,29 +539,22 @@ STRSAFEAPI StringCbPrintfW(STRSAFE_LPWSTR pszDest,size_t cbDest,STRSAFE_LPCWSTR
#ifndef __CRT__NO_INLINE
STRSAFEAPI StringCbPrintfA(STRSAFE_LPSTR pszDest,size_t cbDest,STRSAFE_LPCSTR pszFormat,...) {
HRESULT hr;
size_t cchDest;
cchDest = cbDest / sizeof(char);
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else {
va_list argList;
va_start(argList,pszFormat);
hr = StringVPrintfWorkerA(pszDest,cchDest,pszFormat,argList);
va_end(argList);
}
va_list argList;
if(cbDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
va_start(argList,pszFormat);
hr = StringVPrintfWorkerA(pszDest,cbDest,pszFormat,argList);
va_end(argList);
return hr;
}
STRSAFEAPI StringCbPrintfW(STRSAFE_LPWSTR pszDest,size_t cbDest,STRSAFE_LPCWSTR pszFormat,...) {
HRESULT hr;
size_t cchDest;
cchDest = cbDest / sizeof(wchar_t);
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else {
va_list argList;
va_start(argList,pszFormat);
hr = StringVPrintfWorkerW(pszDest,cchDest,pszFormat,argList);
va_end(argList);
}
va_list argList;
size_t cchDest = cbDest / sizeof(wchar_t);
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
va_start(argList,pszFormat);
hr = StringVPrintfWorkerW(pszDest,cchDest,pszFormat,argList);
va_end(argList);
return hr;
}
#endif /* !__CRT__NO_INLINE */
@ -712,29 +567,22 @@ STRSAFEAPI StringCchPrintfExW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPWS
#ifndef __CRT__NO_INLINE
STRSAFEAPI StringCchPrintfExA(STRSAFE_LPSTR pszDest,size_t cchDest,STRSAFE_LPSTR *ppszDestEnd,size_t *pcchRemaining,unsigned long dwFlags,STRSAFE_LPCSTR pszFormat,...) {
HRESULT hr;
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else {
size_t cbDest;
va_list argList;
cbDest = cchDest*sizeof(char);
va_start(argList,pszFormat);
hr = StringVPrintfExWorkerA(pszDest,cchDest,cbDest,ppszDestEnd,pcchRemaining,dwFlags,pszFormat,argList);
va_end(argList);
}
va_list argList;
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
va_start(argList,pszFormat);
hr = StringVPrintfExWorkerA(pszDest,cchDest,cchDest,ppszDestEnd,pcchRemaining,dwFlags,pszFormat,argList);
va_end(argList);
return hr;
}
STRSAFEAPI StringCchPrintfExW(STRSAFE_LPWSTR pszDest,size_t cchDest,STRSAFE_LPWSTR *ppszDestEnd,size_t *pcchRemaining,unsigned long dwFlags,STRSAFE_LPCWSTR pszFormat,...) {
HRESULT hr;
if(cchDest > STRSAFE_MAX_CCH) hr = STRSAFE_E_INVALID_PARAMETER;
else {
size_t cbDest;
va_list argList;
cbDest = cchDest*sizeof(wchar_t);
va_start(argList,pszFormat);
hr = StringVPrintfExWorkerW(pszDest,cchDest,cbDest,ppszDestEnd,pcchRemaining,dwFlags,pszFormat,argList);
va_end(argList);
}
size_t cbDest = cchDest * sizeof(wchar_t);
va_list argList;
if(cchDest > STRSAFE_MAX_CCH) return STRSAFE_E_INVALID_PARAMETER;
va_start(argList,pszFormat);
hr = StringVPrintfExWorkerW(pszDest,cchDest,cbDest,ppszDestEnd,pcchRemaining,dwFlags,pszFormat,argList);
va_end(argList);
return hr;
}
#endif /* !__CRT__NO_INLINE */

2
mingw-w64-headers/include/tapi.h
View File

@ -1703,7 +1703,7 @@ extern "C" {
DWORD dwClientUserNameOffset;
DWORD dwClientAppAPIVersion;
DWORD dwRequestType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
DWORD dwAddressID;
LINEAGENTGROUPLIST GroupList;

2
mingw-w64-headers/include/tapi3.h
View File

@ -1338,7 +1338,7 @@ extern "C" {
DWORD dwSize;
MSP_EVENT Event;
MSP_HANDLE hCall;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
MSP_ADDRESS_EVENT Type;
ITTerminal *pTerminal;

10
mingw-w64-headers/include/tdh.h
View File

@ -24,7 +24,7 @@ typedef enum _EVENT_FIELD_TYPE {
typedef struct _EVENT_MAP_ENTRY {
ULONG OutputOffset;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
ULONG Value;
ULONG InputOffset;
};
@ -50,7 +50,7 @@ typedef struct _EVENT_MAP_INFO {
ULONG NameOffset;
MAP_FLAGS Flag;
ULONG EntryCount;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
MAP_VALUETYPE MapEntryValueType;
ULONG FormatStringOffset;
};
@ -68,7 +68,7 @@ typedef enum _PROPERTY_FLAGS {
typedef struct _EVENT_PROPERTY_INFO {
PROPERTY_FLAGS Flags;
ULONG NameOffset;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
USHORT InType;
USHORT OutType;
@ -80,11 +80,11 @@ typedef struct _EVENT_PROPERTY_INFO {
ULONG padding;
} structType;
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
USHORT count;
USHORT countPropertyIndex;
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
USHORT length;
USHORT lengthPropertyIndex;
};

2
mingw-w64-headers/include/tspi.h
View File

@ -75,7 +75,7 @@ extern "C" {
DWORD dwKey;
DWORD dwTotalSize;
DWORD dwQOSRequestType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
DWORD dwNumServiceLevelEntries;
LINEQOSSERVICELEVEL LineQOSServiceLevel[1];

2
mingw-w64-headers/include/txfw32.h
View File

@ -13,7 +13,7 @@ extern "C" {
#endif
typedef struct _TXF_ID {
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
LONGLONG LowPart;
LONGLONG HighPart;
} DUMMYSTRUCTNAME;

4
mingw-w64-headers/include/usb.h
View File

@ -428,7 +428,7 @@ typedef struct _OS_STRING {
UCHAR bDescriptorType;
WCHAR MicrosoftString[7];
UCHAR bVendorCode;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
UCHAR bPad;
UCHAR bFlags;
};
@ -518,7 +518,7 @@ struct _URB_ISOCH_TRANSFER {
};
typedef struct _URB {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct _URB_HEADER UrbHeader;
struct _URB_SELECT_INTERFACE UrbSelectInterface;
struct _URB_SELECT_CONFIGURATION UrbSelectConfiguration;

4
mingw-w64-headers/include/usb200.h
View File

@ -59,14 +59,14 @@ typedef struct _USB_DEFAULT_PIPE_SETUP_PACKET {
BM_REQUEST_TYPE bmRequestType;
UCHAR bRequest;
union _wValue {
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
UCHAR LowByte;
UCHAR HiByte;
};
USHORT W;
} wValue;
union _wIndex {
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
UCHAR LowByte;
UCHAR HiByte;
};

4
mingw-w64-headers/include/usbioctl.h
View File

@ -369,7 +369,7 @@ C_ASSERT(sizeof(USB_NODE_CONNECTION_INFORMATION_EX) == sizeof(USB_NODE_CONNECTIO
typedef union _USB_HUB_CAP_FLAGS {
ULONG ul;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
ULONG HubIsHighSpeedCapable:1;
ULONG HubIsHighSpeed:1;
ULONG HubIsMultiTtCapable:1;
@ -626,7 +626,7 @@ typedef struct _USB_DEVICE_NODE_INFO {
WCHAR DeviceDescription[40];
USB_WMI_DEVICE_NODE_TYPE NodeType;
USB_TOPOLOGY_ADDRESS BusAddress;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
USB_DEVICE_INFO UsbDeviceInfo;
USB_HUB_DEVICE_INFO HubDeviceInfo;
USB_COMPOSITE_DEVICE_INFO CompositeDeviceInfo;

24
mingw-w64-headers/include/vds.h
View File

@ -661,7 +661,7 @@ extern "C" {
typedef struct _CHANGE_ATTRIBUTES_PARAMETERS {
VDS_PARTITION_STYLE style;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
BOOLEAN bootIndicator;
} MbrPartInfo;
@ -673,7 +673,7 @@ extern "C" {
typedef struct _CHANGE_PARTITION_TYPE_PARAMETERS {
VDS_PARTITION_STYLE style;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
BYTE partitionType;
} MbrPartInfo;
@ -686,7 +686,7 @@ extern "C" {
typedef struct _CREATE_PARTITION_PARAMETERS {
VDS_PARTITION_STYLE style;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
BYTE partitionType;
BOOLEAN bootIndicator;
@ -702,7 +702,7 @@ extern "C" {
typedef struct _VDS_ASYNC_OUTPUT {
VDS_ASYNC_OUTPUT_TYPE type;
/*[switch(type)] */__MINGW_EXTENSION union {
/*[switch(type)] */__C89_NAMELESSUNION union {
/*[case(VDS_ASYNCOUT_CREATEPARTITION)]*/
struct {
ULONGLONG ullOffset;
@ -841,7 +841,7 @@ extern "C" {
typedef struct _VDS_NOTIFICATION {
VDS_NOTIFICATION_TARGET_TYPE objectType;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
VDS_PACK_NOTIFICATION Pack;
VDS_DISK_NOTIFICATION Disk;
VDS_VOLUME_NOTIFICATION Volume;
@ -882,7 +882,7 @@ extern "C" {
ULONG ulFlags;
VDS_STORAGE_BUS_TYPE BusType;
VDS_PARTITION_STYLE PartitionStyle;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD dwSignature;
GUID DiskGuid;
};
@ -1137,7 +1137,7 @@ extern "C" {
ULONG ulPartitionNumber;
ULONGLONG ullOffset;
ULONGLONG ullSize;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
VDS_PARTITION_INFO_MBR Mbr;
VDS_PARTITION_INFO_GPT Gpt;
};
@ -1147,15 +1147,15 @@ extern "C" {
VDS_PATH_ID pathId;
VDS_HWPROVIDER_TYPE type;
VDS_PATH_STATUS status;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
VDS_OBJECT_ID controllerPortId;
VDS_OBJECT_ID targetPortalId;
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
VDS_OBJECT_ID hbaPortId;
VDS_OBJECT_ID initiatorAdapterId;
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
VDS_HBAPORT_PROP *pHbaPortProp;
VDS_IPADDRESS *pInitiatorPortalIpAddr;
};
@ -1390,10 +1390,10 @@ typedef struct _VDS_DISK_PROP2 {
ULONG ulFlags;
VDS_STORAGE_BUS_TYPE BusType;
VDS_PARTITION_STYLE PartitionStyle;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD dwSignature;
GUID DiskGuid;
} ;
};
LPWSTR pwszDiskAddress;
LPWSTR pwszName;
LPWSTR pwszFriendlyName;

18
mingw-w64-headers/include/virtdisk.h
View File

@ -140,7 +140,7 @@ typedef struct _VIRTUAL_STORAGE_TYPE {
typedef struct _ATTACH_VIRTUAL_DISK_PARAMETERS {
ATTACH_VIRTUAL_DISK_VERSION Version;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
ULONG Reserved;
} Version1;
@ -149,7 +149,7 @@ typedef struct _ATTACH_VIRTUAL_DISK_PARAMETERS {
typedef struct _COMPACT_VIRTUAL_DISK_PARAMETERS {
COMPACT_VIRTUAL_DISK_VERSION Version;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
ULONG Reserved;
} Version1;
@ -158,7 +158,7 @@ typedef struct _COMPACT_VIRTUAL_DISK_PARAMETERS {
typedef struct _CREATE_VIRTUAL_DISK_PARAMETERS {
CREATE_VIRTUAL_DISK_VERSION Version;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
GUID UniqueId;
ULONGLONG MaximumSize;
@ -172,7 +172,7 @@ typedef struct _CREATE_VIRTUAL_DISK_PARAMETERS {
typedef struct _EXPAND_VIRTUAL_DISK_PARAMETERS {
EXPAND_VIRTUAL_DISK_VERSION Version;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
ULONGLONG NewSize;
} Version1;
@ -181,7 +181,7 @@ typedef struct _EXPAND_VIRTUAL_DISK_PARAMETERS {
typedef struct _GET_VIRTUAL_DISK_INFO {
GET_VIRTUAL_DISK_INFO_VERSION Version;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
ULONGLONG VirtualSize;
ULONGLONG PhysicalSize;
@ -202,7 +202,7 @@ typedef struct _GET_VIRTUAL_DISK_INFO {
typedef struct _MERGE_VIRTUAL_DISK_PARAMETERS {
MERGE_VIRTUAL_DISK_VERSION Version;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
ULONG MergeDepth;
} Version1;
@ -211,7 +211,7 @@ typedef struct _MERGE_VIRTUAL_DISK_PARAMETERS {
typedef struct _OPEN_VIRTUAL_DISK_PARAMETERS {
OPEN_VIRTUAL_DISK_VERSION Version;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
ULONG RWDepth;
} Version1;
@ -220,7 +220,7 @@ typedef struct _OPEN_VIRTUAL_DISK_PARAMETERS {
typedef struct _SET_VIRTUAL_DISK_INFO {
SET_VIRTUAL_DISK_INFO_VERSION Version;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PCWSTR ParentFilePath;
GUID UniqueIdentifier;
} DUMMYUNIONNAME;
@ -248,7 +248,7 @@ typedef struct _STORAGE_DEPENDENCY_INFO_TYPE_2 {
typedef struct _STORAGE_DEPENDENCY_INFO {
STORAGE_DEPENDENCY_INFO_VERSION Version;
ULONG NumberEntries;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
STORAGE_DEPENDENCY_INFO_TYPE_1 Version1Entries[1];
STORAGE_DEPENDENCY_INFO_TYPE_2 Version2Entries[1];
} DUMMYUNIONNAME;

2
mingw-w64-headers/include/wabutil.h
View File

@ -153,7 +153,7 @@ extern "C" {
typedef struct {
ULONG cctl;
LPTSTR lpszResourceName;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LPTSTR lpszComponent;
ULONG ulItemID;
};

2
mingw-w64-headers/include/wct.h
View File

@ -48,7 +48,7 @@ extern "C" {
typedef struct _WAITCHAIN_NODE_INFO {
WCT_OBJECT_TYPE ObjectType;
WCT_OBJECT_STATUS ObjectStatus;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
WCHAR ObjectName[WCT_OBJNAME_LENGTH];
LARGE_INTEGER Timeout;

4
mingw-w64-headers/include/wdspxe.h
View File

@ -27,7 +27,7 @@ typedef ULONG PXE_PROVIDER_ATTRIBUTE;
typedef struct tagPXE_ADDRESS {
ULONG uFlags;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
BYTE bAddress[PXE_MAX_ADDRESS];
ULONG uIpAddress;
} DUMMYUNIONNAME;
@ -50,7 +50,7 @@ typedef struct _PXE_DHCP_MESSAGE {
BYTE HardwareAddress[PXE_DHCP_HWAADR_SIZE];
BYTE HostName[PXE_DHCP_SERVER_SIZE];
BYTE BootFileName;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
BYTE bMagicCookie[PXE_DHCP_MAGIC_COOKIE_SIZE];
ULONG uMagicCookie;
} DUMMYUNIONNAME;

12
mingw-w64-headers/include/winbase.h
View File

@ -145,8 +145,8 @@ extern "C" {
typedef struct _OVERLAPPED {
ULONG_PTR Internal;
ULONG_PTR InternalHigh;
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
DWORD Offset;
DWORD OffsetHigh;
};
@ -384,9 +384,9 @@ extern "C" {
} COMMCONFIG,*LPCOMMCONFIG;
typedef struct _SYSTEM_INFO {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD dwOemId;
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
WORD wProcessorArchitecture;
WORD wReserved;
} DUMMYSTRUCTNAME;
@ -1192,7 +1192,7 @@ extern "C" {
BYTE cbOverhead;
BYTE iRegionIndex;
WORD wFlags;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
struct {
HANDLE hMem;
DWORD dwReserved[3];
@ -3194,7 +3194,7 @@ typedef struct _FILE_ID_BOTH_DIR_INFO {
typedef struct _FILE_ID_DESCRIPTOR{
DWORD dwSize;
FILE_ID_TYPE Type;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
LARGE_INTEGER FileId;
GUID ObjectId;
};

44
mingw-w64-headers/include/wincrypt.h
View File

@ -1491,7 +1491,7 @@ extern "C" {
typedef struct _CERT_ALT_NAME_ENTRY {
DWORD dwAltNameChoice;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PCERT_OTHER_NAME pOtherName;
LPWSTR pwszRfc822Name;
LPWSTR pwszDNSName;
@ -1659,7 +1659,7 @@ extern "C" {
typedef struct _CRL_DIST_POINT_NAME {
DWORD dwDistPointNameChoice;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
CERT_ALT_NAME_INFO FullName;
};
} CRL_DIST_POINT_NAME,*PCRL_DIST_POINT_NAME;
@ -1866,7 +1866,7 @@ extern "C" {
typedef struct _CMC_TAGGED_REQUEST {
DWORD dwTaggedRequestChoice;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PCMC_TAGGED_CERT_REQUEST pTaggedCertRequest;
};
} CMC_TAGGED_REQUEST,*PCMC_TAGGED_REQUEST;
@ -1915,7 +1915,7 @@ extern "C" {
DWORD *rgdwBodyList;
LPWSTR pwszStatusString;
DWORD dwOtherInfoChoice;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD dwFailInfo;
PCMC_PEND_INFO pPendInfo;
};
@ -2029,7 +2029,7 @@ extern "C" {
LPCSTR pszOID;
LPCWSTR pwszName;
DWORD dwGroupId;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD dwValue;
ALG_ID Algid;
DWORD dwLength;
@ -2110,7 +2110,7 @@ extern "C" {
typedef struct _CERT_ID {
DWORD dwIdChoice;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
CERT_ISSUER_SERIAL_NUMBER IssuerSerialNumber;
CRYPT_HASH_BLOB KeyId;
CRYPT_HASH_BLOB HashId;
@ -2201,7 +2201,7 @@ extern "C" {
HCRYPTPROV hCryptProv;
DWORD dwKeySpec;
DWORD dwKeyChoice;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PCRYPT_ALGORITHM_IDENTIFIER pEphemeralAlgorithm;
PCERT_ID pSenderId;
};
@ -2219,7 +2219,7 @@ extern "C" {
void *pvKeyEncryptionAuxInfo;
HCRYPTPROV hCryptProv;
DWORD dwKeyChoice;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
HCRYPTKEY hKeyEncryptionKey;
void *pvKeyEncryptionKey;
@ -2233,7 +2233,7 @@ extern "C" {
struct _CMSG_RECIPIENT_ENCODE_INFO {
DWORD dwRecipientChoice;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PCMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO pKeyTrans;
PCMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO pKeyAgree;
PCMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO pMailList;
@ -2408,7 +2408,7 @@ extern "C" {
typedef struct _CMSG_KEY_AGREE_RECIPIENT_INFO {
DWORD dwVersion;
DWORD dwOriginatorChoice;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
CERT_ID OriginatorCertId;
CERT_PUBLIC_KEY_INFO OriginatorPublicKeyInfo;
};
@ -2432,7 +2432,7 @@ extern "C" {
typedef struct _CMSG_CMS_RECIPIENT_INFO {
DWORD dwRecipientChoice;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PCMSG_KEY_TRANS_RECIPIENT_INFO pKeyTrans;
PCMSG_KEY_AGREE_RECIPIENT_INFO pKeyAgree;
PCMSG_MAIL_LIST_RECIPIENT_INFO pMailList;
@ -2513,7 +2513,7 @@ extern "C" {
PCMSG_MAIL_LIST_RECIPIENT_INFO pMailList;
DWORD dwRecipientIndex;
DWORD dwKeyChoice;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
HCRYPTKEY hKeyEncryptionKey;
void *pvKeyEncryptionKey;
};
@ -2596,10 +2596,8 @@ extern "C" {
CRYPT_ALGORITHM_IDENTIFIER KeyEncryptionAlgorithm;
CRYPT_DATA_BLOB UserKeyingMaterial;
DWORD dwOriginatorChoice;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
CERT_ID OriginatorCertId;
CERT_PUBLIC_KEY_INFO OriginatorPublicKeyInfo;
};
DWORD cKeyAgreeKeyEncryptInfo;
@ -2824,11 +2822,11 @@ extern "C" {
#define CERT_SYSTEM_STORE_RELOCATE_FLAG 0x80000000
typedef struct _CERT_SYSTEM_STORE_RELOCATE_PARA {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
HKEY hKeyBase;
void *pvBase;
};
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
void *pvSystemStore;
LPCSTR pszSystemStore;
LPCWSTR pwszSystemStore;
@ -4181,7 +4179,7 @@ extern "C" {
#define AUTHTYPE_SERVER 2
typedef struct _HTTPSPolicyCallbackData {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD cbStruct;
DWORD cbSize;
};
@ -4324,7 +4322,7 @@ typedef struct _CERT_HASHED_URL {
typedef struct _CERT_BIOMETRIC_DATA {
DWORD dwTypeOfBiometricDataChoice;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD dwPredefined;
LPSTR pszObjId;
};
@ -4366,7 +4364,7 @@ typedef struct _CERT_LOGOTYPE_IMAGE_INFO {
DWORD dwXSize;
DWORD dwYSize;
DWORD dwLogotypeImageResolutionChoice;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD dwNumBits;
DWORD dwTableSize;
};
@ -4392,7 +4390,7 @@ typedef struct _CERT_LOGOTYPE_REFERENCE {
typedef struct _CERT_LOGOTYPE_INFO {
DWORD dwLogotypeInfoChoice;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
PCERT_LOGOTYPE_DATA pLogotypeDirectInfo;
PCERT_LOGOTYPE_REFERENCE pLogotypeIndirectInfo;
} ;
@ -4655,7 +4653,7 @@ typedef struct _OCSP_BASIC_REVOKED_INFO {
typedef struct _OCSP_BASIC_RESPONSE_ENTRY {
OCSP_CERT_ID CertId;
DWORD dwCertStatus;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
POCSP_BASIC_REVOKED_INFO pRevokedInfo;
};
FILETIME ThisUpdate;
@ -4667,7 +4665,7 @@ typedef struct _OCSP_BASIC_RESPONSE_ENTRY {
typedef struct _OCSP_BASIC_RESPONSE_INFO {
DWORD dwVersion;
DWORD dwResponderIdChoice;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
CERT_NAME_BLOB ByNameResponderId;
CRYPT_HASH_BLOB ByKeyResponderId;
};

2
mingw-w64-headers/include/winevt.h
View File

@ -267,7 +267,7 @@ typedef enum _EVT_VARIANT_TYPE {
} EVT_VARIANT_TYPE;
typedef struct _EVT_VARIANT {
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
WINBOOL BooleanVal;
INT8 SByteVal;
INT16 Int16Val;

14
mingw-w64-headers/include/wingdi.h
View File

@ -1576,8 +1576,8 @@ extern "C" {
WORD dmSize;
WORD dmDriverExtra;
DWORD dmFields;
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
short dmOrientation;
short dmPaperSize;
short dmPaperLength;
@ -1603,7 +1603,7 @@ extern "C" {
DWORD dmBitsPerPel;
DWORD dmPelsWidth;
DWORD dmPelsHeight;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD dmDisplayFlags;
DWORD dmNup;
};
@ -1625,8 +1625,8 @@ extern "C" {
WORD dmSize;
WORD dmDriverExtra;
DWORD dmFields;
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
__C89_NAMELESSUNION union {
__C89_NAMELESSSTRUCT struct {
short dmOrientation;
short dmPaperSize;
short dmPaperLength;
@ -1636,7 +1636,7 @@ extern "C" {
short dmDefaultSource;
short dmPrintQuality;
};
__MINGW_EXTENSION struct {
__C89_NAMELESSSTRUCT struct {
POINTL dmPosition;
DWORD dmDisplayOrientation;
DWORD dmDisplayFixedOutput;
@ -1652,7 +1652,7 @@ extern "C" {
DWORD dmBitsPerPel;
DWORD dmPelsWidth;
DWORD dmPelsHeight;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD dmDisplayFlags;
DWORD dmNup;
};

4
mingw-w64-headers/include/wininet.h
View File

@ -1316,7 +1316,7 @@ extern "C" {
LPSTR lpHeaderInfo;
DWORD dwHeaderInfoSize;
LPSTR lpszFileExtension;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD dwReserved;
DWORD dwExemptDelta;
};
@ -1338,7 +1338,7 @@ extern "C" {
LPWSTR lpHeaderInfo;
DWORD dwHeaderInfoSize;
LPWSTR lpszFileExtension;
__MINGW_EXTENSION union {
__C89_NAMELESSUNION union {
DWORD dwReserved;
DWORD dwExemptDelta;
};

8
mingw-w64-headers/include/winineti.h
View File

@ -47,9 +47,9 @@ typedef struct _INTERNET_CACHE_CONFIG_INFOA
WINBOOL fPerUser;
DWORD dwSyncMode;
DWORD dwNumCachePaths;
__C89_NAMELESS union
__C89_NAMELESSUNION union
{
__C89_NAMELESS struct
__C89_NAMELESSSTRUCT struct
{
CHAR CachePath[MAX_PATH];
DWORD dwCacheSize;
@ -69,9 +69,9 @@ typedef struct _INTERNET_CACHE_CONFIG_INFOW
WINBOOL fPerUser;
DWORD dwSyncMode;
DWORD dwNumCachePaths;
__C89_NAMELESS union
__C89_NAMELESSUNION union
{
__C89_NAMELESS struct
__C89_NAMELESSSTRUCT struct
{
WCHAR CachePath[MAX_PATH];
DWORD dwCacheSize;

Some files were not shown because too many files have changed in this diff Show More