diff --git a/.gitignore b/.gitignore index e2f73ccfe0cb5bdc6077f103cd4cb42ca096699a..3ac1e38155377870865eceb62dc322e8d0e27143 100644 --- a/.gitignore +++ b/.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 diff --git a/configure b/configure index 605d71342adbbdba34bcea65f10307818e7b0de9..f050c845ac60b5678d8d3321a465894f335356fb 100755 --- a/configure +++ b/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} @@ -25022,6 +25023,14 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS 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 \\ @@ -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" ;; diff --git a/configure.ac b/configure.ac index 41ba25498e4b8a20d6c40951c183b05fa08ddf17..68cf6001a2b0bfad1e8ec67ac71c001b133ce2f5 100644 --- a/configure.ac +++ b/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]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index fe71dc6bcb91c461878f5b604bcc6c0c0ecb4141..340e8b65a9a5a35415158a12c31c91a448331c76 100644 --- a/dlls/Makefile.in +++ b/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: diff --git a/dlls/dispdib.dll16/Makefile.in b/dlls/dispdib.dll16/Makefile.in new file mode 100644 index 0000000000000000000000000000000000000000..9671dd3d00e681c16bdacfc333de73ad8f567809 --- /dev/null +++ b/dlls/dispdib.dll16/Makefile.in @@ -0,0 +1,15 @@ +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 diff --git a/dlls/gdi32/dispdib.c b/dlls/dispdib.dll16/dispdib.c similarity index 100% rename from dlls/gdi32/dispdib.c rename to dlls/dispdib.dll16/dispdib.c diff --git a/dlls/gdi32/dispdib.spec b/dlls/dispdib.dll16/dispdib.dll16.spec similarity index 100% rename from dlls/gdi32/dispdib.spec rename to dlls/dispdib.dll16/dispdib.dll16.spec diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index dce15b80ba556c86eb5c8ac01bb20758fa640862..fbd2d476f7e30a5e93bb6a23792d1487dccc8490 100644 --- a/dlls/gdi32/Makefile.in +++ b/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 \