Alexandre Julliard : kernel32: Make windebug. dll into a stand-alone 16-bit module.
Alexandre Julliard
julliard at winehq.org
Wed Mar 4 09:01:02 CST 2009
Module: wine
Branch: master
Commit: 6cebffcd70e86b43b1f0eb8d990136c8feefc9a7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cebffcd70e86b43b1f0eb8d990136c8feefc9a7
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Mar 4 14:24:30 2009 +0100
kernel32: Make windebug.dll into a stand-alone 16-bit module.
---
.gitignore | 1 -
configure | 10 ++++++++++
configure.ac | 2 ++
dlls/Makefile.in | 3 +--
dlls/kernel32/Makefile.in | 4 +---
dlls/windebug.dll16/Makefile.in | 15 +++++++++++++++
dlls/{kernel32 => windebug.dll16}/windebug.c | 0
.../windebug.dll16.spec} | 0
8 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3ba4b2e..e2f73cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -118,7 +118,6 @@ dlls/ver.dll16
dlls/w32sys.dll16
dlls/win32s16.dll16
dlls/winaspi.dll16
-dlls/windebug.dll16
dlls/wineps16.drv16
dlls/wing.dll16
dlls/winnls.dll16
diff --git a/configure b/configure
index c8ffeba..605d713 100755
--- a/configure
+++ b/configure
@@ -3914,6 +3914,7 @@ then
enable_vwin32_vxd=${enable_vwin32_vxd:-no}
enable_w32skrnl=${enable_w32skrnl:-no}
enable_win87em_dll16=${enable_win87em_dll16:-no}
+ enable_windebug_dll16=${enable_windebug_dll16:-no}
enable_winedos=${enable_winedos:-no}
enable_winevdm=${enable_winevdm:-no}
enable_winhelp_exe16=${enable_winhelp_exe16:-no}
@@ -27102,6 +27103,14 @@ dlls/win87em.dll16/Makefile: dlls/win87em.dll16/Makefile.in dlls/Makedll.rules"
ac_config_files="$ac_config_files dlls/win87em.dll16/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\
+ dlls/windebug.dll16/Makefile"
+test "x$enable_windebug_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+ windebug.dll16"
+ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+dlls/windebug.dll16/Makefile: dlls/windebug.dll16/Makefile.in dlls/Makedll.rules"
+ac_config_files="$ac_config_files dlls/windebug.dll16/Makefile"
+
+ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/winealsa.drv/Makefile"
test "x$enable_winealsa_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
winealsa.drv"
@@ -29015,6 +29024,7 @@ do
"dlls/vwin32.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/vwin32.vxd/Makefile" ;;
"dlls/w32skrnl/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/w32skrnl/Makefile" ;;
"dlls/win87em.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/win87em.dll16/Makefile" ;;
+ "dlls/windebug.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/windebug.dll16/Makefile" ;;
"dlls/winealsa.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winealsa.drv/Makefile" ;;
"dlls/wineaudioio.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wineaudioio.drv/Makefile" ;;
"dlls/winecoreaudio.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winecoreaudio.drv/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index cd50b49..41ba254 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,6 +151,7 @@ then
enable_vwin32_vxd=${enable_vwin32_vxd:-no}
enable_w32skrnl=${enable_w32skrnl:-no}
enable_win87em_dll16=${enable_win87em_dll16:-no}
+ enable_windebug_dll16=${enable_windebug_dll16:-no}
enable_winedos=${enable_winedos:-no}
enable_winevdm=${enable_winevdm:-no}
enable_winhelp_exe16=${enable_winhelp_exe16:-no}
@@ -2221,6 +2222,7 @@ WINE_CONFIG_MAKEFILE([dlls/vtdapi.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL
WINE_CONFIG_MAKEFILE([dlls/vwin32.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/w32skrnl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/win87em.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/windebug.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/winealsa.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/wineaudioio.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/winecoreaudio.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index cd6103b..fe71dc6 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -57,7 +57,6 @@ WIN16_FILES = \
w32sys.dll16 \
win32s16.dll16 \
winaspi.dll16 \
- windebug.dll16 \
wineps16.drv16 \
wing.dll16 \
winnls.dll16 \
@@ -88,7 +87,7 @@ dispdib.dll16 gdi.exe16 wing.dll16:
imm.dll16:
echo "imm32.dll" >$@
-krnl386.exe16 system.drv16 toolhelp.dll16 windebug.dll16:
+krnl386.exe16 system.drv16 toolhelp.dll16:
echo "kernel32.dll" >$@
lzexpand.dll16:
diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in
index f782634..d7b91d3 100644
--- a/dlls/kernel32/Makefile.in
+++ b/dlls/kernel32/Makefile.in
@@ -12,8 +12,7 @@ EXTRADLLFLAGS = -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000
SPEC_SRCS16 = \
krnl386.exe.spec \
system.drv.spec \
- toolhelp.spec \
- windebug.spec
+ toolhelp.spec
C_SRCS = \
actctx.c \
@@ -68,7 +67,6 @@ C_SRCS = \
virtual.c \
volume.c \
vxd.c \
- windebug.c \
wowthunk.c
C_SRCS16 = \
diff --git a/dlls/windebug.dll16/Makefile.in b/dlls/windebug.dll16/Makefile.in
new file mode 100644
index 0000000..5615a2c
--- /dev/null
+++ b/dlls/windebug.dll16/Makefile.in
@@ -0,0 +1,15 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR = @srcdir@
+VPATH = @srcdir@
+MODULE = windebug.dll16
+IMPORTS = kernel32
+EXTRADLLFLAGS = -Wb,--subsystem,win16
+
+SPEC_SRCS = windebug.dll16.spec
+
+C_SRCS = windebug.c
+
+ at MAKE_DLL_RULES@
+
+ at DEPENDENCIES@ # everything below this line is overwritten by make depend
diff --git a/dlls/kernel32/windebug.c b/dlls/windebug.dll16/windebug.c
similarity index 100%
rename from dlls/kernel32/windebug.c
rename to dlls/windebug.dll16/windebug.c
diff --git a/dlls/kernel32/windebug.spec b/dlls/windebug.dll16/windebug.dll16.spec
similarity index 100%
rename from dlls/kernel32/windebug.spec
rename to dlls/windebug.dll16/windebug.dll16.spec
More information about the wine-cvs
mailing list