Headers diff for oledlg.dll between 1.0-Windows 5.0 and 6.0.6001.18000-Windows 6.0 versions



 oledlg.h (1.0-Windows 5.0)   oledlg.h (6.0.6001.18000-Windows 6.0) 
skipping to change at line 661 skipping to change at line 661
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE; STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE; STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE;
// *** IOleUILinkContainer *** // // *** IOleUILinkContainer *** //
STDMETHOD_(DWORD,GetNextLink) (THIS_ DWORD dwLink) PURE; STDMETHOD_(DWORD,GetNextLink) (THIS_ DWORD dwLink) PURE;
STDMETHOD(SetLinkUpdateOptions) (THIS_ DWORD dwLink, STDMETHOD(SetLinkUpdateOptions) (THIS_ DWORD dwLink,
DWORD dwUpdateOpt) PURE; DWORD dwUpdateOpt) PURE;
STDMETHOD(GetLinkUpdateOptions) (THIS_ DWORD dwLink, STDMETHOD(GetLinkUpdateOptions) (THIS_ DWORD dwLink,
DWORD FAR* lpdwUpdateOpt) PURE; DWORD FAR* lpdwUpdateOpt) PURE;
STDMETHOD(SetLinkSource) (THIS_ DWORD dwLink, LPWSTR lpszDisplayName, STDMETHOD(SetLinkSource) (THIS_ DWORD dwLink, __in LPWSTR lpszDisplayNam e,
ULONG lenFileName, ULONG FAR* pchEaten, BOOL fValidateSource) PU RE; ULONG lenFileName, ULONG FAR* pchEaten, BOOL fValidateSource) PU RE;
STDMETHOD(GetLinkSource) (THIS_ DWORD dwLink, STDMETHOD(GetLinkSource) (THIS_ DWORD dwLink,
LPWSTR FAR* lplpszDisplayName, ULONG FAR* lplenFileName, __deref_opt_out_opt LPWSTR FAR* lplpszDisplayName, ULONG FAR* lp
LPWSTR FAR* lplpszFullLinkType, LPWSTR FAR* lplpszShortLinkType, lenFileName,
__deref_opt_out_opt LPWSTR FAR* lplpszFullLinkType, __deref_opt_
out_opt LPWSTR FAR* lplpszShortLinkType,
BOOL FAR* lpfSourceAvailable, BOOL FAR* lpfIsSelected) PURE; BOOL FAR* lpfSourceAvailable, BOOL FAR* lpfIsSelected) PURE;
STDMETHOD(OpenLinkSource) (THIS_ DWORD dwLink) PURE; STDMETHOD(OpenLinkSource) (THIS_ DWORD dwLink) PURE;
STDMETHOD(UpdateLink) (THIS_ DWORD dwLink, STDMETHOD(UpdateLink) (THIS_ DWORD dwLink,
BOOL fErrorMessage, BOOL fReserved) PURE; BOOL fErrorMessage, BOOL fReserved) PURE;
STDMETHOD(CancelLink) (THIS_ DWORD dwLink) PURE; STDMETHOD(CancelLink) (THIS_ DWORD dwLink) PURE;
}; };
typedef IOleUILinkContainerW FAR* LPOLEUILINKCONTAINERW; typedef IOleUILinkContainerW FAR* LPOLEUILINKCONTAINERW;
#undef INTERFACE #undef INTERFACE
skipping to change at line 691 skipping to change at line 691
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE; STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE; STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE;
// *** IOleUILinkContainer *** // // *** IOleUILinkContainer *** //
STDMETHOD_(DWORD,GetNextLink) (THIS_ DWORD dwLink) PURE; STDMETHOD_(DWORD,GetNextLink) (THIS_ DWORD dwLink) PURE;
STDMETHOD(SetLinkUpdateOptions) (THIS_ DWORD dwLink, STDMETHOD(SetLinkUpdateOptions) (THIS_ DWORD dwLink,
DWORD dwUpdateOpt) PURE; DWORD dwUpdateOpt) PURE;
STDMETHOD(GetLinkUpdateOptions) (THIS_ DWORD dwLink, STDMETHOD(GetLinkUpdateOptions) (THIS_ DWORD dwLink,
DWORD FAR* lpdwUpdateOpt) PURE; DWORD FAR* lpdwUpdateOpt) PURE;
STDMETHOD(SetLinkSource) (THIS_ DWORD dwLink, LPSTR lpszDisplayName, STDMETHOD(SetLinkSource) (THIS_ DWORD dwLink, __in LPSTR lpszDisplayName ,
ULONG lenFileName, ULONG FAR* pchEaten, BOOL fValidateSource) PU RE; ULONG lenFileName, ULONG FAR* pchEaten, BOOL fValidateSource) PU RE;
STDMETHOD(GetLinkSource) (THIS_ DWORD dwLink, STDMETHOD(GetLinkSource) (THIS_ DWORD dwLink,
LPSTR FAR* lplpszDisplayName, ULONG FAR* lplenFileName, __deref_opt_out_opt LPSTR FAR* lplpszDisplayName, ULONG FAR* lpl
LPSTR FAR* lplpszFullLinkType, LPSTR FAR* lplpszShortLinkType, enFileName,
__deref_opt_out_opt LPSTR FAR* lplpszFullLinkType, __deref_opt_o
ut_opt LPSTR FAR* lplpszShortLinkType,
BOOL FAR* lpfSourceAvailable, BOOL FAR* lpfIsSelected) PURE; BOOL FAR* lpfSourceAvailable, BOOL FAR* lpfIsSelected) PURE;
STDMETHOD(OpenLinkSource) (THIS_ DWORD dwLink) PURE; STDMETHOD(OpenLinkSource) (THIS_ DWORD dwLink) PURE;
STDMETHOD(UpdateLink) (THIS_ DWORD dwLink, STDMETHOD(UpdateLink) (THIS_ DWORD dwLink,
BOOL fErrorMessage, BOOL fReserved) PURE; BOOL fErrorMessage, BOOL fReserved) PURE;
STDMETHOD(CancelLink) (THIS_ DWORD dwLink) PURE; STDMETHOD(CancelLink) (THIS_ DWORD dwLink) PURE;
}; };
typedef IOleUILinkContainerA FAR* LPOLEUILINKCONTAINERA; typedef IOleUILinkContainerA FAR* LPOLEUILINKCONTAINERA;
#ifdef UNICODE #ifdef UNICODE
skipping to change at line 1168 skipping to change at line 1168
DECLARE_INTERFACE_(IOleUIObjInfoW, IUnknown) DECLARE_INTERFACE_(IOleUIObjInfoW, IUnknown)
{ {
// *** IUnknown methods *** // // *** IUnknown methods *** //
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE; STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE; STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE;
// *** extra for General Properties *** // // *** extra for General Properties *** //
STDMETHOD(GetObjectInfo) (THIS_ DWORD dwObject, STDMETHOD(GetObjectInfo) (THIS_ DWORD dwObject,
DWORD FAR* lpdwObjSize, LPWSTR FAR* lplpszLabel, DWORD FAR* lpdwObjSize, __deref_opt_out_opt LPWSTR FAR* lplpszLa
LPWSTR FAR* lplpszType, LPWSTR FAR* lplpszShortType, bel,
LPWSTR FAR* lplpszLocation) PURE; __deref_opt_out_opt LPWSTR FAR* lplpszType, __deref_opt_out_opt
LPWSTR FAR* lplpszShortType,
__deref_opt_out_opt LPWSTR FAR* lplpszLocation) PURE;
STDMETHOD(GetConvertInfo) (THIS_ DWORD dwObject, STDMETHOD(GetConvertInfo) (THIS_ DWORD dwObject,
CLSID FAR* lpClassID, WORD FAR* lpwFormat, CLSID FAR* lpClassID, WORD FAR* lpwFormat,
CLSID FAR* lpConvertDefaultClassID, CLSID FAR* lpConvertDefaultClassID,
LPCLSID FAR* lplpClsidExclude, UINT FAR* lpcClsidExclude) PURE; LPCLSID FAR* lplpClsidExclude, UINT FAR* lpcClsidExclude) PURE;
STDMETHOD(ConvertObject) (THIS_ DWORD dwObject, REFCLSID clsidNew) PURE; STDMETHOD(ConvertObject) (THIS_ DWORD dwObject, REFCLSID clsidNew) PURE;
// *** extra for View Properties *** // // *** extra for View Properties *** //
STDMETHOD(GetViewInfo) (THIS_ DWORD dwObject, STDMETHOD(GetViewInfo) (THIS_ DWORD dwObject,
HGLOBAL FAR* phMetaPict, DWORD* pdvAspect, int* pnCurrentScale) PURE; HGLOBAL FAR* phMetaPict, DWORD* pdvAspect, int* pnCurrentScale) PURE;
STDMETHOD(SetViewInfo) (THIS_ DWORD dwObject, STDMETHOD(SetViewInfo) (THIS_ DWORD dwObject,
skipping to change at line 1199 skipping to change at line 1199
DECLARE_INTERFACE_(IOleUIObjInfoA, IUnknown) DECLARE_INTERFACE_(IOleUIObjInfoA, IUnknown)
{ {
// *** IUnknown methods *** // // *** IUnknown methods *** //
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE; STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE; STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE;
// *** extra for General Properties *** // // *** extra for General Properties *** //
STDMETHOD(GetObjectInfo) (THIS_ DWORD dwObject, STDMETHOD(GetObjectInfo) (THIS_ DWORD dwObject,
DWORD FAR* lpdwObjSize, LPSTR FAR* lplpszLabel, DWORD FAR* lpdwObjSize, __deref_opt_out_opt LPSTR FAR* lplpszLab
LPSTR FAR* lplpszType, LPSTR FAR* lplpszShortType, el,
LPSTR FAR* lplpszLocation) PURE; __deref_opt_out_opt LPSTR FAR* lplpszType, __deref_opt_out_opt L
PSTR FAR* lplpszShortType,
__deref_opt_out_opt LPSTR FAR* lplpszLocation) PURE;
STDMETHOD(GetConvertInfo) (THIS_ DWORD dwObject, STDMETHOD(GetConvertInfo) (THIS_ DWORD dwObject,
CLSID FAR* lpClassID, WORD FAR* lpwFormat, CLSID FAR* lpClassID, WORD FAR* lpwFormat,
CLSID FAR* lpConvertDefaultClassID, CLSID FAR* lpConvertDefaultClassID,
LPCLSID FAR* lplpClsidExclude, UINT FAR* lpcClsidExclude) PURE; LPCLSID FAR* lplpClsidExclude, UINT FAR* lpcClsidExclude) PURE;
STDMETHOD(ConvertObject) (THIS_ DWORD dwObject, REFCLSID clsidNew) PURE; STDMETHOD(ConvertObject) (THIS_ DWORD dwObject, REFCLSID clsidNew) PURE;
// *** extra for View Properties *** // // *** extra for View Properties *** //
STDMETHOD(GetViewInfo) (THIS_ DWORD dwObject, STDMETHOD(GetViewInfo) (THIS_ DWORD dwObject,
HGLOBAL FAR* phMetaPict, DWORD* pdvAspect, int* pnCurrentScale) PURE; HGLOBAL FAR* phMetaPict, DWORD* pdvAspect, int* pnCurrentScale) PURE;
STDMETHOD(SetViewInfo) (THIS_ DWORD dwObject, STDMETHOD(SetViewInfo) (THIS_ DWORD dwObject,
skipping to change at line 1244 skipping to change at line 1244
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE; STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE; STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE;
// *** IOleUILinkContainer *** // // *** IOleUILinkContainer *** //
STDMETHOD_(DWORD,GetNextLink) (THIS_ DWORD dwLink) PURE; STDMETHOD_(DWORD,GetNextLink) (THIS_ DWORD dwLink) PURE;
STDMETHOD(SetLinkUpdateOptions) (THIS_ DWORD dwLink, STDMETHOD(SetLinkUpdateOptions) (THIS_ DWORD dwLink,
DWORD dwUpdateOpt) PURE; DWORD dwUpdateOpt) PURE;
STDMETHOD(GetLinkUpdateOptions) (THIS_ DWORD dwLink, STDMETHOD(GetLinkUpdateOptions) (THIS_ DWORD dwLink,
DWORD FAR* lpdwUpdateOpt) PURE; DWORD FAR* lpdwUpdateOpt) PURE;
STDMETHOD(SetLinkSource) (THIS_ DWORD dwLink, LPWSTR lpszDisplayName, STDMETHOD(SetLinkSource) (THIS_ DWORD dwLink, __in LPWSTR lpszDisplayNam e,
ULONG lenFileName, ULONG FAR* pchEaten, BOOL fValidateSource) PU RE; ULONG lenFileName, ULONG FAR* pchEaten, BOOL fValidateSource) PU RE;
STDMETHOD(GetLinkSource) (THIS_ DWORD dwLink, STDMETHOD(GetLinkSource) (THIS_ DWORD dwLink,
LPWSTR FAR* lplpszDisplayName, ULONG FAR* lplenFileName, __deref_opt_out_opt LPWSTR FAR* lplpszDisplayName, ULONG FAR* lp
LPWSTR FAR* lplpszFullLinkType, LPWSTR FAR* lplpszShortLinkType, lenFileName,
__deref_opt_out_opt LPWSTR FAR* lplpszFullLinkType, __deref_opt_
out_opt LPWSTR FAR* lplpszShortLinkType,
BOOL FAR* lpfSourceAvailable, BOOL FAR* lpfIsSelected) PURE; BOOL FAR* lpfSourceAvailable, BOOL FAR* lpfIsSelected) PURE;
STDMETHOD(OpenLinkSource) (THIS_ DWORD dwLink) PURE; STDMETHOD(OpenLinkSource) (THIS_ DWORD dwLink) PURE;
STDMETHOD(UpdateLink) (THIS_ DWORD dwLink, STDMETHOD(UpdateLink) (THIS_ DWORD dwLink,
BOOL fErrorMessage, BOOL fReserved) PURE; BOOL fErrorMessage, BOOL fReserved) PURE;
STDMETHOD(CancelLink) (THIS_ DWORD dwLink) PURE; STDMETHOD(CancelLink) (THIS_ DWORD dwLink) PURE;
// *** extra for Link Properties *** // // *** extra for Link Properties *** //
STDMETHOD(GetLastUpdate) (THIS_ DWORD dwLink, STDMETHOD(GetLastUpdate) (THIS_ DWORD dwLink,
FILETIME FAR* lpLastUpdate) PURE; FILETIME FAR* lpLastUpdate) PURE;
}; };
skipping to change at line 1278 skipping to change at line 1278
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE; STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE; STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE;
// *** IOleUILinkContainer *** // // *** IOleUILinkContainer *** //
STDMETHOD_(DWORD,GetNextLink) (THIS_ DWORD dwLink) PURE; STDMETHOD_(DWORD,GetNextLink) (THIS_ DWORD dwLink) PURE;
STDMETHOD(SetLinkUpdateOptions) (THIS_ DWORD dwLink, STDMETHOD(SetLinkUpdateOptions) (THIS_ DWORD dwLink,
DWORD dwUpdateOpt) PURE; DWORD dwUpdateOpt) PURE;
STDMETHOD(GetLinkUpdateOptions) (THIS_ DWORD dwLink, STDMETHOD(GetLinkUpdateOptions) (THIS_ DWORD dwLink,
DWORD FAR* lpdwUpdateOpt) PURE; DWORD FAR* lpdwUpdateOpt) PURE;
STDMETHOD(SetLinkSource) (THIS_ DWORD dwLink, LPSTR lpszDisplayName, STDMETHOD(SetLinkSource) (THIS_ DWORD dwLink, __in LPSTR lpszDisplayName ,
ULONG lenFileName, ULONG FAR* pchEaten, BOOL fValidateSource) PU RE; ULONG lenFileName, ULONG FAR* pchEaten, BOOL fValidateSource) PU RE;
STDMETHOD(GetLinkSource) (THIS_ DWORD dwLink, STDMETHOD(GetLinkSource) (THIS_ DWORD dwLink,
LPSTR FAR* lplpszDisplayName, ULONG FAR* lplenFileName, __deref_opt_out_opt LPSTR FAR* lplpszDisplayName, ULONG FAR* lpl
LPSTR FAR* lplpszFullLinkType, LPSTR FAR* lplpszShortLinkType, enFileName,
__deref_opt_out_opt LPSTR FAR* lplpszFullLinkType, __deref_opt_o
ut_opt LPSTR FAR* lplpszShortLinkType,
BOOL FAR* lpfSourceAvailable, BOOL FAR* lpfIsSelected) PURE; BOOL FAR* lpfSourceAvailable, BOOL FAR* lpfIsSelected) PURE;
STDMETHOD(OpenLinkSource) (THIS_ DWORD dwLink) PURE; STDMETHOD(OpenLinkSource) (THIS_ DWORD dwLink) PURE;
STDMETHOD(UpdateLink) (THIS_ DWORD dwLink, STDMETHOD(UpdateLink) (THIS_ DWORD dwLink,
BOOL fErrorMessage, BOOL fReserved) PURE; BOOL fErrorMessage, BOOL fReserved) PURE;
STDMETHOD(CancelLink) (THIS_ DWORD dwLink) PURE; STDMETHOD(CancelLink) (THIS_ DWORD dwLink) PURE;
// *** extra for Link Properties *** // // *** extra for Link Properties *** //
STDMETHOD(GetLastUpdate) (THIS_ DWORD dwLink, STDMETHOD(GetLastUpdate) (THIS_ DWORD dwLink,
FILETIME FAR* lpLastUpdate) PURE; FILETIME FAR* lpLastUpdate) PURE;
}; };
skipping to change at line 1459 skipping to change at line 1459
// for the property sheet code. // for the property sheet code.
// //
// Since the UNICODE version of our API is not implemented on Windows 95, // Since the UNICODE version of our API is not implemented on Windows 95,
// this only creates a semantic problem. The entry points will still // this only creates a semantic problem. The entry points will still
// look the same and the code will still work the same if we define // look the same and the code will still work the same if we define
// LPPROPSHEETHEADERW to be the narrow version of the structure. // LPPROPSHEETHEADERW to be the narrow version of the structure.
typedef struct _PROPSHEETHEADER FAR* LPPROPSHEETHEADERW; typedef struct _PROPSHEETHEADER FAR* LPPROPSHEETHEADERW;
typedef struct _PROPSHEETHEADER FAR* LPPROPSHEETHEADERA; typedef struct _PROPSHEETHEADER FAR* LPPROPSHEETHEADERA;
#else
// We are building under Windows NT.
// Go ahead and define LPPROPSHEETHEADERW as it should be defined!
typedef struct _PROPSHEETHEADERW FAR* LPPROPSHEETHEADERW;
typedef struct _PROPSHEETHEADERA FAR* LPPROPSHEETHEADERA;
#ifdef UNICODE
#define LPPROPSHEETHEADER LPPROPSHEETHEADERW
#else
#define LPPROPSHEETHEADER LPPROPSHEETHEADERA
#endif
#endif // PSM_SETFINISHTEXTA #endif // PSM_SETFINISHTEXTA
#else // WINVER #else // WINVER
// If WINVER < 0x400, then PROPSHEETHEADER stuff isn't defined. // If WINVER < 0x400, then PROPSHEETHEADER stuff isn't defined.
// The user won't be able to use the prop-sheet code, so we just define the // The user won't be able to use the prop-sheet code, so we just define the
// necessary structures to be void pointers to enable to header file to // necessary structures to be void pointers to enable to header file to
// at least compile correctly. // at least compile correctly.
typedef void FAR* LPPROPSHEETHEADERW; typedef void FAR* LPPROPSHEETHEADERW;
skipping to change at line 1607 skipping to change at line 1593
int __cdecl OleUIPromptUserW(int nTemplate, HWND hwndParent, ...); int __cdecl OleUIPromptUserW(int nTemplate, HWND hwndParent, ...);
int __cdecl OleUIPromptUserA(int nTemplate, HWND hwndParent, ...); int __cdecl OleUIPromptUserA(int nTemplate, HWND hwndParent, ...);
#ifdef UNICODE #ifdef UNICODE
#define OleUIPromptUser OleUIPromptUserW #define OleUIPromptUser OleUIPromptUserW
#else #else
#define OleUIPromptUser OleUIPromptUserA #define OleUIPromptUser OleUIPromptUserA
#endif #endif
STDAPI_(BOOL) OleUIUpdateLinksW(LPOLEUILINKCONTAINERW lpOleUILinkCntr, STDAPI_(BOOL) OleUIUpdateLinksW(LPOLEUILINKCONTAINERW lpOleUILinkCntr,
HWND hwndParent, LPWSTR lpszTitle, int cLinks); HWND hwndParent, __in LPWSTR lpszTitle, int cLinks);
STDAPI_(BOOL) OleUIUpdateLinksA(LPOLEUILINKCONTAINERA lpOleUILinkCntr, STDAPI_(BOOL) OleUIUpdateLinksA(LPOLEUILINKCONTAINERA lpOleUILinkCntr,
HWND hwndParent, LPSTR lpszTitle, int cLinks); HWND hwndParent, __in LPSTR lpszTitle, int cLinks);
#ifdef UNICODE #ifdef UNICODE
#define OleUIUpdateLinks OleUIUpdateLinksW #define OleUIUpdateLinks OleUIUpdateLinksW
#else #else
#define OleUIUpdateLinks OleUIUpdateLinksA #define OleUIUpdateLinks OleUIUpdateLinksA
#endif #endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#pragma pack(pop) #pragma pack(pop)
 End of changes. 13 change blocks. 
34 lines changed or deleted 32 lines changed or added

This html diff was produced by rfcdiff 1.41.