From 2cbfda31149920a1156ee92bd8f8cd2074a39335 Mon Sep 17 00:00:00 2001
From: Aleksey Bragin <aleksey@reactos.org>
Date: Tue, 11 Dec 2007 21:25:10 +0000
Subject: [PATCH] - Reshuflle baseaddresses so no relocations occur during
 booting. - Give beepmidi.dll a baseaddress. - Silence non-critical
 trace-style messages in umpnpmgr and in the kernel.

svn path=/trunk/; revision=31170
---
 reactos/base/services/umpnpmgr/umpnpmgr.c  |  2 +-
 reactos/baseaddress.rbuild                 | 13 +++++++------
 reactos/dll/win32/advapi32/advapi32.rbuild |  2 +-
 reactos/dll/win32/beepmidi/beepmidi.rbuild |  2 +-
 reactos/dll/win32/lsasrv/lsarpc.c          |  2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/reactos/base/services/umpnpmgr/umpnpmgr.c b/reactos/base/services/umpnpmgr/umpnpmgr.c
index 2ebc58bb584..c9dbdc683b6 100644
--- a/reactos/base/services/umpnpmgr/umpnpmgr.c
+++ b/reactos/base/services/umpnpmgr/umpnpmgr.c
@@ -201,7 +201,7 @@ PNP_ReportLogOn(handle_t BindingHandle,
 
     UNREFERENCED_PARAMETER(BindingHandle);
 
-    DPRINT1("PNP_ReportLogOn(%u, %u) called\n", Admin, ProcessId);
+    DPRINT("PNP_ReportLogOn(%u, %u) called\n", Admin, ProcessId);
 
     /* Get the users token */
     hProcess = OpenProcess(PROCESS_ALL_ACCESS,
diff --git a/reactos/baseaddress.rbuild b/reactos/baseaddress.rbuild
index b0726fcb234..70651b62553 100644
--- a/reactos/baseaddress.rbuild
+++ b/reactos/baseaddress.rbuild
@@ -30,7 +30,7 @@
   <property name="BASEADDRESS_NCPL" value="0x64ea0000" />
   <property name="BASEADDRESS_MAIN" value="0x64f40000" />
   <property name="BASEADDRESS_INTL" value="0x64fb0000" />
-  <property name="BASEADDRESS_CONSOLE" value="0x6E4D0000" />
+  <property name="BASEADDRESS_CONSOLE" value="0x6e4d0000" />
   <property name="BASEADDRESS_DESK" value="0x65080000" />
   <property name="BASEADDRESS_APPWIZ" value="0x65100000" />
   <property name="BASEADDRESS_MLANG" value="0x65140000" />
@@ -43,7 +43,7 @@
   <property name="BASEADDRESS_OLEACC" value="0x69640000" />
   <property name="BASEADDRESS_WINMM" value="0x697d0000" />
   <property name="BASEADDRESS_MSIMG32" value="0x69cc0000" />
-  <property name="BASEADDRESS_BROWSEUI" value="0x69cc0000" />
+  <property name="BASEADDRESS_BROWSEUI" value="0x69cd0000" />
   <property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" />
   <property name="BASEADDRESS_SHELL32" value="0x6a360000" />
   <property name="BASEADDRESS_UNICODE" value="0x6b200000" />
@@ -102,7 +102,6 @@
   <property name="BASEADDRESS_SHLWAPI" value="0x76120000" />
   <property name="BASEADDRESS_COMCTL32" value="0x76160000" />
   <property name="BASEADDRESS_COMDLG32" value="0x76210000" />
-  <property name="BASEADDRESS_OLEAUT32" value="0x76290000" />
   <property name="BASEADDRESS_RICHED32" value="0x76340000" />
   <property name="BASEADDRESS_D3D8THK" value="0x76340000" />
   <property name="BASEADDRESS_RICHED20" value="0x76360000" />
@@ -125,9 +124,10 @@
   <property name="BASEADDRESS_CLUSAPI" value="0x76d10000" />
   <property name="BASEADDRESS_DHCPCSVC" value="0x76d80000" />
   <property name="BASEADDRESS_FMIFS" value="0x76df0000" />
-  <property name="BASEADDRESS_RASAPI32" value="0x76ee0000h" />
+  <property name="BASEADDRESS_OLEAUT32" value="0x76e00000" />
+  <property name="BASEADDRESS_RASAPI32" value="0x76ee0000" />
   <property name="BASEADDRESS_WTSAPI32" value="0x76f50000" />
-  <property name="BASEADDRESS_MSVFW32" value="0x77400000" />
+  <property name="BASEADDRESS_MSVFW32" value="0x76f60000" />
   <property name="BASEADDRESS_MSACM32" value="0x77400000" />
   <property name="BASEADDRESS_CRTDLL" value="0x77630000" />
   <property name="BASEADDRESS_AUTHZ" value="0x77690000" />
@@ -143,7 +143,7 @@
   <property name="BASEADDRESS_WSHIRDA" value="0x777f0000" />
   <property name="BASEADDRESS_VERSION" value="0x77a40000" />
   <property name="BASEADDRESS_OLE32" value="0x77a50000" />
-  <property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" />
+  <property name="BASEADDRESS_OLEPRO32" value="0x77b10000" />
   <property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" />
   <property name="BASEADDRESS_USER32" value="0x77e30000" />
   <property name="BASEADDRESS_GDI32" value="0x77f70000" />
@@ -153,5 +153,6 @@
   <property name="BASEADDRESS_KERNEL32" value="0x7c800000" />
   <property name="BASEADDRESS_NTDLL" value="0x7c900000" />
   <property name="BASEADDRESS_HHCTRL" value="0x7e410000" />
+  <property name="BASEADDRESS_BEEPMIDI" value="0x7ef0000" />
   <property name="BASEADDRESS_FREETYPE" value="0x7f000000" />
 </group>
diff --git a/reactos/dll/win32/advapi32/advapi32.rbuild b/reactos/dll/win32/advapi32/advapi32.rbuild
index 7b6d87aa953..8ca94fed28c 100644
--- a/reactos/dll/win32/advapi32/advapi32.rbuild
+++ b/reactos/dll/win32/advapi32/advapi32.rbuild
@@ -1,4 +1,4 @@
-<module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}"  installbase="system32" installname="advapi32.dll">
+<module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}" installbase="system32" installname="advapi32.dll">
 
 	<importlibrary definition="advapi32.def" />
 	<include base="advapi32">.</include>
diff --git a/reactos/dll/win32/beepmidi/beepmidi.rbuild b/reactos/dll/win32/beepmidi/beepmidi.rbuild
index 98c2d3cbd4e..a53b6949993 100644
--- a/reactos/dll/win32/beepmidi/beepmidi.rbuild
+++ b/reactos/dll/win32/beepmidi/beepmidi.rbuild
@@ -1,4 +1,4 @@
-<module name="beepmidi" type="win32dll" installbase="system32" installname="beepmidi.dll">
+<module name="beepmidi" type="win32dll" baseaddress="${BASEADDRESS_BEEPMIDI}" installbase="system32" installname="beepmidi.dll">
 	<importlibrary definition="beepmidi.def" />
 	<include base="beepmidi">.</include>
 	<define name="UNICODE" />
diff --git a/reactos/dll/win32/lsasrv/lsarpc.c b/reactos/dll/win32/lsasrv/lsarpc.c
index 60b87f85b1f..1cad6ae5fd2 100644
--- a/reactos/dll/win32/lsasrv/lsarpc.c
+++ b/reactos/dll/win32/lsasrv/lsarpc.c
@@ -129,7 +129,7 @@ LsarClose(IN handle_t BindingHandle,
     PLSAR_POLICY_HANDLE Policy = NULL;
     NTSTATUS Status;
 
-    DPRINT1("LsarClose(0x%p) called!\n", ObjectHandle);
+    DPRINT("LsarClose(0x%p) called!\n", ObjectHandle);
 
     Status = ReferencePolicyHandle((LSA_HANDLE)ObjectHandle,
                                    0,