ntdll: gcc 2.95 compile fixes.
This commit is contained in:
parent
ba3fb48657
commit
d7187d79bd
|
@ -88,15 +88,15 @@ static void test_ntncdf(void)
|
||||||
filter |= FILE_NOTIFY_CHANGE_CREATION;
|
filter |= FILE_NOTIFY_CHANGE_CREATION;
|
||||||
filter |= FILE_NOTIFY_CHANGE_SECURITY;
|
filter |= FILE_NOTIFY_CHANGE_SECURITY;
|
||||||
|
|
||||||
iosb.Status = 1;
|
U(iosb).Status = 1;
|
||||||
iosb.Information = 1;
|
iosb.Information = 1;
|
||||||
r = pNtNotifyChangeDirectoryFile(hdir,hEvent,NULL,NULL,&iosb,buffer,sizeof buffer,-1,0);
|
r = pNtNotifyChangeDirectoryFile(hdir,hEvent,NULL,NULL,&iosb,buffer,sizeof buffer,-1,0);
|
||||||
ok(r==STATUS_INVALID_PARAMETER, "should return invalid parameter\n");
|
ok(r==STATUS_INVALID_PARAMETER, "should return invalid parameter\n");
|
||||||
|
|
||||||
ok( iosb.Status == 1, "information wrong\n");
|
ok( U(iosb).Status == 1, "information wrong\n");
|
||||||
ok( iosb.Information == 1, "information wrong\n");
|
ok( iosb.Information == 1, "information wrong\n");
|
||||||
|
|
||||||
iosb.Status = 1;
|
U(iosb).Status = 1;
|
||||||
iosb.Information = 0;
|
iosb.Information = 0;
|
||||||
r = pNtNotifyChangeDirectoryFile(hdir,hEvent,NULL,NULL,&iosb,buffer,sizeof buffer,filter,0);
|
r = pNtNotifyChangeDirectoryFile(hdir,hEvent,NULL,NULL,&iosb,buffer,sizeof buffer,filter,0);
|
||||||
ok(r==STATUS_PENDING, "should return status pending\n");
|
ok(r==STATUS_PENDING, "should return status pending\n");
|
||||||
|
@ -116,7 +116,7 @@ static void test_ntncdf(void)
|
||||||
r = WaitForSingleObject( hEvent, 0 );
|
r = WaitForSingleObject( hEvent, 0 );
|
||||||
ok( r == WAIT_OBJECT_0, "event should be ready\n" );
|
ok( r == WAIT_OBJECT_0, "event should be ready\n" );
|
||||||
|
|
||||||
ok( iosb.Status == STATUS_SUCCESS, "information wrong\n");
|
ok( U(iosb).Status == STATUS_SUCCESS, "information wrong\n");
|
||||||
ok( iosb.Information == 0x12, "information wrong\n");
|
ok( iosb.Information == 0x12, "information wrong\n");
|
||||||
|
|
||||||
pfni = (PFILE_NOTIFY_INFORMATION) buffer;
|
pfni = (PFILE_NOTIFY_INFORMATION) buffer;
|
||||||
|
@ -133,12 +133,12 @@ static void test_ntncdf(void)
|
||||||
|
|
||||||
filter = FILE_NOTIFY_CHANGE_SIZE;
|
filter = FILE_NOTIFY_CHANGE_SIZE;
|
||||||
|
|
||||||
iosb.Status = 1;
|
U(iosb).Status = 1;
|
||||||
iosb.Information = 1;
|
iosb.Information = 1;
|
||||||
r = pNtNotifyChangeDirectoryFile(hdir,0,NULL,NULL,&iosb,NULL,0,filter,0);
|
r = pNtNotifyChangeDirectoryFile(hdir,0,NULL,NULL,&iosb,NULL,0,filter,0);
|
||||||
ok(r==STATUS_PENDING, "should status pending\n");
|
ok(r==STATUS_PENDING, "should status pending\n");
|
||||||
|
|
||||||
ok( iosb.Status == 1, "information wrong\n");
|
ok( U(iosb).Status == 1, "information wrong\n");
|
||||||
ok( iosb.Information == 1, "information wrong\n");
|
ok( iosb.Information == 1, "information wrong\n");
|
||||||
|
|
||||||
r = WaitForSingleObject( hdir, 0 );
|
r = WaitForSingleObject( hdir, 0 );
|
||||||
|
@ -153,7 +153,7 @@ static void test_ntncdf(void)
|
||||||
r = WaitForSingleObject( hdir, 100 );
|
r = WaitForSingleObject( hdir, 100 );
|
||||||
ok( r == WAIT_OBJECT_0, "should be ready\n" );
|
ok( r == WAIT_OBJECT_0, "should be ready\n" );
|
||||||
|
|
||||||
ok( iosb.Status == STATUS_NOTIFY_ENUM_DIR, "information wrong\n");
|
ok( U(iosb).Status == STATUS_NOTIFY_ENUM_DIR, "information wrong\n");
|
||||||
ok( iosb.Information == 0, "information wrong\n");
|
ok( iosb.Information == 0, "information wrong\n");
|
||||||
|
|
||||||
CloseHandle(hdir);
|
CloseHandle(hdir);
|
||||||
|
@ -211,11 +211,11 @@ static void test_ntncdf_async(void)
|
||||||
filter |= FILE_NOTIFY_CHANGE_SECURITY;
|
filter |= FILE_NOTIFY_CHANGE_SECURITY;
|
||||||
|
|
||||||
|
|
||||||
iosb.Status = 0x01234567;
|
U(iosb).Status = 0x01234567;
|
||||||
iosb.Information = 0x12345678;
|
iosb.Information = 0x12345678;
|
||||||
r = pNtNotifyChangeDirectoryFile(hdir,0,NULL,NULL,&iosb,buffer,sizeof buffer,filter,0);
|
r = pNtNotifyChangeDirectoryFile(hdir,0,NULL,NULL,&iosb,buffer,sizeof buffer,filter,0);
|
||||||
ok(r==STATUS_PENDING, "should status pending\n");
|
ok(r==STATUS_PENDING, "should status pending\n");
|
||||||
ok(iosb.Status == 0x01234567, "status set too soon\n");
|
ok(U(iosb).Status == 0x01234567, "status set too soon\n");
|
||||||
ok(iosb.Information == 0x12345678, "info set too soon\n");
|
ok(iosb.Information == 0x12345678, "info set too soon\n");
|
||||||
|
|
||||||
r = CreateDirectoryW( subdir, NULL );
|
r = CreateDirectoryW( subdir, NULL );
|
||||||
|
@ -224,7 +224,7 @@ static void test_ntncdf_async(void)
|
||||||
r = WaitForSingleObject( hdir, 100 );
|
r = WaitForSingleObject( hdir, 100 );
|
||||||
ok( r == WAIT_OBJECT_0, "should be ready\n" );
|
ok( r == WAIT_OBJECT_0, "should be ready\n" );
|
||||||
|
|
||||||
ok(iosb.Status == STATUS_SUCCESS, "status not successful\n");
|
ok(U(iosb).Status == STATUS_SUCCESS, "status not successful\n");
|
||||||
ok(iosb.Information == 0x12, "info not set\n");
|
ok(iosb.Information == 0x12, "info not set\n");
|
||||||
|
|
||||||
pfni = (PFILE_NOTIFY_INFORMATION) buffer;
|
pfni = (PFILE_NOTIFY_INFORMATION) buffer;
|
||||||
|
@ -242,7 +242,7 @@ static void test_ntncdf_async(void)
|
||||||
r = WaitForSingleObject( hdir, 0 );
|
r = WaitForSingleObject( hdir, 0 );
|
||||||
ok( r == WAIT_OBJECT_0, "should be ready\n" );
|
ok( r == WAIT_OBJECT_0, "should be ready\n" );
|
||||||
|
|
||||||
ok(iosb.Status == STATUS_SUCCESS, "status not successful\n");
|
ok(U(iosb).Status == STATUS_SUCCESS, "status not successful\n");
|
||||||
ok(iosb.Information == 0x12, "info not set\n");
|
ok(iosb.Information == 0x12, "info not set\n");
|
||||||
|
|
||||||
ok( pfni->NextEntryOffset == 0, "offset wrong\n" );
|
ok( pfni->NextEntryOffset == 0, "offset wrong\n" );
|
||||||
|
@ -251,7 +251,7 @@ static void test_ntncdf_async(void)
|
||||||
ok( !memcmp(pfni->FileName,&szHoo[1],6), "name wrong\n" );
|
ok( !memcmp(pfni->FileName,&szHoo[1],6), "name wrong\n" );
|
||||||
|
|
||||||
/* check APCs */
|
/* check APCs */
|
||||||
iosb.Status = 0;
|
U(iosb).Status = 0;
|
||||||
iosb.Information = 0;
|
iosb.Information = 0;
|
||||||
|
|
||||||
r = pNtNotifyChangeDirectoryFile(hdir,0,NULL,NULL,&iosb,NULL,0,filter,0);
|
r = pNtNotifyChangeDirectoryFile(hdir,0,NULL,NULL,&iosb,NULL,0,filter,0);
|
||||||
|
@ -263,10 +263,10 @@ static void test_ntncdf_async(void)
|
||||||
r = WaitForSingleObject( hdir, 0 );
|
r = WaitForSingleObject( hdir, 0 );
|
||||||
ok( r == WAIT_OBJECT_0, "should be ready\n" );
|
ok( r == WAIT_OBJECT_0, "should be ready\n" );
|
||||||
|
|
||||||
ok(iosb.Status == STATUS_NOTIFY_ENUM_DIR, "status not successful\n");
|
ok(U(iosb).Status == STATUS_NOTIFY_ENUM_DIR, "status not successful\n");
|
||||||
ok(iosb.Information == 0, "info not set\n");
|
ok(iosb.Information == 0, "info not set\n");
|
||||||
|
|
||||||
iosb.Status = 0;
|
U(iosb).Status = 0;
|
||||||
iosb.Information = 0;
|
iosb.Information = 0;
|
||||||
|
|
||||||
r = pNtNotifyChangeDirectoryFile(hdir,hEvent,NULL,NULL,&iosb,buffer,sizeof buffer,filter,0);
|
r = pNtNotifyChangeDirectoryFile(hdir,hEvent,NULL,NULL,&iosb,buffer,sizeof buffer,filter,0);
|
||||||
|
@ -278,21 +278,21 @@ static void test_ntncdf_async(void)
|
||||||
r = WaitForSingleObject( hEvent, 0 );
|
r = WaitForSingleObject( hEvent, 0 );
|
||||||
ok( r == WAIT_OBJECT_0, "should be ready\n" );
|
ok( r == WAIT_OBJECT_0, "should be ready\n" );
|
||||||
|
|
||||||
ok(iosb.Status == STATUS_SUCCESS, "status not successful\n");
|
ok(U(iosb).Status == STATUS_SUCCESS, "status not successful\n");
|
||||||
ok(iosb.Information == 0x12, "info not set\n");
|
ok(iosb.Information == 0x12, "info not set\n");
|
||||||
|
|
||||||
|
|
||||||
iosb.Status = 0x01234567;
|
U(iosb).Status = 0x01234567;
|
||||||
iosb.Information = 0x12345678;
|
iosb.Information = 0x12345678;
|
||||||
r = pNtNotifyChangeDirectoryFile(hdir,0,NULL,NULL,&iosb,buffer,sizeof buffer,filter,0);
|
r = pNtNotifyChangeDirectoryFile(hdir,0,NULL,NULL,&iosb,buffer,sizeof buffer,filter,0);
|
||||||
ok(r==STATUS_PENDING, "should status pending\n");
|
ok(r==STATUS_PENDING, "should status pending\n");
|
||||||
|
|
||||||
iosb2.Status = 0x01234567;
|
U(iosb2).Status = 0x01234567;
|
||||||
iosb2.Information = 0x12345678;
|
iosb2.Information = 0x12345678;
|
||||||
r = pNtNotifyChangeDirectoryFile(hdir,0,NULL,NULL,&iosb2,buffer,sizeof buffer,filter,0);
|
r = pNtNotifyChangeDirectoryFile(hdir,0,NULL,NULL,&iosb2,buffer,sizeof buffer,filter,0);
|
||||||
ok(r==STATUS_PENDING, "should status pending\n");
|
ok(r==STATUS_PENDING, "should status pending\n");
|
||||||
|
|
||||||
ok(iosb.Status == 0x01234567, "status set too soon\n");
|
ok(U(iosb).Status == 0x01234567, "status set too soon\n");
|
||||||
ok(iosb.Information == 0x12345678, "info set too soon\n");
|
ok(iosb.Information == 0x12345678, "info set too soon\n");
|
||||||
|
|
||||||
todo_wine {
|
todo_wine {
|
||||||
|
@ -301,8 +301,8 @@ static void test_ntncdf_async(void)
|
||||||
|
|
||||||
CloseHandle(hdir);
|
CloseHandle(hdir);
|
||||||
|
|
||||||
ok(iosb.Status == STATUS_SUCCESS, "status wrong\n");
|
ok(U(iosb).Status == STATUS_SUCCESS, "status wrong\n");
|
||||||
ok(iosb2.Status == STATUS_CANCELLED, "status wrong\n");
|
ok(U(iosb2).Status == STATUS_CANCELLED, "status wrong\n");
|
||||||
}
|
}
|
||||||
ok(iosb.Information == 0, "info wrong\n");
|
ok(iosb.Information == 0, "info wrong\n");
|
||||||
ok(iosb2.Information == 0, "info wrong\n");
|
ok(iosb2.Information == 0, "info wrong\n");
|
||||||
|
|
Loading…
Reference in New Issue