Commit 45396585 authored by Jeremy White's avatar Jeremy White Committed by Alexandre Julliard

kernel: Fixed build with gcc 2.95.

parent 20284673
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
#include "ntstatus.h" #include "ntstatus.h"
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
...@@ -167,7 +169,7 @@ BOOL WINAPI ReadDirectoryChangesW( HANDLE handle, LPVOID buffer, DWORD len, BOOL ...@@ -167,7 +169,7 @@ BOOL WINAPI ReadDirectoryChangesW( HANDLE handle, LPVOID buffer, DWORD len, BOOL
pov = overlapped; pov = overlapped;
ios = (PIO_STATUS_BLOCK) pov; ios = (PIO_STATUS_BLOCK) pov;
ios->Status = STATUS_PENDING; ios->u.Status = STATUS_PENDING;
status = NtNotifyChangeDirectoryFile( handle, pov->hEvent, NULL, NULL, status = NtNotifyChangeDirectoryFile( handle, pov->hEvent, NULL, NULL,
ios, buffer, len, filter, subtree ); ios, buffer, len, filter, subtree );
...@@ -180,7 +182,7 @@ BOOL WINAPI ReadDirectoryChangesW( HANDLE handle, LPVOID buffer, DWORD len, BOOL ...@@ -180,7 +182,7 @@ BOOL WINAPI ReadDirectoryChangesW( HANDLE handle, LPVOID buffer, DWORD len, BOOL
CloseHandle( ov.hEvent ); CloseHandle( ov.hEvent );
if (returned) if (returned)
*returned = ios->Information; *returned = ios->Information;
status = ios->Status; status = ios->u.Status;
} }
if (status != STATUS_SUCCESS) if (status != STATUS_SUCCESS)
......
...@@ -431,8 +431,8 @@ static void test_readdirectorychanges(void) ...@@ -431,8 +431,8 @@ static void test_readdirectorychanges(void)
SetEvent(ov.hEvent); SetEvent(ov.hEvent);
ov.Internal = 1; ov.Internal = 1;
ov.InternalHigh = 1; ov.InternalHigh = 1;
ov.Offset = 0; S(U(ov)).Offset = 0;
ov.OffsetHigh = 0; S(U(ov)).OffsetHigh = 0;
memset( buffer, 0, sizeof buffer ); memset( buffer, 0, sizeof buffer );
r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL);
ok(r==TRUE, "should return true\n"); ok(r==TRUE, "should return true\n");
...@@ -532,8 +532,8 @@ static void test_readdirectorychanges_null(void) ...@@ -532,8 +532,8 @@ static void test_readdirectorychanges_null(void)
ov.Internal = 0; ov.Internal = 0;
ov.InternalHigh = 0; ov.InternalHigh = 0;
ov.Offset = 0; S(U(ov)).Offset = 0;
ov.OffsetHigh = 0; S(U(ov)).OffsetHigh = 0;
memset( buffer, 0, sizeof buffer ); memset( buffer, 0, sizeof buffer );
r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment