Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 17:12:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32]

Browse source 
Revert r75348.
Because of r75349, this revision was made useless, and even worse, it was leaking a handle to the directory where the FSD doesn't support notifications.
Also made some debug traces more useful

svn path=/trunk/; revision=75419
This commit is contained in:
Pierre Schweitzer 2017-07-27 09:33:11 +00:00
parent b36097ee50
commit 4a4f6e5d9f
1 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
reactos/dll/win32/shell32/wine/changenotify.c
View file

@ -173,7 +173,7 @@ static void DeleteNode(LPNOTIFICATIONLIST item)
TRACE("Not freeing, still %d queued events\n", queued); TRACE("Not freeing, still %d queued events\n", queued);
return; return;
} }
TRACE("Freeing for real!\n"); TRACE("Freeing for real! %p (%d) \n", item, item->cidl);
#endif #endif
/* remove item from list */ /* remove item from list */
@ -693,7 +693,7 @@ BOOL _OpenDirectory(LPNOTIFYREGISTER item)
static void CALLBACK _RequestTermination(ULONG_PTR arg) static void CALLBACK _RequestTermination(ULONG_PTR arg)
{ {
LPNOTIFYREGISTER item = (LPNOTIFYREGISTER) arg; LPNOTIFYREGISTER item = (LPNOTIFYREGISTER) arg;
TRACE("_RequestTermination %p \n", item->hDirectory); TRACE("_RequestTermination %p %p \n", item, item->hDirectory);
if (!item->hDirectory || item->hDirectory == INVALID_HANDLE_VALUE) return; if (!item->hDirectory || item->hDirectory == INVALID_HANDLE_VALUE) return;
CancelIo(item->hDirectory); CancelIo(item->hDirectory);
@ -724,18 +724,6 @@ _NotificationCompletion(DWORD dwErrorCode, // completion code
#endif #endif
#ifdef __REACTOS__ #ifdef __REACTOS__
/* This is to avoid double-free and potential use after free
* In case it failed, _BeginRead() already deferenced item
* But if failure comes the FSD, the APC routine (us) will
* be called as well, which will cause a double-free on quit.
* Avoid this by deferencing only once in case of failure and thus,
* incrementing reference count here
*/
if (dwErrorCode != ERROR_SUCCESS)
{
InterlockedIncrement(&item->pParent->wQueuedCount);
}
/* If the FSD doesn't support directory change notifications, there's no /* If the FSD doesn't support directory change notifications, there's no
* no need to retry and requeue notification * no need to retry and requeue notification
*/ */
@ -807,7 +795,9 @@ static VOID _BeginRead(LPNOTIFYREGISTER item )
#ifdef __REACTOS__ #ifdef __REACTOS__
{ {
#endif #endif
ERR("ReadDirectoryChangesW failed. (%p, %p, %p, %p) Code: %u \n", ERR("ReadDirectoryChangesW failed. (%p, %p, %p, %p, %p, %p) Code: %u \n",
item,
item->pParent,
item->hDirectory, item->hDirectory,
item->buffer, item->buffer,
&item->overlapped, &item->overlapped,