fix uninitialized variable
[reactos.git] / reactos / ntoskrnl / ex / sysinfo.c
index 413aa32..4546b75 100644 (file)
-/* $Id: sysinfo.c,v 1.24 2003/08/18 15:18:03 ea Exp $
+/* $Id$
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/ex/sysinfo.c
  * PURPOSE:         System information functions
- * PROGRAMMER:      David Welch (welch@mcmail.com)
- * UPDATE HISTORY:
- *                  Created 22/05/98
- *                  20/03/2003: implemented querying SystemProcessInformation,
- *                              no more copying to-from the caller (Aleksey
- *                              Bragin <aleksey@studiocerebral.com>)
+ * 
+ * PROGRAMMERS:     David Welch (welch@mcmail.com)
+ *                  Aleksey Bragin (aleksey@studiocerebral.com)
  */
 
 /* INCLUDES *****************************************************************/
 
-#define NTOS_MODE_KERNEL
-#include <ntos.h>
-#include <ddk/halfuncs.h>
-#include <internal/ex.h>
-#include <internal/ldr.h>
-#include <internal/safe.h>
-#include <internal/ps.h>
-
+#include <ntoskrnl.h>
+#define NDEBUG
 #include <internal/debug.h>
 
+extern PEPROCESS PsIdleProcess;
 extern ULONG NtGlobalFlag; /* FIXME: it should go in a ddk/?.h */
+ULONGLONG STDCALL KeQueryInterruptTime(VOID);
+
+VOID MmPrintMemoryStatistic(VOID);
 
 /* FUNCTIONS *****************************************************************/
 
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+ExEnumHandleTable (
+       PULONG  HandleTable,
+       PVOID   Callback,
+       PVOID   Param,
+       PHANDLE Handle OPTIONAL
+       )
+{
+       UNIMPLEMENTED;
+}
+
+/*
+ * @implemented
+ */
+VOID
+STDCALL
+ExGetCurrentProcessorCpuUsage (
+       PULONG  CpuUsage
+       )
+{
+       PKPRCB Prcb;
+       ULONG TotalTime;
+       ULONGLONG ScaledIdle;
+
+       Prcb = KeGetCurrentPrcb();
+
+       ScaledIdle = Prcb->IdleThread->KernelTime * 100;
+       TotalTime = Prcb->KernelTime + Prcb->UserTime;
+       if (TotalTime != 0)
+               *CpuUsage = 100 - (ScaledIdle / TotalTime);
+       else
+               *CpuUsage = 0;
+}
+
+/*
+ * @implemented
+ */
+VOID
+STDCALL
+ExGetCurrentProcessorCounts (
+       PULONG  ThreadKernelTime,
+       PULONG  TotalCpuTime,
+       PULONG  ProcessorNumber
+       )
+{
+       PKPRCB Prcb;
+
+       Prcb = KeGetCurrentPrcb();
+
+       *ThreadKernelTime = Prcb->KernelTime + Prcb->UserTime;
+       *TotalCpuTime = Prcb->CurrentThread->KernelTime;
+       *ProcessorNumber = KeGetCurrentKPCR()->ProcessorNumber;
+}
+
+/*
+ * @implemented
+ */
+BOOLEAN 
+STDCALL
+ExIsProcessorFeaturePresent(IN ULONG ProcessorFeature)
+{
+    /* Quick check to see if it exists at all */
+    if (ProcessorFeature >= PROCESSOR_FEATURE_MAX) return(FALSE);
+
+    /* Return our support for it */
+    return(SharedUserData->ProcessorFeatures[ProcessorFeature]);
+}
+
 NTSTATUS STDCALL
-NtQuerySystemEnvironmentValue (IN      PUNICODE_STRING UnsafeName,
-                              OUT      PVOID           UnsafeValue,
-                              IN       ULONG           Length,
-                              IN OUT   PULONG          UnsafeReturnLength)
+NtQuerySystemEnvironmentValue (IN      PUNICODE_STRING VariableName,
+                              OUT      PWCHAR          ValueBuffer,
+                              IN       ULONG           ValueBufferLength,
+                              IN OUT   PULONG          ReturnLength  OPTIONAL)
 {
-  NTSTATUS Status;
   ANSI_STRING AName;
   UNICODE_STRING WName;
   BOOLEAN Result;
   PCH Value;
   ANSI_STRING AValue;
   UNICODE_STRING WValue;
-  ULONG ReturnLength;
-
-  /*
-   * Copy the name to kernel space if necessary and convert it to ANSI.
-   */
-  if (ExGetPreviousMode() != KernelMode)
+  KPROCESSOR_MODE PreviousMode;
+  NTSTATUS Status = STATUS_SUCCESS;
+  
+  PAGED_CODE();
+  
+  PreviousMode = ExGetPreviousMode();
+  
+  if(PreviousMode != KernelMode)
+  {
+    _SEH_TRY
     {
-      Status = RtlCaptureUnicodeString(&WName, UnsafeName);
-      if (!NT_SUCCESS(Status))
-       {
-         return(Status);
-       }
-      Status = RtlUnicodeStringToAnsiString(&AName, UnsafeName, TRUE);
-      if (!NT_SUCCESS(Status))
-       {
-         return(Status);
-       }
+      ProbeForRead(VariableName,
+                   sizeof(UNICODE_STRING),
+                   sizeof(ULONG));
+      ProbeForWrite(ValueBuffer,
+                    ValueBufferLength,
+                    sizeof(WCHAR));
+      if(ReturnLength != NULL)
+      {
+        ProbeForWrite(ReturnLength,
+                      sizeof(ULONG),
+                      sizeof(ULONG));
+      }
     }
-  else
+    _SEH_HANDLE
     {
-      Status = RtlUnicodeStringToAnsiString(&AName, UnsafeName, TRUE);
-      if (!NT_SUCCESS(Status))
-       {
-         return(Status);
-       }
+      Status = _SEH_GetExceptionCode();
     }
+    _SEH_END;
+    
+    if(!NT_SUCCESS(Status))
+    {
+      return Status;
+    }
+  }
 
   /*
-   * Create a temporary buffer for the value
+   * Copy the name to kernel space if necessary and convert it to ANSI.
    */
-  Value = ExAllocatePool(NonPagedPool, Length);
-  if (Value == NULL)
+  Status = RtlCaptureUnicodeString(&WName,
+                                   PreviousMode,
+                                   NonPagedPool,
+                                   FALSE,
+                                   VariableName);
+  if(NT_SUCCESS(Status))
+  {
+    /*
+     * according to ntinternals the SeSystemEnvironmentName privilege is required!
+     */
+    if(!SeSinglePrivilegeCheck(SeSystemEnvironmentPrivilege,
+                               PreviousMode))
     {
-      RtlFreeAnsiString(&AName);
-      if (ExGetPreviousMode() != KernelMode)
-       {
-         RtlFreeUnicodeString(&WName);
-       }
-      return(STATUS_NO_MEMORY);
+      RtlReleaseCapturedUnicodeString(&WName,
+                                     PreviousMode,
+                                     FALSE);
+      DPRINT1("NtQuerySystemEnvironmentValue: Caller requires the SeSystemEnvironmentPrivilege privilege!\n");
+      return STATUS_PRIVILEGE_NOT_HELD;
     }
-
+    
+    /*
+     * convert the value name to ansi
+     */
+    Status = RtlUnicodeStringToAnsiString(&AName, &WName, TRUE);
+    RtlReleaseCapturedUnicodeString(&WName,
+                                   PreviousMode,
+                                   FALSE);
+    if(!NT_SUCCESS(Status))
+    {
+      return Status;
+    }
+    
   /*
-   * Get the environment variable
+   * Create a temporary buffer for the value
    */
-  Result = HalGetEnvironmentVariable(AName.Buffer, Value, Length);
-  if (!Result)
+    Value = ExAllocatePool(NonPagedPool, ValueBufferLength);
+    if (Value == NULL)
     {
       RtlFreeAnsiString(&AName);
-      if (ExGetPreviousMode() != KernelMode)
-       {
-         RtlFreeUnicodeString(&WName);
-       }
-      ExFreePool(Value);
-      return(STATUS_UNSUCCESSFUL);
+      return STATUS_INSUFFICIENT_RESOURCES;
     }
-
-  /*
-   * Convert the result to UNICODE.
-   */
-  RtlInitAnsiString(&AValue, Value);
-  Status = RtlAnsiStringToUnicodeString(&WValue, &AValue, TRUE);
-  if (!NT_SUCCESS(Status))
+    
+    /*
+     * Get the environment variable
+     */
+    Result = HalGetEnvironmentVariable(AName.Buffer, Value, ValueBufferLength);
+    if(!Result)
     {
       RtlFreeAnsiString(&AName);
-      if (ExGetPreviousMode() != KernelMode)
-       {
-         RtlFreeUnicodeString(&WName);
-       }
       ExFreePool(Value);
-      return(Status);
+      return STATUS_UNSUCCESSFUL;
     }
-  ReturnLength = WValue.Length;
-
-  /*
-   * Copy the result back to the caller.
-   */
-  if (ExGetPreviousMode() != KernelMode)
+    
+    /*
+     * Convert the result to UNICODE, protect with SEH in case the value buffer
+     * isn't NULL-terminated!
+     */
+    _SEH_TRY
     {
-      Status = MmCopyToCaller(UnsafeValue, WValue.Buffer, ReturnLength);
-      if (!NT_SUCCESS(Status))
-       {
-         RtlFreeAnsiString(&AName);
-         if (ExGetPreviousMode() != KernelMode)
-           {
-             RtlFreeUnicodeString(&WName);
-           }
-         ExFreePool(Value);
-         RtlFreeUnicodeString(&WValue);
-         return(Status);
-       }
-
-      Status = MmCopyToCaller(UnsafeReturnLength, &ReturnLength, 
-                             sizeof(ULONG));
-      if (!NT_SUCCESS(Status))
-       {
-         RtlFreeAnsiString(&AName);
-         if (ExGetPreviousMode() != KernelMode)
-           {
-             RtlFreeUnicodeString(&WName);
-           }
-         ExFreePool(Value);
-         RtlFreeUnicodeString(&WValue);
-         return(Status);
-       }
+      RtlInitAnsiString(&AValue, Value);
+      Status = RtlAnsiStringToUnicodeString(&WValue, &AValue, TRUE);
     }
-  else
+    _SEH_HANDLE
     {
-      memcpy(UnsafeValue, WValue.Buffer, ReturnLength);
-      memcpy(UnsafeReturnLength, &ReturnLength, sizeof(ULONG));
+      Status = _SEH_GetExceptionCode();
     }
+    _SEH_END;
 
-  /*
-   * Free temporary buffers.
-   */
-  RtlFreeAnsiString(&AName);
-  if (ExGetPreviousMode() != KernelMode)
+    if(NT_SUCCESS(Status))
     {
-      RtlFreeUnicodeString(&WName);
+      /*
+       * Copy the result back to the caller.
+       */
+      _SEH_TRY
+      {
+        RtlCopyMemory(ValueBuffer, WValue.Buffer, WValue.Length);
+        ValueBuffer[WValue.Length / sizeof(WCHAR)] = L'\0';
+        if(ReturnLength != NULL)
+        {
+          *ReturnLength = WValue.Length + sizeof(WCHAR);
+        }
+
+        Status = STATUS_SUCCESS;
+      }
+      _SEH_HANDLE
+      {
+        Status = _SEH_GetExceptionCode();
+      }
+      _SEH_END;
     }
-  ExFreePool(Value);
-  RtlFreeUnicodeString(&WValue);
+    
+    /*
+     * Cleanup allocated resources.
+     */
+    RtlFreeAnsiString(&AName);
+    ExFreePool(Value);
+  }
 
-  return(STATUS_SUCCESS);
+  return Status;
 }
 
 
 NTSTATUS STDCALL
-NtSetSystemEnvironmentValue (IN        PUNICODE_STRING UnsafeName,
-                            IN PUNICODE_STRING UnsafeValue)
+NtSetSystemEnvironmentValue (IN        PUNICODE_STRING VariableName,
+                            IN PUNICODE_STRING Value)
 {
-  UNICODE_STRING WName;
-  ANSI_STRING AName;
-  UNICODE_STRING WValue;
-  ANSI_STRING AValue;
-  BOOLEAN Result;
+  UNICODE_STRING CapturedName, CapturedValue;
+  ANSI_STRING AName, AValue;
+  KPROCESSOR_MODE PreviousMode;
   NTSTATUS Status;
+  
+  PAGED_CODE();
 
+  PreviousMode = ExGetPreviousMode();
+  
   /*
-   * Check for required privilege.
-   */
-  /* FIXME: Not implemented. */
-
-  /*
-   * Copy the name to kernel space if necessary and convert it to ANSI.
-   */
-  if (ExGetPreviousMode() != KernelMode)
-    {
-      Status = RtlCaptureUnicodeString(&WName, UnsafeName);
-      if (!NT_SUCCESS(Status))
-       {
-         return(Status);
-       }
-      Status = RtlUnicodeStringToAnsiString(&AName, UnsafeName, TRUE);
-      if (!NT_SUCCESS(Status))
-       {
-         return(Status);
-       }      
-    }
-  else
-    {
-      Status = RtlUnicodeStringToAnsiString(&AName, UnsafeName, TRUE);
-      if (!NT_SUCCESS(Status))
-       {
-         return(Status);
-       }
-    }
-
-  /*
-   * Copy the value to kernel space and convert to ANSI.
-   */
-  if (ExGetPreviousMode() != KernelMode)
-    {
-      Status = RtlCaptureUnicodeString(&WValue, UnsafeValue);
-      if (!NT_SUCCESS(Status))
-       {
-         RtlFreeUnicodeString(&WName);
-         RtlFreeAnsiString(&AName);
-         return(Status);
-       }
-      Status = RtlUnicodeStringToAnsiString(&AValue, UnsafeValue, TRUE);
-      if (!NT_SUCCESS(Status))
-       {
-         RtlFreeUnicodeString(&WName);
-         RtlFreeAnsiString(&AName);
-         RtlFreeUnicodeString(&WValue);
-         return(Status);
-       }      
-    }
-  else
-    {
-      Status = RtlUnicodeStringToAnsiString(&AValue, UnsafeValue, TRUE);
-      if (!NT_SUCCESS(Status))
-       {
-         RtlFreeAnsiString(&AName);
-         return(Status);
-       }
-    }
-
-  /*
-   * Set the environment variable
-   */
-  Result = HalSetEnvironmentVariable(AName.Buffer, AValue.Buffer);
-
-  /*
-   * Free everything and return status.
+   * Copy the strings to kernel space if necessary
    */
-  RtlFreeAnsiString(&AName);
-  RtlFreeAnsiString(&AValue);
-  if (ExGetPreviousMode() != KernelMode)
+  Status = RtlCaptureUnicodeString(&CapturedName,
+                                   PreviousMode,
+                                   NonPagedPool,
+                                   FALSE,
+                                   VariableName);
+  if(NT_SUCCESS(Status))
+  {
+    Status = RtlCaptureUnicodeString(&CapturedValue,
+                                     PreviousMode,
+                                     NonPagedPool,
+                                     FALSE,
+                                     Value);
+    if(NT_SUCCESS(Status))
     {
-      RtlFreeUnicodeString(&WName);
-      RtlFreeUnicodeString(&WValue);
+      /*
+       * according to ntinternals the SeSystemEnvironmentName privilege is required!
+       */
+      if(SeSinglePrivilegeCheck(SeSystemEnvironmentPrivilege,
+                                PreviousMode))
+      {
+        /*
+         * convert the strings to ANSI
+         */
+        Status = RtlUnicodeStringToAnsiString(&AName,
+                                              &CapturedName,
+                                              TRUE);
+        if(NT_SUCCESS(Status))
+        {
+          Status = RtlUnicodeStringToAnsiString(&AValue,
+                                                &CapturedValue,
+                                                TRUE);
+          if(NT_SUCCESS(Status))
+          {
+            BOOLEAN Result = HalSetEnvironmentVariable(AName.Buffer,
+                                                       AValue.Buffer);
+
+            Status = (Result ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL);
+          }
+        }
+      }
+      else
+      {
+        DPRINT1("NtSetSystemEnvironmentValue: Caller requires the SeSystemEnvironmentPrivilege privilege!\n");
+        Status = STATUS_PRIVILEGE_NOT_HELD;
+      }
+      
+      RtlReleaseCapturedUnicodeString(&CapturedValue,
+                                     PreviousMode,
+                                     FALSE);
     }
 
-  if (!Result)
-    {
-      return(STATUS_UNSUCCESSFUL);
-    }
-  return(STATUS_SUCCESS);
+    RtlReleaseCapturedUnicodeString(&CapturedName,
+                                   PreviousMode,
+                                   FALSE);
+  }
+  
+  return Status;
 }
 
 
 /* --- Query/Set System Information --- */
 
-
 /*
  * NOTE: QSI_DEF(n) and SSI_DEF(n) define _cdecl function symbols
  * so the stack is popped only in one place on x86 platform.
@@ -278,6 +338,7 @@ static NTSTATUS QSI_USE(n) (PVOID Buffer, ULONG Size, PULONG ReqSize)
 #define SSI_DEF(n) \
 static NTSTATUS SSI_USE(n) (PVOID Buffer, ULONG Size)
 
+
 /* Class 0 - Basic Information */
 QSI_DEF(SystemBasicInformation)
 {
@@ -292,19 +353,17 @@ QSI_DEF(SystemBasicInformation)
        {
                return (STATUS_INFO_LENGTH_MISMATCH);
        }
-
        Sbi->Unknown = 0;
-       Sbi->MaximumIncrement = 0; /* FIXME */
-       Sbi->PhysicalPageSize = PAGE_SIZE; /* FIXME: it should be PAGE_SIZE */
-       Sbi->NumberOfPhysicalPages = 0; /* FIXME */
-       Sbi->LowestPhysicalPage = 0; /* FIXME */
-       Sbi->HighestPhysicalPage = 0; /* FIXME */
-       Sbi->AllocationGranularity = 65536; /* hard coded on Intel? */
-       Sbi->LowestUserAddress = 0; /* FIXME */
-       Sbi->HighestUserAddress = 0; /* FIXME */
-       Sbi->ActiveProcessors = 0x00000001; /* FIXME */
-       Sbi->NumberProcessors = 1; /* FIXME */
-
+       Sbi->MaximumIncrement = KeMaximumIncrement;
+       Sbi->PhysicalPageSize = PAGE_SIZE;
+       Sbi->NumberOfPhysicalPages = MmStats.NrTotalPages;
+       Sbi->LowestPhysicalPage = 0; /* FIXME */ 
+       Sbi->HighestPhysicalPage = MmStats.NrTotalPages; /* FIXME */
+       Sbi->AllocationGranularity = MM_VIRTMEM_GRANULARITY; /* hard coded on Intel? */
+       Sbi->LowestUserAddress = 0x10000; /* Top of 64k */
+       Sbi->HighestUserAddress = (ULONG_PTR)MmHighestUserAddress;
+       Sbi->ActiveProcessors = KeActiveProcessors;
+       Sbi->NumberProcessors = KeNumberProcessors;
        return (STATUS_SUCCESS);
 }
 
@@ -313,7 +372,7 @@ QSI_DEF(SystemProcessorInformation)
 {
        PSYSTEM_PROCESSOR_INFORMATION Spi 
                = (PSYSTEM_PROCESSOR_INFORMATION) Buffer;
-
+       PKPRCB Prcb;
        *ReqSize = sizeof (SYSTEM_PROCESSOR_INFORMATION);
        /*
         * Check user buffer's size 
@@ -322,14 +381,16 @@ QSI_DEF(SystemProcessorInformation)
        {
                return (STATUS_INFO_LENGTH_MISMATCH);
        }
+       Prcb = KeGetCurrentPrcb();
+       Spi->ProcessorArchitecture = 0; /* Intel Processor */
+       Spi->ProcessorLevel        = Prcb->CpuType;
+       Spi->ProcessorRevision     = Prcb->CpuStep;
+       Spi->Unknown               = 0;
+       Spi->FeatureBits           = Prcb->FeatureBits;
+
+       DPRINT("Arch %d Level %d Rev 0x%x\n", Spi->ProcessorArchitecture,
+               Spi->ProcessorLevel, Spi->ProcessorRevision);
 
-       /* FIXME: add CPU type detection code */
-       Spi->ProcessorArchitecture = 0; /* FIXME */
-       Spi->ProcessorLevel = 0; /* FIXME */
-       Spi->ProcessorRevision = 0; /* FIXME */
-       Spi->Unknown = 0;
-       Spi->FeatureBits = 0x00000000; /* FIXME */
-       
        return (STATUS_SUCCESS);
 }
 
@@ -339,6 +400,8 @@ QSI_DEF(SystemPerformanceInformation)
        PSYSTEM_PERFORMANCE_INFORMATION Spi 
                = (PSYSTEM_PERFORMANCE_INFORMATION) Buffer;
 
+       PEPROCESS TheIdleProcess;
+       
        *ReqSize = sizeof (SYSTEM_PERFORMANCE_INFORMATION);
        /*
         * Check user buffer's size 
@@ -348,16 +411,35 @@ QSI_DEF(SystemPerformanceInformation)
                return (STATUS_INFO_LENGTH_MISMATCH);
        }
        
-       Spi->IdleTime.QuadPart = 0; /* FIXME */
-       Spi->ReadTransferCount.QuadPart = 0; /* FIXME */
-       Spi->WriteTransferCount.QuadPart = 0; /* FIXME */
-       Spi->OtherTransferCount.QuadPart = 0; /* FIXME */
-       Spi->ReadOperationCount = 0; /* FIXME */
-       Spi->WriteOperationCount = 0; /* FIXME */
-       Spi->OtherOperationCount = 0; /* FIXME */
-       Spi->AvailablePages = 0; /* FIXME */
-       Spi->TotalCommittedPages = 0; /* FIXME */
-       Spi->TotalCommitLimit = 0; /* FIXME */
+       TheIdleProcess = PsIdleProcess;
+       
+       Spi->IdleTime.QuadPart = TheIdleProcess->Pcb.KernelTime * 100000LL;
+
+       Spi->ReadTransferCount.QuadPart = IoReadTransferCount;
+       Spi->WriteTransferCount.QuadPart = IoWriteTransferCount;
+       Spi->OtherTransferCount.QuadPart = IoOtherTransferCount;
+       Spi->ReadOperationCount = IoReadOperationCount;
+       Spi->WriteOperationCount = IoWriteOperationCount;
+       Spi->OtherOperationCount = IoOtherOperationCount;
+
+       Spi->AvailablePages = MmStats.NrFreePages;
+/*
+        Add up all the used "Commitied" memory + pagefile.
+        Not sure this is right. 8^\
+ */
+       Spi->TotalCommittedPages = MiMemoryConsumers[MC_PPOOL].PagesUsed +
+                                  MiMemoryConsumers[MC_NPPOOL].PagesUsed+
+                                   MiMemoryConsumers[MC_CACHE].PagesUsed+
+                                  MiMemoryConsumers[MC_USER].PagesUsed+
+                                  MiUsedSwapPages;
+/*
+       Add up the full system total + pagefile.
+       All this make Taskmgr happy but not sure it is the right numbers.
+       This too, fixes some of GlobalMemoryStatusEx numbers.
+*/
+        Spi->TotalCommitLimit = MmStats.NrTotalPages + MiFreeSwapPages +
+                                MiUsedSwapPages;
+
        Spi->PeakCommitment = 0; /* FIXME */
        Spi->PageFaults = 0; /* FIXME */
        Spi->WriteCopyFaults = 0; /* FIXME */
@@ -372,24 +454,28 @@ QSI_DEF(SystemPerformanceInformation)
        Spi->PagefilePageWriteIos = 0; /* FIXME */
        Spi->MappedFilePagesWritten = 0; /* FIXME */
        Spi->MappedFilePageWriteIos = 0; /* FIXME */
-       Spi->PagedPoolUsage = 0; /* FIXME */
-       Spi->NonPagedPoolUsage = 0; /* FIXME */
+
+       Spi->PagedPoolUsage = MiMemoryConsumers[MC_PPOOL].PagesUsed;
        Spi->PagedPoolAllocs = 0; /* FIXME */
        Spi->PagedPoolFrees = 0; /* FIXME */
+       Spi->NonPagedPoolUsage = MiMemoryConsumers[MC_NPPOOL].PagesUsed;
        Spi->NonPagedPoolAllocs = 0; /* FIXME */
        Spi->NonPagedPoolFrees = 0; /* FIXME */
+
        Spi->TotalFreeSystemPtes = 0; /* FIXME */
-       Spi->SystemCodePage = 0; /* FIXME */
+       
+       Spi->SystemCodePage = MmStats.NrSystemPages; /* FIXME */
+       
        Spi->TotalSystemDriverPages = 0; /* FIXME */
        Spi->TotalSystemCodePages = 0; /* FIXME */
        Spi->SmallNonPagedLookasideListAllocateHits = 0; /* FIXME */
        Spi->SmallPagedLookasideListAllocateHits = 0; /* FIXME */
        Spi->Reserved3 = 0; /* FIXME */
 
-       Spi->MmSystemCachePage = 0; /* FIXME */
-       Spi->PagedPoolPage = 0; /* FIXME */
-       Spi->SystemDriverPage = 0; /* FIXME */
+       Spi->MmSystemCachePage = MiMemoryConsumers[MC_CACHE].PagesUsed;
+       Spi->PagedPoolPage = MmPagedPoolSize; /* FIXME */
 
+       Spi->SystemDriverPage = 0; /* FIXME */
        Spi->FastReadNoWait = 0; /* FIXME */
        Spi->FastReadWait = 0; /* FIXME */
        Spi->FastReadResourceMiss = 0; /* FIXME */
@@ -428,57 +514,60 @@ QSI_DEF(SystemPerformanceInformation)
        Spi->FirstLevelTbFills = 0; /* FIXME */
        Spi->SecondLevelTbFills = 0; /* FIXME */
        Spi->SystemCalls = 0; /* FIXME */
-       
+
        return (STATUS_SUCCESS);
 }
 
 /* Class 3 - Time Of Day Information */
 QSI_DEF(SystemTimeOfDayInformation)
 {
-       PSYSTEM_TIMEOFDAY_INFORMATION Sti
-               = (PSYSTEM_TIMEOFDAY_INFORMATION) Buffer;
+  PSYSTEM_TIMEOFDAY_INFORMATION Sti;
+  LARGE_INTEGER CurrentTime;
 
-       *ReqSize = sizeof (SYSTEM_TIMEOFDAY_INFORMATION);
-       /*
-        * Check user buffer's size 
-        */
-       if (Size < sizeof (SYSTEM_TIMEOFDAY_INFORMATION))
-       {
-               return (STATUS_INFO_LENGTH_MISMATCH);
-       }
+  Sti = (PSYSTEM_TIMEOFDAY_INFORMATION)Buffer;
+  *ReqSize = sizeof (SYSTEM_TIMEOFDAY_INFORMATION);
 
-       Sti->BootTime.QuadPart = 0;     /* FIXME */
-       Sti->CurrentTime.QuadPart = 0;  /* FIXME */
-       Sti->TimeZoneBias.QuadPart = 0; /* FIXME */
-       Sti->TimeZoneId = 0;            /* FIXME */
-       Sti->Reserved = 0;              /* FIXME */
+  /* Check user buffer's size */
+  if (Size < sizeof (SYSTEM_TIMEOFDAY_INFORMATION))
+    {
+      return STATUS_INFO_LENGTH_MISMATCH;
+    }
 
-       return (STATUS_SUCCESS);
+  KeQuerySystemTime(&CurrentTime);
+
+  Sti->BootTime= SystemBootTime;
+  Sti->CurrentTime = CurrentTime;
+  Sti->TimeZoneBias.QuadPart = ExpTimeZoneBias.QuadPart;
+  Sti->TimeZoneId = ExpTimeZoneId;
+  Sti->Reserved = 0;
+
+  return STATUS_SUCCESS;
 }
 
 /* Class 4 - Path Information */
 QSI_DEF(SystemPathInformation)
 {
        /* FIXME: QSI returns STATUS_BREAKPOINT. Why? */
+       DPRINT1("NtQuerySystemInformation - SystemPathInformation not implemented\n");
+
        return (STATUS_BREAKPOINT);
 }
 
 /* Class 5 - Process Information */
 QSI_DEF(SystemProcessInformation)
 {
-       ULONG ovlSize=0, nThreads=1;
+       ULONG ovlSize=0, nThreads;
        PEPROCESS pr, syspr;
        unsigned char *pCur;
 
        /* scan the process list */
-       // TODO: Add thread information
 
-       PSYSTEM_PROCESSES Spi
-               = (PSYSTEM_PROCESSES) Buffer;
+       PSYSTEM_PROCESS_INFORMATION Spi
+               = (PSYSTEM_PROCESS_INFORMATION) Buffer;
 
-       *ReqSize = sizeof(SYSTEM_PROCESSES);
+       *ReqSize = sizeof(SYSTEM_PROCESS_INFORMATION);
 
-       if (Size < sizeof(SYSTEM_PROCESSES))
+       if (Size < sizeof(SYSTEM_PROCESS_INFORMATION))
        {
                return (STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small
        }
@@ -489,74 +578,117 @@ QSI_DEF(SystemProcessInformation)
 
        do
        {
-               PSYSTEM_PROCESSES SpiCur;
-               int curSize;
+               PSYSTEM_PROCESS_INFORMATION SpiCur;
+               int curSize, i = 0;
                ANSI_STRING     imgName;
                int inLen=32; // image name len in bytes
-               
+               PLIST_ENTRY current_entry;
+               PETHREAD current;
 
-               SpiCur = (PSYSTEM_PROCESSES)pCur;
+               SpiCur = (PSYSTEM_PROCESS_INFORMATION)pCur;
+
+               nThreads = 0;
+               current_entry = pr->ThreadListHead.Flink;
+               while (current_entry != &pr->ThreadListHead)
+               {
+                       nThreads++;
+                       current_entry = current_entry->Flink;
+               }
 
-               nThreads = 1; // FIXME
-               
                // size of the structure for every process
-               curSize = sizeof(SYSTEM_PROCESSES)-sizeof(SYSTEM_THREADS)+sizeof(SYSTEM_THREADS)*nThreads;
+               curSize = sizeof(SYSTEM_PROCESS_INFORMATION)-sizeof(SYSTEM_THREAD_INFORMATION)+sizeof(SYSTEM_THREAD_INFORMATION)*nThreads;
                ovlSize += curSize+inLen;
 
                if (ovlSize > Size)
                {
                        *ReqSize = ovlSize;
+                       ObDereferenceObject(pr);
 
                        return (STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small
                }
 
                // fill system information
-               SpiCur->NextEntryDelta = curSize+inLen; // relative offset to the beginnnig of the next structure
-               SpiCur->ThreadCount = nThreads;
+               SpiCur->NextEntryOffset = curSize+inLen; // relative offset to the beginnnig of the next structure
+               SpiCur->NumberOfThreads = nThreads;
                SpiCur->CreateTime = pr->CreateTime;
-               //SpiCur->UserTime = 0; // FIXME
-               //SpiCur->KernelTime = 0; // FIXME
-
-               SpiCur->ProcessName.Length = strlen(pr->ImageFileName) * sizeof(WCHAR);
-               SpiCur->ProcessName.MaximumLength = inLen;
-               SpiCur->ProcessName.Buffer = (void*)(pCur+curSize);
+               SpiCur->UserTime.QuadPart = pr->Pcb.UserTime * 100000LL; 
+               SpiCur->KernelTime.QuadPart = pr->Pcb.KernelTime * 100000LL;
+               SpiCur->ImageName.Length = strlen(pr->ImageFileName) * sizeof(WCHAR);
+               SpiCur->ImageName.MaximumLength = inLen;
+               SpiCur->ImageName.Buffer = (void*)(pCur+curSize);
 
                // copy name to the end of the struct
-               RtlInitAnsiString(&imgName, pr->ImageFileName);
-               RtlAnsiStringToUnicodeString(&SpiCur->ProcessName, &imgName, FALSE);
-
-               SpiCur->BasePriority = 0; // FIXME
-               SpiCur->ProcessId = pr->UniqueProcessId;
-               SpiCur->InheritedFromProcessId = (DWORD)(pr->InheritedFromUniqueProcessId);
-               SpiCur->HandleCount = 0; // FIXME
-               SpiCur->VmCounters.PeakVirtualSize = pr->PeakVirtualSize;
-               SpiCur->VmCounters.VirtualSize = 0; // FIXME
-               SpiCur->VmCounters.PageFaultCount = pr->LastFaultCount;
-               SpiCur->VmCounters.PeakWorkingSetSize = pr->Vm.PeakWorkingSetSize; // Is this right using ->Vm. here ?
-               SpiCur->VmCounters.WorkingSetSize = pr->Vm.WorkingSetSize; // Is this right using ->Vm. here ?
-               SpiCur->VmCounters.QuotaPeakPagedPoolUsage = 0; // FIXME
-               SpiCur->VmCounters.QuotaPagedPoolUsage = 0; // FIXME
-               SpiCur->VmCounters.QuotaPeakNonPagedPoolUsage = 0; // FIXME
-               SpiCur->VmCounters.QuotaNonPagedPoolUsage = 0; // FIXME
-               SpiCur->VmCounters.PagefileUsage = 0; // FIXME
-               SpiCur->VmCounters.PeakPagefileUsage = pr->PeakPagefileUsage;
-                // KJK::Hyperion: I don't know what does this mean. VM_COUNTERS
-                // doesn't seem to contain any equivalent field
+               if(pr != PsIdleProcess)
+               {
+                 RtlInitAnsiString(&imgName, pr->ImageFileName);
+                 RtlAnsiStringToUnicodeString(&SpiCur->ImageName, &imgName, FALSE);
+               }
+               else
+               {
+                  RtlInitUnicodeString(&SpiCur->ImageName, NULL);
+               }
+
+               SpiCur->BasePriority = pr->Pcb.BasePriority;
+               SpiCur->UniqueProcessId = pr->UniqueProcessId;
+               SpiCur->InheritedFromUniqueProcessId = pr->InheritedFromUniqueProcessId;
+               SpiCur->HandleCount = (pr->ObjectTable ? ObpGetHandleCountByHandleTable(pr->ObjectTable) : 0);
+               SpiCur->PeakVirtualSize = pr->PeakVirtualSize;
+               SpiCur->VirtualSize = pr->VirtualSize.QuadPart;
+               SpiCur->PageFaultCount = pr->LastFaultCount;
+               SpiCur->PeakWorkingSetSize = pr->Vm.PeakWorkingSetSize; // Is this right using ->Vm. here ?
+               SpiCur->WorkingSetSize = pr->Vm.WorkingSetSize; // Is this right using ->Vm. here ?
+               SpiCur->QuotaPeakPagedPoolUsage =
+                                       pr->QuotaPeakPoolUsage[0];
+               SpiCur->QuotaPagedPoolUsage =
+                                       pr->QuotaPoolUsage[0];
+               SpiCur->QuotaPeakNonPagedPoolUsage =
+                                       pr->QuotaPeakPoolUsage[1];
+               SpiCur->QuotaNonPagedPoolUsage =
+                                       pr->QuotaPoolUsage[1];
+               SpiCur->PagefileUsage = pr->PagefileUsage; // FIXME
+               SpiCur->PeakPagefileUsage = pr->PeakPagefileUsage;
+               // KJK::Hyperion: I don't know what does this mean. VM_COUNTERS
+               // doesn't seem to contain any equivalent field
                //SpiCur->TotalPrivateBytes = pr->NumberOfPrivatePages; //FIXME: bytes != pages
 
+          current_entry = pr->ThreadListHead.Flink;
+          while (current_entry != &pr->ThreadListHead)
+               {
+                 current = CONTAINING_RECORD(current_entry, ETHREAD,
+                                             ThreadListEntry);
+
+                 SpiCur->TH[i].KernelTime.QuadPart = current->Tcb.KernelTime * 100000LL;
+                 SpiCur->TH[i].UserTime.QuadPart = current->Tcb.UserTime * 100000LL;
+//                 SpiCur->TH[i].CreateTime = current->CreateTime;
+                 SpiCur->TH[i].WaitTime = current->Tcb.WaitTime;
+                 SpiCur->TH[i].StartAddress = (PVOID) current->StartAddress;
+                 SpiCur->TH[i].ClientId = current->Cid;
+                 SpiCur->TH[i].Priority = current->Tcb.Priority;
+                 SpiCur->TH[i].BasePriority = current->Tcb.BasePriority;
+                 SpiCur->TH[i].ContextSwitches = current->Tcb.ContextSwitches;
+                 SpiCur->TH[i].ThreadState = current->Tcb.State;
+                 SpiCur->TH[i].WaitReason = current->Tcb.WaitReason;
+                 i++;
+                 current_entry = current_entry->Flink;
+               }
+               
                pr = PsGetNextProcess(pr);
-
+        nThreads = 0;
                if ((pr == syspr) || (pr == NULL))
                {
-                       SpiCur->NextEntryDelta = 0;
+                       SpiCur->NextEntryOffset = 0;
                        break;
                }
                else
                        pCur = pCur + curSize + inLen;
        }  while ((pr != syspr) && (pr != NULL));
+       
+       if(pr != NULL)
+       {
+          ObDereferenceObject(pr);
+       }
 
        *ReqSize = ovlSize;
-
        return (STATUS_SUCCESS);
 }
 
@@ -564,6 +696,7 @@ QSI_DEF(SystemProcessInformation)
 QSI_DEF(SystemCallCountInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemCallCountInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -598,8 +731,37 @@ QSI_DEF(SystemDeviceInformation)
 /* Class 8 - Processor Performance Information */
 QSI_DEF(SystemProcessorPerformanceInformation)
 {
-       /* FIXME */
-       return (STATUS_NOT_IMPLEMENTED);
+       PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION Spi
+               = (PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) Buffer;
+
+        ULONG i;
+       LARGE_INTEGER CurrentTime;
+       PKPRCB Prcb;
+
+       *ReqSize = KeNumberProcessors * sizeof (SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION);
+       /*
+        * Check user buffer's size
+        */
+       if (Size < KeNumberProcessors * sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION))
+       {
+               return (STATUS_INFO_LENGTH_MISMATCH);
+       }
+
+       CurrentTime.QuadPart = KeQueryInterruptTime();
+       Prcb = ((PKPCR)KPCR_BASE)->Prcb;
+       for (i = 0; i < KeNumberProcessors; i++)
+       {
+          Spi->IdleTime.QuadPart = (Prcb->IdleThread->KernelTime + Prcb->IdleThread->UserTime) * 100000LL; // IdleTime
+           Spi->KernelTime.QuadPart =  Prcb->KernelTime * 100000LL; // KernelTime
+           Spi->UserTime.QuadPart = Prcb->UserTime * 100000LL;
+           Spi->DpcTime.QuadPart = Prcb->DpcTime * 100000LL;
+           Spi->InterruptTime.QuadPart = Prcb->InterruptTime * 100000LL;
+           Spi->InterruptCount = Prcb->InterruptCount; // Interrupt Count
+          Spi++;
+          Prcb = (PKPRCB)((ULONG_PTR)Prcb + PAGE_SIZE);
+       }
+
+       return (STATUS_SUCCESS);
 }
 
 /* Class 9 - Flags Information */
@@ -628,6 +790,7 @@ SSI_DEF(SystemFlagsInformation)
 QSI_DEF(SystemCallTimeInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemCallTimeInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -641,6 +804,7 @@ QSI_DEF(SystemModuleInformation)
 QSI_DEF(SystemLocksInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemLocksInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -648,6 +812,7 @@ QSI_DEF(SystemLocksInformation)
 QSI_DEF(SystemStackTraceInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemStackTraceInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -655,6 +820,7 @@ QSI_DEF(SystemStackTraceInformation)
 QSI_DEF(SystemPagedPoolInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemPagedPoolInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -662,34 +828,146 @@ QSI_DEF(SystemPagedPoolInformation)
 QSI_DEF(SystemNonPagedPoolInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemNonPagedPoolInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
+
+VOID
+ObpGetNextHandleByProcessCount(PSYSTEM_HANDLE_TABLE_ENTRY_INFO pshi,
+                               PEPROCESS Process,
+                               int Count);
+
 /* Class 16 - Handle Information */
 QSI_DEF(SystemHandleInformation)
 {
-       /* FIXME */
-       return (STATUS_NOT_IMPLEMENTED);
+        PSYSTEM_HANDLE_INFORMATION Shi = 
+               (PSYSTEM_HANDLE_INFORMATION) Buffer;
+
+        DPRINT("NtQuerySystemInformation - SystemHandleInformation\n");
+
+       if (Size < sizeof (SYSTEM_HANDLE_INFORMATION))
+        {
+               * ReqSize = sizeof (SYSTEM_HANDLE_INFORMATION);
+               return (STATUS_INFO_LENGTH_MISMATCH);
+       }
+
+       DPRINT("SystemHandleInformation 1\n");
+
+       PEPROCESS pr, syspr;
+       int curSize, i = 0;
+       ULONG hCount = 0;
+               
+        /* First Calc Size from Count. */
+        syspr = PsGetNextProcess(NULL);
+       pr = syspr;
+
+        do
+         {
+            hCount = hCount + (pr->ObjectTable ? ObpGetHandleCountByHandleTable(pr->ObjectTable) : 0);
+            pr = PsGetNextProcess(pr);
+
+           if ((pr == syspr) || (pr == NULL))
+               break;
+        } while ((pr != syspr) && (pr != NULL));
+        
+       if(pr != NULL)
+       {
+          ObDereferenceObject(pr);
+       }
+
+       DPRINT("SystemHandleInformation 2\n");
+
+        curSize = sizeof(SYSTEM_HANDLE_INFORMATION)+
+                  (  (sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO) * hCount) - 
+                     (sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO) ));
+
+        Shi->NumberOfHandles = hCount;
+
+        if (curSize > Size)
+          {
+            *ReqSize = curSize;
+             return (STATUS_INFO_LENGTH_MISMATCH);
+          }
+
+       DPRINT("SystemHandleInformation 3\n");
+
+        /* Now get Handles from all processs. */
+        syspr = PsGetNextProcess(NULL);
+       pr = syspr;
+
+        do
+         {
+            int Count = 0, HandleCount;
+
+            HandleCount = (pr->ObjectTable ? ObpGetHandleCountByHandleTable(pr->ObjectTable) : 0);
+
+            for (Count = 0; HandleCount > 0 ; HandleCount--)
+               {
+                 ObpGetNextHandleByProcessCount( &Shi->Handles[i], pr, Count);
+                 Count++;
+                 i++;
+               }
+
+           pr = PsGetNextProcess(pr);
+
+           if ((pr == syspr) || (pr == NULL))
+               break;
+          } while ((pr != syspr) && (pr != NULL));
+
+       if(pr != NULL)
+       {
+          ObDereferenceObject(pr);
+       }
+
+       DPRINT("SystemHandleInformation 4\n");
+       return (STATUS_SUCCESS);
+
 }
+/*
+SSI_DEF(SystemHandleInformation)
+{
+       
+       return (STATUS_SUCCESS);
+}
+*/
 
 /* Class 17 -  Information */
 QSI_DEF(SystemObjectInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemObjectInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
 /* Class 18 -  Information */
 QSI_DEF(SystemPageFileInformation)
 {
+       SYSTEM_PAGEFILE_INFORMATION *Spfi = (SYSTEM_PAGEFILE_INFORMATION *) Buffer;
+
+       if (Size < sizeof (SYSTEM_PAGEFILE_INFORMATION))
+       {
+               * ReqSize = sizeof (SYSTEM_PAGEFILE_INFORMATION);
+               return (STATUS_INFO_LENGTH_MISMATCH);
+       }
+
+       UNICODE_STRING FileName; /* FIXME */
+
        /* FIXME */
-       return (STATUS_NOT_IMPLEMENTED);
+       Spfi->NextEntryOffset = 0;
+
+       Spfi->TotalSize = MiFreeSwapPages + MiUsedSwapPages;
+       Spfi->TotalInUse = MiUsedSwapPages;
+       Spfi->PeakUsage = MiUsedSwapPages; /* FIXME */
+       Spfi->PageFileName = FileName;
+       return (STATUS_SUCCESS);
 }
 
 /* Class 19 - Vdm Instemul Information */
 QSI_DEF(SystemVdmInstemulInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemVdmInstemulInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -697,19 +975,33 @@ QSI_DEF(SystemVdmInstemulInformation)
 QSI_DEF(SystemVdmBopInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemVdmBopInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
 /* Class 21 - File Cache Information */
 QSI_DEF(SystemFileCacheInformation)
 {
+       SYSTEM_CACHE_INFORMATION *Sci = (SYSTEM_CACHE_INFORMATION *) Buffer;
+
        if (Size < sizeof (SYSTEM_CACHE_INFORMATION))
        {
                * ReqSize = sizeof (SYSTEM_CACHE_INFORMATION);
                return (STATUS_INFO_LENGTH_MISMATCH);
        }
-       /* FIXME */
-       return (STATUS_NOT_IMPLEMENTED);
+       /* Return the Byte size not the page size. */
+       Sci->CurrentSize = 
+               MiMemoryConsumers[MC_CACHE].PagesUsed * PAGE_SIZE;
+       Sci->PeakSize = 
+               MiMemoryConsumers[MC_CACHE].PagesUsed * PAGE_SIZE; /* FIXME */
+
+       Sci->PageFaultCount = 0; /* FIXME */
+       Sci->MinimumWorkingSet = 0; /* FIXME */
+       Sci->MaximumWorkingSet = 0; /* FIXME */
+       Sci->TransitionSharedPages = 0; /* FIXME */
+       Sci->TransitionSharedPagesPeak = 0; /* FIXME */
+
+       return (STATUS_SUCCESS);
 }
 
 SSI_DEF(SystemFileCacheInformation)
@@ -719,6 +1011,7 @@ SSI_DEF(SystemFileCacheInformation)
                return (STATUS_INFO_LENGTH_MISMATCH);
        }
        /* FIXME */
+       DPRINT1("NtSetSystemInformation - SystemFileCacheInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -726,34 +1019,86 @@ SSI_DEF(SystemFileCacheInformation)
 QSI_DEF(SystemPoolTagInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemPoolTagInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
-/* Class 23 - Interrupt Information */
+/* Class 23 - Interrupt Information for all processors */
 QSI_DEF(SystemInterruptInformation)
 {
-       /* FIXME */
-       return (STATUS_NOT_IMPLEMENTED);
+  PKPRCB Prcb;
+  UINT i;
+  ULONG ti;
+  PSYSTEM_INTERRUPT_INFORMATION sii = (PSYSTEM_INTERRUPT_INFORMATION)Buffer;
+  
+  if(Size < KeNumberProcessors * sizeof(SYSTEM_INTERRUPT_INFORMATION))
+  {
+    return (STATUS_INFO_LENGTH_MISMATCH);
+  }
+  
+  ti = KeQueryTimeIncrement();
+  
+  Prcb = ((PKPCR)KPCR_BASE)->Prcb;
+  for (i = 0; i < KeNumberProcessors; i++)
+  {
+    sii->ContextSwitches = Prcb->KeContextSwitches;
+    sii->DpcCount = 0; /* FIXME */
+    sii->DpcRate = 0; /* FIXME */
+    sii->TimeIncrement = ti;
+    sii->DpcBypassCount = 0; /* FIXME */
+    sii->ApcBypassCount = 0; /* FIXME */
+    sii++;
+    Prcb = (PKPRCB)((ULONG_PTR)Prcb + PAGE_SIZE);
+  }
+  
+  return STATUS_SUCCESS;
 }
 
 /* Class 24 - DPC Behaviour Information */
 QSI_DEF(SystemDpcBehaviourInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemDpcBehaviourInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
 SSI_DEF(SystemDpcBehaviourInformation)
 {
        /* FIXME */
+       DPRINT1("NtSetSystemInformation - SystemDpcBehaviourInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
 /* Class 25 - Full Memory Information */
 QSI_DEF(SystemFullMemoryInformation)
 {
-       /* FIXME */
-       return (STATUS_NOT_IMPLEMENTED);
+       PULONG Spi = (PULONG) Buffer;
+
+       PEPROCESS TheIdleProcess;
+
+       * ReqSize = sizeof (ULONG);
+
+       if (sizeof (ULONG) != Size)
+       {
+               return (STATUS_INFO_LENGTH_MISMATCH);
+       }
+       DPRINT("SystemFullMemoryInformation\n");
+
+       TheIdleProcess = PsIdleProcess;
+
+        DPRINT("PID: %d, KernelTime: %u PFFree: %d PFUsed: %d\n",
+               TheIdleProcess->UniqueProcessId,
+               TheIdleProcess->Pcb.KernelTime,
+               MiFreeSwapPages,
+               MiUsedSwapPages);
+
+#ifndef NDEBUG
+       MmPrintMemoryStatistic();
+#endif
+       
+       *Spi = MiMemoryConsumers[MC_USER].PagesUsed;
+
+       return (STATUS_SUCCESS);
 }
 
 /* Class 26 - Load Image */
@@ -795,6 +1140,7 @@ QSI_DEF(SystemTimeAdjustmentInformation)
                return (STATUS_INFO_LENGTH_MISMATCH);
        }
        /* FIXME: */
+       DPRINT1("NtQuerySystemInformation - SystemTimeAdjustmentInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -805,6 +1151,7 @@ SSI_DEF(SystemTimeAdjustmentInformation)
                return (STATUS_INFO_LENGTH_MISMATCH);
        }
        /* FIXME: */
+       DPRINT1("NtSetSystemInformation - SystemTimeAdjustmentInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -812,6 +1159,7 @@ SSI_DEF(SystemTimeAdjustmentInformation)
 QSI_DEF(SystemSummaryMemoryInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemSummaryMemoryInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -819,6 +1167,7 @@ QSI_DEF(SystemSummaryMemoryInformation)
 QSI_DEF(SystemNextEventIdInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemNextEventIdInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -826,13 +1175,15 @@ QSI_DEF(SystemNextEventIdInformation)
 QSI_DEF(SystemEventIdsInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemEventIdsInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
-/* Class 32 - Crach Dump Information */
+/* Class 32 - Crash Dump Information */
 QSI_DEF(SystemCrashDumpInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemCrashDumpInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -840,13 +1191,15 @@ QSI_DEF(SystemCrashDumpInformation)
 QSI_DEF(SystemExceptionInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemExceptionInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
-/* Class 34 - Crach Dump State Information */
+/* Class 34 - Crash Dump State Information */
 QSI_DEF(SystemCrashDumpStateInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemCrashDumpStateInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -854,6 +1207,7 @@ QSI_DEF(SystemCrashDumpStateInformation)
 QSI_DEF(SystemKernelDebuggerInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemKernelDebuggerInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -861,19 +1215,33 @@ QSI_DEF(SystemKernelDebuggerInformation)
 QSI_DEF(SystemContextSwitchInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemContextSwitchInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
 /* Class 37 - Registry Quota Information */
 QSI_DEF(SystemRegistryQuotaInformation)
 {
-       /* FIXME */
-       return (STATUS_NOT_IMPLEMENTED);
+  PSYSTEM_REGISTRY_QUOTA_INFORMATION srqi = (PSYSTEM_REGISTRY_QUOTA_INFORMATION) Buffer;
+
+  *ReqSize = sizeof(SYSTEM_REGISTRY_QUOTA_INFORMATION);
+  if (Size < sizeof(SYSTEM_REGISTRY_QUOTA_INFORMATION))
+    {
+      return STATUS_INFO_LENGTH_MISMATCH;
+    }
+
+  DPRINT1("Faking max registry size of 32 MB\n");
+  srqi->RegistryQuotaAllowed = 0x2000000;
+  srqi->RegistryQuotaUsed = 0x200000;
+  srqi->Reserved1 = (void*)0x200000;
+
+  return STATUS_SUCCESS;
 }
 
 SSI_DEF(SystemRegistryQuotaInformation)
 {
        /* FIXME */
+       DPRINT1("NtSetSystemInformation - SystemRegistryQuotaInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -890,10 +1258,11 @@ SSI_DEF(SystemLoadAndCallImage)
   return(LdrpLoadAndCallImage(&Slci->ModuleName));
 }
 
-/* Class 39 - Priority Seperation */
+/* Class 39 - Priority Separation */
 SSI_DEF(SystemPrioritySeperation)
 {
        /* FIXME */
+       DPRINT1("NtSetSystemInformation - SystemPrioritySeperation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -901,6 +1270,7 @@ SSI_DEF(SystemPrioritySeperation)
 QSI_DEF(SystemPlugPlayBusInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemPlugPlayBusInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -908,6 +1278,7 @@ QSI_DEF(SystemPlugPlayBusInformation)
 QSI_DEF(SystemDockInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemDockInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -915,6 +1286,7 @@ QSI_DEF(SystemDockInformation)
 QSI_DEF(SystemPowerInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemPowerInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -922,45 +1294,38 @@ QSI_DEF(SystemPowerInformation)
 QSI_DEF(SystemProcessorSpeedInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemProcessorSpeedInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
 /* Class 44 - Current Time Zone Information */
 QSI_DEF(SystemCurrentTimeZoneInformation)
 {
-       * ReqSize = sizeof (TIME_ZONE_INFORMATION);
+  * ReqSize = sizeof (TIME_ZONE_INFORMATION);
 
-       if (sizeof (TIME_ZONE_INFORMATION) != Size)
-       {
-               return (STATUS_INFO_LENGTH_MISMATCH);
-       }
-       /* Copy the time zone information struct */
-        memcpy (
-               Buffer,
-                & SystemTimeZoneInfo,
-                sizeof (TIME_ZONE_INFORMATION)
-               );
+  if (sizeof (TIME_ZONE_INFORMATION) != Size)
+    {
+      return STATUS_INFO_LENGTH_MISMATCH;
+    }
 
-       return (STATUS_SUCCESS);
+  /* Copy the time zone information struct */
+  memcpy(Buffer,
+         &ExpTimeZoneInfo,
+         sizeof(TIME_ZONE_INFORMATION));
+
+  return STATUS_SUCCESS;
 }
 
 
 SSI_DEF(SystemCurrentTimeZoneInformation)
 {
-       /*
-        * Check user buffer's size 
-        */
-       if (Size < sizeof (TIME_ZONE_INFORMATION))
-       {
-               return (STATUS_INFO_LENGTH_MISMATCH);
-       }
-       /* Copy the time zone information struct */
-       memcpy (
-               & SystemTimeZoneInfo,
-               (TIME_ZONE_INFORMATION *) Buffer,
-               sizeof (TIME_ZONE_INFORMATION)
-               );
-       return (STATUS_SUCCESS);
+  /* Check user buffer's size */
+  if (Size < sizeof (TIME_ZONE_INFORMATION))
+    {
+      return STATUS_INFO_LENGTH_MISMATCH;
+    }
+
+  return ExpSetTimeZoneInformation((PTIME_ZONE_INFORMATION)Buffer);
 }
 
 
@@ -968,6 +1333,7 @@ SSI_DEF(SystemCurrentTimeZoneInformation)
 QSI_DEF(SystemLookasideInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemLookasideInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -976,6 +1342,7 @@ QSI_DEF(SystemLookasideInformation)
 SSI_DEF(SystemSetTimeSlipEvent)
 {
        /* FIXME */
+       DPRINT1("NtSetSystemInformation - SystemSetTimSlipEvent not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -984,6 +1351,7 @@ SSI_DEF(SystemSetTimeSlipEvent)
 SSI_DEF(SystemCreateSession)
 {
        /* FIXME */
+       DPRINT1("NtSetSystemInformation - SystemCreateSession not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -992,6 +1360,7 @@ SSI_DEF(SystemCreateSession)
 SSI_DEF(SystemDeleteSession)
 {
        /* FIXME */
+       DPRINT1("NtSetSystemInformation - SystemDeleteSession not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -1000,6 +1369,7 @@ SSI_DEF(SystemDeleteSession)
 QSI_DEF(SystemInvalidInfoClass4)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemInvalidInfoClass4 not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -1008,6 +1378,7 @@ QSI_DEF(SystemInvalidInfoClass4)
 QSI_DEF(SystemRangeStartInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemRangeStartInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -1016,6 +1387,7 @@ QSI_DEF(SystemRangeStartInformation)
 QSI_DEF(SystemVerifierInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemVerifierInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -1023,6 +1395,7 @@ QSI_DEF(SystemVerifierInformation)
 SSI_DEF(SystemVerifierInformation)
 {
        /* FIXME */
+       DPRINT1("NtSetSystemInformation - SystemVerifierInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -1031,6 +1404,7 @@ SSI_DEF(SystemVerifierInformation)
 SSI_DEF(SystemAddVerifier)
 {
        /* FIXME */
+       DPRINT1("NtSetSystemInformation - SystemAddVerifier not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -1039,6 +1413,7 @@ SSI_DEF(SystemAddVerifier)
 QSI_DEF(SystemSessionProcessesInformation)
 {
        /* FIXME */
+       DPRINT1("NtQuerySystemInformation - SystemSessionProcessInformation not implemented\n");
        return (STATUS_NOT_IMPLEMENTED);
 }
 
@@ -1054,7 +1429,7 @@ struct _QSSI_CALLS
 
 // QS  Query & Set
 // QX  Query
-// XQ  Set
+// XS  Set
 // XX  unknown behaviour
 //
 #define SI_QS(n) {QSI_USE(n),SSI_USE(n)}
@@ -1136,7 +1511,12 @@ NtQuerySystemInformation (IN SYSTEM_INFORMATION_CLASS SystemInformationClass,
   PVOID SystemInformation;
   NTSTATUS Status;
   NTSTATUS FStatus;
+  
+  PAGED_CODE();
 
+/*     DPRINT("NtQuerySystemInformation Start. Class:%d\n",
+                                       SystemInformationClass );
+*/
   /*if (ExGetPreviousMode() == KernelMode)
     {*/
       SystemInformation = UnsafeSystemInformation;
@@ -1210,6 +1590,8 @@ NtSetSystemInformation (
        IN      ULONG                           SystemInformationLength
        )
 {
+        PAGED_CODE();
+        
        /*
         * If called from user mode, check 
         * possible unsafe arguments.
@@ -1258,7 +1640,10 @@ NtFlushInstructionCache (
        IN      UINT    NumberOfBytesToFlush
        )
 {
-       UNIMPLEMENTED;
+        PAGED_CODE();
+        
+       __asm__("wbinvd\n");
+       return STATUS_SUCCESS;
 }