Fix C-style arrays.

This commit is contained in:
Andrey Penechko 2014-12-31 03:03:52 +02:00
parent 4cbf96784b
commit bf6d65959d
37 changed files with 453 additions and 453 deletions

View File

@ -2834,14 +2834,14 @@ static if (_WIN32_IE >= 0x400) {
struct NMCBEDRAGBEGINW {
NMHDR hdr;
int iItemid;
WCHAR szText[CBEMAXSTRLEN];
WCHAR[CBEMAXSTRLEN] szText;
}
alias NMCBEDRAGBEGINW* LPNMCBEDRAGBEGINW, PNMCBEDRAGBEGINW;
struct NMCBEDRAGBEGINA {
NMHDR hdr;
int iItemid;
char szText[CBEMAXSTRLEN];
char[CBEMAXSTRLEN] szText;
}
alias NMCBEDRAGBEGINA* LPNMCBEDRAGBEGINA, PNMCBEDRAGBEGINA;
@ -2962,7 +2962,7 @@ struct NMCBEENDEDITW {
NMHDR hdr;
BOOL fChanged;
int iNewSelection;
WCHAR szText[CBEMAXSTRLEN];
WCHAR[CBEMAXSTRLEN] szText;
int iWhy;
}
alias NMCBEENDEDITW* LPNMCBEENDEDITW, PNMCBEENDEDITW;
@ -2971,7 +2971,7 @@ struct NMCBEENDEDITA {
NMHDR hdr;
BOOL fChanged;
int iNewSelection;
char szText[CBEMAXSTRLEN];
char[CBEMAXSTRLEN] szText;
int iWhy;
}
alias NMCBEENDEDITA* LPNMCBEENDEDITA, PNMCBEENDEDITA;
@ -2995,9 +2995,9 @@ struct TBBUTTON {
BYTE fsState;
BYTE fsStyle;
version(Win64){
BYTE bReserved[6];
BYTE[6] bReserved;
} else {
BYTE bReserved[2];
BYTE[2] bReserved;
}
DWORD_PTR dwData;
INT_PTR iString;
@ -3172,7 +3172,7 @@ struct HD_LAYOUT {
RECT* prc;
WINDOWPOS* pwpos;
}
alias HDLAYOUT* LPHDLAYOUT;
alias HD_LAYOUT* LPHDLAYOUT;
deprecated alias HD_LAYOUT HDLAYOUT;
struct HD_HITTESTINFO {
@ -3543,7 +3543,7 @@ static if (_WIN32_IE >= 0x300) {
struct NMTTDISPINFOA {
NMHDR hdr;
LPSTR lpszText;
char szText[80];
char[80] szText;
HINSTANCE hinst;
UINT uFlags;
LPARAM lParam;
@ -3552,7 +3552,7 @@ static if (_WIN32_IE >= 0x300) {
struct NMTTDISPINFOW {
NMHDR hdr;
LPWSTR lpszText;
WCHAR szText[80];
WCHAR[80] szText;
HINSTANCE hinst;
UINT uFlags;
LPARAM lParam;
@ -3561,7 +3561,7 @@ static if (_WIN32_IE >= 0x300) {
struct NMTTDISPINFOA {
NMHDR hdr;
LPSTR lpszText;
char szText[80];
char[80] szText;
HINSTANCE hinst;
UINT uFlags;
}
@ -3569,7 +3569,7 @@ static if (_WIN32_IE >= 0x300) {
struct NMTTDISPINFOW {
NMHDR hdr;
LPWSTR lpszText;
WCHAR szText[80];
WCHAR[80] szText;
HINSTANCE hinst;
UINT uFlags;
}

View File

@ -302,7 +302,7 @@ interface LPDIRECT3DDEVICE9 : IUnknown
D3DMATRIX ProjectionMatrix;
D3DMATRIX ViewMatrix;
D3DMATRIX WorldMatrix;
D3DMATRIX TextureMatrices[8];
D3DMATRIX[8] TextureMatrices;
DWORD FVF;
UINT VertexSize;
@ -311,8 +311,8 @@ interface LPDIRECT3DDEVICE9 : IUnknown
BOOL SoftwareVertexProcessing;
D3DMATERIAL9 Material;
D3DLIGHT9 Lights[16];
BOOL LightsEnabled[16];
D3DLIGHT9[16] Lights;
BOOL[16] LightsEnabled;
D3DGAMMARAMP GammaRamp;
RECT ScissorRect;

View File

@ -1708,8 +1708,8 @@ const D3DRTYPECOUNT = D3DRTYPE_INDEXBUFFER+1;
struct D3DDEVINFO_RESOURCEMANAGER
{
//#ifndef WOW64_ENUM_WORKAROUND
// D3DRESOURCESTATS stats[D3DRTYPECOUNT];
D3DRESOURCESTATS stats[8];
// D3DRESOURCESTATS[D3DRTYPECOUNT] stats;
D3DRESOURCESTATS[8] stats;
}
alias D3DDEVINFO_RESOURCEMANAGER* LPD3DDEVINFO_RESOURCEMANAGER;

View File

@ -160,7 +160,7 @@ align(4) struct D3DXFONT_DESCA
BYTE OutputPrecision;
BYTE Quality;
BYTE PitchAndFamily;
CHAR FaceName[LF_FACESIZE];
CHAR[LF_FACESIZE] FaceName;
}
align(4) struct D3DXFONT_DESCW
@ -174,7 +174,7 @@ align(4) struct D3DXFONT_DESCW
BYTE OutputPrecision;
BYTE Quality;
BYTE PitchAndFamily;
WCHAR FaceName[LF_FACESIZE];
WCHAR[LF_FACESIZE] FaceName;
}
align(4) struct TEXTMETRICA
@ -1744,36 +1744,36 @@ const char[] XSKINEXP_TEMPLATES =
<B8D65549-D7C9-4995-89CF-53A9A8B031E3>
DWORD nIndices;
DWORD nOriginalVertices;
array DWORD indices[nIndices];
array DWORD[nIndices] indices;
}
template FaceAdjacency
{
<A64C844A-E282-4756-8B80-250CDE04398C>
DWORD nIndices;
array DWORD indices[nIndices];
array DWORD[nIndices] indices;
}
template SkinWeights
{
<6F0D123B-BAD2-4167-A0D0-80224F25FABB>
STRING transformNodeName;
DWORD nWeights;
array DWORD vertexIndices[nWeights];
array float weights[nWeights];
array DWORD[nWeights] vertexIndices;
array float[nWeights] weights;
Matrix4x4 matrixOffset;
}
template Patch
{
<A3EB5D44-FC22-429D-9AFB-3221CB9719A6>
DWORD nControlIndices;
array DWORD controlIndices[nControlIndices];
array DWORD[nControlIndices] controlIndices;
}
template PatchMesh
{
<D02C95CC-EDBA-4305-9B5D-1820D7704BBF>
DWORD nVertices;
array Vector vertices[nVertices];
array Vector[nVertices] vertices;
DWORD nPatches;
array Patch patches[nPatches];
array Patch[nPatches] patches;
[ ... ]
}
template PatchMesh9
@ -1783,16 +1783,16 @@ const char[] XSKINEXP_TEMPLATES =
DWORD Degree;
DWORD Basis;
DWORD nVertices;
array Vector vertices[nVertices];
array Vector[nVertices] vertices;
DWORD nPatches;
array Patch patches[nPatches];
array Patch[nPatches] patches;
[ ... ]
} "
"template EffectFloats
{
<F1CFE2B3-0DE3-4e28-AFA1-155A750A282D>
DWORD nFloats;
array float Floats[nFloats];
array float[nFloats] Floats;
}
template EffectString
{
@ -1809,7 +1809,7 @@ const char[] XSKINEXP_TEMPLATES =
<3014B9A0-62F5-478c-9B86-E4AC9F4E418B>
STRING ParamName;
DWORD nFloats;
array float Floats[nFloats];
array float[nFloats] Floats;
} "
"template EffectParamString
{
@ -1841,7 +1841,7 @@ const char[] XSKINEXP_TEMPLATES =
FLOAT TicksPerSec;
DWORD PlaybackType;
DWORD BufferLength;
array DWORD CompressedData[BufferLength];
array DWORD[BufferLength] CompressedData;
} ";
const char[] XEXTENSIONS_TEMPLATES =
@ -1851,7 +1851,7 @@ const char[] XEXTENSIONS_TEMPLATES =
<B6E70A0E-8EF9-4e83-94AD-ECC8B0C04897>
DWORD dwFVF;
DWORD nDWords;
array DWORD data[nDWords];
array DWORD[nDWords] data;
}
template VertexElement
{
@ -1865,9 +1865,9 @@ const char[] XEXTENSIONS_TEMPLATES =
{
<BF22E553-292C-4781-9FEA-62BD554BDD93>
DWORD nElements;
array VertexElement Elements[nElements];
array VertexElement[nElements] Elements;
DWORD nDWords;
array DWORD data[nDWords];
array DWORD[nDWords] data;
}
template PMAttributeRange
{
@ -1890,14 +1890,14 @@ const char[] XEXTENSIONS_TEMPLATES =
{
<B6C3E656-EC8B-4b92-9B62-681659522947>
DWORD nAttributes;
array PMAttributeRange attributeRanges[nAttributes];
array PMAttributeRange[nAttributes] attributeRanges;
DWORD nMaxValence;
DWORD nMinLogicalVertices;
DWORD nMaxLogicalVertices;
DWORD nVSplits;
array PMVSplitRecord splitRecords[nVSplits];
array PMVSplitRecord[nVSplits] splitRecords;
DWORD nAttributeMispredicts;
array DWORD attributeMispredicts[nAttributeMispredicts];
array DWORD[nAttributeMispredicts] attributeMispredicts;
} ";
enum : uint

View File

@ -24,8 +24,8 @@ struct DIDEVICEINSTANCEA
GUID guidInstance;
GUID guidProduct;
DWORD dwDevType;
CHAR tszInstanceName[MAX_PATH];
CHAR tszProductName[MAX_PATH];
CHAR[MAX_PATH] tszInstanceName;
CHAR[MAX_PATH] tszProductName;
GUID guidFFDriver;
WORD wUsagePage;
WORD wUsage;
@ -39,7 +39,7 @@ struct DIDEVICEOBJECTINSTANCEA
DWORD dwOfs;
DWORD dwType;
DWORD dwFlags;
CHAR tszName[MAX_PATH];
CHAR[MAX_PATH] tszName;
DWORD dwFFMaxForce;
DWORD dwFFForceResolution;
WORD wCollectionNumber;
@ -103,7 +103,7 @@ struct DIACTIONFORMATA
HINSTANCE hInstString;
FILETIME ftTimeStamp;
DWORD dwCRC;
CHAR tszActionMap[MAX_PATH];
CHAR[MAX_PATH] tszActionMap;
}
struct DIDEVCAPS
@ -182,7 +182,7 @@ struct DIEFFECTINFOA
DWORD dwEffType;
DWORD dwStaticParams;
DWORD dwDynamicParams;
CHAR tszName[MAX_PATH];
CHAR[MAX_PATH] tszName;
}
struct DIFILEEFFECT
@ -190,21 +190,21 @@ struct DIFILEEFFECT
DWORD dwSize;
GUID GuidEffect;
DIEFFECT* lpDiEffect;
CHAR szFriendlyName[MAX_PATH];
CHAR[MAX_PATH] szFriendlyName;
}
struct DIDEVICEIMAGEINFOA
{
CHAR tszImagePath[MAX_PATH];
DWORD dwFlags;
CHAR[MAX_PATH] tszImagePath;
DWORD dwFlags;
// These are valid if DIDIFT_OVERLAY is present in dwFlags.
DWORD dwViewID;
RECT rcOverlay;
DWORD dwObjID;
DWORD dwcValidPts;
POINT rgptCalloutLine[5];
RECT rcCalloutRect;
DWORD dwTextAlign;
DWORD dwViewID;
RECT rcOverlay;
DWORD dwObjID;
DWORD dwcValidPts;
POINT[5] rgptCalloutLine;
RECT rcCalloutRect;
DWORD dwTextAlign;
}
struct DIDEVICEIMAGEINFOHEADERA
@ -250,20 +250,20 @@ struct DIMOUSESTATE2
LONG lX;
LONG lY;
LONG lZ;
BYTE rgbButtons[8];
BYTE[8] rgbButtons;
}
struct DIJOYSTATE
{
LONG lX; /* x-axis position */
LONG lY; /* y-axis position */
LONG lZ; /* z-axis position */
LONG lRx; /* x-axis rotation */
LONG lRy; /* y-axis rotation */
LONG lRz; /* z-axis rotation */
LONG rglSlider[2]; /* extra axes positions */
DWORD rgdwPOV[4]; /* POV directions */
BYTE rgbButtons[32]; /* 32 buttons */
LONG lX; /* x-axis position */
LONG lY; /* y-axis position */
LONG lZ; /* z-axis position */
LONG lRx; /* x-axis rotation */
LONG lRy; /* y-axis rotation */
LONG lRz; /* z-axis rotation */
LONG[2] rglSlider; /* extra axes positions */
DWORD[4] rgdwPOV; /* POV directions */
BYTE[32] rgbButtons; /* 32 buttons */
}
struct DIPROPRANGE

View File

@ -74,7 +74,7 @@ struct OLECMDTEXT {
DWORD cmdtextf;
ULONG cwActual;
ULONG cwBuf;
wchar rgwz[1];
wchar[1] rgwz;
}
struct OLECMD {

10
3rdparty/win32/imm.d vendored
View File

@ -301,7 +301,7 @@ struct CANDIDATELIST{
DWORD dwSelection;
DWORD dwPageStart;
DWORD dwPageSize;
DWORD dwOffset[1];
DWORD[1] dwOffset;
}
alias CANDIDATELIST* PCANDIDATELIST, LPCANDIDATELIST;
@ -319,13 +319,13 @@ alias REGISTERWORDW* PREGISTERWORDW, LPREGISTERWORDW;
struct STYLEBUFA{
DWORD dwStyle;
CHAR szDescription[STYLE_DESCRIPTION_SIZE];
CHAR[STYLE_DESCRIPTION_SIZE] szDescription;
}
alias STYLEBUFA* PSTYLEBUFA, LPSTYLEBUFA;
struct STYLEBUFW{
DWORD dwStyle;
WCHAR szDescription[STYLE_DESCRIPTION_SIZE];
WCHAR[STYLE_DESCRIPTION_SIZE] szDescription;
}
alias STYLEBUFW* PSTYLEBUFW, LPSTYLEBUFW;
@ -337,7 +337,7 @@ struct IMEMENUITEMINFOA{
HBITMAP hbmpChecked;
HBITMAP hbmpUnchecked;
DWORD dwItemData;
CHAR szString[IMEMENUITEM_STRING_SIZE];
CHAR[IMEMENUITEM_STRING_SIZE] szString;
HBITMAP hbmpItem;
}
alias IMEMENUITEMINFOA* PIMEMENUITEMINFOA, LPIMEMENUITEMINFOA;
@ -350,7 +350,7 @@ struct IMEMENUITEMINFOW{
HBITMAP hbmpChecked;
HBITMAP hbmpUnchecked;
DWORD dwItemData;
WCHAR szString[IMEMENUITEM_STRING_SIZE];
WCHAR[IMEMENUITEM_STRING_SIZE] szString;
HBITMAP hbmpItem;
}
alias IMEMENUITEMINFOW* PIMEMENUITEMINFOW, LPIMEMENUITEMINFOW;

View File

@ -352,13 +352,13 @@ struct USER_INFO_20 {
alias USER_INFO_20* PUSER_INFO_20, LPUSER_INFO_20;
struct USER_INFO_21 {
BYTE usri21_password[ENCRYPTED_PWLEN];
BYTE[ENCRYPTED_PWLEN] usri21_password;
}
alias USER_INFO_21* PUSER_INFO_21, LPUSER_INFO_21;
struct USER_INFO_22{
LPWSTR usri22_name;
BYTE usri22_password[ENCRYPTED_PWLEN];
BYTE[ENCRYPTED_PWLEN] usri22_password;
DWORD usri22_password_age;
DWORD usri22_priv;
LPWSTR usri22_home_dir;

View File

@ -1036,7 +1036,7 @@ struct MMTIME {
BYTE frame;
BYTE fps;
BYTE dummy;
BYTE pad[2];
BYTE[2] pad;
};
struct midi {
DWORD songptrpos;
@ -1100,7 +1100,7 @@ struct WAVEOUTCAPSA {
WORD wMid;
WORD wPid;
MMVERSION vDriverVersion;
CHAR szPname[MAXPNAMELEN];
CHAR[MAXPNAMELEN] szPname;
DWORD dwFormats;
WORD wChannels;
WORD wReserved1;
@ -1112,7 +1112,7 @@ struct WAVEOUTCAPSW {
WORD wMid;
WORD wPid;
MMVERSION vDriverVersion;
WCHAR szPname[MAXPNAMELEN];
WCHAR[MAXPNAMELEN] szPname;
DWORD dwFormats;
WORD wChannels;
WORD wReserved1;
@ -1124,7 +1124,7 @@ struct WAVEINCAPSA {
WORD wMid;
WORD wPid;
MMVERSION vDriverVersion;
CHAR szPname[MAXPNAMELEN];
CHAR[MAXPNAMELEN] szPname;
DWORD dwFormats;
WORD wChannels;
WORD wReserved1;
@ -1135,7 +1135,7 @@ struct WAVEINCAPSW {
WORD wMid;
WORD wPid;
MMVERSION vDriverVersion;
WCHAR szPname[MAXPNAMELEN];
WCHAR[MAXPNAMELEN] szPname;
DWORD dwFormats;
WORD wChannels;
WORD wReserved1;
@ -1179,16 +1179,16 @@ alias HMIDIIN* LPHMIDIIN;
alias HMIDIOUT* LPHMIDIOUT;
alias HMIDISTRM* LPHMIDISTRM;
alias WORD PATCHARRAY[MIDIPATCHSIZE];
alias WORD[MIDIPATCHSIZE] PATCHARRAY;
alias WORD* LPPATCHARRAY;
alias WORD KEYARRAY[MIDIPATCHSIZE];
alias WORD[MIDIPATCHSIZE] KEYARRAY;
alias WORD* LPKEYARRAY;
struct MIDIOUTCAPSA {
WORD wMid;
WORD wPid;
MMVERSION vDriverVersion;
CHAR szPname[MAXPNAMELEN];
CHAR[MAXPNAMELEN] szPname;
WORD wTechnology;
WORD wVoices;
WORD wNotes;
@ -1201,7 +1201,7 @@ struct MIDIOUTCAPSW {
WORD wMid;
WORD wPid;
MMVERSION vDriverVersion;
WCHAR szPname[MAXPNAMELEN];
WCHAR[MAXPNAMELEN] szPname;
WORD wTechnology;
WORD wVoices;
WORD wNotes;
@ -1214,7 +1214,7 @@ struct MIDIINCAPSA {
WORD wMid;
WORD wPid;
MMVERSION vDriverVersion;
CHAR szPname[MAXPNAMELEN];
CHAR[MAXPNAMELEN] szPname;
DWORD dwSupport;
}
alias MIDIINCAPSA* PMIDIINCAPSA, LPMIDIINCAPSA;
@ -1223,7 +1223,7 @@ struct MIDIINCAPSW {
WORD wMid;
WORD wPid;
MMVERSION vDriverVersion;
WCHAR szPname[MAXPNAMELEN];
WCHAR[MAXPNAMELEN] szPname;
DWORD dwSupport;
}
alias MIDIINCAPSW* PMIDIINCAPSW, LPMIDIINCAPSW;
@ -1237,7 +1237,7 @@ struct MIDIHDR {
MIDIHDR *lpNext;
DWORD reserved;
DWORD dwOffset;
DWORD dwReserved[8];
DWORD[8] dwReserved;
}
alias MIDIHDR* PMIDIHDR, LPMIDIHDR;
@ -1245,7 +1245,7 @@ struct MIDIEVENT {
DWORD dwDeltaTime;
DWORD dwStreamID;
DWORD dwEvent;
DWORD dwParms[1];
DWORD[1] dwParms;
}
struct MIDISTRMBUFFVER {
@ -1270,7 +1270,7 @@ struct AUXCAPSA {
WORD wMid;
WORD wPid;
MMVERSION vDriverVersion;
CHAR szPname[MAXPNAMELEN];
CHAR[MAXPNAMELEN] szPname;
WORD wTechnology;
WORD wReserved1;
DWORD dwSupport;
@ -1281,7 +1281,7 @@ struct AUXCAPSW {
WORD wMid;
WORD wPid;
MMVERSION vDriverVersion;
WCHAR szPname[MAXPNAMELEN];
WCHAR[MAXPNAMELEN] szPname;
WORD wTechnology;
WORD wReserved1;
DWORD dwSupport;
@ -1298,7 +1298,7 @@ struct MIXERCAPSA {
WORD wMid;
WORD wPid;
MMVERSION vDriverVersion;
CHAR szPname[MAXPNAMELEN];
CHAR[MAXPNAMELEN] szPname;
DWORD fdwSupport;
DWORD cDestinations;
}
@ -1308,7 +1308,7 @@ struct MIXERCAPSW {
WORD wMid;
WORD wPid;
MMVERSION vDriverVersion;
WCHAR szPname[MAXPNAMELEN];
WCHAR[MAXPNAMELEN] szPname;
DWORD fdwSupport;
DWORD cDestinations;
}
@ -1325,15 +1325,15 @@ struct MIXERLINEA {
DWORD cChannels;
DWORD cConnections;
DWORD cControls;
CHAR szShortName[MIXER_SHORT_NAME_CHARS];
CHAR szName[MIXER_LONG_NAME_CHARS];
CHAR[MIXER_SHORT_NAME_CHARS] szShortName;
CHAR[MIXER_LONG_NAME_CHARS] szName;
struct Target {
DWORD dwType;
DWORD dwDeviceID;
WORD wMid;
WORD wPid;
MMVERSION vDriverVersion;
CHAR szPname[MAXPNAMELEN];
CHAR[MAXPNAMELEN] szPname;
}
}
alias MIXERLINEA* PMIXERLINEA, LPMIXERLINEA;
@ -1349,15 +1349,15 @@ struct MIXERLINEW {
DWORD cChannels;
DWORD cConnections;
DWORD cControls;
WCHAR szShortName[MIXER_SHORT_NAME_CHARS];
WCHAR szName[MIXER_LONG_NAME_CHARS];
WCHAR[MIXER_SHORT_NAME_CHARS] szShortName;
WCHAR[MIXER_LONG_NAME_CHARS] szName;
struct Target {
DWORD dwType;
DWORD dwDeviceID;
WORD wMid;
WORD wPid;
MMVERSION vDriverVersion;
WCHAR szPname[MAXPNAMELEN];
WCHAR[MAXPNAMELEN] szPname;
}
}
alias MIXERLINEW* PMIXERLINEW, LPMIXERLINEW;
@ -1368,8 +1368,8 @@ struct MIXERCONTROLA {
DWORD dwControlType;
DWORD fdwControl;
DWORD cMultipleItems;
CHAR szShortName[MIXER_SHORT_NAME_CHARS];
CHAR szName[MIXER_LONG_NAME_CHARS];
CHAR[MIXER_SHORT_NAME_CHARS] szShortName;
CHAR[MIXER_LONG_NAME_CHARS] szName;
union _Bounds {
struct {
LONG lMinimum;
@ -1379,13 +1379,13 @@ struct MIXERCONTROLA {
DWORD dwMinimum;
DWORD dwMaximum;
}
DWORD dwReserved[6];
DWORD[6] dwReserved;
}
_Bounds Bounds;
union _Metrics {
DWORD cSteps;
DWORD cbCustomData;
DWORD dwReserved[6];
DWORD[6] dwReserved;
}
_Metrics Metrics;
}
@ -1397,8 +1397,8 @@ struct MIXERCONTROLW {
DWORD dwControlType;
DWORD fdwControl;
DWORD cMultipleItems;
WCHAR szShortName[MIXER_SHORT_NAME_CHARS];
WCHAR szName[MIXER_LONG_NAME_CHARS];
WCHAR[MIXER_SHORT_NAME_CHARS] szShortName;
WCHAR[MIXER_LONG_NAME_CHARS] szName;
union _Bounds {
struct {
LONG lMinimum;
@ -1408,13 +1408,13 @@ struct MIXERCONTROLW {
DWORD dwMinimum;
DWORD dwMaximum;
}
DWORD dwReserved[6];
DWORD[6] dwReserved;
}
_Bounds Bounds;
union _Metrics {
DWORD cSteps;
DWORD cbCustomData;
DWORD dwReserved[6];
DWORD[6] dwReserved;
}
_Metrics Metrics;
}
@ -1463,14 +1463,14 @@ alias MIXERCONTROLDETAILS* PMIXERCONTROLDETAILS, LPMIXERCONTROLDETAILS;
struct MIXERCONTROLDETAILS_LISTTEXTA {
DWORD dwParam1;
DWORD dwParam2;
CHAR szName[MIXER_LONG_NAME_CHARS];
CHAR[MIXER_LONG_NAME_CHARS] szName;
}
alias MIXERCONTROLDETAILS_LISTTEXTA* PMIXERCONTROLDETAILS_LISTTEXTA, LPMIXERCONTROLDETAILS_LISTTEXTA;
struct MIXERCONTROLDETAILS_LISTTEXTW {
DWORD dwParam1;
DWORD dwParam2;
WCHAR szName[MIXER_LONG_NAME_CHARS];
WCHAR[MIXER_LONG_NAME_CHARS] szName;
}
alias MIXERCONTROLDETAILS_LISTTEXTW* PMIXERCONTROLDETAILS_LISTTEXTW, LPMIXERCONTROLDETAILS_LISTTEXTW;
@ -1500,7 +1500,7 @@ alias TIMECAPS* PTIMECAPS, LPTIMECAPS;
struct JOYCAPSA {
WORD wMid;
WORD wPid;
CHAR szPname[MAXPNAMELEN];
CHAR[MAXPNAMELEN] szPname;
UINT wXmin;
UINT wXmax;
UINT wYmin;
@ -1520,15 +1520,15 @@ struct JOYCAPSA {
UINT wMaxAxes;
UINT wNumAxes;
UINT wMaxButtons;
CHAR szRegKey[MAXPNAMELEN];
CHAR szOEMVxD[MAX_JOYSTICKOEMVXDNAME];
CHAR[MAXPNAMELEN] szRegKey;
CHAR[MAX_JOYSTICKOEMVXDNAME] szOEMVxD;
}
alias JOYCAPSA* PJOYCAPSA, LPJOYCAPSA;
struct JOYCAPSW {
WORD wMid;
WORD wPid;
WCHAR szPname[MAXPNAMELEN];
WCHAR[MAXPNAMELEN] szPname;
UINT wXmin;
UINT wXmax;
UINT wYmin;
@ -1548,8 +1548,8 @@ struct JOYCAPSW {
UINT wMaxAxes;
UINT wNumAxes;
UINT wMaxButtons;
WCHAR szRegKey[MAXPNAMELEN];
WCHAR szOEMVxD[MAX_JOYSTICKOEMVXDNAME];
WCHAR[MAXPNAMELEN] szRegKey;
WCHAR[MAX_JOYSTICKOEMVXDNAME] szOEMVxD;
}
alias JOYCAPSW* PJOYCAPSW, LPJOYCAPSW;
@ -1598,7 +1598,7 @@ struct MMIOINFO {
HPSTR pchEndWrite;
LONG lBufOffset;
LONG lDiskOffset;
DWORD adwInfo[3];
DWORD[3] adwInfo;
DWORD dwReserved1;
DWORD dwReserved2;
HMMIO hmmio;

View File

@ -212,7 +212,7 @@ struct NCB {
extern (Windows) void function(NCB*) ncb_post;
UCHAR ncb_lana_num;
UCHAR ncb_cmd_cplt;
UCHAR ncb_reserve[10];
UCHAR[10] ncb_reserve;
HANDLE ncb_event;
}
alias NCB* PNCB;

View File

@ -112,7 +112,7 @@ struct SECPKG_SUPPLEMENTAL_CRED {
alias SECPKG_SUPPLEMENTAL_CRED* PSECPKG_SUPPLEMENTAL_CRED;
struct SECPKG_SUPPLEMENTAL_CRED_ARRAY {
ULONG CredentialCount;
SECPKG_SUPPLEMENTAL_CRED Credentials[1];
SECPKG_SUPPLEMENTAL_CRED[1] Credentials;
}
alias SECPKG_SUPPLEMENTAL_CRED_ARRAY* PSECPKG_SUPPLEMENTAL_CRED_ARRAY;
struct SECPKG_PARAMETERS {
@ -145,12 +145,12 @@ alias SECURITY_USER_DATA* PSECURITY_USER_DATA,PSecurityUserData;
alias SECURITY_USER_DATA SecurityUserData;
struct SECPKG_GSS_INFO {
ULONG EncodedIdLength;
UCHAR EncodedId[4];
UCHAR[4] EncodedId;
}
alias SECPKG_GSS_INFO* PSECPKG_GSS_INFO;
struct SECPKG_CONTEXT_THUNKS {
ULONG InfoLevelCount;
ULONG Levels[1];
ULONG[1] Levels;
}
alias SECPKG_CONTEXT_THUNKS* PSECPKG_CONTEXT_THUNKS;
struct SECPKG_MUTUAL_AUTH_LEVEL {

View File

@ -161,7 +161,7 @@ struct _wireSAFEARRAY {
ULONG cbElements;
ULONG cLocks;
SAFEARRAYUNION uArrayStructs;
SAFEARRAYBOUND rgsabound[1];
SAFEARRAYBOUND[1] rgsabound;
}
alias _wireSAFEARRAY* wireSAFEARRAY;
@ -173,7 +173,7 @@ struct SAFEARRAY {
ULONG cbElements;
ULONG cLocks;
PVOID pvData;
SAFEARRAYBOUND rgsabound[1];
SAFEARRAYBOUND[1] rgsabound;
}
alias SAFEARRAY* LPSAFEARRAY;
@ -316,7 +316,7 @@ struct TYPEDESC {
struct ARRAYDESC {
TYPEDESC tdescElem;
USHORT cDims;
SAFEARRAYBOUND rgbounds[1];
SAFEARRAYBOUND[1] rgbounds;
}
struct PARAMDESCEX {

View File

@ -91,7 +91,7 @@ struct DVTARGETDEVICE {
WORD tdDeviceNameOffset;
WORD tdPortNameOffset;
WORD tdExtDevmodeOffset;
BYTE tdData[1];
BYTE[1] tdData;
}
struct FORMATETC {
@ -109,7 +109,7 @@ struct RemSTGMEDIUM {
ULONG pData;
uint pUnkForRelease;
uint cbData;
BYTE data[1];
BYTE[1] data;
}
struct HLITEM {
@ -226,7 +226,7 @@ struct RPCOLEMESSAGE {
PVOID Buffer;
ULONG cbBuffer;
ULONG iMethod;
PVOID reserved2[5];
PVOID[5] reserved2;
ULONG rpcFlags;
}
alias RPCOLEMESSAGE* PRPCOLEMESSAGE;
@ -250,7 +250,7 @@ enum MKREDUCE {
struct RemSNB {
uint ulCntStr;
uint ulCntChar;
OLECHAR rgString[1];
OLECHAR[1] rgString;
}
enum ADVF {

View File

@ -543,7 +543,7 @@ struct OLEUICHANGEICONW {
HRSRC hResource;
HGLOBAL hMetaPict;
CLSID clsid;
WCHAR szIconExe[MAX_PATH];
WCHAR[MAX_PATH] szIconExe;
int cchIconExe;
}
alias OLEUICHANGEICONW* POLEUICHANGEICONW, LPOLEUICHANGEICONW;
@ -560,7 +560,7 @@ struct OLEUICHANGEICONA {
HRSRC hResource;
HGLOBAL hMetaPict;
CLSID clsid;
CHAR szIconExe[MAX_PATH];
CHAR[MAX_PATH] szIconExe;
int cchIconExe;
}
alias OLEUICHANGEICONA* POLEUICHANGEICONA, LPOLEUICHANGEICONA;
@ -658,7 +658,7 @@ struct OLEUICHANGESOURCEW {
LPCWSTR lpszTemplate;
HRSRC hResource;
OPENFILENAMEW* lpOFN;
DWORD dwReserved1[4];
DWORD[4] dwReserved1;
LPOLEUILINKCONTAINERW lpOleUILinkContainer;
DWORD dwLink;
LPWSTR lpszDisplayName;
@ -679,7 +679,7 @@ struct OLEUICHANGESOURCEA {
LPCSTR lpszTemplate;
HRSRC hResource;
OPENFILENAMEA *lpOFN;
DWORD dwReserved1[4];
DWORD[4] dwReserved1;
LPOLEUILINKCONTAINERA lpOleUILinkContainer;
DWORD dwLink;
LPSTR lpszDisplayName;
@ -752,10 +752,10 @@ alias IOleUILinkInfoA LPOLEUILINKINFOA;
struct OLEUIGNRLPROPSW {
DWORD cbStruct;
DWORD dwFlags;
DWORD dwReserved1[2];
DWORD[2] dwReserved1;
LPFNOLEUIHOOK lpfnHook;
LPARAM lCustData;
DWORD dwReserved2[3];
DWORD[3] dwReserved2;
OLEUIOBJECTPROPSW* lpOP;
}
alias OLEUIGNRLPROPSW* POLEUIGNRLPROPSW, LPOLEUIGNRLPROPSW;
@ -763,10 +763,10 @@ alias OLEUIGNRLPROPSW* POLEUIGNRLPROPSW, LPOLEUIGNRLPROPSW;
struct OLEUIGNRLPROPSA {
DWORD cbStruct;
DWORD dwFlags;
DWORD dwReserved1[2];
DWORD[2] dwReserved1;
LPFNOLEUIHOOK lpfnHook;
LPARAM lCustData;
DWORD dwReserved2[3];
DWORD[3] dwReserved2;
OLEUIOBJECTPROPSA* lpOP;
}
alias OLEUIGNRLPROPSA* POLEUIGNRLPROPSA, LPOLEUIGNRLPROPSA;
@ -774,10 +774,10 @@ alias OLEUIGNRLPROPSA* POLEUIGNRLPROPSA, LPOLEUIGNRLPROPSA;
struct OLEUIVIEWPROPSW {
DWORD cbStruct;
DWORD dwFlags;
DWORD dwReserved1[2];
DWORD[2] dwReserved1;
LPFNOLEUIHOOK lpfnHook;
LPARAM lCustData;
DWORD dwReserved2[3];
DWORD[3] dwReserved2;
OLEUIOBJECTPROPSW* lpOP;
int nScaleMin;
int nScaleMax;
@ -787,10 +787,10 @@ alias OLEUIVIEWPROPSW* POLEUIVIEWPROPSW, LPOLEUIVIEWPROPSW;
struct OLEUIVIEWPROPSA {
DWORD cbStruct;
DWORD dwFlags;
DWORD dwReserved1[2];
DWORD[2] dwReserved1;
LPFNOLEUIHOOK lpfnHook;
LPARAM lCustData;
DWORD dwReserved2[3];
DWORD[3] dwReserved2;
OLEUIOBJECTPROPSA *lpOP;
int nScaleMin;
int nScaleMax;
@ -800,10 +800,10 @@ alias OLEUIVIEWPROPSA* POLEUIVIEWPROPSA, LPOLEUIVIEWPROPSA;
struct OLEUILINKPROPSW {
DWORD cbStruct;
DWORD dwFlags;
DWORD dwReserved1[2];
DWORD[2] dwReserved1;
LPFNOLEUIHOOK lpfnHook;
LPARAM lCustData;
DWORD dwReserved2[3];
DWORD[3] dwReserved2;
OLEUIOBJECTPROPSW *lpOP;
}
alias OLEUILINKPROPSW* POLEUILINKPROPSW, LPOLEUILINKPROPSW;
@ -811,10 +811,10 @@ alias OLEUILINKPROPSW* POLEUILINKPROPSW, LPOLEUILINKPROPSW;
struct OLEUILINKPROPSA {
DWORD cbStruct;
DWORD dwFlags;
DWORD dwReserved1[2];
DWORD[2] dwReserved1;
LPFNOLEUIHOOK lpfnHook;
LPARAM lCustData;
DWORD dwReserved2[3];
DWORD[3] dwReserved2;
OLEUIOBJECTPROPSA* lpOP;
}
alias OLEUILINKPROPSA* POLEUILINKPROPSA, LPOLEUILINKPROPSA;

View File

@ -55,7 +55,7 @@ enum DROPEFFECT {
}
struct OLEMENUGROUPWIDTHS {
LONG width[6];
LONG[6] width;
}
alias OLEMENUGROUPWIDTHS* LPOLEMENUGROUPWIDTHS;

28
3rdparty/win32/ras.d vendored
View File

@ -233,7 +233,7 @@ struct RASCONNW {
WCHAR szDeviceType[RAS_MaxDeviceType + 1];
WCHAR szDeviceName[RAS_MaxDeviceName + 1];
static if (_WIN32_WINNT >= 0x401) {
WCHAR szPhonebook[MAX_PATH];
WCHAR[MAX_PATH] szPhonebook;
DWORD dwSubEntry;
}
static if (_WIN32_WINNT >= 0x500) {
@ -253,7 +253,7 @@ struct RASCONNA {
CHAR szDeviceType[RAS_MaxDeviceType + 1];
CHAR szDeviceName[RAS_MaxDeviceName + 1];
static if (_WIN32_WINNT >= 0x401) {
CHAR szPhonebook[MAX_PATH];
CHAR[MAX_PATH] szPhonebook;
DWORD dwSubEntry;
}
static if (_WIN32_WINNT >= 0x500) {
@ -451,7 +451,7 @@ struct RASPPPLCPW{
BOOL fMultilink;
DWORD dwTerminateReason;
DWORD dwServerTerminateReason;
WCHAR szReplyMessage[RAS_MaxReplyMessage];
WCHAR[RAS_MaxReplyMessage] szReplyMessage;
DWORD dwOptions;
DWORD dwServerOptions;
}
@ -472,7 +472,7 @@ struct RASPPPLCPA{
BOOL fMultilink;
DWORD dwTerminateReason;
DWORD dwServerTerminateReason;
CHAR szReplyMessage[RAS_MaxReplyMessage];
CHAR[RAS_MaxReplyMessage] szReplyMessage;
DWORD dwOptions;
DWORD dwServerOptions;
}
@ -542,9 +542,9 @@ struct RASENTRYW {
DWORD dwFrameSize;
DWORD dwfNetProtocols;
DWORD dwFramingProtocol;
WCHAR szScript[MAX_PATH];
WCHAR szAutodialDll[MAX_PATH];
WCHAR szAutodialFunc[MAX_PATH];
WCHAR[MAX_PATH] szScript;
WCHAR[MAX_PATH] szAutodialDll;
WCHAR[MAX_PATH] szAutodialFunc;
WCHAR szDeviceType[RAS_MaxDeviceType + 1];
WCHAR szDeviceName[RAS_MaxDeviceName + 1];
WCHAR szX25PadType[RAS_MaxPadType + 1];
@ -568,7 +568,7 @@ struct RASENTRYW {
DWORD dwEncryptionType;
DWORD dwCustomAuthKey;
GUID guidId;
WCHAR szCustomDialDll[MAX_PATH];
WCHAR[MAX_PATH] szCustomDialDll;
DWORD dwVpnStrategy;
}
}
@ -590,9 +590,9 @@ struct RASENTRYA {
DWORD dwFrameSize;
DWORD dwfNetProtocols;
DWORD dwFramingProtocol;
CHAR szScript[MAX_PATH];
CHAR szAutodialDll[MAX_PATH];
CHAR szAutodialFunc[MAX_PATH];
CHAR[MAX_PATH] szScript;
CHAR[MAX_PATH] szAutodialDll;
CHAR[MAX_PATH] szAutodialFunc;
CHAR szDeviceType[RAS_MaxDeviceType + 1];
CHAR szDeviceName[RAS_MaxDeviceName + 1];
CHAR szX25PadType[RAS_MaxPadType + 1];
@ -616,7 +616,7 @@ struct RASENTRYA {
DWORD dwEncryptionType;
DWORD dwCustomAuthKey;
GUID guidId;
CHAR szCustomDialDll[MAX_PATH];
CHAR[MAX_PATH] szCustomDialDll;
DWORD dwVpnStrategy;
}
}
@ -702,14 +702,14 @@ static if (_WIN32_WINNT >= 0x500) {
struct RASEAPUSERIDENTITYW{
WCHAR szUserName[UNLEN + 1];
DWORD dwSizeofEapInfo;
BYTE pbEapInfo[1];
BYTE[1] pbEapInfo;
}
alias RASEAPUSERIDENTITYW* LPRASEAPUSERIDENTITYW;
struct RASEAPUSERIDENTITYA{
CHAR szUserName[UNLEN + 1];
DWORD dwSizeofEapInfo;
BYTE pbEapInfo[1];
BYTE[1] pbEapInfo;
}
alias RASEAPUSERIDENTITYA* LPRASEAPUSERIDENTITYA;

View File

@ -317,7 +317,7 @@ struct CHARFORMATA {
COLORREF crTextColor;
BYTE bCharSet;
BYTE bPitchAndFamily;
char szFaceName[LF_FACESIZE];
char[LF_FACESIZE] szFaceName;
}
struct CHARFORMATW {
UINT cbSize = this.sizeof;
@ -328,7 +328,7 @@ struct CHARFORMATW {
COLORREF crTextColor;
BYTE bCharSet;
BYTE bPitchAndFamily;
WCHAR szFaceName[LF_FACESIZE];
WCHAR[LF_FACESIZE] szFaceName;
}
struct CHARFORMAT2A {
@ -340,7 +340,7 @@ struct CHARFORMAT2A {
COLORREF crTextColor;
BYTE bCharSet;
BYTE bPitchAndFamily;
char szFaceName[LF_FACESIZE];
char[LF_FACESIZE] szFaceName;
WORD wWeight;
SHORT sSpacing;
COLORREF crBackColor;
@ -362,7 +362,7 @@ struct CHARFORMAT2W {
COLORREF crTextColor;
BYTE bCharSet;
BYTE bPitchAndFamily;
WCHAR szFaceName[LF_FACESIZE];
WCHAR[LF_FACESIZE] szFaceName;
WORD wWeight;
SHORT sSpacing;
COLORREF crBackColor;
@ -486,7 +486,7 @@ struct PARAFORMAT {
LONG dxOffset;
WORD wAlignment;
SHORT cTabCount;
LONG rgxTabs[MAX_TAB_STOPS];
LONG[MAX_TAB_STOPS] rgxTabs;
}
struct PARAFORMAT2 {
@ -499,7 +499,7 @@ struct PARAFORMAT2 {
LONG dxOffset;
WORD wAlignment;
SHORT cTabCount;
LONG rgxTabs[MAX_TAB_STOPS];
LONG[MAX_TAB_STOPS] rgxTabs;
LONG dySpaceBefore;
LONG dySpaceAfter;
LONG dyLineSpacing;

View File

@ -118,7 +118,7 @@ alias RPC_BINDING_HANDLE handle_t;
struct RPC_BINDING_VECTOR {
uint Count;
RPC_BINDING_HANDLE BindingH[1];
RPC_BINDING_HANDLE[1] BindingH;
}
alias RPC_BINDING_HANDLE rpc_binding_handle_t;
@ -127,7 +127,7 @@ alias RPC_BINDING_VECTOR rpc_binding_vector_t;
struct UUID_VECTOR {
uint Count;
UUID* Uuid[1];
UUID*[1] Uuid;
}
alias void* RPC_IF_HANDLE;

View File

@ -100,8 +100,8 @@ const cbNDRContext=20;
alias void * NDR_CCONTEXT;
struct tagNDR_SCONTEXT {
void *pad[2];
void *userContext;
void*[2] pad;
void* userContext;
}
alias tagNDR_SCONTEXT * NDR_SCONTEXT;
@ -211,7 +211,7 @@ struct MIDL_STUB_MESSAGE {
uint * SizePtrLengthArray;
void* pArgQueue;
uint dwStubPhase;
uint w2kReserved[5];
uint[5] w2kReserved;
}
alias MIDL_STUB_MESSAGE * PMIDL_STUB_MESSAGE;
@ -317,7 +317,7 @@ alias void * PMIDL_XMIT_TYPE;
struct MIDL_FORMAT_STRING {
short Pad;
ubyte Format[1];
ubyte[1] Format;
}
struct MIDL_SERVER_INFO {

View File

@ -881,10 +881,10 @@ struct INFCONTEXT {
alias INFCONTEXT* PINFCONTEXT;
struct SP_INF_INFORMATION {
DWORD InfStyle;
DWORD InfCount;
BYTE _VersionData[1];
BYTE* VersionData() { return _VersionData.ptr; }
DWORD InfStyle;
DWORD InfCount;
BYTE[1] _VersionData;
BYTE* VersionData() { return _VersionData.ptr; }
}
alias SP_INF_INFORMATION* PSP_INF_INFORMATION;
@ -899,16 +899,16 @@ struct SP_ALTPLATFORM_INFO {
alias SP_ALTPLATFORM_INFO* PSP_ALTPLATFORM_INFO;
struct SP_ORIGINAL_FILE_INFO_A {
DWORD cbSize = SP_ORIGINAL_FILE_INFO_A.sizeof;
CHAR OriginalInfName[MAX_PATH];
CHAR OriginalCatalogName[MAX_PATH];
DWORD cbSize = SP_ORIGINAL_FILE_INFO_A.sizeof;
CHAR[MAX_PATH] OriginalInfName;
CHAR[MAX_PATH] OriginalCatalogName;
}
alias SP_ORIGINAL_FILE_INFO_A* PSP_ORIGINAL_FILE_INFO_A;
struct SP_ORIGINAL_FILE_INFO_W {
DWORD cbSize = SP_ORIGINAL_FILE_INFO_W.sizeof;
WCHAR OriginalInfName[MAX_PATH];
WCHAR OriginalCatalogName[MAX_PATH];
DWORD cbSize = SP_ORIGINAL_FILE_INFO_W.sizeof;
WCHAR[MAX_PATH] OriginalInfName;
WCHAR[MAX_PATH] OriginalCatalogName;
}
alias SP_ORIGINAL_FILE_INFO_W* PSP_ORIGINAL_FILE_INFO_W;
@ -967,24 +967,24 @@ struct CABINET_INFO_W {
alias CABINET_INFO_W* PCABINET_INFO_W;
struct FILE_IN_CABINET_INFO_A {
PCSTR NameInCabinet;
DWORD FileSize;
DWORD Win32Error;
WORD DosDate;
WORD DosTime;
WORD DosAttribs;
CHAR FullTargetName[MAX_PATH];
PCSTR NameInCabinet;
DWORD FileSize;
DWORD Win32Error;
WORD DosDate;
WORD DosTime;
WORD DosAttribs;
CHAR[MAX_PATH] FullTargetName;
}
alias FILE_IN_CABINET_INFO_A* PFILE_IN_CABINET_INFO_A;
struct FILE_IN_CABINET_INFO_W {
PCWSTR NameInCabinet;
DWORD FileSize;
DWORD Win32Error;
WORD DosDate;
WORD DosTime;
WORD DosAttribs;
WCHAR FullTargetName[MAX_PATH];
PCWSTR NameInCabinet;
DWORD FileSize;
DWORD Win32Error;
WORD DosDate;
WORD DosTime;
WORD DosAttribs;
WCHAR[MAX_PATH] FullTargetName;
}
alias FILE_IN_CABINET_INFO_W* PFILE_IN_CABINET_INFO_W;
@ -1039,16 +1039,16 @@ deprecated alias SP_DEVICE_INTERFACE_DATA SP_INTERFACE_DEVICE_DATA;
deprecated alias SP_DEVICE_INTERFACE_DATA* PSP_INTERFACE_DEVICE_DATA;
struct SP_DEVICE_INTERFACE_DETAIL_DATA_A {
DWORD cbSize = SP_DEVICE_INTERFACE_DETAIL_DATA_A.sizeof;
CHAR _DevicePath[1];
CHAR* DevicePath() { return _DevicePath.ptr; }
DWORD cbSize = SP_DEVICE_INTERFACE_DETAIL_DATA_A.sizeof;
CHAR[1] _DevicePath;
CHAR* DevicePath() { return _DevicePath.ptr; }
}
alias SP_DEVICE_INTERFACE_DETAIL_DATA_A* PSP_DEVICE_INTERFACE_DETAIL_DATA_A;
struct SP_DEVICE_INTERFACE_DETAIL_DATA_W {
DWORD cbSize = SP_DEVICE_INTERFACE_DETAIL_DATA_W.sizeof;
WCHAR _DevicePath[1];
WCHAR* DevicePath() { return _DevicePath.ptr; }
DWORD cbSize = SP_DEVICE_INTERFACE_DETAIL_DATA_W.sizeof;
WCHAR[1] _DevicePath;
WCHAR* DevicePath() { return _DevicePath.ptr; }
}
alias SP_DEVICE_INTERFACE_DETAIL_DATA_W* PSP_DEVICE_INTERFACE_DETAIL_DATA_W;
@ -1058,18 +1058,18 @@ deprecated alias SP_DEVICE_INTERFACE_DETAIL_DATA_W SP_INTERFACE_DEVICE_DETAIL_DA
deprecated alias SP_DEVICE_INTERFACE_DETAIL_DATA_W* PSP_INTERFACE_DEVICE_DETAIL_DATA_W;
struct SP_DEVINFO_LIST_DETAIL_DATA_A {
DWORD cbSize = SP_DEVINFO_LIST_DETAIL_DATA_A.sizeof;
GUID ClassGuid;
HANDLE RemoteMachineHandle;
CHAR RemoteMachineName[SP_MAX_MACHINENAME_LENGTH];
DWORD cbSize = SP_DEVINFO_LIST_DETAIL_DATA_A.sizeof;
GUID ClassGuid;
HANDLE RemoteMachineHandle;
CHAR[SP_MAX_MACHINENAME_LENGTH] RemoteMachineName;
}
alias SP_DEVINFO_LIST_DETAIL_DATA_A* PSP_DEVINFO_LIST_DETAIL_DATA_A;
struct SP_DEVINFO_LIST_DETAIL_DATA_W {
DWORD cbSize = SP_DEVINFO_LIST_DETAIL_DATA_W.sizeof;
GUID ClassGuid;
HANDLE RemoteMachineHandle;
WCHAR RemoteMachineName[SP_MAX_MACHINENAME_LENGTH];
DWORD cbSize = SP_DEVINFO_LIST_DETAIL_DATA_W.sizeof;
GUID ClassGuid;
HANDLE RemoteMachineHandle;
WCHAR[SP_MAX_MACHINENAME_LENGTH] RemoteMachineName;
}
alias SP_DEVINFO_LIST_DETAIL_DATA_W* PSP_DEVINFO_LIST_DETAIL_DATA_W;
@ -1086,7 +1086,7 @@ struct SP_DEVINSTALL_PARAMS_A {
HSPFILEQ FileQueue;
ULONG_PTR ClassInstallReserved;
DWORD Reserved;
CHAR DriverPath[MAX_PATH];
CHAR[MAX_PATH] DriverPath;
}
alias SP_DEVINSTALL_PARAMS_A* PSP_DEVINSTALL_PARAMS_A;
@ -1100,7 +1100,7 @@ struct SP_DEVINSTALL_PARAMS_W {
HSPFILEQ FileQueue;
ULONG_PTR ClassInstallReserved;
DWORD Reserved;
WCHAR DriverPath[MAX_PATH];
WCHAR[MAX_PATH] DriverPath;
}
alias SP_DEVINSTALL_PARAMS_W* PSP_DEVINSTALL_PARAMS_W;
@ -1146,21 +1146,21 @@ struct SP_UNREMOVEDEVICE_PARAMS {
alias SP_UNREMOVEDEVICE_PARAMS* PSP_UNREMOVEDEVICE_PARAMS;
struct SP_SELECTDEVICE_PARAMS_A {
SP_CLASSINSTALL_HEADER ClassInstallHeader;
CHAR Title[MAX_TITLE_LEN];
CHAR Instructions[MAX_INSTRUCTION_LEN];
CHAR ListLabel[MAX_LABEL_LEN];
CHAR SubTitle[MAX_SUBTITLE_LEN];
BYTE Reserved[2];
SP_CLASSINSTALL_HEADER ClassInstallHeader;
CHAR[MAX_TITLE_LEN] Title;
CHAR[MAX_INSTRUCTION_LEN] Instructions;
CHAR[MAX_LABEL_LEN] ListLabel;
CHAR[MAX_SUBTITLE_LEN] SubTitle;
BYTE[2] Reserved;
}
alias SP_SELECTDEVICE_PARAMS_A* PSP_SELECTDEVICE_PARAMS_A;
struct SP_SELECTDEVICE_PARAMS_W {
SP_CLASSINSTALL_HEADER ClassInstallHeader;
WCHAR Title[MAX_TITLE_LEN];
WCHAR Instructions[MAX_INSTRUCTION_LEN];
WCHAR ListLabel[MAX_LABEL_LEN];
WCHAR SubTitle[MAX_SUBTITLE_LEN];
SP_CLASSINSTALL_HEADER ClassInstallHeader;
WCHAR[MAX_TITLE_LEN] Title;
WCHAR[MAX_INSTRUCTION_LEN] Instructions;
WCHAR[MAX_LABEL_LEN] ListLabel;
WCHAR[MAX_SUBTITLE_LEN] SubTitle;
}
alias SP_SELECTDEVICE_PARAMS_W* PSP_SELECTDEVICE_PARAMS_W;
@ -1174,23 +1174,23 @@ struct SP_DETECTDEVICE_PARAMS {
alias SP_DETECTDEVICE_PARAMS* PSP_DETECTDEVICE_PARAMS;
struct SP_INSTALLWIZARD_DATA {
SP_CLASSINSTALL_HEADER ClassInstallHeader;
DWORD Flags;
HPROPSHEETPAGE DynamicPages[MAX_INSTALLWIZARD_DYNAPAGES];
DWORD NumDynamicPages;
DWORD DynamicPageFlags;
DWORD PrivateFlags;
LPARAM PrivateData;
HWND hwndWizardDlg;
SP_CLASSINSTALL_HEADER ClassInstallHeader;
DWORD Flags;
HPROPSHEETPAGE[MAX_INSTALLWIZARD_DYNAPAGES] DynamicPages;
DWORD NumDynamicPages;
DWORD DynamicPageFlags;
DWORD PrivateFlags;
LPARAM PrivateData;
HWND hwndWizardDlg;
}
alias SP_INSTALLWIZARD_DATA* PSP_INSTALLWIZARD_DATA;
struct SP_NEWDEVICEWIZARD_DATA {
SP_CLASSINSTALL_HEADER ClassInstallHeader;
DWORD Flags;
HPROPSHEETPAGE DynamicPages[MAX_INSTALLWIZARD_DYNAPAGES];
DWORD NumDynamicPages;
HWND hwndWizardDlg;
SP_CLASSINSTALL_HEADER ClassInstallHeader;
DWORD Flags;
HPROPSHEETPAGE[MAX_INSTALLWIZARD_DYNAPAGES] DynamicPages;
DWORD NumDynamicPages;
HWND hwndWizardDlg;
}
alias SP_NEWDEVICEWIZARD_DATA* PSP_NEWDEVICEWIZARD_DATA;
alias SP_NEWDEVICEWIZARD_DATA SP_ADDPROPERTYPAGE_DATA;
@ -1198,15 +1198,15 @@ alias SP_NEWDEVICEWIZARD_DATA* PSP_ADDPROPERTYPAGE_DATA;
struct SP_TROUBLESHOOTER_PARAMS_A {
SP_CLASSINSTALL_HEADER ClassInstallHeader;
CHAR ChmFile[MAX_PATH];
CHAR HtmlTroubleShooter[MAX_PATH];
CHAR[MAX_PATH] ChmFile;
CHAR[MAX_PATH] HtmlTroubleShooter;
}
alias SP_TROUBLESHOOTER_PARAMS_A* PSP_TROUBLESHOOTER_PARAMS_A;
struct SP_TROUBLESHOOTER_PARAMS_W {
SP_CLASSINSTALL_HEADER ClassInstallHeader;
WCHAR ChmFile[MAX_PATH];
WCHAR HtmlTroubleShooter[MAX_PATH];
WCHAR[MAX_PATH] ChmFile;
WCHAR[MAX_PATH] HtmlTroubleShooter;
}
alias SP_TROUBLESHOOTER_PARAMS_W* PSP_TROUBLESHOOTER_PARAMS_W;
@ -1223,46 +1223,46 @@ struct SP_POWERMESSAGEWAKE_PARAMS_W {
alias SP_POWERMESSAGEWAKE_PARAMS_W* PSP_POWERMESSAGEWAKE_PARAMS_W;
struct SP_DRVINFO_DATA_V2_A {
DWORD cbSize = SP_DRVINFO_DATA_V2_A.sizeof;
DWORD DriverType;
ULONG_PTR Reserved;
CHAR Description[LINE_LEN];
CHAR MfgName[LINE_LEN];
CHAR ProviderName[LINE_LEN];
FILETIME DriverDate;
DWORDLONG DriverVersion;
DWORD cbSize = SP_DRVINFO_DATA_V2_A.sizeof;
DWORD DriverType;
ULONG_PTR Reserved;
CHAR[LINE_LEN] Description;
CHAR[LINE_LEN] MfgName;
CHAR[LINE_LEN] ProviderName;
FILETIME DriverDate;
DWORDLONG DriverVersion;
}
alias SP_DRVINFO_DATA_V2_A* PSP_DRVINFO_DATA_V2_A;
struct SP_DRVINFO_DATA_V2_W {
DWORD cbSize = SP_DRVINFO_DATA_V2_A.sizeof;
DWORD DriverType;
ULONG_PTR Reserved;
WCHAR Description[LINE_LEN];
WCHAR MfgName[LINE_LEN];
WCHAR ProviderName[LINE_LEN];
FILETIME DriverDate;
DWORDLONG DriverVersion;
DWORD cbSize = SP_DRVINFO_DATA_V2_A.sizeof;
DWORD DriverType;
ULONG_PTR Reserved;
WCHAR[LINE_LEN] Description;
WCHAR[LINE_LEN] MfgName;
WCHAR[LINE_LEN] ProviderName;
FILETIME DriverDate;
DWORDLONG DriverVersion;
}
alias SP_DRVINFO_DATA_V2_W* PSP_DRVINFO_DATA_V2_W;
struct SP_DRVINFO_DATA_V1_A {
DWORD cbSize = SP_DRVINFO_DATA_V1_A.sizeof;
DWORD DriverType;
ULONG_PTR Reserved;
CHAR Description[LINE_LEN];
CHAR MfgName[LINE_LEN];
CHAR ProviderName[LINE_LEN];
DWORD cbSize = SP_DRVINFO_DATA_V1_A.sizeof;
DWORD DriverType;
ULONG_PTR Reserved;
CHAR[LINE_LEN] Description;
CHAR[LINE_LEN] MfgName;
CHAR[LINE_LEN] ProviderName;
}
alias SP_DRVINFO_DATA_V1_A* PSP_DRVINFO_DATA_V1_A;
struct SP_DRVINFO_DATA_V1_W {
DWORD cbSize = SP_DRVINFO_DATA_V1_W.sizeof;
DWORD DriverType;
ULONG_PTR Reserved;
WCHAR Description[LINE_LEN];
WCHAR MfgName[LINE_LEN];
WCHAR ProviderName[LINE_LEN];
DWORD cbSize = SP_DRVINFO_DATA_V1_W.sizeof;
DWORD DriverType;
ULONG_PTR Reserved;
WCHAR[LINE_LEN] Description;
WCHAR[LINE_LEN] MfgName;
WCHAR[LINE_LEN] ProviderName;
}
alias SP_DRVINFO_DATA_V1_W* PSP_DRVINFO_DATA_V1_W;
@ -1295,29 +1295,29 @@ static if(USE_SP_DRVINFO_DATA_V1) {
extern(Windows) alias DWORD function(HDEVINFO, PSP_DEVINFO_DATA, PSP_DEVINFO_DATA, PVOID) PSP_DETSIG_CMPPROC;
struct SP_DRVINFO_DETAIL_DATA_A {
DWORD cbSize = SP_DRVINFO_DETAIL_DATA_A.sizeof;
FILETIME InfDate;
DWORD CompatIDsOffset;
DWORD CompatIDsLength;
ULONG_PTR Reserved;
CHAR SectionName[LINE_LEN];
CHAR InfFileName[MAX_PATH];
CHAR DrvDescription[LINE_LEN];
CHAR _HardwareID[1];
DWORD cbSize = SP_DRVINFO_DETAIL_DATA_A.sizeof;
FILETIME InfDate;
DWORD CompatIDsOffset;
DWORD CompatIDsLength;
ULONG_PTR Reserved;
CHAR[LINE_LEN] SectionName;
CHAR[MAX_PATH] InfFileName;
CHAR[LINE_LEN] DrvDescription;
CHAR[1] _HardwareID;
CHAR* HardwareID() { return _HardwareID.ptr; }
}
alias SP_DRVINFO_DETAIL_DATA_A* PSP_DRVINFO_DETAIL_DATA_A;
struct SP_DRVINFO_DETAIL_DATA_W {
DWORD cbSize = SP_DRVINFO_DETAIL_DATA_W.sizeof;
FILETIME InfDate;
DWORD CompatIDsOffset;
DWORD CompatIDsLength;
ULONG_PTR Reserved;
WCHAR SectionName[LINE_LEN];
WCHAR InfFileName[MAX_PATH];
WCHAR DrvDescription[LINE_LEN];
WCHAR _HardwareID[1];
DWORD cbSize = SP_DRVINFO_DETAIL_DATA_W.sizeof;
FILETIME InfDate;
DWORD CompatIDsOffset;
DWORD CompatIDsLength;
ULONG_PTR Reserved;
WCHAR[LINE_LEN] SectionName;
WCHAR[MAX_PATH] InfFileName;
WCHAR[LINE_LEN] DrvDescription;
WCHAR[1] _HardwareID;
WCHAR* HardwareID() { return _HardwareID.ptr; }
}
alias SP_DRVINFO_DETAIL_DATA_W* PSP_DRVINFO_DETAIL_DATA_W;
@ -1354,16 +1354,16 @@ struct SP_PROPSHEETPAGE_REQUEST {
alias SP_PROPSHEETPAGE_REQUEST* PSP_PROPSHEETPAGE_REQUEST;
struct SP_BACKUP_QUEUE_PARAMS_A {
DWORD cbSize = SP_BACKUP_QUEUE_PARAMS_A.sizeof;
CHAR FullInfPath[MAX_PATH];
INT FilenameOffset;
DWORD cbSize = SP_BACKUP_QUEUE_PARAMS_A.sizeof;
CHAR[MAX_PATH] FullInfPath;
INT FilenameOffset;
}
alias SP_BACKUP_QUEUE_PARAMS_A* PSP_BACKUP_QUEUE_PARAMS_A;
struct SP_BACKUP_QUEUE_PARAMS_W {
DWORD cbSize = SP_BACKUP_QUEUE_PARAMS_W.sizeof;
WCHAR FullInfPath[MAX_PATH];
INT FilenameOffset;
DWORD cbSize = SP_BACKUP_QUEUE_PARAMS_W.sizeof;
WCHAR[MAX_PATH] FullInfPath;
INT FilenameOffset;
}
alias SP_BACKUP_QUEUE_PARAMS_W* PSP_BACKUP_QUEUE_PARAMS_W;

View File

@ -477,7 +477,7 @@ struct STRRET {
union {
LPWSTR pOleStr;
UINT uOffset;
char cStr[MAX_PATH];
char[MAX_PATH] cStr;
}
}
alias STRRET* LPSTRRET;
@ -504,7 +504,7 @@ struct FILEDESCRIPTORA {
FILETIME ftLastWriteTime;
DWORD nFileSizeHigh;
DWORD nFileSizeLow;
CHAR cFileName[MAX_PATH];
CHAR[MAX_PATH] cFileName;
}
alias FILEDESCRIPTORA* LPFILEDESCRIPTORA;
@ -519,19 +519,19 @@ struct FILEDESCRIPTORW {
FILETIME ftLastWriteTime;
DWORD nFileSizeHigh;
DWORD nFileSizeLow;
WCHAR cFileName[MAX_PATH];
WCHAR[MAX_PATH] cFileName;
}
alias FILEDESCRIPTORW* LPFILEDESCRIPTORW;
struct FILEGROUPDESCRIPTORA {
UINT cItems;
FILEDESCRIPTORA fgd[1];
FILEDESCRIPTORA[1] fgd;
}
alias FILEGROUPDESCRIPTORA* LPFILEGROUPDESCRIPTORA;
struct FILEGROUPDESCRIPTORW {
UINT cItems;
FILEDESCRIPTORW fgd[1];
FILEDESCRIPTORW[1] fgd;
}
alias FILEGROUPDESCRIPTORW* LPFILEGROUPDESCRIPTORW;
@ -591,13 +591,13 @@ struct FVSHOWINFO {
DWORD dwFlags;
RECT rect;
LPUNKNOWN punkRel;
OLECHAR strNewFile[MAX_PATH];
OLECHAR[MAX_PATH] strNewFile;
}
alias FVSHOWINFO* LPFVSHOWINFO;
struct NRESARRAY {
UINT cItems;
NETRESOURCE nr[1];
NETRESOURCE[1] nr;
}
alias NRESARRAY* LPNRESARRAY;
@ -629,8 +629,8 @@ static if (_WIN32_IE >= 0x500) {
struct EXTRASEARCH
{
GUID guidSearch;
WCHAR wszFriendlyName[80];
WCHAR wszUrl[2084];
WCHAR[80] wszFriendlyName;
WCHAR[2084] wszUrl;
}
alias EXTRASEARCH* LPEXTRASEARCH;
@ -653,8 +653,8 @@ static if (_WIN32_IE >= 0x500) {
struct PERSIST_FOLDER_TARGET_INFO
{
LPITEMIDLIST pidlTargetFolder;
WCHAR szTargetParsingName[MAX_PATH];
WCHAR szNetworkProvider[MAX_PATH];
WCHAR[MAX_PATH] szTargetParsingName;
WCHAR[MAX_PATH] szNetworkProvider;
DWORD dwAttributes;
int csidl;
}
@ -696,7 +696,7 @@ static if (_WIN32_IE >= 0x500) {
struct SHCOLUMNINIT {
ULONG dwFlags;
ULONG dwReserved;
WCHAR wszFolder[MAX_PATH];
WCHAR[MAX_PATH] wszFolder;
}
alias SHCOLUMNINIT* LPSHCOLUMNINIT;
alias const(SHCOLUMNINIT)* LPCSHCOLUMNINIT;
@ -706,7 +706,7 @@ static if (_WIN32_IE >= 0x500) {
DWORD dwFileAttributes;
ULONG dwReserved;
WCHAR *pwszExt;
WCHAR wszFile[MAX_PATH];
WCHAR[MAX_PATH] wszFile;
}
alias SHCOLUMNDATA* LPSHCOLUMNDATA;
alias const(SHCOLUMNDATA)* LPCSHCOLUMNDATA;
@ -721,8 +721,8 @@ static if (_WIN32_IE >= 0x500) {
DWORD fmt;
UINT cChars;
DWORD csFlags;
WCHAR wszTitle[MAX_COLUMN_NAME_LEN];
WCHAR wszDescription[MAX_COLUMN_DESC_LEN];
WCHAR[MAX_COLUMN_NAME_LEN] wszTitle;
WCHAR[MAX_COLUMN_DESC_LEN] wszDescription;
}
alias SHCOLUMNINFO* LPSHCOLUMNINFO;
alias const(SHCOLUMNINFO)* LPCSHCOLUMNINFO;

View File

@ -137,7 +137,7 @@ struct SQL_NUMERIC_STRUCT {
SQLCHAR precision;
SQLSCHAR scale;
SQLCHAR sign;
SQLCHAR val[SQL_MAX_NUMERIC_LEN];
SQLCHAR[SQL_MAX_NUMERIC_LEN] val;
}
// } ODBCVER >= 0x0300
alias GUID SQLGUID;

View File

@ -132,22 +132,22 @@ const USER_SESSION_KEY_LENGTH = CYPHER_BLOCK_LENGTH * 2;
const CLEAR_BLOCK_LENGTH = 8;
struct CYPHER_BLOCK {
CHAR data[CYPHER_BLOCK_LENGTH];
CHAR[CYPHER_BLOCK_LENGTH] data;
}
alias CYPHER_BLOCK* PCYPHER_BLOCK;
struct CLEAR_BLOCK {
CHAR data[CLEAR_BLOCK_LENGTH];
CHAR[CLEAR_BLOCK_LENGTH] data;
}
alias CLEAR_BLOCK* PCLEAR_BLOCK;
struct LM_OWF_PASSWORD {
CYPHER_BLOCK data[2];
CYPHER_BLOCK[2] data;
}
alias LM_OWF_PASSWORD* PLM_OWF_PASSWORD;
struct USER_SESSION_KEY {
CYPHER_BLOCK data[2];
CYPHER_BLOCK[2] data;
}
alias USER_SESSION_KEY* PUSER_SESSION_KEY;

View File

@ -67,7 +67,7 @@ struct PROCESSENTRY32W {
DWORD th32ParentProcessID;
LONG pcPriClassBase;
DWORD dwFlags;
WCHAR szExeFile[MAX_PATH];
WCHAR[MAX_PATH] szExeFile;
}
alias PROCESSENTRY32W* PPROCESSENTRY32W;
alias PROCESSENTRY32W* LPPROCESSENTRY32W;
@ -94,7 +94,7 @@ struct MODULEENTRY32W {
DWORD modBaseSize;
HMODULE hModule;
WCHAR szModule[MAX_MODULE_NAME32 + 1];
WCHAR szExePath[MAX_PATH];
WCHAR[MAX_PATH] szExePath;
}
alias MODULEENTRY32W* PMODULEENTRY32W;
alias MODULEENTRY32W* LPMODULEENTRY32W;
@ -118,7 +118,7 @@ version(Unicode) {
DWORD th32ParentProcessID;
LONG pcPriClassBase;
DWORD dwFlags;
CHAR szExeFile[MAX_PATH];
CHAR[MAX_PATH] szExeFile;
}
alias PROCESSENTRY32* PPROCESSENTRY32;
alias PROCESSENTRY32* LPPROCESSENTRY32;
@ -133,7 +133,7 @@ version(Unicode) {
DWORD modBaseSize;
HMODULE hModule;
char szModule[MAX_MODULE_NAME32 + 1];
char szExePath[MAX_PATH];
char[MAX_PATH] szExePath;
}
alias MODULEENTRY32* PMODULEENTRY32;
alias MODULEENTRY32* LPMODULEENTRY32;

30
3rdparty/win32/vfw.d vendored
View File

@ -181,15 +181,15 @@ struct ICOPEN {
}
struct ICINFO {
DWORD dwSize;
DWORD fccType;
DWORD fccHandler;
DWORD dwFlags;
DWORD dwVersion;
DWORD dwVersionICM;
WCHAR szName[16];
WCHAR szDescription[128];
WCHAR szDriver[128];
DWORD dwSize;
DWORD fccType;
DWORD fccHandler;
DWORD dwFlags;
DWORD dwVersion;
DWORD dwVersionICM;
WCHAR[16] szName;
WCHAR[128] szDescription;
WCHAR[128] szDriver;
}
enum {
@ -819,7 +819,7 @@ struct MainAVIHeader {
DWORD dwSuggestedBufferSize;
DWORD dwWidth;
DWORD dwHeight;
DWORD dwReserved[4];
DWORD[4] dwReserved;
}
const AVISF_DISABLED = 0x00000001;
@ -885,7 +885,7 @@ struct AVISTREAMINFOW {
RECT rcFrame;
DWORD dwEditCount;
DWORD dwFormatChangeCount;
WCHAR szName[64];
WCHAR[64] szName;
}
alias AVISTREAMINFOW* LPAVISTREAMINFOW;
@ -907,7 +907,7 @@ struct AVISTREAMINFOA {
RECT rcFrame;
DWORD dwEditCount;
DWORD dwFormatChangeCount;
char szName[64];
char[64] szName;
}
alias AVISTREAMINFOA* LPAVISTREAMINFOA;
@ -934,7 +934,7 @@ struct AVIFILEINFOW {
DWORD dwRate;
DWORD dwLength;
DWORD dwEditCount;
WCHAR szFileType[64];
WCHAR[64] szFileType;
}
alias AVIFILEINFOW* LPAVIFILEINFOW;
@ -950,7 +950,7 @@ struct AVIFILEINFOA {
DWORD dwRate;
DWORD dwLength;
DWORD dwEditCount;
char szFileType[64];
char[64] szFileType;
}
alias AVIFILEINFOA* LPAVIFILEINFOA;
@ -1887,7 +1887,7 @@ struct VIDEOHDR {
DWORD dwTimeCaptured;
DWORD_PTR dwUser;
DWORD dwFlags;
DWORD_PTR dwReserved[4];
DWORD_PTR[4] dwReserved;
}
alias VIDEOHDR* PVIDEOHDR, LPVIDEOHDR;

View File

@ -1960,7 +1960,7 @@ struct GUID {
uint Data1;
ushort Data2;
ushort Data3;
ubyte Data4[8];
ubyte[8] Data4;
}
alias GUID* REFGUID, LPGUID;
*/
@ -2164,9 +2164,9 @@ version (X86) {
WORD Reserved3;
DWORD MxCsr;
DWORD MxCsr_Mask;
M128A FloatRegisters[8];
M128A XmmRegisters[16];
BYTE Reserved4[96];
M128A[8] FloatRegisters;
M128A[16] XmmRegisters;
BYTE[96] Reserved4;
}
alias XMM_SAVE_AREA32 PXMM_SAVE_AREA32;
const LEGACY_SAVE_AREA_LENGTH = XMM_SAVE_AREA32.sizeof;
@ -2217,8 +2217,8 @@ version (X86) {
XMM_SAVE_AREA32 FloatSave;
struct
{
M128A Header[2];
M128A Legacy[8];
M128A[2] Header;
M128A[8] Legacy;
M128A Xmm0;
M128A Xmm1;
M128A Xmm2;
@ -2237,7 +2237,7 @@ version (X86) {
M128A Xmm15;
};
};
M128A VectorRegister[26];
M128A[26] VectorRegister;
DWORD64 VectorControl;
DWORD64 DebugControl;
DWORD64 LastBranchToRip;

View File

@ -83,7 +83,7 @@ const PERF_RAW_BASE=(PERF_SIZE_DWORD|PERF_TYPE_COUNTER|PERF_COUNTER_BASE|PERF_DI
const PERF_ELAPSED_TIME=(PERF_SIZE_LARGE|PERF_TYPE_COUNTER|PERF_COUNTER_ELAPSED|PERF_OBJECT_TIMER|PERF_DISPLAY_SECONDS);
struct PERF_DATA_BLOCK {
WCHAR Signature[4];
WCHAR[4] Signature;
DWORD LittleEndian;
DWORD Version;
DWORD Revision;

View File

@ -636,7 +636,7 @@ struct PRINTER_NOTIFY_INFO_DATA {
DWORD Reserved;
DWORD Id;
union _NotifyData {
DWORD adwData[2];
DWORD[2] adwData;
struct Data {
DWORD cbBuf;
PVOID pBuf;
@ -650,7 +650,7 @@ struct PRINTER_NOTIFY_INFO {
DWORD Version;
DWORD Flags;
DWORD Count;
PRINTER_NOTIFY_INFO_DATA aData[1];
PRINTER_NOTIFY_INFO_DATA[1] aData;
}
alias PRINTER_NOTIFY_INFO* PPRINTER_NOTIFY_INFO, LPPRINTER_NOTIFY_INFO;

View File

@ -3051,7 +3051,7 @@ struct MENUITEMTEMPLATEHEADER {
struct MENUITEMTEMPLATE {
WORD mtOption;
WORD mtID;
WCHAR mtString[1];
WCHAR[1] mtString;
}
alias void MENUTEMPLATE, MENUTEMPLATEA, MENUTEMPLATEW;
@ -3309,7 +3309,7 @@ struct WINDOWPOS {
alias WINDOWPOS* PWINDOWPOS, LPWINDOWPOS;
struct NCCALCSIZE_PARAMS {
RECT rgrc[3];
RECT[3] rgrc;
PWINDOWPOS lppos;
}
alias NCCALCSIZE_PARAMS* LPNCCALCSIZE_PARAMS;
@ -3381,14 +3381,14 @@ alias DWORD HELPPOLY;
struct MULTIKEYHELPA {
DWORD mkSize;
CHAR mkKeylist;
CHAR szKeyphrase[1];
CHAR[1] szKeyphrase;
}
alias MULTIKEYHELPA* PMULTIKEYHELPA, LPMULTIKEYHELPA;
struct MULTIKEYHELPW {
DWORD mkSize;
WCHAR mkKeylist;
WCHAR szKeyphrase[1];
WCHAR[1] szKeyphrase;
}
alias MULTIKEYHELPW* PMULTIKEYHELPW, LPMULTIKEYHELPW;
@ -3399,7 +3399,7 @@ struct HELPWININFOA {
int dx;
int dy;
int wMax;
CHAR rgchMember[2];
CHAR[2] rgchMember;
}
alias HELPWININFOA* PHELPWININFOA, LPHELPWININFOA;
@ -3410,7 +3410,7 @@ struct HELPWININFOW {
int dx;
int dy;
int wMax;
WCHAR rgchMember[2];
WCHAR[2] rgchMember;
}
alias HELPWININFOW* PHELPWININFOW, LPHELPWININFOW;
@ -3489,7 +3489,7 @@ struct SCROLLBARINFO {
int xyThumbTop;
int xyThumbBottom;
int reserved;
DWORD rgstate[CCHILDREN_SCROLLBAR+1];
DWORD[CCHILDREN_SCROLLBAR+1] rgstate;
}
alias SCROLLBARINFO* PSCROLLBARINFO, LPSCROLLBARINFO;

View File

@ -326,38 +326,38 @@ static if (_WIN32_WINNT >= 0x600) {
}
struct WTSINFOW {
WTS_CONNECTSTATE_CLASS State;
DWORD SessionId;
DWORD IncomingBytes;
DWORD OutgoingBytes;
DWORD IncomingCompressedBytes;
DWORD OutgoingCompressedBytes;
WCHAR WinStationName[WINSTATIONNAME_LENGTH];
WCHAR Domain[DOMAIN_LENGTH];
WCHAR UserName[USERNAME_LENGTH+1];
LARGE_INTEGER ConnectTime;
LARGE_INTEGER DisconnectTime;
LARGE_INTEGER LastInputTime;
LARGE_INTEGER LogonTime;
LARGE_INTEGER CurrentTime;
WTS_CONNECTSTATE_CLASS State;
DWORD SessionId;
DWORD IncomingBytes;
DWORD OutgoingBytes;
DWORD IncomingCompressedBytes;
DWORD OutgoingCompressedBytes;
WCHAR[WINSTATIONNAME_LENGTH] WinStationName;
WCHAR[DOMAIN_LENGTH] Domain;
WCHAR UserName[USERNAME_LENGTH+1];
LARGE_INTEGER ConnectTime;
LARGE_INTEGER DisconnectTime;
LARGE_INTEGER LastInputTime;
LARGE_INTEGER LogonTime;
LARGE_INTEGER CurrentTime;
}
alias WTSINFOW* PWTSINFOW;
struct WTSINFOA {
WTS_CONNECTSTATE_CLASS State;
DWORD SessionId;
DWORD IncomingBytes;
DWORD OutgoingBytes;
DWORD IncomingCompressedBytes;
DWORD OutgoingCompressedBytes;
CHAR WinStationName[WINSTATIONNAME_LENGTH];
CHAR Domain[DOMAIN_LENGTH];
CHAR UserName[USERNAME_LENGTH+1];
LARGE_INTEGER ConnectTime;
LARGE_INTEGER DisconnectTime;
LARGE_INTEGER LastInputTime;
LARGE_INTEGER LogonTime;
LARGE_INTEGER CurrentTime;
WTS_CONNECTSTATE_CLASS State;
DWORD SessionId;
DWORD IncomingBytes;
DWORD OutgoingBytes;
DWORD IncomingCompressedBytes;
DWORD OutgoingCompressedBytes;
CHAR[WINSTATIONNAME_LENGTH] WinStationName;
CHAR[DOMAIN_LENGTH] Domain;
CHAR UserName[USERNAME_LENGTH+1];
LARGE_INTEGER ConnectTime;
LARGE_INTEGER DisconnectTime;
LARGE_INTEGER LastInputTime;
LARGE_INTEGER LogonTime;
LARGE_INTEGER CurrentTime;
}
alias WTSINFOA* PWTSINFOA;

View File

@ -77,7 +77,7 @@ enum MSHLFLAGS {
struct FLAGGED_WORD_BLOB {
uint fFlags;
uint clSize;
ushort asData[1];
ushort[1] asData;
}
alias WCHAR OLECHAR;

View File

@ -107,7 +107,7 @@ void drawColorAndTextureRect(uint textureId, int tdx, int tdy, Rect srcrc, Rect
}
void drawColorAndTextureRect(uint textureId, int tdx, int tdy, int srcx, int srcy, int srcdx, int srcdy, int xx, int yy, int dx, int dy, uint color, bool linear) {
float colors[6*4];
float[6*4] colors;
LVGLFillColor(color, colors.ptr, 6);
float dstx0 = cast(float)xx;
float dsty0 = cast(float)(bufferDy - (yy));

View File

@ -142,8 +142,8 @@ version (USE_FREEIMAGE) {
FREE_IMAGE_LOADED = true;
}
ubyte imagebuf[];
ubyte readbuf[4096];
ubyte[] imagebuf;
ubyte[4096] readbuf;
for (;;) {
size_t bytesRead = stream.read(readbuf);
if (!bytesRead)

View File

@ -452,7 +452,7 @@ class StateDrawable : Drawable {
private static uint colorTransformFromStringAdd(string value) {
if (value is null)
return COLOR_TRANSFORM_OFFSET_NONE;
int n[4];
int [4]n;
if (!parseList4(value, n))
return COLOR_TRANSFORM_OFFSET_NONE;
foreach (ref item; n) {
@ -467,8 +467,8 @@ class StateDrawable : Drawable {
private static uint colorTransformFromStringMult(string value) {
if (value is null)
return COLOR_TRANSFORM_MULTIPLY_NONE;
float n[4];
uint nn[4];
float[4] n;
uint[4] nn;
if (!parseList4!float(value, n))
return COLOR_TRANSFORM_MULTIPLY_NONE;
for(int i = 0; i < 4; i++) {

View File

@ -167,7 +167,7 @@ class Win32Font : Font {
g.glyph = new ubyte[g.blackBoxX * g.blackBoxY];
if (gs>0)
{
ubyte glyph[] = new ubyte[gs];
ubyte[] glyph = new ubyte[gs];
res = GetGlyphOutlineW( _drawbuf.dc, cast(wchar)ch,
GGO_GRAY8_BITMAP, //GGO_METRICS
&metrics,

View File

@ -1,24 +1,24 @@
// Written in the D programming language.
/**
This module contains implementation of Win32 platform support
Provides Win32Window and Win32Platform classes.
Usually you don't need to use this module directly.
Synopsis:
----
import dlangui.platforms.windows.winapp;
----
Copyright: Vadim Lopatin, 2014
License: Boost License 1.0
Authors: Vadim Lopatin, coolreader.org@gmail.com
*/
// Written in the D programming language.
/**
This module contains implementation of Win32 platform support
Provides Win32Window and Win32Platform classes.
Usually you don't need to use this module directly.
Synopsis:
----
import dlangui.platforms.windows.winapp;
----
Copyright: Vadim Lopatin, 2014
License: Boost License 1.0
Authors: Vadim Lopatin, coolreader.org@gmail.com
*/
module dlangui.platforms.windows.winapp;
version (USE_SDL) { }
else version (Windows) {
@ -39,15 +39,15 @@ import dlangui.graphics.drawbuf;
import dlangui.graphics.images;
import dlangui.graphics.fonts;
import dlangui.core.logger;
import dlangui.core.files;
import dlangui.core.files;
version (USE_OPENGL) {
import dlangui.graphics.glsupport;
}
// specify debug=DebugMouseEvents for logging mouse handling
// specify debug=DebugRedraw for logging drawing and layouts handling
// specify debug=DebugKeys for logging of key events
// specify debug=DebugMouseEvents for logging mouse handling
// specify debug=DebugRedraw for logging drawing and layouts handling
// specify debug=DebugKeys for logging of key events
pragma(lib, "gdi32.lib");
pragma(lib, "user32.lib");
@ -370,59 +370,59 @@ class Win32Window : Window {
void onSetCursorType() {
HANDLE winCursor = null;
switch (_cursorType) {
case CursorType.None:
winCursor = null;
break;
case CursorType.Parent:
break;
case CursorType.Arrow:
winCursor = loadCursor(IDC_ARROW);
break;
case CursorType.IBeam:
winCursor = loadCursor(IDC_IBEAM);
break;
case CursorType.Wait:
winCursor = loadCursor(IDC_WAIT);
break;
case CursorType.Crosshair:
winCursor = loadCursor(IDC_CROSS);
break;
case CursorType.WaitArrow:
winCursor = loadCursor(IDC_APPSTARTING);
break;
case CursorType.SizeNWSE:
winCursor = loadCursor(IDC_SIZENWSE);
break;
case CursorType.SizeNESW:
winCursor = loadCursor(IDC_SIZENESW);
break;
case CursorType.SizeWE:
winCursor = loadCursor(IDC_SIZEWE);
break;
case CursorType.SizeNS:
winCursor = loadCursor(IDC_SIZENS);
break;
case CursorType.SizeAll:
winCursor = loadCursor(IDC_SIZEALL);
break;
case CursorType.No:
winCursor = loadCursor(IDC_NO);
break;
case CursorType.Hand:
winCursor = loadCursor(IDC_HAND);
break;
default:
break;
case CursorType.None:
winCursor = null;
break;
case CursorType.Parent:
break;
case CursorType.Arrow:
winCursor = loadCursor(IDC_ARROW);
break;
case CursorType.IBeam:
winCursor = loadCursor(IDC_IBEAM);
break;
case CursorType.Wait:
winCursor = loadCursor(IDC_WAIT);
break;
case CursorType.Crosshair:
winCursor = loadCursor(IDC_CROSS);
break;
case CursorType.WaitArrow:
winCursor = loadCursor(IDC_APPSTARTING);
break;
case CursorType.SizeNWSE:
winCursor = loadCursor(IDC_SIZENWSE);
break;
case CursorType.SizeNESW:
winCursor = loadCursor(IDC_SIZENESW);
break;
case CursorType.SizeWE:
winCursor = loadCursor(IDC_SIZEWE);
break;
case CursorType.SizeNS:
winCursor = loadCursor(IDC_SIZENS);
break;
case CursorType.SizeAll:
winCursor = loadCursor(IDC_SIZEALL);
break;
case CursorType.No:
winCursor = loadCursor(IDC_NO);
break;
case CursorType.Hand:
winCursor = loadCursor(IDC_HAND);
break;
default:
break;
}
SetCursor(winCursor);
}
/// sets cursor type for window
override protected void setCursorType(uint cursorType) {
// override to support different mouse cursors
_cursorType = cursorType;
onSetCursorType();
}
/// sets cursor type for window
override protected void setCursorType(uint cursorType) {
// override to support different mouse cursors
_cursorType = cursorType;
onSetCursorType();
}
/// sets window icon
@property override void windowIcon(DrawBufRef buf) {
@ -852,7 +852,7 @@ int myWinMain(void* hInstance, void* hPrevInstance, char* lpCmdLine, int iCmdSho
FreeTypeFontManager ftfontMan = new FreeTypeFontManager();
string fontsPath = "c:\\Windows\\Fonts\\";
static if (false) { // SHGetFolderPathW not found in shell32.lib
WCHAR szPath[MAX_PATH];
WCHAR[MAX_PATH] szPath;
const CSIDL_FLAG_NO_ALIAS = 0x1000;
const CSIDL_FLAG_DONT_UNEXPAND = 0x2000;
if(SUCCEEDED(SHGetFolderPathW(NULL,

View File

@ -118,7 +118,7 @@ class XCBWindow : Window {
import std.c.linux.X11.Xlib;
uint mask;
uint values[3];
uint[3] values;
// disable opengl for testing
_enableOpengl = false;
@ -139,7 +139,7 @@ class XCBWindow : Window {
Log.d("window=", _w, " gc=", _g);
version (USE_OPENGL) {
if (_enableOpengl) {
int visual_attribs[] = [
int[] visual_attribs = [
GLX_RENDER_TYPE, GLX_RGBA_BIT,
GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
GLX_DOUBLEBUFFER, 1,
@ -385,7 +385,7 @@ class XCBWindow : Window {
Log.e("glXCreateContextAttribsARB function is not found");
_context = glXCreateNewContext(_display, _fb_config, GLX_RGBA_TYPE, null, true);
} else {
int context_attribs[] =
int[] context_attribs =
[
GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
GLX_CONTEXT_MINOR_VERSION_ARB, 0,