[ros-diffs] [hbirr] 15699: Try always to open a file as named object first.

Try always to open a file as named object first. 
This is necessary for the redirection to NUL which is used by the new
build system.
Modified: trunk/reactos/ntoskrnl/io/file.c
  _____  

Modified: trunk/reactos/ntoskrnl/io/file.c
--- trunk/reactos/ntoskrnl/io/file.c	2005-05-31 14:51:53 UTC (rev
15698)
+++ trunk/reactos/ntoskrnl/io/file.c	2005-05-31 14:56:55 UTC (rev
15699)
@@ -844,44 +844,39 @@

      DPRINT1("FIXME: IO_CHECK_CREATE_PARAMETERS not yet supported!\n");
    }
 
-   if (CreateDisposition == FILE_OPEN ||
-       CreateDisposition == FILE_OPEN_IF)
-   {
+   Status = ObOpenObjectByName(ObjectAttributes,
+                               NULL,
+                               NULL,
+                               AccessMode,
+                               DesiredAccess,
+                               NULL,
+                               &LocalHandle);
 
-      Status = ObOpenObjectByName(ObjectAttributes,
-                                  NULL,
-                                  NULL,
-                                  AccessMode,
-                                  DesiredAccess,
-                                  NULL,
-                                  &LocalHandle);
-
-      if (NT_SUCCESS(Status))
+   if (NT_SUCCESS(Status))
+   {
+      Status = ObReferenceObjectByHandle(LocalHandle,
+                                         DesiredAccess,
+                                         NULL,
+                                         AccessMode,
+                                         (PVOID*)&DeviceObject,
+                                         NULL);
+      ZwClose(LocalHandle);
+      if (!NT_SUCCESS(Status))
       {
-         Status = ObReferenceObjectByHandle(LocalHandle,
-                                            DesiredAccess,
-                                            NULL,
-                                            AccessMode,
-                                            (PVOID*)&DeviceObject,
-                                            NULL);
-         ZwClose(LocalHandle);
-         if (!NT_SUCCESS(Status))
-         {
-            return Status;
-         }
-         if (BODY_TO_HEADER(DeviceObject)->Type != IoDeviceObjectType)
-         {
-            ObDereferenceObject (DeviceObject);
-            return STATUS_OBJECT_NAME_COLLISION;
-         }
-         /* FIXME: wt... */
-         FileObject = IoCreateStreamFileObject(NULL, DeviceObject);
-         /* HACK */
-         FileObject->Flags |= FO_DIRECT_DEVICE_OPEN;
-         DPRINT("%wZ\n", ObjectAttributes->ObjectName);
-
+         return Status;
+      }
+      if (BODY_TO_HEADER(DeviceObject)->Type != IoDeviceObjectType)
+      {
          ObDereferenceObject (DeviceObject);
+         return STATUS_OBJECT_NAME_COLLISION;
       }
+      /* FIXME: wt... */
+      FileObject = IoCreateStreamFileObject(NULL, DeviceObject);
+      /* HACK */
+      FileObject->Flags |= FO_DIRECT_DEVICE_OPEN;
+      DPRINT("%wZ\n", ObjectAttributes->ObjectName);
+
+      ObDereferenceObject (DeviceObject);
    }