March 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : winmm: Make sound.drv into a stand-alone 16-bit module .
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: b0530a5fbdba9d4661c34ed8d773ab7128a1d431 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0530a5fbdba9d4661c34ed8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 23 20:35:00 2009 +0100 winmm: Make sound.drv into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 +++++++++ configure.ac | 1 + dlls/Makefile.in | 3 +-- dlls/sound.drv16/Makefile.in | 15 +++++++++++++++ dlls/{winmm/sound16.c => sound.drv16/sound.c} | 0 .../sound.drv16.spec} | 0 dlls/winmm/Makefile.in | 6 ++---- 8 files changed, 28 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 76e57f5..3619da5 100644 --- a/.gitignore +++ b/.gitignore @@ -86,7 +86,6 @@ dlls/rpcrt4/tests/server_s.c dlls/setupx.dll16 dlls/shdocvw/shdocvw_v1.tlb dlls/shell.dll16 -dlls/sound.drv16 dlls/stdole2.tlb/std_ole_v2.tlb dlls/stdole32.tlb/std_ole_v1.tlb dlls/system.drv16 diff --git a/configure b/configure index 7cd8973..2b50abf 100755 --- a/configure +++ b/configure @@ -27128,6 +27128,14 @@ dlls/softpub/Makefile: dlls/softpub/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/softpub/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/sound.drv16/Makefile" +test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + sound.drv16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/sound.drv16/Makefile: dlls/sound.drv16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/sound.drv16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/spoolss/Makefile" test "x$enable_spoolss" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ spoolss" @@ -29374,6 +29382,7 @@ do "dlls/snmpapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/snmpapi/Makefile" ;; "dlls/snmpapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/snmpapi/tests/Makefile" ;; "dlls/softpub/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/softpub/Makefile" ;; + "dlls/sound.drv16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sound.drv16/Makefile" ;; "dlls/spoolss/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/spoolss/Makefile" ;; "dlls/spoolss/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/spoolss/tests/Makefile" ;; "dlls/stdole2.tlb/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/stdole2.tlb/Makefile" ;; diff --git a/configure.ac b/configure.ac index b1c7377..c3f7008 100644 --- a/configure.ac +++ b/configure.ac @@ -2205,6 +2205,7 @@ WINE_CONFIG_MAKEFILE([dlls/slc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DI WINE_CONFIG_MAKEFILE([dlls/snmpapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/snmpapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/softpub/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/sound.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/spoolss/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/spoolss/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/stdole2.tlb/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 928b6c3..bf7bcc0 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -27,7 +27,6 @@ WIN16_FILES = \ msvideo.dll16 \ setupx.dll16 \ shell.dll16 \ - sound.drv16 \ system.drv16 \ toolhelp.dll16 \ user.exe16 \ @@ -84,7 +83,7 @@ wprocs.dll16: wineps16.drv16: echo "wineps.drv" >$@ -mmsystem.dll16 sound.drv16: +mmsystem.dll16: echo "winmm.dll" >$@ winnls.dll16: diff --git a/dlls/sound.drv16/Makefile.in b/dlls/sound.drv16/Makefile.in new file mode 100644 index 0000000..e61efec --- /dev/null +++ b/dlls/sound.drv16/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = sound.drv16 +IMPORTS = kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,winmm.dll + +SPEC_SRCS = sound.drv16.spec + +C_SRCS = sound.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/winmm/sound16.c b/dlls/sound.drv16/sound.c similarity index 100% rename from dlls/winmm/sound16.c rename to dlls/sound.drv16/sound.c diff --git a/dlls/winmm/sound.drv.spec b/dlls/sound.drv16/sound.drv16.spec similarity index 100% rename from dlls/winmm/sound.drv.spec rename to dlls/sound.drv16/sound.drv16.spec diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index bb92807..a8ebc62 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -19,12 +19,10 @@ C_SRCS = \ C_SRCS16 = \ message16.c \ - mmsystem.c \ - sound16.c + mmsystem.c SPEC_SRCS16 = \ - mmsystem.spec \ - sound.drv.spec + mmsystem.spec RC_SRCS = winmm_res.rc

1 0

Dylan Smith : winhlp32: Invalidate scrollbar when changing pages.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: 2592fea305c9876686c2e17711abbb8b2d90c2aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2592fea305c9876686c2e1771… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Mar 23 10:34:55 2009 -0400 winhlp32: Invalidate scrollbar when changing pages. --- programs/winhlp32/winhelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index b042a5a..bac416e 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -136,7 +136,7 @@ static void WINHELP_SetupText(HWND hTextWnd, WINHELP_WINDOW* win, ULONG relative SendMessage(hTextWnd, EM_SETSCROLLPOS, 0, (LPARAM)&pt); } SendMessage(hTextWnd, WM_SETREDRAW, TRUE, 0); - InvalidateRect(hTextWnd, NULL, TRUE); + RedrawWindow(hTextWnd, NULL, NULL, RDW_FRAME|RDW_INVALIDATE); } /***********************************************************************

1 0

Alexandre Julliard : w32skrnl: Make w32sys. dll into a stand-alone 16-bit module.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: b4d462589029cf70c5fed1039da6c85e5334892c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4d462589029cf70c5fed1039… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 24 09:42:02 2009 +0100 w32skrnl: Make w32sys.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 +++++++++ configure.ac | 1 + dlls/Makefile.in | 4 ---- dlls/w32skrnl/Makefile.in | 7 +------ dlls/w32sys.dll16/Makefile.in | 15 +++++++++++++++ dlls/{w32skrnl => w32sys.dll16}/w32sys.c | 0 .../w32sys.spec => w32sys.dll16/w32sys.dll16.spec} | 0 8 files changed, 26 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index e6a9eda..961dae5 100644 --- a/.gitignore +++ b/.gitignore @@ -92,7 +92,6 @@ dlls/system.drv16 dlls/toolhelp.dll16 dlls/user.exe16 dlls/ver.dll16 -dlls/w32sys.dll16 dlls/wineps16.drv16 dlls/wing.dll16 dlls/winsock.dll16 diff --git a/configure b/configure index 6396199..a4808b5 100755 --- a/configure +++ b/configure @@ -27456,6 +27456,14 @@ dlls/w32skrnl/Makefile: dlls/w32skrnl/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/w32skrnl/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/w32sys.dll16/Makefile" +test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + w32sys.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/w32sys.dll16/Makefile: dlls/w32sys.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/w32sys.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/win32s16.dll16/Makefile" test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ win32s16.dll16" @@ -29439,6 +29447,7 @@ do "dlls/vtdapi.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/vtdapi.vxd/Makefile" ;; "dlls/vwin32.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/vwin32.vxd/Makefile" ;; "dlls/w32skrnl/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/w32skrnl/Makefile" ;; + "dlls/w32sys.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/w32sys.dll16/Makefile" ;; "dlls/win32s16.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/win32s16.dll16/Makefile" ;; "dlls/win87em.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/win87em.dll16/Makefile" ;; "dlls/winaspi.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winaspi.dll16/Makefile" ;; diff --git a/configure.ac b/configure.ac index 6be9680..78ea5db 100644 --- a/configure.ac +++ b/configure.ac @@ -2246,6 +2246,7 @@ WINE_CONFIG_MAKEFILE([dlls/vnetbios.vxd/Makefile],[dlls/Makedll.rules],[dlls],[A WINE_CONFIG_MAKEFILE([dlls/vtdapi.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/vwin32.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/w32skrnl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/w32sys.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/win32s16.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/win87em.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/winaspi.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 0d06f09..e3a9284 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -31,7 +31,6 @@ WIN16_FILES = \ toolhelp.dll16 \ user.exe16 \ ver.dll16 \ - w32sys.dll16 \ wineps16.drv16 \ wing.dll16 \ winsock.dll16 \ @@ -72,9 +71,6 @@ ddeml.dll16 user.exe16: ver.dll16: echo "version.dll" >$@ -w32sys.dll16: - echo "w32skrnl.dll" >$@ - wprocs.dll16: echo "winedos.dll" >$@ diff --git a/dlls/w32skrnl/Makefile.in b/dlls/w32skrnl/Makefile.in index 4f966d3..8067d14 100644 --- a/dlls/w32skrnl/Makefile.in +++ b/dlls/w32skrnl/Makefile.in @@ -5,12 +5,7 @@ VPATH = @srcdir@ MODULE = w32skrnl.dll IMPORTS = kernel32 ntdll -C_SRCS = \ - w32skernel.c \ - w32sys.c - -SPEC_SRCS16 = \ - w32sys.spec +C_SRCS = w32skernel.c @MAKE_DLL_RULES@ diff --git a/dlls/w32sys.dll16/Makefile.in b/dlls/w32sys.dll16/Makefile.in new file mode 100644 index 0000000..c04db41 --- /dev/null +++ b/dlls/w32sys.dll16/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = w32sys.dll16 +IMPORTS = kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,w32skrnl.dll + +SPEC_SRCS = w32sys.dll16.spec + +C_SRCS = w32sys.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/w32skrnl/w32sys.c b/dlls/w32sys.dll16/w32sys.c similarity index 100% rename from dlls/w32skrnl/w32sys.c rename to dlls/w32sys.dll16/w32sys.c diff --git a/dlls/w32skrnl/w32sys.spec b/dlls/w32sys.dll16/w32sys.dll16.spec similarity index 100% rename from dlls/w32skrnl/w32sys.spec rename to dlls/w32sys.dll16/w32sys.dll16.spec

1 0

Alexandre Julliard : w32skrnl: Make win32s16. dll into a stand-alone 16-bit module.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: 2a745fecd235fa049e9b7c7f27ce21e31313f4fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a745fecd235fa049e9b7c7f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 24 09:38:01 2009 +0100 w32skrnl: Make win32s16.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 +++++++++ configure.ac | 1 + dlls/Makefile.in | 3 +-- dlls/w32skrnl/Makefile.in | 6 +----- dlls/win32s16.dll16/Makefile.in | 15 +++++++++++++++ dlls/{w32skrnl => win32s16.dll16}/win32s16.c | 0 .../win32s16.dll16.spec} | 0 8 files changed, 27 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index b2c44c2..e6a9eda 100644 --- a/.gitignore +++ b/.gitignore @@ -93,7 +93,6 @@ dlls/toolhelp.dll16 dlls/user.exe16 dlls/ver.dll16 dlls/w32sys.dll16 -dlls/win32s16.dll16 dlls/wineps16.drv16 dlls/wing.dll16 dlls/winsock.dll16 diff --git a/configure b/configure index e11f83c..6396199 100755 --- a/configure +++ b/configure @@ -27456,6 +27456,14 @@ dlls/w32skrnl/Makefile: dlls/w32skrnl/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/w32skrnl/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/win32s16.dll16/Makefile" +test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + win32s16.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/win32s16.dll16/Makefile: dlls/win32s16.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/win32s16.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/win87em.dll16/Makefile" test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ win87em.dll16" @@ -29431,6 +29439,7 @@ do "dlls/vtdapi.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/vtdapi.vxd/Makefile" ;; "dlls/vwin32.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/vwin32.vxd/Makefile" ;; "dlls/w32skrnl/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/w32skrnl/Makefile" ;; + "dlls/win32s16.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/win32s16.dll16/Makefile" ;; "dlls/win87em.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/win87em.dll16/Makefile" ;; "dlls/winaspi.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winaspi.dll16/Makefile" ;; "dlls/windebug.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/windebug.dll16/Makefile" ;; diff --git a/configure.ac b/configure.ac index 9ee0e88..6be9680 100644 --- a/configure.ac +++ b/configure.ac @@ -2246,6 +2246,7 @@ WINE_CONFIG_MAKEFILE([dlls/vnetbios.vxd/Makefile],[dlls/Makedll.rules],[dlls],[A WINE_CONFIG_MAKEFILE([dlls/vtdapi.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/vwin32.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/w32skrnl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/win32s16.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/win87em.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/winaspi.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/windebug.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 2de197d..0d06f09 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -32,7 +32,6 @@ WIN16_FILES = \ user.exe16 \ ver.dll16 \ w32sys.dll16 \ - win32s16.dll16 \ wineps16.drv16 \ wing.dll16 \ winsock.dll16 \ @@ -73,7 +72,7 @@ ddeml.dll16 user.exe16: ver.dll16: echo "version.dll" >$@ -w32sys.dll16 win32s16.dll16: +w32sys.dll16: echo "w32skrnl.dll" >$@ wprocs.dll16: diff --git a/dlls/w32skrnl/Makefile.in b/dlls/w32skrnl/Makefile.in index 61017ce..4f966d3 100644 --- a/dlls/w32skrnl/Makefile.in +++ b/dlls/w32skrnl/Makefile.in @@ -9,12 +9,8 @@ C_SRCS = \ w32skernel.c \ w32sys.c -C_SRCS16 = \ - win32s16.c - SPEC_SRCS16 = \ - w32sys.spec \ - win32s16.spec + w32sys.spec @MAKE_DLL_RULES@ diff --git a/dlls/win32s16.dll16/Makefile.in b/dlls/win32s16.dll16/Makefile.in new file mode 100644 index 0000000..bb1bdf6 --- /dev/null +++ b/dlls/win32s16.dll16/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = win32s16.dll16 +IMPORTS = kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,w32skrnl.dll + +SPEC_SRCS = win32s16.dll16.spec + +C_SRCS = win32s16.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/w32skrnl/win32s16.c b/dlls/win32s16.dll16/win32s16.c similarity index 100% rename from dlls/w32skrnl/win32s16.c rename to dlls/win32s16.dll16/win32s16.c diff --git a/dlls/w32skrnl/win32s16.spec b/dlls/win32s16.dll16/win32s16.dll16.spec similarity index 100% rename from dlls/w32skrnl/win32s16.spec rename to dlls/win32s16.dll16/win32s16.dll16.spec

1 0

Alexandre Julliard : winnls32: Make winnls. dll into a stand-alone 16-bit module.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: 9bf9eb094102c8e1d3661c88d6cf5e8129bc4dc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf9eb094102c8e1d3661c88d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 24 09:31:03 2009 +0100 winnls32: Make winnls.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 ++++ configure.ac | 1 + dlls/Makefile.in | 4 -- dlls/winnls.dll16/Makefile.in | 15 +++++++ dlls/winnls.dll16/winnls.c | 41 ++++++++++++++++++++ .../winnls.spec => winnls.dll16/winnls.dll16.spec} | 0 dlls/winnls32/Makefile.in | 2 - dlls/winnls32/winnls.c | 19 ++------- dlls/winnls32/winnls32.spec | 4 +- 10 files changed, 73 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 3619da5..b2c44c2 100644 --- a/.gitignore +++ b/.gitignore @@ -96,7 +96,6 @@ dlls/w32sys.dll16 dlls/win32s16.dll16 dlls/wineps16.drv16 dlls/wing.dll16 -dlls/winnls.dll16 dlls/winsock.dll16 dlls/wprocs.dll16 include/activaut.h diff --git a/configure b/configure index 2b50abf..e11f83c 100755 --- a/configure +++ b/configure @@ -27656,6 +27656,14 @@ dlls/winmm/tests/Makefile: dlls/winmm/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/winmm/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/winnls.dll16/Makefile" +test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + winnls.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/winnls.dll16/Makefile: dlls/winnls.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/winnls.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winnls32/Makefile" test "x$enable_winnls32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ winnls32" @@ -29448,6 +29456,7 @@ do "dlls/wininet/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wininet/tests/Makefile" ;; "dlls/winmm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winmm/Makefile" ;; "dlls/winmm/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winmm/tests/Makefile" ;; + "dlls/winnls.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winnls.dll16/Makefile" ;; "dlls/winnls32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winnls32/Makefile" ;; "dlls/winscard/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winscard/Makefile" ;; "dlls/winspool.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winspool.drv/Makefile" ;; diff --git a/configure.ac b/configure.ac index c3f7008..9ee0e88 100644 --- a/configure.ac +++ b/configure.ac @@ -2271,6 +2271,7 @@ WINE_CONFIG_MAKEFILE([dlls/wininet/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL WINE_CONFIG_MAKEFILE([dlls/wininet/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/winmm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/winmm/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) +WINE_CONFIG_MAKEFILE([dlls/winnls.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/winnls32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/winscard/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/winspool.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index bf7bcc0..2de197d 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -35,7 +35,6 @@ WIN16_FILES = \ win32s16.dll16 \ wineps16.drv16 \ wing.dll16 \ - winnls.dll16 \ winsock.dll16 \ wprocs.dll16 @@ -86,9 +85,6 @@ wineps16.drv16: mmsystem.dll16: echo "winmm.dll" >$@ -winnls.dll16: - echo "winnls32.dll" >$@ - winsock.dll16: echo "ws2_32.dll" >$@ diff --git a/dlls/winnls.dll16/Makefile.in b/dlls/winnls.dll16/Makefile.in new file mode 100644 index 0000000..0552321 --- /dev/null +++ b/dlls/winnls.dll16/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = winnls.dll16 +IMPORTS = winnls32 kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,winnls32.dll + +SPEC_SRCS = winnls.dll16.spec + +C_SRCS = winnls.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/winnls.dll16/winnls.c b/dlls/winnls.dll16/winnls.c new file mode 100644 index 0000000..778c254 --- /dev/null +++ b/dlls/winnls.dll16/winnls.c @@ -0,0 +1,41 @@ +/* + * Copyright 2001 Andreas Mohr + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls32.h" +#include "wownt32.h" +#include "wine/winuser16.h" + +/*********************************************************************** + * WINNLSEnableIME (WINNLS.16) + */ +BOOL WINAPI WINNLSEnableIME16( HWND16 hwnd, BOOL enable ) +{ + return WINNLSEnableIME( HWND_32(hwnd), enable ); +} + +/*********************************************************************** + * WINNLSGetEnableStatus (WINNLS.18) + */ +BOOL WINAPI WINNLSGetEnableStatus16( HWND16 hwnd ) +{ + return WINNLSGetEnableStatus( HWND_32(hwnd) ); +} diff --git a/dlls/winnls32/winnls.spec b/dlls/winnls.dll16/winnls.dll16.spec similarity index 100% rename from dlls/winnls32/winnls.spec rename to dlls/winnls.dll16/winnls.dll16.spec diff --git a/dlls/winnls32/Makefile.in b/dlls/winnls32/Makefile.in index ed062d8..ecdfc1c 100644 --- a/dlls/winnls32/Makefile.in +++ b/dlls/winnls32/Makefile.in @@ -9,8 +9,6 @@ IMPORTS = kernel32 C_SRCS = \ winnls.c -SPEC_SRCS16 = winnls.spec - @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/winnls32/winnls.c b/dlls/winnls32/winnls.c index 357b04e..2366815 100644 --- a/dlls/winnls32/winnls.c +++ b/dlls/winnls32/winnls.c @@ -20,7 +20,7 @@ #include "windef.h" #include "winbase.h" -#include "wine/winuser16.h" +#include "winnls32.h" /*********************************************************************** * DllMain (WINNLS.@) @@ -39,26 +39,17 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } /*********************************************************************** - * WINNLSEnableIME (WINNLS.16) + * WINNLSGetEnableStatus (WINNLS32.2) */ -BOOL WINAPI WINNLSEnableIME16(HWND16 hWnd, BOOL fEnable) -{ - /* fake return of previous status. is this what this function should do ? */ - return !fEnable; -} - -/*********************************************************************** - * WINNLSGetEnableStatus (WINNLS.18) - */ -BOOL WINAPI WINNLSGetEnableStatus16(HWND16 hWnd) +BOOL WINAPI WINNLSGetEnableStatus(HWND hWnd) { return FALSE; } /*********************************************************************** - * WINNLS32EnableIME (WINNLS32.1) + * WINNLSEnableIME (WINNLS32.1) */ -BOOL WINAPI WINNLS32EnableIME(HWND hWnd, BOOL fEnable) +BOOL WINAPI WINNLSEnableIME(HWND hWnd, BOOL fEnable) { /* fake return of previous status. is this what this function should do ? */ return !fEnable; diff --git a/dlls/winnls32/winnls32.spec b/dlls/winnls32/winnls32.spec index e2dfdee..18bffea 100644 --- a/dlls/winnls32/winnls32.spec +++ b/dlls/winnls32/winnls32.spec @@ -1,5 +1,5 @@ -1 stdcall WINNLS32EnableIME(long long) -2 stub WINNLS32GetEnableStatus +1 stdcall WINNLSEnableIME(long long) +2 stdcall WINNLSGetEnableStatus(long) 3 stub WINNLS32GetIMEHotKey 21 stub IMP32GetIME 22 stub IMP32QueryIME

1 0

Alexandre Julliard : rasapi32: Make rasapi16. dll into a stand-alone 16-bit module.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: e475ef89fdb870411f73da9e14480d62b5aa3a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e475ef89fdb870411f73da9e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 23 20:34:34 2009 +0100 rasapi32: Make rasapi16.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 +++++++++ configure.ac | 1 + dlls/Makefile.in | 4 ---- dlls/rasapi16.dll16/Makefile.in | 13 +++++++++++++ .../rasapi16.dll16.spec} | 0 dlls/rasapi32/Makefile.in | 2 -- 7 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 8b5e888..76e57f5 100644 --- a/.gitignore +++ b/.gitignore @@ -78,7 +78,6 @@ dlls/qmgr/qmgr_local_i.c dlls/qmgrprxy/qmgrprxy.h dlls/qmgrprxy/qmgrprxy_i.c dlls/qmgrprxy/qmgrprxy_p.c -dlls/rasapi16.dll16 dlls/rpcrt4/epm.h dlls/rpcrt4/epm_c.c dlls/rpcrt4/tests/server.h diff --git a/configure b/configure index fe3756a..7cd8973 100755 --- a/configure +++ b/configure @@ -26800,6 +26800,14 @@ dlls/query/Makefile: dlls/query/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/query/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/rasapi16.dll16/Makefile" +test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + rasapi16.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/rasapi16.dll16/Makefile: dlls/rasapi16.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/rasapi16.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/rasapi32/Makefile" test "x$enable_rasapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ rasapi32" @@ -29325,6 +29333,7 @@ do "dlls/quartz/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/quartz/Makefile" ;; "dlls/quartz/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/quartz/tests/Makefile" ;; "dlls/query/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/query/Makefile" ;; + "dlls/rasapi16.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rasapi16.dll16/Makefile" ;; "dlls/rasapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rasapi32/Makefile" ;; "dlls/rasapi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rasapi32/tests/Makefile" ;; "dlls/rasdlg/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rasdlg/Makefile" ;; diff --git a/configure.ac b/configure.ac index 7616588..b1c7377 100644 --- a/configure.ac +++ b/configure.ac @@ -2164,6 +2164,7 @@ WINE_CONFIG_MAKEFILE([dlls/qmgrprxy/Makefile],[dlls/Makedll.rules],[dlls],[ALL_D WINE_CONFIG_MAKEFILE([dlls/quartz/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/quartz/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/query/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/rasapi16.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/rasapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/rasapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/rasdlg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index ac1767a..928b6c3 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -25,7 +25,6 @@ WIN16_FILES = \ krnl386.exe16 \ mmsystem.dll16 \ msvideo.dll16 \ - rasapi16.dll16 \ setupx.dll16 \ shell.dll16 \ sound.drv16 \ @@ -64,9 +63,6 @@ krnl386.exe16 system.drv16 toolhelp.dll16: msvideo.dll16: echo "msvfw32.dll" >$@ -rasapi16.dll16: - echo "rasapi32.dll" >$@ - setupx.dll16: echo "setupapi.dll" >$@ diff --git a/dlls/rasapi16.dll16/Makefile.in b/dlls/rasapi16.dll16/Makefile.in new file mode 100644 index 0000000..ae51282 --- /dev/null +++ b/dlls/rasapi16.dll16/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = rasapi16.dll16 +IMPORTS = kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,rasapi32.dll + +SPEC_SRCS = rasapi16.dll16.spec + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/rasapi32/rasapi16.spec b/dlls/rasapi16.dll16/rasapi16.dll16.spec similarity index 100% rename from dlls/rasapi32/rasapi16.spec rename to dlls/rasapi16.dll16/rasapi16.dll16.spec diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in index 12bbd65..ce4f34d 100644 --- a/dlls/rasapi32/Makefile.in +++ b/dlls/rasapi32/Makefile.in @@ -8,8 +8,6 @@ IMPORTS = kernel32 C_SRCS = rasapi.c -SPEC_SRCS16 = rasapi16.spec - @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend

1 0

Dylan Smith : richedit: Properly handle lack of semicolon after font name in rtf.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: 78a7ea5a39ac4a12f106b632dc4cac7c869d21de URL: http://source.winehq.org/git/wine.git/?a=commit;h=78a7ea5a39ac4a12f106b632d… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Mar 23 13:24:27 2009 -0400 richedit: Properly handle lack of semicolon after font name in rtf. This was partially handled by ungetting the end group token (i.e. '}') so that it was read again at the proper place. Unfortunately there is a read hook that maintains a stackTop variable, which is decremented when receiving this end group token. Therefore stackTop would get decremented twice, and the rich text file would end prematurely. This is fixed by incrementing the stackTop variable to compensate for it being decremented twice. --- dlls/riched20/reader.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 3df7109..fa1ef79 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -475,6 +475,11 @@ static void RTFUngetToken(RTF_Info *info) info->pushedMinor = info->rtfMinor; info->pushedParam = info->rtfParam; lstrcpyA (info->pushedTextBuf, info->rtfTextBuf); + /* The read hook decrements stackTop on rtfEndGroup, so + * increment the value to compensate for it being decremented + * twice due to the RTFUngetToken. */ + if(RTFCheckCM (info, rtfGroup, rtfEndGroup)) + info->stackTop++; }

1 0

Alexandre Julliard : twain_32: Make twain. dll into a stand-alone 16-bit module.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: 2b67a23fb0c35d87a9979c8110b935f8b07d4e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b67a23fb0c35d87a9979c811… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 23 20:34:02 2009 +0100 twain_32: Make twain.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 +++++++++ configure.ac | 1 + dlls/Makefile.in | 4 ---- dlls/twain.dll16/Makefile.in | 15 +++++++++++++++ .../twain16_main.c => twain.dll16/twain.c} | 1 - .../twain.spec => twain.dll16/twain.dll16.spec} | 0 dlls/twain_32/Makefile.in | 5 ----- 8 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index a5cf0b1..8b5e888 100644 --- a/.gitignore +++ b/.gitignore @@ -92,7 +92,6 @@ dlls/stdole2.tlb/std_ole_v2.tlb dlls/stdole32.tlb/std_ole_v1.tlb dlls/system.drv16 dlls/toolhelp.dll16 -dlls/twain.dll16 dlls/user.exe16 dlls/ver.dll16 dlls/w32sys.dll16 diff --git a/configure b/configure index 2e4b0df..fe3756a 100755 --- a/configure +++ b/configure @@ -27216,6 +27216,14 @@ dlls/traffic/Makefile: dlls/traffic/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/traffic/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/twain.dll16/Makefile" +test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + twain.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/twain.dll16/Makefile: dlls/twain.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/twain.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/twain_32/Makefile" test "x$enable_twain_32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ twain_32" @@ -29369,6 +29377,7 @@ do "dlls/sxs/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sxs/Makefile" ;; "dlls/tapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/tapi32/Makefile" ;; "dlls/traffic/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/traffic/Makefile" ;; + "dlls/twain.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain.dll16/Makefile" ;; "dlls/twain_32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain_32/Makefile" ;; "dlls/twain_32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain_32/tests/Makefile" ;; "dlls/typelib.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/typelib.dll16/Makefile" ;; diff --git a/configure.ac b/configure.ac index d1b2729..7616588 100644 --- a/configure.ac +++ b/configure.ac @@ -2216,6 +2216,7 @@ WINE_CONFIG_MAKEFILE([dlls/svrapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/sxs/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/tapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/traffic/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/twain.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/twain_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/twain_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/typelib.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 2022039..ac1767a 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -31,7 +31,6 @@ WIN16_FILES = \ sound.drv16 \ system.drv16 \ toolhelp.dll16 \ - twain.dll16 \ user.exe16 \ ver.dll16 \ w32sys.dll16 \ @@ -74,9 +73,6 @@ setupx.dll16: shell.dll16: echo "shell32.dll" >$@ -twain.dll16: - echo "twain_32.dll" >$@ - ddeml.dll16 user.exe16: echo "user32.dll" >$@ diff --git a/dlls/twain.dll16/Makefile.in b/dlls/twain.dll16/Makefile.in new file mode 100644 index 0000000..ba8e564 --- /dev/null +++ b/dlls/twain.dll16/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = twain.dll16 +IMPORTS = kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,twain_32.dll + +SPEC_SRCS = twain.dll16.spec + +C_SRCS = twain.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/twain_32/twain16_main.c b/dlls/twain.dll16/twain.c similarity index 98% rename from dlls/twain_32/twain16_main.c rename to dlls/twain.dll16/twain.c index 0a874c3..92ebf57 100644 --- a/dlls/twain_32/twain16_main.c +++ b/dlls/twain.dll16/twain.c @@ -25,7 +25,6 @@ #include "windef.h" #include "winbase.h" #include "twain.h" -#include "twain_i.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(twain); diff --git a/dlls/twain_32/twain.spec b/dlls/twain.dll16/twain.dll16.spec similarity index 100% rename from dlls/twain_32/twain.spec rename to dlls/twain.dll16/twain.dll16.spec diff --git a/dlls/twain_32/Makefile.in b/dlls/twain_32/Makefile.in index 3fc9776..17151c0 100644 --- a/dlls/twain_32/Makefile.in +++ b/dlls/twain_32/Makefile.in @@ -9,11 +9,6 @@ C_SRCS = \ dsm_ctrl.c \ twain32_main.c -C_SRCS16 = \ - twain16_main.c - -SPEC_SRCS16 = twain.spec - @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend

1 0

Alexandre Julliard : wintab32: Make wintab. dll into a stand-alone 16-bit module.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: d540fa2a28a946231088930db2ed01df2d351258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d540fa2a28a946231088930db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 23 20:33:00 2009 +0100 wintab32: Make wintab.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 +++++++++ configure.ac | 1 + dlls/Makefile.in | 4 ---- dlls/wintab.dll16/Makefile.in | 15 +++++++++++++++ .../{wintab32/wintab16.c => wintab.dll16/wintab.c} | 0 .../wintab.spec => wintab.dll16/wintab.dll16.spec} | 0 dlls/wintab32/Makefile.in | 5 ----- 8 files changed, 25 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 0e05d6c..1c9e49c 100644 --- a/.gitignore +++ b/.gitignore @@ -102,7 +102,6 @@ dlls/wineps16.drv16 dlls/wing.dll16 dlls/winnls.dll16 dlls/winsock.dll16 -dlls/wintab.dll16 dlls/wprocs.dll16 include/activaut.h include/activdbg.h diff --git a/configure b/configure index 86716d9..cb0faa0 100755 --- a/configure +++ b/configure @@ -27656,6 +27656,14 @@ dlls/winspool.drv/tests/Makefile: dlls/winspool.drv/tests/Makefile.in dlls/Maket ac_config_files="$ac_config_files dlls/winspool.drv/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/wintab.dll16/Makefile" +test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wintab.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/wintab.dll16/Makefile: dlls/wintab.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/wintab.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wintab32/Makefile" test "x$enable_wintab32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ wintab32" @@ -29408,6 +29416,7 @@ do "dlls/winscard/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winscard/Makefile" ;; "dlls/winspool.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winspool.drv/Makefile" ;; "dlls/winspool.drv/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winspool.drv/tests/Makefile" ;; + "dlls/wintab.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintab.dll16/Makefile" ;; "dlls/wintab32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintab32/Makefile" ;; "dlls/wintrust/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintrust/Makefile" ;; "dlls/wintrust/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintrust/tests/Makefile" ;; diff --git a/configure.ac b/configure.ac index 71baeeb..baa2c95 100644 --- a/configure.ac +++ b/configure.ac @@ -2271,6 +2271,7 @@ WINE_CONFIG_MAKEFILE([dlls/winnls32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_D WINE_CONFIG_MAKEFILE([dlls/winscard/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/winspool.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/winspool.drv/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) +WINE_CONFIG_MAKEFILE([dlls/wintab.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/wintab32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wintrust/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wintrust/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 0600f9a..484d1c8 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -41,7 +41,6 @@ WIN16_FILES = \ wing.dll16 \ winnls.dll16 \ winsock.dll16 \ - wintab.dll16 \ wprocs.dll16 @MAKE_RULES@ @@ -100,9 +99,6 @@ mmsystem.dll16 sound.drv16: winnls.dll16: echo "winnls32.dll" >$@ -wintab.dll16: - echo "wintab32.dll" >$@ - winaspi.dll16: echo "wnaspi32.dll" >$@ diff --git a/dlls/wintab.dll16/Makefile.in b/dlls/wintab.dll16/Makefile.in new file mode 100644 index 0000000..8551164 --- /dev/null +++ b/dlls/wintab.dll16/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = wintab.dll16 +IMPORTS = kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,wintab32.dll + +SPEC_SRCS = wintab.dll16.spec + +C_SRCS = wintab.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/wintab32/wintab16.c b/dlls/wintab.dll16/wintab.c similarity index 100% rename from dlls/wintab32/wintab16.c rename to dlls/wintab.dll16/wintab.c diff --git a/dlls/wintab32/wintab.spec b/dlls/wintab.dll16/wintab.dll16.spec similarity index 100% rename from dlls/wintab32/wintab.spec rename to dlls/wintab.dll16/wintab.dll16.spec diff --git a/dlls/wintab32/Makefile.in b/dlls/wintab32/Makefile.in index 5c2a3c5..b150914 100644 --- a/dlls/wintab32/Makefile.in +++ b/dlls/wintab32/Makefile.in @@ -11,11 +11,6 @@ C_SRCS = \ manager.c \ wintab32.c -C_SRCS16 = \ - wintab16.c - -SPEC_SRCS16 = wintab.spec - @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend

1 0

Alexandre Julliard : wnaspi32: Make winaspi. dll into a stand-alone 16-bit module.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: a2ae7dd06c74adb47fdda261b3377576589647fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2ae7dd06c74adb47fdda261b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 23 20:33:34 2009 +0100 wnaspi32: Make winaspi.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 ++ configure.ac | 1 + dlls/Makefile.in | 4 - dlls/winaspi.dll16/Makefile.in | 15 ++++ dlls/winaspi.dll16/aspi.h | 84 ++++++++++++++++++++ .../winaspi16.c => winaspi.dll16/winaspi.c} | 35 ++++++++- .../winaspi.dll16.spec} | 0 dlls/wnaspi32/Makefile.in | 5 - 9 files changed, 143 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 1c9e49c..a5cf0b1 100644 --- a/.gitignore +++ b/.gitignore @@ -97,7 +97,6 @@ dlls/user.exe16 dlls/ver.dll16 dlls/w32sys.dll16 dlls/win32s16.dll16 -dlls/winaspi.dll16 dlls/wineps16.drv16 dlls/wing.dll16 dlls/winnls.dll16 diff --git a/configure b/configure index cb0faa0..2e4b0df 100755 --- a/configure +++ b/configure @@ -27440,6 +27440,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/winaspi.dll16/Makefile" +test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + winaspi.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/winaspi.dll16/Makefile: dlls/winaspi.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/winaspi.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/windebug.dll16/Makefile" test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ windebug.dll16" @@ -29389,6 +29397,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/winaspi.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winaspi.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" ;; diff --git a/configure.ac b/configure.ac index baa2c95..d1b2729 100644 --- a/configure.ac +++ b/configure.ac @@ -2244,6 +2244,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],[enable_win16]) 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],[enable_win16]) +WINE_CONFIG_MAKEFILE([dlls/winaspi.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/windebug.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) 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]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 484d1c8..2022039 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -36,7 +36,6 @@ WIN16_FILES = \ ver.dll16 \ w32sys.dll16 \ win32s16.dll16 \ - winaspi.dll16 \ wineps16.drv16 \ wing.dll16 \ winnls.dll16 \ @@ -99,9 +98,6 @@ mmsystem.dll16 sound.drv16: winnls.dll16: echo "winnls32.dll" >$@ -winaspi.dll16: - echo "wnaspi32.dll" >$@ - winsock.dll16: echo "ws2_32.dll" >$@ diff --git a/dlls/winaspi.dll16/Makefile.in b/dlls/winaspi.dll16/Makefile.in new file mode 100644 index 0000000..318e321 --- /dev/null +++ b/dlls/winaspi.dll16/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = winaspi.dll16 +IMPORTS = advapi32 kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,wnaspi32.dll + +SPEC_SRCS = winaspi.dll16.spec + +C_SRCS = winaspi.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/winaspi.dll16/aspi.h b/dlls/winaspi.dll16/aspi.h new file mode 100644 index 0000000..a9912ff --- /dev/null +++ b/dlls/winaspi.dll16/aspi.h @@ -0,0 +1,84 @@ +/* ASPI definitions used for both WINASPI and WNASPI32 + * + * Copyright (C) 2000 David Elliott + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_ASPI_H +#define __WINE_ASPI_H + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "pshpack1.h" +#ifdef __cplusplus +extern "C" { +#endif /* #ifdef __cplusplus */ + +/*********** OLD ****************/ + +/* Target status codes */ +#define STATUS_GOOD 0x00 +#define STATUS_CHKCOND 0x02 +#define STATUS_BUSY 0x08 +#define STATUS_RESCONF 0x18 + +#define ASPI_POSTING(prb) (prb->SRB_Flags & 0x1) + +/* WNASPI32/WINASPI defs */ +#define HOST_TO_TARGET(prb) (((prb->SRB_Flags>>3) & 0x3) == 0x2) +#define TARGET_TO_HOST(prb) (((prb->SRB_Flags>>3) & 0x3) == 0x1) +#define NO_DATA_TRANSFERRED(prb) (((prb->SRB_Flags>>3) & 0x3) == 0x3) + + +#define INQUIRY_VENDOR 8 + +#define MUSTEK_SCSI_AREA_AND_WINDOWS 0x04 +#define MUSTEK_SCSI_READ_SCANNED_DATA 0x08 +#define MUSTEK_SCSI_GET_IMAGE_STATUS 0x0f +#define MUSTEK_SCSI_ADF_AND_BACKTRACE 0x10 +#define MUSTEK_SCSI_CCD_DISTANCE 0x11 +#define MUSTEK_SCSI_START_STOP 0x1b + +#define CMD_TEST_UNIT_READY 0x00 +#define CMD_REQUEST_SENSE 0x03 +#define CMD_INQUIRY 0x12 + +/* scanner commands - just for debug */ +#define CMD_SCAN_GET_DATA_BUFFER_STATUS 0x34 +#define CMD_SCAN_GET_WINDOW 0x25 +#define CMD_SCAN_OBJECT_POSITION 0x31 +#define CMD_SCAN_READ 0x28 +#define CMD_SCAN_RELEASE_UNIT 0x17 +#define CMD_SCAN_RESERVE_UNIT 0x16 +#define CMD_SCAN_SCAN 0x1b +#define CMD_SCAN_SEND 0x2a +#define CMD_SCAN_CHANGE_DEFINITION 0x40 + +#define INQURIY_CMDLEN 6 +#define INQURIY_REPLY_LEN 96 +#define INQUIRY_VENDOR 8 + +#define SENSE_BUFFER(prb) (&prb->CDBByte[prb->SRB_CDBLen]) + +#ifdef __cplusplus +} +#endif /* #ifdef __cplusplus */ +#include "poppack.h" + +#endif diff --git a/dlls/wnaspi32/winaspi16.c b/dlls/winaspi.dll16/winaspi.c similarity index 90% rename from dlls/wnaspi32/winaspi16.c rename to dlls/winaspi.dll16/winaspi.c index 7429780..9ef9974 100644 --- a/dlls/wnaspi32/winaspi16.c +++ b/dlls/winaspi.dll16/winaspi.c @@ -37,7 +37,6 @@ #include "winreg.h" #include "wownt32.h" #include "aspi.h" -#include "winescsi.h" #include "wine/winaspi.h" #include "wine/debug.h" @@ -50,11 +49,45 @@ #ifdef linux +/* Copy of info from 2.2.x kernel */ +#define SG_MAX_SENSE 16 /* too little, unlikely to change in 2.2.x */ + +struct sg_header +{ + int pack_len; /* [o] reply_len (ie useless), ignored as input */ + int reply_len; /* [i] max length of expected reply (inc. sg_header) */ + int pack_id; /* [io] id number of packet (use ints >= 0) */ + int result; /* [o] 0==ok, else (+ve) Unix errno (best ignored) */ + unsigned int twelve_byte:1; + /* [i] Force 12 byte command length for group 6 & 7 commands */ + unsigned int target_status:5; /* [o] scsi status from target */ + unsigned int host_status:8; /* [o] host status (see "DID" codes) */ + unsigned int driver_status:8; /* [o] driver status+suggestion */ + unsigned int other_flags:10; /* unused */ + unsigned char sense_buffer[SG_MAX_SENSE]; /* [o] Output in 3 cases: + when target_status is CHECK_CONDITION or + when target_status is COMMAND_TERMINATED or + when (driver_status & DRIVER_SENSE) is true. */ +}; /* This structure is 36 bytes long on i386 */ + +#define SCSI_OFF sizeof(struct sg_header) + #define PTR_TO_LIN(ptr,mode) \ ((mode) == ASPI_DOS ? ((void*)(((unsigned int)SELECTOROF(ptr) << 4) + OFFSETOF(ptr))) : MapSL(ptr)) WINE_DEFAULT_DEBUG_CHANNEL(aspi); +/* Just a container for seeing what devices are open */ +struct ASPI_DEVICE_INFO { + struct ASPI_DEVICE_INFO * next; + int fd; + int hostId; + int target; + int lun; +}; + +typedef struct ASPI_DEVICE_INFO ASPI_DEVICE_INFO; + static ASPI_DEVICE_INFO *ASPI_open_devices = NULL; static FARPROC16 ASPIChainFunc = NULL; diff --git a/dlls/wnaspi32/winaspi.spec b/dlls/winaspi.dll16/winaspi.dll16.spec similarity index 100% rename from dlls/wnaspi32/winaspi.spec rename to dlls/winaspi.dll16/winaspi.dll16.spec diff --git a/dlls/wnaspi32/Makefile.in b/dlls/wnaspi32/Makefile.in index 12707b5..36cbf72 100644 --- a/dlls/wnaspi32/Makefile.in +++ b/dlls/wnaspi32/Makefile.in @@ -10,11 +10,6 @@ C_SRCS = \ aspi.c \ winaspi32.c -C_SRCS16 = \ - winaspi16.c - -SPEC_SRCS16 = winaspi.spec - @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend

1 0