Alexandre Julliard : kernel32/tests: Allow the parent directory to receive a modified event.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Dec 3 15:43:25 CST 2014


Module: wine
Branch: master
Commit: 0ab2311cd5c766fb14d8ce799cd02461c40c5aa0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0ab2311cd5c766fb14d8ce799cd02461c40c5aa0

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Dec  3 21:32:46 2014 +0100

kernel32/tests: Allow the parent directory to receive a modified event.

---

 dlls/kernel32/tests/change.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c
index ad22f18..19e55bb 100644
--- a/dlls/kernel32/tests/change.c
+++ b/dlls/kernel32/tests/change.c
@@ -554,9 +554,18 @@ static void test_readdirectorychanges(void)
     ok( r == WAIT_OBJECT_0, "should be ready\n" );
 
     ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n");
-    ok( ov.InternalHigh == 0x18, "ov.InternalHigh wrong\n");
+    ok( ov.InternalHigh == 0x18 || ov.InternalHigh == 0x12 + 0x18,
+        "ov.InternalHigh wrong %lx\n", ov.InternalHigh);
 
     pfni = (PFILE_NOTIFY_INFORMATION) buffer;
+    if (pfni->NextEntryOffset)  /* we may get a modified event on the parent dir */
+    {
+        ok( pfni->NextEntryOffset == 0x12, "offset wrong %x\n", pfni->NextEntryOffset );
+        ok( pfni->Action == FILE_ACTION_MODIFIED, "action wrong %d\n", pfni->Action );
+        ok( pfni->FileNameLength == 3*sizeof(WCHAR), "len wrong\n" );
+        ok( !memcmp(pfni->FileName,&szGa[1],3*sizeof(WCHAR)), "name wrong\n");
+        pfni = (PFILE_NOTIFY_INFORMATION)((char *)pfni + pfni->NextEntryOffset);
+    }
     ok( pfni->NextEntryOffset == 0, "offset wrong\n" );
     ok( pfni->Action == FILE_ACTION_ADDED, "action wrong\n" );
     ok( pfni->FileNameLength == 6*sizeof(WCHAR), "len wrong\n" );




More information about the wine-cvs mailing list