user32: Make display.drv 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/display.drv16
 dlls/gdi.exe16
 dlls/imm.dll16
 dlls/jscript/jsglobal.tlb

configure

@@ -3903,6 +3903,7 @@ then
     WIN16_INSTALL=""
     enable_comm_drv16=${enable_comm_drv16:-no}
     enable_dispdib_dll16=${enable_dispdib_dll16:-no}
+    enable_display_drv16=${enable_display_drv16:-no}
     enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no}
     enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no}
     enable_monodebg_vxd=${enable_monodebg_vxd:-no}
@@ -25032,6 +25033,14 @@ 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/display.drv16/Makefile"
+test "x$enable_display_drv16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	display.drv16"
+ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+dlls/display.drv16/Makefile: dlls/display.drv16/Makefile.in dlls/Makedll.rules"
+ac_config_files="$ac_config_files dlls/display.drv16/Makefile"
+
+ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dmband/Makefile"
 test "x$enable_dmband" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dmband"
@@ -28774,6 +28783,7 @@ do
     "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/display.drv16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/display.drv16/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

@@ -140,6 +140,7 @@ then
     WIN16_INSTALL=""
     enable_comm_drv16=${enable_comm_drv16:-no}
     enable_dispdib_dll16=${enable_dispdib_dll16:-no}
+    enable_display_drv16=${enable_display_drv16:-no}
     enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no}
     enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no}
     enable_monodebg_vxd=${enable_monodebg_vxd:-no}
@@ -1964,6 +1965,7 @@ WINE_CONFIG_MAKEFILE([dlls/dinput/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL
 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/display.drv16/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 \
-	display.drv16 \
 	gdi.exe16 \
 	imm.dll16 \
 	keyboard.drv16 \
@@ -122,7 +121,7 @@ shell.dll16:
 twain.dll16:
 	echo "twain_32.dll" >$@
 
-ddeml.dll16 display.drv16 keyboard.drv16 mouse.drv16 user.exe16:
+ddeml.dll16 keyboard.drv16 mouse.drv16 user.exe16:
 	echo "user32.dll" >$@
 
 ver.dll16:

dlls/display.drv16/Makefile.in

+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = display.drv16
+IMPORTS   = user32 kernel32
+
+EXTRADLLFLAGS = -Wb,--subsystem,win16
+EXTRARCFLAGS  = -O res16
+
+SPEC_SRCS = display.drv16.spec
+
+C_SRCS = display.c
+
+RC_SRCS = display.rc
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend

dlls/user32/display.c → dlls/display.drv16/display.c

@@ -23,7 +23,6 @@
 #include "wine/debug.h"
 #include "windef.h"
 #include "winbase.h"
-#include "user_private.h"
 #include "wine/winuser16.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(cursor);
@@ -39,7 +38,7 @@ typedef struct tagCURSORINFO16
 /***********************************************************************
  *           Inquire			(DISPLAY.101)
  */
-WORD WINAPI DISPLAY_Inquire(LPCURSORINFO16 lpCursorInfo)
+WORD WINAPI Inquire16(LPCURSORINFO16 lpCursorInfo)
 {
     lpCursorInfo->wXMickeys = 1;
     lpCursorInfo->wYMickeys = 1;
@@ -52,21 +51,21 @@ WORD WINAPI DISPLAY_Inquire(LPCURSORINFO16 lpCursorInfo)
  */
 VOID WINAPI DISPLAY_SetCursor( struct tagCURSORICONINFO *lpCursor )
 {
-    USER_Driver->pSetCursor(lpCursor);
+    FIXME("stub\n" );
 }
 
 /***********************************************************************
  *           MoveCursor			(DISPLAY.103)
  */
-VOID WINAPI DISPLAY_MoveCursor( WORD wAbsX, WORD wAbsY )
+VOID WINAPI MoveCursor16( WORD wAbsX, WORD wAbsY )
 {
-    USER_Driver->pSetCursorPos(wAbsX, wAbsY);
+    SetCursorPos( wAbsX, wAbsY );
 }
 
 /***********************************************************************
  *           CheckCursor                  (DISPLAY.104)
  */
-VOID WINAPI DISPLAY_CheckCursor( void )
+VOID WINAPI CheckCursor16( void )
 {
     TRACE("stub\n" );
 }
@@ -79,7 +78,7 @@ VOID WINAPI DISPLAY_CheckCursor( void )
  * wQueriedResID is the ID USER asks about.
  * lpsResName does often contain "OEMBIN".
  */
-DWORD WINAPI DISPLAY_GetDriverResourceID( WORD wQueriedResID, LPSTR lpsResName )
+DWORD WINAPI GetDriverResourceID16( WORD wQueriedResID, LPSTR lpsResName )
 {
 	if (wQueriedResID == 3)
 		return (DWORD)1;

dlls/user32/display.drv.spec → dlls/display.drv16/display.drv16.spec

@@ -40,15 +40,15 @@
 90  stub Do_Polylines
 91  stub Do_Scanlines
 92  stub SaveScreenBitmap
-101 pascal -ret16 Inquire(ptr) DISPLAY_Inquire
+101 pascal -ret16 Inquire(ptr) Inquire16
 102 pascal -ret16 SetCursor(ptr) DISPLAY_SetCursor
-103 pascal -ret16 MoveCursor(word word) DISPLAY_MoveCursor
-104 pascal -ret16 CheckCursor() DISPLAY_CheckCursor
+103 pascal -ret16 MoveCursor(word word) MoveCursor16
+104 pascal -ret16 CheckCursor() CheckCursor16
 400 stub PExtTextOut
 401 stub PStrBlt
 402 stub RExtTextOut
 403 stub RStrBlt
-450 pascal GetDriverResourceID(word str) DISPLAY_GetDriverResourceID
+450 pascal GetDriverResourceID(word str) GetDriverResourceID16
 500 pascal -ret16 UserRepaintDisable(word) UserRepaintDisable16
 501 stub ORDINAL_ONLY1
 502 stub ORDINAL_ONLY2

dlls/user32/resources/display.rc → dlls/display.drv16/display.rc

@@ -53,5 +53,5 @@
 	0x00000000L		/* inactive caption text */
 }
 
-/* @makedep: resources/oic_hand.ico */
-1 ICON resources/oic_hand.ico
+/* @makedep: oic_hand.ico */
+1 ICON oic_hand.ico

dlls/user32/Makefile.in

@@ -10,7 +10,6 @@ DELAYIMPORTS = imm32
 
 SPEC_SRCS16 = \
 	ddeml.spec \
-	display.drv.spec \
 	keyboard.drv.spec \
 	mouse.drv.spec \
 	user.exe.spec
@@ -68,7 +67,6 @@ C_SRCS = \
 C_SRCS16 = \
 	bidi16.c \
 	comm16.c \
-	display.c \
 	hook16.c \
 	kbd16.c \
 	mouse16.c \
@@ -81,7 +79,6 @@ RC_SRCS = resources/user32.rc
 SVG_SRCS = resources/oic_winlogo.svg
 
 RC_SRCS16 = \
-	resources/display.rc \
 	resources/mouse.rc \
 	resources/version16.rc
 
@@ -94,15 +91,9 @@ EXTRASUBDIRS = resources
 user.exe.spec.o: user.exe.spec resources/version16.res
 	$(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --heap 65520 --main-module $(MODULE) --res resources/version16.res --export $(SRCDIR)/user.exe.spec
 
-display.drv.spec.o: display.drv.spec resources/display.res
-	$(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --main-module $(MODULE) --res resources/display.res --export $(SRCDIR)/display.drv.spec
-
 mouse.drv.spec.o: mouse.drv.spec resources/mouse.res
 	$(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --main-module $(MODULE) --res resources/mouse.res --export $(SRCDIR)/mouse.drv.spec
 
-resources/display.res: resources/display.rc
-	$(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/resources/display.rc
-
 resources/mouse.res: resources/mouse.rc
 	$(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/resources/mouse.rc