private:
HRESULT _MergeToolbar();
BOOL _Sort();
- VOID _DoFolderViewCB(UINT uMsg, WPARAM wParam, LPARAM lParam);
+ HRESULT _DoFolderViewCB(UINT uMsg, WPARAM wParam, LPARAM lParam);
public:
CDefView();
*/
BOOL CDefView::CreateList()
{
+ HRESULT hr;
DWORD dwStyle, dwExStyle;
+ UINT ViewMode;
TRACE("%p\n", this);
else
dwStyle |= LVS_ALIGNTOP | LVS_SHOWSELALWAYS;
+ ViewMode = m_FolderSettings.ViewMode;
+ hr = _DoFolderViewCB(SFVM_DEFVIEWMODE, NULL, (LPARAM)&ViewMode);
+ if (SUCCEEDED(hr))
+ {
+ if (ViewMode >= FVM_FIRST && ViewMode <= FVM_LAST)
+ m_FolderSettings.ViewMode = ViewMode;
+ else
+ ERR("Ignoring invalid ViewMode from SFVM_DEFVIEWMODE: %u (was: %u)\n", ViewMode, m_FolderSettings.ViewMode);
+ }
+
switch (m_FolderSettings.ViewMode)
{
case FVM_ICON:
return S_OK;
}
-VOID CDefView::_DoFolderViewCB(UINT uMsg, WPARAM wParam, LPARAM lParam)
+HRESULT CDefView::_DoFolderViewCB(UINT uMsg, WPARAM wParam, LPARAM lParam)
{
if (m_pShellFolderViewCB)
{
- m_pShellFolderViewCB->MessageSFVCB(uMsg, wParam, lParam);
+ return m_pShellFolderViewCB->MessageSFVCB(uMsg, wParam, lParam);
}
+ return E_NOINTERFACE;
}
HRESULT CDefView_CreateInstance(IShellFolder *pFolder, REFIID riid, LPVOID * ppvOut)