Alexandre Julliard : kernel32/tests: Fix the change notification test on Vista.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun 10 17:44:41 2008 +0200

kernel32/tests: Fix the change notification test on Vista.

---

 dlls/kernel32/tests/change.c |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c
index c070eb0..cb500ef 100644
--- a/dlls/kernel32/tests/change.c
+++ b/dlls/kernel32/tests/change.c
@@ -560,8 +560,8 @@ static void test_readdirectorychanges(void)
     pfni = (PFILE_NOTIFY_INFORMATION) buffer;
     ok( pfni->NextEntryOffset == 0, "offset wrong\n" );
     ok( pfni->Action == FILE_ACTION_ADDED, "action wrong\n" );
-    ok( pfni->FileNameLength == 0x0c, "len wrong\n" );
-    ok( !memcmp(pfni->FileName,&szGa[1],6), "name wrong\n" );
+    ok( pfni->FileNameLength == 6*sizeof(WCHAR), "len wrong\n" );
+    ok( !memcmp(pfni->FileName,&szGa[1],6*sizeof(WCHAR)), "name wrong\n" );
 
     r = RemoveDirectoryW( subsubdir );
     ok( r == TRUE, "failed to remove directory\n");
@@ -578,13 +578,21 @@ static void test_readdirectorychanges(void)
     ok( r == WAIT_OBJECT_0, "should be ready\n" );
 
     pfni = (PFILE_NOTIFY_INFORMATION) buffer;
-    ok( pfni->NextEntryOffset == 0, "offset wrong\n" );
-    ok( pfni->Action == FILE_ACTION_REMOVED, "action wrong\n" );
-    ok( pfni->FileNameLength == 0x0c, "len wrong\n" );
-    ok( !memcmp(pfni->FileName,&szGa[1],6), "name wrong\n" );
+    /* we may get a notification for the parent dir too */
+    if (pfni->Action == FILE_ACTION_MODIFIED && pfni->NextEntryOffset)
+    {
+        ok( pfni->FileNameLength == 3*sizeof(WCHAR), "len wrong %u\n", pfni->FileNameLength );
+        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 %u\n", pfni->NextEntryOffset );
+    ok( pfni->Action == FILE_ACTION_REMOVED, "action wrong %u\n", pfni->Action );
+    ok( pfni->FileNameLength == 6*sizeof(WCHAR), "len wrong %u\n", pfni->FileNameLength );
+    ok( !memcmp(pfni->FileName,&szGa[1],6*sizeof(WCHAR)), "name wrong\n" );
 
     ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n");
-    ok( ov.InternalHigh == 0x18, "ov.InternalHigh wrong\n");
+    dwCount = (char *)&pfni->FileName[pfni->FileNameLength/sizeof(WCHAR)] - buffer;
+    ok( ov.InternalHigh == dwCount, "ov.InternalHigh wrong %lu/%u\n",ov.InternalHigh, dwCount );
 
     CloseHandle(hdir);