[KMTESTS:MM]

[reactos.git] / rostests / kmtests / ntos_mm / ZwCreateSection.c

diff --git a/rostests/kmtests/ntos_mm/ZwCreateSection.c b/rostests/kmtests/ntos_mm/ZwCreateSection.c
index 1e9ccdb..fc41c6d 100644 (file)
--- a/rostests/kmtests/ntos_mm/ZwCreateSection.c
+++ b/rostests/kmtests/ntos_mm/ZwCreateSection.c
@@ -272,7 +272,7 @@ KmtInitTestFiles(PHANDLE ReadOnlyFile, PHANDLE WriteOnlyFile, PHANDLE Executable
     ok_eq_hex(Status, STATUS_SUCCESS);
     ok_eq_ulongptr(IoStatusBlock.Information, FILE_CREATED);
     ok(*WriteOnlyFile != NULL, "WriteOnlyFile is NULL\n");
-    if (*WriteOnlyFile)
+    if (!skip(*WriteOnlyFile != NULL, "No WriteOnlyFile\n"))
     {
         FileOffset.QuadPart = 0;
         Status = ZwWriteFile(*WriteOnlyFile, NULL, NULL, NULL, &IoStatusBlock, (PVOID)TestString, TestStringSize, &FileOffset, NULL);
@@ -324,7 +324,7 @@ SimpleErrorChecks(HANDLE FileHandleReadOnly, HANDLE FileHandleWriteOnly, HANDLE
     CREATE_SECTION(Section, SECTION_ALL_ACCESS, NULL, MaximumSize, PAGE_READWRITE, SEC_COMMIT, NULL, STATUS_INVALID_PARAMETER_4, IGNORE);
 
     //division by zero in ROS
-    if (!skip(SharedUserData->LargePageMinimum > 0, "LargePageMinimum is 0"))
+    if (!skip(SharedUserData->LargePageMinimum > 0, "LargePageMinimum is 0\n"))
     {
         MaximumSize.QuadPart = (_4mb / SharedUserData->LargePageMinimum) * SharedUserData->LargePageMinimum; //4mb
         CREATE_SECTION(Section, SECTION_ALL_ACCESS, NULL, MaximumSize, PAGE_READWRITE, (SEC_LARGE_PAGES | SEC_COMMIT), NULL, STATUS_SUCCESS, STATUS_SUCCESS);
@@ -425,7 +425,7 @@ SimpleErrorChecks(HANDLE FileHandleReadOnly, HANDLE FileHandleWriteOnly, HANDLE
 
     //MaximumSize
     Status = ZwQueryInformationFile(FileHandleExecuteOnly, &IoStatusBlock, &FileStandardInfo, sizeof(FILE_STANDARD_INFORMATION), FileStandardInformation);
-    if (!skip(NT_SUCCESS(Status), "Cannot query file information"))
+    if (!skip(NT_SUCCESS(Status), "Cannot query file information\n"))
     {
         //as big as file
         MaximumSize = FileStandardInfo.EndOfFile;
@@ -455,14 +455,10 @@ BasicBehaviorChecks(HANDLE FileHandle)
 {
     NTSTATUS Status;
     HANDLE Section = NULL;
-#ifdef ROSTESTS_108_FIXED
     PFILE_OBJECT FileObject;
-#endif /* ROSTESTS_108_FIXED */
     LARGE_INTEGER Length;
     Length.QuadPart = TestStringSize;
 
-/* FIXME: Null pointer dereference. See ROSTESTS-108 */
-#ifdef ROSTESTS_108_FIXED
     //mimic lack of section support for a particular file as well.
     Status = ObReferenceObjectByHandle(FileHandle, STANDARD_RIGHTS_ALL, *IoFileObjectType, KernelMode, (PVOID *)&FileObject, NULL);
     if (!skip(NT_SUCCESS(Status), "Cannot reference object by handle\n"))
@@ -474,7 +470,7 @@ BasicBehaviorChecks(HANDLE FileHandle)
         FileObject->SectionObjectPointer = Pointers;
         ObDereferenceObject(FileObject);
     }
-#endif /* ROSTESTS_108_FIXED */
+
     Length.QuadPart = TestStringSize;
     CREATE_SECTION(Section, (SECTION_ALL_ACCESS), NULL, Length, PAGE_READONLY, SEC_COMMIT, FileHandle, STATUS_SUCCESS, NO_HANDLE_CLOSE);
     CheckObject(Section, 2, 1);
@@ -507,7 +503,7 @@ START_TEST(ZwCreateSection)
 
     KmtInitTestFiles(&FileHandleReadOnly, &FileHandleWriteOnly, &FileHandleExecuteOnly);
 
-    if (FileHandleReadOnly && FileHandleWriteOnly && FileHandleExecuteOnly)
+    if (!skip(FileHandleReadOnly && FileHandleWriteOnly && FileHandleExecuteOnly, "Missing one or more file handles\n"))
     {
         FileSectionViewPermissionCheck(FileHandleReadOnly, FileHandleWriteOnly, FileHandleExecuteOnly);
         SimpleErrorChecks(FileHandleReadOnly, FileHandleWriteOnly, FileHandleExecuteOnly);