lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-05 03:02:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32] Follow-up of 'Simplify CChangeNotifyServer'

Browse Source 
Do DestroyAllItems() on OnDestroy().
CORE-13950
This commit is contained in:
Katayama Hirofumi MZ
2022-03-06 12:33:10 +09:00
parent 08bd879247
commit c5f6e744e7
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp
View File

@@ -79,6 +79,7 @@ private:
BOOL RemoveItemsByRegID(UINT nRegID);
BOOL RemoveItemsByProcess(DWORD dwUserPID);
void DestroyItem(CWatchItem *pItem, HWND *phwndBroker);
void DestroyAllItems();
UINT GetNextRegID();
BOOL DeliverNotification(HANDLE hTicket, DWORD dwOwnerPID);
@@ -136,6 +137,20 @@ void CChangeNotifyServer::DestroyItem(CWatchItem *pItem, HWND *phwndBroker)
delete pItem;
}
void CChangeNotifyServer::DestroyAllItems()
{
for (INT i = 0; i < m_items.GetSize(); ++i)
{
if (m_items[i])
{
HWND hwndBroker = NULL;
DestroyItem(m_items[i], &hwndBroker);
m_items[i] = NULL;
}
}
m_items.RemoveAll();
}
BOOL CChangeNotifyServer::RemoveItemsByRegID(UINT nRegID)
{
BOOL bFound = FALSE;
@@ -319,6 +334,7 @@ LRESULT CChangeNotifyServer::OnRemoveByPID(UINT uMsg, WPARAM wParam, LPARAM lPar
LRESULT CChangeNotifyServer::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{
DestroyAllItems();
CDirectoryWatcher::RequestAllWatchersTermination();
return 0;
}