Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 02:25:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] Fix CDefView::OnChangeNotify for My Documents (#6935)

Browse source 
Follow-up to #6916. My Documents change notification was not working
due to this bug.
JIRA issue: CORE-19615
- Use _ILIsSpecialFolder for checking PIDLs.
- Simplify ILIsParentOrSpecialParent helper function.
- Add SFVM_FSNOTIFY, SFVM_QUERYFSNOTIFY, and SFVM_GETNOTIFY
  callback calls.
This commit is contained in:
Katayama Hirofumi MZ 2024-05-28 23:04:21 +09:00 committed by GitHub
parent 47d17f59bf
commit 522c02f335
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
dll/win32/shell32/CDefView.cpp
View file

@ -1646,16 +1646,27 @@ LRESULT CDefView::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
SetShellWindowEx(hwndSB, m_ListView); SetShellWindowEx(hwndSB, m_ListView);
} }
SHChangeNotifyEntry ntreg[1]; // Set up change notification
ntreg[0].fRecursive = FALSE; LPITEMIDLIST pidlTarget = NULL;
ntreg[0].pidl = m_pidlParent; LONG fEvents = 0;
HRESULT hr = _DoFolderViewCB(SFVM_GETNOTIFY, (WPARAM)&pidlTarget, (LPARAM)&fEvents);
if (FAILED(hr) || (!pidlTarget && !fEvents))
{
pidlTarget = m_pidlParent;
fEvents = SHCNE_ALLEVENTS;
}
SHChangeNotifyEntry ntreg = {};
hr = _DoFolderViewCB(SFVM_QUERYFSNOTIFY, 0, (LPARAM)&ntreg);
if (FAILED(hr))
{
ntreg.fRecursive = FALSE;
ntreg.pidl = pidlTarget;
}
m_hNotify = SHChangeNotifyRegister(m_hWnd, m_hNotify = SHChangeNotifyRegister(m_hWnd,
SHCNRF_InterruptLevel | SHCNRF_ShellLevel | SHCNRF_InterruptLevel | SHCNRF_ShellLevel |
SHCNRF_NewDelivery, SHCNRF_NewDelivery,
SHCNE_ALLEVENTS, SHV_CHANGE_NOTIFY, fEvents, SHV_CHANGE_NOTIFY,
1, ntreg); 1, &ntreg);
//_DoFolderViewCB(SFVM_GETNOTIFY, ?? ??)
m_hAccel = LoadAcceleratorsW(shell32_hInstance, MAKEINTRESOURCEW(IDA_SHELLVIEW)); m_hAccel = LoadAcceleratorsW(shell32_hInstance, MAKEINTRESOURCEW(IDA_SHELLVIEW));
@ -2711,35 +2722,9 @@ static BOOL ILIsParentOrSpecialParent(PCIDLIST_ABSOLUTE pidl1, PCIDLIST_ABSOLUTE
if (ILIsParent(pidl1, pidl2, TRUE)) if (ILIsParent(pidl1, pidl2, TRUE))
return TRUE; return TRUE;
if (_ILIsDesktop(pidl1)) CComHeapPtr<ITEMIDLIST_ABSOLUTE> pidl2Clone(ILClone(pidl2));
{
PIDLIST_ABSOLUTE deskpidl;
SHGetFolderLocation(NULL, CSIDL_DESKTOPDIRECTORY, NULL, 0, &deskpidl);
if (ILIsParent(deskpidl, pidl2, TRUE))
{
ILFree(deskpidl);
return TRUE;
}
ILFree(deskpidl);
SHGetFolderLocation(NULL, CSIDL_COMMON_DESKTOPDIRECTORY, NULL, 0, &deskpidl);
if (ILIsParent(deskpidl, pidl2, TRUE))
{
ILFree(deskpidl);
return TRUE;
}
ILFree(deskpidl);
}
LPITEMIDLIST pidl2Clone = ILClone(pidl2);
ILRemoveLastID(pidl2Clone); ILRemoveLastID(pidl2Clone);
if (ILIsEqual(pidl1, pidl2Clone)) return ILIsEqual(pidl1, pidl2Clone);
{
ILFree(pidl2Clone);
return TRUE;
}
ILFree(pidl2Clone);
return FALSE;
} }
LRESULT CDefView::OnChangeNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) LRESULT CDefView::OnChangeNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
@ -2761,19 +2746,22 @@ LRESULT CDefView::OnChangeNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &
TRACE("(%p)(%p,%p,%p)\n", this, Pidls[0], Pidls[1], lParam); TRACE("(%p)(%p,%p,%p)\n", this, Pidls[0], Pidls[1], lParam);
if (_DoFolderViewCB(SFVM_FSNOTIFY, (WPARAM)Pidls, lEvent) == S_FALSE)
return FALSE;
// Translate child IDLs. // Translate child IDLs.
// SHSimpleIDListFromPathW creates fake PIDLs (lacking some attributes) // SHSimpleIDListFromPathW creates fake PIDLs (lacking some attributes)
HRESULT hr; HRESULT hr;
PITEMID_CHILD child0 = NULL, child1 = NULL; PITEMID_CHILD child0 = NULL, child1 = NULL;
CComHeapPtr<ITEMIDLIST_RELATIVE> pidl0Temp, pidl1Temp; CComHeapPtr<ITEMIDLIST_RELATIVE> pidl0Temp, pidl1Temp;
if (ILIsParentOrSpecialParent(m_pidlParent, Pidls[0])) if (_ILIsSpecialFolder(Pidls[0]) || ILIsParentOrSpecialParent(m_pidlParent, Pidls[0]))
{ {
child0 = ILFindLastID(Pidls[0]); child0 = ILFindLastID(Pidls[0]);
hr = SHGetRealIDL(m_pSFParent, child0, &pidl0Temp); hr = SHGetRealIDL(m_pSFParent, child0, &pidl0Temp);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
child0 = pidl0Temp; child0 = pidl0Temp;
} }
if (ILIsParentOrSpecialParent(m_pidlParent, Pidls[1])) if (_ILIsSpecialFolder(Pidls[1]) || ILIsParentOrSpecialParent(m_pidlParent, Pidls[1]))
{ {
child1 = ILFindLastID(Pidls[1]); child1 = ILFindLastID(Pidls[1]);
hr = SHGetRealIDL(m_pSFParent, child1, &pidl1Temp); hr = SHGetRealIDL(m_pSFParent, child1, &pidl1Temp);