Changeset 352

Show
Ignore:
Timestamp:
10/26/10 18:09:37 (2 years ago)
Author:
Yu Hozuki
Message:

Many argument types and return types were improved to const using CPtr template.
They follow the original headers.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/win32/dde.d

    r218 r352  
    150150 
    151151extern (Windows) { 
    152     BOOL DdeSetQualityOfService(HWND, SECURITY_QUALITY_OF_SERVICE*, 
     152    BOOL DdeSetQualityOfService(HWND, CPtr!(SECURITY_QUALITY_OF_SERVICE), 
    153153      PSECURITY_QUALITY_OF_SERVICE); 
    154154    BOOL ImpersonateDdeClientWindow(HWND, HWND); 

  • trunk/win32/docobj.d

    r155 r352  
    125125 
    126126interface IOleCommandTarget : public IUnknown { 
    127     HRESULT QueryStatus(GUID*, ULONG, OLECMD*, OLECMDTEXT*); 
    128     HRESULT Exec(GUID*, DWORD, DWORD, VARIANTARG*, VARIANTARG*); 
     127    HRESULT QueryStatus(CPtr!(GUID), ULONG, OLECMD*, OLECMDTEXT*); 
     128    HRESULT Exec(CPtr!(GUID), DWORD, DWORD, VARIANTARG*, VARIANTARG*); 
    129129} 
    130130 

  • trunk/win32/mmsystem.d

    r183 r352  
    11671167} 
    11681168alias WAVEFORMATEX* PWAVEFORMATEX, LPWAVEFORMATEX; 
    1169 alias WAVEFORMATEX* LPCWAVEFORMATEX; 
     1169alias CPtr!(WAVEFORMATEX) LPCWAVEFORMATEX; 
    11701170 
    11711171typedef HANDLE HMIDI; 
    …… 
    16041604} 
    16051605alias MMIOINFO* PMMIOINFO, LPMMIOINFO; 
    1606 alias MMIOINFO* LPCMMIOINFO; 
     1606alias CPtr!(MMIOINFO) LPCMMIOINFO; 
    16071607 
    16081608struct MMCKINFO { 
    …… 
    16141614} 
    16151615alias MMCKINFO* PMMCKINFO, LPMMCKINFO; 
    1616 alias MMCKINFO* LPCMMCKINFO; 
     1616alias CPtr!(MMCKINFO) LPCMMCKINFO; 
    16171617 
    16181618struct MCI_GENERIC_PARMS { 
    …… 
    19661966MMRESULT mmioAdvance(HMMIO,LPMMIOINFO,UINT); 
    19671967LRESULT mmioSendMessage(HMMIO,UINT,LPARAM,LPARAM); 
    1968 MMRESULT mmioDescend(HMMIO,LPMMCKINFO, MMCKINFO*,UINT); 
     1968MMRESULT mmioDescend(HMMIO,LPMMCKINFO, CPtr!(MMCKINFO),UINT); 
    19691969MMRESULT mmioAscend(HMMIO,LPMMCKINFO,UINT); 
    19701970MMRESULT mmioCreateChunk(HMMIO,LPMMCKINFO,UINT); 

  • trunk/win32/ntdef.d

    r155 r352  
    4848    PWSTR  Buffer; 
    4949} 
    50 alias UNICODE_STRING* PUNICODE_STRING, PCUNICODE_STRING; 
     50alias UNICODE_STRING*       PUNICODE_STRING; 
     51alias CPtr!(UNICODE_STRING) PCUNICODE_STRING; 
    5152 
    5253struct STRING { 

  • trunk/win32/objbase.d

    r288 r352  
    6767    USHORT reserved; 
    6868    ULONG ulSectorSize; 
    69     WCHAR* pwcsTemplateFile; 
     69    CPtr!(WCHAR) pwcsTemplateFile; 
    7070} 
    7171 
    …… 
    165165    HRESULT CreateDataAdviseHolder(LPDATAADVISEHOLDER*); 
    166166    HRESULT CreateDataCache(LPUNKNOWN, REFCLSID, REFIID, PVOID*); 
    167     HRESULT StgCreateDocfile(OLECHAR*, DWORD, DWORD, IStorage**); 
     167    HRESULT StgCreateDocfile(CPtr!(OLECHAR), DWORD, DWORD, IStorage**); 
    168168    HRESULT StgCreateDocfileOnILockBytes(ILockBytes*, DWORD, DWORD, IStorage**); 
    169     HRESULT StgOpenStorage(OLECHAR*, IStorage, DWORD, SNB, DWORD, IStorage*); 
     169    HRESULT StgOpenStorage(CPtr!(OLECHAR), IStorage, DWORD, SNB, DWORD, IStorage*); 
    170170    HRESULT StgOpenStorageOnILockBytes(ILockBytes*, IStorage*, DWORD, SNB, DWORD, IStorage**); 
    171     HRESULT StgIsStorageFile(OLECHAR*); 
     171    HRESULT StgIsStorageFile(CPtr!(OLECHAR)); 
    172172    HRESULT StgIsStorageILockBytes(ILockBytes*); 
    173173    HRESULT StgSetTimes(OLECHAR *, FILETIME *, FILETIME *, FILETIME *); 
    174     HRESULT StgCreateStorageEx(WCHAR*, DWORD, DWORD, DWORD, STGOPTIONS*, void*, REFIID, void**); 
    175     HRESULT StgOpenStorageEx(WCHAR*, DWORD, DWORD, DWORD, STGOPTIONS*, void*, REFIID, void**); 
     174    HRESULT StgCreateStorageEx(CPtr!(WCHAR), DWORD, DWORD, DWORD, STGOPTIONS*, void*, REFIID, void**); 
     175    HRESULT StgOpenStorageEx(CPtr!(WCHAR), DWORD, DWORD, DWORD, STGOPTIONS*, void*, REFIID, void**); 
    176176    HRESULT BindMoniker(LPMONIKER, DWORD, REFIID, PVOID*); 
    177177    HRESULT CoGetObject(LPCWSTR, BIND_OPTS*, REFIID, void**); 

  • trunk/win32/objidl.d

    r289 r352  
    140140 
    141141struct MULTI_QI { 
    142     IID*      pIID; 
    143     IUnknown  pItf; 
    144     HRESULT   hr; 
     142    CPtr!(IID) pIID; 
     143    IUnknown  pItf; 
     144    HRESULT    hr; 
    145145} 
    146146 
    …… 
    10921092HRESULT IStorage_CreateStream_Proxy(IStorage*, OLECHAR*, DWORD, DWORD, DWORD, IStream**); 
    10931093void IStorage_CreateStream_Stub(IRpcStubBuffer*, IRpcChannelBuffer*, PRPC_MESSAGE, PDWORD); 
    1094 HRESULT IStorage_RemoteOpenStream_Proxy(IStorage*, OLECHAR*, uint, BYTE*, DWORD, DWORD, IStream**); 
     1094HRESULT IStorage_RemoteOpenStream_Proxy(IStorage*, CPtr!(OLECHAR), uint, BYTE*, DWORD, DWORD, IStream**); 
    10951095void IStorage_RemoteOpenStream_Stub(IRpcStubBuffer*, IRpcChannelBuffer*, PRPC_MESSAGE, PDWORD); 
    10961096HRESULT IStorage_CreateStorage_Proxy(IStorage*, OLECHAR*, DWORD, DWORD, DWORD, IStorage**); 
    …… 
    10981098HRESULT IStorage_OpenStorage_Proxy(IStorage*, OLECHAR*, IStorage*, DWORD, SNB, DWORD, IStorage**); 
    10991099void IStorage_OpenStorage_Stub(IRpcStubBuffer*, IRpcChannelBuffer*, PRPC_MESSAGE, PDWORD); 
    1100 HRESULT IStorage_CopyTo_Proxy(IStorage*, DWORD, IID*, SNB, IStorage*); 
     1100HRESULT IStorage_CopyTo_Proxy(IStorage*, DWORD, CPtr!(IID), SNB, IStorage*); 
    11011101void IStorage_CopyTo_Stub(IRpcStubBuffer*, IRpcChannelBuffer*, PRPC_MESSAGE, PDWORD); 
    1102 HRESULT IStorage_MoveElementTo_Proxy(IStorage*, OLECHAR*, IStorage*, OLECHAR*, DWORD); 
     1102HRESULT IStorage_MoveElementTo_Proxy(IStorage*, CPtr!(OLECHAR, IStorage*, CPtr!(OLECHAR), DWORD); 
    11031103void IStorage_MoveElementTo_Stub(IRpcStubBuffer*, IRpcChannelBuffer*, PRPC_MESSAGE, PDWORD); 
    11041104HRESULT IStorage_Commit_Proxy(IStorage*, DWORD); 
    …… 
    11101110HRESULT IStorage_DestroyElement_Proxy(IStorage*, OLECHAR*); 
    11111111void IStorage_DestroyElement_Stub(IRpcStubBuffer*, IRpcChannelBuffer*, PRPC_MESSAGE, PDWORD); 
    1112 HRESULT IStorage_RenameElement_Proxy(IStorage*, OLECHAR*, OLECHAR*); 
     1112HRESULT IStorage_RenameElement_Proxy(IStorage*, CPtr!(OLECHAR), CPtr!(OLECHAR)); 
    11131113void IStorage_RenameElement_Stub(IRpcStubBuffer*, IRpcChannelBuffer*, PRPC_MESSAGE, PDWORD); 
    1114 HRESULT IStorage_SetElementTimes_Proxy(IStorage*, OLECHAR*, FILETIME*, FILETIME*, FILETIME*); 
     1114HRESULT IStorage_SetElementTimes_Proxy(IStorage*, CPtr!(OLECHAR), CPtr!(FILETIME), CPtr!(FILETIME), CPtr!(FILETIME)); 
    11151115void IStorage_SetElementTimes_Stub(IRpcStubBuffer*, IRpcChannelBuffer*, PRPC_MESSAGE, PDWORD); 
    11161116HRESULT IStorage_SetClass_Proxy(IStorage*, REFCLSID); 
    …… 
    13021302HRESULT ILockBytes_ReadAt_Proxy(ILockBytes*, ULARGE_INTEGER, void*, ULONG, ULONG*); 
    13031303HRESULT ILockBytes_ReadAt_Stub(ILockBytes*, ULARGE_INTEGER, BYTE*, ULONG, ULONG*); 
    1304 HRESULT ILockBytes_WriteAt_Proxy(ILockBytes*, ULARGE_INTEGER, void*, ULONG, ULONG*); 
     1304HRESULT ILockBytes_WriteAt_Proxy(ILockBytes*, ULARGE_INTEGER, CPtr!(void), ULONG, ULONG*); 
    13051305HRESULT ILockBytes_WriteAt_Stub(ILockBytes*, ULARGE_INTEGER, BYTE*, ULONG, ULONG*); 
    13061306} 

  • trunk/win32/ole.d

    r289 r352  
    289289    OLESTATUS OleSetTargetDevice(LPOLEOBJECT, HGLOBAL); 
    290290    OLESTATUS OleSetBounds(LPOLEOBJECT, LPCRECT); 
    291     OLESTATUS OleSetColorScheme(LPOLEOBJECT, LOGPALETTE*); 
     291    OLESTATUS OleSetColorScheme(LPOLEOBJECT, CPtr!(LOGPALETTE)); 
    292292    OLESTATUS OleQueryBounds(LPOLEOBJECT, RECT*); 
    293293    OLESTATUS OleQuerySize(LPOLEOBJECT, DWORD*); 

  • trunk/win32/ole2.d

    r289 r352  
    4444    struct OLESTREAMVTBL { 
    4545        DWORD function (LPOLESTREAM, void*, DWORD) Get; 
    46         DWORD function (LPOLESTREAM, void*, DWORD) Put; 
     46        DWORD function (LPOLESTREAM, CPtr!(void), DWORD) Put; 
    4747    } 
    4848} 
    …… 
    103103    HRESULT OleRegEnumFormatEtc (REFCLSID, DWORD, LPENUMFORMATETC*); 
    104104    HRESULT OleRegEnumVerbs (REFCLSID, LPENUMOLEVERB*); 
    105     HRESULT OleConvertOLESTREAMToIStorage(LPOLESTREAM, LPSTORAGE, DVTARGETDEVICE*); 
     105    HRESULT OleConvertOLESTREAMToIStorage(LPOLESTREAM, LPSTORAGE, CPtr!(DVTARGETDEVICE)); 
    106106    HRESULT OleConvertIStorageToOLESTREAM(LPSTORAGE, LPOLESTREAM); 
    107107    HRESULT GetHGlobalFromILockBytes(LPLOCKBYTES, HGLOBAL*); 

  • trunk/win32/oleauto.d

    r287 r352  
    228228 
    229229extern (Windows) { 
    230     BSTR SysAllocString(OLECHAR*); 
    231     int SysReAllocString(BSTR*, OLECHAR*); 
    232     BSTR SysAllocStringLen(OLECHAR*, uint); 
    233     int SysReAllocStringLen(BSTR*, OLECHAR*, uint); 
     230    BSTR SysAllocString(CPtr!(OLECHAR)); 
     231    int SysReAllocString(BSTR*, CPtr!(OLECHAR)); 
     232    BSTR SysAllocStringLen(CPtr!(OLECHAR), uint); 
     233    int SysReAllocStringLen(BSTR*, CPtr!(OLECHAR), uint); 
    234234    void SysFreeString(BSTR); 
    235235    uint SysStringLen(BSTR); 
    236236    uint SysStringByteLen(BSTR); 
    237     BSTR SysAllocStringByteLen(char*, uint); 
     237    BSTR SysAllocStringByteLen(CPtr!(char), uint); 
    238238    int DosDateTimeToVariantTime(ushort, ushort, double*); 
    239239    int VariantTimeToDosDateTime(double, ushort*, ushort*); 
    …… 
    359359    HRESULT VarBoolFromDisp(LPDISPATCH, LCID, VARIANT_BOOL*); 
    360360    HRESULT VarDecFromR8(double, DECIMAL*); 
    361     ULONG LHashValOfNameSysA(SYSKIND, LCID, char*); 
    362     ULONG LHashValOfNameSys(SYSKIND, LCID, OLECHAR*); 
    363     HRESULT LoadTypeLib(OLECHAR*, LPTYPELIB*); 
     361    ULONG LHashValOfNameSysA(SYSKIND, LCID, CPtr!(char)); 
     362    ULONG LHashValOfNameSys(SYSKIND, LCID, CPtr!(OLECHAR)); 
     363    HRESULT LoadTypeLib(CPtr!(OLECHAR), LPTYPELIB*); 
    364364    HRESULT LoadTypeLibEx(LPCOLESTR, REGKIND, LPTYPELIB*); 
    365365    HRESULT LoadRegTypeLib(REFGUID, WORD, WORD, LCID, LPTYPELIB*); 
    …… 
    368368    HRESULT UnRegisterTypeLib(REFGUID, WORD, WORD, LCID, SYSKIND); 
    369369    // not actually deprecated, but depends on unconverted ICreateTypeLib 
    370     deprecated HRESULT CreateTypeLib(SYSKIND, OLECHAR*, LPCREATETYPELIB*); 
     370    deprecated HRESULT CreateTypeLib(SYSKIND, CPtr!(OLECHAR), LPCREATETYPELIB*); 
    371371    HRESULT DispGetParam(DISPPARAMS*, UINT, VARTYPE, VARIANT*, UINT*); 
    372372    HRESULT DispGetIDsOfNames(LPTYPEINFO, OLECHAR**, UINT, DISPID*); 
    …… 
    634634    HRESULT VarDecFromDisp(IDispatch*, LCID, DECIMAL*); 
    635635 
    636     HRESULT VarDecNeg(DECIMAL*, DECIMAL*); 
     636    HRESULT VarDecNeg(CPtr!(DECIMAL), DECIMAL*); 
    637637    HRESULT VarR4CmpR8(float, double); 
    638638    HRESULT VarR8Pow(double, double, double*); 
    639639    HRESULT VarR8Round(double, int, double*); 
    640     HRESULT VarDecAbs(DECIMAL*, DECIMAL*); 
    641     HRESULT VarDecAdd(DECIMAL*, DECIMAL*, DECIMAL*); 
    642     HRESULT VarDecCmp(DECIMAL*, DECIMAL*); 
    643     HRESULT VarDecCmpR8(DECIMAL*, DOUBLE); 
    644     HRESULT VarDecDiv(DECIMAL*, DECIMAL*, DECIMAL*); 
    645     HRESULT VarDecFix(DECIMAL*, DECIMAL*); 
    646     HRESULT VarDecInt(DECIMAL*, DECIMAL*); 
    647     HRESULT VarDecMul(DECIMAL*, DECIMAL*, DECIMAL*); 
    648     HRESULT VarDecRound(DECIMAL*, int, DECIMAL*); 
    649     HRESULT VarDecSub(DECIMAL*, DECIMAL*, DECIMAL*); 
     640    HRESULT VarDecAbs(CPtr!(DECIMAL), DECIMAL*); 
     641    HRESULT VarDecAdd(CPtr!(DECIMAL), CPtr!(DECIMAL), DECIMAL*); 
     642    HRESULT VarDecCmp(CPtr!(DECIMAL), CPtr!(DECIMAL)); 
     643    HRESULT VarDecCmpR8(CPtr!(DECIMAL), DOUBLE); 
     644    HRESULT VarDecDiv(CPtr!(DECIMAL), CPtr!(DECIMAL), DECIMAL*); 
     645    HRESULT VarDecFix(CPtr!(DECIMAL), DECIMAL*); 
     646    HRESULT VarDecInt(CPtr!(DECIMAL), DECIMAL*); 
     647    HRESULT VarDecMul(CPtr!(DECIMAL), CPtr!(DECIMAL), DECIMAL*); 
     648    HRESULT VarDecRound(CPtr!(DECIMAL), int, DECIMAL*); 
     649    HRESULT VarDecSub(CPtr!(DECIMAL), CPtr!(DECIMAL), DECIMAL*); 
    650650    HRESULT VarCyAbs(CY, CY*); 
    651651    HRESULT VarCyAdd(CY, CY, CY*); 

  • trunk/win32/prsht.d

    r155 r352  
    216216    } 
    217217} 
    218 alias PROPSHEETPAGEA* LPPROPSHEETPAGEA, LPCPROPSHEETPAGEA; 
     218alias PROPSHEETPAGEA*       LPPROPSHEETPAGEA; 
     219alias CPtr!(PROPSHEETPAGEA) LPCPROPSHEETPAGEA; 
    219220 
    220221struct PROPSHEETPAGEW { 
    …… 
    240241    } 
    241242} 
    242 alias PROPSHEETPAGEW* LPPROPSHEETPAGEW, LPCPROPSHEETPAGEW; 
     243alias PROPSHEETPAGEW*       LPPROPSHEETPAGEW; 
     244alias CPtr!(PROPSHEETPAGEW) LPCPROPSHEETPAGEW; 
    243245 
    244246alias HANDLE HPROPSHEETPAGE; 
    …… 
    276278    } 
    277279} 
    278 alias PROPSHEETHEADERA* LPPROPSHEETHEADERA, LPCPROPSHEETHEADERA; 
     280alias PROPSHEETHEADERA*       LPPROPSHEETHEADERA; 
     281alias CPtr!(PROPSHEETHEADERA) LPCPROPSHEETHEADERA; 
    279282 
    280283struct PROPSHEETHEADERW { 
    …… 
    310313    } 
    311314} 
    312 alias PROPSHEETHEADERW* LPPROPSHEETHEADERW, LPCPROPSHEETHEADERW; 
     315alias PROPSHEETHEADERW*       LPPROPSHEETHEADERW; 
     316alias CPtr!(PROPSHEETHEADERW) LPCPROPSHEETHEADERW; 
    313317 
    314318alias BOOL function(HPROPSHEETPAGE, LPARAM) LPFNADDPROPSHEETPAGE; 

  • trunk/win32/rassapi.d

    r180 r352  
    199199 
    200200extern (Windows) { 
    201     DWORD RasAdminServerGetInfo(WCHAR*, PRAS_SERVER_0); 
    202     DWORD RasAdminGetUserAccountServer(WCHAR*, WCHAR*, LPWSTR); 
    203     DWORD RasAdminUserGetInfo(WCHAR*, WCHAR*, PRAS_USER_0); 
    204     DWORD RasAdminUserSetInfo(WCHAR*, WCHAR*, PRAS_USER_0); 
     201    DWORD RasAdminServerGetInfo(CPtr!(WCHAR), PRAS_SERVER_0); 
     202    DWORD RasAdminGetUserAccountServer(CPtr!(WCHAR), CPtr!(WCHAR), LPWSTR); 
     203    DWORD RasAdminUserGetInfo(CPtr!(WCHAR), CPtr!(WCHAR), PRAS_USER_0); 
     204    DWORD RasAdminUserSetInfo(CPtr!(WCHAR), CPtr!(WCHAR), PRAS_USER_0); 
    205205    DWORD RasAdminPortEnum(WCHAR*, PRAS_PORT_0*, WORD*); 
    206     DWORD RasAdminPortGetInfo(WCHAR*, WCHAR*, RAS_PORT_1*, 
     206    DWORD RasAdminPortGetInfo(CPtr!(WCHAR), CPtr!(WCHAR), RAS_PORT_1*, 
    207207     RAS_PORT_STATISTICS*, RAS_PARAMETERS**); 
    208     DWORD RasAdminPortClearStatistics(WCHAR*, WCHAR*); 
    209     DWORD RasAdminPortDisconnect(WCHAR*, WCHAR*); 
     208    DWORD RasAdminPortClearStatistics(CPtr!(WCHAR), CPtr!(WCHAR)); 
     209    DWORD RasAdminPortDisconnect(CPtr!(WCHAR), CPtr!(WCHAR)); 
    210210    DWORD RasAdminFreeBuffer(PVOID); 
    211211    DWORD RasAdminGetErrorString(UINT, WCHAR*, DWORD); 

  • trunk/win32/rpcdcep.d

    r257 r352  
    8080    PRPC_PROTSEQ_ENDPOINT RpcProtseqEndpoint; 
    8181    void*                 DefaultManagerEpv; 
    82     void*                 InterpreterInfo; 
     82    CPtr!(void)           InterpreterInfo; 
    8383} 
    8484alias RPC_SERVER_INTERFACE* PRPC_SERVER_INTERFACE; 
    …… 
    9292    PRPC_PROTSEQ_ENDPOINT RpcProtseqEndpoint; 
    9393    uint                  Reserved; 
    94     void*                 InterpreterInfo; 
     94    CPtr!(void)           InterpreterInfo; 
    9595} 
    9696alias RPC_CLIENT_INTERFACE* PRPC_CLIENT_INTERFACE; 

  • trunk/win32/rpcndr.d

    r257 r352  
    118118alias uint RPC_LENGTH; 
    119119 
    120 alias ubyte *PFORMAT_STRING; 
     120alias CPtr!(char) PFORMAT_STRING; 
    121121 
    122122struct ARRAY_INFO { 
    …… 
    190190    ubyte * pTransmitType; 
    191191    handle_t SavedHandle; 
    192     _MIDL_STUB_DESC *StubDesc; 
     192    CPtr!(_MIDL_STUB_DESC) StubDesc; 
    193193    _FULL_PTR_XLAT_TABLES *FullPtrXlatTables; 
    194194    uint FullPtrRefId; 
    …… 
    294294    } 
    295295    _IMPLICIT_HANDLE_INFO IMPLICIT_HANDLE_INFO;  
    296     NDR_RUNDOWN *apfnNdrRundownRoutines; 
    297     GENERIC_BINDING_ROUTINE_PAIR *aGenericBindingRoutinePairs; 
    298     EXPR_EVAL *apfnExprEval; 
    299     XMIT_ROUTINE_QUINTUPLE *aXmitQuintuple; 
    300     ubyte *pFormatTypes; 
     296    CPtr!(NDR_RUNDOWN) apfnNdrRundownRoutines; 
     297    CPtr!(GENERIC_BINDING_ROUTINE_PAIR) aGenericBindingRoutinePairs; 
     298    CPtr!(EXPR_EVAL) apfnExprEval; 
     299    CPtr!(XMIT_ROUTINE_QUINTUPLE) aXmitQuintuple; 
     300    CPtr!(char) *pFormatTypes; 
    301301    int fCheckBounds; 
    302302    uint Version; 
    303303    MALLOC_FREE_STRUCT *pMallocFreeStruct; 
    304304    int MIDLVersion; 
    305     COMM_FAULT_OFFSETS *CommFaultOffsets; 
    306     USER_MARSHAL_ROUTINE_QUADRUPLE *aUserMarshalQuadruple; 
    307     NDR_NOTIFY_ROUTINE *NotifyRoutineTable; 
     305    CPtr!(COMM_FAULT_OFFSETS) CommFaultOffsets; 
     306    CPtr!(USER_MARSHAL_ROUTINE_QUADRUPLE) aUserMarshalQuadruple; 
     307    CPtr!(NDR_NOTIFY_ROUTINE) NotifyRoutineTable; 
    308308    ULONG_PTR mFlags; 
    309     NDR_CS_ROUTINES *CsRoutineTables; 
     309    CPtr!(NDR_CS_ROUTINES) CsRoutineTables; 
    310310    void *Reserved4; 
    311311    ULONG_PTR Reserved5; 
    312312} 
    313 alias MIDL_STUB_DESC * PMIDL_STUB_DESC; 
     313alias CPtr!(MIDL_STUB_DESC) PMIDL_STUB_DESC; 
    314314 
    315315alias void * PMIDL_XMIT_TYPE; 
    …… 
    322322struct MIDL_SERVER_INFO { 
    323323    PMIDL_STUB_DESC pStubDesc; 
    324     SERVER_ROUTINE *DispatchTable; 
     324    CPtr!(SERVER_ROUTINE) DispatchTable; 
    325325    PFORMAT_STRING ProcString; 
    326     ushort *FmtStringOffset; 
    327     STUB_THUNK *ThunkTable; 
     326    CPtr!(ushort) FmtStringOffset; 
     327    CPtr!(STUB_THUNK) ThunkTable; 
    328328} 
    329329alias MIDL_SERVER_INFO * PMIDL_SERVER_INFO; 
    …… 
    332332    PMIDL_STUB_DESC pStubDesc; 
    333333    PFORMAT_STRING ProcFormatString; 
    334     ushort *FormatStringOffset; 
     334    CPtr!(ushort) FormatStringOffset; 
    335335} 
    336336alias MIDL_STUBLESS_PROXY_INFO *PMIDL_STUBLESS_PROXY_INFO; 

  • trunk/win32/setupapi.d

    r264 r352  
    14831483    BOOL SetupDiClassGuidsFromNameExA(PCSTR,LPGUID,DWORD,PDWORD,PCSTR,PVOID); 
    14841484    BOOL SetupDiClassGuidsFromNameExW(PCWSTR,LPGUID,DWORD,PDWORD,PCWSTR,PVOID); 
    1485     BOOL SetupDiClassNameFromGuidA(GUID*,PSTR,DWORD,PDWORD); 
    1486     BOOL SetupDiClassNameFromGuidW(GUID*,PWSTR,DWORD,PDWORD); 
    1487     BOOL SetupDiClassNameFromGuidExA(GUID*,PSTR,DWORD,PDWORD,PCSTR,PVOID); 
    1488     BOOL SetupDiClassNameFromGuidExW(GUID*,PWSTR,DWORD,PDWORD,PCWSTR,PVOID); 
    1489     BOOL SetupDiCreateDeviceInfoA(HDEVINFO,PCSTR,GUID*,PCSTR,HWND,DWORD,PSP_DEVINFO_DATA); 
    1490     BOOL SetupDiCreateDeviceInfoW(HDEVINFO,PCWSTR,GUID*,PCWSTR,HWND,DWORD,PSP_DEVINFO_DATA); 
    1491     HDEVINFO SetupDiCreateDeviceInfoList(GUID*,HWND); 
    1492     HDEVINFO SetupDiCreateDeviceInfoListExA(GUID*,HWND,PCSTR,PVOID); 
    1493     HDEVINFO SetupDiCreateDeviceInfoListExW(GUID*,HWND,PCWSTR,PVOID); 
    1494     BOOL SetupDiCreateDeviceInterfaceA(HDEVINFO,PSP_DEVINFO_DATA,GUID*,PCSTR,DWORD,PSP_DEVICE_INTERFACE_DATA); 
    1495     BOOL SetupDiCreateDeviceInterfaceW(HDEVINFO,PSP_DEVINFO_DATA,GUID*,PCWSTR,DWORD,PSP_DEVICE_INTERFACE_DATA); 
     1485    BOOL SetupDiClassNameFromGuidA(CPtr!(GUID),PSTR,DWORD,PDWORD); 
     1486    BOOL SetupDiClassNameFromGuidW(CPtr!(GUID),PWSTR,DWORD,PDWORD); 
     1487    BOOL SetupDiClassNameFromGuidExA(CPtr!(GUID),PSTR,DWORD,PDWORD,PCSTR,PVOID); 
     1488    BOOL SetupDiClassNameFromGuidExW(CPtr!(GUID),PWSTR,DWORD,PDWORD,PCWSTR,PVOID); 
     1489    BOOL SetupDiCreateDeviceInfoA(HDEVINFO,PCSTR,CPtr!(GUID),PCSTR,HWND,DWORD,PSP_DEVINFO_DATA); 
     1490    BOOL SetupDiCreateDeviceInfoW(HDEVINFO,PCWSTR,CPtr!(GUID),PCWSTR,HWND,DWORD,PSP_DEVINFO_DATA); 
     1491    HDEVINFO SetupDiCreateDeviceInfoList(CPtr!(GUID),HWND); 
     1492    HDEVINFO SetupDiCreateDeviceInfoListExA(CPtr!(GUID),HWND,PCSTR,PVOID); 
     1493    HDEVINFO SetupDiCreateDeviceInfoListExW(CPtr!(GUID),HWND,PCWSTR,PVOID); 
     1494    BOOL SetupDiCreateDeviceInterfaceA(HDEVINFO,PSP_DEVINFO_DATA,CPtr!(GUID),PCSTR,DWORD,PSP_DEVICE_INTERFACE_DATA); 
     1495    BOOL SetupDiCreateDeviceInterfaceW(HDEVINFO,PSP_DEVINFO_DATA,CPtr!(GUID),PCWSTR,DWORD,PSP_DEVICE_INTERFACE_DATA); 
    14961496    HKEY SetupDiCreateDeviceInterfaceRegKeyA(HDEVINFO,PSP_DEVICE_INTERFACE_DATA,DWORD,REGSAM,HINF,PCSTR); 
    14971497    HKEY SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO,PSP_DEVICE_INTERFACE_DATA,DWORD,REGSAM,HINF,PCWSTR); 
    …… 
    15071507    INT SetupDiDrawMiniIcon(HDC,RECT,INT,DWORD); 
    15081508    BOOL SetupDiEnumDeviceInfo(HDEVINFO,DWORD,PSP_DEVINFO_DATA); 
    1509     BOOL SetupDiEnumDeviceInterfaces(HDEVINFO,PSP_DEVINFO_DATA,GUID*,DWORD,PSP_DEVICE_INTERFACE_DATA); 
     1509    BOOL SetupDiEnumDeviceInterfaces(HDEVINFO,PSP_DEVINFO_DATA,CPtr!(GUID),DWORD,PSP_DEVICE_INTERFACE_DATA); 
    15101510    BOOL SetupDiEnumDriverInfoA(HDEVINFO,PSP_DEVINFO_DATA,DWORD,DWORD,PSP_DRVINFO_DATA_A); 
    15111511    BOOL SetupDiEnumDriverInfoW(HDEVINFO,PSP_DEVINFO_DATA,DWORD,DWORD,PSP_DRVINFO_DATA_W); 
    15121512    BOOL SetupDiGetActualSectionToInstallA(HINF,PCSTR,PSTR,DWORD,PDWORD,PSTR*); 
    15131513    BOOL SetupDiGetActualSectionToInstallW(HINF,PCWSTR,PWSTR,DWORD,PDWORD,PWSTR*); 
    1514     BOOL SetupDiGetClassBitmapIndex(GUID*,PINT); 
    1515     BOOL SetupDiGetClassDescriptionA(GUID*,PSTR,DWORD,PDWORD); 
    1516     BOOL SetupDiGetClassDescriptionW(GUID*,PWSTR,DWORD,PDWORD); 
    1517     BOOL SetupDiGetClassDescriptionExA(GUID*,PSTR,DWORD,PDWORD,PCSTR,PVOID); 
    1518     BOOL SetupDiGetClassDescriptionExW(GUID*,PWSTR,DWORD,PDWORD,PCWSTR,PVOID); 
     1514    BOOL SetupDiGetClassBitmapIndex(CPtr!(GUID),PINT); 
     1515    BOOL SetupDiGetClassDescriptionA(CPtr!(GUID),PSTR,DWORD,PDWORD); 
     1516    BOOL SetupDiGetClassDescriptionW(CPtr!(GUID),PWSTR,DWORD,PDWORD); 
     1517    BOOL SetupDiGetClassDescriptionExA(CPtr!(GUID),PSTR,DWORD,PDWORD,PCSTR,PVOID); 
     1518    BOOL SetupDiGetClassDescriptionExW(CPtr!(GUID),PWSTR,DWORD,PDWORD,PCWSTR,PVOID); 
    15191519    BOOL SetupDiGetClassDevPropertySheetsA(HDEVINFO,PSP_DEVINFO_DATA,LPPROPSHEETHEADERA,DWORD,PDWORD,DWORD); 
    15201520    BOOL SetupDiGetClassDevPropertySheetsW(HDEVINFO,PSP_DEVINFO_DATA,LPPROPSHEETHEADERW,DWORD,PDWORD,DWORD); 
    1521     HDEVINFO SetupDiGetClassDevsA(GUID*,PCSTR,HWND,DWORD); 
    1522     HDEVINFO SetupDiGetClassDevsW(GUID*,PCWSTR,HWND,DWORD); 
    1523     HDEVINFO SetupDiGetClassDevsExA(GUID*,PCSTR,HWND,DWORD,HDEVINFO,PCSTR,PVOID); 
    1524     HDEVINFO SetupDiGetClassDevsExW(GUID*,PCWSTR,HWND,DWORD,HDEVINFO,PCWSTR,PVOID); 
    1525     BOOL SetupDiGetClassImageIndex(PSP_CLASSIMAGELIST_DATA,GUID*,PINT); 
     1521    HDEVINFO SetupDiGetClassDevsA(CPtr!(GUID),PCSTR,HWND,DWORD); 
     1522    HDEVINFO SetupDiGetClassDevsW(CPtr!(GUID),PCWSTR,HWND,DWORD); 
     1523    HDEVINFO SetupDiGetClassDevsExA(CPtr!(GUID),PCSTR,HWND,DWORD,HDEVINFO,PCSTR,PVOID); 
     1524    HDEVINFO SetupDiGetClassDevsExW(CPtr!(GUID),PCWSTR,HWND,DWORD,HDEVINFO,PCWSTR,PVOID); 
     1525    BOOL SetupDiGetClassImageIndex(PSP_CLASSIMAGELIST_DATA,CPtr!(GUID),PINT); 
    15261526    BOOL SetupDiGetClassImageList(PSP_CLASSIMAGELIST_DATA); 
    15271527    BOOL SetupDiGetClassImageListExA(PSP_CLASSIMAGELIST_DATA,PCSTR,PVOID); 
    …… 
    15381538    BOOL SetupDiGetDeviceInstanceIdA(HDEVINFO,PSP_DEVINFO_DATA,PSTR,DWORD,PDWORD); 
    15391539    BOOL SetupDiGetDeviceInstanceIdW(HDEVINFO,PSP_DEVINFO_DATA,PWSTR,DWORD,PDWORD); 
    1540     BOOL SetupDiGetDeviceInterfaceAlias(HDEVINFO,PSP_DEVICE_INTERFACE_DATA,GUID*,PSP_DEVICE_INTERFACE_DATA); 
     1540    BOOL SetupDiGetDeviceInterfaceAlias(HDEVINFO,PSP_DEVICE_INTERFACE_DATA,CPtr!(GUID),PSP_DEVICE_INTERFACE_DATA); 
    15411541    BOOL SetupDiGetDeviceInterfaceDetailA(HDEVINFO,PSP_DEVICE_INTERFACE_DATA,PSP_DEVICE_INTERFACE_DETAIL_DATA_A,DWORD,PDWORD,PSP_DEVINFO_DATA); 
    15421542    BOOL SetupDiGetDeviceInterfaceDetailW(HDEVINFO,PSP_DEVICE_INTERFACE_DATA,PSP_DEVICE_INTERFACE_DETAIL_DATA_W,DWORD,PDWORD,PSP_DEVINFO_DATA); 
    …… 
    15621562    BOOL SetupDiInstallClassA(HWND,PCSTR,DWORD,HSPFILEQ); 
    15631563    BOOL SetupDiInstallClassW(HWND,PCWSTR,DWORD,HSPFILEQ); 
    1564     BOOL SetupDiInstallClassExA(HWND,PCSTR,DWORD,HSPFILEQ,GUID*,PVOID,PVOID); 
    1565     BOOL SetupDiInstallClassExW(HWND,PCWSTR,DWORD,HSPFILEQ,GUID*,PVOID,PVOID); 
     1564    BOOL SetupDiInstallClassExA(HWND,PCSTR,DWORD,HSPFILEQ,CPtr!(GUID),PVOID,PVOID); 
     1565    BOOL SetupDiInstallClassExW(HWND,PCWSTR,DWORD,HSPFILEQ,CPtr!(GUID),PVOID,PVOID); 
    15661566    BOOL SetupDiInstallDevice(HDEVINFO,PSP_DEVINFO_DATA); 
    15671567    BOOL SetupDiInstallDeviceInterfaces(HDEVINFO,PSP_DEVINFO_DATA); 
    15681568    BOOL SetupDiInstallDriverFiles(HDEVINFO,PSP_DEVINFO_DATA); 
    1569     BOOL SetupDiLoadClassIcon(GUID*,HICON*,PINT); 
     1569    BOOL SetupDiLoadClassIcon(CPtr!(GUID),HICON*,PINT); 
    15701570    BOOL SetupDiMoveDuplicateDevice(HDEVINFO,PSP_DEVINFO_DATA); 
    1571     HKEY SetupDiOpenClassRegKey(GUID*,REGSAM); 
    1572     HKEY SetupDiOpenClassRegKeyExA(GUID*,REGSAM,DWORD,PCSTR,PVOID); 
    1573     HKEY SetupDiOpenClassRegKeyExW(GUID*,REGSAM,DWORD,PCWSTR,PVOID); 
     1571    HKEY SetupDiOpenClassRegKey(CPtr!(GUID),REGSAM); 
     1572    HKEY SetupDiOpenClassRegKeyExA(CPtr!(GUID),REGSAM,DWORD,PCSTR,PVOID); 
     1573    HKEY SetupDiOpenClassRegKeyExW(CPtr!(GUID),REGSAM,DWORD,PCWSTR,PVOID); 
    15741574    BOOL SetupDiOpenDeviceInfoA(HDEVINFO,PCSTR,HWND,DWORD,PSP_DEVINFO_DATA); 
    15751575    BOOL SetupDiOpenDeviceInfoW(HDEVINFO,PCWSTR,HWND,DWORD,PSP_DEVINFO_DATA); 
    …… 
    15871587    BOOL SetupDiSetClassInstallParamsA(HDEVINFO,PSP_DEVINFO_DATA,PSP_CLASSINSTALL_HEADER,DWORD); 
    15881588    BOOL SetupDiSetClassInstallParamsW(HDEVINFO,PSP_DEVINFO_DATA,PSP_CLASSINSTALL_HEADER,DWORD); 
    1589     BOOL SetupDiSetClassRegistryPropertyA(LPGUID,DWORD,BYTE*,DWORD,PCSTR,PVOID); 
    1590     BOOL SetupDiSetClassRegistryPropertyW(LPGUID,DWORD,BYTE*,DWORD,PCWSTR,PVOID); 
     1589    BOOL SetupDiSetClassRegistryPropertyA(LPGUID,DWORD,CPtr!(BYTE),DWORD,PCSTR,PVOID); 
     1590    BOOL SetupDiSetClassRegistryPropertyW(LPGUID,DWORD,CPtr!(BYTE),DWORD,PCWSTR,PVOID); 
    15911591    BOOL SetupDiSetDeviceInstallParamsA(HDEVINFO,PSP_DEVINFO_DATA,PSP_DEVINSTALL_PARAMS_A); 
    15921592    BOOL SetupDiSetDeviceInstallParamsW(HDEVINFO,PSP_DEVINFO_DATA,PSP_DEVINSTALL_PARAMS_W); 
    1593     BOOL SetupDiSetDeviceRegistryPropertyA(HDEVINFO,PSP_DEVINFO_DATA,DWORD,BYTE*,DWORD); 
    1594     BOOL SetupDiSetDeviceRegistryPropertyW(HDEVINFO,PSP_DEVINFO_DATA,DWORD,BYTE*,DWORD); 
     1593    BOOL SetupDiSetDeviceRegistryPropertyA(HDEVINFO,PSP_DEVINFO_DATA,DWORD,CPtr!(BYTE),DWORD); 
     1594    BOOL SetupDiSetDeviceRegistryPropertyW(HDEVINFO,PSP_DEVINFO_DATA,DWORD,CPtr!(BYTE),DWORD); 
    15951595    BOOL SetupDiSetDriverInstallParamsA(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_A,PSP_DRVINSTALL_PARAMS); 
    15961596    BOOL SetupDiSetDriverInstallParamsW(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_W,PSP_DRVINSTALL_PARAMS); 

  • trunk/win32/shlobj.d

    r319 r352  
    382382    BYTE[1] abID; 
    383383} 
    384 alias SHITEMID* LPSHITEMID, LPCSHITEMID; 
     384alias SHITEMID*       LPSHITEMID; 
     385alias CPtr!(SHITEMID) LPCSHITEMID; 
    385386 
    386387struct ITEMIDLIST { 
    387388    SHITEMID mkid; 
    388389} 
    389 alias ITEMIDLIST* LPITEMIDLIST, LPCITEMIDLIST; 
     390alias ITEMIDLIST*       LPITEMIDLIST; 
     391alias CPtr!(ITEMIDLIST) LPCITEMIDLIST; 
    390392 
    391393alias int function(HWND,UINT,LPARAM,LPARAM) BFFCALLBACK; 
    …… 
    564566    UINT fFlags; 
    565567} 
    566 alias FOLDERSETTINGS* LPFOLDERSETTINGS, LPCFOLDERSETTINGS; 
     568alias FOLDERSETTINGS*       LPFOLDERSETTINGS; 
     569alias CPtr!(FOLDERSETTINGS) LPCFOLDERSETTINGS; 
    567570 
    568571struct FVSHOWINFO { 
    …… 
    622625        DWORD pid; 
    623626    } 
    624     alias SHCOLUMNID* LPSHCOLUMNID, LPCSHCOLUMNID; 
     627    alias SHCOLUMNID*       LPSHCOLUMNID; 
     628    alias CPtr!(SHCOLUMNID) LPCSHCOLUMNID; 
    625629 
    626630    struct SHELLDETAILS { 
    …… 
    699703        WCHAR wszFolder[MAX_PATH]; 
    700704    } 
    701     alias SHCOLUMNINIT* LPSHCOLUMNINIT, LPCSHCOLUMNINIT; 
     705    alias SHCOLUMNINIT*       LPSHCOLUMNINIT; 
     706    alias CPtr!(SHCOLUMNINIT) LPCSHCOLUMNINIT; 
    702707 
    703708    struct SHCOLUMNDATA { 
    …… 
    708713        WCHAR wszFile[MAX_PATH]; 
    709714    } 
    710     alias SHCOLUMNDATA* LPSHCOLUMNDATA, LPCSHCOLUMNDATA; 
     715    alias SHCOLUMNDATA*       LPSHCOLUMNDATA; 
     716    alias CPtr!(SHCOLUMNDATA) LPCSHCOLUMNDATA; 
    711717    align: 
    712718 
    …… 
    724730        WCHAR wszDescription[MAX_COLUMN_DESC_LEN]; 
    725731    } 
    726     alias SHCOLUMNINFO* LPSHCOLUMNINFO, LPCSHCOLUMNINFO; 
     732    alias SHCOLUMNINFO*       LPSHCOLUMNINFO; 
     733    alias CPtr!(SHCOLUMNINFO) LPCSHCOLUMNINFO; 
    727734    align: 
    728735 
    …… 
    909916    HRESULT GetDefaultColumn(DWORD,ULONG*,ULONG*); 
    910917    HRESULT GetDefaultColumnState(UINT,SHCOLSTATEF*); 
    911     HRESULT GetDetailsEx(LPCITEMIDLIST, SHCOLUMNID*,VARIANT*); 
     918    HRESULT GetDetailsEx(LPCITEMIDLIST, CPtr!(SHCOLUMNID),VARIANT*); 
    912919    HRESULT GetDetailsOf(LPCITEMIDLIST,UINT,SHELLDETAILS*); 
    913920    HRESULT MapColumnToSCID(UINT,SHCOLUMNID*); 
    …… 
    952959    ULONG AddRef(); 
    953960    ULONG Release(); 
    954     HRESULT SetFindData( WIN32_FIND_DATAW*); 
     961    HRESULT SetFindData(CPtr!(WIN32_FIND_DATAW)); 
    955962    HRESULT GetFindData(WIN32_FIND_DATAW*); 
    956963} 
    …… 
    991998    HRESULT Initialize(LPCITEMIDLIST); 
    992999    HRESULT GetCurFolder(LPITEMIDLIST*); 
    993     HRESULT InitializeEx(IBindCtx*,LPCITEMIDLIST, PERSIST_FOLDER_TARGET_INFO*); 
     1000    HRESULT InitializeEx(IBindCtx*,LPCITEMIDLIST, CPtr!(PERSIST_FOLDER_TARGET_INFO)); 
    9941001    HRESULT GetFolderTargetInfo(PERSIST_FOLDER_TARGET_INFO*); 
    9951002} 
    …… 
    10661073    IShellBrowser *psbOwner; 
    10671074    RECT *prcView; 
    1068     SHELLVIEWID  *pvid; 
     1075    CPtr!(SHELLVIEWID) pvid; 
    10691076    HWND hwndView; 
    10701077} 

  • trunk/win32/shlwapi.d

    r319 r352  
    354354HRESULT SHGetThreadRef(IUnknown**); 
    355355HRESULT SHSetThreadRef(IUnknown*); 
    356 BOOL SHSkipJunction(IBindCtx*, CLSID*); 
     356BOOL SHSkipJunction(IBindCtx*, CPtr!(CLSID)); 
    357357DWORD SHEnumValueA(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPVOID,LPDWORD); 
    358358DWORD SHEnumValueW(HKEY,DWORD,LPWSTR,LPDWORD,LPDWORD,LPVOID,LPDWORD); 
    …… 
    363363DWORD SHDeleteValueA(HKEY,LPCSTR,LPCSTR); 
    364364DWORD SHDeleteValueW(HKEY,LPCWSTR,LPCWSTR); 
    365 HRESULT AssocCreate(CLSID, IID* ,LPVOID*); 
     365HRESULT AssocCreate(CLSID, CPtr!(IID) ,CPtr!(LPVOID)); 
    366366HRESULT AssocQueryKeyA(ASSOCF,ASSOCKEY,LPCSTR,LPCSTR,HKEY*); 
    367367HRESULT AssocQueryKeyW(ASSOCF,ASSOCKEY,LPCWSTR,LPCWSTR,HKEY*); 

  • trunk/win32/usp10.d

    r243 r352  
    287287{ 
    288288    HRESULT ScriptFreeCache(SCRIPT_CACHE*); 
    289     HRESULT ScriptItemize(WCHAR*, int, int, SCRIPT_CONTROL*, SCRIPT_STATE*, SCRIPT_ITEM*, int*); 
    290     HRESULT ScriptLayout(int, BYTE*, int*, int*); 
    291     HRESULT ScriptShape(HDC, SCRIPT_CACHE*, WCHAR*, int, int, SCRIPT_ANALYSIS*, WORD*, WORD*, SCRIPT_VISATTR*, int*); 
    292     HRESULT ScriptPlace(HDC, SCRIPT_CACHE*, WORD*, int, SCRIPT_VISATTR*, SCRIPT_ANALYSIS*, int*, GOFFSET*, ABC*); 
    293     HRESULT ScriptTextOut(HDC, SCRIPT_CACHE*, int, int, UINT, RECT*, SCRIPT_ANALYSIS*, WCHAR*, int, WORD*, int, int*, int*, GOFFSET*); 
    294     HRESULT ScriptJustify(SCRIPT_VISATTR*, int*, int, int, int, int*); 
    295     HRESULT ScriptBreak(WCHAR*, int, SCRIPT_ANALYSIS*, SCRIPT_LOGATTR*); 
    296     HRESULT ScriptCPtoX(int, BOOL, int, int, WORD*, SCRIPT_VISATTR*, int*, SCRIPT_ANALYSIS*, int*); 
    297     HRESULT ScriptXtoCP(int, int, int, WORD*, SCRIPT_VISATTR*, int*, SCRIPT_ANALYSIS*, int*, int*); 
    298     HRESULT ScriptGetLogicalWidths(SCRIPT_ANALYSIS*, int, int, int*, WORD*, SCRIPT_VISATTR*, int*); 
    299     HRESULT ScriptApplyLogicalWidth(int*, int, int, WORD*, SCRIPT_VISATTR*, int*, SCRIPT_ANALYSIS*, ABC*, int*); 
    300     HRESULT ScriptGetCMap(HDC, SCRIPT_CACHE*, WCHAR*, int, DWORD, WORD*); 
     289    HRESULT ScriptItemize(CPtr!(WCHAR), int, int, CPtr!(SCRIPT_CONTROL), CPtr!(SCRIPT_STATE), SCRIPT_ITEM*, int*); 
     290    HRESULT ScriptLayout(int, CPtr!(BYTE), int*, int*); 
     291    HRESULT ScriptShape(HDC, SCRIPT_CACHE*, CPtr!(WCHAR), int, int, SCRIPT_ANALYSIS*, WORD*, WORD*, SCRIPT_VISATTR*, int*); 
     292    HRESULT ScriptPlace(HDC, SCRIPT_CACHE*, CPtr!(WORD), int, CPtr!(SCRIPT_VISATTR), SCRIPT_ANALYSIS*, int*, GOFFSET*, ABC*); 
     293    HRESULT ScriptTextOut(HDC, SCRIPT_CACHE*, int, int, UINT, CPtr!(RECT), CPtr!(SCRIPT_ANALYSIS), CPtr!(WCHAR), int, CPtr!(WORD), int, CPtr!(int), int*, CPtr!(GOFFSET)); 
     294    HRESULT ScriptJustify(CPtr!(SCRIPT_VISATTR), CPtr!(int), int, int, int, int*); 
     295    HRESULT ScriptBreak(CPtr!(WCHAR), int, CPtr!(SCRIPT_ANALYSIS), CPtr!(SCRIPT_LOGATTR)); 
     296    HRESULT ScriptCPtoX(int, BOOL, int, int, CPtr!(WORD), CPtr!(SCRIPT_VISATTR), CPtr!(int), CPtr!(SCRIPT_ANALYSIS), int*); 
     297    HRESULT ScriptXtoCP(int, int, int, CPtr!(WORD), CPtr!(SCRIPT_VISATTR), CPtr!(int), CPtr!(SCRIPT_ANALYSIS), int*, int*); 
     298    HRESULT ScriptGetLogicalWidths(CPtr!(SCRIPT_ANALYSIS), int, int, CPtr!(int), CPtr!(WORD), CPtr!(SCRIPT_VISATTR), int*); 
     299    HRESULT ScriptApplyLogicalWidth(CPtr!(int), int, int, CPtr!(WORD), CPtr!(SCRIPT_VISATTR), CPtr!(int), CPtr!(SCRIPT_ANALYSIS), ABC*, int*); 
     300    HRESULT ScriptGetCMap(HDC, SCRIPT_CACHE*, CPtr!(WCHAR), int, DWORD, WORD*); 
    301301    HRESULT ScriptGetGlyphABCWidth(HDC, SCRIPT_CACHE*, WORD, ABC*); 
    302     HRESULT ScriptGetProperties(SCRIPT_PROPERTIES***, int*); 
     302    HRESULT ScriptGetProperties(CPtr!(SCRIPT_PROPERTIES**), int*); 
    303303    HRESULT ScriptGetFontProperties(HDC, SCRIPT_CACHE*, SCRIPT_FONTPROPERTIES*); 
    304304    HRESULT ScriptCacheGetHeight(HDC, SCRIPT_CACHE*, int*); 
    305     HRESULT ScriptIsComplex(WCHAR*, int, DWORD); 
     305    HRESULT ScriptIsComplex(CPtr!(WCHAR), int, DWORD); 
    306306    HRESULT ScriptRecordDigitSubstitution(LCID, SCRIPT_DIGITSUBSTITUTE*); 
    307     HRESULT ScriptApplyDigitSubstitution(SCRIPT_DIGITSUBSTITUTE*, SCRIPT_CONTROL*, SCRIPT_STATE*); 
     307    HRESULT ScriptApplyDigitSubstitution(CPtr!(SCRIPT_DIGITSUBSTITUTE), SCRIPT_CONTROL*, SCRIPT_STATE*); 
    308308 
    309309    /* ScriptString Functions 
    310310     * http://msdn2.microsoft.com/library/ms776485 */ 
    311     HRESULT ScriptStringAnalyse(HDC, void*, int, int, int, DWORD, int, SCRIPT_CONTROL*, SCRIPT_STATE*, int*, SCRIPT_TABDEF*, BYTE*, SCRIPT_STRING_ANALYSIS*); 
     311    HRESULT ScriptStringAnalyse(HDC, CPtr!(void), int, int, int, DWORD, int, SCRIPT_CONTROL*, SCRIPT_STATE*, CPtr!(int), SCRIPT_TABDEF*, CPtr!(BYTE), SCRIPT_STRING_ANALYSIS*); 
    312312    HRESULT ScriptStringFree(SCRIPT_STRING_ANALYSIS*); 
    313     SIZE* ScriptString_pSize(SCRIPT_STRING_ANALYSIS); 
    314     int* ScriptString_pcOutChars(SCRIPT_STRING_ANALYSIS); 
    315     SCRIPT_LOGATTR* ScriptString_pLogAttr(SCRIPT_STRING_ANALYSIS); 
     313    CPtr!(SIZE) ScriptString_pSize(SCRIPT_STRING_ANALYSIS); 
     314    CPtr!(int) ScriptString_pcOutChars(SCRIPT_STRING_ANALYSIS); 
     315    CPtr!(SCRIPT_LOGATTR) ScriptString_pLogAttr(SCRIPT_STRING_ANALYSIS); 
    316316    HRESULT ScriptStringGetOrder(SCRIPT_STRING_ANALYSIS, UINT*); 
    317317    HRESULT ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS, int, BOOL, int*); 
    …… 
    319319    HRESULT ScriptStringGetLogicalWidths(SCRIPT_STRING_ANALYSIS, int*); 
    320320    HRESULT ScriptStringValidate(SCRIPT_STRING_ANALYSIS); 
    321     HRESULT ScriptStringOut(SCRIPT_STRING_ANALYSIS, int, int, UINT, RECT*, int, int, BOOL); 
     321    HRESULT ScriptStringOut(SCRIPT_STRING_ANALYSIS, int, int, UINT, CPtr!(RECT), int, int, BOOL); 
    322322 
    323323    /* TODO: Windows Vista fearured functions 

  • trunk/win32/winbase.d

    r319 r352  
    15701570        HMODULE hModule; 
    15711571    } 
    1572     alias ACTCTXA* PACTCTXA, PCACTCTXA; 
     1572    alias ACTCTXA*       PACTCTXA; 
     1573    alias CPtr!(ACTCTXA) PCACTCTXA; 
    15731574 
    15741575    struct ACTCTXW { 
    …… 
    15831584        HMODULE hModule; 
    15841585    } 
    1585     alias ACTCTXW* PACTCTXW, PCACTCTXW; 
     1586    alias ACTCTXW*       PACTCTXW; 
     1587    alias CPtr!(ACTCTXW) PCACTCTXW; 
    15861588 
    15871589    struct ACTCTX_SECTION_KEYED_DATA { 
    …… 
    15971599        HANDLE ulAssemblyRosterIndex; 
    15981600    } 
    1599     alias ACTCTX_SECTION_KEYED_DATA* PACTCTX_SECTION_KEYED_DATA, PCACTCTX_SECTION_KEYED_DATA; 
     1601    alias ACTCTX_SECTION_KEYED_DATA*       PACTCTX_SECTION_KEYED_DATA; 
     1602    alias CPtr!(ACTCTX_SECTION_KEYED_DATA) PCACTCTX_SECTION_KEYED_DATA; 
    16001603 
    16011604    enum MEMORY_RESOURCE_NOTIFICATION_TYPE { 
    …… 
    16621665    BOOL CommConfigDialogA(LPCSTR, HWND, LPCOMMCONFIG); 
    16631666    BOOL CommConfigDialogW(LPCWSTR, HWND, LPCOMMCONFIG); 
    1664     LONG CompareFileTime(FILETIME*, FILETIME*); 
     1667    LONG CompareFileTime(CPtr!(FILETIME), CPtr!(FILETIME)); 
    16651668    BOOL ContinueDebugEvent(DWORD, DWORD, DWORD); 
    16661669    BOOL CopyFileA(LPCSTR, LPCSTR, BOOL); 
    …… 
    17311734    void FatalAppExitW(UINT, LPCWSTR); 
    17321735    void FatalExit(int); 
    1733     BOOL FileTimeToDosDateTime(FILETIME* , LPWORD, LPWORD); 
    1734     BOOL FileTimeToLocalFileTime(FILETIME* , LPFILETIME); 
    1735     BOOL FileTimeToSystemTime(FILETIME* , LPSYSTEMTIME); 
     1736    BOOL FileTimeToDosDateTime(CPtr!(FILETIME) , LPWORD, LPWORD); 
     1737    BOOL FileTimeToLocalFileTime(CPtr!(FILETIME) , LPFILETIME); 
     1738    BOOL FileTimeToSystemTime(CPtr!(FILETIME) , LPSYSTEMTIME); 
    17361739    ATOM FindAtomA(LPCSTR); 
    17371740    ATOM FindAtomW(LPCWSTR); 
    …… 
    19051908    DWORD LoadModule(LPCSTR, PVOID); 
    19061909    HGLOBAL LoadResource(HINSTANCE, HRSRC); 
    1907     BOOL LocalFileTimeToFileTime(FILETIME* , LPFILETIME); 
     1910    BOOL LocalFileTimeToFileTime(CPtr!(FILETIME) , LPFILETIME); 
    19081911    BOOL LockFile(HANDLE, DWORD, DWORD, DWORD, DWORD); 
    19091912    PVOID LockResource(HGLOBAL); 
    …… 
    19411944    BOOL QueryPerformanceFrequency(PLARGE_INTEGER); 
    19421945    DWORD QueueUserAPC(PAPCFUNC, HANDLE, ULONG_PTR); 
    1943     void RaiseException(DWORD, DWORD, DWORD, DWORD*); 
     1946    void RaiseException(DWORD, DWORD, DWORD, CPtr!(DWORD)); 
    19441947    BOOL ReadFile(HANDLE, PVOID, DWORD, PDWORD, LPOVERLAPPED); 
    19451948    BOOL ReadFileEx(HANDLE, PVOID, DWORD, LPOVERLAPPED, LPOVERLAPPED_COMPLETION_ROUTINE); 
    …… 
    19881991    BOOL SetFileAttributesW(LPCWSTR, DWORD); 
    19891992    DWORD SetFilePointer(HANDLE, LONG, PLONG, DWORD); 
    1990     BOOL SetFileTime(HANDLE, FILETIME*, FILETIME*, FILETIME*); 
     1993    BOOL SetFileTime(HANDLE, CPtr!(FILETIME), CPtr!(FILETIME), CPtr!(FILETIME)); 
    19911994    deprecated UINT SetHandleCount(UINT); 
    19921995    void SetLastError(DWORD); 
    19931996    void SetLastErrorEx(DWORD, DWORD); 
    1994     BOOL SetLocalTime(SYSTEMTIME*); 
     1997    BOOL SetLocalTime(CPtr!(SYSTEMTIME)); 
    19951998    BOOL SetMailslotInfo(HANDLE, DWORD); 
    19961999    BOOL SetNamedPipeHandleState(HANDLE, PDWORD, PDWORD, PDWORD); 
    19972000    BOOL SetPriorityClass(HANDLE, DWORD); 
    19982001    BOOL SetStdHandle(DWORD, HANDLE); 
    1999     BOOL SetSystemTime(SYSTEMTIME*); 
     2002    BOOL SetSystemTime(CPtr!(SYSTEMTIME)); 
    20002003    DWORD SetThreadAffinityMask(HANDLE, DWORD); 
    2001     BOOL SetThreadContext(HANDLE, CONTEXT*); 
     2004    BOOL SetThreadContext(HANDLE, CPtr!(CONTEXT)); 
    20022005    BOOL SetThreadPriority(HANDLE, int); 
    2003     BOOL SetTimeZoneInformation(TIME_ZONE_INFORMATION*); 
     2006    BOOL SetTimeZoneInformation(CPtr!(TIME_ZONE_INFORMATION)); 
    20042007    LPTOP_LEVEL_EXCEPTION_FILTER SetUnhandledExceptionFilter(LPTOP_LEVEL_EXCEPTION_FILTER); 
    20052008    BOOL SetupComm(HANDLE, DWORD, DWORD); 
    …… 
    20112014    DWORD SleepEx(DWORD, BOOL); 
    20122015    DWORD SuspendThread(HANDLE); 
    2013     BOOL SystemTimeToFileTime(SYSTEMTIME*, LPFILETIME); 
     2016    BOOL SystemTimeToFileTime(CPtr!(SYSTEMTIME), LPFILETIME); 
    20142017    BOOL TerminateProcess(HANDLE, UINT); 
    20152018    BOOL TerminateThread(HANDLE, DWORD); 
    …… 
    20242027    BOOL WaitCommEvent(HANDLE, PDWORD, LPOVERLAPPED); 
    20252028    BOOL WaitForDebugEvent(LPDEBUG_EVENT, DWORD); 
    2026     DWORD WaitForMultipleObjects(DWORD, HANDLE*, BOOL, DWORD); 
    2027     DWORD WaitForMultipleObjectsEx(DWORD, HANDLE*, BOOL, DWORD, BOOL); 
     2029    DWORD WaitForMultipleObjects(DWORD, CPtr!(HANDLE), BOOL, DWORD); 
     2030    DWORD WaitForMultipleObjectsEx(DWORD, CPtr!(HANDLE), BOOL, DWORD, BOOL); 
    20282031    DWORD WaitForSingleObject(HANDLE, DWORD); 
    20292032    DWORD WaitForSingleObjectEx(HANDLE, DWORD, BOOL); 
    …… 
    21112114        DWORD QueryDosDeviceA(LPCSTR, LPSTR, DWORD); 
    21122115        DWORD QueryDosDeviceW(LPCWSTR, LPWSTR, DWORD); 
    2113         BOOL SetWaitableTimer(HANDLE, LARGE_INTEGER*, LONG, PTIMERAPCROUTINE, PVOID, BOOL); 
     2116        BOOL SetWaitableTimer(HANDLE, CPtr!(LARGE_INTEGER), LONG, PTIMERAPCROUTINE, PVOID, BOOL); 
    21142117        void SwitchToFiber(PVOID); 
    21152118    } 
    …… 
    23942397            BOOL DebugBreakProcess(HANDLE); 
    23952398            BOOL DebugSetProcessKillOnExit(BOOL); 
    2396             BOOL FindActCtxSectionGuid(DWORD, GUID*, ULONG, GUID*, 
     2399            BOOL FindActCtxSectionGuid(DWORD, CPtr!(GUID), ULONG, CPtr!(GUID), 
    23972400              PACTCTX_SECTION_KEYED_DATA); 
    2398             BOOL FindActCtxSectionStringA(DWORD, GUID*, ULONG, LPCSTR, 
     2401            BOOL FindActCtxSectionStringA(DWORD, CPtr!(GUID), ULONG, LPCSTR, 
    23992402              PACTCTX_SECTION_KEYED_DATA); 
    2400             BOOL FindActCtxSectionStringW(DWORD, GUID*, ULONG, LPCWSTR, 
     2403            BOOL FindActCtxSectionStringW(DWORD, CPtr!(GUID), ULONG, LPCWSTR, 
    24012404              PACTCTX_SECTION_KEYED_DATA); 
    24022405            BOOL GetCurrentActCtx(HANDLE*); 

  • trunk/win32/winber.d

    r168 r352  
    2828 */ 
    2929 
     30 import win32.basetsd; 
     31  
    3032/* Opaque structure 
    3133 *  http://msdn.microsoft.com/library/en-us/ldap/ldap/berelement.asp 
    …… 
    5355 */ 
    5456extern (C) { 
    55     BerElement* ber_init(BerValue*); 
    56     int ber_printf(BerElement*, char*, ...); 
     57    BerElement* ber_init(CPtr!(BerValue)); 
     58    int ber_printf(BerElement*, CPtr!(char), ...); 
    5759    int ber_flatten(BerElement*, BerValue**); 
    58     ber_tag_t ber_scanf(BerElement*, char*, ...); 
     60    ber_tag_t ber_scanf(BerElement*, CPtr!(char), ...); 
    5961    ber_tag_t ber_peek_tag(BerElement*, ber_len_t*); 
    6062    ber_tag_t ber_skip_tag(BerElement*, ber_len_t*); 

  • trunk/win32/wincon.d

    r182 r352  
    210210BOOL ReadConsoleOutputA(HANDLE, PCHAR_INFO, COORD, COORD, PSMALL_RECT); 
    211211BOOL ReadConsoleOutputW(HANDLE, PCHAR_INFO, COORD, COORD, PSMALL_RECT); 
    212 BOOL ScrollConsoleScreenBufferA(HANDLE, SMALL_RECT*, SMALL_RECT*, COORD, CHAR_INFO*); 
    213 BOOL ScrollConsoleScreenBufferW(HANDLE, SMALL_RECT*, SMALL_RECT*, COORD, CHAR_INFO*); 
     212BOOL ScrollConsoleScreenBufferA(HANDLE, CPtr!(SMALL_RECT), CPtr!(SMALL_RECT), COORD, CPtr!(CHAR_INFO)); 
     213BOOL ScrollConsoleScreenBufferW(HANDLE, CPtr!(SMALL_RECT), CPtr!(SMALL_RECT), COORD, CPtr!(CHAR_INFO)); 
    214214BOOL SetConsoleActiveScreenBuffer(HANDLE); 
    215215BOOL SetConsoleCP(UINT); 
    216216BOOL SetConsoleCtrlHandler(PHANDLER_ROUTINE, BOOL); 
    217 BOOL SetConsoleCursorInfo(HANDLE, CONSOLE_CURSOR_INFO*); 
     217BOOL SetConsoleCursorInfo(HANDLE, CPtr!(CONSOLE_CURSOR_INFO)); 
    218218BOOL SetConsoleCursorPosition(HANDLE, COORD); 
    219219 
    …… 
    236236BOOL SetConsoleTitleA(LPCSTR); 
    237237BOOL SetConsoleTitleW(LPCWSTR); 
    238 BOOL SetConsoleWindowInfo(HANDLE, BOOL, SMALL_RECT*); 
     238BOOL SetConsoleWindowInfo(HANDLE, BOOL, CPtr!(SMALL_RECT)); 
    239239BOOL WriteConsoleA(HANDLE, PCVOID, DWORD, PDWORD, PVOID); 
    240240BOOL WriteConsoleW(HANDLE, PCVOID, DWORD, PDWORD, PVOID); 
    241 BOOL WriteConsoleInputA(HANDLE, INPUT_RECORD*, DWORD, PDWORD); 
    242 BOOL WriteConsoleInputW(HANDLE, INPUT_RECORD*, DWORD, PDWORD); 
    243 BOOL WriteConsoleOutputA(HANDLE, CHAR_INFO*, COORD, COORD, PSMALL_RECT); 
    244 BOOL WriteConsoleOutputW(HANDLE, CHAR_INFO*, COORD, COORD, PSMALL_RECT); 
    245 BOOL WriteConsoleOutputAttribute(HANDLE, WORD*, DWORD, COORD, PDWORD); 
     241BOOL WriteConsoleInputA(HANDLE, CPtr!(INPUT_RECORD), DWORD, PDWORD); 
     242BOOL WriteConsoleInputW(HANDLE, CPtr!(INPUT_RECORD), DWORD, PDWORD); 
     243BOOL WriteConsoleOutputA(HANDLE, CPtr!(CHAR_INFO), COORD, COORD, PSMALL_RECT); 
     244BOOL WriteConsoleOutputW(HANDLE, CPtr!(CHAR_INFO), COORD, COORD, PSMALL_RECT); 
     245BOOL WriteConsoleOutputAttribute(HANDLE, CPtr!(WORD), DWORD, COORD, PDWORD); 
    246246BOOL WriteConsoleOutputCharacterA(HANDLE, LPCSTR, DWORD, COORD, PDWORD); 
    247247BOOL WriteConsoleOutputCharacterW(HANDLE, LPCWSTR, DWORD, COORD, PDWORD); 

  • trunk/win32/wincrypt.d

    r168 r352  
    489489    HCERTSTORE hCertStore; 
    490490} 
    491 alias CERT_CONTEXT* PCERT_CONTEXT, PCCERT_CONTEXT; 
     491alias CERT_CONTEXT*       PCERT_CONTEXT; 
     492alias CPtr!(CERT_CONTEXT) PCCERT_CONTEXT; 
    492493 
    493494struct CTL_USAGE { 
    …… 
    569570    HCERTSTORE hCertStore; 
    570571} 
    571 alias CRL_CONTEXT* PCRL_CONTEXT, PCCRL_CONTEXT; 
     572alias CRL_CONTEXT*       PCRL_CONTEXT; 
     573alias CPtr!(CRL_CONTEXT) PCCRL_CONTEXT; 
    572574 
    573575struct CERT_REVOCATION_CRL_INFO { 
    …… 
    642644    DWORD      cbCtlContent; 
    643645} 
    644 alias CTL_CONTEXT* PCTL_CONTEXT, PCCTL_CONTEXT; 
     646alias CTL_CONTEXT*       PCTL_CONTEXT; 
     647alias CPtr!(CTL_CONTEXT) PCCTL_CONTEXT; 
    645648 
    646649struct CERT_TRUST_LIST_INFO { 
    …… 
    660663    DWORD                 dwRevocationFreshnessTime; 
    661664} 
    662 alias CERT_SIMPLE_CHAIN* PCERT_SIMPLE_CHAIN, PCCERT_CHAIN_CONTEXT; 
     665alias CERT_SIMPLE_CHAIN* PCERT_SIMPLE_CHAIN; 
    663666 
    664667/* #if (_WIN32_WINNT>=0x500) */ 
     668alias CPtr!(CERT_CHAIN_CONTEXT) PCCERT_CHAIN_CONTEXT; 
    665669struct CERT_CHAIN_CONTEXT { 
    666670    DWORD                 cbSize = CERT_CHAIN_CONTEXT.sizeof; 
    …… 
    717721    HCERTSTORE CertOpenSystemStoreA(HCRYPTPROV, LPCSTR); 
    718722    HCERTSTORE CertOpenSystemStoreW(HCRYPTPROV, LPCWSTR); 
    719     HCERTSTORE CertOpenStore(LPCSTR, DWORD, HCRYPTPROV, DWORD, void*); 
     723    HCERTSTORE CertOpenStore(LPCSTR, DWORD, HCRYPTPROV, DWORD, CPtr!(void)); 
    720724    PCCERT_CONTEXT CertFindCertificateInStore(HCERTSTORE, DWORD, DWORD, DWORD, 
    721       void*, PCCERT_CONTEXT); 
     725      CPtr!(void), PCCERT_CONTEXT); 
    722726    BOOL CertFreeCertificateContext(PCCERT_CONTEXT); 
    723727    PCCERT_CONTEXT CertGetIssuerCertificateFromStore(HCERTSTORE, 
    724728      PCCERT_CONTEXT, PCCERT_CONTEXT, DWORD*); 
    725729    PCCERT_CHAIN_CONTEXT CertFindChainInStore(HCERTSTORE, DWORD, DWORD, DWORD, 
    726       void*, PCCERT_CHAIN_CONTEXT); 
     730      CPtr!(void), PCCERT_CHAIN_CONTEXT); 
    727731 
    728732    BOOL CryptAcquireContextA(HCRYPTPROV*, LPCSTR, LPCSTR, DWORD, DWORD); 

  • trunk/win32/windef.d

    r296 r352  
    5353 
    5454const void* NULL = null; 
    55 alias ubyte   BYTE; 
    56 alias ubyte*  PBYTE, LPBYTE; 
    57 alias ushort  USHORT, WORD, ATOM; 
    58 alias ushort* PUSHORT, PWORD, LPWORD; 
    59 alias uint    ULONG, DWORD, UINT, COLORREF; 
    60 alias uint*   PULONG, PDWORD, LPDWORD, PUINT, LPUINT; 
    61 alias int     WINBOOL, BOOL, INT, LONG, HFILE, HRESULT; 
    62 alias int*    PWINBOOL, LPWINBOOL, PBOOL, LPBOOL, PINT, LPINT, LPLONG; 
    63 alias float   FLOAT; 
    64 alias float*  PFLOAT; 
    65 alias void*  PCVOID, LPCVOID; 
     55alias ubyte       BYTE; 
     56alias ubyte*      PBYTE, LPBYTE; 
     57alias ushort      USHORT, WORD, ATOM; 
     58alias ushort*     PUSHORT, PWORD, LPWORD; 
     59alias uint        ULONG, DWORD, UINT, COLORREF; 
     60alias uint*       PULONG, PDWORD, LPDWORD, PUINT, LPUINT; 
     61alias int         WINBOOL, BOOL, INT, LONG, HFILE, HRESULT; 
     62alias int*        PWINBOOL, LPWINBOOL, PBOOL, LPBOOL, PINT, LPINT, LPLONG; 
     63alias float       FLOAT; 
     64alias float*      PFLOAT; 
     65alias CPtr!(void) PCVOID, LPCVOID; 
    6666 
    6767alias UINT_PTR WPARAM; 
    …… 
    8787} 
    8888alias RECT RECTL; 
    89 alias RECT* PRECT, LPRECT, LPCRECT, PRECTL, LPRECTL, LPCRECTL; 
     89alias RECT*       PRECT, LPRECT, PRECTL, LPRECTL; 
     90alias CPtr!(RECT) LPCRECT, LPCRECTL; 
    9091 
    9192struct POINT { 

  • trunk/win32/wingdi.d

    r177 r352  
    39743974alias BOOL function (HDC, int) ABORTPROC; 
    39753975alias int function (HDC, HANDLETABLE*, METARECORD*, int, LPARAM) MFENUMPROC; 
    3976 alias int function (HDC, HANDLETABLE*, ENHMETARECORD*, int, LPARAM) ENHMFENUMPROC; 
    3977 alias int function (LOGFONTA*, TEXTMETRICA*, DWORD, LPARAM) FONTENUMPROCA, OLDFONTENUMPROCA; 
    3978 alias int function (LOGFONTW*, TEXTMETRICW*, DWORD, LPARAM) FONTENUMPROCW, OLDFONTENUMPROCW; 
     3976alias int function (HDC, HANDLETABLE*, CPtr!(ENHMETARECORD), int, LPARAM) ENHMFENUMPROC; 
     3977alias int function (CPtr!(LOGFONTA), CPtr!(TEXTMETRICA), DWORD, LPARAM) FONTENUMPROCA, OLDFONTENUMPROCA; 
     3978alias int function (CPtr!(LOGFONTW), CPtr!(TEXTMETRICW), DWORD, LPARAM) FONTENUMPROCW, OLDFONTENUMPROCW; 
    39793979alias int function (LPSTR, LPARAM) ICMENUMPROCA; 
    39803980alias int function (LPWSTR, LPARAM) ICMENUMPROCW; 
    …… 
    40444044    int AddFontResourceW(LPCWSTR); 
    40454045    BOOL AngleArc(HDC, int, int, DWORD, FLOAT, FLOAT); 
    4046     BOOL AnimatePalette(HPALETTE, UINT, UINT, PALETTEENTRY*); 
     4046    BOOL AnimatePalette(HPALETTE, UINT, UINT, CPtr!(PALETTEENTRY)); 
    40474047    BOOL Arc(HDC, int, int, int, int, int, int, int, int); 
    40484048    BOOL ArcTo(HDC, int, int, int, int, int, int, int, int); 
    …… 
    40524052    BOOL CheckColorsInGamut(HDC, PVOID, PVOID, DWORD); 
    40534053    BOOL Chord(HDC, int, int, int, int, int, int, int, int); 
    4054     int ChoosePixelFormat(HDC, PIXELFORMATDESCRIPTOR*); 
     4054    int ChoosePixelFormat(HDC, CPtr!(PIXELFORMATDESCRIPTOR)); 
    40554055    HENHMETAFILE CloseEnhMetaFile(HDC); 
    40564056    BOOL CloseFigure(HDC); 
    …… 
    40594059    BOOL ColorCorrectPalette(HDC, HPALETTE, DWORD, DWORD); 
    40604060    int CombineRgn(HRGN, HRGN, HRGN, int); 
    4061     BOOL CombineTransform(LPXFORM, XFORM*, XFORM*); 
     4061    BOOL CombineTransform(LPXFORM, CPtr!(XFORM), CPtr!(XFORM)); 
    40624062    HENHMETAFILE CopyEnhMetaFileA(HENHMETAFILE, LPCSTR); 
    40634063    HENHMETAFILE CopyEnhMetaFileW(HENHMETAFILE, LPCWSTR); 
    …… 
    40654065    HMETAFILE CopyMetaFileW(HMETAFILE, LPCWSTR); 
    40664066    HBITMAP CreateBitmap(int, int, UINT, UINT, PCVOID); 
    4067     HBITMAP CreateBitmapIndirect(BITMAP*); 
    4068     HBRUSH CreateBrushIndirect(LOGBRUSH*); 
     4067    HBITMAP CreateBitmapIndirect(CPtr!(BITMAP)); 
     4068    HBRUSH CreateBrushIndirect(CPtr!(LOGBRUSH)); 
    40694069    HCOLORSPACE CreateColorSpaceA(LPLOGCOLORSPACEA); 
    40704070    HCOLORSPACE CreateColorSpaceW(LPLOGCOLORSPACEW); 
    40714071    HBITMAP CreateCompatibleBitmap(HDC, int, int); 
    40724072    HDC CreateCompatibleDC(HDC); 
    4073     HDC CreateDCA(LPCSTR, LPCSTR, LPCSTR, DEVMODEA*); 
    4074     HDC CreateDCW(LPCWSTR, LPCWSTR, LPCWSTR, DEVMODEW*); 
    4075     HBITMAP CreateDIBitmap(HDC, BITMAPINFOHEADER*, DWORD, PCVOID, BITMAPINFO*, UINT); 
     4073    HDC CreateDCA(LPCSTR, LPCSTR, LPCSTR, CPtr!(DEVMODEA)); 
     4074    HDC CreateDCW(LPCWSTR, LPCWSTR, LPCWSTR, CPtr!(DEVMODEW)); 
     4075    HBITMAP CreateDIBitmap(HDC, CPtr!(BITMAPINFOHEADER), DWORD, PCVOID, CPtr!(BITMAPINFO), UINT); 
    40764076    HBRUSH CreateDIBPatternBrush(HGLOBAL, UINT); 
    40774077    HBRUSH CreateDIBPatternBrushPt(PCVOID, UINT); 
    4078     HBITMAP CreateDIBSection(HDC, BITMAPINFO*, UINT, void**, HANDLE, DWORD); 
     4078    HBITMAP CreateDIBSection(HDC, CPtr!(BITMAPINFO), UINT, void**, HANDLE, DWORD); 
    40794079    HBITMAP CreateDiscardableBitmap(HDC, int, int); 
    40804080    HRGN CreateEllipticRgn(int, int, int, int); 
    …… 
    40844084    HFONT CreateFontA(int, int, int, int, int, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, LPCSTR); 
    40854085    HFONT CreateFontW(int, int, int, int, int, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, LPCWSTR); 
    4086     HFONT CreateFontIndirectA(LOGFONTA*); 
    4087     HFONT CreateFontIndirectW(LOGFONTW*); 
     4086    HFONT CreateFontIndirectA(CPtr!(LOGFONTA)); 
     4087    HFONT CreateFontIndirectW(CPtr!(LOGFONTW)); 
    40884088    HPALETTE CreateHalftonePalette(HDC); 
    40894089    HBRUSH CreateHatchBrush(int, COLORREF); 
    4090     HDC CreateICA(LPCSTR, LPCSTR, LPCSTR, DEVMODEA*); 
    4091     HDC CreateICW(LPCWSTR, LPCWSTR, LPCWSTR, DEVMODEW*); 
     4090    HDC CreateICA(LPCSTR, LPCSTR, LPCSTR, CPtr!(DEVMODEA)); 
     4091    HDC CreateICW(LPCWSTR, LPCWSTR, LPCWSTR, CPtr!(DEVMODEW)); 
    40924092    HDC CreateMetaFileA(LPCSTR); 
    40934093    HDC CreateMetaFileW(LPCWSTR); 
    4094     HPALETTE CreatePalette(LOGPALETTE*); 
     4094    HPALETTE CreatePalette(CPtr!(LOGPALETTE)); 
    40954095    HBRUSH CreatePatternBrush(HBITMAP); 
    40964096    HPEN CreatePen(int, int, COLORREF); 
    4097     HPEN CreatePenIndirect(LOGPEN*); 
    4098     HRGN CreatePolygonRgn(POINT*, int, int); 
    4099     HRGN CreatePolyPolygonRgn(POINT*, INT*, int, int); 
     4097    HPEN CreatePenIndirect(CPtr!(LOGPEN)); 
     4098    HRGN CreatePolygonRgn(CPtr!(POINT), int, int); 
     4099    HRGN CreatePolyPolygonRgn(CPtr!(POINT), CPtr!(INT), int, int); 
    41004100    HRGN CreateRectRgn(int, int, int, int); 
    41014101    HRGN CreateRectRgnIndirect(LPCRECT); 
    …… 
    41104110    BOOL DeleteObject(HGDIOBJ); 
    41114111    int DescribePixelFormat(HDC, int, UINT, LPPIXELFORMATDESCRIPTOR); 
    4112     DWORD DeviceCapabilitiesA(LPCSTR, LPCSTR, WORD, LPSTR, DEVMODEA*); 
    4113     DWORD DeviceCapabilitiesW(LPCWSTR, LPCWSTR, WORD, LPWSTR, DEVMODEW*); 
     4112    DWORD DeviceCapabilitiesA(LPCSTR, LPCSTR, WORD, LPSTR, CPtr!(DEVMODEA)); 
     4113    DWORD DeviceCapabilitiesW(LPCWSTR, LPCWSTR, WORD, LPWSTR, CPtr!(DEVMODEW)); 
    41144114    BOOL DPtoLP(HDC, LPPOINT, int); 
    41154115    int DrawEscape(HDC, int, int, LPCSTR); 
    …… 
    41334133    int ExcludeClipRect(HDC, int, int, int, int); 
    41344134    int ExcludeUpdateRgn(HDC, HWND); 
    4135     HPEN ExtCreatePen(DWORD, DWORD, LOGBRUSH*, DWORD, DWORD*); 
    4136     HRGN ExtCreateRegion(XFORM*, DWORD, RGNDATA*); 
     4135    HPEN ExtCreatePen(DWORD, DWORD, CPtr!(LOGBRUSH), DWORD, CPtr!(DWORD)); 
     4136    HRGN ExtCreateRegion(CPtr!(XFORM), DWORD, CPtr!(RGNDATA)); 
    41374137    int ExtEscape(HDC, int, int, LPCSTR, int, LPSTR); 
    41384138    BOOL ExtFloodFill(HDC, int, int, COLORREF, UINT); 
    41394139    int ExtSelectClipRgn(HDC, HRGN, int); 
    4140     BOOL ExtTextOutA(HDC, int, int, UINT, LPCRECT, LPCSTR, UINT, INT*); 
    4141     BOOL ExtTextOutW(HDC, int, int, UINT, LPCRECT, LPCWSTR, UINT, INT*); 
     4140    BOOL ExtTextOutA(HDC, int, int, UINT, LPCRECT, LPCSTR, UINT, CPtr!(INT)); 
     4141    BOOL ExtTextOutW(HDC, int, int, UINT, LPCRECT, LPCWSTR, UINT, CPtr!(INT)); 
    41424142    BOOL FillPath(HDC); 
    41434143    int FillRect(HDC, LPCRECT, HBRUSH); 
    …… 
    41474147    BOOL FloodFill(HDC, int, int, COLORREF); 
    41484148    BOOL FrameRgn(HDC, HRGN, HBRUSH, int, int); 
    4149     BOOL GdiComment(HDC, UINT, BYTE*); 
     4149    BOOL GdiComment(HDC, UINT, CPtr!(BYTE)); 
    41504150    BOOL GdiFlush(); 
    41514151    DWORD GdiGetBatchLimit(); 
    …… 
    41904190    UINT GetEnhMetaFileHeader(HENHMETAFILE, UINT, LPENHMETAHEADER); 
    41914191    UINT GetEnhMetaFilePaletteEntries(HENHMETAFILE, UINT, LPPALETTEENTRY); 
    4192     UINT GetEnhMetaFilePixelFormat(HENHMETAFILE, DWORD, PIXELFORMATDESCRIPTOR*); 
     4192    UINT GetEnhMetaFilePixelFormat(HENHMETAFILE, DWORD, CPtr!(PIXELFORMATDESCRIPTOR)); 
    41934193    DWORD GetFontData(HDC, DWORD, DWORD, PVOID, DWORD); 
    41944194    DWORD GetFontLanguageInfo(HDC); 
    4195     DWORD GetGlyphOutlineA(HDC, UINT, UINT, LPGLYPHMETRICS, DWORD, PVOID, MAT2*); 
    4196     DWORD GetGlyphOutlineW(HDC, UINT, UINT, LPGLYPHMETRICS, DWORD, PVOID, MAT2*); 
     4195    DWORD GetGlyphOutlineA(HDC, UINT, UINT, LPGLYPHMETRICS, DWORD, PVOID, CPtr!(MAT2)); 
     4196    DWORD GetGlyphOutlineW(HDC, UINT, UINT, LPGLYPHMETRICS, DWORD, PVOID, CPtr!(MAT2)); 
    41974197    int GetGraphicsMode(HDC); 
    41984198    BOOL GetICMProfileA(HDC, DWORD, LPSTR); 
    …… 
    42564256    BOOL LPtoDP(HDC, LPPOINT, int); 
    42574257    BOOL MaskBlt(HDC, int, int, int, int, HDC, int, int, HBITMAP, int, int, DWORD); 
    4258     BOOL ModifyWorldTransform(HDC, XFORM*, DWORD); 
     4258    BOOL ModifyWorldTransform(HDC, CPtr!(XFORM), DWORD); 
    42594259    BOOL MoveToEx(HDC, int, int, LPPOINT); 
    42604260    int OffsetClipRgn(HDC, int, int); 
    …… 
    42674267    BOOL Pie(HDC, int, int, int, int, int, int, int, int); 
    42684268    BOOL PlayEnhMetaFile(HDC, HENHMETAFILE, LPCRECT); 
    4269     BOOL PlayEnhMetaFileRecord(HDC, LPHANDLETABLE, ENHMETARECORD*, UINT); 
     4269    BOOL PlayEnhMetaFileRecord(HDC, LPHANDLETABLE, CPtr!(ENHMETARECORD), UINT); 
    42704270    BOOL PlayMetaFile(HDC, HMETAFILE); 
    42714271    BOOL PlayMetaFileRecord(HDC, LPHANDLETABLE, LPMETARECORD, UINT); 
    4272     BOOL PlgBlt(HDC, POINT*, HDC, int, int, int, int, HBITMAP, int, int); 
    4273     BOOL PolyBezier(HDC, POINT*, DWORD); 
    4274     BOOL PolyBezierTo(HDC, POINT*, DWORD); 
    4275     BOOL PolyDraw(HDC, POINT*, BYTE*, int); 
    4276     BOOL Polygon(HDC, POINT*, int); 
    4277     BOOL Polyline(HDC, POINT*, int); 
    4278     BOOL PolylineTo(HDC, POINT*, DWORD); 
    4279     BOOL PolyPolygon(HDC, POINT*, INT*, int); 
    4280     BOOL PolyPolyline(HDC, POINT*, DWORD*, DWORD); 
    4281     BOOL PolyTextOutA(HDC, POLYTEXTA*, int); 
    4282     BOOL PolyTextOutW(HDC, POLYTEXTW*, int); 
     4272    BOOL PlgBlt(HDC, CPtr!(POINT), HDC, int, int, int, int, HBITMAP, int, int); 
     4273    BOOL PolyBezier(HDC, CPtr!(POINT), DWORD); 
     4274    BOOL PolyBezierTo(HDC, CPtr!(POINT), DWORD); 
     4275    BOOL PolyDraw(HDC, CPtr!(POINT), CPtr!(BYTE), int); 
     4276    BOOL Polygon(HDC, CPtr!(POINT), int); 
     4277    BOOL Polyline(HDC, CPtr!(POINT), int); 
     4278    BOOL PolylineTo(HDC, CPtr!(POINT), DWORD); 
     4279    BOOL PolyPolygon(HDC, CPtr!(POINT), CPtr!(INT), int); 
     4280    BOOL PolyPolyline(HDC, CPtr!(POINT), CPtr!(DWORD), DWORD); 
     4281    BOOL PolyTextOutA(HDC, CPtr!(POLYTEXTA), int); 
     4282    BOOL PolyTextOutW(HDC, CPtr!(POLYTEXTW), int); 
    42834283    BOOL PtInRegion(HRGN, int, int); 
    42844284    BOOL PtVisible(HDC, int, int); 
    …… 
    42904290    BOOL RemoveFontResourceW(LPCWSTR); 
    42914291 
    4292     HDC ResetDCA(HDC, DEVMODEA*); 
    4293     HDC ResetDCW(HDC, DEVMODEW*); 
     4292    HDC ResetDCA(HDC, CPtr!(DEVMODEA)); 
     4293    HDC ResetDCW(HDC, CPtr!(DEVMODEW)); 
    42944294    BOOL ResizePalette(HPALETTE, UINT); 
    42954295    BOOL RestoreDC(HDC, int); 
    …… 
    43104310    UINT SetBoundsRect(HDC, LPCRECT, UINT); 
    43114311    BOOL SetBrushOrgEx(HDC, int, int, LPPOINT); 
    4312     BOOL SetColorAdjustment(HDC, COLORADJUSTMENT*); 
     4312    BOOL SetColorAdjustment(HDC, CPtr!(COLORADJUSTMENT)); 
    43134313    BOOL SetColorSpace(HDC, HCOLORSPACE); 
    43144314 
    43154315    BOOL SetDeviceGammaRamp(HDC, PVOID); 
    4316     UINT SetDIBColorTable(HDC, UINT, UINT, RGBQUAD*); 
    4317     int SetDIBits(HDC, HBITMAP, UINT, UINT, PCVOID, BITMAPINFO*, UINT); 
    4318     int SetDIBitsToDevice(HDC, int, int, DWORD, DWORD, int, int, UINT, UINT, PCVOID, BITMAPINFO*, UINT); 
    4319     HENHMETAFILE SetEnhMetaFileBits(UINT, BYTE*); 
     4316    UINT SetDIBColorTable(HDC, UINT, UINT, CPtr!(RGBQUAD)); 
     4317    int SetDIBits(HDC, HBITMAP, UINT, UINT, PCVOID, CPtr!(BITMAPINFO), UINT); 
     4318    int SetDIBitsToDevice(HDC, int, int, DWORD, DWORD, int, int, UINT, UINT, PCVOID, CPtr!(BITMAPINFO), UINT); 
     4319    HENHMETAFILE SetEnhMetaFileBits(UINT, CPtr!(BYTE)); 
    43204320    int SetGraphicsMode(HDC, int); 
    43214321    int SetICMMode(HDC, int); 
    …… 
    43304330 
    43314331    DWORD SetMapperFlags(HDC, DWORD); 
    4332     HMETAFILE SetMetaFileBitsEx(UINT, BYTE*); 
     4332    HMETAFILE SetMetaFileBitsEx(UINT, CPtr!(BYTE)); 
    43334333    int SetMetaRgn(HDC); 
    43344334    BOOL SetMiterLimit(HDC, FLOAT, PFLOAT); 
    4335     UINT SetPaletteEntries(HPALETTE, UINT, UINT, PALETTEENTRY*); 
     4335    UINT SetPaletteEntries(HPALETTE, UINT, UINT, CPtr!(PALETTEENTRY)); 
    43364336    COLORREF SetPixel(HDC, int, int, COLORREF); 
    4337     BOOL SetPixelFormat(HDC, int, PIXELFORMATDESCRIPTOR*); 
     4337    BOOL SetPixelFormat(HDC, int, CPtr!(PIXELFORMATDESCRIPTOR)); 
    43384338    BOOL SetPixelV(HDC, int, int, COLORREF); 
    43394339    int SetPolyFillMode(HDC, int); 
    …… 
    43504350    BOOL SetWindowExtEx(HDC, int, int, LPSIZE); 
    43514351    BOOL SetWindowOrgEx(HDC, int, int, LPPOINT); 
    4352     HENHMETAFILE SetWinMetaFileBits(UINT, BYTE*, HDC, METAFILEPICT*); 
    4353     BOOL SetWorldTransform(HDC, XFORM*); 
    4354     int StartDocA(HDC, DOCINFOA*); 
    4355     int StartDocW(HDC, DOCINFOW*); 
     4352    HENHMETAFILE SetWinMetaFileBits(UINT, CPtr!(BYTE), HDC, CPtr!(METAFILEPICT)); 
     4353    BOOL SetWorldTransform(HDC, CPtr!(XFORM)); 
     4354    int StartDocA(HDC, CPtr!(DOCINFOA)); 
     4355    int StartDocW(HDC, CPtr!(DOCINFOW)); 
    43564356    int StartPage(HDC); 
    43574357    BOOL StretchBlt(HDC, int, int, int, int, HDC, int, int, int, int, DWORD); 
    4358     int StretchDIBits(HDC, int, int, int, int, int, int, int, int, VOID* , BITMAPINFO* , UINT, DWORD); 
     4358    int StretchDIBits(HDC, int, int, int, int, int, int, int, int, CPtr!(VOID) , CPtr!(BITMAPINFO) , UINT, DWORD); 
    43594359    BOOL StrokeAndFillPath(HDC); 
    43604360    BOOL StrokePath(HDC); 
    …… 
    43794379    BOOL wglMakeCurrent(HDC, HGLRC); 
    43804380    BOOL wglRealizeLayerPalette(HDC, int, BOOL); 
    4381     int wglSetLayerPaletteEntries(HDC, int, int, int, COLORREF*); 
     4381    int wglSetLayerPaletteEntries(HDC, int, int, int, CPtr!(COLORREF)); 
    43824382    BOOL wglShareLists(HGLRC, HGLRC); 
    43834383    BOOL wglSwapLayerBuffers(HDC, UINT); 

  • trunk/win32/winnls.d

    r172 r352  
    646646    BOOL GetCPInfoExA(UINT, DWORD, LPCPINFOEXA); 
    647647    BOOL GetCPInfoExW(UINT, DWORD, LPCPINFOEXW); 
    648     int GetCurrencyFormatA(LCID, DWORD, LPCSTR,  CURRENCYFMTA*, LPSTR, int); 
    649     int GetCurrencyFormatW(LCID, DWORD, LPCWSTR,  CURRENCYFMTW*, LPWSTR, 
     648    int GetCurrencyFormatA(LCID, DWORD, LPCSTR,  CPtr!(CURRENCYFMTA), LPSTR, int); 
     649    int GetCurrencyFormatW(LCID, DWORD, LPCWSTR,  CPtr!(CURRENCYFMTW), LPWSTR, 
    650650      int); 
    651     int GetDateFormatA(LCID, DWORD,  SYSTEMTIME*, LPCSTR, LPSTR, int); 
    652     int GetDateFormatW(LCID, DWORD,  SYSTEMTIME*, LPCWSTR, LPWSTR, int); 
     651    int GetDateFormatA(LCID, DWORD,  CPtr!(SYSTEMTIME), LPCSTR, LPSTR, int); 
     652    int GetDateFormatW(LCID, DWORD,  CPtr!(SYSTEMTIME), LPCWSTR, LPWSTR, int); 
    653653    int GetGeoInfoA(GEOID, GEOTYPE, LPSTR, int, LANGID); 
    654654    int GetGeoInfoW(GEOID, GEOTYPE, LPWSTR, int, LANGID); 
    …… 
    656656    int GetLocaleInfoW(LCID, LCTYPE, LPWSTR, int); 
    657657    BOOL GetNLSVersion(NLS_FUNCTION, LCID, LPNLSVERSIONINFO); 
    658     int GetNumberFormatA(LCID, DWORD, LPCSTR,  NUMBERFMTA*, LPSTR, int); 
    659     int GetNumberFormatW(LCID, DWORD, LPCWSTR,  NUMBERFMTW*, LPWSTR, int); 
     658    int GetNumberFormatA(LCID, DWORD, LPCSTR,  CPtr!(NUMBERFMTA), LPSTR, int); 
     659    int GetNumberFormatW(LCID, DWORD, LPCWSTR,  CPtr!(NUMBERFMTW), LPWSTR, int); 
    660660    UINT GetOEMCP(); 
    661661    BOOL GetStringTypeA(LCID, DWORD, LPCSTR, int, LPWORD); 
    …… 
    666666    LCID GetSystemDefaultLCID(); 
    667667    LCID GetThreadLocale(); 
    668     int GetTimeFormatA(LCID, DWORD,  SYSTEMTIME*, LPCSTR, LPSTR, int); 
    669     int GetTimeFormatW(LCID, DWORD,  SYSTEMTIME*, LPCWSTR, LPWSTR, int); 
     668    int GetTimeFormatA(LCID, DWORD,  CPtr!(SYSTEMTIME), LPCSTR, LPSTR, int); 
     669    int GetTimeFormatW(LCID, DWORD,  CPtr!(SYSTEMTIME), LPCWSTR, LPWSTR, int); 
    670670    LANGID GetUserDefaultLangID(); 
    671671    LCID GetUserDefaultLCID(); 

  • trunk/win32/winreg.d

    r237 r352  
    130130    LONG RegSaveKeyW(HKEY, LPCWSTR, LPSECURITY_ATTRIBUTES); 
    131131    LONG RegSetKeySecurity(HKEY, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR); 
    132     LONG RegSetValueExA(HKEY, LPCSTR, DWORD, DWORD, BYTE*, DWORD); 
    133     LONG RegSetValueExW(HKEY, LPCWSTR, DWORD, DWORD, BYTE*, DWORD); 
     132    LONG RegSetValueExA(HKEY, LPCSTR, DWORD, DWORD, CPtr!(BYTE), DWORD); 
     133    LONG RegSetValueExW(HKEY, LPCWSTR, DWORD, DWORD, CPtr!(BYTE), DWORD); 
    134134    LONG RegUnLoadKeyA(HKEY, LPCSTR); 
    135135    LONG RegUnLoadKeyW(HKEY, LPCWSTR); 

  • trunk/win32/winsock.d

    r345 r352  
    513513extern (Pascal) { 
    514514    SOCKET accept(SOCKET, SOCKADDR*, int*); 
    515     int bind(SOCKET, SOCKADDR*, int); 
     515    int bind(SOCKET, CPtr!(SOCKADDR), int); 
    516516    int closesocket(SOCKET); 
    517     int connect(SOCKET, SOCKADDR*, int); 
     517    int connect(SOCKET, CPtr!(SOCKADDR), int); 
    518518    int ioctlsocket(SOCKET, int, u_long*); 
    519519    int getpeername(SOCKET, SOCKADDR*, int*); 
    520520    int getsockname(SOCKET, SOCKADDR*, int*); 
    521521    int getsockopt(SOCKET, int, int, char*, int*); 
    522     uint inet_addr(char*); 
     522    uint inet_addr(CPtr!(char)); 
    523523    int listen(SOCKET, int); 
    524524    int recv(SOCKET, char*, int, int); 
    525525    int recvfrom(SOCKET, char*, int, int, SOCKADDR*, int*); 
    526     int send(SOCKET, char*, int, int); 
    527     int sendto(SOCKET, char*, int, int, SOCKADDR*, int); 
    528     int setsockopt(SOCKET, int, int, char*, int); 
     526    int send(SOCKET, CPtr!(char), int, int); 
     527    int sendto(SOCKET, CPtr!(char), int, int, CPtr!(SOCKADDR), int); 
     528    int setsockopt(SOCKET, int, int, CPtr!(char), int); 
    529529    int shutdown(SOCKET, int); 
    530530    SOCKET socket(int, int, int); 
    …… 
    537537    FARPROC WSASetBlockingHook(FARPROC); 
    538538    int WSACancelBlockingCall(); 
    539     HANDLE WSAAsyncGetServByName(HWND, u_int, char*, char*, char*, int); 
    540     HANDLE WSAAsyncGetServByPort(HWND, u_int, int, char*, char*, int); 
    541     HANDLE WSAAsyncGetProtoByName(HWND, u_int, char*, char*, int); 
     539    HANDLE WSAAsyncGetServByName(HWND, u_int, CPtr!(char), CPtr!(char), char*, int); 
     540    HANDLE WSAAsyncGetServByPort(HWND, u_int, int, CPtr!(char), char*, int); 
     541    HANDLE WSAAsyncGetProtoByName(HWND, u_int, CPtr!(char), char*, int); 
    542542    HANDLE WSAAsyncGetProtoByNumber(HWND, u_int, int, char*, int); 
    543     HANDLE WSAAsyncGetHostByName(HWND, u_int, char*, char*, int); 
    544     HANDLE WSAAsyncGetHostByAddr(HWND, u_int, char*, int, int, char*, int); 
     543    HANDLE WSAAsyncGetHostByName(HWND, u_int, CPtr!(char), char*, int); 
     544    HANDLE WSAAsyncGetHostByAddr(HWND, u_int, CPtr!(char), int, int, char*, int); 
    545545    int WSACancelAsyncRequest(HANDLE); 
    546546    int WSAAsyncSelect(SOCKET, HWND, u_int, int); 
    …… 
    549549    u_short htons(u_short); 
    550550    u_short ntohs(u_short); 
    551     int select(int nfds, FD_SET*, FD_SET*, FD_SET*, TIMEVAL*); 
     551    int select(int nfds, FD_SET*, FD_SET*, FD_SET*, CPtr!(TIMEVAL)); 
    552552    int gethostname(char*, int); 
    553553} 
    …… 
    555555extern (Windows) { 
    556556    char* inet_ntoa(IN_ADDR); 
    557     HOSTENT* gethostbyaddr(char*, int, int); 
    558     HOSTENT* gethostbyname(char*); 
    559     SERVENT* getservbyport(int, char*); 
    560     SERVENT* getservbyname(char*, char*); 
     557    HOSTENT* gethostbyaddr(CPtr!(char), int, int); 
     558    HOSTENT* gethostbyname(CPtr!(char)); 
     559    SERVENT* getservbyport(int, CPtr!(char)); 
     560    SERVENT* getservbyname(CPtr!(char), CPtr!(char)); 
    561561    PROTOENT* getprotobynumber(int); 
    562     PROTOENT* getprotobyname(char*); 
     562    PROTOENT* getprotobyname(CPtr!(char)); 
    563563} 
    564564 

  • trunk/win32/winsock2.d

    r345 r352  
    611611extern (Windows) { 
    612612    SOCKET accept(SOCKET, SOCKADDR*, int*); 
    613     int bind(SOCKET, SOCKADDR*, int); 
     613    int bind(SOCKET, CPtr!(SOCKADDR), int); 
    614614    int closesocket(SOCKET); 
    615     int connect(SOCKET, SOCKADDR*, int); 
     615    int connect(SOCKET, CPtr!(SOCKADDR), int); 
    616616    int ioctlsocket(SOCKET, int, u_long*); 
    617617    int getpeername(SOCKET, SOCKADDR*, int*); 
    618618    int getsockname(SOCKET, SOCKADDR*, int*); 
    619619    int getsockopt(SOCKET, int, int, void*, int*); 
    620     uint inet_addr(char*); 
     620    uint inet_addr(CPtr!(char)); 
    621621    int listen(SOCKET, int); 
    622622    int recv(SOCKET, ubyte*, int, int); 
    623623    int recvfrom(SOCKET, ubyte*, int, int, SOCKADDR*, int*); 
    624     int send(SOCKET, ubyte*, int, int); 
    625     int sendto(SOCKET, ubyte*, int, int, SOCKADDR*, int); 
    626     int setsockopt(SOCKET, int, int, void*, int); 
     624    int send(SOCKET, CPtr!(ubyte), int, int); 
     625    int sendto(SOCKET, CPtr!(ubyte), int, int, CPtr!(SOCKADDR), int); 
     626    int setsockopt(SOCKET, int, int, CPtr!(void), int); 
    627627    int shutdown(SOCKET, int); 
    628628    SOCKET socket(int, int, int); 
    …… 
    649649extern(Windows) { 
    650650    char* inet_ntoa(IN_ADDR); 
    651     HOSTENT* gethostbyaddr(char*, int, int); 
    652     HOSTENT* gethostbyname(char*); 
    653     SERVENT* getservbyport(int, char*); 
    654     SERVENT* getservbyname(char*, char*); 
     651    HOSTENT* gethostbyaddr(CPtr!(char), int, int); 
     652    HOSTENT* gethostbyname(CPtr!(char)); 
     653    SERVENT* getservbyport(int, CPtr!(char)); 
     654    SERVENT* getservbyname(CPtr!(char), CPtr!(char)); 
    655655    PROTOENT* getprotobynumber(int); 
    656     PROTOENT* getprotobyname(char*); 
     656    PROTOENT* getprotobyname(CPtr!(char)); 
    657657 
    658658    /* NOTE: DK: in the original headers, these were declared with 
    …… 
    698698 
    699699extern(Windows) { 
    700     HANDLE WSAAsyncGetServByName(HWND, u_int, char*, char*, char*, int); 
    701     HANDLE WSAAsyncGetServByPort(HWND, u_int, int, char*, char*, int); 
    702     HANDLE WSAAsyncGetProtoByName(HWND, u_int, char*, char*, int); 
     700    HANDLE WSAAsyncGetServByName(HWND, u_int, CPtr!(char), CPtr!(char), char*, int); 
     701    HANDLE WSAAsyncGetServByPort(HWND, u_int, int, CPtr!(char), char*, int); 
     702    HANDLE WSAAsyncGetProtoByName(HWND, u_int, CPtr!(char), char*, int); 
    703703    HANDLE WSAAsyncGetProtoByNumber(HWND, u_int, int, char*, int); 
    704     HANDLE WSAAsyncGetHostByName(HWND, u_int, char*, char*, int); 
    705     HANDLE WSAAsyncGetHostByAddr(HWND, u_int, char*, int, int, char*, int); 
     704    HANDLE WSAAsyncGetHostByName(HWND, u_int, CPtr!(char), char*, int); 
     705    HANDLE WSAAsyncGetHostByAddr(HWND, u_int, CPtr!(char), int, int, char*, int); 
    706706    int WSACancelAsyncRequest(HANDLE); 
    707707    int WSAAsyncSelect(SOCKET, HWND, u_int, long); 
    …… 
    722722    u_short htons(u_short); 
    723723    u_short ntohs(u_short); 
    724     int select(int nfds, fd_set*, fd_set*, fd_set*, TIMEVAL*); 
     724    int select(int nfds, fd_set*, fd_set*, fd_set*, CPtr!(TIMEVAL)); 
    725725 
    726726    alias typeof(&htonl) LPFN_HTONL; 
    …… 
    13131313    INT WSAAddressToStringW(LPSOCKADDR, DWORD, LPWSAPROTOCOL_INFOW, LPWSTR, LPDWORD); 
    13141314    BOOL WSACloseEvent(WSAEVENT); 
    1315     int WSAConnect(SOCKET, SOCKADDR*, int, LPWSABUF, LPWSABUF, LPQOS, LPQOS); 
     1315    int WSAConnect(SOCKET, CPtr!(SOCKADDR), int, LPWSABUF, LPWSABUF, LPQOS, LPQOS); 
    13161316    WSAEVENT WSACreateEvent(); 
    13171317    int WSADuplicateSocketA(SOCKET, DWORD, LPWSAPROTOCOL_INFOA); 
    …… 
    13341334    INT WSAInstallServiceClassW(LPWSASERVICECLASSINFOW); 
    13351335    int WSAIoctl(SOCKET, DWORD, LPVOID, DWORD, LPVOID, DWORD, LPDWORD, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE); 
    1336     SOCKET WSAJoinLeaf(SOCKET, SOCKADDR*, int, LPWSABUF, LPWSABUF, LPQOS, LPQOS, DWORD); 
     1336    SOCKET WSAJoinLeaf(SOCKET, CPtr!(SOCKADDR), int, LPWSABUF, LPWSABUF, LPQOS, LPQOS, DWORD); 
    13371337    INT WSALookupServiceBeginA(LPWSAQUERYSETA, DWORD, LPHANDLE); 
    13381338    INT WSALookupServiceBeginW(LPWSAQUERYSETW lpqsRestrictions, DWORD, LPHANDLE); 
    …… 
    13501350    int WSASend(SOCKET, LPWSABUF, DWORD, LPDWORD, DWORD, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE); 
    13511351    int WSASendDisconnect(SOCKET, LPWSABUF); 
    1352     int WSASendTo(SOCKET, LPWSABUF, DWORD, LPDWORD, DWORD, SOCKADDR*, int, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE); 
     1352    int WSASendTo(SOCKET, LPWSABUF, DWORD, LPDWORD, DWORD, CPtr!(SOCKADDR), int, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE); 
    13531353    BOOL WSASetEvent(WSAEVENT); 
    13541354    INT WSASetServiceA(LPWSAQUERYSETA, WSAESETSERVICEOP, DWORD); // NB: was declared with "WSAAPI" linkage 
    …… 
    13581358    INT WSAStringToAddressA(LPSTR, INT, LPWSAPROTOCOL_INFOA, LPSOCKADDR, LPINT); 
    13591359    INT WSAStringToAddressW(LPWSTR, INT, LPWSAPROTOCOL_INFOW, LPSOCKADDR, LPINT); 
    1360     DWORD WSAWaitForMultipleEvents(DWORD, WSAEVENT*, BOOL, DWORD, BOOL); 
     1360    DWORD WSAWaitForMultipleEvents(DWORD, CPtr!(WSAEVENT), BOOL, DWORD, BOOL); 
    13611361 
    13621362    alias typeof(&WSAAccept) LPFN_WSAACCEPT; 

  • trunk/win32/winuser.d

    r327 r352  
    27652765    short cy; 
    27662766} 
    2767 alias DLGTEMPLATE* LPDLGTEMPLATE, LPDLGTEMPLATEA, LPDLGTEMPLATEW; 
    2768 alias DLGTEMPLATE* LPCDLGTEMPLATE; 
     2767alias DLGTEMPLATE*       LPDLGTEMPLATE, LPDLGTEMPLATEA, LPDLGTEMPLATEW; 
     2768alias CPtr!(DLGTEMPLATE) LPCDLGTEMPLATE; 
    27692769 
    27702770align: 
    …… 
    29042904    } 
    29052905} 
    2906 alias MENUITEMINFOA* LPMENUITEMINFOA; 
    2907 alias MENUITEMINFOA* LPCMENUITEMINFOA; 
     2906alias MENUITEMINFOA*       LPMENUITEMINFOA; 
     2907alias CPtr!(MENUITEMINFOA) LPCMENUITEMINFOA; 
    29082908 
    29092909struct MENUITEMINFOW { 
    …… 
    29232923    } 
    29242924} 
    2925 alias MENUITEMINFOW* LPMENUITEMINFOW; 
    2926 alias MENUITEMINFOW* LPCMENUITEMINFOW; 
     2925alias MENUITEMINFOW*       LPMENUITEMINFOW; 
     2926alias CPtr!(MENUITEMINFOW) LPCMENUITEMINFOW; 
    29272927 
    29282928struct SCROLLINFO { 
    …… 
    29352935    int nTrackPos; 
    29362936} 
    2937 alias SCROLLINFO* LPSCROLLINFO; 
    2938 alias SCROLLINFO* LPCSCROLLINFO; 
     2937alias SCROLLINFO*       LPSCROLLINFO; 
     2938alias CPtr!(SCROLLINFO) LPCSCROLLINFO; 
    29392939 
    29402940struct WINDOWPLACEMENT { 
    …… 
    33813381    ULONG_PTR dwMenuData; 
    33823382} 
    3383 alias MENUINFO* LPMENUINFO, LPCMENUINFO; 
     3383alias MENUINFO*       LPMENUINFO; 
     3384alias CPtr!(MENUINFO) LPCMENUINFO; 
    33843385 
    33853386 
    …… 
    36133614    HWND hwndTarget; 
    36143615} 
    3615 alias RAWINPUTDEVICE* PRAWINPUTDEVICE, LPRAWINPUTDEVICE; 
    3616 alias RAWINPUTDEVICE* PCRAWINPUTDEVICE; 
     3616alias RAWINPUTDEVICE*       PRAWINPUTDEVICE, LPRAWINPUTDEVICE; 
     3617alias CPtr!(RAWINPUTDEVICE) PCRAWINPUTDEVICE; 
    36173618 
    36183619struct RAWINPUTDEVICELIST { 
    …… 
    37023703LRESULT CallWindowProcA(WNDPROC, HWND, UINT, WPARAM, LPARAM); 
    37033704LRESULT CallWindowProcW(WNDPROC, HWND, UINT, WPARAM, LPARAM); 
    3704 WORD CascadeWindows(HWND, UINT, LPCRECT, UINT, HWND*); 
     3705WORD CascadeWindows(HWND, UINT, LPCRECT, UINT, CPtr!(HWND)); 
    37053706BOOL ChangeClipboardChain(HWND, HWND); 
    37063707 
    …… 
    37643765HWND CreateDialogIndirectParamW(HINSTANCE, LPCDLGTEMPLATE, HWND, DLGPROC, LPARAM); 
    37653766 
    3766 HICON CreateIcon(HINSTANCE, int, int, BYTE, BYTE, BYTE*, BYTE*); 
     3767HICON CreateIcon(HINSTANCE, int, int, BYTE, BYTE, CPtr!(BYTE), BYTE*); 
    37673768HICON CreateIconFromResource(PBYTE, DWORD, BOOL, DWORD); 
    37683769HICON CreateIconFromResourceEx(PBYTE, DWORD, BOOL, DWORD, int, int, UINT); 
    …… 
    38673868 
    38683869extern (Windows): 
    3869 LONG DispatchMessageA( MSG*); 
    3870 LONG DispatchMessageW( MSG*); 
     3870LONG DispatchMessageA( CPtr!(MSG)); 
     3871LONG DispatchMessageW( CPtr!(MSG)); 
    38713872int DlgDirListA(HWND, LPSTR, int, int, UINT); 
    38723873int DlgDirListW(HWND, LPWSTR, int, int, UINT); 
    …… 
    39003901BOOL EndDialog(HWND, int); 
    39013902BOOL EndMenu(); 
    3902 BOOL EndPaint(HWND, PAINTSTRUCT*); 
     3903BOOL EndPaint(HWND, CPtr!(PAINTSTRUCT)); 
    39033904BOOL EnumChildWindows(HWND, ENUMWINDOWSPROC, LPARAM); 
    39043905UINT EnumClipboardFormats(UINT); 
    …… 
    41084109HKL LoadKeyboardLayoutW(LPCWSTR, UINT); 
    41094110HMENU LoadMenuA(HINSTANCE, LPCSTR); 
    4110 HMENU LoadMenuIndirectA( MENUTEMPLATE*); 
    4111 HMENU LoadMenuIndirectW( MENUTEMPLATE*); 
     4111HMENU LoadMenuIndirectA( CPtr!(MENUTEMPLATE)); 
     4112HMENU LoadMenuIndirectW( CPtr!(MENUTEMPLATE)); 
    41124113HMENU LoadMenuW(HINSTANCE, LPCWSTR); 
    41134114int LoadStringA(HINSTANCE, UINT, LPSTR, int); 
    …… 
    41284129int MessageBoxExA(HWND, LPCSTR, LPCSTR, UINT, WORD); 
    41294130int MessageBoxExW(HWND, LPCWSTR, LPCWSTR, UINT, WORD); 
    4130 int MessageBoxIndirectA(MSGBOXPARAMSA*); 
    4131 int MessageBoxIndirectW(MSGBOXPARAMSW*); 
     4131int MessageBoxIndirectA(CPtr!(MSGBOXPARAMSA)); 
     4132int MessageBoxIndirectW(CPtr!(MSGBOXPARAMSW)); 
    41324133BOOL ModifyMenuA(HMENU, UINT, UINT, UINT, LPCSTR); 
    41334134BOOL ModifyMenuW(HMENU, UINT, UINT, UINT, LPCWSTR); 
    41344135void mouse_event(DWORD, DWORD, DWORD, DWORD, ULONG_PTR); 
    41354136BOOL MoveWindow(HWND, int, int, int, int, BOOL); 
    4136 DWORD MsgWaitForMultipleObjects(DWORD, HANDLE*, BOOL, DWORD, DWORD); 
    4137 DWORD MsgWaitForMultipleObjectsEx(DWORD, HANDLE*, DWORD, DWORD, DWORD); 
     4137DWORD MsgWaitForMultipleObjects(DWORD, CPtr!(HANDLE), BOOL, DWORD, DWORD); 
     4138DWORD MsgWaitForMultipleObjectsEx(DWORD, CPtr!(HANDLE), DWORD, DWORD, DWORD); 
    41384139DWORD OemKeyScan(WORD); 
    41394140BOOL OemToCharA(LPCSTR, LPSTR); 
    …… 
    41624163UINT RealGetWindowClassW(HWND, LPWSTR, UINT); 
    41634164BOOL RedrawWindow(HWND, LPCRECT, HRGN, UINT); 
    4164 ATOM RegisterClassA(WNDCLASSA*); 
    4165 ATOM RegisterClassW(WNDCLASSW*); 
    4166 ATOM RegisterClassExA(WNDCLASSEXA*); 
    4167 ATOM RegisterClassExW(WNDCLASSEXW*); 
     4165ATOM RegisterClassA(CPtr!(WNDCLASSA)); 
     4166ATOM RegisterClassW(CPtr!(WNDCLASSW)); 
     4167ATOM RegisterClassExA(CPtr!(WNDCLASSEXA)); 
     4168ATOM RegisterClassExW(CPtr!(WNDCLASSEXW)); 
    41684169UINT RegisterClipboardFormatA(LPCSTR); 
    41694170UINT RegisterClipboardFormatW(LPCWSTR); 
    …… 
    42284229int SetScrollPos(HWND, int, int, BOOL); 
    42294230BOOL SetScrollRange(HWND, int, int, int, BOOL); 
    4230 BOOL SetSysColors(int, INT* , COLORREF* ); 
     4231BOOL SetSysColors(int, CPtr!(INT) , CPtr!(COLORREF) ); 
    42314232BOOL SetSystemCursor(HCURSOR, DWORD); 
    42324233BOOL SetThreadDesktop(HDESK); 
    …… 
    42384239LONG SetWindowLongA(HWND, int, LONG); 
    42394240LONG SetWindowLongW(HWND, int, LONG); 
    4240 BOOL SetWindowPlacement(HWND hWnd, WINDOWPLACEMENT*); 
     4241BOOL SetWindowPlacement(HWND hWnd, CPtr!(WINDOWPLACEMENT)); 
    42414242BOOL SetWindowPos(HWND, HWND, int, int, int, int, UINT); 
    42424243int SetWindowRgn(HWND, HRGN, BOOL); 
    …… 
    42614262LONG TabbedTextOutA(HDC, int, int, LPCSTR, int, int, LPINT, int); 
    42624263LONG TabbedTextOutW(HDC, int, int, LPCWSTR, int, int, LPINT, int); 
    4263 WORD TileWindows(HWND, UINT, LPCRECT, UINT, HWND* ); 
     4264WORD TileWindows(HWND, UINT, LPCRECT, UINT, CPtr!(HWND) ); 
    42644265int ToAscii(UINT, UINT, PBYTE, LPWORD, UINT); 
    42654266int ToAsciiEx(UINT, UINT, PBYTE, LPWORD, UINT, HKL); 
    …… 
    42724273int TranslateAcceleratorW(HWND, HACCEL, LPMSG); 
    42734274BOOL TranslateMDISysAccel(HWND, LPMSG); 
    4274 BOOL TranslateMessage( MSG*); 
     4275BOOL TranslateMessage( CPtr!(MSG)); 
    42754276BOOL UnhookWindowsHook(int, HOOKPROC); 
    42764277BOOL UnhookWindowsHookEx(HHOOK); 

  • trunk/win32/ws2tcpip.d

    r256 r352  
    138138alias SOCKADDR_IN6* PSOCKADDR_IN6, LPSOCKADDR_IN6; 
    139139 
    140 extern IN6_ADDR in6addr_any; 
    141 extern IN6_ADDR in6addr_loopback; 
     140extern CPtr!(IN6_ADDR) in6addr_any; 
     141extern IN6_ADDR        in6addr_loopback; 
    142142 
    143143/+ TODO:  
    …… 
    226226    static if (_WIN32_WINNT >= 0x0501) { 
    227227        void freeaddrinfo(addrinfo*); 
    228         int getaddrinfo (char*, char*, addrinfo*, addrinfo**); 
    229         int getnameinfo(SOCKADDR*, socklen_t, char*, DWORD, char*, DWORD, int); 
     228        int getaddrinfo (CPtr!(char), CPtr!(char), CPtr!(addrinfo), addrinfo**); 
     229        int getnameinfo(CPtr!(SOCKADDR), socklen_t, char*, DWORD, char*, DWORD, int); 
    230230    } 
    231231}