Changeset 372 for trunk/win32

Show
Ignore:
Timestamp:
01/08/12 12:52:50 (5 months ago)
Author:
CyberShadow
Message:

win32: Replace typedef with compatibility wrapper template

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/win32/basetsd.d

    r326 r372  
    2323} 
    2424 
     25/*  [CyberShadow VP 2011.12.22] typedef is now deprecated in D2. 
     26 */ 
     27template TypeDef(T) { 
     28    version (D_Version2) { 
     29        alias T TypeDef; 
     30    } else { 
     31        // must use mixin so that it doesn't cause a deprecation error under D2 
     32        mixin("typedef T TypeDef;"); 
     33    } 
     34} 
     35 
    2536// [SnakE 2009-02-23] Moved HANDLE definition here from winnt.d to avoid 
    2637// 'forwatd template reference' to CPtr from winnt.d caused by a circular 
    2738// import. 
    2839 
    29 typedef void* HANDLE; 
     40alias TypeDef!(void*) HANDLE; 
    3041 
    3142alias HANDLE* PHANDLE, LPHANDLE; 

  • trunk/win32/directx/d3d9.d

    r261 r372  
    6868/* IID_IDirect3DSurface9 */ 
    6969/* {0CFBAF3A-9FF6-429a-99B3-A2796AF8B89B} */ 
    70 extern (C) const GUID IID_IDirect3DSurface9 = { 0xcfbaf3a,, 0x9ff6, 0x429a, [0x99, 0xb3, 0xa2, 0x79, 0x6a, 0xf8, 0xb8, 0x9b] }; 
     70extern (C) const GUID IID_IDirect3DSurface9 = { 0xcfbaf3a, 0x9ff6, 0x429a, [0x99, 0xb3, 0xa2, 0x79, 0x6a, 0xf8, 0xb8, 0x9b] }; 
    7171 
    7272/* IID_IDirect3DVolume9 */ 

  • trunk/win32/directx/d3d9types.d

    r221 r372  
    1616 
    1717// D3DCOLOR is equivalent to D3DFMT_A8R8G8B8 
    18 typedef uint D3DCOLOR; 
     18alias TypeDef!(uint) D3DCOLOR; 
    1919 
    2020// maps unsigned 8 bits/channel to D3DCOLOR 
    …… 
    134134    D3DLIGHT_DIRECTIONAL    = 3 
    135135} 
    136 typedef uint D3DLIGHTTYPE; 
     136alias TypeDef!(uint) D3DLIGHTTYPE; 
    137137 
    138138struct D3DLIGHT9 { 
    …… 
    168168    D3DSHADE_PHONG              = 3 
    169169}  
    170 typedef uint D3DSHADEMODE; 
     170alias TypeDef!(uint) D3DSHADEMODE; 
    171171 
    172172enum : D3DFILLMODE { 
    …… 
    175175    D3DFILL_SOLID               = 3 
    176176} 
    177 typedef uint D3DFILLMODE; 
     177alias TypeDef!(uint) D3DFILLMODE; 
    178178 
    179179enum : D3DBLEND { 
    …… 
    196196    D3DBLEND_INVSRCCOLOR2       = 17 
    197197} 
    198 typedef uint D3DBLEND; 
     198alias TypeDef!(uint) D3DBLEND; 
    199199 
    200200enum : D3DBLENDOP { 
    …… 
    205205    D3DBLENDOP_MAX              = 5 
    206206} 
    207 typedef uint D3DBLENDOP; 
     207alias TypeDef!(uint) D3DBLENDOP; 
    208208 
    209209enum : D3DTEXTUREADDRESS { 
    …… 
    214214    D3DTADDRESS_MIRRORONCE      = 5 
    215215} 
    216 typedef uint D3DTEXTUREADDRESS; 
     216alias TypeDef!(uint) D3DTEXTUREADDRESS; 
    217217 
    218218enum : D3DCULL { 
    …… 
    221221    D3DCULL_CCW                 = 3 
    222222} 
    223 typedef uint D3DCULL; 
     223alias TypeDef!(uint) D3DCULL; 
    224224 
    225225enum : D3DCMPFUNC { 
    …… 
    233233    D3DCMP_ALWAYS               = 8 
    234234} 
    235 typedef uint D3DCMPFUNC; 
     235alias TypeDef!(uint) D3DCMPFUNC; 
    236236 
    237237enum : D3DSTENCILOP { 
    …… 
    245245    D3DSTENCILOP_DECR           = 8 
    246246} 
    247 typedef uint D3DSTENCILOP; 
     247alias TypeDef!(uint) D3DSTENCILOP; 
    248248 
    249249enum : D3DFOGMODE { 
    …… 
    253253    D3DFOG_LINEAR               = 3 
    254254} 
    255 typedef uint D3DFOGMODE; 
     255alias TypeDef!(uint) D3DFOGMODE; 
    256256 
    257257enum : D3DZBUFFERTYPE { 
    …… 
    260260    D3DZB_USEW                  = 2 // W buffering 
    261261} 
    262 typedef uint D3DZBUFFERTYPE; 
     262alias TypeDef!(uint) D3DZBUFFERTYPE; 
    263263 
    264264// Primitives supported by draw-primitive API 
    …… 
    271271    D3DPT_TRIANGLEFAN           = 6 
    272272} 
    273 typedef uint D3DPRIMITIVETYPE; 
     273alias TypeDef!(uint) D3DPRIMITIVETYPE; 
    274274 
    275275D3DTRANSFORMSTATETYPE D3DTS_WORLDMATRIX(uint index) { return cast(D3DTRANSFORMSTATETYPE)(index + 256); } 
    …… 
    294294    D3DTS_WORLD3        = T_D3DTS_WORLDMATRIX!(3) 
    295295} 
    296 typedef uint D3DTRANSFORMSTATETYPE; 
     296alias TypeDef!(uint) D3DTRANSFORMSTATETYPE; 
    297297 
    298298enum : D3DRENDERSTATETYPE { 
    …… 
    401401    D3DRS_BLENDOPALPHA              = 209   /* Blending operation for the alpha channel when D3DRS_SEPARATEDESTALPHAENABLE is TRUE */ 
    402402} 
    403 typedef uint D3DRENDERSTATETYPE; 
     403alias TypeDef!(uint) D3DRENDERSTATETYPE; 
    404404 
    405405// Maximum number of simultaneous render targets D3D supports 
    …… 
    412412    D3DMCS_COLOR2           = 2             // Specular vertex color is used 
    413413} 
    414 typedef uint D3DMATERIALCOLORSOURCE; 
     414alias TypeDef!(uint) D3DMATERIALCOLORSOURCE; 
    415415 
    416416// Bias to apply to the texture coordinate set to apply a wrap to. 
    …… 
    458458    D3DTSS_CONSTANT       = 32  /* Per-stage constant D3DTA_CONSTANT */ 
    459459} 
    460 typedef uint D3DTEXTURESTAGESTATETYPE; 
     460alias TypeDef!(uint) D3DTEXTURESTAGESTATETYPE; 
    461461 
    462462/* 
    …… 
    482482                                    Only valid for D3DDMAPSAMPLER sampler  */ 
    483483} 
    484 typedef uint D3DSAMPLERSTATETYPE; 
     484alias TypeDef!(uint) D3DSAMPLERSTATETYPE; 
    485485 
    486486/* Special sampler which is used in the tesselator */ 
    …… 
    562562    D3DTOP_LERP                 = 26  // (Arg0)*Arg1 + (1-Arg0)*Arg2 
    563563} 
    564 typedef uint D3DTEXTUREOP; 
     564alias TypeDef!(uint) D3DTEXTUREOP; 
    565565 
    566566/* 
    …… 
    591591    D3DTEXF_CONVOLUTIONMONO = 8    // Convolution filter for monochrome textures 
    592592} 
    593 typedef uint D3DTEXTUREFILTERTYPE; 
     593alias TypeDef!(uint) D3DTEXTUREFILTERTYPE; 
    594594 
    595595/* Bits for Flags in ProcessVertices call */ 
    …… 
    658658    D3DDECLUSAGE_SAMPLE         // 13 
    659659} 
    660 typedef uint D3DDECLUSAGE; 
     660alias TypeDef!(uint) D3DDECLUSAGE; 
    661661 
    662662const MAXD3DDECLUSAGE = D3DDECLUSAGE_SAMPLE; 
    …… 
    673673    D3DDECLMETHOD_LOOKUPPRESAMPLED      // Lookup a pre-sampled displacement map 
    674674} 
    675 typedef uint D3DDECLMETHOD; 
     675alias TypeDef!(uint) D3DDECLMETHOD; 
    676676 
    677677const MAXD3DDECLMETHOD = D3DDECLMETHOD_LOOKUPPRESAMPLED; 
    …… 
    704704    D3DDECLTYPE_UNUSED    = 17   // When the type field in a decl is unused. 
    705705} 
    706 typedef uint D3DDECLTYPE; 
     706alias TypeDef!(uint) D3DDECLTYPE; 
    707707 
    708708const MAXD3DDECLTYPE = D3DDECLTYPE_UNUSED; 
    …… 
    841841    D3DSIO_END          = 0xFFFF 
    842842} 
    843 typedef uint D3DSHADER_INSTRUCTION_OPCODE_TYPE; 
     843alias TypeDef!(uint) D3DSHADER_INSTRUCTION_OPCODE_TYPE; 
    844844 
    845845//--------------------------------------------------------------------- 
    …… 
    878878    D3DSPC_RESERVED1= 7  // 1 1 1 
    879879} 
    880 typedef uint D3DSHADER_COMPARISON; 
     880alias TypeDef!(uint) D3DSHADER_COMPARISON; 
    881881 
    882882// Comparison is part of instruction opcode token: 
    …… 
    908908    D3DSTT_VOLUME  = 4<<D3DSP_TEXTURETYPE_SHIFT  // dcl_volume s# (for declaring a volume texture) 
    909909} 
    910 typedef uint D3DSAMPLER_TEXTURE_TYPE; 
     910alias TypeDef!(uint) D3DSAMPLER_TEXTURE_TYPE; 
    911911 
    912912//--------------------------------------------------------------------- 
    …… 
    971971    D3DSPR_PREDICATE      = 19  // Predicate register 
    972972} 
    973 typedef uint D3DSHADER_PARAM_REGISTER_TYPE; 
     973alias TypeDef!(uint) D3DSHADER_PARAM_REGISTER_TYPE; 
    974974 
    975975// The miscellaneous register file (D3DSPR_MISCTYPES) 
    …… 
    983983    D3DSMO_FACE   = 1, // Floating point primitive area (PS) 
    984984} 
    985 typedef uint D3DSHADER_MISCTYPE_OFFSETS; 
     985alias TypeDef!(uint) D3DSHADER_MISCTYPE_OFFSETS; 
    986986 
    987987// Register offsets in the Rasterizer Register File 
    …… 
    992992    D3DSRO_POINT_SIZE 
    993993} 
    994 typedef uint D3DVS_RASTOUT_OFFSETS; 
     994alias TypeDef!(uint) D3DVS_RASTOUT_OFFSETS; 
    995995 
    996996// Source operand addressing modes 
    …… 
    10031003    D3DVS_ADDRMODE_RELATIVE  = (1 << D3DVS_ADDRESSMODE_SHIFT) 
    10041004} 
    1005 typedef uint D3DVS_ADDRESSMODE_TYPE; 
     1005alias TypeDef!(uint) D3DVS_ADDRESSMODE_TYPE; 
    10061006 
    10071007const D3DSHADER_ADDRESSMODE_SHIFT = 13; 
    …… 
    10121012    D3DSHADER_ADDRMODE_RELATIVE  = (1 << D3DSHADER_ADDRESSMODE_SHIFT) 
    10131013} 
    1014 typedef uint D3DSHADER_ADDRESSMODE_TYPE; 
     1014alias TypeDef!(uint) D3DSHADER_ADDRESSMODE_TYPE; 
    10151015 
    10161016// Source operand swizzle definitions 
    …… 
    11061106    D3DSPSM_NOT     = 13<<D3DSP_SRCMOD_SHIFT  // for predicate register: "!p0" 
    11071107} 
    1108 typedef uint D3DSHADER_PARAM_SRCMOD_TYPE; 
     1108alias TypeDef!(uint) D3DSHADER_PARAM_SRCMOD_TYPE; 
    11091109 
    11101110// pixel shader version token 
    …… 
    11371137   D3DBASIS_CATMULL_ROM = 2  /* In D3D8 this used to be D3DBASIS_INTERPOLATE */ 
    11381138} 
    1139 typedef uint D3DBASISTYPE; 
     1139alias TypeDef!(uint) D3DBASISTYPE; 
    11401140 
    11411141enum : D3DDEGREETYPE { 
    …… 
    11451145   D3DDEGREE_QUINTIC     = 5 
    11461146} 
    1147 typedef uint D3DDEGREETYPE; 
     1147alias TypeDef!(uint) D3DDEGREETYPE; 
    11481148 
    11491149enum : D3DPATCHEDGESTYLE { 
    …… 
    11511151   D3DPATCHEDGE_CONTINUOUS  = 1 
    11521152} 
    1153 typedef uint D3DPATCHEDGESTYLE; 
     1153alias TypeDef!(uint) D3DPATCHEDGESTYLE; 
    11541154 
    11551155enum : D3DSTATEBLOCKTYPE { 
    …… 
    11581158    D3DSBT_VERTEXSTATE   = 3  // capture vertex state 
    11591159} 
    1160 typedef uint D3DSTATEBLOCKTYPE; 
     1160alias TypeDef!(uint) D3DSTATEBLOCKTYPE; 
    11611161 
    11621162// The D3DVERTEXBLENDFLAGS type is used with D3DRS_VERTEXBLEND state. 
    …… 
    11701170    D3DVBF_0WEIGHTS = 256    // one matrix is used with weight 1.0 
    11711171} 
    1172 typedef uint D3DVERTEXBLENDFLAGS; 
     1172alias TypeDef!(uint) D3DVERTEXBLENDFLAGS; 
    11731173 
    11741174enum : D3DTEXTURETRANSFORMFLAGS { 
    …… 
    11801180    D3DTTFF_PROJECTED       = 256   // texcoords to be divided by COUNTth element 
    11811181} 
    1182 typedef uint D3DTEXTURETRANSFORMFLAGS; 
     1182alias TypeDef!(uint) D3DTEXTURETRANSFORMFLAGS; 
    11831183 
    11841184// Macros to set texture coordinate format bits in the FVF id 
    …… 
    12051205    D3DDEVTYPE_NULLREF     = 4 
    12061206} 
    1207 typedef uint D3DDEVTYPE; 
     1207alias TypeDef!(uint) D3DDEVTYPE; 
    12081208 
    12091209/* Multi-Sample buffer types */ 
    …… 
    12271227    D3DMULTISAMPLE_16_SAMPLES      = 16 
    12281228} 
    1229 typedef uint D3DMULTISAMPLE_TYPE; 
     1229alias TypeDef!(uint) D3DMULTISAMPLE_TYPE; 
    12301230 
    12311231/* Formats 
    …… 
    13601360    D3DFMT_BINARYBUFFER         = 199 
    13611361} 
    1362 typedef uint D3DFORMAT; 
     1362alias TypeDef!(uint) D3DFORMAT; 
    13631363 
    13641364/* Display Modes */ 
    …… 
    13861386    D3DSWAPEFFECT_COPY              = 3 
    13871387} 
    1388 typedef uint D3DSWAPEFFECT; 
     1388alias TypeDef!(uint) D3DSWAPEFFECT; 
    13891389 
    13901390/* Pool types */ 
    …… 
    13951395    D3DPOOL_SCRATCH                 = 3 
    13961396} 
    1397 typedef uint D3DPOOL; 
     1397alias TypeDef!(uint) D3DPOOL; 
    13981398 
    13991399 
    …… 
    14501450    D3DBACKBUFFER_TYPE_RIGHT        = 2 
    14511451} 
    1452 typedef uint D3DBACKBUFFER_TYPE; 
     1452alias TypeDef!(uint) D3DBACKBUFFER_TYPE; 
    14531453 
    14541454/* Types */ 
    …… 
    14621462    D3DRTYPE_INDEXBUFFER            =  7            //if this changes, change _D3DDEVINFO_RESOURCEMANAGER definition 
    14631463} 
    1464 typedef uint D3DRESOURCETYPE; 
     1464alias TypeDef!(uint) D3DRESOURCETYPE; 
    14651465 
    14661466/* Usages */ 
    …… 
    15041504    D3DCUBEMAP_FACE_NEGATIVE_Z     = 5 
    15051505} 
    1506 typedef uint D3DCUBEMAP_FACES; 
     1506alias TypeDef!(uint) D3DCUBEMAP_FACES; 
    15071507 
    15081508/* Lock flags */ 
    …… 
    16551655    D3DDMT_DISABLE           = 1     // disable debug monitor 
    16561656} 
    1657 typedef uint D3DDEBUGMONITORTOKENS; 
     1657alias TypeDef!(uint) D3DDEBUGMONITORTOKENS; 
    16581658 
    16591659// Async feedback 
    …… 
    16751675    D3DQUERYTYPE_CACHEUTILIZATION       = 18, /* D3DISSUE_BEGIN, D3DISSUE_END */ 
    16761676} 
    1677 typedef uint D3DQUERYTYPE; 
     1677alias TypeDef!(uint) D3DQUERYTYPE; 
    16781678 
    16791679// Flags field for Issue 
    …… 
    17731773    D3DCOMPOSERECTS_NEG      = 4 
    17741774} 
    1775 typedef uint D3DCOMPOSERECTSOP; 
     1775alias TypeDef!(uint) D3DCOMPOSERECTSOP; 
    17761776 
    17771777struct D3DCOMPOSERECTDESC 
    …… 
    18091809    D3DSCANLINEORDERING_INTERLACED                 = 2 
    18101810} 
    1811 typedef uint D3DSCANLINEORDERING; 
     1811alias TypeDef!(uint) D3DSCANLINEORDERING; 
    18121812 
    18131813 
    …… 
    18371837    D3DDISPLAYROTATION_270      = 4  // Rotated 270 degrees. 
    18381838} 
    1839 typedef uint D3DDISPLAYROTATION; 
     1839alias TypeDef!(uint) D3DDISPLAYROTATION; 
    18401840 
    18411841/* For use in ID3DResource9::SetPriority calls */ 

  • trunk/win32/mmsystem.d

    r352 r372  
    10451045alias MMTIME* PMMTIME, LPMMTIME; 
    10461046 
    1047 typedef HANDLE HDRVR; 
     1047alias TypeDef!(HANDLE) HDRVR; 
    10481048 
    10491049struct DRVCONFIGINFO { 
    …… 
    10771077+/ 
    10781078 
    1079 typedef HANDLE HWAVE; 
    1080 typedef HANDLE HWAVEIN; 
    1081 typedef HANDLE HWAVEOUT; 
     1079alias TypeDef!(HANDLE) HWAVE; 
     1080alias TypeDef!(HANDLE) HWAVEIN; 
     1081alias TypeDef!(HANDLE) HWAVEOUT; 
    10821082 
    10831083alias HWAVEIN* LPHWAVEIN; 
    …… 
    11691169alias CPtr!(WAVEFORMATEX) LPCWAVEFORMATEX; 
    11701170 
    1171 typedef HANDLE HMIDI; 
    1172 typedef HANDLE HMIDIIN; 
    1173 typedef HANDLE HMIDIOUT; 
    1174 typedef HANDLE HMIDISTRM; 
     1171alias TypeDef!(HANDLE) HMIDI; 
     1172alias TypeDef!(HANDLE) HMIDIIN; 
     1173alias TypeDef!(HANDLE) HMIDIOUT; 
     1174alias TypeDef!(HANDLE) HMIDISTRM; 
    11751175 
    11761176alias HMIDI* LPHMIDI; 
    …… 
    12881288alias AUXCAPSW* PAUXCAPSW, LPAUXCAPSW; 
    12891289 
    1290 typedef HANDLE HMIXEROBJ; 
     1290alias TypeDef!(HANDLE) HMIXEROBJ; 
    12911291alias HMIXEROBJ* LPHMIXEROBJ; 
    12921292 
    1293 typedef HANDLE HMIXER; 
     1293alias TypeDef!(HANDLE) HMIXER; 
    12941294alias HMIXER* LPHMIXER; 
    12951295 
    …… 
    15811581alias char* HPSTR; 
    15821582 
    1583 typedef HANDLE HMMIO; 
     1583alias TypeDef!(HANDLE) HMMIO; 
    15841584 
    15851585alias LRESULT function (LPSTR,UINT,LPARAM,LPARAM) LPMMIOPROC; 

  • trunk/win32/ole.d

    r352 r372  
    255255    OLESTATUS function(LPOLESERVER, HGLOBAL) Execute; 
    256256} 
    257 typedef OLESERVERVTBL* LPOLESERVERVTBL; 
     257alias TypeDef!(OLESERVERVTBL*) LPOLESERVERVTBL; 
    258258 
    259259struct OLESERVER { 

  • trunk/win32/ras.d

    r155 r372  
    222222alias RASPROJECTION* LPRASPROJECTION; 
    223223 
    224 typedef HANDLE HRASCONN; 
     224alias TypeDef!(HANDLE) HRASCONN; 
    225225alias HRASCONN* LPHRASCONN; 
    226226 

  • trunk/win32/rpcdcep.d

    r352 r372  
    9696alias RPC_CLIENT_INTERFACE* PRPC_CLIENT_INTERFACE; 
    9797 
    98 typedef void* I_RPC_MUTEX; 
     98alias TypeDef!(void*) I_RPC_MUTEX; 
    9999 
    100100struct RPC_TRANSFER_SYNTAX { 

  • trunk/win32/rpcndr.d

    r352 r372  
    385385} 
    386386 
    387 typedef void * RPC_SS_THREAD_HANDLE; 
     387alias TypeDef!(void *) RPC_SS_THREAD_HANDLE; 
    388388 
    389389extern (Windows) { 

  • trunk/win32/sqltypes.d

    r176 r372  
    3131 
    3232//static if (ODBCVER >= 0x0300) { 
    33 typedef HANDLE SQLHANDLE; 
     33alias TypeDef!(HANDLE) SQLHANDLE; 
    3434alias SQLHANDLE SQLHENV, SQLHDBC, SQLHSTMT, SQLHDESC; 
    3535/* 

  • trunk/win32/vfw.d

    r322 r372  
    3636const ICVERSION = 0x0104; 
    3737 
    38 typedef HANDLE HIC; 
     38alias TypeDef!(HANDLE) HIC; 
    3939 
    4040const BI_1632 = 0x32333631; 
    …… 
    10401040}; 
    10411041 
    1042 typedef       IAVIStream FAR* PAVISTREAM; 
     1042alias TypeDef!(IAVIStream FAR*) PAVISTREAM; 
    10431043 
    10441044#undef  INTERFACE 
    …… 
    10581058}; 
    10591059 
    1060 typedef       IAVIStreaming FAR* PAVISTREAMING; 
     1060alias TypeDef!(IAVIStreaming FAR*) PAVISTREAMING; 
    10611061 
    10621062 
    …… 
    10861086}; 
    10871087 
    1088 typedef       IAVIEditStream FAR* PAVIEDITSTREAM; 
     1088alias TypeDef!(IAVIEditStream FAR*) PAVIEDITSTREAM; 
    10891089 
    10901090#undef  INTERFACE 
    …… 
    10961096}; 
    10971097 
    1098 typedef IAVIPersistFile FAR* PAVIPERSISTFILE; 
     1098alias TypeDef!(IAVIPersistFile FAR*) PAVIPERSISTFILE; 
    10991099 
    11001100#undef  INTERFACE 
    …… 
    11331133 
    11341134#undef PAVIFILE 
    1135 typedef       IAVIFile FAR* PAVIFILE; 
     1135alias TypeDef!(IAVIFile FAR*) PAVIFILE; 
    11361136 
    11371137#undef  INTERFACE 
    …… 
    11541154 
    11551155#undef PGETFRAME 
    1156 typedef IGetFrame FAR* PGETFRAME; 
     1156alias TypeDef!(IGetFrame FAR*) PGETFRAME; 
    11571157 
    11581158#define DEFINE_AVIGUID(name, l, w1, w2)    DEFINE_GUID(name, l, w1, w2, 0xC0,0,0,0,0,0,0,0x46) 
    …… 
    18201820} 
    18211821 
    1822 typedef HANDLE HVIDEO; 
     1822alias TypeDef!(HANDLE) HVIDEO; 
    18231823alias HVIDEO* LPHVIDEO; 
    18241824 

  • trunk/win32/wingdi.d

    r365 r372  
    24472447} 
    24482448alias EMRARC* PEMRARC; 
    2449 typedef EMRARC EMRARCTO; 
     2449alias TypeDef!(EMRARC) EMRARCTO; 
    24502450alias EMRARCTO* PEMRARCTO; 
    2451 typedef EMRARC EMRCHORD; 
     2451alias TypeDef!(EMRARC) EMRCHORD; 
    24522452alias EMRCHORD* PEMRCHORD; 
    2453 typedef EMRARC EMRPIE; 
     2453alias TypeDef!(EMRARC) EMRPIE; 
    24542454alias EMRPIE* PEMRPIE; 
    24552455 
    …… 
    24892489    LONG     lbHatch; 
    24902490} 
    2491 typedef LOGBRUSH PATTERN; 
     2491alias TypeDef!(LOGBRUSH) PATTERN; 
    24922492alias LOGBRUSH* PLOGBRUSH, NPLOGBRUSH, LPLOGBRUSH; 
    24932493alias PATTERN* PPATTERN, NPPATTERN, LPPATTERN; 
    …… 
    25832583    } 
    25842584    alias EMRSETCOLORSPACE* PEMRSETCOLORSPACE; 
    2585     typedef EMRSETCOLORSPACE EMRSELECTCOLORSPACE; 
     2585    alias TypeDef!(EMRSETCOLORSPACE) EMRSELECTCOLORSPACE; 
    25862586    alias EMRSELECTCOLORSPACE* PEMRSELECTCOLORSPACE; 
    2587     typedef EMRSETCOLORSPACE EMRDELETECOLORSPACE; 
     2587    alias TypeDef!(EMRSETCOLORSPACE) EMRDELETECOLORSPACE; 
    25882588    alias EMRDELETECOLORSPACE* PEMRDELETECOLORSPACE; 
    25892589} 
    …… 
    25982598    } 
    25992599    alias EMREXTESCAPE* PEMREXTESCAPE; 
    2600     typedef EMREXTESCAPE EMRDRAWESCAPE; 
     2600    alias TypeDef!(EMREXTESCAPE) EMRDRAWESCAPE; 
    26012601    alias EMRDRAWESCAPE* PEMRDRAWESCAPE; 
    26022602 
    …… 
    26182618    } 
    26192619    alias EMRSETICMPROFILE* PEMRSETICMPROFILE; 
    2620     typedef EMRSETICMPROFILE EMRSETICMPROFILEA; 
     2620    alias TypeDef!(EMRSETICMPROFILE) EMRSETICMPROFILEA; 
    26212621    alias EMRSETICMPROFILEA* PEMRSETICMPROFILEA; 
    2622     typedef EMRSETICMPROFILE EMRSETICMPROFILEW; 
     2622    alias TypeDef!(EMRSETICMPROFILE) EMRSETICMPROFILEW; 
    26232623    alias EMRSETICMPROFILEW* PEMRSETICMPROFILEW; 
    26242624 
    …… 
    27642764alias EMRELLIPSE* PEMRELLIPSE; 
    27652765 
    2766 typedef EMRELLIPSE EMRRECTANGLE; 
     2766alias TypeDef!(EMRELLIPSE) EMRRECTANGLE; 
    27672767alias EMRRECTANGLE* PEMRRECTANGLE; 
    27682768 
    …… 
    27802780} 
    27812781alias EMREXCLUDECLIPRECT* PEMREXCLUDECLIPRECT; 
    2782 typedef EMREXCLUDECLIPRECT EMRINTERSECTCLIPRECT; 
     2782alias TypeDef!(EMREXCLUDECLIPRECT) EMRINTERSECTCLIPRECT; 
    27832783alias EMRINTERSECTCLIPRECT* PEMRINTERSECTCLIPRECT; 
    27842784 
    …… 
    28472847} 
    28482848alias EMREXTTEXTOUTA* PEMREXTTEXTOUTA; 
    2849 typedef EMREXTTEXTOUTA EMREXTTEXTOUTW; 
     2849alias TypeDef!(EMREXTTEXTOUTA) EMREXTTEXTOUTW; 
    28502850alias EMREXTTEXTOUTW* PEMREXTTEXTOUTW; 
    28512851 
    …… 
    28562856alias EMRFILLPATH* PEMRFILLPATH; 
    28572857 
    2858 typedef EMRFILLPATH EMRSTROKEANDFILLPATH; 
     2858alias TypeDef!(EMRFILLPATH) EMRSTROKEANDFILLPATH; 
    28592859alias EMRSTROKEANDFILLPATH* PEMRSTROKEANDFILLPATH; 
    28602860 
    2861 typedef EMRFILLPATH EMRSTROKEPATH; 
     2861alias TypeDef!(EMRFILLPATH) EMRSTROKEPATH; 
    28622862alias EMRSTROKEPATH* PEMRSTROKEPATH; 
    28632863 
    …… 
    29032903} 
    29042904alias EMRINVERTRGN* PEMRINVERTRGN; 
    2905 typedef EMRINVERTRGN EMRPAINTRGN; 
     2905alias TypeDef!(EMRINVERTRGN) EMRPAINTRGN; 
    29062906alias EMRPAINTRGN* PEMRPAINTRGN; 
    29072907 
    …… 
    29112911} 
    29122912alias EMRLINETO* PEMRLINETO; 
    2913 typedef EMRLINETO EMRMOVETOEX; 
     2913alias TypeDef!(EMRLINETO) EMRMOVETOEX; 
    29142914alias EMRMOVETOEX* PEMRMOVETOEX; 
    29152915 
    …… 
    30043004} 
    30053005alias EMRPOLYLINE* PEMRPOLYLINE; 
    3006 typedef EMRPOLYLINE EMRPOLYBEZIER; 
     3006alias TypeDef!(EMRPOLYLINE) EMRPOLYBEZIER; 
    30073007alias EMRPOLYBEZIER* PEMRPOLYBEZIER; 
    3008 typedef EMRPOLYLINE EMRPOLYGON; 
     3008alias TypeDef!(EMRPOLYLINE) EMRPOLYGON; 
    30093009alias EMRPOLYGON* PEMRPOLYGON; 
    3010 typedef EMRPOLYLINE EMRPOLYBEZIERTO; 
     3010alias TypeDef!(EMRPOLYLINE) EMRPOLYBEZIERTO; 
    30113011alias EMRPOLYBEZIERTO* PEMRPOLYBEZIERTO; 
    3012 typedef EMRPOLYLINE EMRPOLYLINETO; 
     3012alias TypeDef!(EMRPOLYLINE) EMRPOLYLINETO; 
    30133013alias EMRPOLYLINETO* PEMRPOLYLINETO; 
    30143014 
    …… 
    30203020} 
    30213021alias EMRPOLYLINE16* PEMRPOLYLINE16; 
    3022 typedef EMRPOLYLINE16 EMRPOLYBEZIER16; 
     3022alias TypeDef!(EMRPOLYLINE16) EMRPOLYBEZIER16; 
    30233023alias EMRPOLYBEZIER16* PEMRPOLYBEZIER16; 
    3024 typedef EMRPOLYLINE16 EMRPOLYGON16; 
     3024alias TypeDef!(EMRPOLYLINE16) EMRPOLYGON16; 
    30253025alias EMRPOLYGON16* PEMRPOLYGON16; 
    3026 typedef EMRPOLYLINE16 EMRPOLYBEZIERTO16; 
     3026alias TypeDef!(EMRPOLYLINE16) EMRPOLYBEZIERTO16; 
    30273027alias EMRPOLYBEZIERTO16* PEMRPOLYBEZIERTO16; 
    3028 typedef EMRPOLYLINE16 EMRPOLYLINETO16; 
     3028alias TypeDef!(EMRPOLYLINE16) EMRPOLYLINETO16; 
    30293029alias EMRPOLYLINETO16* PEMRPOLYLINETO16; 
    30303030 
    …… 
    30383038} 
    30393039alias EMRPOLYPOLYLINE* PEMRPOLYPOLYLINE; 
    3040 typedef EMRPOLYPOLYLINE EMRPOLYPOLYGON; 
     3040alias TypeDef!(EMRPOLYPOLYLINE) EMRPOLYPOLYGON; 
    30413041alias EMRPOLYPOLYGON* PEMRPOLYPOLYGON; 
    30423042 
    …… 
    30503050} 
    30513051alias EMRPOLYPOLYLINE16* PEMRPOLYPOLYLINE16; 
    3052 typedef EMRPOLYPOLYLINE16 EMRPOLYPOLYGON16; 
     3052alias TypeDef!(EMRPOLYPOLYLINE16) EMRPOLYPOLYGON16; 
    30533053alias EMRPOLYPOLYGON16* PEMRPOLYPOLYGON16; 
    30543054 
    …… 
    30633063} 
    30643064alias EMRPOLYTEXTOUTA* PEMRPOLYTEXTOUTA; 
    3065 typedef EMRPOLYTEXTOUTA EMRPOLYTEXTOUTW; 
     3065alias TypeDef!(EMRPOLYTEXTOUTA) EMRPOLYTEXTOUTW; 
    30663066alias EMRPOLYTEXTOUTW* PEMRPOLYTEXTOUTW; 
    30673067 
    …… 
    30943094} 
    30953095alias EMRSCALEVIEWPORTEXTEX* PEMRSCALEVIEWPORTEXTEX; 
    3096 typedef EMRSCALEVIEWPORTEXTEX EMRSCALEWINDOWEXTEX; 
     3096alias TypeDef!(EMRSCALEVIEWPORTEXTEX) EMRSCALEWINDOWEXTEX; 
    30973097alias EMRSCALEWINDOWEXTEX* PEMRSCALEWINDOWEXTEX; 
    30983098 
    …… 
    31023102} 
    31033103alias EMRSELECTOBJECT* PEMRSELECTOBJECT; 
    3104 typedef EMRSELECTOBJECT EMRDELETEOBJECT; 
     3104alias TypeDef!(EMRSELECTOBJECT) EMRDELETEOBJECT; 
    31053105alias EMRDELETEOBJECT* PEMRDELETEOBJECT; 
    31063106 
    …… 
    31223122} 
    31233123alias EMRSETTEXTCOLOR* PEMRSETTEXTCOLOR; 
    3124 typedef EMRSETTEXTCOLOR EMRSETBKCOLOR; 
     3124alias TypeDef!(EMRSETTEXTCOLOR) EMRSETBKCOLOR; 
    31253125alias EMRSETBKCOLOR* PEMRSETBKCOLOR; 
    31263126 
    …… 
    31833183} 
    31843184alias EMRSETVIEWPORTEXTEX* PEMRSETVIEWPORTEXTEX; 
    3185 typedef EMRSETVIEWPORTEXTEX EMRSETWINDOWEXTEX; 
     3185alias TypeDef!(EMRSETVIEWPORTEXTEX) EMRSETWINDOWEXTEX; 
    31863186alias EMRSETWINDOWEXTEX* PEMRSETWINDOWEXTEX; 
    31873187 
    …… 
    31913191} 
    31923192alias EMRSETVIEWPORTORGEX* PEMRSETVIEWPORTORGEX; 
    3193 typedef EMRSETVIEWPORTORGEX EMRSETWINDOWORGEX; 
     3193alias TypeDef!(EMRSETVIEWPORTORGEX) EMRSETWINDOWORGEX; 
    31943194alias EMRSETWINDOWORGEX* PEMRSETWINDOWORGEX; 
    3195 typedef EMRSETVIEWPORTORGEX EMRSETBRUSHORGEX; 
     3195alias TypeDef!(EMRSETVIEWPORTORGEX) EMRSETBRUSHORGEX; 
    31963196alias EMRSETBRUSHORGEX* PEMRSETBRUSHORGEX; 
    31973197 
    …… 
    32483248} 
    32493249alias EMRABORTPATH* PEMRABORTPATH; 
    3250 typedef EMRABORTPATH EMRBEGINPATH; 
     3250alias TypeDef!(EMRABORTPATH) EMRBEGINPATH; 
    32513251alias EMRBEGINPATH* PEMRBEGINPATH; 
    3252 typedef EMRABORTPATH EMRENDPATH; 
     3252alias TypeDef!(EMRABORTPATH) EMRENDPATH; 
    32533253alias EMRENDPATH* PEMRENDPATH; 
    3254 typedef EMRABORTPATH EMRCLOSEFIGURE; 
     3254alias TypeDef!(EMRABORTPATH) EMRCLOSEFIGURE; 
    32553255alias EMRCLOSEFIGURE* PEMRCLOSEFIGURE; 
    3256 typedef EMRABORTPATH EMRFLATTENPATH; 
     3256alias TypeDef!(EMRABORTPATH) EMRFLATTENPATH; 
    32573257alias EMRFLATTENPATH* PEMRFLATTENPATH; 
    3258 typedef EMRABORTPATH EMRWIDENPATH; 
     3258alias TypeDef!(EMRABORTPATH) EMRWIDENPATH; 
    32593259alias EMRWIDENPATH* PEMRWIDENPATH; 
    3260 typedef EMRABORTPATH EMRSETMETARGN; 
     3260alias TypeDef!(EMRABORTPATH) EMRSETMETARGN; 
    32613261alias EMRSETMETARGN* PEMRSETMETARGN; 
    3262 typedef EMRABORTPATH EMRSAVEDC; 
     3262alias TypeDef!(EMRABORTPATH) EMRSAVEDC; 
    32633263alias EMRSAVEDC* PEMRSAVEDC; 
    3264 typedef EMRABORTPATH EMRREALIZEPALETTE; 
     3264alias TypeDef!(EMRABORTPATH) EMRREALIZEPALETTE; 
    32653265alias EMRREALIZEPALETTE* PEMRREALIZEPALETTE; 
    32663266 
    …… 
    32703270} 
    32713271alias EMRSELECTCLIPPATH* PEMRSELECTCLIPPATH; 
    3272 typedef EMRSELECTCLIPPATH EMRSETBKMODE; 
     3272alias TypeDef!(EMRSELECTCLIPPATH) EMRSETBKMODE; 
    32733273alias EMRSETBKMODE* PEMRSETBKMODE; 
    3274 typedef EMRSELECTCLIPPATH EMRSETMAPMODE; 
     3274alias TypeDef!(EMRSELECTCLIPPATH) EMRSETMAPMODE; 
    32753275alias EMRSETMAPMODE* PEMRSETMAPMODE; 
    3276 typedef EMRSELECTCLIPPATH EMRSETPOLYFILLMODE; 
     3276alias TypeDef!(EMRSELECTCLIPPATH) EMRSETPOLYFILLMODE; 
    32773277alias EMRSETPOLYFILLMODE* PEMRSETPOLYFILLMODE; 
    3278 typedef EMRSELECTCLIPPATH EMRSETROP2; 
     3278alias TypeDef!(EMRSELECTCLIPPATH) EMRSETROP2; 
    32793279alias EMRSETROP2* PEMRSETROP2; 
    3280 typedef EMRSELECTCLIPPATH EMRSETSTRETCHBLTMODE; 
     3280alias TypeDef!(EMRSELECTCLIPPATH) EMRSETSTRETCHBLTMODE; 
    32813281alias EMRSETSTRETCHBLTMODE* PEMRSETSTRETCHBLTMODE; 
    3282 typedef EMRSELECTCLIPPATH EMRSETICMMODE; 
     3282alias TypeDef!(EMRSELECTCLIPPATH) EMRSETICMMODE; 
    32833283alias EMRSETICMMODE* PEMRSETICMMODE; 
    3284 typedef EMRSELECTCLIPPATH EMRSETTEXTALIGN; 
     3284alias TypeDef!(EMRSELECTCLIPPATH) EMRSETTEXTALIGN; 
    32853285alias EMRSETTEXTALIGN* PEMRSETTEXTALIGN; 
    3286 typedef EMRSELECTCLIPPATH EMRENABLEICM; 
     3286alias TypeDef!(EMRSELECTCLIPPATH) EMRENABLEICM; 
    32873287alias EMRENABLEICM* PEMRENABLEICM; 
    32883288static if (WINVER >= 0x0500) { 
    3289     typedef EMRSELECTCLIPPATH EMRSETLAYOUT; 
     3289    alias TypeDef!(EMRSELECTCLIPPATH) EMRSETLAYOUT; 
    32903290    alias EMRSETLAYOUT* PEMRSETLAYOUT; 
    32913291} 

  • trunk/win32/winuser.d

    r361 r372  
    26432643} 
    26442644 
    2645 typedef HANDLE HHOOK; 
    2646 typedef HANDLE HDWP; 
    2647 typedef HANDLE HDEVNOTIFY; 
     2645alias TypeDef!(HANDLE) HHOOK; 
     2646alias TypeDef!(HANDLE) HDWP; 
     2647alias TypeDef!(HANDLE) HDEVNOTIFY; 
    26482648 
    26492649struct ACCEL { 
    …… 
    36223622alias BSMINFO* PBSMINFO; 
    36233623 
    3624 typedef HANDLE HRAWINPUT; 
     3624alias TypeDef!(HANDLE) HRAWINPUT; 
    36253625 
    36263626struct RAWINPUTHEADER { 
    …… 
    43714371 
    43724372// These shouldn't be necessary for D. 
    4373 typedef char* va_list_; 
     4373alias TypeDef!(char*) va_list_; 
    43744374int wvsprintfA(LPSTR, LPCSTR, va_list_ arglist); 
    43754375int wvsprintfW(LPWSTR, LPCWSTR, va_list_ arglist);