gdi32: Make dispdib.dll into a stand-alone 16-bit module.

.gitignore

@@ -31,7 +31,6 @@ dlls/compobj.dll16
 dlls/ctl3d.dll16
 dlls/ctl3dv2.dll16
 dlls/ddeml.dll16
-dlls/dispdib.dll16
 dlls/display.drv16
 dlls/gdi.exe16
 dlls/imm.dll16

configure

@@ -3902,6 +3902,7 @@ then
     WIN16_FILES=""
     WIN16_INSTALL=""
     enable_comm_drv16=${enable_comm_drv16:-no}
+    enable_dispdib_dll16=${enable_dispdib_dll16:-no}
     enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no}
     enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no}
     enable_monodebg_vxd=${enable_monodebg_vxd:-no}
@@ -25023,6 +25024,14 @@ dlls/dinput8/Makefile: dlls/dinput8/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dinput8/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
+	dlls/dispdib.dll16/Makefile"
+test "x$enable_dispdib_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dispdib.dll16"
+ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+dlls/dispdib.dll16/Makefile: dlls/dispdib.dll16/Makefile.in dlls/Makedll.rules"
+ac_config_files="$ac_config_files dlls/dispdib.dll16/Makefile"
+
+ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dmband/Makefile"
 test "x$enable_dmband" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dmband"
@@ -28764,6 +28773,7 @@ do
     "dlls/dinput/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dinput/Makefile" ;;
     "dlls/dinput/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dinput/tests/Makefile" ;;
     "dlls/dinput8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dinput8/Makefile" ;;
+    "dlls/dispdib.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dispdib.dll16/Makefile" ;;
     "dlls/dmband/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dmband/Makefile" ;;
     "dlls/dmcompos/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dmcompos/Makefile" ;;
     "dlls/dmime/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dmime/Makefile" ;;

configure.ac

@@ -139,6 +139,7 @@ then
     WIN16_FILES=""
     WIN16_INSTALL=""
     enable_comm_drv16=${enable_comm_drv16:-no}
+    enable_dispdib_dll16=${enable_dispdib_dll16:-no}
     enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no}
     enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no}
     enable_monodebg_vxd=${enable_monodebg_vxd:-no}
@@ -1962,6 +1963,7 @@ WINE_CONFIG_MAKEFILE([dlls/devenum/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL
 WINE_CONFIG_MAKEFILE([dlls/dinput/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/dinput/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/dinput8/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dispdib.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/dmband/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/dmcompos/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/dmime/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])

dlls/Makefile.in

@@ -24,7 +24,6 @@ WIN16_FILES = \
 	ctl3d.dll16 \
 	ctl3dv2.dll16 \
 	ddeml.dll16 \
-	dispdib.dll16 \
 	display.drv16 \
 	gdi.exe16 \
 	imm.dll16 \
@@ -81,7 +80,7 @@ commdlg.dll16:
 ctl3d.dll16 ctl3dv2.dll16:
 	echo "ctl3d32.dll" >$@
 
-dispdib.dll16 gdi.exe16 wing.dll16:
+gdi.exe16 wing.dll16:
 	echo "gdi32.dll" >$@
 
 imm.dll16:

dlls/dispdib.dll16/Makefile.in

+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = dispdib.dll16
+IMPORTS   = kernel32
+EXTRADLLFLAGS = -Wb,--subsystem,win16
+
+SPEC_SRCS = dispdib.dll16.spec
+
+C_SRCS = dispdib.c
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend

dlls/gdi32/Makefile.in

@@ -10,7 +10,6 @@ EXTRAINCL = @FREETYPEINCL@ @FONTCONFIGINCL@
 EXTRALIBS = @CARBONLIB@
 
 SPEC_SRCS16 = \
-	dispdib.spec \
 	gdi.exe.spec \
 	wing.spec
 
@@ -55,7 +54,6 @@ C_SRCS = \
 
 C_SRCS16 = \
 	bidi16.c \
-	dispdib.c \
 	env.c \
 	gdi16.c \
 	metafile16.c \