- Reduce shdeprecated.idl differences to Wine. Fixes a few warnings

svn path=/trunk/; revision=59476
This commit is contained in:
Thomas Faber 2013-07-14 07:12:59 +00:00
parent 8e34f32ce6
commit a73a5c7941
4 changed files with 138 additions and 137 deletions

View file

@ -85,7 +85,7 @@ HRESULT STDMETHODCALLTYPE CCommonBrowser::IEGetDisplayName(LPCITEMIDLIST pidl, L
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT STDMETHODCALLTYPE CCommonBrowser::IEParseDisplayName(UINT uiCP, LPCWSTR pwszPath, LPCITEMIDLIST *ppidlOut) HRESULT STDMETHODCALLTYPE CCommonBrowser::IEParseDisplayName(UINT uiCP, LPCWSTR pwszPath, LPITEMIDLIST *ppidlOut)
{ {
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -140,7 +140,7 @@ HRESULT STDMETHODCALLTYPE CCommonBrowser::CanNavigateNow( void)
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT STDMETHODCALLTYPE CCommonBrowser::GetPidl(LPCITEMIDLIST *ppidl) HRESULT STDMETHODCALLTYPE CCommonBrowser::GetPidl(LPITEMIDLIST *ppidl)
{ {
return E_NOTIMPL; return E_NOTIMPL;
} }

View file

@ -54,7 +54,7 @@ public:
virtual HRESULT STDMETHODCALLTYPE ShowControlWindow(UINT id, BOOL fShow); virtual HRESULT STDMETHODCALLTYPE ShowControlWindow(UINT id, BOOL fShow);
virtual HRESULT STDMETHODCALLTYPE IsControlWindowShown(UINT id, BOOL *pfShown); virtual HRESULT STDMETHODCALLTYPE IsControlWindowShown(UINT id, BOOL *pfShown);
virtual HRESULT STDMETHODCALLTYPE IEGetDisplayName(LPCITEMIDLIST pidl, LPWSTR pwszName, UINT uFlags); virtual HRESULT STDMETHODCALLTYPE IEGetDisplayName(LPCITEMIDLIST pidl, LPWSTR pwszName, UINT uFlags);
virtual HRESULT STDMETHODCALLTYPE IEParseDisplayName(UINT uiCP, LPCWSTR pwszPath, LPCITEMIDLIST *ppidlOut); virtual HRESULT STDMETHODCALLTYPE IEParseDisplayName(UINT uiCP, LPCWSTR pwszPath, LPITEMIDLIST *ppidlOut);
virtual HRESULT STDMETHODCALLTYPE DisplayParseError(HRESULT hres, LPCWSTR pwszPath); virtual HRESULT STDMETHODCALLTYPE DisplayParseError(HRESULT hres, LPCWSTR pwszPath);
virtual HRESULT STDMETHODCALLTYPE NavigateToPidl(LPCITEMIDLIST pidl, DWORD grfHLNF); virtual HRESULT STDMETHODCALLTYPE NavigateToPidl(LPCITEMIDLIST pidl, DWORD grfHLNF);
virtual HRESULT STDMETHODCALLTYPE SetNavigateState(BNSTATE bnstate); virtual HRESULT STDMETHODCALLTYPE SetNavigateState(BNSTATE bnstate);
@ -65,7 +65,7 @@ public:
virtual HRESULT STDMETHODCALLTYPE SetFlags(DWORD dwFlags, DWORD dwFlagMask); virtual HRESULT STDMETHODCALLTYPE SetFlags(DWORD dwFlags, DWORD dwFlagMask);
virtual HRESULT STDMETHODCALLTYPE GetFlags(DWORD *pdwFlags); virtual HRESULT STDMETHODCALLTYPE GetFlags(DWORD *pdwFlags);
virtual HRESULT STDMETHODCALLTYPE CanNavigateNow(); virtual HRESULT STDMETHODCALLTYPE CanNavigateNow();
virtual HRESULT STDMETHODCALLTYPE GetPidl(LPCITEMIDLIST *ppidl); virtual HRESULT STDMETHODCALLTYPE GetPidl(LPITEMIDLIST *ppidl);
virtual HRESULT STDMETHODCALLTYPE SetReferrer(LPCITEMIDLIST pidl); virtual HRESULT STDMETHODCALLTYPE SetReferrer(LPCITEMIDLIST pidl);
virtual DWORD STDMETHODCALLTYPE GetBrowserIndex(); virtual DWORD STDMETHODCALLTYPE GetBrowserIndex();
virtual HRESULT STDMETHODCALLTYPE GetBrowserByIndex(DWORD dwID, IUnknown **ppunk); virtual HRESULT STDMETHODCALLTYPE GetBrowserByIndex(DWORD dwID, IUnknown **ppunk);

View file

@ -426,7 +426,7 @@ public:
virtual HRESULT STDMETHODCALLTYPE ShowControlWindow(UINT id, BOOL fShow); virtual HRESULT STDMETHODCALLTYPE ShowControlWindow(UINT id, BOOL fShow);
virtual HRESULT STDMETHODCALLTYPE IsControlWindowShown(UINT id, BOOL *pfShown); virtual HRESULT STDMETHODCALLTYPE IsControlWindowShown(UINT id, BOOL *pfShown);
virtual HRESULT STDMETHODCALLTYPE IEGetDisplayName(LPCITEMIDLIST pidl, LPWSTR pwszName, UINT uFlags); virtual HRESULT STDMETHODCALLTYPE IEGetDisplayName(LPCITEMIDLIST pidl, LPWSTR pwszName, UINT uFlags);
virtual HRESULT STDMETHODCALLTYPE IEParseDisplayName(UINT uiCP, LPCWSTR pwszPath, LPCITEMIDLIST *ppidlOut); virtual HRESULT STDMETHODCALLTYPE IEParseDisplayName(UINT uiCP, LPCWSTR pwszPath, LPITEMIDLIST *ppidlOut);
virtual HRESULT STDMETHODCALLTYPE DisplayParseError(HRESULT hres, LPCWSTR pwszPath); virtual HRESULT STDMETHODCALLTYPE DisplayParseError(HRESULT hres, LPCWSTR pwszPath);
virtual HRESULT STDMETHODCALLTYPE NavigateToPidl(LPCITEMIDLIST pidl, DWORD grfHLNF); virtual HRESULT STDMETHODCALLTYPE NavigateToPidl(LPCITEMIDLIST pidl, DWORD grfHLNF);
virtual HRESULT STDMETHODCALLTYPE SetNavigateState(BNSTATE bnstate); virtual HRESULT STDMETHODCALLTYPE SetNavigateState(BNSTATE bnstate);
@ -437,7 +437,7 @@ public:
virtual HRESULT STDMETHODCALLTYPE SetFlags(DWORD dwFlags, DWORD dwFlagMask); virtual HRESULT STDMETHODCALLTYPE SetFlags(DWORD dwFlags, DWORD dwFlagMask);
virtual HRESULT STDMETHODCALLTYPE GetFlags(DWORD *pdwFlags); virtual HRESULT STDMETHODCALLTYPE GetFlags(DWORD *pdwFlags);
virtual HRESULT STDMETHODCALLTYPE CanNavigateNow( void); virtual HRESULT STDMETHODCALLTYPE CanNavigateNow( void);
virtual HRESULT STDMETHODCALLTYPE GetPidl(LPCITEMIDLIST *ppidl); virtual HRESULT STDMETHODCALLTYPE GetPidl(LPITEMIDLIST *ppidl);
virtual HRESULT STDMETHODCALLTYPE SetReferrer(LPCITEMIDLIST pidl); virtual HRESULT STDMETHODCALLTYPE SetReferrer(LPCITEMIDLIST pidl);
virtual DWORD STDMETHODCALLTYPE GetBrowserIndex(); virtual DWORD STDMETHODCALLTYPE GetBrowserIndex();
virtual HRESULT STDMETHODCALLTYPE GetBrowserByIndex(DWORD dwID, IUnknown **ppunk); virtual HRESULT STDMETHODCALLTYPE GetBrowserByIndex(DWORD dwID, IUnknown **ppunk);
@ -2070,7 +2070,7 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::IEGetDisplayName(LPCITEMIDLIST pidl, LP
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT STDMETHODCALLTYPE CShellBrowser::IEParseDisplayName(UINT uiCP, LPCWSTR pwszPath, LPCITEMIDLIST *ppidlOut) HRESULT STDMETHODCALLTYPE CShellBrowser::IEParseDisplayName(UINT uiCP, LPCWSTR pwszPath, LPITEMIDLIST *ppidlOut)
{ {
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -2125,7 +2125,7 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::CanNavigateNow()
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT STDMETHODCALLTYPE CShellBrowser::GetPidl(LPCITEMIDLIST *ppidl) HRESULT STDMETHODCALLTYPE CShellBrowser::GetPidl(LPITEMIDLIST *ppidl)
{ {
// called by explorer bar to get current pidl // called by explorer bar to get current pidl
if (ppidl == NULL) if (ppidl == NULL)

View file

@ -47,10 +47,10 @@ interface ITravelEntry : IUnknown
HRESULT Update( HRESULT Update(
[in] IUnknown *punk, [in] IUnknown *punk,
BOOL fIsLocalAnchor); [in] BOOL fIsLocalAnchor);
HRESULT GetPidl( HRESULT GetPidl(
[in] LPITEMIDLIST *ppidl); [out] LPITEMIDLIST *ppidl);
}; };
[ [
@ -63,11 +63,11 @@ interface ITravelLog : IUnknown
{ {
HRESULT AddEntry( HRESULT AddEntry(
[in] IUnknown *punk, [in] IUnknown *punk,
BOOL fIsLocalAnchor); [in] BOOL fIsLocalAnchor);
HRESULT UpdateEntry( HRESULT UpdateEntry(
[in] IUnknown *punk, [in] IUnknown *punk,
BOOL fIsLocalAnchor); [in] BOOL fIsLocalAnchor);
HRESULT UpdateExternal( HRESULT UpdateExternal(
[in] IUnknown *punk, [in] IUnknown *punk,
@ -75,32 +75,32 @@ interface ITravelLog : IUnknown
HRESULT Travel( HRESULT Travel(
[in] IUnknown *punk, [in] IUnknown *punk,
int iOffset); [in] int iOffset);
HRESULT GetTravelEntry( HRESULT GetTravelEntry(
[in] IUnknown *punk, [in] IUnknown *punk,
int iOffset, [in] int iOffset,
[out] ITravelEntry **ppte); [optional, out] ITravelEntry **ppte);
HRESULT FindTravelEntry( HRESULT FindTravelEntry(
[in] IUnknown *punk, [in] IUnknown *punk,
[in] LPCITEMIDLIST pidl, [in] LPCITEMIDLIST pidl,
[out] ITravelEntry **ppte); [out] ITravelEntry **ppte);
HRESULT GetToolTipText( HRESULT GetToolTipText(
[in] IUnknown *punk, [in] IUnknown *punk,
int iOffset, [in] int iOffset,
int idsTemplate, [in] int idsTemplate,
[out] LPWSTR pwzText, [out, size_is(cchText)] LPWSTR pwzText,
DWORD cchText); [in] DWORD cchText);
HRESULT InsertMenuEntries( HRESULT InsertMenuEntries(
[in] IUnknown *punk, [in] IUnknown *punk,
[in, out] HMENU hmenu, [in] HMENU hmenu,
int nPos, [in] int nPos,
int idFirst, [in] int idFirst,
int idLast, [in] int idLast,
DWORD dwFlags); [in] DWORD dwFlags);
HRESULT Clone( HRESULT Clone(
[out] ITravelLog **pptl); [out] ITravelLog **pptl);
@ -182,7 +182,7 @@ cpp_quote("#define HLNF_NEWWINDOWSMANAGED 0x80000000")
pointer_default(unique), pointer_default(unique),
local, local,
object, object,
uuid(02BA3B52-0547-11D1-B833-00C04FC9B31F) uuid(02ba3b52-0547-11d1-b833-00c04fc9b31f)
] ]
interface IBrowserService : IUnknown interface IBrowserService : IUnknown
{ {
@ -195,50 +195,50 @@ interface IBrowserService : IUnknown
HRESULT GetTitle( HRESULT GetTitle(
[in] IShellView *psv, [in] IShellView *psv,
[out] LPWSTR pszName, [out, size_is(cchName)] LPWSTR pszName,
DWORD cchName); [in] DWORD cchName);
HRESULT GetOleObject( HRESULT GetOleObject(
[out] IOleObject **ppobjv); [out] IOleObject **ppobjv);
HRESULT GetTravelLog( HRESULT GetTravelLog(
[out] ITravelLog **pptl); [out, optional] ITravelLog **pptl);
HRESULT ShowControlWindow( HRESULT ShowControlWindow(
UINT id, [in] UINT id,
BOOL fShow); [in] BOOL fShow);
HRESULT IsControlWindowShown( HRESULT IsControlWindowShown(
UINT id, [in] UINT id,
[out] BOOL *pfShown); [out] BOOL *pfShown);
HRESULT IEGetDisplayName( HRESULT IEGetDisplayName(
[in] LPCITEMIDLIST pidl, [in] PCIDLIST_ABSOLUTE pidl,
[out] LPWSTR pwszName, [out] LPWSTR pwszName,
UINT uFlags); [in] UINT uFlags);
HRESULT IEParseDisplayName( HRESULT IEParseDisplayName(
UINT uiCP, [in] UINT uiCP,
[in] LPCWSTR pwszPath, [in] LPCWSTR pwszPath,
[out] LPCITEMIDLIST *ppidlOut); [out] PIDLIST_ABSOLUTE *ppidlOut);
HRESULT DisplayParseError( HRESULT DisplayParseError(
HRESULT hres, [in] HRESULT hres,
[in] LPCWSTR pwszPath); [in] LPCWSTR pwszPath);
HRESULT NavigateToPidl( HRESULT NavigateToPidl(
[in] LPCITEMIDLIST pidl, [in] PCIDLIST_ABSOLUTE pidl,
DWORD grfHLNF); [in] DWORD grfHLNF);
HRESULT SetNavigateState( HRESULT SetNavigateState(
BNSTATE bnstate); [in] BNSTATE bnstate);
HRESULT GetNavigateState( HRESULT GetNavigateState(
[out] BNSTATE *pbnstate); [out] BNSTATE *pbnstate);
HRESULT NotifyRedirect( HRESULT NotifyRedirect(
[in] IShellView *psv, [in] IShellView *psv,
[in] LPCITEMIDLIST pidl, [in] PCIDLIST_ABSOLUTE pidl,
[out] BOOL *pfDidBrowse); [out] BOOL *pfDidBrowse);
HRESULT UpdateWindowList(); HRESULT UpdateWindowList();
@ -246,8 +246,8 @@ interface IBrowserService : IUnknown
HRESULT UpdateBackForwardState(); HRESULT UpdateBackForwardState();
HRESULT SetFlags( HRESULT SetFlags(
DWORD dwFlags, [in] DWORD dwFlags,
DWORD dwFlagMask); [in] DWORD dwFlagMask);
HRESULT GetFlags( HRESULT GetFlags(
[out] DWORD *pdwFlags); [out] DWORD *pdwFlags);
@ -255,15 +255,15 @@ interface IBrowserService : IUnknown
HRESULT CanNavigateNow(); HRESULT CanNavigateNow();
HRESULT GetPidl( HRESULT GetPidl(
[out] LPCITEMIDLIST *ppidl); [out] PIDLIST_ABSOLUTE *ppidl);
HRESULT SetReferrer( HRESULT SetReferrer(
[in] LPCITEMIDLIST pidl); [in] PCIDLIST_ABSOLUTE pidl);
DWORD GetBrowserIndex(); DWORD GetBrowserIndex();
HRESULT GetBrowserByIndex( HRESULT GetBrowserByIndex(
DWORD dwID, [in] DWORD dwID,
[out] IUnknown **ppunk); [out] IUnknown **ppunk);
HRESULT GetHistoryObject( HRESULT GetHistoryObject(
@ -273,7 +273,7 @@ interface IBrowserService : IUnknown
HRESULT SetHistoryObject( HRESULT SetHistoryObject(
[in] IOleObject *pole, [in] IOleObject *pole,
BOOL fIsLocalAnchor); [in] BOOL fIsLocalAnchor);
HRESULT CacheOLEServer( HRESULT CacheOLEServer(
[in] IOleObject *pole); [in] IOleObject *pole);
@ -284,7 +284,7 @@ interface IBrowserService : IUnknown
HRESULT OnHttpEquiv( HRESULT OnHttpEquiv(
[in] IShellView *psv, [in] IShellView *psv,
BOOL fDone, [in] BOOL fDone,
[in] VARIANT *pvarargIn, [in] VARIANT *pvarargIn,
[out] VARIANT *pvarargOut); [out] VARIANT *pvarargOut);
@ -292,25 +292,24 @@ interface IBrowserService : IUnknown
[out] HPALETTE *hpal); [out] HPALETTE *hpal);
HRESULT RegisterWindow( HRESULT RegisterWindow(
BOOL fForceRegister, [in] BOOL fForceRegister,
int swc); [in] int swc);
} }
[ [
pointer_default(unique), pointer_default(unique),
local,
object, object,
uuid(5836FB00-8187-11CF-A12B-00AA004AE837) local,
uuid(5836fb00-8187-11cf-a12b-00aa004ae837)
] ]
interface IShellService : IUnknown interface IShellService : IUnknown
{ {
HRESULT SetOwner( HRESULT SetOwner( [in] IUnknown *pUnk );
[in] IUnknown *owner); }
};
cpp_quote("#if 0") cpp_quote("#if 0")
typedef HANDLE HMONITOR; typedef HANDLE HMONITOR;
cpp_quote("#endif /* 0 */") cpp_quote("#endif")
enum { enum {
SECURELOCK_NOCHANGE = -1, SECURELOCK_NOCHANGE = -1,
@ -336,65 +335,73 @@ typedef struct basebrowserdataxp
{ {
HWND _hwnd; HWND _hwnd;
ITravelLog *_ptl; ITravelLog *_ptl;
IUnknown *_phlf; IHlinkFrame *_phlf;
IUnknown *_pautoWB2; IWebBrowser2 *_pautoWB2;
IUnknown *_pautoEDS; IExpDispSupport *_pautoEDS;
IShellService *_pautoSS; IShellService *_pautoSS;
int _eSecureLockIcon; int _eSecureLockIcon;
DWORD _fCreatingViewWindow; DWORD _fCreatingViewWindow;
UINT _uActivateState; UINT _uActivateState;
LPITEMIDLIST _pidlViewState;
LPCITEMIDLIST _pidlNewShellView;
IOleCommandTarget *_pctView; IOleCommandTarget *_pctView;
LPITEMIDLIST _pidlCur; LPITEMIDLIST _pidlCur;
IShellView *_psv; IShellView *_psv;
IShellFolder *_psf; IShellFolder *_psf;
HWND _hwndView; HWND _hwndView;
LPWSTR _pszTitleCur; LPWSTR _pszTitleCur;
LPITEMIDLIST _pidlPending; LPITEMIDLIST _pidlPending;
IShellView *_psvPending; IShellView *_psvPending;
IShellFolder *_psfPending; IShellFolder *_psfPending;
HWND _hwndViewPending; HWND _hwndViewPending;
LPWSTR _pszTitlePending; LPWSTR _pszTitlePending;
BOOL _fIsViewMSHTML; BOOL _fIsViewMSHTML;
BOOL _fPrivacyImpacted; BOOL _fPrivacyImpacted;
CLSID _clsidView; CLSID _clsidView;
CLSID _clsidViewPending; CLSID _clsidViewPending;
HWND _hwndFrame; HWND _hwndFrame;
} BASEBROWSERDATAXP; } BASEBROWSERDATAXP, *LPBASEBROWSERDATAXP;
typedef struct basebrowserdataxp *LPBASEBROWSERDATAXP;
typedef struct basebrowserdatalh typedef struct basebrowserdatalh
{ {
HWND _hwnd; HWND _hwnd;
ITravelLog *_ptl; ITravelLog *_ptl;
IUnknown *_phlf; IHlinkFrame *_phlf;
IUnknown *_pautoWB2; IWebBrowser2 *_pautoWB2;
IUnknown *_pautoEDS; IExpDispSupport *_pautoEDS;
IShellService *_pautoSS; IShellService *_pautoSS;
int _eSecureLockIcon; int _eSecureLockIcon;
DWORD _fCreatingViewWindow; DWORD _fCreatingViewWindow;
UINT _uActivateState; UINT _uActivateState;
LPITEMIDLIST _pidlViewState;
LPCITEMIDLIST _pidlNewShellView;
IOleCommandTarget *_pctView; IOleCommandTarget *_pctView;
LPITEMIDLIST _pidlCur; LPITEMIDLIST _pidlCur;
IShellView *_psv; IShellView *_psv;
IShellFolder *_psf; IShellFolder *_psf;
HWND _hwndView; HWND _hwndView;
LPWSTR _pszTitleCur; LPWSTR _pszTitleCur;
LPITEMIDLIST _pidlPending; LPITEMIDLIST _pidlPending;
IShellView *_psvPending; IShellView *_psvPending;
IShellFolder *_psfPending; IShellFolder *_psfPending;
HWND _hwndViewPending; HWND _hwndViewPending;
LPWSTR _pszTitlePending; LPWSTR _pszTitlePending;
BOOL _fIsViewMSHTML; BOOL _fIsViewMSHTML;
BOOL _fPrivacyImpacted; BOOL _fPrivacyImpacted;
CLSID _clsidView; CLSID _clsidView;
CLSID _clsidViewPending; CLSID _clsidViewPending;
HWND _hwndFrame; HWND _hwndFrame;
LONG _lPhishingFilterStatus; LONG _lPhishingFilterStatus;
} BASEBROWSERDATALH; } BASEBROWSERDATALH, *LPBASEBROWSERDATALH;
cpp_quote("#include <poppack.h>") cpp_quote("#include <poppack.h>")
typedef struct basebrowserdatalh *LPBASEBROWSERDATALH;
typedef BASEBROWSERDATAXP BASEBROWSERDATA; typedef BASEBROWSERDATAXP BASEBROWSERDATA;
@ -413,25 +420,19 @@ cpp_quote("#define VIEW_PRIORITY_SHELLEXT_ASBACKUP 0x0015")
cpp_quote("#define VIEW_PRIORITY_DESPERATE 0x00000010") cpp_quote("#define VIEW_PRIORITY_DESPERATE 0x00000010")
cpp_quote("#define VIEW_PRIORITY_NONE 0x00000000") cpp_quote("#define VIEW_PRIORITY_NONE 0x00000000")
typedef struct tagFolderSetData typedef struct tagFolderSetData {
{
FOLDERSETTINGS _fs; FOLDERSETTINGS _fs;
SHELLVIEWID _vidRestore; SHELLVIEWID _vidRestore;
DWORD _dwViewPriority; DWORD _dwViewPriority;
} FOLDERSETDATA; } FOLDERSETDATA, *LPFOLDERSETDATA;
typedef struct tagFolderSetData *LPFOLDERSETDATA; typedef struct SToolbarItem {
typedef struct SToolbarItem
{
IDockingWindow *ptbar; IDockingWindow *ptbar;
BORDERWIDTHS rcBorderTool; BORDERWIDTHS rcBorderTool;
LPWSTR pwszItem; LPWSTR pwszItem;
BOOL fShow; BOOL fShow;
HMONITOR hMon; HMONITOR hMon;
} TOOLBARITEM; } TOOLBARITEM, *LPTOOLBARITEM;
typedef struct SToolbarItem *LPTOOLBARITEM;
cpp_quote("#define ITB_VIEW ((UINT)-1)") cpp_quote("#define ITB_VIEW ((UINT)-1)")
@ -439,40 +440,40 @@ cpp_quote("#define ITB_VIEW ((UINT)-1)")
pointer_default(unique), pointer_default(unique),
local, local,
object, object,
uuid(68BD21CC-438B-11D2-A560-00A0C92DBFE8) uuid(68BD21CC-438B-11d2-A560-00A0C92DBFE8)
] ]
interface IBrowserService2 : IBrowserService interface IBrowserService2 : IBrowserService
{ {
LRESULT WndProcBS( LRESULT WndProcBS(
[in] HWND hwnd, [in] HWND hwnd,
UINT uMsg, [in] UINT uMsg,
WPARAM wParam, [in, out] WPARAM wParam,
LPARAM lParam); [in, out] LPARAM lParam);
HRESULT SetAsDefFolderSettings(); HRESULT SetAsDefFolderSettings();
HRESULT GetViewRect( HRESULT GetViewRect(
[out] RECT *prc); [in, out] RECT *prc);
HRESULT OnSize( HRESULT OnSize(
WPARAM wParam); [in] WPARAM wParam);
HRESULT OnCreate( HRESULT OnCreate(
[in] struct tagCREATESTRUCTW *pcs); [in] struct tagCREATESTRUCTW *pcs);
LRESULT OnCommand( LRESULT OnCommand(
WPARAM wParam, [in] WPARAM wParam,
LPARAM lParam); [in] LPARAM lParam);
HRESULT OnDestroy(); HRESULT OnDestroy();
LRESULT OnNotify( LRESULT OnNotify(
[in] struct tagNMHDR *pnm); [in, out] struct tagNMHDR *pnm);
HRESULT OnSetFocus(); HRESULT OnSetFocus();
HRESULT OnFrameWindowActivateBS( HRESULT OnFrameWindowActivateBS(
BOOL fActive); [in] BOOL fActive);
HRESULT ReleaseShellView(); HRESULT ReleaseShellView();
@ -481,7 +482,7 @@ interface IBrowserService2 : IBrowserService
HRESULT CreateViewWindow( HRESULT CreateViewWindow(
[in] IShellView *psvNew, [in] IShellView *psvNew,
[in] IShellView *psvOld, [in] IShellView *psvOld,
[in] LPRECT prcView, [out] LPRECT prcView,
[out] HWND *phwnd); [out] HWND *phwnd);
HRESULT CreateBrowserPropSheetExt( HRESULT CreateBrowserPropSheetExt(
@ -492,27 +493,27 @@ interface IBrowserService2 : IBrowserService
[out] HWND *phwndView); [out] HWND *phwndView);
HRESULT GetBaseBrowserData( HRESULT GetBaseBrowserData(
[out] LPCBASEBROWSERDATA *pbbd); [in, out] LPCBASEBROWSERDATA *pbbd);
LPBASEBROWSERDATA PutBaseBrowserData(); LPBASEBROWSERDATA PutBaseBrowserData();
HRESULT InitializeTravelLog( HRESULT InitializeTravelLog(
[in] ITravelLog *ptl, [in] ITravelLog *ptl,
DWORD dw); [in] DWORD dw);
HRESULT SetTopBrowser(); HRESULT SetTopBrowser();
HRESULT Offline( HRESULT Offline(
int iCmd); [in] int iCmd);
HRESULT AllowViewResize( HRESULT AllowViewResize(
BOOL f); [in] BOOL f);
HRESULT SetActivateState( HRESULT SetActivateState(
UINT u); [in] UINT u);
HRESULT UpdateSecureLockIcon( HRESULT UpdateSecureLockIcon(
int eSecureLock); [in] int eSecureLock);
HRESULT InitializeDownloadManager(); HRESULT InitializeDownloadManager();
@ -529,14 +530,14 @@ interface IBrowserService2 : IBrowserService
HRESULT _MaySaveChanges(); HRESULT _MaySaveChanges();
HRESULT _PauseOrResumeView( HRESULT _PauseOrResumeView(
BOOL fPaused); [in] BOOL fPaused);
HRESULT _DisableModeless(); HRESULT _DisableModeless();
HRESULT _NavigateToPidl( HRESULT _NavigateToPidl(
[in] LPCITEMIDLIST pidl, [in] LPCITEMIDLIST pidl,
DWORD grfHLNF, [in] DWORD grfHLNF,
DWORD dwFlags); [in] DWORD dwFlags);
HRESULT _TryShell2Rename( HRESULT _TryShell2Rename(
[in] IShellView *psv, [in] IShellView *psv,
@ -546,60 +547,60 @@ interface IBrowserService2 : IBrowserService
HRESULT _ExecChildren( HRESULT _ExecChildren(
[in] IUnknown *punkBar, [in] IUnknown *punkBar,
BOOL fBroadcast, [in] BOOL fBroadcast,
[in] const GUID *pguidCmdGroup, [in] const GUID *pguidCmdGroup,
DWORD nCmdID, [in] DWORD nCmdID,
DWORD nCmdexecopt, [in] DWORD nCmdexecopt,
[in] VARIANTARG *pvarargIn, [in] VARIANTARG *pvarargIn,
[in, out] VARIANTARG *pvarargOut); [in, out] VARIANTARG *pvarargOut);
HRESULT _SendChildren( HRESULT _SendChildren(
[in] HWND hwndBar, [in] HWND hwndBar,
BOOL fBroadcast, [in] BOOL fBroadcast,
UINT uMsg, [in] UINT uMsg,
WPARAM wParam, [in, out] WPARAM wParam,
LPARAM lParam); [in, out] LPARAM lParam);
HRESULT GetFolderSetData( HRESULT GetFolderSetData(
[out] struct tagFolderSetData *pfsd); [in, out] struct tagFolderSetData *pfsd);
HRESULT _OnFocusChange( HRESULT _OnFocusChange(
UINT itb); [in] UINT itb);
HRESULT v_ShowHideChildWindows( HRESULT v_ShowHideChildWindows(
BOOL fChildOnly); [in] BOOL fChildOnly);
UINT _get_itbLastFocus(); UINT _get_itbLastFocus();
HRESULT _put_itbLastFocus( HRESULT _put_itbLastFocus(
UINT itbLastFocus); [in] UINT itbLastFocus);
HRESULT _UIActivateView( HRESULT _UIActivateView(
UINT uState); [in] UINT uState);
HRESULT _GetViewBorderRect( HRESULT _GetViewBorderRect(
[out] RECT *prc); [in, out] RECT* prc);
HRESULT _UpdateViewRectSize(); HRESULT _UpdateViewRectSize();
HRESULT _ResizeNextBorder( HRESULT _ResizeNextBorder(
UINT itb); [in] UINT itb);
HRESULT _ResizeView(); HRESULT _ResizeView();
HRESULT _GetEffectiveClientArea( HRESULT _GetEffectiveClientArea(
[out] LPRECT lprectBorder, [in, out] LPRECT lprectBorder,
[in] HMONITOR hmon); [in] HMONITOR hmon);
IStream *v_GetViewStream( IStream* v_GetViewStream(
[in] LPCITEMIDLIST pidl, [in] LPCITEMIDLIST pidl,
DWORD grfMode, [in] DWORD grfMode,
[in] LPCWSTR pwszName); [in] LPCWSTR pwszName);
LRESULT ForwardViewMsg( LRESULT ForwardViewMsg(
UINT uMsg, [in] UINT uMsg,
WPARAM wParam, [in] WPARAM wParam,
LPARAM lParam); [in] LPARAM lParam);
HRESULT SetAcceleratorMenu( HRESULT SetAcceleratorMenu(
[in] HACCEL hacc); [in] HACCEL hacc);
@ -607,7 +608,7 @@ interface IBrowserService2 : IBrowserService
int _GetToolbarCount(); int _GetToolbarCount();
LPTOOLBARITEM _GetToolbarItem( LPTOOLBARITEM _GetToolbarItem(
int itb); [in] int itb);
HRESULT _SaveToolbars( HRESULT _SaveToolbars(
[in] IStream *pstm); [in] IStream *pstm);
@ -616,18 +617,18 @@ interface IBrowserService2 : IBrowserService
[in] IStream *pstm); [in] IStream *pstm);
HRESULT _CloseAndReleaseToolbars( HRESULT _CloseAndReleaseToolbars(
BOOL fClose); [in] BOOL fClose);
HRESULT v_MayGetNextToolbarFocus( HRESULT v_MayGetNextToolbarFocus(
[in] LPMSG lpMsg, [in] LPMSG lpMsg,
UINT itbNext, [in] UINT itbNext,
int citb, [in] int citb,
[out] LPTOOLBARITEM *pptbi, [out] LPTOOLBARITEM *pptbi,
[out] HWND *phwnd); [out] HWND *phwnd);
HRESULT _ResizeNextBorderHelper( HRESULT _ResizeNextBorderHelper(
UINT itb, [in] UINT itb,
BOOL bUseHmonitor); [in] BOOL bUseHmonitor);
UINT _FindTBar( UINT _FindTBar(
[in] IUnknown *punkSrc); [in] IUnknown *punkSrc);
@ -638,16 +639,16 @@ interface IBrowserService2 : IBrowserService
[in] LPMSG lpMsg); [in] LPMSG lpMsg);
HRESULT v_MayTranslateAccelerator( HRESULT v_MayTranslateAccelerator(
[in] MSG *pmsg); [in] MSG* pmsg);
HRESULT _GetBorderDWHelper( HRESULT _GetBorderDWHelper(
[in] IUnknown *punkSrc, [in] IUnknown *punkSrc,
[out] LPRECT lprectBorder, [in] LPRECT lprectBorder,
BOOL bUseHmonitor); [in] BOOL bUseHmonitor);
HRESULT v_CheckZoneCrossing( HRESULT v_CheckZoneCrossing(
[in] LPCITEMIDLIST pidl); [in, out] LPCITEMIDLIST pidl);
} };
[ [
pointer_default(unique), pointer_default(unique),
@ -662,11 +663,11 @@ interface IBrowserService3 : IBrowserService2
[in] LPRECT prc); [in] LPRECT prc);
HRESULT IEParseDisplayNameEx( HRESULT IEParseDisplayNameEx(
UINT uiCP, [in] UINT uiCP,
[in] LPCWSTR pwszPath, [in] LPCWSTR pwszPath,
DWORD dwFlags, [in] DWORD dwFlags,
[out] LPITEMIDLIST *ppidlOut); [out] LPITEMIDLIST *ppidlOut);
} };
[ [
pointer_default(unique), pointer_default(unique),
@ -677,9 +678,9 @@ interface IBrowserService3 : IBrowserService2
interface IBrowserService4 : IBrowserService3 interface IBrowserService4 : IBrowserService3
{ {
HRESULT ActivateView( HRESULT ActivateView(
BOOL fPendingView); [in] BOOL fPendingView);
HRESULT SaveViewState(); HRESULT SaveViewState();
HRESULT _ResizeAllBorders(); HRESULT _ResizeAllBorders();
} };