Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 14:13:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor update

Browse source
This commit is contained in:
gedmurphy 2018-01-18 16:30:13 +00:00 • committed by Ged Murphy
parent 6c9629bb72
commit 8c91a00fcf
1 changed files with 5 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

32
base/shell/explorer/trayntfy.cpp
View file

@ -41,11 +41,6 @@ struct IconWatcherData
DWORD ProcessId; DWORD ProcessId;
NOTIFYICONDATA IconData; NOTIFYICONDATA IconData;
IconWatcherData()
{
IconWatcherData(NULL);
}
IconWatcherData(NOTIFYICONDATA *iconData) : IconWatcherData(NOTIFYICONDATA *iconData) :
hProcess(NULL), ProcessId(0) hProcess(NULL), ProcessId(0)
{ {
@ -81,6 +76,7 @@ public:
m_Loop(false) m_Loop(false)
{ {
} }
virtual ~CIconWatcher() virtual ~CIconWatcher()
{ {
Uninitialize(); Uninitialize();
@ -235,12 +231,16 @@ private:
if (Status == WAIT_OBJECT_0) if (Status == WAIT_OBJECT_0)
{ {
// We've been kicked, we have updates to our list (or we're exiting the thread) // We've been kicked, we have updates to our list (or we're exiting the thread)
if (This->m_Loop)
TRACE("Updating watched icon list");
} }
else if ((Status >= WAIT_OBJECT_0 + 1) && (Status < Size)) else if ((Status >= WAIT_OBJECT_0 + 1) && (Status < Size))
{ {
IconWatcherData *Icon; IconWatcherData *Icon;
Icon = This->GetListEntry(NULL, WatchList[Status], false); Icon = This->GetListEntry(NULL, WatchList[Status], false);
TRACE("Pid %lu owns a notification icon and has stopped without deleting it. We'll cleanup on its behalf", Icon->ProcessId);
int len = FIELD_OFFSET(SYS_PAGER_COPY_DATA, nicon_data) + Icon->IconData.cbSize; int len = FIELD_OFFSET(SYS_PAGER_COPY_DATA, nicon_data) + Icon->IconData.cbSize;
PSYS_PAGER_COPY_DATA pnotify_data = (PSYS_PAGER_COPY_DATA)new BYTE[len]; PSYS_PAGER_COPY_DATA pnotify_data = (PSYS_PAGER_COPY_DATA)new BYTE[len];
pnotify_data->cookie = 1; pnotify_data->cookie = 1;
@ -342,28 +342,6 @@ public:
return -1; return -1;
} }
int FindItem(IN GUID& Guid, NOTIFYICONDATA ** pdata)
{
int count = GetButtonCount();
for (int i = 0; i < count; i++)
{
NOTIFYICONDATA * data;
data = GetItemData(i);
if (data->guidItem == Guid)
{
if (pdata)
*pdata = data;
return i;
}
}
return -1;
}
BOOL AddButton(IN CONST NOTIFYICONDATA *iconData) BOOL AddButton(IN CONST NOTIFYICONDATA *iconData)
{ {
TBBUTTON tbBtn; TBBUTTON tbBtn;