From f6966e84c8ffd00d90871c961dbc30adff173c1b Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Wed, 28 Jan 2004 19:34:45 +0000 Subject: [PATCH] Fixed base addresses and exports. svn path=/trunk/; revision=7895 --- reactos/baseaddress.cfg | 30 ++++++++++------------ reactos/lib/cabinet/Makefile.ros-template | 4 +-- reactos/lib/comdlg32/Makefile.ros-template | 2 +- reactos/lib/imagehlp/makefile | 2 +- reactos/lib/imm32/Makefile | 2 +- reactos/lib/lzexpand/Makefile | 2 +- reactos/lib/oledlg/Makefile.ros-template | 4 +-- reactos/lib/rpcrt4/Makefile | 2 +- reactos/lib/setupapi/Makefile.ros-template | 4 +-- reactos/lib/winmm/winmm.edf | 16 ++++++------ 10 files changed, 33 insertions(+), 35 deletions(-) diff --git a/reactos/baseaddress.cfg b/reactos/baseaddress.cfg index 55c23f81137..12cdaaf7b42 100644 --- a/reactos/baseaddress.cfg +++ b/reactos/baseaddress.cfg @@ -4,20 +4,32 @@ REACTOS lib/advapi32 TARGET_BASE=0x77dc0000 +lib/comctl32 TARGET_BASE=0x76160000 +lib/comdlg32 TARGET_BASE=0x76200000 +lib/cabinet TARGET_BASE=0x75120000 lib/crtdll TARGET_BASE=0x77630000 lib/fmifs TARGET_BASE=0x76df0000 lib/gdi32 TARGET_BASE=0x77ed0000 +lib/imagehlp TARGET_BASE=0x76c90000 +lib/imm32 TARGET_BASE=0x75e60000 lib/kernel32 TARGET_BASE=0x77f00000 +lib/lzexpand TARGET_BASE=0x73d80000 lib/msafd TARGET_BASE=0x777a0000 lib/msvcrt TARGET_BASE=0x78000000 lib/mswsock TARGET_BASE=0x71a30000 lib/ntdll TARGET_BASE=0x77f60000 lib/ole32 TARGET_BASE=0x77a50000 lib/oleaut32 TARGET_BASE=0x76260000 +lib/oledlg TARGET_BASE=0x74d00000 +lib/psapi TARGET_BASE=0x68F70000 +lib/richedit TARGET_BASE=0x76340000 +lib/rpcrt4 TARGET_BASE=0x76000000 lib/samlib TARGET_BASE=0x777e0000 lib/secur32 TARGET_BASE=0x10000000 +lib/setupapi TARGET_BASE=0x76660000 lib/shell32 TARGET_BASE=0x77260000 -lib/syssetup TARGET_BASE=0x74A30000 +lib/shlwapi TARGET_BASE=0x76120000 +lib/syssetup TARGET_BASE=0x74A30000 lib/user32 TARGET_BASE=0x77e70000 lib/userenv TARGET_BASE=0x74850000 lib/version TARGET_BASE=0x77a90000 @@ -30,33 +42,19 @@ subsys/psx/lib/psxdll TARGET_BASE=0x68EB0000 subsys/psx/lib/psxx # TARGET_BASE=0x77dc0000 subsys/win32k TARGET_BASE=0x0 - - WINE -dlls/comctl32 TARGET_BASE=0x76160000 -dlls/commdlg TARGET_BASE=0x76200000 dlls/ddraw TARGET_BASE=0x76240000 dlls/dinput TARGET_BASE=0x76280000 dlls/dplay TARGET_BASE=0x76320000 dlls/dplayx TARGET_BASE=0x76310000 -dlls/imm32 TARGET_BASE=0x75e60000 dlls/mapi32 TARGET_BASE=0x76430000 -dlls/ole32 TARGET_BASE=0x76010000 -dlls/oleaut32 TARGET_BASE=0x76040000 dlls/olecli TARGET_BASE=0x76070000 -dlls/oledlg TARGET_BASE=0x76050000 dlls/olepro32 TARGET_BASE=0x76060000 dlls/olesvr TARGET_BASE=0x76080000 -dlls/psapi TARGET_BASE=0x76330000 dlls/url TARGET_BASE=0x76530000 dlls/urlmon TARGET_BASE=0x76730000 -dlls/richedit TARGET_BASE=0x76340000 -dlls/rpcrt4 TARGET_BASE=0x76000000 dlls/serialui TARGET_BASE=0x76370000 dlls/shdocvw TARGET_BASE=0x76190000 -dlls/shell32 TARGET_BASE=0x76090000 dlls/shfolder TARGET_BASE=0x76180000 -dlls/shlwapi TARGET_BASE=0x76120000 -dlls/winspool TARGET_BASE=0x76380000 -unicode/wine_unicode TARGET_BASE=0x76590000 #Do not use \ No newline at end of file +unicode/wine_unicode TARGET_BASE=0x76590000 #Do not use diff --git a/reactos/lib/cabinet/Makefile.ros-template b/reactos/lib/cabinet/Makefile.ros-template index ad1283d4d2a..1703af0db2c 100644 --- a/reactos/lib/cabinet/Makefile.ros-template +++ b/reactos/lib/cabinet/Makefile.ros-template @@ -1,4 +1,4 @@ -# $Id: Makefile.ros-template,v 1.1 2004/01/14 01:47:46 sedwards Exp $ +# $Id: Makefile.ros-template,v 1.2 2004/01/28 19:34:44 navaraf Exp $ TARGET_NAME = cabinet @@ -8,7 +8,7 @@ TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ TARGET_SDKLIBS = @IMPORTS@ libwine.a wine_uuid.a ntdll.a -TARGET_BASE = 0x76160000 +TARGET_BASE = 0x75120000 TARGET_RC_SRCS = @RC_SRCS@ TARGET_RC_BINSRC = @RC_BINSRC@ diff --git a/reactos/lib/comdlg32/Makefile.ros-template b/reactos/lib/comdlg32/Makefile.ros-template index 4b025ec4a53..f470da9de14 100644 --- a/reactos/lib/comdlg32/Makefile.ros-template +++ b/reactos/lib/comdlg32/Makefile.ros-template @@ -7,7 +7,7 @@ TARGET_CFLAGS = -D__REACTOS__ @EXTRADEFS@ TARGET_SDKLIBS = @IMPORTS@ libwine.a libwine_unicode.a wine_uuid.a ntdll.a winspool.a -TARGET_BASE = 0x77a50000 +TARGET_BASE = 0x76200000 TARGET_RC_SRCS = @RC_SRCS@ TARGET_RC_BINSRC = @RC_BINSRC@ diff --git a/reactos/lib/imagehlp/makefile b/reactos/lib/imagehlp/makefile index 22c04ff29c4..27c6b512c0d 100644 --- a/reactos/lib/imagehlp/makefile +++ b/reactos/lib/imagehlp/makefile @@ -36,7 +36,7 @@ TARGET_LFLAGS = -nostartfiles -nostdlib TARGET_SDKLIBS = libwine.a ntdll.a kernel32.a -TARGET_BASE = 0x76160000 +TARGET_BASE = 0x76C90000 TARGET_OBJECTS = \ debug.o \ diff --git a/reactos/lib/imm32/Makefile b/reactos/lib/imm32/Makefile index a599e83e4b5..43cc3a66d13 100644 --- a/reactos/lib/imm32/Makefile +++ b/reactos/lib/imm32/Makefile @@ -5,7 +5,7 @@ TARGET_TYPE = dynlink TARGET_NAME = imm32 -TARGET_BASE=0x76380000 +TARGET_BASE=0x75e60000 # require os code to explicitly request A/W version of structs/functions TARGET_CFLAGS += -D_DISABLE_TIDENTS -D__USE_W32API diff --git a/reactos/lib/lzexpand/Makefile b/reactos/lib/lzexpand/Makefile index e1042c91b1e..6e713ca9d4a 100644 --- a/reactos/lib/lzexpand/Makefile +++ b/reactos/lib/lzexpand/Makefile @@ -5,7 +5,7 @@ TARGET_TYPE = dynlink TARGET_NAME = lz32 -TARGET_BASE=0x76380000 +TARGET_BASE=0x73D80000 # require os code to explicitly request A/W version of structs/functions TARGET_CFLAGS += -D_DISABLE_TIDENTS -Wall -Werror diff --git a/reactos/lib/oledlg/Makefile.ros-template b/reactos/lib/oledlg/Makefile.ros-template index e72ae92cc1c..9d93d9a4463 100644 --- a/reactos/lib/oledlg/Makefile.ros-template +++ b/reactos/lib/oledlg/Makefile.ros-template @@ -1,4 +1,4 @@ -# $Id: Makefile.ros-template,v 1.1 2004/01/14 01:55:00 sedwards Exp $ +# $Id: Makefile.ros-template,v 1.2 2004/01/28 19:34:45 navaraf Exp $ TARGET_NAME = oledlg @@ -8,7 +8,7 @@ TARGET_CFLAGS = @EXTRADEFS@ TARGET_SDKLIBS = @IMPORTS@ libwine.a wine_uuid.a ntdll.a -TARGET_BASE = 0x76160000 +TARGET_BASE = 0x74D00000 TARGET_RC_SRCS = @RC_SRCS@ TARGET_RC_BINSRC = @RC_BINSRC@ diff --git a/reactos/lib/rpcrt4/Makefile b/reactos/lib/rpcrt4/Makefile index 499de0905c3..21bd5a1e2f0 100644 --- a/reactos/lib/rpcrt4/Makefile +++ b/reactos/lib/rpcrt4/Makefile @@ -5,7 +5,7 @@ TARGET_TYPE = dynlink TARGET_NAME = rpcrt4 -TARGET_BASE=0x76380000 +TARGET_BASE=0x76000000 TARGET_CFLAGS = \ -Wall \ diff --git a/reactos/lib/setupapi/Makefile.ros-template b/reactos/lib/setupapi/Makefile.ros-template index a8d0fc15781..c8a53801bdd 100644 --- a/reactos/lib/setupapi/Makefile.ros-template +++ b/reactos/lib/setupapi/Makefile.ros-template @@ -1,4 +1,4 @@ -# $Id: Makefile.ros-template,v 1.1 2004/01/24 15:39:18 sedwards Exp $ +# $Id: Makefile.ros-template,v 1.2 2004/01/28 19:34:45 navaraf Exp $ TARGET_NAME = setupapi @@ -8,7 +8,7 @@ TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ TARGET_SDKLIBS = @IMPORTS@ libwine.a ntdll.a libwine_unicode.a -TARGET_BASE = 0x76160000 +TARGET_BASE = 0x76660000 TARGET_RC_SRCS = @RC_SRCS@ TARGET_RC_BINSRC = @RC_BINSRC@ diff --git a/reactos/lib/winmm/winmm.edf b/reactos/lib/winmm/winmm.edf index 7b72809bf08..deeb8fbd075 100644 --- a/reactos/lib/winmm/winmm.edf +++ b/reactos/lib/winmm/winmm.edf @@ -7,17 +7,17 @@ PlaySoundA=PlaySoundA@12 @18 CloseDriver=CloseDriver@12 @2 DefDriverProc=DefDriverProc@20 @5 DriverCallback=DriverCallback@28 @6 -DrvClose@12=CloseDriver@12 @7 -DrvDefDriverProc@20=DefDriverProc@20 @8 -DrvGetModuleHandle@4=GetDriverModuleHandle@4 @9 -DrvOpen@12=OpenDriverW@12 @10 -DrvOpenA@12=OpenDriverA@12 @11 -DrvSendMessage@16=SendDriverMessage@16 @12 +DrvClose=CloseDriver@12 @7 +DrvDefDriverProc=DefDriverProc@20 @8 +DrvGetModuleHandle=GetDriverModuleHandle@4 @9 +DrvOpen=OpenDriverW@12 @10 +DrvOpenA=OpenDriverA@12 @11 +DrvSendMessage=SendDriverMessage@16 @12 GetDriverFlags=GetDriverFlags@4 @13 GetDriverModuleHandle=GetDriverModuleHandle@4 @14 -OpenDriver@12=OpenDriverW@12 @15 +OpenDriver=OpenDriverW@12 @15 OpenDriverA=OpenDriverA@12 @16 -PlaySound@12=PlaySoundA@12 @17 +PlaySound=PlaySoundA@12 @17 PlaySoundW=PlaySoundW@12 @19 SendDriverMessage=SendDriverMessage@16 @20 auxGetDevCapsA=auxGetDevCapsA@12 @21