- NtQuerySection should check for SECTION_QUERY access right and not SECTION_MAP_READ.

- Fix prototype of NtExtendSection.

svn path=/trunk/; revision=10620

diff --git a/reactos/include/ntos/mm.h b/reactos/include/ntos/mm.h
index ac36121..d6f763c 100644 (file)
--- a/reactos/include/ntos/mm.h
+++ b/reactos/include/ntos/mm.h
@@ -17,6 +17,7 @@
 
 #define SEC_BASED       (0x00200000)
 #define SEC_NO_CHANGE   (0x00400000)
+#define SEC_FILE        (0x00800000)
 #define SEC_IMAGE       (0x01000000)
 #define SEC_VLM         (0x02000000)
 #define SEC_RESERVE     (0x04000000)

diff --git a/reactos/include/ntos/zw.h b/reactos/include/ntos/zw.h
index ad09478..4dd5de8 100755 (executable)
--- a/reactos/include/ntos/zw.h
+++ b/reactos/include/ntos/zw.h
@@ -1,5 +1,5 @@
 
-/* $Id: zw.h,v 1.28 2004/07/17 05:13:05 ion Exp $
+/* $Id: zw.h,v 1.29 2004/08/20 21:23:49 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -5251,7 +5251,7 @@ NTSTATUS
 STDCALL
 NtExtendSection(
        IN HANDLE SectionHandle,
-       IN ULONG NewMaximumSize
+       IN PLARGE_INTEGER NewMaximumSize
        );
 
 /*
@@ -6441,7 +6441,7 @@ NTSTATUS
 STDCALL
 ZwExtendSection(
        IN HANDLE SectionHandle,
-       IN ULONG NewMaximumSize
+       IN PLARGE_INTEGER NewMaximumSize
        );
 
 /*

diff --git a/reactos/ntoskrnl/mm/section.c b/reactos/ntoskrnl/mm/section.c
index b7b6535..23ff9d6 100644 (file)
--- a/reactos/ntoskrnl/mm/section.c
+++ b/reactos/ntoskrnl/mm/section.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: section.c,v 1.159 2004/08/18 02:29:37 navaraf Exp $
+/* $Id: section.c,v 1.160 2004/08/20 21:23:49 navaraf Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/mm/section.c
@@ -3440,30 +3440,41 @@ NtUnmapViewOfSection (HANDLE ProcessHandle,
 }
 
 
-NTSTATUS STDCALL
-NtQuerySection (IN HANDLE SectionHandle,
-                IN CINT SectionInformationClass,
-                OUT PVOID SectionInformation,
-                IN ULONG Length,
-                OUT PULONG ResultLength)
-/*
- * FUNCTION: Queries the information of a section object.
- * ARGUMENTS:
- *        SectionHandle = Handle to the section link object
- *   SectionInformationClass = Index to a certain information structure
- *        SectionInformation (OUT)= Caller supplies storage for resulting
- *                                  information
- *        Length =  Size of the supplied storage
- *        ResultLength = Data written
- * RETURNS: Status
+/**
+ * Queries the information of a section object.
+ * 
+ * @param SectionHandle
+ *        Handle to the section object. It must be opened with SECTION_QUERY
+ *        access.
+ * @param SectionInformationClass
+ *        Index to a certain information structure. Can be either
+ *        SectionBasicInformation or SectionImageInformation. The latter
+ *        is valid only for sections that were created with the SEC_IMAGE
+ *        flag.
+ * @param SectionInformation
+ *        Caller supplies storage for resulting information.
+ * @param Length
+ *        Size of the supplied storage.
+ * @param ResultLength
+ *        Data written.
+ *
+ * @return Status.
  *
+ * @todo Guard by SEH.
+ * @implemented
  */
+NTSTATUS STDCALL
+NtQuerySection(IN HANDLE SectionHandle,
+               IN CINT SectionInformationClass,
+               OUT PVOID SectionInformation,
+               IN ULONG Length,
+               OUT PULONG ResultLength)
 {
    PSECTION_OBJECT Section;
    NTSTATUS Status;
 
    Status = ObReferenceObjectByHandle(SectionHandle,
-                                      SECTION_MAP_READ,
+                                      SECTION_QUERY,
                                       MmSectionObjectType,
                                       UserMode,
                                       (PVOID*)&Section,
@@ -3487,9 +3498,17 @@ NtQuerySection (IN HANDLE SectionHandle,
 
             Sbi = (PSECTION_BASIC_INFORMATION)SectionInformation;
 
-            Sbi->BaseAddress = 0;
-            Sbi->Attributes = 0;
-            Sbi->Size.QuadPart = 0;
+            Sbi->Attributes = Section->AllocationAttributes;
+            if (Section->AllocationAttributes & SEC_IMAGE)
+            {
+               Sbi->BaseAddress = 0;
+               Sbi->Size.QuadPart = 0;
+            }
+            else
+            {
+               Sbi->BaseAddress = Section->Segment->VirtualAddress;
+               Sbi->Size.QuadPart = Section->Segment->Length;
+            }
 
             *ResultLength = sizeof(SECTION_BASIC_INFORMATION);
             Status = STATUS_SUCCESS;
@@ -3537,12 +3556,56 @@ NtQuerySection (IN HANDLE SectionHandle,
 }
 
 
+/**
+ * Extends size of file backed section.
+ * 
+ * @param SectionHandle
+ *        Handle to the section object. It must be opened with
+ *        SECTION_EXTEND_SIZE access.
+ * @param NewMaximumSize
+ *        New maximum size of the section in bytes.
+ *
+ * @return Status.
+ *
+ * @todo Guard by SEH.
+ * @todo Move the actual code to internal function MmExtendSection.
+ * @unimplemented
+ */
 NTSTATUS STDCALL
 NtExtendSection(IN HANDLE SectionHandle,
-                IN ULONG NewMaximumSize)
+                IN PLARGE_INTEGER NewMaximumSize)
 {
-   UNIMPLEMENTED;
-   return(STATUS_NOT_IMPLEMENTED);
+   PSECTION_OBJECT Section;
+   NTSTATUS Status;
+
+   Status = ObReferenceObjectByHandle(SectionHandle,
+                                      SECTION_EXTEND_SIZE,
+                                      MmSectionObjectType,
+                                      UserMode,
+                                      (PVOID*)&Section,
+                                      NULL);
+   if (!NT_SUCCESS(Status))
+   {
+      return Status;
+   }
+
+   if (!(Section->AllocationAttributes & SEC_FILE))
+   {
+      ObfDereferenceObject(Section);
+      return STATUS_INVALID_PARAMETER;
+   }
+   
+   /*
+    * - Acquire file extneding resource.
+    * - Check if we're not resizing the section below it's actual size!
+    * - Extend segments if needed.
+    * - Set file information (FileAllocationInformation) to the new size.
+    * - Release file extending resource.
+    */
+
+   ObDereferenceObject(Section);
+
+   return STATUS_NOT_IMPLEMENTED;
 }