Enhanced memory managment

Correct several bugs in the creation/termination of processes

svn path=/trunk/; revision=360

diff --git a/reactos/apps/utils/shell/shell.c b/reactos/apps/utils/shell/shell.c
index 3a394c2..8f25ca8 100644 (file)
--- a/reactos/apps/utils/shell/shell.c
+++ b/reactos/apps/utils/shell/shell.c
@@ -111,6 +111,7 @@ int ExecuteProcess(char* name, char* cmdline)
      {
        WaitForSingleObject(ProcessInformation.hProcess,INFINITE);
      }
+   CloseHandle(ProcessInformation.hProcess);
    return(ret);
 }
 

diff --git a/reactos/drivers/dd/blue/blue.c b/reactos/drivers/dd/blue/blue.c
index 3b8e042..8beceb6 100644 (file)
--- a/reactos/drivers/dd/blue/blue.c
+++ b/reactos/drivers/dd/blue/blue.c
@@ -11,6 +11,21 @@
 //#define NDEBUG
 #include <internal/debug.h>
 
+#define IDMAP_BASE         (0xd0000000)
+
+/*
+ * Return a linear address which can be used to access the physical memory
+ * starting at x 
+ */
+extern inline unsigned int physical_to_linear(unsigned int x)
+{
+        return(x+IDMAP_BASE);
+}
+
+extern inline unsigned int linear_to_physical(unsigned int x)
+{
+        return(x-IDMAP_BASE);
+}
 
 
 #define VIDMEM_BASE        0xb8000

diff --git a/reactos/include/ddk/li.h b/reactos/include/ddk/li.h
index 9fc7670..9c00737 100644 (file)
--- a/reactos/include/ddk/li.h
+++ b/reactos/include/ddk/li.h
@@ -7,7 +7,7 @@
 #ifdef COMPILER_LARGE_INTEGERS
 
 #define GET_LARGE_INTEGER_HIGH_PART(LI) ( ( (LI) >> 32) )
-#define GET_LARGE_INTEGER_LOW_PART(LI) ( ((LI) & 0xFFFFFFFF) )
+#define GET_LARGE_INTEGER_LOW_PART(LI) (ULONG)( ((LI) & 0xFFFFFFFF) )
 #define SET_LARGE_INTEGER_HIGH_PART(LI, HP)  \
   ( (LI) = ((LI) & 0xFFFFFFFFL) | ( ((LARGE_INTEGER)(HP)) << 32 ) )
 #define SET_LARGE_INTEGER_LOW_PART(LI, LP) \

diff --git a/reactos/include/ddk/pstypes.h b/reactos/include/ddk/pstypes.h
index 5672454..cd46a73 100644 (file)
--- a/reactos/include/ddk/pstypes.h
+++ b/reactos/include/ddk/pstypes.h
@@ -6,10 +6,10 @@
 #include <internal/hal.h>
 
 #ifndef TLS_MINIMUM_AVAILABLE
-       #define TLS_MINIMUM_AVAILABLE   (64)
+#define TLS_MINIMUM_AVAILABLE  (64)
 #endif
 #ifndef MAX_PATH
-       #define MAX_PATH        (260)
+#define MAX_PATH       (260)
 #endif
 
 typedef NTSTATUS (*PKSTART_ROUTINE)(PVOID StartContext);
@@ -109,7 +109,7 @@ typedef struct _CLIENT_ID
     HANDLE UniqueProcess;
     HANDLE UniqueThread;
 } CLIENT_ID, *PCLIENT_ID;
-
+ 
 typedef struct _NT_TIB {
     struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList;
     PVOID StackBase;
@@ -125,7 +125,6 @@ typedef struct _NT_TIB {
 
 typedef struct _NT_TEB
 {
-
        NT_TIB                  Tib; 
        CLIENT_ID               Cid;
        HANDLE                  RPCHandle;
@@ -136,7 +135,6 @@ typedef struct _NT_TEB
        NTSTATUS                LastStatusValue; 
        DWORD                   LockCount;
        UCHAR                   HardErrorMode;
-       
 } NT_TEB;
 
 typedef struct _KTHREAD 

diff --git a/reactos/include/internal/ex.h b/reactos/include/internal/ex.h
new file mode 100644 (file)
index 0000000..ce3d2c0
--- /dev/null
+++ b/reactos/include/internal/ex.h
@@ -0,0 +1,2 @@
+VOID ExUnmapPage(PVOID Addr);
+PVOID ExAllocatePage(VOID);

diff --git a/reactos/include/internal/mm.h b/reactos/include/internal/mm.h
index ab50002..5d9a64b 100644 (file)
--- a/reactos/include/internal/mm.h
+++ b/reactos/include/internal/mm.h
@@ -91,4 +91,6 @@ PVOID MmInitializePageList(PVOID FirstPhysKernelAddress,
 PVOID MmAllocPage(VOID);
 VOID MmFreePage(PVOID PhysicalAddress, ULONG Nr);
 VOID MmDeletePageTable(PEPROCESS Process, PVOID Address);
+NTSTATUS MmCopyMmInfo(PEPROCESS Src, PEPROCESS Dest);
+NTSTATUS MmReleaseMmInfo(PEPROCESS Process);
 #endif

diff --git a/reactos/include/internal/ob.h b/reactos/include/internal/ob.h
index 77ac96e..f525578 100644 (file)
--- a/reactos/include/internal/ob.h
+++ b/reactos/include/internal/ob.h
@@ -111,5 +111,6 @@ NTSTATUS ObFindObject(POBJECT_ATTRIBUTES ObjectAttributes,
                      PVOID* ReturnedObject,
                      PWSTR* RemainingPath);
 
+ULONG ObGetReferenceCount(PVOID Object);
 
 #endif /* __INCLUDE_INTERNAL_OBJMGR_H */

diff --git a/reactos/include/internal/ps.h b/reactos/include/internal/ps.h
index dc8ef29..a9f70cd 100644 (file)
--- a/reactos/include/internal/ps.h
+++ b/reactos/include/internal/ps.h
@@ -57,5 +57,6 @@ NTSTATUS HalInitTask(PETHREAD thread, PKSTART_ROUTINE fn, PVOID StartContext);
 void HalTaskSwitch(PKTHREAD thread);
 NTSTATUS HalInitTaskWithContext(PETHREAD Thread, PCONTEXT Context);
 NTSTATUS HalReleaseTask(PETHREAD Thread);
+VOID PiDeleteProcess(PVOID ObjectBody);
 
 #endif

diff --git a/reactos/lib/kernel32/file/deviceio.c b/reactos/lib/kernel32/file/deviceio.c
index 8d25ca2..3905dec 100644 (file)
--- a/reactos/lib/kernel32/file/deviceio.c
+++ b/reactos/lib/kernel32/file/deviceio.c
@@ -44,8 +44,7 @@ DeviceIoControl(
                bFsIoControlCode = TRUE;        
        else
                bFsIoControlCode = FALSE;
-// CHECKPOINT
-       if(lpOverlapped  != NULL) {
+   if(lpOverlapped  != NULL) {
                hEvent = lpOverlapped->hEvent;
                lpOverlapped->Internal = STATUS_PENDING;
                IoStatusBlock = (PIO_STATUS_BLOCK)lpOverlapped;
@@ -54,14 +53,13 @@ DeviceIoControl(
                IoStatusBlock = &IIosb;
        }
 
-// CHECKPOINT
         if(bFsIoControlCode == TRUE) {
                errCode = NtFsControlFile(hDevice,hEvent,NULL,NULL,IoStatusBlock,dwIoControlCode,lpInBuffer, nInBufferSize, lpOutBuffer, nOutBufferSize );
         } else {   
                errCode = NtDeviceIoControlFile(hDevice,hEvent,NULL,NULL,IoStatusBlock,dwIoControlCode, lpInBuffer, nInBufferSize, lpOutBuffer, nOutBufferSize);
         }
-// CHECKPOINT
-       if(errCode == STATUS_PENDING ) {
+   
+   if(errCode == STATUS_PENDING ) {
            
                if(NtWaitForSingleObject(hDevice,FALSE,NULL) < 0) {
                        *lpBytesReturned = IoStatusBlock->Information;
@@ -73,12 +71,10 @@ DeviceIoControl(
                SetLastError(RtlNtStatusToDosError(errCode));
                return FALSE;
        }
-// CHECKPOINT
-        if (lpOverlapped)
+   if (lpOverlapped)
                 *lpBytesReturned = lpOverlapped->InternalHigh;
         else
                 *lpBytesReturned = IoStatusBlock->Information;
-// CHECKPOINT
         return TRUE;
 }
 

diff --git a/reactos/lib/kernel32/kernel32.def b/reactos/lib/kernel32/kernel32.def
index e8b924f..46fa07d 100644 (file)
--- a/reactos/lib/kernel32/kernel32.def
+++ b/reactos/lib/kernel32/kernel32.def
@@ -189,8 +189,8 @@ FindNextFileW@8
 ;GetCommProperties@8
 ;GetCommState@8
 ;GetCommTimeouts@8
-;GetCommandLineA@0
-;GetCommandLineW@0
+GetCommandLineA@0
+GetCommandLineW@0
 ;GetCompressedFileSizeA@8
 ;GetCompressedFileSizeW@8
 ;GetComputerNameA@8
@@ -239,8 +239,8 @@ GetCurrentDirectoryW@8
 ;GetDriveTypeA@4
 ;GetDriveTypeW@4
 ;GetEnvironmentStrings@0
-;GetEnvironmentStringsA@0
-;GetEnvironmentStringsW@0
+GetEnvironmentStringsA@0
+GetEnvironmentStringsW@0
 ;GetEnvironmentVariableA@12
 ;GetEnvironmentVariableW@12
 ;GetExitCodeProcess@8
@@ -291,7 +291,7 @@ GetCurrentDirectoryW@8
 ;GetPrivateProfileStructW@20
 ;GetProcAddress@8
 ;GetProcessAffinityMask@12
-;GetProcessHeap@0
+GetProcessHeap@0
 ;GetProcessHeaps@8
 ;GetProcessShutdownParameters@8
 ;GetProcessTimes@20
@@ -341,7 +341,7 @@ GetStdHandle@4
 ;GetUserDefaultLCID@0
 ;GetUserDefaultLangID@0
 ;GetVDMCurrentDirectories@8
-;GetVersion@0
+GetVersion@0
 ;GetVersionExA@4
 ;GetVersionExW@4
 ;GetVolumeInformationA@32
@@ -369,21 +369,21 @@ GetStdHandle@4
 ;GlobalUnfix@4
 ;GlobalUnlock@4
 ;GlobalWire@4
-;HeapAlloc@12
-;HeapCompact@8
-;HeapCreate@12
+HeapAlloc@12
+HeapCompact@8
+HeapCreate@12
 ;HeapCreateTagsW@16
-;HeapDestroy@4
+HeapDestroy@4
 ;HeapExtend@16
-;HeapFree@12
+HeapFree@12
 ;HeapLock@4
 ;HeapQueryTagW@20
-;HeapReAlloc@16
-;HeapSize@12
+HeapReAlloc@16
+HeapSize@12
 ;HeapSummary@12
-;HeapUnlock@4
+HeapUnlock@4
 ;HeapUsage@20
-;HeapValidate@12
+HeapValidate@12
 ;HeapWalk@8
 ;InitAtomTable@4
 ;InitializeCriticalSection@4

diff --git a/reactos/ntoskrnl/hal/x86/exp.c b/reactos/ntoskrnl/hal/x86/exp.c
index 076f0b7..8d7349e 100644 (file)
--- a/reactos/ntoskrnl/hal/x86/exp.c
+++ b/reactos/ntoskrnl/hal/x86/exp.c
@@ -214,9 +214,11 @@ asmlinkage void exception_handler(unsigned int edi,
    __asm__("movl %%cr2,%0\n\t"
           : "=d" (cr2));
    DbgPrint("cr2 %x\n",cr2);
-   for(;;);
    DbgPrint("Process: %x\n",PsGetCurrentProcess());
-   DbgPrint("Thread: %x\n",PsGetCurrentThread()->Cid.UniqueThread);
+   if (PsGetCurrentThread() != NULL)
+     {
+       DbgPrint("Thread: %x\n",PsGetCurrentThread()->Cid.UniqueThread);
+     }
    DbgPrint("DS %x ES %x FS %x GS %x\n",ds&0xffff,es&0xffff,fs&0xffff,
            gs&0xfff);
    DbgPrint("EAX: %.8x   EBX: %.8x   ECX: %.8x\n",eax,ebx,ecx);

diff --git a/reactos/ntoskrnl/hal/x86/page.c b/reactos/ntoskrnl/hal/x86/page.c
index a87fcb2..b4a344a 100644 (file)
--- a/reactos/ntoskrnl/hal/x86/page.c
+++ b/reactos/ntoskrnl/hal/x86/page.c
@@ -15,6 +15,7 @@
 #include <string.h>
 #include <internal/string.h>
 #include <internal/bitops.h>
+#include <internal/ex.h>
 #include <ddk/ntddk.h>
 
 #define NDEBUG
@@ -57,6 +58,69 @@ static ULONG ProtectToPTE(ULONG flProtect)
                                 (((ULONG)v / (1024 * 1024))&(~0x3)))
 #define ADDR_TO_PTE(v) (PULONG)(PAGETABLE_MAP + ((ULONG)v / 1024))
 
+NTSTATUS MmReleaseMmInfo(PEPROCESS Process)
+{
+   ULONG i,j,addr;
+   
+   DbgPrint("MmReleaseMmInfo(Process %x)\n",Process);
+   
+   KeAttachProcess(Process);
+   for (i=0; i<1024; i++)
+     {
+       if (ADDR_TO_PDE(i*4*1024*1024) != 0)
+         {
+            for (j=0; j<1024; j++)
+              {
+                 addr = i*4*1024*1024 + j*4*1024;
+                 if (ADDR_TO_PTE(addr) != 0)
+                   {
+                      MmFreePage((PVOID)PAGE_MASK(*ADDR_TO_PTE(addr)), 1);
+                   }
+              }
+         }
+     }
+   KeDetachProcess();
+   MmFreePage(Process->Pcb.PageTableDirectory, 1);
+   Process->Pcb.PageTableDirectory = NULL;
+   
+   DbgPrint("Finished MmReleaseMmInfo()\n");
+   return(STATUS_SUCCESS);
+}
+
+NTSTATUS MmCopyMmInfo(PEPROCESS Src, PEPROCESS Dest)
+{
+   PULONG PhysPageDirectory;
+   PULONG PageDirectory;
+   PULONG CurrentPageDirectory;
+   PKPROCESS KProcess = &Dest->Pcb;
+   ULONG i;
+   
+   DPRINT("MmCopyMmInfo(Src %x, Dest %x)\n", Src, Dest);
+   
+   PageDirectory = ExAllocatePage();
+   if (PageDirectory == NULL)
+     {
+       return(STATUS_UNSUCCESSFUL);
+     }
+   PhysPageDirectory = (PULONG)
+     GET_LARGE_INTEGER_LOW_PART(MmGetPhysicalAddress(PageDirectory));
+   KProcess->PageTableDirectory = PhysPageDirectory;   
+   CurrentPageDirectory = (PULONG)PAGEDIRECTORY_MAP;
+   
+   memset(PageDirectory,0,PAGESIZE);
+   for (i=768; i<896; i++)
+     {
+       PageDirectory[i] = CurrentPageDirectory[i];
+     }
+   DPRINT("Addr %x\n",0xf0000000 / (4*1024*1024));
+   PageDirectory[0xf0000000 / (4*1024*1024)] = (ULONG)PhysPageDirectory | 0x7;
+   
+   ExUnmapPage(PageDirectory);
+   
+   DPRINT("Finished MmCopyMmInfo()\n");
+   return(STATUS_SUCCESS);
+}
+
 VOID MmDeletePageTable(PEPROCESS Process, PVOID Address)
 {
    if (Process != NULL && Process != PsGetCurrentProcess())
@@ -87,6 +151,33 @@ ULONG MmGetPageEntryForProcess(PEPROCESS Process, PVOID Address)
    return(Entry);
 }
 
+VOID MmDeletePageEntry(PEPROCESS Process, PVOID Address)
+{
+   PULONG page_tlb;
+   PULONG page_dir;
+   
+   if (Process != NULL && Process != PsGetCurrentProcess())
+     {
+       KeAttachProcess(Process);
+     }
+   page_dir = ADDR_TO_PDE(Address);
+   if ((*page_dir) == 0)
+     {
+       if (Process != NULL && Process != PsGetCurrentProcess())
+         {
+            KeDetachProcess();
+         }     
+       return;
+     }
+   page_tlb = ADDR_TO_PTE(Address);
+   *page_tlb = 0;
+   if (Process != NULL && Process != PsGetCurrentProcess())
+     {
+       KeDetachProcess();
+     }
+}
+
+
 PULONG MmGetPageEntry(PVOID PAddress)
 /*
  * FUNCTION: Get a pointer to the page table entry for a virtual address
@@ -115,6 +206,7 @@ BOOLEAN MmIsPagePresent(PEPROCESS Process, PVOID Address)
    return((MmGetPageEntryForProcess(Process, Address)) & PA_PRESENT);
 }
 
+
 VOID MmSetPage(PEPROCESS Process,
               PVOID Address, 
               ULONG flProtect,

diff --git a/reactos/ntoskrnl/hal/x86/thread.c b/reactos/ntoskrnl/hal/x86/thread.c
index 050f981..7c180a3 100644 (file)
--- a/reactos/ntoskrnl/hal/x86/thread.c
+++ b/reactos/ntoskrnl/hal/x86/thread.c
@@ -78,6 +78,7 @@ void HalTaskSwitch(PKTHREAD thread)
          &(gdt[thread->Context.nr/8].a),
          gdt[thread->Context.nr/8].a,
          gdt[thread->Context.nr/8].b);
+   DPRINT("thread->Context.cr3 %x\n",thread->Context.cr3);
    __asm__("pushfl\n\t"
           "cli\n\t"
           "ljmp %0\n\t"

diff --git a/reactos/ntoskrnl/ke/process.c b/reactos/ntoskrnl/ke/process.c
index 5b358d1..a2f2133 100644 (file)
--- a/reactos/ntoskrnl/ke/process.c
+++ b/reactos/ntoskrnl/ke/process.c
@@ -14,6 +14,7 @@
 #include <internal/ke.h>
 #include <internal/mm.h>
 
+//#define NDEBUG
 #include <internal/debug.h>
 
 /* FUNCTIONS *****************************************************************/
@@ -40,6 +41,7 @@ VOID KeAttachProcess(PEPROCESS Process)
    CurrentThread->ThreadsProcess = Process;
    PageDir = (ULONG)CurrentThread->ThreadsProcess->Pcb.PageTableDirectory;
    CurrentThread->Tcb.Context.cr3 = PageDir;
+   DPRINT("Switching process context to %x\n",PageDir)
    __asm__("movl %0,%%cr3\n\t"
           : /* no inputs */
           : "r" (PageDir));

diff --git a/reactos/ntoskrnl/mm/npool.c b/reactos/ntoskrnl/mm/npool.c
index fb6fd26..bebf8d4 100644 (file)
--- a/reactos/ntoskrnl/mm/npool.c
+++ b/reactos/ntoskrnl/mm/npool.c
@@ -86,22 +86,43 @@ unsigned int EiUsedNonPagedPool = 0;
 
 /* FUNCTIONS ***************************************************************/
 
+VOID ExUnmapPage(PVOID Addr)
+{
+   KIRQL oldIrql;
+   ULONG i = ((ULONG)Addr - kernel_pool_base) / PAGESIZE;
+   
+   DbgPrint("ExUnmapPage(Addr %x)\n",Addr);
+   DbgPrint("i %x\n",i);
+   
+   KeAcquireSpinLock(&AllocMapLock, &oldIrql);
+   MmSetPage(NULL, (PVOID)Addr, 0, 0);
+   clear_bit(i%32, &alloc_map[i/32]);
+   KeReleaseSpinLock(&AllocMapLock, oldIrql);
+}
+
 PVOID ExAllocatePage(VOID)
 {
    KIRQL oldlvl;
    ULONG addr;
    ULONG i;
-   
+   ULONG PhysPage;
+
+   PhysPage = (ULONG)MmAllocPage();
+   DbgPrint("Allocated page %x\n",PhysPage);
+   if (PhysPage == 0)
+     {
+       return(NULL);
+     }
+
    KeAcquireSpinLock(&AllocMapLock, &oldlvl);
    for (i=1; i<ALLOC_MAP_SIZE;i++)
      {
        if (!test_bit(i%32,&alloc_map[i/32]))
          {
+            DbgPrint("i %x\n",i);
+            set_bit(i%32,&alloc_map[i/32]);
             addr = kernel_pool_base + (i*PAGESIZE);
-            MmSetPage(NULL,
-                      (PVOID)addr,
-                      PAGE_READWRITE,
-                      (ULONG)MmAllocPage());
+            MmSetPage(NULL, (PVOID)addr, PAGE_READWRITE, PhysPage);
             KeReleaseSpinLock(&AllocMapLock, oldlvl);
             return((PVOID)addr);
          }

diff --git a/reactos/ntoskrnl/mm/section.c b/reactos/ntoskrnl/mm/section.c
index 36563ad..c5c38b8 100644 (file)
--- a/reactos/ntoskrnl/mm/section.c
+++ b/reactos/ntoskrnl/mm/section.c
@@ -345,6 +345,7 @@ NTSTATUS STDCALL ZwMapViewOfSection(HANDLE SectionHandle,
    if (!NT_SUCCESS(Status))
      {
        DPRINT("ZwMapViewOfSection() = %x\n",Status);
+       ObDereferenceObject(Process);
        return(Status);
      }
    Result->Data.SectionData.Section = Section;
@@ -362,7 +363,7 @@ NTSTATUS STDCALL ZwMapViewOfSection(HANDLE SectionHandle,
      }
    
    DPRINT("*BaseAddress %x\n",*BaseAddress);
-   
+   ObDereferenceObject(Process);   
    return(STATUS_SUCCESS);
 }
 

diff --git a/reactos/ntoskrnl/mm/virtual.c b/reactos/ntoskrnl/mm/virtual.c
index 5b325c8..82449e3 100644 (file)
--- a/reactos/ntoskrnl/mm/virtual.c
+++ b/reactos/ntoskrnl/mm/virtual.c
@@ -218,6 +218,7 @@ asmlinkage int page_fault_handler(unsigned int cs,
        stat = 0;
        break;
      }
+   DPRINT("Completed page fault handling\n");
    if (stat)
      {
        KeLowerIrql(oldlvl);
@@ -355,6 +356,7 @@ ZwAllocateVirtualMemory(
                  MemoryArea->Type = Type;
                  MemoryArea->Attributes =Protect;
                  DPRINT("*BaseAddress %x\n",*BaseAddress);
+                 ObDereferenceObject(Process);
                  return(STATUS_SUCCESS);
               }
             
@@ -365,6 +367,7 @@ ZwAllocateVirtualMemory(
                                            Type,
                                            Protect);
             DPRINT("*BaseAddress %x\n",*BaseAddress);
+            ObDereferenceObject(Process);
             return(STATUS_SUCCESS);
          }
      }
@@ -383,11 +386,12 @@ ZwAllocateVirtualMemory(
    if (Status != STATUS_SUCCESS)
      {
        DPRINT("ZwAllocateVirtualMemory() = %x\n",Status);
+       ObDereferenceObject(Process);
        return(Status);
      }
    
    DPRINT("*BaseAddress %x\n",*BaseAddress);
-   
+   ObDereferenceObject(Process);
    return(STATUS_SUCCESS);
 }
 
@@ -476,12 +480,14 @@ NTSTATUS STDCALL ZwFreeVirtualMemory(IN HANDLE ProcessHandle,
       case MEM_RELEASE:
        if (MemoryArea->BaseAddress != (*BaseAddress))
          {
+            ObDereferenceObject(Process);
             return(STATUS_UNSUCCESSFUL);
          }
        MmFreeMemoryArea(PsGetCurrentProcess(),
                         BaseAddress,
                         0,
                         TRUE);
+       ObDereferenceObject(Process);
        return(STATUS_SUCCESS);
        
       case MEM_DECOMMIT:       
@@ -491,9 +497,10 @@ NTSTATUS STDCALL ZwFreeVirtualMemory(IN HANDLE ProcessHandle,
                          *RegionSize,
                          MEMORY_AREA_RESERVE,
                          MemoryArea->Attributes);
+       ObDereferenceObject(Process);
        return(STATUS_SUCCESS);
      }
-   
+   ObDereferenceObject(Process);
    return(STATUS_NOT_IMPLEMENTED);
 }
 
@@ -592,6 +599,7 @@ NTSTATUS STDCALL ZwProtectVirtualMemory(IN HANDLE ProcessHandle,
      }
    MmChangeAreaProtection(Process,BaseAddress,NumberOfBytesToProtect,
                          NewAccessProtection);
+   ObDereferenceObject(Process);
    return(STATUS_SUCCESS);
 }
 
@@ -765,6 +773,8 @@ NTSTATUS STDCALL ZwWriteVirtualMemory(IN HANDLE ProcessHandle,
    
    KeDetachProcess();
    
+   ObDereferenceObject(Process);
+   
    *NumberOfBytesWritten = NumberOfBytesToWrite;
    return(STATUS_SUCCESS);
 }

diff --git a/reactos/ntoskrnl/ob/handle.c b/reactos/ntoskrnl/ob/handle.c
index 84cbc83..33ec8da 100644 (file)
--- a/reactos/ntoskrnl/ob/handle.c
+++ b/reactos/ntoskrnl/ob/handle.c
@@ -328,11 +328,13 @@ NTSTATUS ObReferenceObjectByHandle(HANDLE Handle,
    
    if (Handle == NtCurrentProcess())
      {
+       BODY_TO_HEADER(PsGetCurrentProcess())->RefCount++;
        *Object = PsGetCurrentProcess();
        return(STATUS_SUCCESS);
      }
    if (Handle == NtCurrentThread())
      {
+       BODY_TO_HEADER(PsGetCurrentThread())->RefCount++;
        *Object = PsGetCurrentThread();
        return(STATUS_SUCCESS);
      }

diff --git a/reactos/ntoskrnl/ob/object.c b/reactos/ntoskrnl/ob/object.c
index 2675440..56c895f 100644 (file)
--- a/reactos/ntoskrnl/ob/object.c
+++ b/reactos/ntoskrnl/ob/object.c
@@ -205,6 +205,8 @@ NTSTATUS ObPerformRetentionChecks(POBJECT_HEADER Header)
    
    if (Header->RefCount <  0 || Header->HandleCount < 0)
      {
+       DbgPrint("Object %x/%x has invalid reference or handle count\n",
+                Header,HEADER_TO_BODY(Header));
        KeBugCheck(0);
      }
    
@@ -226,6 +228,13 @@ NTSTATUS ObPerformRetentionChecks(POBJECT_HEADER Header)
    return(STATUS_SUCCESS);
 }
 
+ULONG ObGetReferenceCount(PVOID ObjectBody)
+{
+   POBJECT_HEADER Header = BODY_TO_HEADER(ObjectBody);
+   
+   return(Header->RefCount);
+}
+
 VOID ObDereferenceObject(PVOID ObjectBody)
 /*
  * FUNCTION: Decrements a given object's reference count and performs

diff --git a/reactos/ntoskrnl/ps/kill.c b/reactos/ntoskrnl/ps/kill.c
index 27e0559..c6fb705 100644 (file)
--- a/reactos/ntoskrnl/ps/kill.c
+++ b/reactos/ntoskrnl/ps/kill.c
@@ -13,8 +13,10 @@
 #include <ddk/ntddk.h>
 #include <internal/ps.h>
 #include <internal/ke.h>
+#include <internal/mm.h>
+#include <internal/ob.h>
 
-#define NDEBUG
+//#define NDEBUG
 #include <internal/debug.h>
 
 /* GLBOALS *******************************************************************/
@@ -23,6 +25,12 @@ extern ULONG PiNrThreads;
 
 /* FUNCTIONS *****************************************************************/
 
+VOID PiDeleteProcess(PVOID ObjectBody)
+{
+   DPRINT("PiDeleteProcess(ObjectBody %x)\n",ObjectBody);
+   (VOID)MmReleaseMmInfo((PEPROCESS)ObjectBody);
+}
+
 VOID PsTerminateCurrentThread(NTSTATUS ExitStatus)
 /*
  * FUNCTION: Terminates the current thread
@@ -39,6 +47,7 @@ VOID PsTerminateCurrentThread(NTSTATUS ExitStatus)
    
    DPRINT("terminating %x\n",CurrentThread);
    ObDereferenceObject(CurrentThread->ThreadsProcess);
+   CurrentThread->ThreadsProcess = NULL;
    KeRaiseIrql(DISPATCH_LEVEL,&oldlvl);
    CurrentThread->Tcb.ThreadState = THREAD_STATE_TERMINATED;
    ZwYieldExecution();
@@ -66,7 +75,10 @@ NTSTATUS STDCALL ZwTerminateProcess(IN HANDLE ProcessHandle,
    NTSTATUS Status;
    PEPROCESS Process;
    KIRQL oldlvl;
-
+   
+   DPRINT("ZwTerminateProcess(ProcessHandle %x, ExitStatus %x)\n",
+          ProcessHandle, ExitStatus);
+   
    Status = ObReferenceObjectByHandle(ProcessHandle,
                                       PROCESS_TERMINATE,
                                       PsProcessType,
@@ -77,17 +89,22 @@ NTSTATUS STDCALL ZwTerminateProcess(IN HANDLE ProcessHandle,
    {
         return(Status);
    }
-
+   
+   DPRINT("Process %x ReferenceCount %d\n",Process,
+         ObGetReferenceCount(Process));
+   
    PiTerminateProcessThreads(Process, ExitStatus);
    KeRaiseIrql(DISPATCH_LEVEL, &oldlvl);
-   KeDispatcherObjectWake(&Process->Pcb.DispatcherHeader);
    Process->Pcb.ProcessState = PROCESS_STATE_TERMINATED;
+   KeDispatcherObjectWake(&Process->Pcb.DispatcherHeader);
    if (PsGetCurrentThread()->ThreadsProcess == Process)
    {
       KeLowerIrql(oldlvl);
+      ObDereferenceObject(Process);
       PsTerminateCurrentThread(ExitStatus);
    }
    KeLowerIrql(oldlvl);
+   ObDereferenceObject(Process);
    return(STATUS_SUCCESS);
 }
 

diff --git a/reactos/ntoskrnl/ps/process.c b/reactos/ntoskrnl/ps/process.c
index d4ba6b8..e1f36e8 100644 (file)
--- a/reactos/ntoskrnl/ps/process.c
+++ b/reactos/ntoskrnl/ps/process.c
@@ -14,6 +14,7 @@
 #include <internal/ob.h>
 #include <internal/mm.h>
 #include <internal/ke.h>
+#include <internal/ps.h>
 #include <string.h>
 #include <internal/string.h>
 
@@ -29,27 +30,6 @@ POBJECT_TYPE PsProcessType = NULL;
 
 /* FUNCTIONS *****************************************************************/
 
-#define IDMAP_BASE         (0xd0000000)
-
-/*
- * Return a linear address which can be used to access the physical memory
- * starting at x 
- */
-extern inline unsigned int physical_to_linear(unsigned int x)
-{
-        return(x+IDMAP_BASE);
-}
-
-extern inline unsigned int linear_to_physical(unsigned int x)
-{
-        return(x-IDMAP_BASE);
-}
-
-PEPROCESS PsGetSystemProcess(VOID)
-{
-   return(SystemProcess);
-}
-
 VOID PsInitProcessManagment(VOID)
 {
    ANSI_STRING AnsiString;
@@ -70,7 +50,7 @@ VOID PsInitProcessManagment(VOID)
    PsProcessType->Dump = NULL;
    PsProcessType->Open = NULL;
    PsProcessType->Close = NULL;
-   PsProcessType->Delete = NULL;
+   PsProcessType->Delete = PiDeleteProcess;
    PsProcessType->Parse = NULL;
    PsProcessType->Security = NULL;
    PsProcessType->QueryName = NULL;
@@ -82,8 +62,10 @@ VOID PsInitProcessManagment(VOID)
    /*
     * Initialize the system process
     */
-   SystemProcess = ObCreateObject(NULL,PROCESS_ALL_ACCESS,NULL,
-                                        PsProcessType);
+   SystemProcess = ObCreateObject(NULL,
+                                 PROCESS_ALL_ACCESS,
+                                 NULL,
+                                 PsProcessType);
    KProcess = &SystemProcess->Pcb;  
    
    InitializeListHead(&(KProcess->MemoryAreaList));
@@ -174,12 +156,8 @@ NTSTATUS STDCALL ZwCreateProcess(
 {
    PEPROCESS Process;
    PEPROCESS ParentProcess;
-   PULONG PageDirectory;
-   PULONG CurrentPageDirectory;
-   ULONG i;
    PKPROCESS KProcess;
    NTSTATUS Status;
-   PULONG PhysicalPageDirectory;
    
    DPRINT("ZwCreateProcess(ObjectAttributes %x)\n",ObjectAttributes);
 
@@ -210,22 +188,8 @@ NTSTATUS STDCALL ZwCreateProcess(
    ObCreateHandleTable(ParentProcess,
                       InheritObjectTable,
                       Process);
-   
-   PhysicalPageDirectory = (PULONG)MmAllocPage();
-   PageDirectory = (PULONG)physical_to_linear((ULONG)PhysicalPageDirectory);
-   KProcess->PageTableDirectory = PhysicalPageDirectory;
-   
-   CurrentPageDirectory = (PULONG)physical_to_linear(
-                                                 (ULONG)get_page_directory());
-   
-   memset(PageDirectory,0,PAGESIZE);
-   for (i=768; i<896; i++)
-     {
-       PageDirectory[i] = CurrentPageDirectory[i];
-     }
-   PageDirectory[0xf0000000 / (4*1024*1024)] 
-     = (ULONG)PhysicalPageDirectory | 0x7;
-   
+   MmCopyMmInfo(ParentProcess, Process);
+
    /*
     * FIXME: I don't what I'm supposed to know with a section handle
     */
@@ -236,7 +200,8 @@ NTSTATUS STDCALL ZwCreateProcess(
      }
 
    Process->Pcb.ProcessState = PROCESS_STATE_ACTIVE;
-
+   ObDereferenceObject(Process);
+   ObDereferenceObject(ParentProcess);
    return(STATUS_SUCCESS);
 }
 

diff --git a/reactos/ntoskrnl/ps/thread.c b/reactos/ntoskrnl/ps/thread.c
index d666c10..badfcae 100644 (file)
--- a/reactos/ntoskrnl/ps/thread.c
+++ b/reactos/ntoskrnl/ps/thread.c
@@ -243,7 +243,7 @@ NTSTATUS PsInitializeThread(HANDLE ProcessHandle,
      }
    else
      {
-       Thread->ThreadsProcess=SystemProcess;
+       Thread->ThreadsProcess = SystemProcess;
        ObReferenceObjectByPointer(Thread->ThreadsProcess,
                                   PROCESS_CREATE_THREAD,
                                   PsProcessType,
@@ -297,7 +297,12 @@ VOID PsSuspendThread(PETHREAD Thread)
      }
 }
 
-void PsInitThreadManagment(void)
+VOID PiDeleteThread(PVOID ObjectBody)
+{
+   DbgPrint("PiDeleteThread(ObjectBody %x)\n",ObjectBody);
+}
+
+VOID PsInitThreadManagment(VOID)
 /*
  * FUNCTION: Initialize thread managment
  */
@@ -327,7 +332,7 @@ void PsInitThreadManagment(void)
    PsThreadType->Dump = NULL;
    PsThreadType->Open = NULL;
    PsThreadType->Close = NULL;
-   PsThreadType->Delete = NULL;
+   PsThreadType->Delete = PiDeleteThread;
    PsThreadType->Parse = NULL;
    PsThreadType->Security = NULL;
    PsThreadType->QueryName = NULL;

diff --git a/reactos/ntoskrnl/ps/tinfo.c b/reactos/ntoskrnl/ps/tinfo.c
index 61f0aa7..24ba860 100644 (file)
--- a/reactos/ntoskrnl/ps/tinfo.c
+++ b/reactos/ntoskrnl/ps/tinfo.c
@@ -93,6 +93,7 @@ NTSTATUS ZwSetInformationThread(HANDLE ThreadHandle,
       default:
        Status = STATUS_UNSUCCESSFUL;
      }
+   ObDereferenceObject(Thread);
    return(Status);
 }