Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-06 12:45:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fix ReadDirectoryChangesW

Browse source 
- FindFirstChangeNotificationW
+17 passed winetests

svn path=/trunk/; revision=38486
This commit is contained in:
Dmitry Chapyshev 2008-12-31 11:54:30 +00:00
parent abdee726bc
commit 85e610895c
1 changed files with 44 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
reactos/dll/win32/kernel32/file/cnotify.c
View file

@ -92,12 +92,7 @@ FindFirstChangeNotificationW (
&ObjectAttributes,
&IoStatus,
FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
FILE_DIRECTORY_FILE);
/*
FIXME: I think we should use FILE_OPEN_FOR_BACKUP_INTENT. See M$ Q188321
-Gunnar
*/
FILE_DIRECTORY_FILE | FILE_OPEN_FOR_BACKUP_INTENT);
RtlFreeHeap(RtlGetProcessHeap(),
0,
@ -122,6 +117,7 @@ FindFirstChangeNotificationW (
(BOOLEAN)bWatchSubtree);
if (!NT_SUCCESS(Status))
{
NtClose(hDir);
SetLastErrorByStatus(Status);
return INVALID_HANDLE_VALUE;
}
@ -185,24 +181,62 @@ ReadDirectoryChangesW(
LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine /* OPTIONAL???????? */
)
{
PVOID CompletionRoutine;
NTSTATUS Status;
IO_STATUS_BLOCK IoStatus;
HANDLE EventHandle;
PIO_APC_ROUTINE IoApcRoutine;
if (lpOverlapped )
{
if (lpCompletionRoutine)
{
CompletionRoutine = (PVOID) lpCompletionRoutine;
EventHandle = NULL;
IoApcRoutine = ApcRoutine;
}
else
{
if (((ULONG_PTR) lpOverlapped->hEvent & 1) == 0)
CompletionRoutine = (PVOID) lpOverlapped;
else
CompletionRoutine = NULL;
EventHandle = lpOverlapped->hEvent;
IoApcRoutine = NULL;
}
lpOverlapped->Internal = STATUS_PENDING;
}
else
{
EventHandle = NULL;
IoApcRoutine = NULL;
CompletionRoutine = NULL;
}
Status = NtNotifyChangeDirectoryFile(
hDirectory,
lpOverlapped ? lpOverlapped->hEvent : NULL,
lpCompletionRoutine ? ApcRoutine : NULL, /* ApcRoutine OPTIONAL???? */
lpCompletionRoutine, /* ApcContext */
lpOverlapped ? (PIO_STATUS_BLOCK)lpOverlapped : &IoStatus,
EventHandle,
IoApcRoutine,
CompletionRoutine, /* ApcContext */
lpOverlapped ? (PIO_STATUS_BLOCK)lpOverlapped->Internal : &IoStatus,
lpBuffer,
nBufferLength,
dwNotifyFilter,
(BOOLEAN)bWatchSubtree
);
if ((Status == STATUS_PENDING) && (!lpOverlapped))
{
Status = NtWaitForSingleObject(hDirectory, FALSE, NULL);
if (NT_SUCCESS(Status))
{
Status = IoStatus.Status;
}
}
if (!NT_SUCCESS(Status))
{
SetLastErrorByStatus(Status);