Changeset 374

Timestamp:

02/13/12 15:24:57 (3 months ago)

Author:

CyberShadow

Message:

Remove deprecated base class protection attributes from interface declarations

"interface Foo : public Bar" => "interface Foo : Bar"

Files:

• trunk/win32/directx/d3d9.d (modified) (20 diffs)
• trunk/win32/docobj.d (modified) (4 diffs)
• trunk/win32/exdisp.d (modified) (4 diffs)
• trunk/win32/mshtml.d (modified) (12 diffs)
• trunk/win32/oaidl.d (modified) (11 diffs)
• trunk/win32/objidl.d (modified) (38 diffs)
• trunk/win32/ocidl.d (modified) (28 diffs)
• trunk/win32/oleacc.d (modified) (1 diff)
• trunk/win32/oledlg.d (modified) (6 diffs)
• trunk/win32/oleidl.d (modified) (18 diffs)
• trunk/win32/richole.d (modified) (2 diffs)
• trunk/win32/servprov.d (modified) (1 diff)
• trunk/win32/shldisp.d (modified) (2 diffs)
• trunk/win32/shlobj.d (modified) (32 diffs)

trunk/win32/directx/d3d9.d

@@ -141 +141 @@
-
-
-public 
+
-{
-    HRESULT RegisterSoftwareDevice(void* pInitializeFunction);
@@ -165 +165 @@
-alias LPDIRECT3D9 IDirect3D9;
-
-public 
+
-{
-    HRESULT TestCooperativeLevel();
@@ -324 +324 @@
-
-
-public 
+
-{
-    HRESULT GetDevice(LPDIRECT3DDEVICE9* ppDevice);
@@ -338 +338 @@
-alias LPDIRECT3DSTATEBLOCK9 IDirect3DStateBlock9;
-
-public 
+
-{
-    HRESULT Present( RECT* pSourceRect, RECT* pDestRect,HWND hDestWindowOverride, RGNDATA* pDirtyRegion,DWORD dwFlags);
@@ -358 +358 @@
-alias LPDIRECT3DSWAPCHAIN9 IDirect3DSwapChain9;
-
-public 
+
-{
-    HRESULT GetDevice( LPDIRECT3DDEVICE9* ppDevice);
@@ -372 +372 @@
-alias LPDIRECT3DRESOURCE9 IDirect3DResource9;
-
-public 
+
-{
-    HRESULT GetDevice( LPDIRECT3DDEVICE9* ppDevice);
@@ -385 +385 @@
-alias LPDIRECT3DVERTEXDECLARATION9 IDirect3DVertexDeclaration9;
-
-public 
+
-{
-    HRESULT GetDevice( LPDIRECT3DDEVICE9 * ppDevice);
@@ -399 +399 @@
-alias LPDIRECT3DVERTEXSHADER9 IDirect3DVertexShader9;
-
-public 
+
-{
-    HRESULT GetDevice( LPDIRECT3DDEVICE9 * ppDevice);
@@ -413 +413 @@
-alias LPDIRECT3DPIXELSHADER9 IDirect3DPixelShader9;
-
-public 
+
-{
-    DWORD SetLOD(DWORD LODNew);
@@ -425 +425 @@
-alias LPDIRECT3DBASETEXTURE9 IDirect3DBaseTexture9;
-
-public 
+
-{
-    HRESULT GetLevelDesc( UINT Level,D3DSURFACE_DESC *pDesc);
@@ -452 +452 @@
-alias LPDIRECT3DTEXTURE9 IDirect3DTexture9;
-
-public 
+
-{
-    HRESULT GetLevelDesc( UINT Level,D3DVOLUME_DESC *pDesc);
@@ -480 +480 @@
-alias LPDIRECT3DVOLUMETEXTURE9 IDirect3DVolumeTexture9;
-
-public 
+
-{
-    HRESULT GetLevelDesc( UINT Level,D3DSURFACE_DESC *pDesc);
@@ -507 +507 @@
-alias LPDIRECT3DCUBETEXTURE9 IDirect3DCubeTexture9;
-
-public 
+
-{
-    HRESULT Lock( UINT OffsetToLock,UINT SizeToLock,void** ppbData,DWORD Flags);
@@ -528 +528 @@
-alias LPDIRECT3DVERTEXBUFFER9 IDirect3DVertexBuffer9;
-
-public 
+
-{
-    HRESULT Lock( UINT OffsetToLock,UINT SizeToLock,void** ppbData,DWORD Flags);
@@ -549 +549 @@
-alias LPDIRECT3DINDEXBUFFER9 IDirect3DIndexBuffer9;
-
-public 
+
-{
-    HRESULT GetContainer( REFIID riid,void** ppContainer);
@@ -577 +577 @@
-alias LPDIRECT3DSURFACE9 IDirect3DSurface9;
-
-public 
+
-{
-    HRESULT GetDevice( LPDIRECT3DDEVICE9 * ppDevice);
@@ -604 +604 @@
-alias LPDIRECT3DVOLUME9 IDirect3DVolume9;
-
-public 
+
-{
-    HRESULT GetDevice( LPDIRECT3DDEVICE9* ppDevice);
@@ -796 +796 @@
-extern (Windows) HRESULT Direct3DCreate9Ex(UINT SDKVersion, LPDIRECT3D9EX*);
-
-public 
+
-{
-    UINT GetAdapterModeCountEx(UINT Adapter, D3DDISPLAYMODEFILTER* pFilter );
@@ -807 +807 @@
-alias LPDIRECT3D9EX IDirect3D9Ex;
-
-public 
+
-{
-    HRESULT SetConvolutionMonoKernel( UINT width,UINT height,float* rows,float* columns);
@@ -828 +828 @@
-alias LPDIRECT3DDEVICE9EX IDirect3DDevice9Ex;
-
-public 
+
-{
-    HRESULT GetLastPresentCount( UINT* pLastPresentCount);

trunk/win32/docobj.d

@@ -95 +95 @@
-
-
-public 
+
-    HRESULT SetInPlaceSite(LPOLEINPLACESITE);
-    HRESULT GetInPlaceSite(LPOLEINPLACESITE*);
@@ -111 +111 @@
-}
-
-public 
+
-      HRESULT Next(ULONG, IOleDocumentView*, ULONG*);
-      HRESULT Skip(ULONG);
@@ -118 +118 @@
-}
-
-public 
+
-    HRESULT CreateView(LPOLEINPLACESITE, IStream*, DWORD, IOleDocumentView**);
-    HRESULT GetDocMiscStatus(DWORD*);
@@ -124 +124 @@
-}
-
-public 
+
-    HRESULT QueryStatus(CPtr!(GUID), ULONG, OLECMD*, OLECMDTEXT*);
-    HRESULT Exec(CPtr!(GUID), DWORD, DWORD, VARIANTARG*, VARIANTARG*);
-}
-
-public 
+
-    HRESULT ActivateMe(IOleDocumentView*);
-}

trunk/win32/exdisp.d

@@ -24 +24 @@
-}
-
-public 
+
-    HRESULT GoBack();
-    HRESULT GoForward();
@@ -52 +52 @@
-}
-
-public 
+
-    HRESULT Quit();
-    HRESULT ClientToWindow(int*, int*);
@@ -75 +75 @@
-}
-
-public 
+
-    HRESULT Navigate2(VARIANT*, VARIANT*, VARIANT*, VARIANT*, VARIANT*);
-    HRESULT QueryStatusWB(OLECMDID, OLECMDF*);
@@ -97 +97 @@
-}
-
-public 
+
-    void StatusTextChange(BSTR);
-    void ProgressChange(LONG, LONG);

trunk/win32/mshtml.d

@@ -44 +44 @@
-alias IHTMLOptionElementFactory LPHTMLOPTIONELEMENTFACTORY;
-
-public 
+
-    HRESULT put_href(BSTR);
-    HRESULT get_href(BSTR*);
@@ -68 +68 @@
-alias IHTMLLinkElement LPHTMLLINKELEMENT;
-
-public 
+
-    HRESULT put_isMap(VARIANT_BOOL);
-    HRESULT get_isMap(VARIANT_BOOL*);
@@ -120 +120 @@
-alias IHTMLImgElement LPHTMLIMGELEMENT;
-
-public 
+
-    HRESULT toString(BSTR*);
-    HRESULT put_length(LONG);
@@ -130 +130 @@
-alias IHTMLElementCollection LPHTMLELEMENTCOLLECTION;
-
-public 
+
-    HRESULT get_Script(IDispatch*);
-}
-
-public 
+
-    HRESULT get_all(LPHTMLELEMENTCOLLECTION*);
-    HRESULT get_body(LPHTMLELEMENT*);
@@ -245 +245 @@
-}
-
-public 
+
-    HRESULT createRange(IDispatch*);
-    HRESULT empty();
@@ -253 +253 @@
-alias IHTMLSelectionObject LPHTMLSELECTIONOBJECT;
-
-public 
+
-    HRESULT get_htmlText(BSTR*);
-    HRESULT put_text(BSTR);
@@ -286 +286 @@
-}
-
-public 
+
-    HRESULT setAttribute(BSTR,VARIANT,LONG);
-    HRESULT getAttribute(BSTR,LONG,VARIANT*);
@@ -377 +377 @@
-alias IHTMLElement LPHTMLELEMENT;
-
-public 
+
-    HRESULT item(VARIANT*,VARIANT*);
-    HRESULT get_length(LONG*);
-}
-
-public 
+
-    HRESULT get_frames(IHTMLFramesCollection2*);
-    HRESULT put_defaultStatus(BSTR);
@@ -454 +454 @@
-alias IHTMLWindow2 LPHTMLWINDOW2;
-
-public 
+
-    HRESULT put_src(BSTR);
-    HRESULT get_src(BSTR*);
@@ -475 +475 @@
-}
-
-public 
+
-    HRESULT get_contentWindow(IHTMLWindow2 *);
-    HRESULT put_onload(VARIANT);
@@ -486 +486 @@
-}
-
-public 
+
-    HRESULT put_longDesc(BSTR);
-    HRESULT get_longDesc(BSTR*);
-}
-
-public 
+
-    HRESULT put_background(BSTR);
-    HRESULT get_background(BSTR*);
@@ -529 +529 @@
-}
-
-public 
+
-    HRESULT put_onbeforeprint(VARIANT);
-    HRESULT get_onbeforeprint(VARIANT*);

trunk/win32/oaidl.d

@@ -535 +535 @@
-alias BINDPTR* LPBINDPTR;
-
-public 
+
-    HRESULT GetTypeInfoCount(UINT*);
-    HRESULT GetTypeInfo(UINT, LCID, LPTYPEINFO*);
@@ -543 +543 @@
-alias IDispatch LPDISPATCH;
-
-public 
+
-    HRESULT Next(ULONG, VARIANT*, ULONG*);
-    HRESULT Skip(ULONG);
@@ -551 +551 @@
-alias IEnumVARIANT LPENUMVARIANT;
-
-public 
+
-    HRESULT Bind(LPOLESTR, ULONG, WORD, LPTYPEINFO*, DESCKIND*, LPBINDPTR);
-    HRESULT BindType(LPOLESTR, ULONG, LPTYPEINFO*, LPTYPECOMP*);
@@ -557 +557 @@
-alias ITypeComp LPTYPECOMP;
-
-public 
+
-    HRESULT GetTypeAttr(LPTYPEATTR*);
-    HRESULT GetTypeComp(LPTYPECOMP*);
@@ -581 +581 @@
-alias ITypeInfo LPTYPEINFO;
-
-public 
+
-    HRESULT GetTypeKind(TYPEKIND*);
-    HRESULT GetTypeFlags(ULONG*);
@@ -600 +600 @@
-alias ITypeInfo2 LPTYPEINFO2;
-
-public 
+
-    UINT GetTypeInfoCount();
-    HRESULT GetTypeInfo(UINT, ITypeInfo**);
@@ -614 +614 @@
-alias ITypeLib LPTYPELIB;
-
-public 
+
-    HRESULT GetCustData(REFGUID, VARIANT*);
-    HRESULT GetLibStatistics(ULONG*, ULONG*);
@@ -622 +622 @@
-alias ITypeLib2 LPTYPELIB2;
-
-public 
+
-    HRESULT GetGUID(GUID*);
-    HRESULT GetSource(BSTR*);
@@ -631 +631 @@
-alias IErrorInfo LPERRORINFO;
-
-public 
+
-    HRESULT SetGUID(REFGUID);
-    HRESULT SetSource(LPOLESTR);
@@ -640 +640 @@
-alias ICreateErrorInfo* LPCREATEERRORINFO;
-
-public 
+
-    HRESULT InterfaceSupportsErrorInfo(REFIID);
-}
-alias ISupportErrorInfo LPSUPPORTERRORINFO;
-
-public 
+
-    HRESULT RecordInit(PVOID);
-    HRESULT RecordClear(PVOID);
@@ -665 +665 @@
-alias IRecordInfo LPRECORDINFO;
-
-public 
+
-    HRESULT Size(PVOID, DWORD, PVOID, ULONG*);
-    HRESULT Marshal(PVOID, DWORD, PVOID, ULONG, BYTE*, ULONG*);

trunk/win32/objidl.d

@@ -508 +508 @@
-}
-
-public 
+
-      HRESULT Next(ULONG, FORMATETC*, ULONG*);
-      HRESULT Skip(ULONG);
@@ -515 +515 @@
-}
-
-public 
+
-      HRESULT Next(ULONG, HLITEM*, ULONG*);
-      HRESULT Skip(ULONG);
@@ -522 +522 @@
-}
-
-public 
+
-      HRESULT Next(ULONG, STATDATA*, ULONG*);
-      HRESULT Skip(ULONG);
@@ -529 +529 @@
-}
-
-public 
+
-      HRESULT Next(ULONG, STATPROPSETSTG*, ULONG*);
-      HRESULT Skip(ULONG);
@@ -536 +536 @@
-}
-
-public 
+
-      HRESULT Next(ULONG, STATPROPSTG*, ULONG*);
-      HRESULT Skip(ULONG);
@@ -543 +543 @@
-}
-
-public 
+
-      HRESULT Next(ULONG, STATSTG*, ULONG*);
-      HRESULT Skip(ULONG);
@@ -550 +550 @@
-}
-
-public 
+
-      HRESULT Next(ULONG, LPOLESTR*, ULONG*);
-      HRESULT Skip(ULONG);
@@ -557 +557 @@
-}
-
-public 
+
-      HRESULT Next(ULONG, IMoniker*, ULONG*);
-      HRESULT Skip(ULONG);
@@ -565 +565 @@
-
-
-public 
+
-      HRESULT Next(ULONG, IUnknown*, ULONG*);
-      HRESULT Skip(ULONG);
@@ -572 +572 @@
-}
-
-public 
+
-    HRESULT Read(void*, ULONG, ULONG*);
-    HRESULT Write(void* , ULONG, ULONG*);
-}
-
-public 
+
-    HRESULT Seek(LARGE_INTEGER, DWORD, ULARGE_INTEGER*);
-    HRESULT SetSize(ULARGE_INTEGER);
@@ -589 +589 @@
-}
-
-public 
+
-    HRESULT GetUnmarshalClass(REFIID, PVOID, DWORD, PVOID, DWORD, CLSID*);
-    HRESULT GetMarshalSizeMax(REFIID, PVOID, DWORD, PVOID, PDWORD, ULONG*);
@@ -598 +598 @@
-}
-
-public 
+
-    HRESULT GetClassForHandler(DWORD, PVOID, CLSID*);
-}
-
-public 
+
-    void* Alloc(ULONG);
-    void* Realloc(void*, ULONG);
@@ -611 +611 @@
-}
-
-public 
+
-    ULONG PreAlloc(ULONG);
-    void* PostAlloc(void*);
@@ -626 +626 @@
-}
-
-public 
+
-    DWORD HandleInComingCall(DWORD, HTASK, DWORD, LPINTERFACEINFO);
-    DWORD RetryRejectedCall(HTASK, DWORD, DWORD);
@@ -633 +633 @@
-
-
-public 
+
-    HRESULT GetClassID(CLSID*);
-}
-
-public 
+
-    HRESULT IsDirty();
-    HRESULT Load(IStream*);
@@ -644 +644 @@
-}
-
-public 
+
-    HRESULT Register(DWORD, LPUNKNOWN, LPMONIKER, PDWORD);
-    HRESULT Revoke(DWORD);
@@ -654 +654 @@
-}
-
-public 
+
-    HRESULT RegisterObjectBound(LPUNKNOWN);
-    HRESULT RevokeObjectBound(LPUNKNOWN);
@@ -667 +667 @@
-}
-
-public 
+
-    HRESULT BindToObject(IBindCtx*, IMoniker*, REFIID, PVOID*);
-    HRESULT BindToStorage(IBindCtx*, IMoniker*, REFIID, PVOID*);
@@ -685 +685 @@
-}
-
-public 
+
-{
-    HRESULT IsDirty();
@@ -695 +695 @@
-}
-
-public 
+
-{
-    HRESULT IsDirty();
@@ -704 +704 @@
-}
-
-public 
+
-    HRESULT QueryInterface(REFIID, PVOID*);
-    ULONG AddRef();
@@ -715 +715 @@
-}
-
-public 
+
-{
-    void OnLinkSrcChange(IMoniker*);
-}
-
-public 
+
-    HRESULT GetData(FORMATETC*, STGMEDIUM*);
-    HRESULT GetDataHere(FORMATETC*, STGMEDIUM*);
@@ -732 +732 @@
-}
-
-public 
+
-    HRESULT Advise(IDataObject*, FORMATETC*, DWORD, IAdviseSink*, PDWORD);
-    HRESULT Unadvise(DWORD);
@@ -739 +739 @@
-}
-
-public 
+
-    HRESULT CreateStream(LPCWSTR, DWORD, DWORD, DWORD, IStream*);
-    HRESULT OpenStream(LPCWSTR, PVOID, DWORD, DWORD, IStream*);
@@ -758 +758 @@
-
-// FIXME: GetClassID from IPersist not there - what to do about it?
-public 
+
-    HRESULT QueryInterface(REFIID, PVOID*);
-    ULONG AddRef();
@@ -765 +765 @@
-}
-
-public 
+
-    HRESULT GetBuffer(RPCOLEMESSAGE*, REFIID);
-    HRESULT SendReceive(RPCOLEMESSAGE*, PULONG);
@@ -773 +773 @@
-}
-
-public 
+
-    HRESULT Connect(IRpcChannelBuffer*);
-    void Disconnect();
-}
-
-public 
+
-    HRESULT Connect(LPUNKNOWN);
-    void Disconnect();
@@ -788 +788 @@
-}
-
-public 
+
-    HRESULT CreateProxy(LPUNKNOWN, REFIID, LPRPCPROXYBUFFER*, PVOID*);
-    HRESULT CreateStub(REFIID, LPUNKNOWN, LPRPCSTUBBUFFER*);
@@ -794 +794 @@
-alias IPSFactoryBuffer* LPPSFACTORYBUFFER;
-
-public 
+
-    HRESULT ReadAt(ULARGE_INTEGER, PVOID, ULONG, ULONG*);
-    HRESULT WriteAt(ULARGE_INTEGER, PCVOID, ULONG, ULONG*);
@@ -804 +804 @@
-}
-
-public 
+
-    HRESULT AddConnection(DWORD, DWORD);
-    HRESULT ReleaseConnection(DWORD, DWORD, BOOL);
-}
-
-public 
+
-    HRESULT GetRunningClass(LPCLSID);
-    HRESULT Run(LPBC);
@@ -817 +817 @@
-}
-
-public 
+
-    HRESULT GetComparisonData(PVOID, ULONG, PULONG);
-}
-
-public 
+
-    void ClientGetSize(REFGUID, REFIID, PULONG);
-    void ClientFillBuffer(REFGUID, REFIID, PULONG, PVOID);
@@ -830 +830 @@
-}
-
-public 
+
-    HRESULT ReadMultiple(ULONG, PROPSPEC* , PROPVARIANT*);
-    HRESULT WriteMultiple(ULONG, PROPSPEC* , PROPVARIANT*, PROPID);
@@ -845 +845 @@
-}
-
-public 
+
-    HRESULT Create(REFFMTID, CLSID*, DWORD, DWORD, LPPROPERTYSTORAGE*);
-    HRESULT Open(REFFMTID, DWORD, LPPROPERTYSTORAGE*);
@@ -852 +852 @@
-}
-
-public 
+
-    HRESULT QueryBlanket(PVOID, PDWORD, PDWORD, OLECHAR**, PDWORD, PDWORD, RPC_AUTH_IDENTITY_HANDLE**, PDWORD*);
-    HRESULT SetBlanket(PVOID, DWORD, DWORD, LPWSTR, DWORD, DWORD, RPC_AUTH_IDENTITY_HANDLE*, DWORD);
@@ -858 +858 @@
-}
-
-public 
+
-    HRESULT QueryBlanket(PDWORD, PDWORD, OLECHAR**, PDWORD, PDWORD, RPC_AUTHZ_HANDLE*, PDWORD*);
-    HRESULT ImpersonateClient();
@@ -865 +865 @@
-}
-
-public 
+
-    HRESULT GetClassObject(REFCLSID, DWORD, LCID, REFIID, PVOID*);
-}
-
-public 
+
-    HRESULT FillAppend(void* , ULONG, PULONG);
-    HRESULT FillAt(ULARGE_INTEGER, void* , ULONG, PULONG);
@@ -876 +876 @@
-}
-
-public 
+
-    HRESULT OnProgress(DWORD, DWORD, BOOL, BOOL);
-}
-
-public 
+
-    HRESULT LayoutScript(STORAGELAYOUT*, DWORD, DWORD);
-    HRESULT BeginMonitor();
@@ -887 +887 @@
-}
-
-public 
+
-    HRESULT RegisterInterfaceInGlobal(IUnknown*, REFIID, DWORD*);
-    HRESULT RevokeInterfaceFromGlobal(DWORD);

trunk/win32/ocidl.d

@@ -17 +17 @@
-private import win32.winuser; // for LPMSG
-
-public 
+
-
-interface IServiceProvider : IUnknown{
@@ -29 +29 @@
-
-// win32.urlmon should contain:
-public 
+
-{
-    HRESULT CreateMoniker(LPOLESTR szName, IBindCtx* pBC, IMoniker** ppmk, DWORD);
@@ -175 +175 @@
-alias PROPPAGEINFO* LPPROPPAGEINFO;
-
-public 
+
-    HRESULT GetControlInfo(LPCONTROLINFO);
-    HRESULT OnMnemonic(LPMSG);
@@ -182 +182 @@
-}
-
-public 
+
-    HRESULT OnControlInfoChanged();
-    HRESULT LockInPlaceActive(BOOL);
@@ -192 +192 @@
-}
-
-public 
+
-    HRESULT PreMessageFilter(HWND, UINT, WPARAM, LPARAM, LRESULT*, PDWORD);
-    HRESULT PostMessageFilter(HWND, UINT, WPARAM, LPARAM, LRESULT*, DWORD);
-}
-
-public 
+
-    HRESULT AddError(LPCOLESTR, LPEXCEPINFO);
-}
-alias IErrorLog LPERRORLOG;
-
-public 
+
-    HRESULT Read(LPCOLESTR, LPVARIANT, LPERRORLOG);
-    HRESULT Write(LPCOLESTR, LPVARIANT);
@@ -208 +208 @@
-alias IPropertyBag LPPROPERTYBAG;
-
-public 
+
-    HRESULT Read(ULONG, PROPBAG2*, LPERRORLOG, VARIANT*, HRESULT*);
-    HRESULT Write(ULONG, PROPBAG2*, VARIANT*);
@@ -217 +217 @@
-alias IPropertyBag2 LPPROPERTYBAG2;
-
-public 
+
-    HRESULT InitNew();
-    HRESULT Load(LPPROPERTYBAG, LPERRORLOG);
@@ -223 +223 @@
-}
-
-public 
+
-    HRESULT InitNew();
-    HRESULT Load(LPPROPERTYBAG2, LPERRORLOG);
@@ -230 +230 @@
-}
-
-public 
+
-    HRESULT IsDirty();
-    HRESULT Load(LPSTREAM);
@@ -238 +238 @@
-}
-
-public 
+
-    HRESULT IsDirty();
-    HRESULT Load(PVOID, ULONG);
@@ -246 +246 @@
-}
-
-public 
+
-    HRESULT OnChanged(DISPID);
-    HRESULT OnRequestEdit(DISPID);
-}
-
-public 
+
-    HRESULT GetClassInfo(LPTYPEINFO*);
-}
-
-public 
+
-    HRESULT GetGUID(DWORD, GUID*);
-}
-
-public 
+
-    HRESULT EnumConnectionPoints(LPENUMCONNECTIONPOINTS*);
-    HRESULT FindConnectionPoint(REFIID, LPCONNECTIONPOINT*);
-}
-
-public 
+
-    HRESULT Next(ULONG, LPCONNECTIONPOINT*, ULONG*);
-    HRESULT Skip(ULONG);
@@ -272 +272 @@
-alias IEnumConnectionPoints LPENUMCONNECTIONPOINTS;
-
-public 
+
-    HRESULT GetConnectionInterface(IID*);
-    HRESULT GetConnectionPointContainer(IConnectionPointContainer**);
@@ -281 +281 @@
-alias IConnectionPoint LPCONNECTIONPOINT;
-
-public 
+
-    HRESULT Next(ULONG, LPCONNECTDATA, PULONG);
-    HRESULT Skip(ULONG);
@@ -289 +289 @@
-alias IEnumConnections LPENUMCONNECTIONS;
-
-public 
+
-    HRESULT GetLicInfo(LPLICINFO);
-    HRESULT RequestLicKey(DWORD, BSTR*);
@@ -295 +295 @@
-}
-
-public 
+
-    HRESULT GetPages(CAUUID*);
-}
-
-public 
+
-    HRESULT GetDisplayString(DISPID, BSTR*);
-    HRESULT MapPropertyToPage(DISPID, LPCLSID);
@@ -306 +306 @@
-}
-
-public 
+
-    HRESULT OnStatusChange(DWORD);
-    HRESULT GetLocaleID(LCID*);
@@ -314 +314 @@
-alias IPropertyPageSite LPPROPERTYPAGESITE;
-
-public 
+
-    HRESULT SetPageSite(LPPROPERTYPAGESITE);
-    HRESULT Activate(HWND, LPCRECT, BOOL);
@@ -329 +329 @@
-
-
-public 
+
-{ HRESULT EditProperty(DISPID);
-}
-
-public 
+
-    HRESULT get_Name(BSTR*);
-    HRESULT put_Name(BSTR);
@@ -361 +361 @@
-alias IFont LPFONT;
-
-public 
+
-}
-alias IFontDisp LPFONTDISP;
-
-public 
+
-    HRESULT get_Handle(OLE_HANDLE*);
-    HRESULT get_hPal(OLE_HANDLE*);
@@ -383 +383 @@
-}
-
-public 
-
-
-public 
+
+
+
+
-    HRESULT OnInPlaceActivateEx(BOOL*, DWORD);
-    HRESULT OnInPlaceDeactivateEx(BOOL);
@@ -392 +392 @@
-}
-
-public 
+
-    HRESULT SetSite(IUnknown*);
-    HRESULT GetSite(REFIID, void**);
-}
-
-public 
+
-    HRESULT CanWindowlessActivate();
-    HRESULT GetCapture();
@@ -412 +412 @@
-}
-
-public 
+
-    void OnDataChange(FORMATETC*, STGMEDIUM*);
-    void OnViewChange(DWORD, LONG);
@@ -421 +421 @@
-}
-
-public 
+
-    HRESULT GetActivationPolicy(DWORD*);
-    HRESULT OnInactiveMouseMove(LPCRECT, LONG, LONG, DWORD);
@@ -427 +427 @@
-}
-
-public 
+
-    HRESULT Do(LPOLEUNDOMANAGER);
-    HRESULT GetDescription(BSTR*);
@@ -434 +434 @@
-}
-
-public 
+
-    HRESULT Open(IOleParentUndoUnit*);
-    HRESULT Close(IOleParentUndoUnit*, BOOL);
@@ -442 +442 @@
-}
-
-public 
+
-    HRESULT Next(ULONG, IOleUndoUnit**, ULONG*);
-    HRESULT Skip(ULONG);
@@ -449 +449 @@
-}
-
-public 
+
-    HRESULT Open(IOleParentUndoUnit*);
-    HRESULT Close(IOleParentUndoUnit*, BOOL);
@@ -465 +465 @@
-alias IOleUndoManager LPOLEUNDOMANAGER;
-
-public 
+
-    HRESULT QuickActivate(QACONTAINER*, QACONTROL*);
-    HRESULT SetContentExtent(LPSIZEL);

trunk/win32/oleacc.d

@@ -157 +157 @@
-
-
-public 
+
-    HRESULT get_accParent(IDispatch**);
-    HRESULT get_accChildCount(int*);

trunk/win32/oledlg.d

@@ -471 +471 @@
-alias OLEUIPASTESPECIALA* POLEUIPASTESPECIALA, LPOLEUIPASTESPECIALA;
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID, PVOID*);
@@ -487 +487 @@
-alias IOleUILinkContainerW* LPOLEUILINKCONTAINERW;
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID, PVOID*);
@@ -689 +689 @@
-alias OLEUICHANGESOURCEA* POLEUICHANGESOURCEA, LPOLEUICHANGESOURCEA;
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID, PVOID*);
@@ -702 +702 @@
-alias IOleUIObjInfoW *LPOLEUIOBJINFOW;
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID, PVOID*);
@@ -715 +715 @@
-alias IOleUIObjInfoA *LPOLEUIOBJINFOA;
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID, PVOID*);
@@ -732 +732 @@
-alias IOleUILinkInfoW *LPOLEUILINKINFOW;
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID, PVOID*);

trunk/win32/oleidl.d

@@ -88 +88 @@
-alias OLEINPLACEFRAMEINFO* LPOLEINPLACEFRAMEINFO;
-
-public 
+
-{
-      HRESULT Next(ULONG,OLEVERB*,ULONG*);
@@ -99 +99 @@
-
-
-public 
+
-    HRESULT ParseDisplayName(IBindCtx*,LPOLESTR,ULONG*,IMoniker**);
-}
-alias IParseDisplayName LPPARSEDISPLAYNAME;
-
-public 
+
-    HRESULT EnumObjects(DWORD,IEnumUnknown**);
-    HRESULT LockContainer(BOOL);
@@ -110 +110 @@
-alias IOleContainer LPOLECONTAINER;
-
-public 
+
-    HRESULT GetObject(LPOLESTR,DWORD,IBindCtx*,REFIID,void**);
-    HRESULT GetObjectStorage(LPOLESTR,IBindCtx*,REFIID,void**);
@@ -117 +117 @@
-
-
-public 
+
-    HRESULT SaveObject();
-    HRESULT GetMoniker(DWORD,DWORD,LPMONIKER*);
@@ -127 +127 @@
-alias IOleClientSite LPOLECLIENTSITE;
-
-public 
+
-    HRESULT SetClientSite(LPOLECLIENTSITE);
-    HRESULT GetClientSite(LPOLECLIENTSITE*);
@@ -152 +152 @@
-alias IOleObject LPOLEOBJECT;
-
-public 
+
-    HRESULT GetWindow(HWND*);
-    HRESULT ContextSensitiveHelp(BOOL);
@@ -158 +158 @@
-alias IOleWindow LPOLEWINDOW;
-
-public 
+
-    HRESULT GetBorder(LPRECT);
-    HRESULT RequestBorderSpace(LPCBORDERWIDTHS);
@@ -166 +166 @@
-alias IOleInPlaceUIWindow LPOLEINPLACEUIWINDOW;
-
-public 
+
-    HRESULT InPlaceDeactivate();
-    HRESULT UIDeactivate();
@@ -174 +174 @@
-
-
-public 
+
-    HRESULT TranslateAccelerator(LPMSG);
-    HRESULT OnFrameWindowActivate(BOOL);
@@ -183 +183 @@
-alias IOleInPlaceActiveObject LPOLEINPLACEACTIVEOBJECT;
-
-public 
+
-    HRESULT InsertMenus(HMENU,LPOLEMENUGROUPWIDTHS);
-    HRESULT SetMenu(HMENU,HOLEMENU,HWND);
@@ -193 +193 @@
-alias IOleInPlaceFrame LPOLEINPLACEFRAME;
-
-public 
+
-    HRESULT CanInPlaceActivate();
-    HRESULT OnInPlaceActivate();
@@ -206 +206 @@
-}
-
-public 
+
-    HRESULT Advise(LPADVISESINK,PDWORD);
-    HRESULT Unadvise(DWORD);
@@ -216 +216 @@
-alias IOleAdviseHolder LPOLEADVISEHOLDER;
-
-public 
+
-    HRESULT QueryContinueDrag(BOOL,DWORD);
-    HRESULT GiveFeedback(DWORD);
@@ -222 +222 @@
-alias IDropSource LPDROPSOURCE;
-
-public 
+
-    HRESULT DragEnter(LPDATAOBJECT,DWORD,POINTL,PDWORD);
-    HRESULT DragOver(DWORD,POINTL,PDWORD);
@@ -234 +234 @@
-}
-
-public 
+
-    HRESULT Draw(DWORD,LONG,PVOID,DVTARGETDEVICE*,HDC,HDC,LPCRECTL,LPCRECTL,__IView_pfncont pfnContinue,DWORD);
-    HRESULT GetColorSet(DWORD,LONG,PVOID,DVTARGETDEVICE*,HDC,LPLOGPALETTE*);
@@ -244 +244 @@
-alias IViewObject LPVIEWOBJECT;
-
-public 
+
-    HRESULT GetExtent(DWORD,LONG,DVTARGETDEVICE*,LPSIZEL);
-}
-alias IViewObject2 LPVIEWOBJECT2;
-
-public 
+
-    HRESULT Cache(FORMATETC*,DWORD,DWORD*);
-    HRESULT Uncache(DWORD);
@@ -258 +258 @@
-alias IOleCache LPOLECACHE;
-
-public 
+
-    HRESULT UpdateCache(LPDATAOBJECT,DWORD,LPVOID);
-    HRESULT DiscardCache(DWORD);
@@ -264 +264 @@
-alias IOleCache2 LPOLECACHE2;
-
-public 
+
-    HRESULT OnRun(LPDATAOBJECT);
-    HRESULT OnStop();

trunk/win32/richole.d

@@ -67 +67 @@
-}
-
-public 
+
-    HRESULT GetClientSite(LPOLECLIENTSITE*);
-    LONG GetObjectCount();
@@ -87 +87 @@
-alias IRichEditOle* LPRICHEDITOLE;
-
-public 
+
-    HRESULT GetNewStorage(LPSTORAGE*);
-    HRESULT GetInPlaceContext(LPOLEINPLACEFRAME*, LPOLEINPLACEUIWINDOW*, LPOLEINPLACEFRAMEINFO);

trunk/win32/servprov.d

@@ -12 +12 @@
-private import win32.basetyps, win32.unknwn, win32.windef, win32.wtypes;
-
-public 
+
-    HRESULT QueryService(REFGUID, REFIID, void**);
-}

trunk/win32/shldisp.d

@@ -15 +15 @@
-const DWORD ACO_AUTOSUGGEST = 0x01;
-
-public 
+
-    HRESULT Init(HWND, IUnknown*, LPCOLESTR, LPCOLESTR);
-    HRESULT Enable(BOOL);
@@ -21 +21 @@
-alias IAutoComplete* LPAUTOCOMPLETE;
-
-public 
+
-    HRESULT SetOptions(DWORD);
-    HRESULT GetOptions(DWORD*);

trunk/win32/shlobj.d

@@ -651 +651 @@
-}
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -663 +663 @@
-alias IEnumIDList *LPENUMIDLIST;
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -672 +672 @@
-}
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -683 +683 @@
-alias IContextMenu* LPCONTEXTMENU;
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -747 +747 @@
-    }
-
-public 
+
-     {
-        HRESULT QueryInterface(REFIID,PVOID*);
@@ -758 +758 @@
-}/* _WIN32_IE >= 0x0500 */
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -767 +767 @@
-}
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -776 +776 @@
-alias IShellExtInit *LPSHELLEXTINIT;
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -786 +786 @@
-alias IShellPropSheetExt *LPSHELLPROPSHEETEXT;
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -796 +796 @@
-alias IExtractIconA *LPEXTRACTICONA;
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -814 +814 @@
-}
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -839 +839 @@
-}
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -865 +865 @@
-
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -885 +885 @@
-static if (_WIN32_IE >= 0x0500) {
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -897 +897 @@
-alias IEnumExtraSearch *LPENUMEXTRASEARCH;
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -924 +924 @@
-} /* _WIN32_IE >= 0x0500 */
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -933 +933 @@
-alias ICopyHook *LPCOPYHOOK;
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -943 +943 @@
-alias IFileViewerSite *LPFILEVIEWERSITE;
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -954 +954 @@
-alias IFileViewer *LPFILEVIEWER;
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -963 +963 @@
-}
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -975 +975 @@
-static if (_WIN32_IE >= 0x0400 || _WIN32_WINNT >= 0x0500) {
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -990 +990 @@
-static if (_WIN32_IE >= 0x0500) {
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -1008 +1008 @@
-alias IShellView* LPSHELLVIEW;
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -1030 +1030 @@
-}
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -1054 +1054 @@
-}
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -1078 +1078 @@
-alias SV2CVW2_PARAMS* LPSV2CVW2_PARAMS;
-
-public 
+
-{
-
@@ -1105 +1105 @@
-}
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -1113 +1113 @@
-}
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -1121 +1121 @@
-}
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -1166 +1166 @@
-const SSF_NOCONFIRMRECYCLE = 0x8000;
-
-public 
+
-{
-    HRESULT QueryInterface(REFIID,PVOID*);
@@ -1226 +1226 @@
-    align:
-
-public 
+
-     {
-        HRESULT QueryInterface(REFIID riid, void **ppv);
@@ -1235 +1235 @@
-    }
-
-public 
+
-     {
-        HRESULT QueryInterface(REFIID riid, void** ppv);