Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 01:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[0.4.9][BROWSEUI] Port back several fixes and tweaks

Browse source 
0.4.15-dev-5688-g 460a01b167 [BROWSEUI] CORE-18646 Fix crash while editing a label in the folder tree, add missing break
0.4.15-dev-5686-g a777cc2cc4 [BROWSEUI] CORE-18646 Fix crash on backspace while editing a label in the folder panel (#5059)
0.4.15-dev-4497-g beefb07d18 [BROWSEUI] CORE-12804 Remove useless variable and unreachable code (#4483) and strip EOL whitespace
0.4.13-dev-1186-g d41c5be3bd [BROWSEUI] Fix a PIDL leak.
0.4.13-dev-283-g 801ec51a91 [BROWSEUI] Fix indentation
0.4.10-dev-252-g 6e6c46a832 [BROWSEUI] CORE-11141 Re-enable the "Folder Options" menu item (#630) It was originally disabled in SVN r71192 == git 8b77c254f8
This commit is contained in:
Joachim Henze 2023-04-02 02:36:57 +02:00
parent 316cb3e1a4
commit 78007d7c85
3 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
dll/win32/browseui/explorerband.cpp
View file

@ -144,7 +144,7 @@ Cleanup:
} }
CExplorerBand::CExplorerBand() : CExplorerBand::CExplorerBand() :
pSite(NULL), fVisible(FALSE), bNavigating(FALSE), dwBandID(0), pidlCurrent(NULL) pSite(NULL), fVisible(FALSE), bNavigating(FALSE), dwBandID(0), m_isEditing(FALSE), pidlCurrent(NULL)
{ {
} }
@ -721,7 +721,6 @@ BOOL CExplorerBand::NavigateToPIDL(LPITEMIDLIST dest, HTREEITEM *item, BOOL bExp
HTREEITEM current; HTREEITEM current;
HTREEITEM tmp; HTREEITEM tmp;
HTREEITEM parent; HTREEITEM parent;
BOOL found;
NodeInfo *nodeData; NodeInfo *nodeData;
LPITEMIDLIST relativeChild; LPITEMIDLIST relativeChild;
TVITEM tvItem; TVITEM tvItem;
@ -729,10 +728,9 @@ BOOL CExplorerBand::NavigateToPIDL(LPITEMIDLIST dest, HTREEITEM *item, BOOL bExp
if (!item) if (!item)
return FALSE; return FALSE;
found = FALSE;
current = hRoot; current = hRoot;
parent = NULL; parent = NULL;
while(!found) while (TRUE)
{ {
nodeData = GetNodeInfo(current); nodeData = GetNodeInfo(current);
if (!nodeData) if (!nodeData)
@ -806,7 +804,6 @@ BOOL CExplorerBand::NavigateToPIDL(LPITEMIDLIST dest, HTREEITEM *item, BOOL bExp
*item = NULL; *item = NULL;
return FALSE; return FALSE;
} }
return FALSE;
} }
BOOL CExplorerBand::NavigateToCurrentFolder() BOOL CExplorerBand::NavigateToCurrentFolder()
@ -1214,7 +1211,8 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::HasFocusIO()
HRESULT STDMETHODCALLTYPE CExplorerBand::TranslateAcceleratorIO(LPMSG lpMsg) HRESULT STDMETHODCALLTYPE CExplorerBand::TranslateAcceleratorIO(LPMSG lpMsg)
{ {
if (lpMsg->hwnd == m_hWnd) if (lpMsg->hwnd == m_hWnd ||
(m_isEditing && IsChild(lpMsg->hwnd)))
{ {
TranslateMessage(lpMsg); TranslateMessage(lpMsg);
DispatchMessage(lpMsg); DispatchMessage(lpMsg);
@ -1291,6 +1289,7 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM
case TVN_BEGINDRAG: case TVN_BEGINDRAG:
case TVN_BEGINRDRAG: case TVN_BEGINRDRAG:
OnTreeItemDragging((LPNMTREEVIEW)lParam, pNotifyHeader->code == TVN_BEGINRDRAG); OnTreeItemDragging((LPNMTREEVIEW)lParam, pNotifyHeader->code == TVN_BEGINRDRAG);
break;
case TVN_BEGINLABELEDITW: case TVN_BEGINLABELEDITW:
{ {
// TODO: put this in a function ? (mostly copypasta from CDefView) // TODO: put this in a function ? (mostly copypasta from CDefView)
@ -1310,8 +1309,12 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM
return E_FAIL; return E_FAIL;
hr = pParent->GetAttributesOf(1, &pChild, &dwAttr); hr = pParent->GetAttributesOf(1, &pChild, &dwAttr);
if (SUCCEEDED(hr) && (dwAttr & SFGAO_CANRENAME) && theResult) if (SUCCEEDED(hr) && (dwAttr & SFGAO_CANRENAME))
{
if (theResult)
*theResult = 0; *theResult = 0;
m_isEditing = TRUE;
}
return S_OK; return S_OK;
} }
case TVN_ENDLABELEDITW: case TVN_ENDLABELEDITW:
@ -1320,6 +1323,7 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM
NodeInfo *info = GetNodeInfo(dispInfo->item.hItem); NodeInfo *info = GetNodeInfo(dispInfo->item.hItem);
HRESULT hr; HRESULT hr;
m_isEditing = FALSE;
if (theResult) if (theResult)
*theResult = 0; *theResult = 0;
if (dispInfo->item.pszText) if (dispInfo->item.pszText)
@ -1350,6 +1354,7 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM
// Navigate to our new location // Navigate to our new location
UpdateBrowser(pidlNewAbs); UpdateBrowser(pidlNewAbs);
ILFree(pidlParent);
ILFree(pidlNewAbs); ILFree(pidlNewAbs);
ILFree(pidlNew); ILFree(pidlNew);
if (theResult) if (theResult)

1
dll/win32/browseui/explorerband.h
View file

@ -59,6 +59,7 @@ private:
BOOL bNavigating; BOOL bNavigating;
BOOL bFocused; BOOL bFocused;
DWORD dwBandID; DWORD dwBandID;
BOOL m_isEditing;
HIMAGELIST hImageList; HIMAGELIST hImageList;
HTREEITEM hRoot; HTREEITEM hRoot;
HTREEITEM oldSelected; HTREEITEM oldSelected;

2
dll/win32/browseui/shellbrowser.cpp
View file

@ -3487,8 +3487,6 @@ LRESULT CShellBrowser::OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam,
SHEnableMenuItem(theMenu, IDM_TOOLS_MAPNETWORKDRIVE, FALSE); SHEnableMenuItem(theMenu, IDM_TOOLS_MAPNETWORKDRIVE, FALSE);
SHEnableMenuItem(theMenu, IDM_TOOLS_DISCONNECTNETWORKDRIVE, FALSE); SHEnableMenuItem(theMenu, IDM_TOOLS_DISCONNECTNETWORKDRIVE, FALSE);
SHEnableMenuItem(theMenu, IDM_TOOLS_SYNCHRONIZE, FALSE); SHEnableMenuItem(theMenu, IDM_TOOLS_SYNCHRONIZE, FALSE);
FIXME("Folder options dialog is stubbed: CORE-11141\n");
SHEnableMenuItem(theMenu, IDM_TOOLS_FOLDEROPTIONS, FALSE); // Remove when CORE-11141 is fixed.
menuIndex = 4; menuIndex = 4;
} }
else if (theMenu == SHGetMenuFromID(fCurrentMenuBar, FCIDM_MENU_HELP)) else if (theMenu == SHGetMenuFromID(fCurrentMenuBar, FCIDM_MENU_HELP))