Define a unique base address for each control panel application.

svn path=/trunk/; revision=11496

diff --git a/reactos/baseaddress.cfg b/reactos/baseaddress.cfg
index 93e0277..16b4dcb 100644 (file)
--- a/reactos/baseaddress.cfg
+++ b/reactos/baseaddress.cfg
@@ -1,6 +1,6 @@
-# $Id: baseaddress.cfg,v 1.23 2004/10/30 22:57:05 weiden Exp $
+# $Id: baseaddress.cfg,v 1.24 2004/10/31 11:50:48 ekohl Exp $
 #
-# Please try to keep this up2date. Please clean up 
+# Please try to keep this up2date. Please clean up
 # after yourself.
 
 # REACTOS
@@ -12,12 +12,20 @@ TARGET_BASE_LIB_DSOUND          =0x50000000
 TARGET_BASE_LIB_GLU32           =0x50000000
 TARGET_BASE_LIB_MMDRV           =0x50000000
 TARGET_BASE_LIB_OPENGL32        =0x50000000
-TARGET_BASE_LIB_CPL_SYSDM       =0x58760000
 TARGET_BASE_LIB_EXT_SLAYER      =0x5C7E0000
+TARGET_BASE_LIB_CPL_TIMEDATE    =0x64DA0000
+TARGET_BASE_LIB_CPL_SYSDM       =0x64DD0000
+TARGET_BASE_LIB_CPL_NCPL        =0x64EA0000
+TARGET_BASE_LIB_CPL_MAIN        =0x64F40000
+TARGET_BASE_LIB_CPL_INTL        =0x64FB0000
+TARGET_BASE_LIB_CPL_DESK        =0x65080000
+TARGET_BASE_LIB_CPL_APPWIZ      =0x65100000
+TARGET_BASE_LIB_CPL_ACCESS      =0x65180000
 TARGET_BASE_LIB_HID             =0x688F0000
 TARGET_BASE_PSX_LIB_PSXDLL      =0x68eb0000
 TARGET_BASE_LIB_PSAPI           =0x68f70000
 TARGET_BASE_LIB_MSIMG32         =0x69cc0000
+TARGET_BASE_LIB_NETPLWIZ        =0x6a240000
 TARGET_BASE_LIB_UNICODE         =0x6b200000
 TARGET_BASE_VGA_DISPLAY         =0x70000000
 TARGET_BASE_LIB_CARDS           =0x701a0000
@@ -44,9 +52,10 @@ TARGET_BASE_LIB_SHLWAPI         =0x76120000
 TARGET_BASE_LIB_COMCTL32        =0x76160000
 TARGET_BASE_LIB_COMDLG32        =0x76200000
 TARGET_BASE_LIB_OLEAUT32        =0x76260000
-TARGET_BASE_LIB_D3D8THK                =0x76340000
+TARGET_BASE_LIB_D3D8THK         =0x76340000
 TARGET_BASE_LIB_RICHEDIT        =0x76340000
 TARGET_BASE_LIB_TWAIN_32        =0x76380000
+TARGET_BASE_LIB_LSASRV          =0x76540000
 TARGET_BASE_LIB_MPR             =0x76620000
 TARGET_BASE_LIB_ODBC32          =0x76660000
 TARGET_BASE_LIB_SETUPAPI        =0x76660000
@@ -61,7 +70,7 @@ TARGET_BASE_LIB_PACKET          =0x77780000
 TARGET_BASE_LIB_W2_32           =0x77780000
 TARGET_BASE_LIB_MSAFD           =0x777a0000
 TARGET_BASE_LIB_IPRTPRIO        =0x777c0000
-TARGET_BASE_LIB_SNMPAPI         =0x777c0000 
+TARGET_BASE_LIB_SNMPAPI         =0x777c0000
 TARGET_BASE_LIB_WINMM           =0x777c0000
 TARGET_BASE_LIB_WS2HELP         =0x777c0000
 TARGET_BASE_LIB_WSHIRDA         =0x777c0000
@@ -70,7 +79,7 @@ TARGET_BASE_LIB_WINSPOOL        =0x77800000
 TARGET_BASE_LIB_OLE32           =0x77a50000
 TARGET_BASE_LIB_OLEPRO32        =0x77a50000
 TARGET_BASE_LIB_VERSION         =0x77a90000
-TARGET_BASE_LIB_ADVAPI32        =0x77dc0000    
+TARGET_BASE_LIB_ADVAPI32        =0x77dc0000
 TARGET_BASE_LIB_USER32          =0x77e60000
 TARGET_BASE_LIB_GDI32           =0x77ed0000
 TARGET_BASE_LIB_DNSAPI          =0x78000000

diff --git a/reactos/lib/cpl/access/Makefile b/reactos/lib/cpl/access/Makefile
index a85b852..a02156f 100644 (file)
--- a/reactos/lib/cpl/access/Makefile
+++ b/reactos/lib/cpl/access/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 2004/06/30 12:16:27 ekohl Exp $
+# $Id: Makefile,v 1.2 2004/10/31 11:51:13 ekohl Exp $
 
 PATH_TO_TOP = ../../..
 
@@ -10,7 +10,7 @@ TARGET_NAME = access
 
 TARGET_INSTALLDIR = system32
 
-TARGET_BASE = 0x58760000
+TARGET_BASE = $(TARGET_BASE_LIB_CPL_ACCESS)
 
 TARGET_CFLAGS = \
  -D_WIN32_IE=0x0600 \

diff --git a/reactos/lib/cpl/appwiz/Makefile b/reactos/lib/cpl/appwiz/Makefile
index 28d6a09..31e866d 100644 (file)
--- a/reactos/lib/cpl/appwiz/Makefile
+++ b/reactos/lib/cpl/appwiz/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2004/06/30 12:11:11 ekohl Exp $
+# $Id: Makefile,v 1.3 2004/10/31 11:51:30 ekohl Exp $
 
 PATH_TO_TOP = ../../..
 
@@ -10,7 +10,7 @@ TARGET_NAME = appwiz
 
 TARGET_INSTALLDIR = system32
 
-TARGET_BASE = $(TARGET_BASE_LIB_CPL_SYSDM)
+TARGET_BASE = $(TARGET_BASE_LIB_CPL_APPWIZ)
 
 TARGET_CFLAGS = \
  -D_WIN32_IE=0x0600 \

diff --git a/reactos/lib/cpl/desk/Makefile b/reactos/lib/cpl/desk/Makefile
index b311339..5facd00 100644 (file)
--- a/reactos/lib/cpl/desk/Makefile
+++ b/reactos/lib/cpl/desk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2004/10/13 10:17:41 ekohl Exp $
+# $Id: Makefile,v 1.3 2004/10/31 11:51:47 ekohl Exp $
 
 PATH_TO_TOP = ../../..
 
@@ -10,7 +10,7 @@ TARGET_NAME = desk
 
 TARGET_INSTALLDIR = system32
 
-TARGET_BASE = $(TARGET_BASE_LIB_CPL_SYSDM)
+TARGET_BASE = $(TARGET_BASE_LIB_CPL_DESK)
 
 TARGET_CFLAGS = \
  -I./include \

diff --git a/reactos/lib/cpl/intl/makefile b/reactos/lib/cpl/intl/makefile
index 6fdc279..4c27a2c 100644 (file)
--- a/reactos/lib/cpl/intl/makefile
+++ b/reactos/lib/cpl/intl/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.1 2004/10/30 12:33:23 ekohl Exp $
+# $Id: makefile,v 1.2 2004/10/31 11:52:07 ekohl Exp $
 
 PATH_TO_TOP = ../../..
 
@@ -10,7 +10,7 @@ TARGET_NAME = intl
 
 TARGET_INSTALLDIR = system32
 
-TARGET_BASE = 0x75970000
+TARGET_BASE = $(TARGET_BASE_LIB_CPL_INTL)
 
 TARGET_CFLAGS = \
  -D_WIN32_IE=0x0600 \

diff --git a/reactos/lib/cpl/main/makefile b/reactos/lib/cpl/main/makefile
index a5ea043..edad8cf 100644 (file)
--- a/reactos/lib/cpl/main/makefile
+++ b/reactos/lib/cpl/main/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.1 2004/10/30 12:35:16 ekohl Exp $
+# $Id: makefile,v 1.2 2004/10/31 11:52:29 ekohl Exp $
 
 PATH_TO_TOP = ../../..
 
@@ -10,7 +10,7 @@ TARGET_NAME = main
 
 TARGET_INSTALLDIR = system32
 
-TARGET_BASE = 0x75970000
+TARGET_BASE = $(TARGET_BASE_LIB_CPL_MAIN)
 
 TARGET_CFLAGS = \
  -D_WIN32_IE=0x0600 \

diff --git a/reactos/lib/cpl/timedate/makefile b/reactos/lib/cpl/timedate/makefile
index 690dc49..99181b2 100644 (file)
--- a/reactos/lib/cpl/timedate/makefile
+++ b/reactos/lib/cpl/timedate/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.1 2004/10/30 19:15:31 ekohl Exp $
+# $Id: makefile,v 1.2 2004/10/31 11:54:22 ekohl Exp $
 
 PATH_TO_TOP = ../../..
 
@@ -10,7 +10,7 @@ TARGET_NAME = timedate
 
 TARGET_INSTALLDIR = system32
 
-TARGET_BASE = 0x75970000
+TARGET_BASE = $(TARGET_BASE_LIB_CPL_TIMEDATE)
 
 TARGET_CFLAGS = \
  -D_WIN32_IE=0x0600 \