properly copy the device map - it's still not initialized properly

reactos/ntoskrnl/ob

diff -u -r1.49 -r1.50
--- namespc.c	21 Nov 2004 06:51:18 -0000	1.49
+++ namespc.c	21 Nov 2004 10:59:10 -0000	1.50
@@ -1,4 +1,4 @@

-/* $Id: namespc.c,v 1.49 2004/11/21 06:51:18 ion Exp $

+/* $Id: namespc.c,v 1.50 2004/11/21 10:59:10 weiden Exp $

  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel

@@ -164,20 +164,19 @@

 ObQueryDeviceMapInformation(PEPROCESS Process,
 			    PPROCESS_DEVICEMAP_INFORMATION DeviceMapInfo)
 {

-        PDEVICE_MAP DeviceMap;

 	//KIRQL OldIrql ;
 	
 	/*
 	 * FIXME: This is an ugly hack for now, to always return the System Device Map
 	 * instead of returning the Process Device Map. Not important yet since we don't use it
 	 */

-	 DeviceMap = ObSystemDeviceMap;

 	   
 	 /* FIXME: Acquire the DeviceMap Spinlock */
 	 // KeAcquireSpinLock(DeviceMap->Lock, &OldIrql);
 	 
 	 /* Make a copy */

-	 RtlMoveMemory(DeviceMapInfo, &DeviceMap->DriveMap, sizeof(DeviceMapInfo->Query));

+	 DeviceMapInfo->Query.DriveMap = ObSystemDeviceMap->DriveMap;
+	 RtlMoveMemory(DeviceMapInfo->Query.DriveType, ObSystemDeviceMap->DriveType, sizeof(ObSystemDeviceMap->DriveType));

 	 
 	 /* FIXME: Release the DeviceMap Spinlock */
 	 // KeReleasepinLock(DeviceMap->Lock, OldIrql);

reactos/ntoskrnl/ps

diff -u -r1.153 -r1.154
--- process.c	21 Nov 2004 06:51:18 -0000	1.153
+++ process.c	21 Nov 2004 10:59:11 -0000	1.154
@@ -1,4 +1,4 @@

-/* $Id: process.c,v 1.153 2004/11/21 06:51:18 ion Exp $

+/* $Id: process.c,v 1.154 2004/11/21 10:59:11 weiden Exp $

  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel

@@ -1224,13 +1224,15 @@

 	break;
 
       case ProcessDeviceMap:

-	if (ProcessInformationLength != sizeof(PROCESS_DEVICEMAP_INFORMATION)) {

+	if (ProcessInformationLength != sizeof(PROCESS_DEVICEMAP_INFORMATION))
+        {

 	  Status = STATUS_INFO_LENGTH_MISMATCH;

-	} else {
-	  PPROCESS_DEVICEMAP_INFORMATION DeviceMapInfo;
-	  DeviceMapInfo = (PPROCESS_DEVICEMAP_INFORMATION)ProcessInformation;
-	  ObQueryDeviceMapInformation(Process, DeviceMapInfo);
-	  if (ReturnLength) {

+	}
+        else
+        {
+	  ObQueryDeviceMapInformation(Process, (PPROCESS_DEVICEMAP_INFORMATION)ProcessInformation);
+	  if (ReturnLength)
+          {

 	    *ReturnLength = sizeof(PROCESS_DEVICEMAP_INFORMATION);
 	  }
 	}