[ros-diffs] [akhaldi] 53457: [NEWCC] * Initialize some variables. * Add a base address to csrsrv in rbuild build to prevent its relocation.

Author: akhaldi
Date: Fri Aug 26 18:06:01 2011
New Revision: 53457

URL: http://svn.reactos.org/svn/reactos?rev=53457&view=rev
Log:
[NEWCC]
* Initialize some variables.
* Add a base address to csrsrv in rbuild build to prevent its relocation.

Modified:
    branches/arty-newcc/baseaddress.rbuild
    branches/arty-newcc/ntoskrnl/cache/cachesub.c
    branches/arty-newcc/ntoskrnl/cache/section/io.c
    branches/arty-newcc/ntoskrnl/mm/section.c
    branches/arty-newcc/subsystems/win32/csrss/csrsrv/csrsrv.rbuild

Modified: branches/arty-newcc/baseaddress.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/arty-newcc/baseaddress.rbuild?r…
==============================================================================
--- branches/arty-newcc/baseaddress.rbuild [iso-8859-1] (original)
+++ branches/arty-newcc/baseaddress.rbuild [iso-8859-1] Fri Aug 26 18:06:01 2011
@@ -261,6 +261,7 @@
 	<property name="BASEADDRESS_QUERY"		value="0x7d9a0000" />
 	<property name="BASEADDRESS_HHCTRL"		value="0x7e410000" />
 	<property name="BASEADDRESS_SXS"		value="0x7e690000" />
+	<property name="BASEADDRESS_CSRSRV"		value="0x7e700000" />
 	<property name="BASEADDRESS_BEEPMIDI"		value="0x7ef00000" />
 	<property name="BASEADDRESS_FREETYPE"		value="0x7f000000" />
 </group>

Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c
URL:
http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/cache…
==============================================================================
--- branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] (original)
+++ branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] Fri Aug 26 18:06:01 2011
@@ -143,7 +143,9 @@
     PNOCC_BCB Bcb = NULL;
 	LARGE_INTEGER LowerBound, UpperBound;
 	PLIST_ENTRY ListEntry;
-    IO_STATUS_BLOCK IOSB = {{0}};
+    IO_STATUS_BLOCK IOSB;
+
+    RtlZeroMemory(&IOSB, sizeof(IO_STATUS_BLOCK));
 
 	DPRINT("CcFlushCache (while file) (%s:%d)\n", File, Line);
 

Modified: branches/arty-newcc/ntoskrnl/cache/section/io.c
URL:
http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti…
==============================================================================
--- branches/arty-newcc/ntoskrnl/cache/section/io.c [iso-8859-1] (original)
+++ branches/arty-newcc/ntoskrnl/cache/section/io.c [iso-8859-1] Fri Aug 26 18:06:01 2011
@@ -198,21 +198,21 @@
 		 Length,
 		 FileOffset,
 		 ReadStatus);
-    
+
     if (!Irp)
     {
 		ObDereferenceObject(FileObject);
 		return STATUS_NO_MEMORY;
     }
-    
+
     Irp->Flags = IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO | IRP_NOCACHE |
IRP_SYNCHRONOUS_API;
-    
+
     Irp->UserEvent = &ReadWait;
     Irp->Tail.Overlay.OriginalFileObject = FileObject;
     Irp->Tail.Overlay.Thread = PsGetCurrentThread();
     IrpSp = IoGetNextIrpStackLocation(Irp);
     IrpSp->FileObject = FileObject;
-    
+
 	DPRINT("Call Driver\n");
     Status = IoCallDriver(DeviceObject, Irp);
 	DPRINT("Status %x\n", Status);

Modified: branches/arty-newcc/ntoskrnl/mm/section.c
URL:
http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section.…
==============================================================================
--- branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] (original)
+++ branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] Fri Aug 26 18:06:01 2011
@@ -1197,9 +1197,11 @@
  *       Page - Variable that receives a page contains the read data.
  */
 {
-   MM_REQUIRED_RESOURCES Resources = {0};
+   MM_REQUIRED_RESOURCES Resources;
    NTSTATUS Status;
-  
+
+   RtlZeroMemory(&Resources, sizeof(MM_REQUIRED_RESOURCES));
+
    Resources.Context = MemoryArea->Data.SectionData.Section->FileObject;
    Resources.FileOffset.QuadPart = SegOffset + 
        MemoryArea->Data.SectionData.Segment->Image.FileOffset;
@@ -4995,6 +4997,7 @@
 	   NTSTATUS Status;
 	   CHAR Buffer;
 	   LARGE_INTEGER ByteOffset;
+       RtlZeroMemory(&ByteOffset, sizeof(LARGE_INTEGER));
 	   Status = ZwReadFile
 		   (FileHandle,
 			NULL,

Modified: branches/arty-newcc/subsystems/win32/csrss/csrsrv/csrsrv.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr…
==============================================================================
--- branches/arty-newcc/subsystems/win32/csrss/csrsrv/csrsrv.rbuild [iso-8859-1]
(original)
+++ branches/arty-newcc/subsystems/win32/csrss/csrsrv/csrsrv.rbuild [iso-8859-1] Fri Aug
26 18:06:01 2011
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="csrsrv" type="nativedll"
entrypoint="DllMain@12" installbase="system32"
installname="csrsrv.dll">
+<module name="csrsrv" type="nativedll"
baseaddress="${BASEADDRESS_CSRSRV}" entrypoint="DllMain@12"
installbase="system32" installname="csrsrv.dll">
 	<importlibrary definition="csrsrv.spec" />
 	<include base="csrsrv">.</include>
 	<include base="csrss">.</include>