commit 0790f955897d5664997d7263fbd3e42165eda548
author Mike McCormack <mike@codeweavers.com> Tue Feb 07 16:50:36 2006 +0100
committer Alexandre Julliard <julliard@winehq.org> Tue Feb 07 16:50:36 2006 +0100
tree 7a79bf477199ee93f06ab998137b0020a4ea4a88
parent be22a9684766bb9bdd5808041ae42b185921cb84

kernel32: ReadDirectoryChangesW fixes.
ReadDirectoryChangesW remembers whether it's recording changes or not.
Don't initialize overlapped->InternalHigh.
The hEvent is cleared when ReadDirectoryChanges is called.

server/change.c

diff --git a/server/change.c b/server/change.c
index d6213fe..c35a82c 100644
--- a/server/change.c
+++ b/server/change.c
@@ -141,6 +141,7 @@
     struct event  *event;
     unsigned int   filter;   /* notification filter */
     int            notified; /* SIGIO counter */
+    int            want_data; /* return change data */
     long           signaled; /* the file changed */
     struct fd     *inotify_fd; /* inotify file descriptor */
     int            wd;       /* inotify watch descriptor */
@@ -254,6 +255,7 @@
     dir->filter = 0;
     dir->notified = 0;
     dir->signaled = 0;
+    dir->want_data = 0;
     dir->inotify_fd = NULL;
     dir->wd = -1;
     grab_object( fd );
@@ -412,20 +414,23 @@
 {
     struct change_record *record;
 
-    record = malloc( sizeof (*record) + ie->len - 1 ) ;
-    if (!record)
-        return;
+    if (dir->want_data)
+    {
+        record = malloc( sizeof (*record) + ie->len - 1 ) ;
+        if (!record)
+            return;
 
-    if( ie->mask & IN_CREATE )
-        record->action = FILE_ACTION_ADDED;
-    else if( ie->mask & IN_DELETE )
-        record->action = FILE_ACTION_REMOVED;
-    else
-        record->action = FILE_ACTION_MODIFIED;
-    memcpy( record->name, ie->name, ie->len );
-    record->len = strlen( ie->name );
+        if( ie->mask & IN_CREATE )
+            record->action = FILE_ACTION_ADDED;
+        else if( ie->mask & IN_DELETE )
+            record->action = FILE_ACTION_REMOVED;
+        else
+            record->action = FILE_ACTION_MODIFIED;
+        memcpy( record->name, ie->name, ie->len );
+        record->len = strlen( ie->name );
 
-    list_add_tail( &dir->change_records, &record->entry );
+        list_add_tail( &dir->change_records, &record->entry );
+    }
 
     if (!list_empty( &dir->change_q ))
         async_terminate_head( &dir->change_q, STATUS_ALERTED );
@@ -551,12 +556,17 @@
     {
         insert_change( dir );
         dir->filter = req->filter;
+        dir->want_data = req->want_data;
     }
 
     /* remove any notifications */
     if (dir->signaled>0)
         dir->signaled--;
 
+    /* clear the event */
+    if (event)
+        reset_event( event );
+
     /* setup the real notification */
 #ifdef USE_INOTIFY
     if (!inotify_adjust_changes( dir ))

server/protocol.def

diff --git a/server/protocol.def b/server/protocol.def
index 2b3a587..986a595 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -1045,6 +1045,7 @@
     obj_handle_t handle;        /* handle to the directory */
     obj_handle_t event;         /* handle to the event */
     unsigned int filter;        /* notification filter */
+    int          want_data;     /* flag indicating whether change data should be collected */
     void*        io_apc;        /* APC routine to queue upon end of async */
     void*        io_sb;         /* I/O status block (unique across all async on this handle) */
     void*        io_user;       /* data to pass back to caller */

server/trace.c

diff --git a/server/trace.c b/server/trace.c
index e1ed879..05f4bb6 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -1449,6 +1449,7 @@
     fprintf( stderr, " handle=%p,", req->handle );
     fprintf( stderr, " event=%p,", req->event );
     fprintf( stderr, " filter=%08x,", req->filter );
+    fprintf( stderr, " want_data=%d,", req->want_data );
     fprintf( stderr, " io_apc=%p,", req->io_apc );
     fprintf( stderr, " io_sb=%p,", req->io_sb );
     fprintf( stderr, " io_user=%p", req->io_user );