Alexandre Julliard : kernel32/tests: Fix overlapped status checks for 64-bit.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Oct 1 14:34:31 CDT 2014


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Oct  1 21:14:24 2014 +0200

kernel32/tests: Fix overlapped status checks for 64-bit.

---

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

diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c
index 9226950..ad22f18 100644
--- a/dlls/kernel32/tests/change.c
+++ b/dlls/kernel32/tests/change.c
@@ -472,7 +472,7 @@ static void test_readdirectorychanges(void)
     r = WaitForSingleObject( ov.hEvent, 1000 );
     ok( r == WAIT_OBJECT_0, "event should be ready\n" );
 
-    ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n");
+    ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n");
     ok( ov.InternalHigh == 0x12, "ov.InternalHigh wrong\n");
 
     pfni = (PFILE_NOTIFY_INFORMATION) buffer;
@@ -502,7 +502,7 @@ static void test_readdirectorychanges(void)
     r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL);
     ok(r==TRUE, "should return true\n");
 
-    ok( ov.Internal == STATUS_PENDING, "ov.Internal wrong\n");
+    ok( (NTSTATUS)ov.Internal == STATUS_PENDING, "ov.Internal wrong\n");
     ok( ov.InternalHigh == 1, "ov.InternalHigh wrong\n");
 
     r = WaitForSingleObject( ov.hEvent, 0 );
@@ -514,10 +514,10 @@ static void test_readdirectorychanges(void)
     r = WaitForSingleObject( ov.hEvent, 1000 );
     ok( r == WAIT_OBJECT_0, "should be ready\n" );
 
-    ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n");
+    ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n");
     ok( ov.InternalHigh == 0x12, "ov.InternalHigh wrong\n");
 
-    if (ov.Internal == STATUS_SUCCESS)
+    if ((NTSTATUS)ov.Internal == STATUS_SUCCESS)
     {
         r = GetOverlappedResult( hdir, &ov, &dwCount, TRUE );
         ok( r == TRUE, "getoverlappedresult failed\n");
@@ -540,7 +540,7 @@ static void test_readdirectorychanges(void)
     r = WaitForSingleObject( ov.hEvent, 1000 );
     ok( r == WAIT_OBJECT_0, "should be ready\n" );
 
-    ok( ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n");
+    ok( (NTSTATUS)ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n");
     ok( ov.InternalHigh == 0, "ov.InternalHigh wrong\n");
 
     /* test the recursive watch */
@@ -553,7 +553,7 @@ static void test_readdirectorychanges(void)
     r = WaitForSingleObject( ov.hEvent, 1000 );
     ok( r == WAIT_OBJECT_0, "should be ready\n" );
 
-    ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n");
+    ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n");
     ok( ov.InternalHigh == 0x18, "ov.InternalHigh wrong\n");
 
     pfni = (PFILE_NOTIFY_INFORMATION) buffer;
@@ -589,7 +589,7 @@ static void test_readdirectorychanges(void)
     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( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n");
     dwCount = (char *)&pfni->FileName[pfni->FileNameLength/sizeof(WCHAR)] - buffer;
     ok( ov.InternalHigh == dwCount, "ov.InternalHigh wrong %lu/%u\n",ov.InternalHigh, dwCount );
 
@@ -666,7 +666,7 @@ static void test_readdirectorychanges_null(void)
     r = WaitForSingleObject( ov.hEvent, 0 );
     ok( r == WAIT_OBJECT_0, "event should be ready\n" );
 
-    ok( ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n");
+    ok( (NTSTATUS)ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n");
     ok( ov.InternalHigh == 0, "ov.InternalHigh wrong\n");
 
     ov.Internal = 0;
@@ -687,7 +687,7 @@ static void test_readdirectorychanges_null(void)
     r = WaitForSingleObject( ov.hEvent, 1000 );
     ok( r == WAIT_OBJECT_0, "should be ready\n" );
 
-    ok( ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n");
+    ok( (NTSTATUS)ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n");
     ok( ov.InternalHigh == 0, "ov.InternalHigh wrong\n");
 
     pfni = (PFILE_NOTIFY_INFORMATION) buffer;
@@ -763,7 +763,7 @@ static void test_readdirectorychanges_filedir(void)
     r = WaitForSingleObject( ov.hEvent, 1000 );
     ok( r == WAIT_OBJECT_0, "event should be ready\n" );
 
-    ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n");
+    ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n");
     ok( ov.InternalHigh == 0x12, "ov.InternalHigh wrong\n");
 
     pfni = (PFILE_NOTIFY_INFORMATION) buffer;




More information about the wine-cvs mailing list