Re: [ros-diffs] [CVS reactos] properly copy the device map - it's still not initialized properly

[Alex Ionescu]

weiden(a)osexperts.com wrote:

>   Commit in *reactos/ntoskrnl* on MAIN
>  ob/namespc.c <#file1> 	+3 	-4 	1.49 
>
> <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/ntoskrnl/ob/namespc.c?rev=1.49&content-type=text/x-cvsweb-markup>
>
>  -> 
>
> <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/ntoskrnl/ob/namespc.c.diff?r1=text&tr1=1.49&r2=text&tr2=1.50&f=h>
>
>  1.50 
>
> <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/ntoskrnl/ob/namespc.c?rev=1.50&content-type=text/x-cvsweb-markup>
>
>
>  ps/process.c <#file2> 	+9 	-7 	1.153 
>
> <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/ntoskrnl/ps/process.c?rev=1.153&content-type=text/x-cvsweb-markup>
>
>  -> 
>
> <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/ntoskrnl/ps/process.c.diff?r1=text&tr1=1.153&r2=text&tr2=1.154&f=h>
>
>  1.154 
>
> <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/ntoskrnl/ps/process.c?rev=1.154&content-type=text/x-cvsweb-markup>
>
>
>
>  	+12 	-11 	
>
>  2 modified files
>
> properly copy the device map - it's still not initialized properly
>   
>
>  ------------------------------------------------------------------------
>  reactos <http://cvs.reactos.com/cgi-bin/cvsweb/reactos>/ntoskrnl 
>  <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/ntoskrnl>/ob 
>  <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/ntoskrnl/ob>
>  *namespc.c* 1.49 
>
> <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/ntoskrnl/ob/namespc.c?rev=1.49&content-type=text/x-cvsweb-markup>
>
>  -> 
>
> <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/ntoskrnl/ob/namespc.c.diff?r1=text&tr1=1.49&r2=text&tr2=1.50&f=h>
>
>  1.50 
>
> <http://cvs.reactos.com/cgi-bin/cvsweb/reactos/ntoskrnl/ob/namespc.c?rev=1.50&content-type=text/x-cvsweb-markup>
>
> 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);
>   
>
>  ------------------------------------------------------------------------ 
These changes are incorrect. Please revert them... the device map is 
perfectly intialized with my original code. My only mistake was to 
forget to update autocheck. Devicemap will eventually have to be 
Process->DeviceMap so you cannot hack up my code to make it force to use 
ObSystemDeviceMap. It makes the hack worse.

Best regards,
Alex Ionescu

>  _______________________________________________
> Ros-diffs mailing list
> Ros-diffs(a)reactos.com
> http://reactos.com:8080/mailman/listinfo/ros-diffs
>   
>