Changeset 289
- Timestamp:
- 09/17/08 03:42:14 (3 years ago)
- Files:
-
- trunk/win32/cguid.d (modified) (1 diff)
- trunk/win32/comcat.d (modified) (1 diff)
- trunk/win32/exdisp.d (modified) (1 diff)
- trunk/win32/oaidl.d (modified) (1 diff)
- trunk/win32/objidl.d (modified) (1 diff)
- trunk/win32/objsafe.d (modified) (1 diff)
- trunk/win32/ocidl.d (modified) (12 diffs)
- trunk/win32/ole.d (modified) (1 diff)
- trunk/win32/ole2.d (modified) (1 diff)
- trunk/win32/oleacc.d (modified) (1 diff)
- trunk/win32/olectlid.d (modified) (1 diff)
- trunk/win32/oleidl.d (modified) (1 diff)
- trunk/win32/servprov.d (modified) (1 diff)
- trunk/win32/shlguid.d (modified) (1 diff)
- trunk/win32/unknwn.d (modified) (1 diff)
- trunk/win32/uuid.d (added)
- trunk/win32/wtypes.d (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/win32/cguid.d
r155 r289 12 12 private import win32.basetyps; 13 13 14 extern (C) {15 extern const IID16 GUID_NULL,17 IID_IRpcChannel,18 IID_IRpcStub,19 IID_IStubManager,20 IID_IRpcProxy,21 IID_IProxyManager,22 IID_IPSFactory,23 IID_IInternalMoniker,24 IID_IDfReserved1,25 IID_IDfReserved2,26 IID_IDfReserved3,27 IID_IStub,28 IID_IProxy,29 IID_IEnumGeneric,30 IID_IEnumHolder,31 IID_IEnumCallback,32 IID_IOleManager,33 IID_IOlePresObj,34 IID_IDebug,35 IID_IDebugStream;36 37 extern const CLSID38 CLSID_StdMarshal,39 CLSID_PSGenObject,40 CLSID_PSClientSite,41 CLSID_PSClassObject,42 CLSID_PSInPlaceActive,43 CLSID_PSInPlaceFrame,44 CLSID_PSDragDrop,45 CLSID_PSBindCtx,46 CLSID_PSEnumerators,47 CLSID_StaticMetafile,48 CLSID_StaticDib,49 50 CID_CDfsVolume,51 52 CLSID_CCDFormKrnl,53 CLSID_CCDPropertyPage,54 CLSID_CCDFormDialog,55 CLSID_CCDCommandButton,56 CLSID_CCDComboBox,57 CLSID_CCDTextBox,58 CLSID_CCDCheckBox,59 CLSID_CCDLabel,60 CLSID_CCDOptionButton,61 CLSID_CCDListBox,62 CLSID_CCDScrollBar,63 CLSID_CCDGroupBox,64 CLSID_CCDGeneralPropertyPage,65 CLSID_CCDGenericPropertyPage,66 CLSID_CCDFontPropertyPage,67 CLSID_CCDColorPropertyPage,68 CLSID_CCDLabelPropertyPage,69 CLSID_CCDCheckBoxPropertyPage,70 CLSID_CCDTextBoxPropertyPage,71 CLSID_CCDOptionButtonPropertyPage,72 CLSID_CCDListBoxPropertyPage,73 CLSID_CCDCommandButtonPropertyPage,74 CLSID_CCDComboBoxPropertyPage,75 CLSID_CCDScrollBarPropertyPage,76 CLSID_CCDGroupBoxPropertyPage,77 CLSID_CCDXObjectPropertyPage,78 CLSID_CStdPropertyFrame,79 CLSID_CFormPropertyPage,80 CLSID_CGridPropertyPage,81 CLSID_CWSJArticlePage,82 CLSID_CSystemPage,83 CLSID_IdentityUnmarshal,84 CLSID_InProcFreeMarshaler,85 CLSID_Picture_Metafile,86 CLSID_Picture_EnhMetafile,87 CLSID_Picture_Dib,88 CLSID_StdGlobalInterfaceTable;89 90 extern const GUID GUID_TRISTATE;91 }trunk/win32/comcat.d
r155 r289 36 36 alias CATEGORYINFO* LPCATEGORYINFO; 37 37 38 extern (C) {39 const CATID40 CATID_Insertable,41 CATID_Control,42 CATID_Programmable,43 CATID_IsShortcut,44 CATID_NeverShowExt,45 CATID_DocObject,46 CATID_Printable,47 CATID_RequiresDataPathHost,48 CATID_PersistsToMoniker,49 CATID_PersistsToStorage,50 CATID_PersistsToStreamInit,51 CATID_PersistsToStream,52 CATID_PersistsToMemory,53 CATID_PersistsToFile,54 CATID_PersistsToPropertyBag,55 CATID_InternetAware,56 CATID_DesignTimeUIActivatableControl;57 58 const CLSID CLSID_StdComponentCategoriesMgr;59 60 const IID61 IID_IEnumGUID,62 IID_ICatInformation,63 IID_ICatRegister,64 IID_IEnumCATEGORYINFO;65 }66 67 38 alias IEnumGUID IEnumCATID; 68 39 alias LPENUMGUID LPENUMCATID; trunk/win32/exdisp.d
r155 r289 22 22 navBrowserBar = 0x20, 23 23 navHyperLink = 0x40 24 }25 26 extern (C) {27 extern const CLSID CLSID_WebBrowser;28 extern const IID29 DIID_DWebBrowserEvents,30 IID_IWebBrowser,31 IID_IWebBrowserApp,32 IID_IWebBrowser2,33 DIID_DWebBrowserEvents2;34 24 } 35 25 trunk/win32/oaidl.d
r287 r289 55 55 const IMPLTYPEFLAG_FDEFAULTVTABLE = 8; 56 56 57 extern (Windows) {58 extern IID IID_ITypeLib;59 extern IID IID_ITypeLib2;60 extern IID IID_ICreateTypeInfo;61 extern IID IID_ICreateTypeInfo2;62 extern IID IID_ICreateTypeLib;63 extern IID IID_ICreateTypeLib2;64 extern IID IID_ITypeInfo;65 extern IID IID_ITypeInfo2;66 extern IID IID_IErrorInfo;67 extern IID IID_IDispatch;68 extern IID IID_IEnumVARIANT;69 extern IID IID_ICreateErrorInfo;70 extern IID IID_ISupportErrorInfo;71 extern IID IID_IRecordInfo;72 extern IID IID_ITypeMarshal;73 }74 57 75 58 enum SYSKIND { trunk/win32/objidl.d
r287 r289 506 506 DWORD cAuthInfo; 507 507 SOLE_AUTHENTICATION_INFO* aAuthInfo; 508 }509 510 extern (C) {511 extern IID IID_ISequentialStream;512 extern IID IID_IStream;513 extern IID IID_IMarshal;514 extern IID IID_IStdMarshalInfo;515 extern IID IID_IMalloc;516 extern IID IID_IMallocSpy;517 extern IID IID_IMessageFilter;518 extern IID IID_IPersist;519 extern IID IID_IPersistStream;520 extern IID IID_IRunningObjectTable;521 extern IID IID_IBindCtx;522 extern IID IID_IMoniker;523 extern IID IID_IPersistStorage;524 extern IID IID_IPersistFile;525 extern IID IID_IAdviseSink;526 extern IID IID_IAdviseSink2;527 extern IID IID_IDataObject;528 extern IID IID_IDataAdviseHolder;529 extern IID IID_IStorage;530 extern IID IID_IRootStorage;531 extern IID IID_IRpcChannelBuffer;532 extern IID IID_IRpcProxyBuffer;533 extern IID IID_IRpcStubBuffer;534 extern IID IID_IPSFactoryBuffer;535 extern IID IID_ILockBytes;536 extern IID IID_IExternalConnection;537 extern IID IID_IRunnableObject;538 extern IID IID_IROTData;539 extern IID IID_IChannelHook;540 extern IID IID_IPropertyStorage;541 extern IID IID_IPropertySetStorage;542 extern IID IID_IClientSecurity;543 extern IID IID_IServerSecurity;544 extern IID IID_IClassActivator;545 extern IID IID_IFillLockBytes;546 extern IID IID_IProgressNotify;547 extern IID IID_ILayoutStorage;548 extern IID IID_IGlobalInterfaceTable;549 550 extern FMTID FMTID_SummaryInformation;551 extern FMTID FMTID_DocSummaryInformation;552 extern FMTID FMTID_UserDefinedProperties;553 508 } 554 509 trunk/win32/objsafe.d
r155 r289 18 18 } 19 19 20 extern (C) extern const IID IID_IObjectSafety;21 22 23 20 interface IObjectSafety : IUnknown { 24 21 HRESULT GetInterfaceSafetyOptions(REFIID, DWORD*, DWORD*); trunk/win32/ocidl.d
r277 r289 20 20 interface IServiceProvider {} 21 21 22 / +22 /* 23 23 // TODO: 24 24 //private import win32.servprov; // for IServiceProvider … … 32 32 HRESULT MonikerBindToStorage(IMoniker* pMk, IBindCtx* pBC, IBindStatusCallback* pBSC, REFIID, void** ); 33 33 } 34 +/ 35 36 alias IErrorLog* LPERRORLOG; 37 alias IPropertyBag* LPPROPERTYBAG; 38 alias IPropertyBag2* LPPROPERTYBAG2; 39 alias IEnumConnections* LPENUMCONNECTIONS; 40 alias IConnectionPoint* LPCONNECTIONPOINT; 41 alias IEnumConnectionPoints* LPENUMCONNECTIONPOINTS; 42 alias IPropertyPageSite* LPPROPERTYPAGESITE; 43 alias IFont* LPFONT; 44 alias IFontDisp* LPFONTDISP; 45 alias IOleUndoManager* LPOLEUNDOMANAGER; 34 */ 35 36 46 37 47 38 … … 181 172 alias PROPPAGEINFO* LPPROPPAGEINFO; 182 173 183 extern (C)184 {185 //extern IID IID_IOleControl;186 //extern IID IID_IOleControlSite;187 //extern IID IID_ISimpleFrameSite;188 //extern IID IID_IErrorLog;189 //extern IID IID_IPropertyBag;190 extern IID IID_IPropertyBag2;191 //extern IID IID_IPersistPropertyBag;192 extern IID IID_IPersistPropertyBag2;193 //extern IID IID_IPersistStreamInit;194 //extern IID IID_IPersistMemory;195 //extern IID IID_IPropertyNotifySink;196 //extern IID IID_IProvideClassInfo;197 //extern IID IID_IProvideClassInfo2;198 //extern IID IID_IConnectionPointContainer;199 //extern IID IID_IEnumConnectionPoints;200 //extern IID IID_IConnectionPoint;201 //extern IID IID_IEnumConnections;202 //extern IID IID_IClassFactory2;203 //extern IID IID_ISpecifyPropertyPages;204 //extern IID IID_IPerPropertyBrowsing;205 //extern IID IID_IPropertyPageSite;206 //extern IID IID_IPropertyPage;207 //extern IID IID_IPropertyPage2;208 //extern IID IID_IFont;209 //extern IID IID_IFontDisp;210 //extern IID IID_IPicture;211 //extern IID IID_IPictureDisp;212 extern IID IID_IOleInPlaceSiteEx;213 extern IID IID_IObjectWithSite;214 extern IID IID_IOleInPlaceSiteWindowless;215 extern IID IID_IAdviseSinkEx;216 extern IID IID_IPointerInactive;217 extern IID IID_IOleUndoUnit;218 extern IID IID_IOleParentUndoUnit;219 extern IID IID_IEnumOleUndoUnits;220 extern IID IID_IOleUndoManager;221 extern IID IID_IQuickActivate;222 }223 224 174 interface IOleControl : public IUnknown { 225 175 HRESULT GetControlInfo(LPCONTROLINFO); … … 247 197 HRESULT AddError(LPCOLESTR, LPEXCEPINFO); 248 198 } 199 alias IErrorLog LPERRORLOG; 249 200 250 201 interface IPropertyBag : public IUnknown { … … 252 203 HRESULT Write(LPCOLESTR, LPVARIANT); 253 204 } 205 alias IPropertyBag LPPROPERTYBAG; 254 206 255 207 interface IPropertyBag2 : public IUnknown { … … 260 212 HRESULT LoadObject(LPCOLESTR, DWORD, IUnknown*, LPERRORLOG); 261 213 } 214 alias IPropertyBag2 LPPROPERTYBAG2; 262 215 263 216 interface IPersistPropertyBag : public IPersist { … … 314 267 HRESULT Clone(LPENUMCONNECTIONPOINTS*); 315 268 } 269 alias IEnumConnectionPoints LPENUMCONNECTIONPOINTS; 316 270 317 271 interface IConnectionPoint : public IUnknown { … … 322 276 HRESULT EnumConnections(LPENUMCONNECTIONS*); 323 277 } 278 alias IConnectionPoint LPCONNECTIONPOINT; 324 279 325 280 interface IEnumConnections : public IUnknown { … … 329 284 HRESULT Clone(LPENUMCONNECTIONS*); 330 285 } 286 alias IEnumConnections LPENUMCONNECTIONS; 331 287 332 288 interface IClassFactory2 : public IClassFactory { … … 353 309 HRESULT TranslateAccelerator(LPMSG); 354 310 } 311 alias IPropertyPageSite LPPROPERTYPAGESITE; 355 312 356 313 interface IPropertyPage : public IUnknown { … … 399 356 HRESULT SetHdc(HDC); 400 357 } 358 alias IFont LPFONT; 401 359 402 360 interface IFontDisp : public IDispatch { 403 361 } 362 alias IFontDisp LPFONTDISP; 404 363 405 364 interface IPicture : public IUnknown { … … 501 460 HRESULT Enable(BOOL); 502 461 } 462 alias IOleUndoManager LPOLEUNDOMANAGER; 503 463 504 464 interface IQuickActivate : public IUnknown { trunk/win32/ole.d
r155 r289 11 11 module win32.ole; 12 12 13 private import win32.windef, win32.wingdi ;13 private import win32.windef, win32.wingdi, win32.uuid; 14 14 15 15 alias LPCSTR OLE_LPCSTR; trunk/win32/ole2.d
r155 r289 12 12 13 13 public import win32.basetyps, win32.objbase, win32.oleauto, win32.olectlid, 14 win32.oleidl, win32.unknwn, win32.winerror ;14 win32.oleidl, win32.unknwn, win32.winerror, win32.uuid; 15 15 private import win32.objfwd, win32.objidl, win32.windef, win32.wtypes; 16 16 private import win32.winuser; // for LPMSG trunk/win32/oleacc.d
r155 r289 156 156 const SELFLAG_VALID = 0x0000001F; 157 157 158 extern (Windows) {159 /* DEFINE_GUID(LIBID_Accessibility, 0x1ea4dbf0, 0x3c3b, 0x11cf, 0x81, 0x0c, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); */160 /* DEFINE_GUID(IID_IAccessible, 0x618736e0, 0x3c3d, 0x11cf, 0x81, 0x0c, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); */161 extern IID LIBID_Accessibility;162 extern IID IID_IAccessible;163 }164 158 165 159 interface IAccessible : public IDispatch { trunk/win32/olectlid.d
r277 r289 12 12 private import win32.basetyps; 13 13 14 extern (Windows) extern const GUID15 IID_IDispatch,16 IID_IPropertyNotifySink,17 IID_IClassFactory2,18 IID_IProvideClassInfo,19 IID_IProvideClassInfo2,20 IID_IConnectionPointContainer,21 IID_IEnumConnectionPoints,22 IID_IConnectionPoint,23 IID_IEnumConnections,24 25 IID_IOleControl,26 IID_IOleControlSite,27 IID_ISimpleFrameSite,28 29 IID_IPersistStreamInit,30 IID_IPersistMemory,31 32 IID_IPersistPropertyBag,33 IID_IPropertyBag,34 35 IID_IErrorLog,36 37 IID_IPropertyFrame,38 IID_ISpecifyPropertyPages,39 IID_IPerPropertyBrowsing,40 IID_IPropertyPageSite,41 IID_IPropertyPage,42 IID_IPropertyPage2,43 CLSID_CFontPropPage,44 CLSID_CColorPropPage,45 CLSID_CPicturePropPage,46 CLSID_PersistPropset,47 CLSID_ConvertVBX,48 CLSID_StdFont,49 CLSID_StdPicture,50 IID_IFont,51 IID_IFontDisp,52 IID_IPicture,53 IID_IPictureDisp,54 GUID_HIMETRIC,55 GUID_COLOR,56 GUID_XPOSPIXEL,57 GUID_YPOSPIXEL,58 GUID_XSIZEPIXEL,59 GUID_YSIZEPIXEL,60 GUID_XPOS,61 GUID_YPOS,62 GUID_XSIZE,63 GUID_YSIZE,64 GUID_TRISTATE,65 GUID_OPTIONVALUEEXCLUSIVE,66 GUID_CHECKVALUEEXCLUSIVE,67 GUID_FONTNAME,68 GUID_FONTSIZE,69 GUID_FONTBOLD,70 GUID_FONTITALIC,71 GUID_FONTUNDERSCORE,72 GUID_FONTSTRIKETHROUGH,73 GUID_HANDLE,74 IID_IEnumUnknown,75 IID_IEnumString,76 IID_IEnumMoniker,77 IID_IEnumFORMATETC,78 IID_IEnumOLEVERB,79 IID_IEnumSTATDATA,80 IID_IEnumSTATSTG,81 IID_IEnumGeneric,82 IID_IEnumHolder,83 IID_IEnumCallback,84 IID_IPersistStream,85 IID_IPersistStorage,86 IID_IPersistFile,87 IID_IPersist,88 IID_IViewObject,89 IID_IDataObject,90 IID_IAdviseSink,91 IID_IDataAdviseHolder,92 IID_IOleAdviseHolder,93 IID_IOleObject,94 IID_IOleInPlaceObject,95 IID_IOleWindow,96 IID_IOleInPlaceUIWindow,97 IID_IOleInPlaceFrame,98 IID_IOleInPlaceActiveObject,99 IID_IOleClientSite,100 IID_IOleInPlaceSite,101 IID_IParseDisplayName,102 IID_IOleContainer,103 IID_IOleItemContainer,104 IID_IOleLink,105 IID_IOleCache,106 IID_IOleManager,107 IID_IOlePresObj,108 IID_IDropSource,109 IID_IDropTarget,110 IID_IDebug,111 IID_IDebugStream,112 IID_IAdviseSink2,113 IID_IRunnableObject,114 IID_IViewObject2,115 IID_IOleCache2,116 IID_IOleCacheControl,117 CLSID_Picture_Metafile,118 CLSID_Picture_Dib;trunk/win32/oleidl.d
r286 r289 20 20 21 21 const MK_ALT = 32; 22 23 extern (C) {24 extern IID IID_IParseDisplayName;25 extern IID IID_IOleContainer;26 extern IID IID_IOleItemContainer;27 //extern IID IID_IOleClientSite;28 //extern IID IID_IOleObject;29 extern IID IID_IOleWindow;30 extern IID IID_IOleInPlaceUIWindow;31 //extern IID IID_IOleInPlaceObject;32 extern IID IID_IOleInPlaceActiveObject;33 //extern IID IID_IOleInPlaceFrame;34 //extern IID IID_IOleInPlaceSite;35 extern IID IID_IOleAdviseHolder;36 extern IID IID_IDropSource;37 extern IID IID_IDropTarget;38 extern IID IID_IViewObject;39 extern IID IID_IViewObject2;40 extern IID IID_IOleCache;41 extern IID IID_IOleCache2;42 extern IID IID_IOleCacheControl;43 // add miss IID_IDocHostUiHandler44 extern IID IID_IDocHostUIHandler;45 }46 22 47 23 enum BINDSPEED { trunk/win32/servprov.d
r204 r289 12 12 private import win32.basetyps, win32.unknwn, win32.windef, win32.wtypes; 13 13 14 extern (C) {15 extern IID IID_IServiceProvider;16 }17 18 14 interface IServiceProvider : public IUnknown { 19 15 HRESULT QueryService(REFGUID, REFIID, void**); trunk/win32/shlguid.d
r155 r289 17 17 //MACRO #define DEFINE_SHLGUID(n,l,w1,w2) DEFINE_GUID(n,l,w1,w2,0xC0,0,0,0,0,0,0,0x46) 18 18 19 extern (C) {20 extern const GUID21 CLSID_ShellDesktop,22 CLSID_ShellLink,23 FMTID_Intshcut,24 FMTID_InternetSite,25 CGID_Explorer,26 CGID_ShellDocView,27 CGID_ShellServiceObject,28 IID_INewShortcutHookA,29 IID_IShellBrowser,30 IID_IShellView,31 IID_IContextMenu,32 IID_IColumnProvider,33 IID_IQueryInfo,34 IID_IShellIcon,35 IID_IShellIconOverlayIdentifier,36 IID_IShellFolder,37 IID_IShellExtInit,38 IID_IShellPropSheetExt,39 IID_IPersistFolder,40 IID_IExtractIconA,41 IID_IShellLinkA,42 IID_IShellCopyHookA,43 IID_IFileViewerA,44 IID_ICommDlgBrowser,45 IID_IEnumIDList,46 IID_IFileViewerSite,47 IID_IContextMenu2,48 IID_IShellExecuteHookA,49 IID_IPropSheetPage,50 IID_INewShortcutHookW,51 IID_IFileViewerW,52 IID_IShellLinkW,53 IID_IExtractIconW,54 IID_IShellExecuteHookW,55 IID_IShellCopyHookW,56 IID_IShellView2,57 LIBID_SHDocVw,58 IID_IShellExplorer,59 DIID_DShellExplorerEvents,60 CLSID_ShellExplorer,61 IID_ISHItemOC,62 DIID_DSHItemOCEvents,63 CLSID_SHItemOC,64 IID_DHyperLink,65 IID_DIExplorer,66 DIID_DExplorerEvents,67 CLSID_InternetExplorer,68 CLSID_StdHyperLink,69 CLSID_FileTypes,70 CLSID_InternetShortcut,71 IID_IUniformResourceLocator,72 CLSID_DragDropHelper,73 IID_IDropTargetHelper,74 IID_IDragSourceHelper,75 CLSID_AutoComplete,76 IID_IAutoComplete,77 IID_IAutoComplete2,78 CLSID_ACLMulti,79 IID_IObjMgr,80 CLSID_ACListISF,81 IID_IACList;82 83 static if (_WIN32_IE >= 0x400 || _WIN32_WINNT >= 0x500) {84 extern const GUID IID_IPersistFolder2;85 }86 87 static if (_WIN32_WINNT >= 0x0500) {88 extern const GUID89 IID_IPersistFolder3,90 IID_IShellFolder2,91 IID_IFileSystemBindData;92 }93 }94 95 alias IID_IShellBrowser SID_SShellBrowser;96 97 version(Unicode) {98 alias IID_IFileViewerW IID_IFileViewer;99 alias IID_IShellLinkW IID_IShellLink;100 alias IID_IExtractIconW IID_IExtractIcon;101 alias IID_IShellCopyHookW IID_IShellCopyHook;102 alias IID_IShellExecuteHookW IID_IShellExecuteHook;103 alias IID_INewShortcutHookW IID_INewShortcutHook;104 } else {105 alias IID_IFileViewerA IID_IFileViewer;106 alias IID_IShellLinkA IID_IShellLink;107 alias IID_IExtractIconA IID_IExtractIcon;108 alias IID_IShellCopyHookA IID_IShellCopyHook;109 alias IID_IShellExecuteHookA IID_IShellExecuteHook;110 alias IID_INewShortcutHookA IID_INewShortcutHook;111 }trunk/win32/unknwn.d
r285 r289 18 18 } 19 19 20 extern (C)21 {22 extern IID IID_IUnknown;23 extern IID IID_IClassFactory;24 }25 20 26 21 extern (Windows) { trunk/win32/wtypes.d
r155 r289 12 12 import win32.rpc, win32.rpcndr; 13 13 private import win32.windef; 14 private import win32. cguid; // for GUID_NULL14 private import win32.uuid; // for GUID_NULL 15 15 16 16 alias GUID_NULL IID_NULL, CLSID_NULL;
