Module: wine Branch: master Commit: d62c05f72049c25f317ff3c538c33c5069e11902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62c05f72049c25f317ff3c538...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Mar 4 14:32:56 2009 +0100
user32: Make mouse.drv into a stand-alone 16-bit module.
---
.gitignore | 1 - configure | 10 ++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 3 +-- dlls/mouse.drv16/Makefile.in | 19 +++++++++++++++++++ dlls/{user32/mouse16.c => mouse.drv16/mouse.c} | 6 +++--- .../mouse.drv16.spec} | 6 +++--- dlls/{user32/resources => mouse.drv16}/mouse.rc | 0 dlls/user32/Makefile.in | 9 --------- 9 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/.gitignore b/.gitignore index 9247205..4f084d3 100644 --- a/.gitignore +++ b/.gitignore @@ -47,7 +47,6 @@ dlls/libwinspool.def dlls/libxinput.def dlls/lzexpand.dll16 dlls/mmsystem.dll16 -dlls/mouse.drv16 dlls/msacm.dll16 dlls/mshtml.tlb/mshtml_tlb.tlb dlls/mshtml/nsiface.h diff --git a/configure b/configure index 30f8970..f182c34 100755 --- a/configure +++ b/configure @@ -3908,6 +3908,7 @@ then enable_keyboard_drv16=${enable_keyboard_drv16:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} + enable_mouse_drv16=${enable_mouse_drv16:-no} enable_stress_dll16=${enable_stress_dll16:-no} enable_vdhcp_vxd=${enable_vdhcp_vxd:-no} enable_vmm_vxd=${enable_vmm_vxd:-no} @@ -25786,6 +25787,14 @@ dlls/mountmgr.sys/Makefile: dlls/mountmgr.sys/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mountmgr.sys/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \ + dlls/mouse.drv16/Makefile" +test "x$enable_mouse_drv16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \ + mouse.drv16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/mouse.drv16/Makefile: dlls/mouse.drv16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/mouse.drv16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \ dlls/mpr/Makefile" test "x$enable_mpr" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \ mpr" @@ -28886,6 +28895,7 @@ do "dlls/mmdevldr.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mmdevldr.vxd/Makefile" ;; "dlls/monodebg.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/monodebg.vxd/Makefile" ;; "dlls/mountmgr.sys/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mountmgr.sys/Makefile" ;; + "dlls/mouse.drv16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mouse.drv16/Makefile" ;; "dlls/mpr/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mpr/Makefile" ;; "dlls/mprapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mprapi/Makefile" ;; "dlls/msacm32.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm32.drv/Makefile" ;; diff --git a/configure.ac b/configure.ac index f9b2e04..c5ac0db 100644 --- a/configure.ac +++ b/configure.ac @@ -145,6 +145,7 @@ then enable_keyboard_drv16=${enable_keyboard_drv16:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} + enable_mouse_drv16=${enable_mouse_drv16:-no} enable_stress_dll16=${enable_stress_dll16:-no} enable_vdhcp_vxd=${enable_vdhcp_vxd:-no} enable_vmm_vxd=${enable_vmm_vxd:-no} @@ -2060,6 +2061,7 @@ WINE_CONFIG_MAKEFILE([dlls/mlang/tests/Makefile],[dlls/Maketest.rules],[dlls],[A WINE_CONFIG_MAKEFILE([dlls/mmdevldr.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/monodebg.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mountmgr.sys/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mouse.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mpr/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mprapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/msacm32.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index def2518..84f9363 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -29,7 +29,6 @@ WIN16_FILES = \ krnl386.exe16 \ lzexpand.dll16 \ mmsystem.dll16 \ - mouse.drv16 \ msacm.dll16 \ msvideo.dll16 \ ole2.dll16 \ @@ -120,7 +119,7 @@ shell.dll16: twain.dll16: echo "twain_32.dll" >$@
-ddeml.dll16 mouse.drv16 user.exe16: +ddeml.dll16 user.exe16: echo "user32.dll" >$@
ver.dll16: diff --git a/dlls/mouse.drv16/Makefile.in b/dlls/mouse.drv16/Makefile.in new file mode 100644 index 0000000..982e9b7 --- /dev/null +++ b/dlls/mouse.drv16/Makefile.in @@ -0,0 +1,19 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = mouse.drv16 +IMPORTS = user32 kernel32 + +EXTRADLLFLAGS = -Wb,--subsystem,win16 +EXTRARCFLAGS = -O res16 + +SPEC_SRCS = mouse.drv16.spec + +C_SRCS = mouse.c + +RC_SRCS = mouse.rc + +@MAKE_DLL_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/user32/mouse16.c b/dlls/mouse.drv16/mouse.c similarity index 94% rename from dlls/user32/mouse16.c rename to dlls/mouse.drv16/mouse.c index 7cb653d..b2e074e 100644 --- a/dlls/user32/mouse16.c +++ b/dlls/mouse.drv16/mouse.c @@ -47,7 +47,7 @@ static FARPROC16 DefMouseEventProc; /*********************************************************************** * Inquire (MOUSE.1) */ -WORD WINAPI MOUSE_Inquire(LPMOUSEINFO mouseInfo) +WORD WINAPI Inquire16(LPMOUSEINFO mouseInfo) { mouseInfo->msExist = TRUE; mouseInfo->msRelative = FALSE; @@ -65,7 +65,7 @@ WORD WINAPI MOUSE_Inquire(LPMOUSEINFO mouseInfo) /*********************************************************************** * Enable (MOUSE.2) */ -VOID WINAPI MOUSE_Enable( FARPROC16 proc ) +VOID WINAPI Enable16( FARPROC16 proc ) { DefMouseEventProc = proc; } @@ -73,7 +73,7 @@ VOID WINAPI MOUSE_Enable( FARPROC16 proc ) /*********************************************************************** * Disable (MOUSE.3) */ -VOID WINAPI MOUSE_Disable(VOID) +VOID WINAPI Disable16(void) { DefMouseEventProc = 0; } diff --git a/dlls/user32/mouse.drv.spec b/dlls/mouse.drv16/mouse.drv16.spec similarity index 53% rename from dlls/user32/mouse.drv.spec rename to dlls/mouse.drv16/mouse.drv16.spec index 71d406c..c45cc6a 100644 --- a/dlls/user32/mouse.drv.spec +++ b/dlls/mouse.drv16/mouse.drv16.spec @@ -1,6 +1,6 @@ -1 pascal -ret16 Inquire(ptr) MOUSE_Inquire -2 pascal -ret16 Enable(segptr) MOUSE_Enable -3 pascal -ret16 Disable() MOUSE_Disable +1 pascal -ret16 Inquire(ptr) Inquire16 +2 pascal -ret16 Enable(segptr) Enable16 +3 pascal -ret16 Disable() Disable16 4 stub MOUSEGETINTVECT 5 stub GETSETMOUSEDATA #Control Panel thinks this is implemented if it is available diff --git a/dlls/user32/resources/mouse.rc b/dlls/mouse.drv16/mouse.rc similarity index 100% rename from dlls/user32/resources/mouse.rc rename to dlls/mouse.drv16/mouse.rc diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 511db73..da8cb8c 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -10,7 +10,6 @@ DELAYIMPORTS = imm32
SPEC_SRCS16 = \ ddeml.spec \ - mouse.drv.spec \ user.exe.spec
C_SRCS = \ @@ -67,7 +66,6 @@ C_SRCS16 = \ bidi16.c \ comm16.c \ hook16.c \ - mouse16.c \ network.c \ user16.c \ wnd16.c @@ -77,7 +75,6 @@ RC_SRCS = resources/user32.rc SVG_SRCS = resources/oic_winlogo.svg
RC_SRCS16 = \ - resources/mouse.rc \ resources/version16.rc
EXTRASUBDIRS = resources @@ -89,12 +86,6 @@ 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
-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/mouse.res: resources/mouse.rc - $(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/resources/mouse.rc - resources/version16.res: resources/version16.rc $(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/resources/version16.rc