#include "precomp.h"
#include <atlwin.h>
+#include <rosctrls.h>
WINE_DEFAULT_DEBUG_CHANNEL(shell);
static const WCHAR SV_CLASS_NAME[] = {'S', 'H', 'E', 'L', 'L', 'D', 'L', 'L', '_', 'D', 'e', 'f', 'V', 'i', 'e', 'w', 0};
typedef struct
-{ BOOL bIsAscending;
+{
+ BOOL bIsAscending;
INT nHeaderID;
INT nLastHeaderID;
} LISTVIEW_SORT_INFO, *LPLISTVIEW_SORT_INFO;
CComPtr<IShellFolder2> m_pSF2Parent;
CComPtr<IShellBrowser> m_pShellBrowser;
CComPtr<ICommDlgBrowser> m_pCommDlgBrowser;
- HWND m_hWndList; /* ListView control */
+ CListView m_ListView;
HWND m_hWndParent;
FOLDERSETTINGS m_FolderSettings;
HMENU m_hMenu;
+ BOOL m_menusLoaded;
UINT m_uState;
UINT m_cidl;
LPITEMIDLIST *m_apidl;
POINT m_ptLastMousePos; /* Mouse position at last DragOver call */
//
CComPtr<IContextMenu> m_pCM;
+
+ BOOL m_isEditing;
+
+ CLSID m_Category;
+ HMENU m_hView;
+ private:
+
+ HRESULT _MergeToolbar();
+
public:
CDefView();
~CDefView();
void UpdateListColors();
BOOL InitList();
static INT CALLBACK CompareItems(LPVOID lParam1, LPVOID lParam2, LPARAM lpData);
- static INT CALLBACK ListViewCompareItems(LPVOID lParam1, LPVOID lParam2, LPARAM lpData);
+ static INT CALLBACK ListViewCompareItems(LPARAM lParam1, LPARAM lParam2, LPARAM lpData);
int LV_FindItemByPidl(LPCITEMIDLIST pidl);
BOOLEAN LV_AddItem(LPCITEMIDLIST pidl);
BOOLEAN LV_DeleteItem(LPCITEMIDLIST pidl);
static INT CALLBACK fill_list(LPVOID ptr, LPVOID arg);
HRESULT FillList();
HMENU BuildFileMenu();
- void MergeFileMenu(HMENU hSubMenu);
- void MergeViewMenu(HMENU hSubMenu);
+ void PrepareShowFileMenu(HMENU hSubMenu);
+ void PrepareShowViewMenu(HMENU hSubMenu);
UINT GetSelections();
HRESULT OpenSelectedItems();
void OnDeactivate();
virtual HRESULT STDMETHODCALLTYPE GetDefaultSpacing(POINT *ppt);
virtual HRESULT STDMETHODCALLTYPE GetAutoArrange();
virtual HRESULT STDMETHODCALLTYPE SelectItem(int iItem, DWORD dwFlags);
- virtual HRESULT STDMETHODCALLTYPE SelectAndPositionItems(UINT cidl, LPCITEMIDLIST *apidl, POINT *apt, DWORD dwFlags);
+ virtual HRESULT STDMETHODCALLTYPE SelectAndPositionItems(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, POINT *apt, DWORD dwFlags);
// *** IShellFolderView methods ***
virtual HRESULT STDMETHODCALLTYPE Rearrange(LPARAM sort);
virtual HRESULT STDMETHODCALLTYPE GetArrangeParam(LPARAM *sort);
virtual HRESULT STDMETHODCALLTYPE ArrangeGrid();
virtual HRESULT STDMETHODCALLTYPE AutoArrange();
- virtual HRESULT STDMETHODCALLTYPE IShellFolderView_GetAutoArrange();
virtual HRESULT STDMETHODCALLTYPE AddObject(PITEMID_CHILD pidl, UINT *item);
virtual HRESULT STDMETHODCALLTYPE GetObject(PITEMID_CHILD *pidl, UINT item);
virtual HRESULT STDMETHODCALLTYPE RemoveObject(PITEMID_CHILD pidl, UINT *item);
LRESULT OnChangeNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
LRESULT OnCustomItem(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
LRESULT OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
+ LRESULT OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
static ATL::CWndClassInfo& GetWndClassInfo()
{
MESSAGE_HANDLER(WM_SYSCOLORCHANGE, OnSysColorChange)
MESSAGE_HANDLER(CWM_GETISHELLBROWSER, OnGetShellBrowser)
MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChange)
+ MESSAGE_HANDLER(WM_INITMENUPOPUP, OnInitMenuPopup)
END_MSG_MAP()
BEGIN_COM_MAP(CDefView)
#define GET_WM_COMMAND_HWND(wp, lp) (HWND)(lp)
#define GET_WM_COMMAND_CMD(wp, lp) HIWORD(wp)
-/*
- Items merged into the toolbar and the filemenu
-*/
-typedef struct
-{ int idCommand;
- int iImage;
- int idButtonString;
- int idMenuString;
- BYTE bState;
- BYTE bStyle;
-} MYTOOLINFO, *LPMYTOOLINFO;
-
-static const MYTOOLINFO Tools[] =
-{
- { FCIDM_SHVIEW_BIGICON, 0, 0, IDS_VIEW_LARGE, TBSTATE_ENABLED, BTNS_BUTTON },
- { FCIDM_SHVIEW_SMALLICON, 0, 0, IDS_VIEW_SMALL, TBSTATE_ENABLED, BTNS_BUTTON },
- { FCIDM_SHVIEW_LISTVIEW, 0, 0, IDS_VIEW_LIST, TBSTATE_ENABLED, BTNS_BUTTON },
- { FCIDM_SHVIEW_REPORTVIEW, 0, 0, IDS_VIEW_DETAILS, TBSTATE_ENABLED, BTNS_BUTTON },
- { -1, 0, 0, 0, 0, 0}
-};
-
typedef void (CALLBACK *PFNSHGETSETTINGSPROC)(LPSHELLFLAGSTATE lpsfs, DWORD dwMask);
-CDefView::CDefView()
-{
- m_hWndList = NULL;
- m_hWndParent = NULL;
- m_FolderSettings.fFlags = 0;
- m_FolderSettings.ViewMode = 0;
- m_hMenu = NULL;
- m_uState = 0;
- m_cidl = 0;
- m_apidl = NULL;
- m_sortInfo.bIsAscending = FALSE;
- m_sortInfo.nHeaderID = 0;
- m_sortInfo.nLastHeaderID = 0;
- m_hNotify = 0;
- m_hAccel = NULL;
- m_dwAspects = 0;
- m_dwAdvf = 0;
- m_iDragOverItem = 0;
- m_cScrollDelay = 0;
- m_ptLastMousePos.x = 0;
- m_ptLastMousePos.y = 0;
+CDefView::CDefView() :
+ m_ListView(),
+ m_hWndParent(NULL),
+ m_hMenu(NULL),
+ m_menusLoaded(FALSE),
+ m_uState(0),
+ m_cidl(0),
+ m_apidl(NULL),
+ m_hNotify(0),
+ m_hAccel(NULL),
+ m_dwAspects(0),
+ m_dwAdvf(0),
+ m_iDragOverItem(0),
+ m_cScrollDelay(0),
+ m_isEditing(FALSE),
+ m_hView(NULL)
+{
+ ZeroMemory(&m_FolderSettings, sizeof(m_FolderSettings));
+ ZeroMemory(&m_sortInfo, sizeof(m_sortInfo));
+ ZeroMemory(&m_ptLastMousePos, sizeof(m_ptLastMousePos));
+ ZeroMemory(&m_Category, sizeof(m_Category));
}
CDefView::~CDefView()
{
TRACE(" destroying IShellView(%p)\n", this);
+ if (m_hWnd)
+ {
+ DestroyViewWindow();
+ }
+
SHFree(m_apidl);
}
TRACE("(%p)\n", this);
- tmpstyle = ::GetWindowLongPtrW(m_hWndList, GWL_STYLE);
- ::SetWindowLongPtrW(m_hWndList, GWL_STYLE, dwAdd | (tmpstyle & ~dwRemove));
+ tmpstyle = ::GetWindowLongPtrW(m_ListView, GWL_STYLE);
+ ::SetWindowLongPtrW(m_ListView, GWL_STYLE, dwAdd | (tmpstyle & ~dwRemove));
}
/**********************************************************
if (m_FolderSettings.fFlags & FWF_DESKTOP)
dwStyle |= LVS_ALIGNLEFT;
else
- dwStyle |= LVS_ALIGNTOP;
+ dwStyle |= LVS_ALIGNTOP | LVS_SHOWSELALWAYS;
switch (m_FolderSettings.ViewMode)
{
if (m_FolderSettings.fFlags & FWF_NOCLIENTEDGE)
dwExStyle &= ~WS_EX_CLIENTEDGE;
- m_hWndList = CreateWindowExW( dwExStyle,
- WC_LISTVIEWW,
- NULL,
- dwStyle,
- 0, 0, 0, 0,
- m_hWnd,
- (HMENU)ID_LISTVIEW,
- shell32_hInstance,
- NULL);
-
- if (!m_hWndList)
+ RECT rcListView = {0,0,0,0};
+ m_ListView.Create(m_hWnd, rcListView, NULL,dwStyle, dwExStyle, ID_LISTVIEW);
+
+ if (!m_ListView)
return FALSE;
m_sortInfo.bIsAscending = TRUE;
L"ListviewShadow", RRF_RT_DWORD, NULL, &bDropShadow, &cbDropShadow);
if (bDropShadow && SystemParametersInfoW(SPI_GETDESKWALLPAPER, _countof(wszBuf), wszBuf, 0) && wszBuf[0])
{
- SendMessageW(m_hWndList, LVM_SETTEXTBKCOLOR, 0, CLR_NONE);
- SendMessageW(m_hWndList, LVM_SETBKCOLOR, 0, CLR_NONE);
- SendMessageW(m_hWndList, LVM_SETTEXTCOLOR, 0, RGB(255, 255, 255));
- SendMessageW(m_hWndList, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_TRANSPARENTSHADOWTEXT, LVS_EX_TRANSPARENTSHADOWTEXT);
+ m_ListView.SetTextBkColor(CLR_NONE);
+ m_ListView.SetBkColor(CLR_NONE);
+ m_ListView.SetTextColor(RGB(255, 255, 255));
+ m_ListView.SetExtendedListViewStyle(LVS_EX_TRANSPARENTSHADOWTEXT, LVS_EX_TRANSPARENTSHADOWTEXT);
}
else
{
COLORREF crDesktop = GetSysColor(COLOR_DESKTOP);
- SendMessageW(m_hWndList, LVM_SETTEXTBKCOLOR, 0, crDesktop);
- SendMessageW(m_hWndList, LVM_SETBKCOLOR, 0, crDesktop);
+ m_ListView.SetTextBkColor(crDesktop);
+ m_ListView.SetBkColor(crDesktop);
if (GetRValue(crDesktop) + GetGValue(crDesktop) + GetBValue(crDesktop) > 128 * 3)
- SendMessageW(m_hWndList, LVM_SETTEXTCOLOR, 0, RGB(0, 0, 0));
+ m_ListView.SetTextColor(RGB(0, 0, 0));
else
- SendMessageW(m_hWndList, LVM_SETTEXTCOLOR, 0, RGB(255, 255, 255));
- SendMessageW(m_hWndList, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_TRANSPARENTSHADOWTEXT, 0);
+ m_ListView.SetTextColor(RGB(255, 255, 255));
+ m_ListView.SetExtendedListViewStyle(LVS_EX_TRANSPARENTSHADOWTEXT);
}
}
}
*/
BOOL CDefView::InitList()
{
- LVCOLUMNW lvColumn;
SHELLDETAILS sd;
WCHAR szTemp[50];
TRACE("%p\n", this);
- SendMessageW(m_hWndList, LVM_DELETEALLITEMS, 0, 0);
-
- lvColumn.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT;
- lvColumn.pszText = szTemp;
+ m_ListView.DeleteAllItems();
if (m_pSF2Parent)
{
{
if (FAILED(m_pSF2Parent->GetDetailsOf(NULL, i, &sd)))
break;
-
- lvColumn.fmt = sd.fmt;
- lvColumn.cx = sd.cxChar * 8; /* chars->pixel */
StrRetToStrNW( szTemp, 50, &sd.str, NULL);
- SendMessageW(m_hWndList, LVM_INSERTCOLUMNW, i, (LPARAM) &lvColumn);
+ m_ListView.InsertColumn(i, szTemp, sd.fmt, sd.cxChar * 8);
+
}
}
else
FIXME("no SF2\n");
}
- SendMessageW(m_hWndList, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)ShellSmallIconList);
- SendMessageW(m_hWndList, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)ShellBigIconList);
+ m_ListView.SetImageList(ShellBigIconList, LVSIL_NORMAL);
+ m_ListView.SetImageList(ShellSmallIconList, LVSIL_SMALL);
return TRUE;
}
* the way this function works is only usable if we had only
* filesystemfolders (25/10/99 jsch)
*/
-INT CALLBACK CDefView::ListViewCompareItems(LPVOID lParam1, LPVOID lParam2, LPARAM lpData)
+INT CALLBACK CDefView::ListViewCompareItems(LPARAM lParam1, LPARAM lParam2, LPARAM lpData)
{
INT nDiff = 0;
FILETIME fd1, fd2;
*/
int CDefView::LV_FindItemByPidl(LPCITEMIDLIST pidl)
{
- LVITEMW lvItem;
- lvItem.iSubItem = 0;
- lvItem.mask = LVIF_PARAM;
+ int cItems = m_ListView.GetItemCount();
- for (lvItem.iItem = 0;
- SendMessageW(m_hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem);
- lvItem.iItem++)
+ for (int i = 0; i<cItems; i++)
{
- LPITEMIDLIST currentpidl = (LPITEMIDLIST) lvItem.lParam;
+ LPITEMIDLIST currentpidl = reinterpret_cast<LPITEMIDLIST>(m_ListView.GetItemData(i));
HRESULT hr = m_pSFParent->CompareIDs(0, pidl, currentpidl);
if (SUCCEEDED(hr) && !HRESULT_CODE(hr))
{
- return lvItem.iItem;
+ return i;
}
}
return -1;
TRACE("(%p)(pidl=%p)\n", this, pidl);
lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM; /*set the mask*/
- lvItem.iItem = ListView_GetItemCount(m_hWndList); /*add the item to the end of the list*/
+ lvItem.iItem = m_ListView.GetItemCount(); /*add the item to the end of the list*/
lvItem.iSubItem = 0;
- lvItem.lParam = (LPARAM) ILClone(ILFindLastID(pidl)); /*set the item's data*/
- lvItem.pszText = LPSTR_TEXTCALLBACKW; /*get text on a callback basis*/
- lvItem.iImage = I_IMAGECALLBACK; /*get the image on a callback basis*/
+ lvItem.lParam = (LPARAM) ILClone(ILFindLastID(pidl)); /*set the item's data*/
+ lvItem.pszText = LPSTR_TEXTCALLBACKW; /*get text on a callback basis*/
+ lvItem.iImage = I_IMAGECALLBACK; /*get the image on a callback basis*/
- if (SendMessageW(m_hWndList, LVM_INSERTITEMW, 0, (LPARAM)&lvItem) == -1)
+ if (m_ListView.InsertItem(&lvItem) == -1)
return FALSE;
else
return TRUE;
nIndex = LV_FindItemByPidl(ILFindLastID(pidl));
- return (-1 == ListView_DeleteItem(m_hWndList, nIndex)) ? FALSE : TRUE;
+ return (-1 == m_ListView.DeleteItem(nIndex)) ? FALSE : TRUE;
}
/**********************************************************
{
lvItem.mask = LVIF_PARAM; /* only the pidl */
lvItem.iItem = nItem;
- SendMessageW(m_hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem);
+ m_ListView.GetItem(&lvItem);
SHFree((LPITEMIDLIST)lvItem.lParam);
lvItem.mask = LVIF_PARAM|LVIF_IMAGE;
lvItem.iItem = nItem;
lvItem.lParam = (LPARAM) ILClone(ILFindLastID(pidlNew)); /* set the item's data */
lvItem.iImage = SHMapPIDLToSystemImageListIndex(m_pSFParent, pidlNew, 0);
- SendMessageW(m_hWndList, LVM_SETITEMW, 0, (LPARAM) &lvItem);
- SendMessageW(m_hWndList, LVM_UPDATE, nItem, 0);
+ m_ListView.SetItem(&lvItem);
+ m_ListView.Update(nItem);
return TRUE; /* FIXME: better handling */
}
INT CALLBACK CDefView::fill_list( LPVOID ptr, LPVOID arg )
{
LPITEMIDLIST pidl = (LPITEMIDLIST)ptr;
- CDefView *pThis = (CDefView *)arg;
+ CDefView *pThis = static_cast<CDefView *>(arg);
/* in a commdlg This works as a filemask*/
if (pThis->IncludeObject(pidl) == S_OK)
pThis->LV_AddItem(pidl);
DPA_Sort(hdpa, CompareItems, (LPARAM)m_pSFParent.p);
/*turn the listview's redrawing off*/
- SendMessageA(m_hWndList, WM_SETREDRAW, FALSE, 0);
+ m_ListView.SetRedraw(FALSE);
DPA_DestroyCallback( hdpa, fill_list, (void *)this);
/*turn the listview's redrawing back on and force it to draw*/
- SendMessageA(m_hWndList, WM_SETREDRAW, TRUE, 0);
+ m_ListView.SetRedraw(TRUE);
pEnumIDList->Release(); /* destroy the list*/
LRESULT CDefView::OnShowWindow(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
{
- ::UpdateWindow(m_hWndList);
+ m_ListView.UpdateWindow();
bHandled = FALSE;
return 0;
}
LRESULT CDefView::OnGetDlgCode(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
{
- return SendMessageW(m_hWndList, uMsg, 0, 0);
+ return m_ListView.SendMessageW(uMsg, 0, 0);
}
LRESULT CDefView::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
{
+ if (m_hMenu)
+ DestroyMenu(m_hMenu);
RevokeDragDrop(m_hWnd);
SHChangeNotifyDeregister(m_hNotify);
bHandled = FALSE;
UpdateListColors();
/* Forward WM_SYSCOLORCHANGE to common controls */
- return SendMessageW(m_hWndList, uMsg, 0, 0);
+ return m_ListView.SendMessageW(uMsg, 0, 0);
}
LRESULT CDefView::OnGetShellBrowser(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
SHFree((LPITEMIDLIST)ntreg.pidl);
}
- m_hAccel = LoadAcceleratorsA(shell32_hInstance, MAKEINTRESOURCEA( IDA_SHELLVIEW));
+ m_hAccel = LoadAcceleratorsW(shell32_hInstance, MAKEINTRESOURCEW(IDA_SHELLVIEW));
return S_OK;
}
* #### Handling of the menus ####
*/
-/**********************************************************
-* ShellView_BuildFileMenu()
-*/
HMENU CDefView::BuildFileMenu()
-{ WCHAR szText[MAX_PATH];
- MENUITEMINFOW mii;
- int nTools, i;
- HMENU hSubMenu;
+{
+ HRESULT hr;
+ CComPtr<IContextMenu> cm;
- TRACE("(%p)\n", this);
+ GetSelections();
- hSubMenu = CreatePopupMenu();
- if (hSubMenu)
- {
- /*get the number of items in our global array*/
- for(nTools = 0; Tools[nTools].idCommand != -1; nTools++) {}
+ LPCITEMIDLIST * apidl = (LPCITEMIDLIST *)m_apidl;
- /*add the menu items*/
- for(i = 0; i < nTools; i++)
- {
- LoadStringW(shell32_hInstance, Tools[i].idMenuString, szText, MAX_PATH);
+ hr = m_pSFParent->GetUIObjectOf(m_hWnd, m_cidl, apidl, IID_NULL_PPV_ARG(IContextMenu, &cm));
+ if (FAILED(hr))
+ return NULL;
- ZeroMemory(&mii, sizeof(mii));
- mii.cbSize = sizeof(mii);
- mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE;
+ HMENU hmenu = CreatePopupMenu();
- if(BTNS_SEP != Tools[i].bStyle) /* no separator*/
- {
- mii.fType = MFT_STRING;
- mii.fState = MFS_ENABLED;
- mii.dwTypeData = szText;
- mii.wID = Tools[i].idCommand;
- }
- else
- {
- mii.fType = MFT_SEPARATOR;
- }
- /* tack This item onto the end of the menu */
- InsertMenuItemW(hSubMenu, (UINT) - 1, TRUE, &mii);
- }
- }
+ //FIXME: get proper numbers ?
+ const UINT first = 0x7800;
+ const UINT last = 0x7A00;
+ hr = cm->QueryContextMenu(hmenu, 0, first, last, 0);
+ if (FAILED(hr))
+ return NULL;
- TRACE("-- return (menu=%p)\n", hSubMenu);
- return hSubMenu;
+ // TODO: filter or something
+
+ return hmenu;
}
-/**********************************************************
-* ShellView_MergeFileMenu()
-*/
-void CDefView::MergeFileMenu(HMENU hSubMenu)
+void CDefView::PrepareShowFileMenu(HMENU hSubMenu)
{
TRACE("(%p)->(submenu=%p) stub\n", this, hSubMenu);
- if (hSubMenu)
- { /*insert This item at the beginning of the menu */
- _InsertMenuItemW(hSubMenu, 0, TRUE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED);
- _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM+4, MFT_STRING, L"Properties", MFS_DISABLED);
- _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM+3, MFT_STRING, L"Rename", MFS_DISABLED);
- _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM+2, MFT_STRING, L"Delete", MFS_DISABLED);
- _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM+1, MFT_STRING, L"Create Shortcut", MFS_DISABLED);
- _InsertMenuItemW(hSubMenu, 0, TRUE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED);
- _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM, MFT_STRING, L"New", MFS_ENABLED);
+ if (!hSubMenu)
+ return;
+
+ /* Cleanup the items added previously */
+ for (int i = 0; i < GetMenuItemCount(hSubMenu); )
+ {
+ MENUITEMINFOW mii;
+ mii.cbSize = sizeof(mii);
+ mii.fMask = MIIM_ID;
+ GetMenuItemInfoW(hSubMenu, i, TRUE, &mii);
+
+ if (mii.wID < 0x8000)
+ {
+ DeleteMenu(hSubMenu, i, MF_BYPOSITION);
+ }
+ else
+ {
+ i++;
+ }
}
+ /* Insert This item at the beginning of the menu. */
+ _InsertMenuItemW(hSubMenu, 0, TRUE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED);
+ _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM + 4, MFT_STRING, L"Properties", MFS_DISABLED);
+ _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM + 3, MFT_STRING, L"Rename", MFS_DISABLED);
+ _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM + 2, MFT_STRING, L"Delete", MFS_DISABLED);
+ _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM + 1, MFT_STRING, L"Create Shortcut", MFS_DISABLED);
+ _InsertMenuItemW(hSubMenu, 0, TRUE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED);
+ _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM, MFT_STRING, L"New", MFS_ENABLED);
+
+ HMENU menubase = BuildFileMenu();
+ if (menubase)
+ {
+ int count = ::GetMenuItemCount(menubase);
+
+ for (int i = 0; i < count; i++)
+ {
+ WCHAR label[128];
+
+ MENUITEMINFOW mii = { 0 };
+ mii.cbSize = sizeof(mii);
+ mii.fMask = MIIM_STATE | MIIM_ID | MIIM_SUBMENU | MIIM_CHECKMARKS | MIIM_DATA | MIIM_STRING | MIIM_BITMAP | MIIM_FTYPE;
+ mii.dwTypeData = label;
+ mii.cch = _countof(label);
+ ::GetMenuItemInfoW(menubase, i, TRUE, &mii);
+
+ TRACE("Adding item %d label %S type %d\n", mii.wID, mii.dwTypeData, mii.fType);
+
+ mii.fType |= MFT_RADIOCHECK;
+
+ ::InsertMenuItemW(hSubMenu, IDM_MYFILEITEM, FALSE, &mii);
+ }
+
+ _InsertMenuItemW(hSubMenu, IDM_MYFILEITEM, FALSE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED);
+
+ ::DestroyMenu(menubase);
+ }
TRACE("--\n");
}
-/**********************************************************
-* ShellView_MergeViewMenu()
-*/
-void CDefView::MergeViewMenu(HMENU hSubMenu)
+void CDefView::PrepareShowViewMenu(HMENU hSubMenu)
{
TRACE("(%p)->(submenu=%p)\n", this, hSubMenu);
- if (hSubMenu)
- {
- /*add a separator at the correct position in the menu*/
- MENUITEMINFOW mii;
- static WCHAR view[] = L"View";
-
- _InsertMenuItemW(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED);
+ if (!hSubMenu)
+ return;
- ZeroMemory(&mii, sizeof(mii));
- mii.cbSize = sizeof(mii);
- mii.fMask = MIIM_SUBMENU | MIIM_TYPE | MIIM_DATA;
- mii.fType = MFT_STRING;
- mii.dwTypeData = view;
- mii.hSubMenu = LoadMenuW(shell32_hInstance, L"MENU_001");
- InsertMenuItemW(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, &mii);
+ if (m_FolderSettings.ViewMode >= FVM_FIRST && m_FolderSettings.ViewMode <= FVM_LAST)
+ {
+ UINT iItemFirst = FCIDM_SHVIEW_BIGICON;
+ UINT iItemLast = iItemFirst + FVM_LAST - FVM_FIRST;
+ UINT iItem = iItemFirst + m_FolderSettings.ViewMode - FVM_FIRST;
+ CheckMenuRadioItem(hSubMenu, iItemFirst, iItemLast, iItem, MF_BYCOMMAND);
}
}
*/
UINT CDefView::GetSelections()
{
- LVITEMW lvItem;
- UINT i = 0;
-
SHFree(m_apidl);
- m_cidl = ListView_GetSelectedCount(m_hWndList);
+ m_cidl = m_ListView.GetSelectedCount();
m_apidl = (LPITEMIDLIST*)SHAlloc(m_cidl * sizeof(LPITEMIDLIST));
-
- TRACE("selected=%i\n", m_cidl);
-
- if (m_apidl)
+ if (!m_apidl)
{
- TRACE("-- Items selected =%u\n", m_cidl);
+ m_cidl = 0;
+ return 0;
+ }
- lvItem.mask = LVIF_STATE | LVIF_PARAM;
- lvItem.stateMask = LVIS_SELECTED;
- lvItem.iItem = 0;
- lvItem.iSubItem = 0;
- lvItem.state = 0;
+ TRACE("-- Items selected =%u\n", m_cidl);
- while(SendMessageW(m_hWndList, LVM_GETITEMW, 0, (LPARAM)&lvItem) && (i < m_cidl))
- {
- if(lvItem.state & LVIS_SELECTED)
- {
- m_apidl[i] = (LPITEMIDLIST)lvItem.lParam;
- i++;
- if (i == m_cidl)
- break;
- TRACE("-- selected Item found\n");
- }
- lvItem.iItem++;
- }
+ UINT i = 0;
+ int lvIndex = -1;
+ while ((lvIndex = m_ListView.GetNextItem(lvIndex, LVNI_SELECTED)) > -1)
+ {
+ m_apidl[i] = (LPITEMIDLIST)m_ListView.GetItemData(lvIndex);
+ i++;
+ if (i == m_cidl)
+ break;
+ TRACE("-- selected Item found\n");
}
return m_cidl;
UINT uCommand;
HRESULT hResult;
- m_cidl = ListView_GetSelectedCount(m_hWndList);
+ m_cidl = m_ListView.GetSelectedCount();
if (m_cidl == 0)
return S_OK;
if (!hMenu)
return E_FAIL;
- m_cidl = ListView_GetSelectedCount(m_hWndList);
+ m_cidl = m_ListView.GetSelectedCount();
hResult = GetItemObject( m_cidl ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_PPV_ARG(IContextMenu, &m_pCM));
if (FAILED( hResult))
TRACE("%p width=%u height=%u\n", this, wWidth, wHeight);
/*resize the ListView to fit our window*/
- if (m_hWndList)
+ if (m_ListView)
{
- ::MoveWindow(m_hWndList, 0, 0, wWidth, wHeight, TRUE);
+ ::MoveWindow(m_ListView, 0, 0, wWidth, wHeight, TRUE);
}
return 0;
if (m_uState != SVUIA_DEACTIVATE)
{
- if (m_hMenu)
- {
- m_pShellBrowser->SetMenuSB(0, 0, 0);
- m_pShellBrowser->RemoveMenusSB(m_hMenu);
- DestroyMenu(m_hMenu);
- m_hMenu = 0;
- }
+ // TODO: cleanup menu after deactivation
m_uState = SVUIA_DEACTIVATE;
}
void CDefView::DoActivate(UINT uState)
{
- OLEMENUGROUPWIDTHS omw = { {0, 0, 0, 0, 0, 0} };
- MENUITEMINFOA mii;
- CHAR szText[MAX_PATH];
-
TRACE("%p uState=%x\n", this, uState);
/*don't do anything if the state isn't really changing */
return;
}
- OnDeactivate();
-
- /*only do This if we are active */
- if(uState != SVUIA_DEACTIVATE)
+ if (uState == SVUIA_DEACTIVATE)
+ {
+ OnDeactivate();
+ }
+ else
{
- /*merge the menus */
- m_hMenu = CreateMenu();
-
if(m_hMenu)
{
- m_pShellBrowser->InsertMenusSB(m_hMenu, &omw);
- TRACE("-- after fnInsertMenusSB\n");
+ if (!m_menusLoaded)
+ {
+ MENUITEMINFOW mii = { 0 };
- /*build the top level menu get the menu item's text*/
- strcpy(szText, "dummy 31");
+ /* initialize EDIT menu */
+ mii.cbSize = sizeof(mii);
+ mii.fMask = MIIM_SUBMENU;
+ if (::GetMenuItemInfoW(m_hMenu, FCIDM_MENU_EDIT, FALSE, &mii))
+ {
+ HMENU hSubMenu = mii.hSubMenu;
- ZeroMemory(&mii, sizeof(mii));
- mii.cbSize = sizeof(mii);
- mii.fMask = MIIM_SUBMENU | MIIM_TYPE | MIIM_STATE;
- mii.fType = MFT_STRING;
- mii.fState = MFS_ENABLED;
- mii.dwTypeData = szText;
- mii.hSubMenu = BuildFileMenu();
-
- /*get the view menu so we can merge with it*/
- ZeroMemory(&mii, sizeof(mii));
- mii.cbSize = sizeof(mii);
- mii.fMask = MIIM_SUBMENU;
+ HMENU menubase = ::LoadMenuW(shell32_hInstance, L"MENU_003");
- if (GetMenuItemInfoA(m_hMenu, FCIDM_MENU_VIEW, FALSE, &mii))
- {
- MergeViewMenu(mii.hSubMenu);
- }
+ int count = ::GetMenuItemCount(menubase);
+ for (int i = 0; i < count; i++)
+ {
+ WCHAR label[128];
+
+ ZeroMemory(&mii, sizeof(mii));
+ mii.cbSize = sizeof(mii);
+ mii.fMask = MIIM_STATE | MIIM_ID | MIIM_SUBMENU | MIIM_CHECKMARKS | MIIM_DATA | MIIM_STRING | MIIM_BITMAP | MIIM_FTYPE;
+ mii.dwTypeData = label;
+ mii.cch = _countof(label);
+ ::GetMenuItemInfoW(menubase, i, TRUE, &mii);
+
+ TRACE("Adding item %d label %S type %d\n", mii.wID, mii.dwTypeData, mii.fType);
+
+ mii.fType |= MFT_RADIOCHECK;
+
+ ::InsertMenuItemW(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, &mii);
+ }
+
+ ::DestroyMenu(menubase);
+ }
+
+ /* initialize VIEW menu */
- /*add the items that should only be added if we have the focus*/
- if (SVUIA_ACTIVATE_FOCUS == uState)
- {
- /*get the file menu so we can merge with it */
- ZeroMemory(&mii, sizeof(mii));
mii.cbSize = sizeof(mii);
mii.fMask = MIIM_SUBMENU;
-
- if (GetMenuItemInfoA(m_hMenu, FCIDM_MENU_FILE, FALSE, &mii))
+ if (::GetMenuItemInfoW(m_hMenu, FCIDM_MENU_VIEW, FALSE, &mii))
{
- MergeFileMenu(mii.hSubMenu);
+ HMENU menubase = ::LoadMenuW(shell32_hInstance, L"MENU_001");
+
+ HMENU hSubMenu = mii.hSubMenu;
+
+ m_hView = CreatePopupMenu();
+
+ _InsertMenuItemW(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED);
+
+ int count = ::GetMenuItemCount(menubase);
+ for (int i = 0; i < count; i++)
+ {
+ WCHAR label[128];
+
+ ZeroMemory(&mii, sizeof(mii));
+ mii.cbSize = sizeof(mii);
+ mii.fMask = MIIM_STATE | MIIM_ID | MIIM_SUBMENU | MIIM_CHECKMARKS | MIIM_DATA | MIIM_STRING | MIIM_BITMAP | MIIM_FTYPE;
+ mii.dwTypeData = label;
+ mii.cch = _countof(label);
+ ::GetMenuItemInfoW(menubase, i, TRUE, &mii);
+
+ ::AppendMenuW(m_hView, mii.fType, mii.wID, mii.dwTypeData);
+
+ TRACE("Adding item %d label %S type %d\n", mii.wID, mii.dwTypeData, mii.fType);
+
+ mii.fType |= MFT_RADIOCHECK;
+
+ ::InsertMenuItemW(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, &mii);
+ }
+
+ ::DestroyMenu(menubase);
}
+
+
+ TRACE("-- before fnSetMenuSB\n");
+ m_pShellBrowser->SetMenuSB(m_hMenu, 0, m_hWnd);
+
+ m_menusLoaded = TRUE;
}
+ }
- TRACE("-- before fnSetMenuSB\n");
- m_pShellBrowser->SetMenuSB(m_hMenu, 0, m_hWnd);
+ if (SVUIA_ACTIVATE_FOCUS == uState)
+ {
+ m_ListView.SetFocus();
}
}
+
m_uState = uState;
TRACE("--\n");
}
DoActivate(SVUIA_ACTIVATE_FOCUS);
/* Set the focus to the listview */
- ::SetFocus(m_hWndList);
+ m_ListView.SetFocus();
/* Notify the ICommDlgBrowser interface */
OnStateChange(CDBOSC_SETFOCUS);
m_sortInfo.nHeaderID = (LPARAM) (dwCmdID - 0x30);
m_sortInfo.bIsAscending = TRUE;
m_sortInfo.nLastHeaderID = m_sortInfo.nHeaderID;
- SendMessageA(m_hWndList, LVM_SORTITEMS, (WPARAM) &m_sortInfo, (LPARAM)ListViewCompareItems);
+ m_ListView.SortItems(ListViewCompareItems, &m_sortInfo);
break;
case FCIDM_SHVIEW_REFRESH:
case HDN_ENDTRACKW:
TRACE("-- HDN_ENDTRACKW %p\n", this);
- /*nColumn1 = ListView_GetColumnWidth(m_hWndList, 0);
- nColumn2 = ListView_GetColumnWidth(m_hWndList, 1);*/
+ /*nColumn1 = m_ListView.GetColumnWidth(0);
+ nColumn2 = m_ListView.GetColumnWidth(1);*/
break;
case LVN_DELETEITEM:
case LVN_COLUMNCLICK:
m_sortInfo.nHeaderID = lpnmlv->iSubItem;
if (m_sortInfo.nLastHeaderID == m_sortInfo.nHeaderID)
- {
m_sortInfo.bIsAscending = !m_sortInfo.bIsAscending;
- }
else
- {
m_sortInfo.bIsAscending = TRUE;
- }
m_sortInfo.nLastHeaderID = m_sortInfo.nHeaderID;
- SendMessageW(lpnmlv->hdr.hwndFrom, LVM_SORTITEMS, (WPARAM) &m_sortInfo, (LPARAM)ListViewCompareItems);
+ m_ListView.SortItems(ListViewCompareItems, &m_sortInfo);
break;
case LVN_GETDISPINFOA:
if (GetSelections())
{
- IDataObject * pda;
+ CComPtr<IDataObject> pda;
DWORD dwAttributes = SFGAO_CANLINK;
DWORD dwEffect = DROPEFFECT_COPY | DROPEFFECT_MOVE;
- if (SUCCEEDED(m_pSFParent->GetUIObjectOf(m_hWnd, m_cidl, (LPCITEMIDLIST*)m_apidl, IID_IDataObject, 0, (LPVOID *)&pda)))
+ if (SUCCEEDED(m_pSFParent->GetUIObjectOf(m_hWnd, m_cidl, (LPCITEMIDLIST*)m_apidl, IID_NULL_PPV_ARG(IDataObject, &pda))))
{
- IDropSource * pds = (IDropSource *)this; /* own DropSource interface */
+ CComPtr<IDropSource> pds = static_cast<IDropSource *>(this); /* own DropSource interface */
if (SUCCEEDED(m_pSFParent->GetAttributesOf(m_cidl, (LPCITEMIDLIST*)m_apidl, &dwAttributes)))
{
if (SUCCEEDED(pda->QueryInterface(IID_PPV_ARG(IAsyncOperation, &piaso))))
{
piaso->SetAsyncMode(TRUE);
- piaso->Release();
}
if (pds)
{ DWORD dwEffect2;
DoDragDrop(pda, pds, dwEffect, &dwEffect2);
}
- pda->Release();
}
}
break;
m_pSFParent->GetAttributesOf(1, (LPCITEMIDLIST*)&pidl, &dwAttr);
if (SFGAO_CANRENAME & dwAttr)
{
+ m_isEditing = TRUE;
return FALSE;
}
return TRUE;
case LVN_ENDLABELEDITW:
{
TRACE("-- LVN_ENDLABELEDITW %p\n", this);
+
+ m_isEditing = FALSE;
+
if (lpdi->item.pszText)
{
HRESULT hr;
LVITEMW lvItem;
- lvItem.iItem = lpdi->item.iItem;
- lvItem.iSubItem = 0;
- lvItem.mask = LVIF_PARAM;
- SendMessageW(m_hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem);
-
pidl = (LPITEMIDLIST)lpdi->item.lParam;
hr = m_pSFParent->SetNameOf(0, pidl, lpdi->item.pszText, SHGDN_INFOLDER, &pidl);
if (SUCCEEDED(hr) && pidl)
{
lvItem.mask = LVIF_PARAM|LVIF_IMAGE;
+ lvItem.iItem = lpdi->item.iItem;
lvItem.lParam = (LPARAM)pidl;
lvItem.iImage = SHMapPIDLToSystemImageListIndex(m_pSFParent, pidl, 0);
- SendMessageW(m_hWndList, LVM_SETITEMW, 0, (LPARAM) &lvItem);
- SendMessageW(m_hWndList, LVM_UPDATE, lpdi->item.iItem, 0);
-
+ m_ListView.SetItem(&lvItem);
+ m_ListView.Update(lpdi->item.iItem);
return TRUE;
}
}
return FALSE;
}
- case LVN_KEYDOWN:
- {
- LPNMLVKEYDOWN plvKeyDown = (LPNMLVKEYDOWN) lpnmh;
-
- /* initiate a rename of the selected file or directory */
- if (plvKeyDown->wVKey == VK_BACK)
- {
- LPSHELLBROWSER lpSb;
- if ((lpSb = (LPSHELLBROWSER)SendMessageW(m_hWndParent, CWM_GETISHELLBROWSER, 0, 0)))
- {
- lpSb->BrowseObject(NULL, SBSP_PARENT);
- }
- }
-
- else
- FIXME("LVN_KEYDOWN key=0x%08x\n", plvKeyDown->wVKey);
- }
- break;
-
default:
TRACE("-- %p WM_COMMAND %x unhandled\n", this, lpnmh->code);
break;
return S_OK;
}
+/**********************************************************
+* CDefView::OnInitMenuPopup
+*/
+LRESULT CDefView::OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
+{
+ MENUITEMINFOW mii = { 0 };
+ HMENU hSubmenu = (HMENU) wParam;
+
+ DbgPrint("OnInitMenuPopup lParam=%d\n", lParam);
+
+ mii.cbSize = sizeof(mii);
+ mii.fMask = MIIM_ID | MIIM_SUBMENU;
+
+ if (!GetMenuItemInfoW(this->m_hMenu, lParam, TRUE, &mii))
+ {
+ DbgPrint("OnInitMenuPopup GetMenuItemInfoW failed!\n");
+ return FALSE;
+ }
+
+ UINT menuItemId = mii.wID;
+
+ if (mii.hSubMenu != hSubmenu)
+ {
+ DbgPrint("OnInitMenuPopup submenu does not match!!!!\n");
+ return FALSE;
+ }
+
+ DbgPrint("OnInitMenuPopup id=%d\n", menuItemId);
+
+ switch (menuItemId)
+ {
+ case FCIDM_MENU_FILE:
+ PrepareShowFileMenu(hSubmenu);
+ break;
+ case FCIDM_MENU_EDIT:
+ //PrepareShowEditMenu(hSubmenu);
+ break;
+ case FCIDM_MENU_VIEW:
+ PrepareShowViewMenu(hSubmenu);
+ break;
+ }
+
+ return FALSE;
+}
+
/**********************************************************
*
*
*/
HRESULT WINAPI CDefView::TranslateAccelerator(LPMSG lpmsg)
{
+ if (m_isEditing)
+ return S_FALSE;
+
if (lpmsg->message >= WM_KEYFIRST && lpmsg->message <= WM_KEYLAST)
{
if (::TranslateAcceleratorW(m_hWnd, m_hAccel, lpmsg) != 0)
return S_OK;
- /* FIXME: should call TranslateAcceleratorSB */
-
TRACE("-- key=0x04%lx\n", lpmsg->wParam) ;
}
- return S_FALSE; /* not handled */
+ return m_pShellBrowser->TranslateAcceleratorSB(lpmsg, 0);
}
HRESULT WINAPI CDefView::EnableModeless(BOOL fEnable)
{
TRACE("(%p)\n", this);
- SendMessageW(m_hWndList, LVM_DELETEALLITEMS, 0, 0);
+ m_ListView.DeleteAllItems();
FillList();
return S_OK;
HRESULT WINAPI CDefView::CreateViewWindow(IShellView *lpPrevView, LPCFOLDERSETTINGS lpfs, IShellBrowser *psb, RECT *prcView, HWND *phWnd)
{
+ OLEMENUGROUPWIDTHS omw = { { 0, 0, 0, 0, 0, 0 } };
+
*phWnd = 0;
TRACE("(%p)->(shlview=%p set=%p shlbrs=%p rec=%p hwnd=%p) incomplete\n", this, lpPrevView, lpfs, psb, prcView, phWnd);
SetWindowPos(HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
UpdateWindow();
+ if (!m_hMenu)
+ {
+ m_hMenu = CreateMenu();
+ m_pShellBrowser->InsertMenusSB(m_hMenu, &omw);
+ TRACE("-- after fnInsertMenusSB\n");
+ }
+
+ _MergeToolbar();
+
return S_OK;
}
/*Make absolutely sure all our UI is cleaned up.*/
UIActivate(SVUIA_DEACTIVATE);
+ if (m_hAccel)
+ {
+ // "Accelerator tables loaded from resources are freed automatically when the application terminates." -- MSDN
+ m_hAccel = NULL;
+ }
+
+ if (m_hView)
+ {
+ DestroyMenu(m_hView);
+ m_hView = NULL;
+ }
+
if (m_hMenu)
{
DestroyMenu(m_hMenu);
+ m_hView = NULL;
+ }
+
+ if (m_ListView)
+ {
+ m_ListView.DestroyWindow();
+ }
+
+ if (m_hWnd)
+ {
+ DestroyWindow();
}
- DestroyWindow();
m_pShellBrowser.Release();
m_pCommDlgBrowser.Release();
TRACE("(%p)->(pidl=%p, 0x%08x) stub\n", this, pidl, uFlags);
i = LV_FindItemByPidl(pidl);
+ if (i == -1)
+ return S_OK;
- if (i != -1)
- {
- LVITEMW lvItem;
-
- if(uFlags & SVSI_ENSUREVISIBLE)
- SendMessageW(m_hWndList, LVM_ENSUREVISIBLE, i, 0);
+ if(uFlags & SVSI_ENSUREVISIBLE)
+ m_ListView.EnsureVisible(i, FALSE);
- lvItem.mask = LVIF_STATE;
- lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED;
- lvItem.iItem = 0;
- lvItem.iSubItem = 0;
+ LVITEMW lvItem = {0};
+ lvItem.mask = LVIF_STATE;
+ lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED;
- while (SendMessageW(m_hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem))
+ while (m_ListView.GetItem(&lvItem))
+ {
+ if (lvItem.iItem == i)
{
- if (lvItem.iItem == i)
- {
- if (uFlags & SVSI_SELECT)
- lvItem.state |= LVIS_SELECTED;
- else
- lvItem.state &= ~LVIS_SELECTED;
-
- if (uFlags & SVSI_FOCUSED)
- lvItem.state &= ~LVIS_FOCUSED;
- }
+ if (uFlags & SVSI_SELECT)
+ lvItem.state |= LVIS_SELECTED;
else
- {
- if (uFlags & SVSI_DESELECTOTHERS)
- lvItem.state &= ~LVIS_SELECTED;
- }
+ lvItem.state &= ~LVIS_SELECTED;
- SendMessageW(m_hWndList, LVM_SETITEMW, 0, (LPARAM) &lvItem);
- lvItem.iItem++;
+ if (uFlags & SVSI_FOCUSED)
+ lvItem.state &= ~LVIS_FOCUSED;
+ }
+ else
+ {
+ if (uFlags & SVSI_DESELECTOTHERS)
+ lvItem.state &= ~LVIS_SELECTED;
}
-
- if(uFlags & SVSI_EDIT)
- SendMessageW(m_hWndList, LVM_EDITLABELW, i, 0);
+ m_ListView.SetItem(&lvItem);
+ lvItem.iItem++;
}
+ if(uFlags & SVSI_EDIT)
+ m_ListView.EditLabel(i);
+
return S_OK;
}
HRESULT STDMETHODCALLTYPE CDefView::Item(int iItemIndex, LPITEMIDLIST *ppidl)
{
- LVITEMW item;
-
- TRACE("(%p)->(%d %p)\n", this, iItemIndex, ppidl);
-
- item.mask = LVIF_PARAM;
- item.iItem = iItemIndex;
-
- if (SendMessageW(m_hWndList, LVM_GETITEMW, 0, (LPARAM)&item))
+ PITEMID_CHILD pidl = reinterpret_cast<PITEMID_CHILD>(m_ListView.GetItemData(iItemIndex));
+ if (pidl)
{
- *ppidl = ILClone((PITEMID_CHILD)item.lParam);
+ *ppidl = ILClone(pidl);
return S_OK;
}
*ppidl = 0;
-
return E_INVALIDARG;
}
if (uFlags != SVGIO_ALLVIEW)
FIXME("some flags unsupported, %x\n", uFlags & ~SVGIO_ALLVIEW);
- *pcItems = SendMessageW(m_hWndList, LVM_GETITEMCOUNT, 0, 0);
+ *pcItems = m_ListView.GetItemCount();
return S_OK;
}
{
TRACE("(%p)->(%p)\n", this, piItem);
- *piItem = SendMessageW(m_hWndList, LVM_GETSELECTIONMARK, 0, 0);
+ *piItem = m_ListView.GetSelectionMark();
return S_OK;
}
{
TRACE("(%p)->(%p)\n", this, piItem);
- *piItem = SendMessageW(m_hWndList, LVM_GETNEXTITEM, -1, LVNI_FOCUSED);
+ *piItem = m_ListView.GetNextItem(-1, LVNI_FOCUSED);
return S_OK;
}
{
TRACE("(%p)->(%p)\n", this, ppt);
- if (NULL == m_hWndList) return S_FALSE;
+ if (!m_ListView)
+ return S_FALSE;
if (ppt)
{
- const DWORD ret = SendMessageW(m_hWndList, LVM_GETITEMSPACING, 0, 0);
+ SIZE spacing;
+ m_ListView.GetItemSpacing(spacing);
- ppt->x = LOWORD(ret);
- ppt->y = HIWORD(ret);
+ ppt->x = spacing.cx;
+ ppt->y = spacing.cy;
}
return S_OK;
lvItem.stateMask = LVIS_SELECTED;
if (dwFlags & SVSI_ENSUREVISIBLE)
- SendMessageW(m_hWndList, LVM_ENSUREVISIBLE, iItem, 0);
+ m_ListView.EnsureVisible(iItem, 0);
/* all items */
if (dwFlags & SVSI_DESELECTOTHERS)
- SendMessageW(m_hWndList, LVM_SETITEMSTATE, -1, (LPARAM)&lvItem);
+ m_ListView.SetItemState(-1, 0, LVIS_SELECTED);
/* this item */
if (dwFlags & SVSI_SELECT)
if (dwFlags & SVSI_FOCUSED)
lvItem.stateMask |= LVIS_FOCUSED;
- SendMessageW(m_hWndList, LVM_SETITEMSTATE, iItem, (LPARAM)&lvItem);
+ m_ListView.SetItemState(iItem, lvItem.state, lvItem.stateMask);
if (dwFlags & SVSI_EDIT)
- SendMessageW(m_hWndList, LVM_EDITLABELW, iItem, 0);
+ m_ListView.EditLabel(iItem);
return S_OK;
}
-HRESULT STDMETHODCALLTYPE CDefView::SelectAndPositionItems(UINT cidl, LPCITEMIDLIST *apidl, POINT *apt, DWORD dwFlags)
+HRESULT STDMETHODCALLTYPE CDefView::SelectAndPositionItems(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, POINT *apt, DWORD dwFlags)
{
return E_NOTIMPL;
}
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE CDefView::IShellFolderView_GetAutoArrange()
-{
- TRACE("(%p)\n", this);
- return GetAutoArrange();
-}
-
HRESULT STDMETHODCALLTYPE CDefView::AddObject(PITEMID_CHILD pidl, UINT *item)
{
FIXME("(%p)->(%p %p) stub\n", this, pidl, item);
if (pidl)
{
*item = LV_FindItemByPidl(ILFindLastID(pidl));
- SendMessageW(m_hWndList, LVM_DELETEITEM, *item, 0);
+ m_ListView.DeleteItem(*item);
}
else
{
*item = 0;
- SendMessageW(m_hWndList, LVM_DELETEALLITEMS, 0, 0);
+ m_ListView.DeleteAllItems();
}
return S_OK;
HRESULT STDMETHODCALLTYPE CDefView::SetRedraw(BOOL redraw)
{
TRACE("(%p)->(%d)\n", this, redraw);
- SendMessageW(m_hWndList, WM_SETREDRAW, redraw, 0);
+ m_ListView.SetRedraw(redraw);
return S_OK;
}
if (!pguidCmdGroup)
return OLECMDERR_E_UNKNOWNGROUP;
+ if (IsEqualCLSID(*pguidCmdGroup, m_Category))
+ {
+ if (nCmdID == FCIDM_SHVIEW_AUTOARRANGE)
+ {
+ if (V_VT(pvaIn) != VT_INT_PTR)
+ return OLECMDERR_E_NOTSUPPORTED;
+
+
+ TPMPARAMS params;
+ params.cbSize = sizeof(params);
+ params.rcExclude = *(RECT*) V_INTREF(pvaIn);
+
+ HMENU hView = m_hView;
+#if 0
+ hView = CreatePopupMenu();
+ AppendMenuW(hView, MF_STRING, FCIDM_SHVIEW_BIGICON, L"Big!");
+ AppendMenuW(hView, MF_STRING, FCIDM_SHVIEW_SMALLICON, L"Small!");
+ AppendMenuW(hView, MF_STRING, FCIDM_SHVIEW_LISTVIEW, L"List!");
+ AppendMenuW(hView, MF_STRING, FCIDM_SHVIEW_REPORTVIEW, L"Report!");
+#endif
+
+ if (hView)
+ {
+ PrepareShowViewMenu(hView);
+
+ TrackPopupMenuEx(hView, TPM_LEFTALIGN | TPM_TOPALIGN, params.rcExclude.left, params.rcExclude.bottom, m_hWndParent, ¶ms);
+ }
+
+ // pvaOut is VT_I4 with value 0x403 (cmd id of the new mode maybe?)
+ V_VT(pvaOut) = VT_I4;
+ V_I4(pvaOut) = 0x403;
+ }
+ }
+
if (IsEqualIID(*pguidCmdGroup, CGID_Explorer) &&
(nCmdID == 0x29) &&
(nCmdexecopt == 4) && pvaOut)
HRESULT CDefView::drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD *pdwEffect)
{
LVHITTESTINFO htinfo;
- LVITEMW lvItem;
LONG lResult;
HRESULT hr;
RECT clientRect;
htinfo.pt.x = pt.x;
htinfo.pt.y = pt.y;
htinfo.flags = LVHT_ONITEM;
- ::ScreenToClient(m_hWndList, &htinfo.pt);
- lResult = SendMessageW(m_hWndList, LVM_HITTEST, 0, (LPARAM)&htinfo);
+ ::ScreenToClient(m_ListView, &htinfo.pt);
+ lResult = m_ListView.HitTest(&htinfo);
/* Send WM_*SCROLL messages every 250 ms during drag-scrolling */
- ::GetClientRect(m_hWndList, &clientRect);
+ ::GetClientRect(m_ListView, &clientRect);
if (htinfo.pt.x == m_ptLastMousePos.x && htinfo.pt.y == m_ptLastMousePos.y &&
(htinfo.pt.x < SCROLLAREAWIDTH || htinfo.pt.x > clientRect.right - SCROLLAREAWIDTH ||
htinfo.pt.y < SCROLLAREAWIDTH || htinfo.pt.y > clientRect.bottom - SCROLLAREAWIDTH ))
{
/* Mouse did hover another 250 ms over the scroll-area */
if (htinfo.pt.x < SCROLLAREAWIDTH)
- SendMessageW(m_hWndList, WM_HSCROLL, SB_LINEUP, 0);
+ m_ListView.SendMessageW(WM_HSCROLL, SB_LINEUP, 0);
if (htinfo.pt.x > clientRect.right - SCROLLAREAWIDTH)
- SendMessageW(m_hWndList, WM_HSCROLL, SB_LINEDOWN, 0);
+ m_ListView.SendMessageW(WM_HSCROLL, SB_LINEDOWN, 0);
if (htinfo.pt.y < SCROLLAREAWIDTH)
- SendMessageW(m_hWndList, WM_VSCROLL, SB_LINEUP, 0);
+ m_ListView.SendMessageW(WM_VSCROLL, SB_LINEUP, 0);
if (htinfo.pt.y > clientRect.bottom - SCROLLAREAWIDTH)
- SendMessageW(m_hWndList, WM_VSCROLL, SB_LINEDOWN, 0);
+ m_ListView.SendMessageW(WM_VSCROLL, SB_LINEDOWN, 0);
}
}
else
{
/* Query the relative PIDL of the shellfolder object represented by the currently
* dragged over listview-item ... */
- lvItem.mask = LVIF_PARAM;
- lvItem.iItem = lResult;
- lvItem.iSubItem = 0;
- SendMessageW(m_hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem);
+ LPCITEMIDLIST pidl = reinterpret_cast<LPCITEMIDLIST>(m_ListView.GetItemData(lResult));
/* ... and bind m_pCurDropTarget to the IDropTarget interface of an UIObject of this object */
- hr = m_pSFParent->GetUIObjectOf(m_hWndList, 1,
- (LPCITEMIDLIST*)&lvItem.lParam, IID_IDropTarget, NULL, (LPVOID*)&m_pCurDropTarget);
+ hr = m_pSFParent->GetUIObjectOf(m_ListView, 1, &pidl, IID_NULL_PPV_ARG(IDropTarget, &m_pCurDropTarget));
}
/* If anything failed, m_pCurDropTarget should be NULL now, which ought to be a save state. */
return E_NOINTERFACE;
}
-/**********************************************************
- * IShellView_Constructor
- */
-HRESULT WINAPI IShellView_Constructor(IShellFolder *pFolder, IShellView **newView)
+HRESULT CDefView::_MergeToolbar()
{
- CComObject<CDefView> *theView;
- CComPtr<IShellView> result;
- HRESULT hResult;
+ CComPtr<IExplorerToolbar> ptb; // [sp+8h] [bp-4h]@1
- if (newView == NULL)
- return E_POINTER;
+ HRESULT hr = S_OK;
- *newView = NULL;
- ATLTRY (theView = new CComObject<CDefView>);
+ hr = IUnknown_QueryService(m_pShellBrowser, IID_IExplorerToolbar, IID_PPV_ARG(IExplorerToolbar, &ptb));
+ if (FAILED(hr))
+ return hr;
- if (theView == NULL)
- return E_OUTOFMEMORY;
+ m_Category = CGID_DefViewFrame;
- hResult = theView->QueryInterface(IID_PPV_ARG(IShellView, &result));
- if (FAILED (hResult))
- {
- delete theView;
- return hResult;
- }
+ hr = ptb->SetCommandTarget(static_cast<IOleCommandTarget*>(this), &m_Category, 0);
+ if (FAILED(hr))
+ return hr;
- hResult = theView->Initialize (pFolder);
- if (FAILED (hResult))
- return hResult;
- *newView = result.Detach ();
+ if (hr == S_FALSE)
+ return S_OK;
+
+#if 0
+ hr = ptb->AddButtons(&m_Category, buttonsCount, buttons);
+ if (FAILED(hr))
+ return hr;
+#endif
return S_OK;
}
+/**********************************************************
+ * IShellView_Constructor
+ */
+HRESULT WINAPI IShellView_Constructor(IShellFolder *pFolder, IShellView **newView)
+{
+ return ShellObjectCreatorInit<CDefView>(pFolder, IID_IShellView, newView);
+}