Headers diff for oledlg.dll between 6.1.7600.16385-Windows_7.0 and 6.3.9600.17415-Windows_8.1 versions



 oledlg.h (6.1.7600.16385-Windows_7.0)   oledlg.h (6.3.9600.17415-Windows_8.1) 
skipping to change at line 32 skipping to change at line 32
- Object Properties Dialog - Object Properties Dialog
--*/ --*/
#ifndef _OLEDLG_H_ #ifndef _OLEDLG_H_
#define _OLEDLG_H_ #define _OLEDLG_H_
#if _MSC_VER > 1000 #if _MSC_VER > 1000
#pragma once #pragma once
#endif #endif
#include <winapifamily.h>
#pragma region Desktop Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
#ifndef RC_INVOKED #ifndef RC_INVOKED
#ifndef __cplusplus #ifndef __cplusplus
#define NONAMELESSUNION // use strict ANSI standard (for DVOBJ.H) #define NONAMELESSUNION // use strict ANSI standard (for DVOBJ.H)
#endif #endif
// syncronize UNICODE options // syncronize UNICODE options
#if defined(_UNICODE) && !defined(UNICODE) #if defined(_UNICODE) && !defined(UNICODE)
#define UNICODE #define UNICODE
skipping to change at line 237 skipping to change at line 241
#ifndef RC_INVOKED #ifndef RC_INVOKED
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#pragma pack(push, 8) #pragma pack(push, 8)
// Delimeter used to separate ItemMoniker pieces of a composite moniker // Delimeter used to separate ItemMoniker pieces of a composite moniker
#ifdef _MAC #define OLESTDDELIM TEXT("\\")
#define OLESTDDELIM ":"
#else
#define OLESTDDELIM TEXT("\\")
#endif
// Hook type used in all structures. // Hook type used in all structures.
typedef UINT (CALLBACK *LPFNOLEUIHOOK)(HWND, UINT, WPARAM, LPARAM); typedef UINT (CALLBACK *LPFNOLEUIHOOK)(HWND, UINT, WPARAM, LPARAM);
// Strings for registered messages // Strings for registered messages
#define SZOLEUI_MSG_HELP TEXT("OLEUI_MSG_HELP") #define SZOLEUI_MSG_HELP TEXT("OLEUI_MSG_HELP")
#define SZOLEUI_MSG_ENDDIALOG TEXT("OLEUI_MSG_ENDDIALOG") #define SZOLEUI_MSG_ENDDIALOG TEXT("OLEUI_MSG_ENDDIALOG")
#define SZOLEUI_MSG_BROWSE TEXT("OLEUI_MSG_BROWSE") #define SZOLEUI_MSG_BROWSE TEXT("OLEUI_MSG_BROWSE")
#define SZOLEUI_MSG_CHANGEICON TEXT("OLEUI_MSG_CHANGEICON") #define SZOLEUI_MSG_CHANGEICON TEXT("OLEUI_MSG_CHANGEICON")
#define SZOLEUI_MSG_CLOSEBUSYDIALOG TEXT("OLEUI_MSG_CLOSEBUSYDIALOG") #define SZOLEUI_MSG_CLOSEBUSYDIALOG TEXT("OLEUI_MSG_CLOSEBUSYDIALOG")
skipping to change at line 291 skipping to change at line 291
#define OLEUI_ERR_FINDTEMPLATEFAILURE 110 // Initialization errors #define OLEUI_ERR_FINDTEMPLATEFAILURE 110 // Initialization errors
#define OLEUI_ERR_LOADTEMPLATEFAILURE 111 #define OLEUI_ERR_LOADTEMPLATEFAILURE 111
#define OLEUI_ERR_DIALOGFAILURE 112 #define OLEUI_ERR_DIALOGFAILURE 112
#define OLEUI_ERR_LOCALMEMALLOC 113 #define OLEUI_ERR_LOCALMEMALLOC 113
#define OLEUI_ERR_GLOBALMEMALLOC 114 #define OLEUI_ERR_GLOBALMEMALLOC 114
#define OLEUI_ERR_LOADSTRING 115 #define OLEUI_ERR_LOADSTRING 115
#define OLEUI_ERR_STANDARDMAX 116 // Start here for specific errors. #define OLEUI_ERR_STANDARDMAX 116 // Start here for specific errors.
// Miscellaneous utility functions. // Miscellaneous utility functions.
STDAPI_(BOOL) OleUIAddVerbMenuW(__in_opt LPOLEOBJECT lpOleObj, __in_opt LPCWSTR lpszShortType, STDAPI_(BOOL) OleUIAddVerbMenuW(_In_opt_ LPOLEOBJECT lpOleObj, _In_opt_ LPCWSTR lpszShortType,
HMENU hMenu, UINT uPos, UINT uIDVerbMin, UINT uIDVerbMax, HMENU hMenu, UINT uPos, UINT uIDVerbMin, UINT uIDVerbMax,
BOOL bAddConvert, UINT idConvert, __out HMENU *lphMenu); BOOL bAddConvert, UINT idConvert, _Out_ HMENU *lphMenu);
STDAPI_(BOOL) OleUIAddVerbMenuA(__in_opt LPOLEOBJECT lpOleObj, __in_opt LPCSTR l STDAPI_(BOOL) OleUIAddVerbMenuA(_In_opt_ LPOLEOBJECT lpOleObj, _In_opt_ LPCSTR l
pszShortType, pszShortType,
HMENU hMenu, UINT uPos, UINT uIDVerbMin, UINT uIDVerbMax, HMENU hMenu, UINT uPos, UINT uIDVerbMin, UINT uIDVerbMax,
BOOL bAddConvert, UINT idConvert, __out HMENU *lphMenu); BOOL bAddConvert, UINT idConvert, _Out_ HMENU *lphMenu);
#ifdef UNICODE #ifdef UNICODE
#define OleUIAddVerbMenu OleUIAddVerbMenuW #define OleUIAddVerbMenu OleUIAddVerbMenuW
#else #else
#define OleUIAddVerbMenu OleUIAddVerbMenuA #define OleUIAddVerbMenu OleUIAddVerbMenuA
#endif #endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// INSERT OBJECT DIALOG // INSERT OBJECT DIALOG
typedef struct tagOLEUIINSERTOBJECTW typedef struct tagOLEUIINSERTOBJECTW
skipping to change at line 369 skipping to change at line 369
DWORD oleRender; // IN: Rendering option DWORD oleRender; // IN: Rendering option
LPFORMATETC lpFormatEtc; // IN: Desired format LPFORMATETC lpFormatEtc; // IN: Desired format
LPOLECLIENTSITE lpIOleClientSite; // IN: Site to be use for the object . LPOLECLIENTSITE lpIOleClientSite; // IN: Site to be use for the object .
LPSTORAGE lpIStorage; // IN: Storage used for the object LPSTORAGE lpIStorage; // IN: Storage used for the object
LPVOID *ppvObj; // OUT: Where the object is returned. LPVOID *ppvObj; // OUT: Where the object is returned.
SCODE sc; // OUT: Result of creation calls. SCODE sc; // OUT: Result of creation calls.
HGLOBAL hMetaPict; // OUT: metafile aspect (METAFILEPICT) HGLOBAL hMetaPict; // OUT: metafile aspect (METAFILEPICT)
} OLEUIINSERTOBJECTA, *POLEUIINSERTOBJECTA, *LPOLEUIINSERTOBJECTA; } OLEUIINSERTOBJECTA, *POLEUIINSERTOBJECTA, *LPOLEUIINSERTOBJECTA;
STDAPI_(UINT) OleUIInsertObjectW(__in LPOLEUIINSERTOBJECTW); STDAPI_(UINT) OleUIInsertObjectW(_In_ LPOLEUIINSERTOBJECTW);
STDAPI_(UINT) OleUIInsertObjectA(__in LPOLEUIINSERTOBJECTA); STDAPI_(UINT) OleUIInsertObjectA(_In_ LPOLEUIINSERTOBJECTA);
#ifdef UNICODE #ifdef UNICODE
#define tagOLEUIINSERTOBJECT tagOLEUIINSERTOBJECTW #define tagOLEUIINSERTOBJECT tagOLEUIINSERTOBJECTW
#define OLEUIINSERTOBJECT OLEUIINSERTOBJECTW #define OLEUIINSERTOBJECT OLEUIINSERTOBJECTW
#define POLEUIINSERTOBJECT POLEUIINSERTOBJECTW #define POLEUIINSERTOBJECT POLEUIINSERTOBJECTW
#define LPOLEUIINSERTOBJECT LPOLEUIINSERTOBJECTW #define LPOLEUIINSERTOBJECT LPOLEUIINSERTOBJECTW
#define OleUIInsertObject OleUIInsertObjectW #define OleUIInsertObject OleUIInsertObjectW
#else #else
#define tagOLEUIINSERTOBJECT tagOLEUIINSERTOBJECTA #define tagOLEUIINSERTOBJECT tagOLEUIINSERTOBJECTA
#define OLEUIINSERTOBJECT OLEUIINSERTOBJECTA #define OLEUIINSERTOBJECT OLEUIINSERTOBJECTA
skipping to change at line 608 skipping to change at line 608
#define OLEUIPASTESPECIAL OLEUIPASTESPECIALW #define OLEUIPASTESPECIAL OLEUIPASTESPECIALW
#define POLEUIPASTESPECIAL POLEUIPASTESPECIALW #define POLEUIPASTESPECIAL POLEUIPASTESPECIALW
#define LPOLEUIPASTESPECIAL LPOLEUIPASTESPECIALW #define LPOLEUIPASTESPECIAL LPOLEUIPASTESPECIALW
#else #else
#define tagOLEUIPASTESPECIAL tagOLEUIPASTESPECIALA #define tagOLEUIPASTESPECIAL tagOLEUIPASTESPECIALA
#define OLEUIPASTESPECIAL OLEUIPASTESPECIALA #define OLEUIPASTESPECIAL OLEUIPASTESPECIALA
#define POLEUIPASTESPECIAL POLEUIPASTESPECIALA #define POLEUIPASTESPECIAL POLEUIPASTESPECIALA
#define LPOLEUIPASTESPECIAL LPOLEUIPASTESPECIALA #define LPOLEUIPASTESPECIAL LPOLEUIPASTESPECIALA
#endif #endif
STDAPI_(UINT) OleUIPasteSpecialW(__in LPOLEUIPASTESPECIALW); STDAPI_(UINT) OleUIPasteSpecialW(_In_ LPOLEUIPASTESPECIALW);
STDAPI_(UINT) OleUIPasteSpecialA(__in LPOLEUIPASTESPECIALA); STDAPI_(UINT) OleUIPasteSpecialA(_In_ LPOLEUIPASTESPECIALA);
#ifdef UNICODE #ifdef UNICODE
#define OleUIPasteSpecial OleUIPasteSpecialW #define OleUIPasteSpecial OleUIPasteSpecialW
#else #else
#define OleUIPasteSpecial OleUIPasteSpecialA #define OleUIPasteSpecial OleUIPasteSpecialA
#endif #endif
// Paste Special specific flags // Paste Special specific flags
#define PSF_SHOWHELP 0x00000001L #define PSF_SHOWHELP 0x00000001L
#define PSF_SELECTPASTE 0x00000002L #define PSF_SELECTPASTE 0x00000002L
#define PSF_SELECTPASTELINK 0x00000004L #define PSF_SELECTPASTELINK 0x00000004L
skipping to change at line 651 skipping to change at line 651
// want to use the EditLinks dialog. the EditLinks dialog calls back // want to use the EditLinks dialog. the EditLinks dialog calls back
// to the container app to perform the OLE functions to manipulate // to the container app to perform the OLE functions to manipulate
// the links within the container. // the links within the container.
#undef INTERFACE #undef INTERFACE
#define INTERFACE IOleUILinkContainerW #define INTERFACE IOleUILinkContainerW
DECLARE_INTERFACE_(IOleUILinkContainerW, IUnknown) DECLARE_INTERFACE_(IOleUILinkContainerW, IUnknown)
{ {
// *** IUnknown methods *** // // *** IUnknown methods *** //
STDMETHOD(QueryInterface) (THIS_ __in REFIID riid, __deref_out LPVOID FA R* ppvObj) PURE; STDMETHOD(QueryInterface) (THIS_ _In_ REFIID riid, _Outptr_ 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,
__out DWORD FAR* lpdwUpdateOpt) PURE; _Out_ DWORD FAR* lpdwUpdateOpt) PURE;
STDMETHOD(SetLinkSource) (THIS_ DWORD dwLink, __in LPWSTR lpszDisplayNam STDMETHOD(SetLinkSource) (THIS_ DWORD dwLink, _In_ LPWSTR lpszDisplayNam
e, e,
ULONG lenFileName, __out ULONG FAR* pchEaten, BOOL fValidateSour ULONG lenFileName, _Out_ ULONG FAR* pchEaten, BOOL fValidateSour
ce) PURE; ce) PURE;
STDMETHOD(GetLinkSource) (THIS_ DWORD dwLink, STDMETHOD(GetLinkSource) (THIS_ DWORD dwLink,
__deref_opt_out_opt LPWSTR FAR* lplpszDisplayName, __out ULONG F _Outptr_opt_result_maybenull_ LPWSTR FAR* lplpszDisplayName, _Ou
AR* lplenFileName, t_ ULONG FAR* lplenFileName,
__deref_opt_out_opt LPWSTR FAR* lplpszFullLinkType, __deref_opt_ _Outptr_opt_result_maybenull_ LPWSTR FAR* lplpszFullLinkType, _O
out_opt LPWSTR FAR* lplpszShortLinkType, utptr_opt_result_maybenull_ LPWSTR FAR* lplpszShortLinkType,
__out BOOL FAR* lpfSourceAvailable, __out BOOL FAR* lpfIsSelecte _Out_ BOOL FAR* lpfSourceAvailable, _Out_ BOOL FAR* lpfIsSelecte
d) PURE; d) 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
#define INTERFACE IOleUILinkContainerA #define INTERFACE IOleUILinkContainerA
DECLARE_INTERFACE_(IOleUILinkContainerA, IUnknown) DECLARE_INTERFACE_(IOleUILinkContainerA, IUnknown)
{ {
// *** IUnknown methods *** // // *** IUnknown methods *** //
STDMETHOD(QueryInterface) (THIS_ __in REFIID riid, __deref_out LPVOID FA R* ppvObj) PURE; STDMETHOD(QueryInterface) (THIS_ _In_ REFIID riid, _Outptr_ 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,
__out DWORD FAR* lpdwUpdateOpt) PURE; _Out_ DWORD FAR* lpdwUpdateOpt) PURE;
STDMETHOD(SetLinkSource) (THIS_ DWORD dwLink, __in LPSTR lpszDisplayName STDMETHOD(SetLinkSource) (THIS_ DWORD dwLink, _In_ LPSTR lpszDisplayName
, ,
ULONG lenFileName, __out ULONG FAR* pchEaten, BOOL fValidateSour ULONG lenFileName, _Out_ ULONG FAR* pchEaten, BOOL fValidateSour
ce) PURE; ce) PURE;
STDMETHOD(GetLinkSource) (THIS_ DWORD dwLink, STDMETHOD(GetLinkSource) (THIS_ DWORD dwLink,
__deref_opt_out_opt LPSTR FAR* lplpszDisplayName, __out ULONG FA _Outptr_opt_result_maybenull_ LPSTR FAR* lplpszDisplayName, _Out
R* lplenFileName, _ ULONG FAR* lplenFileName,
__deref_opt_out_opt LPSTR FAR* lplpszFullLinkType, __deref_opt_o _Outptr_opt_result_maybenull_ LPSTR FAR* lplpszFullLinkType, _Ou
ut_opt LPSTR FAR* lplpszShortLinkType, tptr_opt_result_maybenull_ LPSTR FAR* lplpszShortLinkType,
__out BOOL FAR* lpfSourceAvailable, __out BOOL FAR* lpfIsSelecte _Out_ BOOL FAR* lpfSourceAvailable, _Out_ BOOL FAR* lpfIsSelecte
d) PURE; d) 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
#define IOleUILinkContainer IOleUILinkContainerW #define IOleUILinkContainer IOleUILinkContainerW
skipping to change at line 768 skipping to change at line 768
#else #else
#define tagOLEUIEDITLINKS tagOLEUIEDITLINKSA #define tagOLEUIEDITLINKS tagOLEUIEDITLINKSA
#define OLEUIEDITLINKS OLEUIEDITLINKSA #define OLEUIEDITLINKS OLEUIEDITLINKSA
#define POLEUIEDITLINKS POLEUIEDITLINKSA #define POLEUIEDITLINKS POLEUIEDITLINKSA
#define LPOLEUIEDITLINKS LPOLEUIEDITLINKSA #define LPOLEUIEDITLINKS LPOLEUIEDITLINKSA
#endif #endif
#define OLEUI_ELERR_LINKCNTRNULL (OLEUI_ERR_STANDARDMAX+0) #define OLEUI_ELERR_LINKCNTRNULL (OLEUI_ERR_STANDARDMAX+0)
#define OLEUI_ELERR_LINKCNTRINVALID (OLEUI_ERR_STANDARDMAX+1) #define OLEUI_ELERR_LINKCNTRINVALID (OLEUI_ERR_STANDARDMAX+1)
STDAPI_(UINT) OleUIEditLinksW(__in LPOLEUIEDITLINKSW); STDAPI_(UINT) OleUIEditLinksW(_In_ LPOLEUIEDITLINKSW);
STDAPI_(UINT) OleUIEditLinksA(__in LPOLEUIEDITLINKSA); STDAPI_(UINT) OleUIEditLinksA(_In_ LPOLEUIEDITLINKSA);
#ifdef UNICODE #ifdef UNICODE
#define OleUIEditLinks OleUIEditLinksW #define OleUIEditLinks OleUIEditLinksW
#else #else
#define OleUIEditLinks OleUIEditLinksA #define OleUIEditLinks OleUIEditLinksA
#endif #endif
// Edit Links flags // Edit Links flags
#define ELF_SHOWHELP 0x00000001L #define ELF_SHOWHELP 0x00000001L
#define ELF_DISABLEUPDATENOW 0x00000002L #define ELF_DISABLEUPDATENOW 0x00000002L
skipping to change at line 833 skipping to change at line 833
// Specifics for OLEUICHANGEICON. // Specifics for OLEUICHANGEICON.
HGLOBAL hMetaPict; // IN-OUT: Current and final image. HGLOBAL hMetaPict; // IN-OUT: Current and final image.
// Sour ce of the icon is embedded in // Sour ce of the icon is embedded in
// the metafile itself. // the metafile itself.
CLSID clsid; // IN: class used to get Default icon CLSID clsid; // IN: class used to get Default icon
CHAR szIconExe[MAX_PATH]; // IN: explicit icon source path CHAR szIconExe[MAX_PATH]; // IN: explicit icon source path
int cchIconExe; // IN: number of characters in szIconExe int cchIconExe; // IN: number of characters in szIconExe
} OLEUICHANGEICONA, *POLEUICHANGEICONA, *LPOLEUICHANGEICONA; } OLEUICHANGEICONA, *POLEUICHANGEICONA, *LPOLEUICHANGEICONA;
STDAPI_(UINT) OleUIChangeIconW(__in LPOLEUICHANGEICONW); STDAPI_(UINT) OleUIChangeIconW(_In_ LPOLEUICHANGEICONW);
STDAPI_(UINT) OleUIChangeIconA(__in LPOLEUICHANGEICONA); STDAPI_(UINT) OleUIChangeIconA(_In_ LPOLEUICHANGEICONA);
#ifdef UNICODE #ifdef UNICODE
#define tagOLEUICHANGEICON tagOLEUICHANGEICONW #define tagOLEUICHANGEICON tagOLEUICHANGEICONW
#define OLEUICHANGEICON OLEUICHANGEICONW #define OLEUICHANGEICON OLEUICHANGEICONW
#define POLEUICHANGEICON POLEUICHANGEICONW #define POLEUICHANGEICON POLEUICHANGEICONW
#define LPOLEUICHANGEICON LPOLEUICHANGEICONW #define LPOLEUICHANGEICON LPOLEUICHANGEICONW
#define OleUIChangeIcon OleUIChangeIconW #define OleUIChangeIcon OleUIChangeIconW
#else #else
#define tagOLEUICHANGEICON tagOLEUICHANGEICONA #define tagOLEUICHANGEICON tagOLEUICHANGEICONA
#define OLEUICHANGEICON OLEUICHANGEICONA #define OLEUICHANGEICON OLEUICHANGEICONA
skipping to change at line 951 skipping to change at line 951
// will be used. if the object is a // will be used. if the object is a
// link , the caller should pass the // link , the caller should pass the
// Disp layName of the link source // Disp layName of the link source
// This gets freed on exit. // This gets freed on exit.
UINT cClsidExclude; //IN: No. of CLSIDs in lpClsidExclude UINT cClsidExclude; //IN: No. of CLSIDs in lpClsidExclude
LPCLSID lpClsidExclude; //IN: List of CLSIDs to exclude from lis t LPCLSID lpClsidExclude; //IN: List of CLSIDs to exclude from lis t
} OLEUICONVERTA, *POLEUICONVERTA, *LPOLEUICONVERTA; } OLEUICONVERTA, *POLEUICONVERTA, *LPOLEUICONVERTA;
STDAPI_(UINT) OleUIConvertW(__in LPOLEUICONVERTW); STDAPI_(UINT) OleUIConvertW(_In_ LPOLEUICONVERTW);
STDAPI_(UINT) OleUIConvertA(__in LPOLEUICONVERTA); STDAPI_(UINT) OleUIConvertA(_In_ LPOLEUICONVERTA);
#ifdef UNICODE #ifdef UNICODE
#define tagOLEUICONVERT tagOLEUICONVERTW #define tagOLEUICONVERT tagOLEUICONVERTW
#define OLEUICONVERT OLEUICONVERTW #define OLEUICONVERT OLEUICONVERTW
#define POLEUICONVERT POLEUICONVERTW #define POLEUICONVERT POLEUICONVERTW
#define LPOLEUICONVERT LPOLEUICONVERTW #define LPOLEUICONVERT LPOLEUICONVERTW
#define OleUIConvert OleUIConvertW #define OleUIConvert OleUIConvertW
#else #else
#define tagOLEUICONVERT tagOLEUICONVERTA #define tagOLEUICONVERT tagOLEUICONVERTA
#define OLEUICONVERT OLEUICONVERTA #define OLEUICONVERT OLEUICONVERTA
#define POLEUICONVERT POLEUICONVERTA #define POLEUICONVERT POLEUICONVERTA
#define LPOLEUICONVERT LPOLEUICONVERTA #define LPOLEUICONVERT LPOLEUICONVERTA
#define OleUIConvert OleUIConvertA #define OleUIConvert OleUIConvertA
#endif #endif
// Determine if there is at least one class that can Convert or ActivateAs // Determine if there is at least one class that can Convert or ActivateAs
// the given clsid. // the given clsid.
STDAPI_(BOOL) OleUICanConvertOrActivateAs( STDAPI_(BOOL) OleUICanConvertOrActivateAs(
__in REFCLSID rClsid, BOOL fIsLinkedObject, WORD wFormat); _In_ REFCLSID rClsid, BOOL fIsLinkedObject, WORD wFormat);
// Convert Dialog flags // Convert Dialog flags
#define CF_SHOWHELPBUTTON 0x00000001L #define CF_SHOWHELPBUTTON 0x00000001L
#define CF_SETCONVERTDEFAULT 0x00000002L #define CF_SETCONVERTDEFAULT 0x00000002L
#define CF_SETACTIVATEDEFAULT 0x00000004L #define CF_SETACTIVATEDEFAULT 0x00000004L
#define CF_SELECTCONVERTTO 0x00000008L #define CF_SELECTCONVERTTO 0x00000008L
#define CF_SELECTACTIVATEAS 0x00000010L #define CF_SELECTACTIVATEAS 0x00000010L
#define CF_DISABLEDISPLAYASICON 0x00000020L #define CF_DISABLEDISPLAYASICON 0x00000020L
#define CF_DISABLEACTIVATEAS 0x00000040L #define CF_DISABLEACTIVATEAS 0x00000040L
#define CF_HIDECHANGEICON 0x00000080L #define CF_HIDECHANGEICON 0x00000080L
skipping to change at line 1032 skipping to change at line 1032
HINSTANCE hInstance; // Instance for customized template name HINSTANCE hInstance; // Instance for customized template name
LPCSTR lpszTemplate; // Customized template name LPCSTR lpszTemplate; // Customized template name
HRSRC hResource; // Customized template handle HRSRC hResource; // Customized template handle
// Specifics for OLEUIBUSY. // Specifics for OLEUIBUSY.
HTASK hTask; // IN: HTask which is blocking HTASK hTask; // IN: HTask which is blocking
HWND * lphWndDialog; // OUT: Dialog's HWND is placed here HWND * lphWndDialog; // OUT: Dialog's HWND is placed here
} OLEUIBUSYA, *POLEUIBUSYA, *LPOLEUIBUSYA; } OLEUIBUSYA, *POLEUIBUSYA, *LPOLEUIBUSYA;
STDAPI_(UINT) OleUIBusyW(__in LPOLEUIBUSYW); STDAPI_(UINT) OleUIBusyW(_In_ LPOLEUIBUSYW);
STDAPI_(UINT) OleUIBusyA(__in LPOLEUIBUSYA); STDAPI_(UINT) OleUIBusyA(_In_ LPOLEUIBUSYA);
#ifdef UNICODE #ifdef UNICODE
#define tagOLEUIBUSY tagOLEUIBUSYW #define tagOLEUIBUSY tagOLEUIBUSYW
#define OLEUIBUSY OLEUIBUSYW #define OLEUIBUSY OLEUIBUSYW
#define POLEUIBUSY POLEUIBUSYW #define POLEUIBUSY POLEUIBUSYW
#define LPOLEUIBUSY LPOLEUIBUSYW #define LPOLEUIBUSY LPOLEUIBUSYW
#define OleUIBusy OleUIBusyW #define OleUIBusy OleUIBusyW
#else #else
#define tagOLEUIBUSY tagOLEUIBUSYA #define tagOLEUIBUSY tagOLEUIBUSYA
#define OLEUIBUSY OLEUIBUSYA #define OLEUIBUSY OLEUIBUSYA
skipping to change at line 1120 skipping to change at line 1120
// Specifics for OLEUICHANGESOURCE. // Specifics for OLEUICHANGESOURCE.
LPOLEUILINKCONTAINERA lpOleUILinkContainer; // IN: used to validate lin k sources LPOLEUILINKCONTAINERA lpOleUILinkContainer; // IN: used to validate lin k sources
DWORD dwLink; // IN: magic# for lpOleUILinkContainer DWORD dwLink; // IN: magic# for lpOleUILinkContainer
LPSTR lpszDisplayName;// IN-OUT: complete source display name LPSTR lpszDisplayName;// IN-OUT: complete source display name
ULONG nFileLength; // IN-OUT: file moniker part of lpszDisp layName ULONG nFileLength; // IN-OUT: file moniker part of lpszDisp layName
LPSTR lpszFrom; // OUT: prefix of source changed from LPSTR lpszFrom; // OUT: prefix of source changed from
LPSTR lpszTo; // OUT: prefix of source changed to LPSTR lpszTo; // OUT: prefix of source changed to
} OLEUICHANGESOURCEA, *POLEUICHANGESOURCEA, *LPOLEUICHANGESOURCEA; } OLEUICHANGESOURCEA, *POLEUICHANGESOURCEA, *LPOLEUICHANGESOURCEA;
STDAPI_(UINT) OleUIChangeSourceW(__in LPOLEUICHANGESOURCEW); STDAPI_(UINT) OleUIChangeSourceW(_In_ LPOLEUICHANGESOURCEW);
STDAPI_(UINT) OleUIChangeSourceA(__in LPOLEUICHANGESOURCEA); STDAPI_(UINT) OleUIChangeSourceA(_In_ LPOLEUICHANGESOURCEA);
#ifdef UNICODE #ifdef UNICODE
#define tagOLEUICHANGESOURCE tagOLEUICHANGESOURCEW #define tagOLEUICHANGESOURCE tagOLEUICHANGESOURCEW
#define OLEUICHANGESOURCE OLEUICHANGESOURCEW #define OLEUICHANGESOURCE OLEUICHANGESOURCEW
#define POLEUICHANGESOURCE POLEUICHANGESOURCEW #define POLEUICHANGESOURCE POLEUICHANGESOURCEW
#define LPOLEUICHANGESOURCE LPOLEUICHANGESOURCEW #define LPOLEUICHANGESOURCE LPOLEUICHANGESOURCEW
#define OleUIChangeSource OleUIChangeSourceW #define OleUIChangeSource OleUIChangeSourceW
#else #else
#define tagOLEUICHANGESOURCE tagOLEUICHANGESOURCEA #define tagOLEUICHANGESOURCE tagOLEUICHANGESOURCEA
#define OLEUICHANGESOURCE OLEUICHANGESOURCEA #define OLEUICHANGESOURCE OLEUICHANGESOURCEA
skipping to change at line 1162 skipping to change at line 1162
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// OBJECT PROPERTIES DIALOG // OBJECT PROPERTIES DIALOG
#undef INTERFACE #undef INTERFACE
#define INTERFACE IOleUIObjInfoW #define INTERFACE IOleUIObjInfoW
DECLARE_INTERFACE_(IOleUIObjInfoW, IUnknown) DECLARE_INTERFACE_(IOleUIObjInfoW, IUnknown)
{ {
// *** IUnknown methods *** // // *** IUnknown methods *** //
STDMETHOD(QueryInterface) (THIS_ __in REFIID riid, __deref_out LPVOID FA R* ppvObj) PURE; STDMETHOD(QueryInterface) (THIS_ _In_ REFIID riid, _Outptr_ 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,
__out DWORD FAR* lpdwObjSize, __deref_opt_out_opt LPWSTR FAR* lp _Out_ DWORD FAR* lpdwObjSize, _Outptr_opt_result_maybenull_ LPWS
lpszLabel, TR FAR* lplpszLabel,
__deref_opt_out_opt LPWSTR FAR* lplpszType, __deref_opt_out_opt _Outptr_opt_result_maybenull_ LPWSTR FAR* lplpszType, _Outptr_op
LPWSTR FAR* lplpszShortType, t_result_maybenull_ LPWSTR FAR* lplpszShortType,
__deref_opt_out_opt LPWSTR FAR* lplpszLocation) PURE; _Outptr_opt_result_maybenull_ LPWSTR FAR* lplpszLocation) PURE;
STDMETHOD(GetConvertInfo) (THIS_ DWORD dwObject, STDMETHOD(GetConvertInfo) (THIS_ DWORD dwObject,
__out CLSID FAR* lpClassID, __out WORD FAR* lpwFormat, _Out_ CLSID FAR* lpClassID, _Out_ WORD FAR* lpwFormat,
__out CLSID FAR* lpConvertDefaultClassID, _Out_ CLSID FAR* lpConvertDefaultClassID,
__deref_out_opt LPCLSID FAR* lplpClsidExclude, __out_opt UINT FA _Outptr_result_maybenull_ LPCLSID FAR* lplpClsidExclude, _Out_op
R* lpcClsidExclude) PURE; t_ UINT FAR* lpcClsidExclude) PURE;
STDMETHOD(ConvertObject) (THIS_ DWORD dwObject, __in REFCLSID clsidNew) STDMETHOD(ConvertObject) (THIS_ DWORD dwObject, _In_ REFCLSID clsidNew)
PURE; PURE;
// *** extra for View Properties *** // // *** extra for View Properties *** //
STDMETHOD(GetViewInfo) (THIS_ DWORD dwObject, STDMETHOD(GetViewInfo) (THIS_ DWORD dwObject,
__in_opt HGLOBAL FAR* phMetaPict, __in_opt DWORD* pdvAspect, __i n_opt int* pnCurrentScale) PURE; _In_opt_ HGLOBAL FAR* phMetaPict, _In_opt_ DWORD* pdvAspect, _In _opt_ int* pnCurrentScale) PURE;
STDMETHOD(SetViewInfo) (THIS_ DWORD dwObject, STDMETHOD(SetViewInfo) (THIS_ DWORD dwObject,
HGLOBAL hMetaPict, DWORD dvAspect, HGLOBAL hMetaPict, DWORD dvAspect,
int nCurrentScale, BOOL bRelativeToOrig) PURE; int nCurrentScale, BOOL bRelativeToOrig) PURE;
}; };
typedef IOleUIObjInfoW FAR* LPOLEUIOBJINFOW; typedef IOleUIObjInfoW FAR* LPOLEUIOBJINFOW;
#undef INTERFACE #undef INTERFACE
#define INTERFACE IOleUIObjInfoA #define INTERFACE IOleUIObjInfoA
DECLARE_INTERFACE_(IOleUIObjInfoA, IUnknown) DECLARE_INTERFACE_(IOleUIObjInfoA, IUnknown)
{ {
// *** IUnknown methods *** // // *** IUnknown methods *** //
STDMETHOD(QueryInterface) (THIS_ __in REFIID riid, __deref_out LPVOID FA R* ppvObj) PURE; STDMETHOD(QueryInterface) (THIS_ _In_ REFIID riid, _Outptr_ 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,
__out DWORD FAR* lpdwObjSize, __deref_opt_out_opt LPSTR FAR* lpl _Out_ DWORD FAR* lpdwObjSize, _Outptr_opt_result_maybenull_ LPST
pszLabel, R FAR* lplpszLabel,
__deref_opt_out_opt LPSTR FAR* lplpszType, __deref_opt_out_opt L _Outptr_opt_result_maybenull_ LPSTR FAR* lplpszType, _Outptr_opt
PSTR FAR* lplpszShortType, _result_maybenull_ LPSTR FAR* lplpszShortType,
__deref_opt_out_opt LPSTR FAR* lplpszLocation) PURE; _Outptr_opt_result_maybenull_ LPSTR FAR* lplpszLocation) PURE;
STDMETHOD(GetConvertInfo) (THIS_ DWORD dwObject, STDMETHOD(GetConvertInfo) (THIS_ DWORD dwObject,
__out CLSID FAR* lpClassID, __out WORD FAR* lpwFormat, _Out_ CLSID FAR* lpClassID, _Out_ WORD FAR* lpwFormat,
__out CLSID FAR* lpConvertDefaultClassID, _Out_ CLSID FAR* lpConvertDefaultClassID,
__deref_out_opt LPCLSID FAR* lplpClsidExclude, __out_opt UINT FA _Outptr_result_maybenull_ LPCLSID FAR* lplpClsidExclude, _Out_op
R* lpcClsidExclude) PURE; t_ UINT FAR* lpcClsidExclude) PURE;
STDMETHOD(ConvertObject) (THIS_ DWORD dwObject, __in REFCLSID clsidNew) STDMETHOD(ConvertObject) (THIS_ DWORD dwObject, _In_ REFCLSID clsidNew)
PURE; PURE;
// *** extra for View Properties *** // // *** extra for View Properties *** //
STDMETHOD(GetViewInfo) (THIS_ DWORD dwObject, STDMETHOD(GetViewInfo) (THIS_ DWORD dwObject,
__in_opt HGLOBAL FAR* phMetaPict, __in_opt DWORD* pdvAspect, __i n_opt int* pnCurrentScale) PURE; _In_opt_ HGLOBAL FAR* phMetaPict, _In_opt_ DWORD* pdvAspect, _In _opt_ int* pnCurrentScale) PURE;
STDMETHOD(SetViewInfo) (THIS_ DWORD dwObject, STDMETHOD(SetViewInfo) (THIS_ DWORD dwObject,
HGLOBAL hMetaPict, DWORD dvAspect, HGLOBAL hMetaPict, DWORD dvAspect,
int nCurrentScale, BOOL bRelativeToOrig) PURE; int nCurrentScale, BOOL bRelativeToOrig) PURE;
}; };
typedef IOleUIObjInfoA FAR* LPOLEUIOBJINFOA; typedef IOleUIObjInfoA FAR* LPOLEUIOBJINFOA;
#ifdef UNICODE #ifdef UNICODE
#define IOleUIObjInfo IOleUIObjInfoW #define IOleUIObjInfo IOleUIObjInfoW
#define IOleUIObjInfoVtbl IOleUIObjInfoWVtbl #define IOleUIObjInfoVtbl IOleUIObjInfoWVtbl
skipping to change at line 1234 skipping to change at line 1234
#define IOleUIObjInfoVtbl IOleUIObjInfoAVtbl #define IOleUIObjInfoVtbl IOleUIObjInfoAVtbl
#define LPOLEUIOBJINFO LPOLEUIOBJINFOA #define LPOLEUIOBJINFO LPOLEUIOBJINFOA
#endif #endif
#undef INTERFACE #undef INTERFACE
#define INTERFACE IOleUILinkInfoW #define INTERFACE IOleUILinkInfoW
DECLARE_INTERFACE_(IOleUILinkInfoW, IOleUILinkContainerW) DECLARE_INTERFACE_(IOleUILinkInfoW, IOleUILinkContainerW)
{ {
// *** IUnknown methods *** // // *** IUnknown methods *** //
STDMETHOD(QueryInterface) (THIS_ __in REFIID riid, __deref_out LPVOID FA R* ppvObj) PURE; STDMETHOD(QueryInterface) (THIS_ _In_ REFIID riid, _Outptr_ 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,
__out DWORD FAR* lpdwUpdateOpt) PURE; _Out_ DWORD FAR* lpdwUpdateOpt) PURE;
STDMETHOD(SetLinkSource) (THIS_ DWORD dwLink, __in LPWSTR lpszDisplayNam STDMETHOD(SetLinkSource) (THIS_ DWORD dwLink, _In_ LPWSTR lpszDisplayNam
e, e,
ULONG lenFileName, __out ULONG FAR* pchEaten, BOOL fValidateSour ULONG lenFileName, _Out_ ULONG FAR* pchEaten, BOOL fValidateSour
ce) PURE; ce) PURE;
STDMETHOD(GetLinkSource) (THIS_ DWORD dwLink, STDMETHOD(GetLinkSource) (THIS_ DWORD dwLink,
__deref_opt_out_opt LPWSTR FAR* lplpszDisplayName, __out ULONG F _Outptr_opt_result_maybenull_ LPWSTR FAR* lplpszDisplayName, _Ou
AR* lplenFileName, t_ ULONG FAR* lplenFileName,
__deref_opt_out_opt LPWSTR FAR* lplpszFullLinkType, __deref_opt_ _Outptr_opt_result_maybenull_ LPWSTR FAR* lplpszFullLinkType, _O
out_opt LPWSTR FAR* lplpszShortLinkType, utptr_opt_result_maybenull_ LPWSTR FAR* lplpszShortLinkType,
__out BOOL FAR* lpfSourceAvailable, __out BOOL FAR* lpfIsSelecte _Out_ BOOL FAR* lpfSourceAvailable, _Out_ BOOL FAR* lpfIsSelecte
d) PURE; d) 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,
__out FILETIME FAR* lpLastUpdate) PURE; _Out_ FILETIME FAR* lpLastUpdate) PURE;
}; };
typedef IOleUILinkInfoW FAR* LPOLEUILINKINFOW; typedef IOleUILinkInfoW FAR* LPOLEUILINKINFOW;
#undef INTERFACE #undef INTERFACE
#define INTERFACE IOleUILinkInfoA #define INTERFACE IOleUILinkInfoA
DECLARE_INTERFACE_(IOleUILinkInfoA, IOleUILinkContainerA) DECLARE_INTERFACE_(IOleUILinkInfoA, IOleUILinkContainerA)
{ {
// *** IUnknown methods *** // // *** IUnknown methods *** //
STDMETHOD(QueryInterface) (THIS_ __in REFIID riid, __deref_out LPVOID FA R* ppvObj) PURE; STDMETHOD(QueryInterface) (THIS_ _In_ REFIID riid, _Outptr_ 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,
__out DWORD FAR* lpdwUpdateOpt) PURE; _Out_ DWORD FAR* lpdwUpdateOpt) PURE;
STDMETHOD(SetLinkSource) (THIS_ DWORD dwLink, __in LPSTR lpszDisplayName STDMETHOD(SetLinkSource) (THIS_ DWORD dwLink, _In_ LPSTR lpszDisplayName
, ,
ULONG lenFileName, __out ULONG FAR* pchEaten, BOOL fValidateSour ULONG lenFileName, _Out_ ULONG FAR* pchEaten, BOOL fValidateSour
ce) PURE; ce) PURE;
STDMETHOD(GetLinkSource) (THIS_ DWORD dwLink, STDMETHOD(GetLinkSource) (THIS_ DWORD dwLink,
__deref_opt_out_opt LPSTR FAR* lplpszDisplayName, __out ULONG FA _Outptr_opt_result_maybenull_ LPSTR FAR* lplpszDisplayName, _Out
R* lplenFileName, _ ULONG FAR* lplenFileName,
__deref_opt_out_opt LPSTR FAR* lplpszFullLinkType, __deref_opt_o _Outptr_opt_result_maybenull_ LPSTR FAR* lplpszFullLinkType, _Ou
ut_opt LPSTR FAR* lplpszShortLinkType, tptr_opt_result_maybenull_ LPSTR FAR* lplpszShortLinkType,
__out BOOL FAR* lpfSourceAvailable, __out BOOL FAR* lpfIsSelecte _Out_ BOOL FAR* lpfSourceAvailable, _Out_ BOOL FAR* lpfIsSelecte
d) PURE; d) 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,
__out FILETIME FAR* lpLastUpdate) PURE; _Out_ FILETIME FAR* lpLastUpdate) PURE;
}; };
typedef IOleUILinkInfoA FAR* LPOLEUILINKINFOA; typedef IOleUILinkInfoA FAR* LPOLEUILINKINFOA;
#ifdef UNICODE #ifdef UNICODE
#define IOleUILinkInfo IOleUILinkInfoW #define IOleUILinkInfo IOleUILinkInfoW
#define IOleUILinkInfoVtbl IOleUILinkInfoWVtbl #define IOleUILinkInfoVtbl IOleUILinkInfoWVtbl
#define LPOLEUILINKINFO LPOLEUILINKINFOW #define LPOLEUILINKINFO LPOLEUILINKINFOW
#else #else
#define IOleUILinkInfo IOleUILinkInfoA #define IOleUILinkInfo IOleUILinkInfoA
skipping to change at line 1527 skipping to change at line 1527
DWORD dwLink; // IN: identifier for the link DWORD dwLink; // IN: identifier for the link
LPOLEUILINKINFOA lpLinkInfo; // IN: interface to manipulate link LPOLEUILINKINFOA lpLinkInfo; // IN: interface to manipulate link
// Data specfic to each page // Data specfic to each page
LPOLEUIGNRLPROPSA lpGP; // IN: general page LPOLEUIGNRLPROPSA lpGP; // IN: general page
LPOLEUIVIEWPROPSA lpVP; // IN: view page LPOLEUIVIEWPROPSA lpVP; // IN: view page
LPOLEUILINKPROPSA lpLP; // IN: link page LPOLEUILINKPROPSA lpLP; // IN: link page
} OLEUIOBJECTPROPSA, *POLEUIOBJECTPROPSA, FAR* LPOLEUIOBJECTPROPSA; } OLEUIOBJECTPROPSA, *POLEUIOBJECTPROPSA, FAR* LPOLEUIOBJECTPROPSA;
STDAPI_(UINT) OleUIObjectPropertiesW(__in LPOLEUIOBJECTPROPSW); STDAPI_(UINT) OleUIObjectPropertiesW(_In_ LPOLEUIOBJECTPROPSW);
STDAPI_(UINT) OleUIObjectPropertiesA(__in LPOLEUIOBJECTPROPSA); STDAPI_(UINT) OleUIObjectPropertiesA(_In_ LPOLEUIOBJECTPROPSA);
#ifdef UNICODE #ifdef UNICODE
#define tagOLEUIOBJECTPROPS tagOLEUIOBJECTPROPSW #define tagOLEUIOBJECTPROPS tagOLEUIOBJECTPROPSW
#define OLEUIOBJECTPROPS OLEUIOBJECTPROPSW #define OLEUIOBJECTPROPS OLEUIOBJECTPROPSW
#define POLEUIOBJECTPROPS POLEUIOBJECTPROPSW #define POLEUIOBJECTPROPS POLEUIOBJECTPROPSW
#define LPOLEUIOBJECTPROPS LPOLEUIOBJECTPROPSW #define LPOLEUIOBJECTPROPS LPOLEUIOBJECTPROPSW
#define OleUIObjectProperties OleUIObjectPropertiesW #define OleUIObjectProperties OleUIObjectPropertiesW
#else #else
#define tagOLEUIOBJECTPROPS tagOLEUIOBJECTPROPSA #define tagOLEUIOBJECTPROPS tagOLEUIOBJECTPROPSA
#define OLEUIOBJECTPROPS OLEUIOBJECTPROPSA #define OLEUIOBJECTPROPS OLEUIOBJECTPROPSA
skipping to change at line 1593 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, __in LPWSTR lpszTitle, int cLinks); HWND hwndParent, _In_ LPWSTR lpszTitle, int cLinks);
STDAPI_(BOOL) OleUIUpdateLinksA(LPOLEUILINKCONTAINERA lpOleUILinkCntr, STDAPI_(BOOL) OleUIUpdateLinksA(LPOLEUILINKCONTAINERA lpOleUILinkCntr,
HWND hwndParent, __in 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)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif // RC_INVOKED #endif // RC_INVOKED
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */
#pragma endregion
#endif //_OLEDLG_H_ #endif //_OLEDLG_H_
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
 End of changes. 39 change blocks. 
105 lines changed or deleted 108 lines changed or added

This html diff was produced by rfcdiff 1.41.