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

Alexandre Julliard : kernel32: Make windebug. dll into a stand-alone 16-bit module.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: 6cebffcd70e86b43b1f0eb8d990136c8feefc9a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cebffcd70e86b43b1f0eb8d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 14:24:30 2009 +0100 kernel32: Make windebug.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 10 ++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 3 +-- dlls/kernel32/Makefile.in | 4 +--- dlls/windebug.dll16/Makefile.in | 15 +++++++++++++++ dlls/{kernel32 => windebug.dll16}/windebug.c | 0 .../windebug.dll16.spec} | 0 8 files changed, 29 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3ba4b2e..e2f73cc 100644 --- a/.gitignore +++ b/.gitignore @@ -118,7 +118,6 @@ dlls/ver.dll16 dlls/w32sys.dll16 dlls/win32s16.dll16 dlls/winaspi.dll16 -dlls/windebug.dll16 dlls/wineps16.drv16 dlls/wing.dll16 dlls/winnls.dll16 diff --git a/configure b/configure index c8ffeba..605d713 100755 --- a/configure +++ b/configure @@ -3914,6 +3914,7 @@ then enable_vwin32_vxd=${enable_vwin32_vxd:-no} enable_w32skrnl=${enable_w32skrnl:-no} enable_win87em_dll16=${enable_win87em_dll16:-no} + enable_windebug_dll16=${enable_windebug_dll16:-no} enable_winedos=${enable_winedos:-no} enable_winevdm=${enable_winevdm:-no} enable_winhelp_exe16=${enable_winhelp_exe16:-no} @@ -27102,6 +27103,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/windebug.dll16/Makefile" +test "x$enable_windebug_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + windebug.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/windebug.dll16/Makefile: dlls/windebug.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/windebug.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/winealsa.drv/Makefile" test "x$enable_winealsa_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ winealsa.drv" @@ -29015,6 +29024,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/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" ;; "dlls/winecoreaudio.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winecoreaudio.drv/Makefile" ;; diff --git a/configure.ac b/configure.ac index cd50b49..41ba254 100644 --- a/configure.ac +++ b/configure.ac @@ -151,6 +151,7 @@ then enable_vwin32_vxd=${enable_vwin32_vxd:-no} enable_w32skrnl=${enable_w32skrnl:-no} enable_win87em_dll16=${enable_win87em_dll16:-no} + enable_windebug_dll16=${enable_windebug_dll16:-no} enable_winedos=${enable_winedos:-no} enable_winevdm=${enable_winevdm:-no} enable_winhelp_exe16=${enable_winhelp_exe16:-no} @@ -2221,6 +2222,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]) 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]) +WINE_CONFIG_MAKEFILE([dlls/windebug.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) 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]) WINE_CONFIG_MAKEFILE([dlls/winecoreaudio.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index cd6103b..fe71dc6 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -57,7 +57,6 @@ WIN16_FILES = \ w32sys.dll16 \ win32s16.dll16 \ winaspi.dll16 \ - windebug.dll16 \ wineps16.drv16 \ wing.dll16 \ winnls.dll16 \ @@ -88,7 +87,7 @@ dispdib.dll16 gdi.exe16 wing.dll16: imm.dll16: echo "imm32.dll" >$@ -krnl386.exe16 system.drv16 toolhelp.dll16 windebug.dll16: +krnl386.exe16 system.drv16 toolhelp.dll16: echo "kernel32.dll" >$@ lzexpand.dll16: diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index f782634..d7b91d3 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -12,8 +12,7 @@ EXTRADLLFLAGS = -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000 SPEC_SRCS16 = \ krnl386.exe.spec \ system.drv.spec \ - toolhelp.spec \ - windebug.spec + toolhelp.spec C_SRCS = \ actctx.c \ @@ -68,7 +67,6 @@ C_SRCS = \ virtual.c \ volume.c \ vxd.c \ - windebug.c \ wowthunk.c C_SRCS16 = \ diff --git a/dlls/windebug.dll16/Makefile.in b/dlls/windebug.dll16/Makefile.in new file mode 100644 index 0000000..5615a2c --- /dev/null +++ b/dlls/windebug.dll16/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = windebug.dll16 +IMPORTS = kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16 + +SPEC_SRCS = windebug.dll16.spec + +C_SRCS = windebug.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/kernel32/windebug.c b/dlls/windebug.dll16/windebug.c similarity index 100% rename from dlls/kernel32/windebug.c rename to dlls/windebug.dll16/windebug.c diff --git a/dlls/kernel32/windebug.spec b/dlls/windebug.dll16/windebug.dll16.spec similarity index 100% rename from dlls/kernel32/windebug.spec rename to dlls/windebug.dll16/windebug.dll16.spec

1 0

Alexandre Julliard : kernel32: Make win87em. dll into a stand-alone 16-bit module.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: a9e81624b7733d33b75b172c1c23acf490eb3576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e81624b7733d33b75b172c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 14:19:49 2009 +0100 kernel32: Make win87em.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 10 ++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 3 +-- dlls/kernel32/Makefile.in | 4 +--- dlls/kernel32/win87em.spec | 4 ---- dlls/win87em.dll16/Makefile.in | 15 +++++++++++++++ dlls/{kernel32 => win87em.dll16}/win87em.c | 23 ++++++++++------------- dlls/win87em.dll16/win87em.dll16.spec | 4 ++++ 9 files changed, 43 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 908f8ae..52d76d4 100644 --- a/.gitignore +++ b/.gitignore @@ -118,7 +118,6 @@ dlls/user.exe16 dlls/ver.dll16 dlls/w32sys.dll16 dlls/win32s16.dll16 -dlls/win87em.dll16 dlls/winaspi.dll16 dlls/windebug.dll16 dlls/wineps16.drv16 diff --git a/configure b/configure index 362d19a..a335b24 100755 --- a/configure +++ b/configure @@ -3912,6 +3912,7 @@ then enable_vtdapi_vxd=${enable_vtdapi_vxd:-no} enable_vwin32_vxd=${enable_vwin32_vxd:-no} enable_w32skrnl=${enable_w32skrnl:-no} + enable_win87em_dll16=${enable_win87em_dll16:-no} enable_winedos=${enable_winedos:-no} enable_winevdm=${enable_winevdm:-no} enable_winhelp_exe16=${enable_winhelp_exe16:-no} @@ -27084,6 +27085,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/win87em.dll16/Makefile" +test "x$enable_win87em_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + win87em.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +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/winealsa.drv/Makefile" test "x$enable_winealsa_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ winealsa.drv" @@ -28995,6 +29004,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/win87em.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/win87em.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" ;; "dlls/winecoreaudio.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winecoreaudio.drv/Makefile" ;; diff --git a/configure.ac b/configure.ac index f738f8d..133f239 100644 --- a/configure.ac +++ b/configure.ac @@ -149,6 +149,7 @@ then enable_vtdapi_vxd=${enable_vtdapi_vxd:-no} enable_vwin32_vxd=${enable_vwin32_vxd:-no} enable_w32skrnl=${enable_w32skrnl:-no} + enable_win87em_dll16=${enable_win87em_dll16:-no} enable_winedos=${enable_winedos:-no} enable_winevdm=${enable_winevdm:-no} enable_winhelp_exe16=${enable_winhelp_exe16:-no} @@ -2217,6 +2218,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]) WINE_CONFIG_MAKEFILE([dlls/vwin32.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) 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]) 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]) WINE_CONFIG_MAKEFILE([dlls/winecoreaudio.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index eeef5ff..8b1c14f 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -57,7 +57,6 @@ WIN16_FILES = \ ver.dll16 \ w32sys.dll16 \ win32s16.dll16 \ - win87em.dll16 \ winaspi.dll16 \ windebug.dll16 \ wineps16.drv16 \ @@ -90,7 +89,7 @@ dispdib.dll16 gdi.exe16 wing.dll16: imm.dll16: echo "imm32.dll" >$@ -comm.drv16 krnl386.exe16 system.drv16 toolhelp.dll16 win87em.dll16 windebug.dll16: +comm.drv16 krnl386.exe16 system.drv16 toolhelp.dll16 windebug.dll16: echo "kernel32.dll" >$@ lzexpand.dll16: diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 467a576..3dec8f9 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -14,7 +14,6 @@ SPEC_SRCS16 = \ krnl386.exe.spec \ system.drv.spec \ toolhelp.spec \ - win87em.spec \ windebug.spec C_SRCS = \ @@ -78,8 +77,7 @@ C_SRCS16 = \ error16.c \ kernel16.c \ registry16.c \ - toolhelp16.c \ - win87em.c + toolhelp16.c RC_SRCS = kernel.rc diff --git a/dlls/kernel32/win87em.spec b/dlls/kernel32/win87em.spec deleted file mode 100644 index 968063e..0000000 --- a/dlls/kernel32/win87em.spec +++ /dev/null @@ -1,4 +0,0 @@ -1 pascal -register _fpMath() WIN87_fpmath -3 pascal -ret16 __WinEm87Info(ptr word) WIN87_WinEm87Info -4 pascal -ret16 __WinEm87Restore(ptr word) WIN87_WinEm87Restore -5 pascal -ret16 __WinEm87Save(ptr word) WIN87_WinEm87Save diff --git a/dlls/win87em.dll16/Makefile.in b/dlls/win87em.dll16/Makefile.in new file mode 100644 index 0000000..929361d --- /dev/null +++ b/dlls/win87em.dll16/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = win87em.dll16 +IMPORTS = kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16 + +SPEC_SRCS = win87em.dll16.spec + +C_SRCS = win87em.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/kernel32/win87em.c b/dlls/win87em.dll16/win87em.c similarity index 90% rename from dlls/kernel32/win87em.c rename to dlls/win87em.dll16/win87em.c index 416d055..35a04c4 100644 --- a/dlls/kernel32/win87em.c +++ b/dlls/win87em.dll16/win87em.c @@ -57,7 +57,7 @@ static WORD StackTop = 175; static WORD StackBottom = 0; static WORD Inthandler02hVar = 1; -static void WIN87_ClearCtrlWord( CONTEXT86 *context ) +static void WIN87_ClearCtrlWord( CONTEXT *context ) { context->Eax &= ~0xffff; /* set AX to 0 */ if (Installed) @@ -69,7 +69,7 @@ static void WIN87_ClearCtrlWord( CONTEXT86 *context ) StatusWord_3 = StatusWord_2 = 0; } -static void WIN87_SetCtrlWord( CONTEXT86 *context ) +static void WIN87_SetCtrlWord( CONTEXT *context ) { CtrlWord_1 = LOWORD(context->Eax); context->Eax &= ~0x00c3; @@ -82,7 +82,7 @@ static void WIN87_SetCtrlWord( CONTEXT86 *context ) CtrlWord_2 = LOWORD(context->Eax); } -static void WIN87_Init( CONTEXT86 *context ) +static void WIN87_Init( CONTEXT *context ) { if (Installed) { #ifdef __i386__ @@ -99,12 +99,11 @@ static void WIN87_Init( CONTEXT86 *context ) /*********************************************************************** * _fpMath (WIN87EM.1) */ -void WINAPI WIN87_fpmath( CONTEXT86 *context ) +void WINAPI _fpMath( CONTEXT *context ) { - TRACE("(cs:eip=%x:%x es=%x bx=%04x ax=%04x dx=%04x)\n", - (WORD)context->SegCs, context->Eip, - (WORD)context->SegEs, (WORD)context->Ebx, - (WORD)context->Eax, (WORD)context->Edx ); + TRACE("(cs:eip=%04x:%04x es=%04x bx=%04x ax=%04x dx=%04x)\n", + context->SegCs, context->Eip, context->SegEs, context->Ebx, + context->Eax, context->Edx ); switch(LOWORD(context->Ebx)) { @@ -224,8 +223,7 @@ void WINAPI WIN87_fpmath( CONTEXT86 *context ) /*********************************************************************** * __WinEm87Info (WIN87EM.3) */ -void WINAPI WIN87_WinEm87Info(struct Win87EmInfoStruct *pWIS, - int cbWin87EmInfoStruct) +void WINAPI __WinEm87Info(struct Win87EmInfoStruct *pWIS, int cbWin87EmInfoStruct) { FIXME("(%p,%d), stub !\n",pWIS,cbWin87EmInfoStruct); } @@ -233,8 +231,7 @@ void WINAPI WIN87_WinEm87Info(struct Win87EmInfoStruct *pWIS, /*********************************************************************** * __WinEm87Restore (WIN87EM.4) */ -void WINAPI WIN87_WinEm87Restore(void *pWin87EmSaveArea, - int cbWin87EmSaveArea) +void WINAPI __WinEm87Restore(void *pWin87EmSaveArea, int cbWin87EmSaveArea) { FIXME("(%p,%d), stub !\n", pWin87EmSaveArea,cbWin87EmSaveArea); @@ -243,7 +240,7 @@ void WINAPI WIN87_WinEm87Restore(void *pWin87EmSaveArea, /*********************************************************************** * __WinEm87Save (WIN87EM.5) */ -void WINAPI WIN87_WinEm87Save(void *pWin87EmSaveArea, int cbWin87EmSaveArea) +void WINAPI __WinEm87Save(void *pWin87EmSaveArea, int cbWin87EmSaveArea) { FIXME("(%p,%d), stub !\n", pWin87EmSaveArea,cbWin87EmSaveArea); diff --git a/dlls/win87em.dll16/win87em.dll16.spec b/dlls/win87em.dll16/win87em.dll16.spec new file mode 100644 index 0000000..0b9024c --- /dev/null +++ b/dlls/win87em.dll16/win87em.dll16.spec @@ -0,0 +1,4 @@ +1 pascal -register _fpMath() _fpMath +3 pascal -ret16 __WinEm87Info(ptr word) __WinEm87Info +4 pascal -ret16 __WinEm87Restore(ptr word) __WinEm87Restore +5 pascal -ret16 __WinEm87Save(ptr word) __WinEm87Save

1 0

Alexandre Julliard : kernel32: Make comm. drv into a stand-alone 16-bit module.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: 41600a82267567713e6c00098798ff65f16058a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41600a82267567713e6c00098… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 14:22:24 2009 +0100 kernel32: Make comm.drv into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 10 ++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 3 +-- dlls/comm.drv16/Makefile.in | 13 +++++++++++++ .../comm.drv.spec => comm.drv16/comm.drv16.spec} | 0 dlls/kernel32/Makefile.in | 1 - 7 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 52d76d4..3ba4b2e 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,6 @@ dlls/advapi32/svcctl.h dlls/advapi32/svcctl_c.c dlls/atl/atliface.h dlls/avifile.dll16 -dlls/comm.drv16 dlls/commdlg.dll16 dlls/compobj.dll16 dlls/ctl3d.dll16 diff --git a/configure b/configure index a335b24..c8ffeba 100755 --- a/configure +++ b/configure @@ -3901,6 +3901,7 @@ if test "x$enable_win16" != "xyes" then WIN16_FILES="" WIN16_INSTALL="" + enable_comm_drv16=${enable_comm_drv16:-no} enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} @@ -24557,6 +24558,14 @@ dlls/comdlg32/tests/Makefile: dlls/comdlg32/tests/Makefile.in dlls/Maketest.rule ac_config_files="$ac_config_files dlls/comdlg32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/comm.drv16/Makefile" +test "x$enable_comm_drv16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + comm.drv16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/comm.drv16/Makefile: dlls/comm.drv16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/comm.drv16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/compstui/Makefile" test "x$enable_compstui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ compstui" @@ -28688,6 +28697,7 @@ do "dlls/comctl32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/comctl32/tests/Makefile" ;; "dlls/comdlg32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/comdlg32/Makefile" ;; "dlls/comdlg32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/comdlg32/tests/Makefile" ;; + "dlls/comm.drv16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/comm.drv16/Makefile" ;; "dlls/compstui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/compstui/Makefile" ;; "dlls/credui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/credui/Makefile" ;; "dlls/credui/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/credui/tests/Makefile" ;; diff --git a/configure.ac b/configure.ac index 133f239..cd50b49 100644 --- a/configure.ac +++ b/configure.ac @@ -138,6 +138,7 @@ if test "x$enable_win16" != "xyes" then WIN16_FILES="" WIN16_INSTALL="" + enable_comm_drv16=${enable_comm_drv16:-no} enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} @@ -1902,6 +1903,7 @@ WINE_CONFIG_MAKEFILE([dlls/comctl32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_D WINE_CONFIG_MAKEFILE([dlls/comctl32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/comdlg32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/comdlg32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) +WINE_CONFIG_MAKEFILE([dlls/comm.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/compstui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/credui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/credui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 8b1c14f..cd6103b 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -19,7 +19,6 @@ DOCSUBDIRS = $(DLLSUBDIRS) WIN16_FILES = \ avifile.dll16 \ - comm.drv16 \ commdlg.dll16 \ compobj.dll16 \ ctl3d.dll16 \ @@ -89,7 +88,7 @@ dispdib.dll16 gdi.exe16 wing.dll16: imm.dll16: echo "imm32.dll" >$@ -comm.drv16 krnl386.exe16 system.drv16 toolhelp.dll16 windebug.dll16: +krnl386.exe16 system.drv16 toolhelp.dll16 windebug.dll16: echo "kernel32.dll" >$@ lzexpand.dll16: diff --git a/dlls/comm.drv16/Makefile.in b/dlls/comm.drv16/Makefile.in new file mode 100644 index 0000000..481b933 --- /dev/null +++ b/dlls/comm.drv16/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = comm.drv16 +IMPORTS = kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16 + +SPEC_SRCS = comm.drv16.spec + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/kernel32/comm.drv.spec b/dlls/comm.drv16/comm.drv16.spec similarity index 100% rename from dlls/kernel32/comm.drv.spec rename to dlls/comm.drv16/comm.drv16.spec diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 3dec8f9..f782634 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -10,7 +10,6 @@ EXTRALIBS = @COREFOUNDATIONLIB@ @LIBPOLL@ EXTRADLLFLAGS = -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000 SPEC_SRCS16 = \ - comm.drv.spec \ krnl386.exe.spec \ system.drv.spec \ toolhelp.spec \

1 0

Alexandre Julliard : kernel32: Make stress. dll into a stand-alone 16-bit module.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: e4085d75dfd6463c745ace594fdd215a9ae30989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4085d75dfd6463c745ace594… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 14:16:18 2009 +0100 kernel32: Make stress.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 10 ++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 3 +-- dlls/kernel32/Makefile.in | 2 -- dlls/stress.dll16/Makefile.in | 15 +++++++++++++++ dlls/{kernel32 => stress.dll16}/stress.c | 0 .../stress.spec => stress.dll16/stress.dll16.spec} | 0 8 files changed, 28 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 868b785..908f8ae 100644 --- a/.gitignore +++ b/.gitignore @@ -110,7 +110,6 @@ dlls/sound.drv16 dlls/stdole2.tlb/std_ole_v2.tlb dlls/stdole32.tlb/std_ole_v1.tlb dlls/storage.dll16 -dlls/stress.dll16 dlls/system.drv16 dlls/toolhelp.dll16 dlls/twain.dll16 diff --git a/configure b/configure index dd91eb8..362d19a 100755 --- a/configure +++ b/configure @@ -3904,6 +3904,7 @@ then enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} + enable_stress_dll16=${enable_stress_dll16:-no} enable_vdhcp_vxd=${enable_vdhcp_vxd:-no} enable_vmm_vxd=${enable_vmm_vxd:-no} enable_vnbt_vxd=${enable_vnbt_vxd:-no} @@ -26827,6 +26828,14 @@ dlls/sti/Makefile: dlls/sti/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/sti/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/stress.dll16/Makefile" +test "x$enable_stress_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + stress.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/stress.dll16/Makefile: dlls/stress.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/stress.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/strmiids/Makefile" test "x$enable_strmiids" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ strmiids" @@ -28954,6 +28963,7 @@ do "dlls/stdole2.tlb/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/stdole2.tlb/Makefile" ;; "dlls/stdole32.tlb/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/stdole32.tlb/Makefile" ;; "dlls/sti/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sti/Makefile" ;; + "dlls/stress.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/stress.dll16/Makefile" ;; "dlls/strmiids/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/strmiids/Makefile" ;; "dlls/svrapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/svrapi/Makefile" ;; "dlls/sxs/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sxs/Makefile" ;; diff --git a/configure.ac b/configure.ac index 0f7927e..f738f8d 100644 --- a/configure.ac +++ b/configure.ac @@ -141,6 +141,7 @@ then enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} + enable_stress_dll16=${enable_stress_dll16:-no} enable_vdhcp_vxd=${enable_vdhcp_vxd:-no} enable_vmm_vxd=${enable_vmm_vxd:-no} enable_vnbt_vxd=${enable_vnbt_vxd:-no} @@ -2184,6 +2185,7 @@ WINE_CONFIG_MAKEFILE([dlls/spoolss/tests/Makefile],[dlls/Maketest.rules],[dlls], WINE_CONFIG_MAKEFILE([dlls/stdole2.tlb/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/stdole32.tlb/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/sti/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/stress.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/strmiids/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) WINE_CONFIG_MAKEFILE([dlls/svrapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/sxs/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index b35daf0..eeef5ff 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -49,7 +49,6 @@ WIN16_FILES = \ shell.dll16 \ sound.drv16 \ storage.dll16 \ - stress.dll16 \ system.drv16 \ toolhelp.dll16 \ twain.dll16 \ @@ -91,7 +90,7 @@ dispdib.dll16 gdi.exe16 wing.dll16: imm.dll16: echo "imm32.dll" >$@ -comm.drv16 krnl386.exe16 stress.dll16 system.drv16 toolhelp.dll16 win87em.dll16 windebug.dll16: +comm.drv16 krnl386.exe16 system.drv16 toolhelp.dll16 win87em.dll16 windebug.dll16: echo "kernel32.dll" >$@ lzexpand.dll16: diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 49e6caf..467a576 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -12,7 +12,6 @@ EXTRADLLFLAGS = -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000 SPEC_SRCS16 = \ comm.drv.spec \ krnl386.exe.spec \ - stress.spec \ system.drv.spec \ toolhelp.spec \ win87em.spec \ @@ -56,7 +55,6 @@ C_SRCS = \ resource16.c \ selector.c \ snoop16.c \ - stress.c \ string.c \ sync.c \ syslevel.c \ diff --git a/dlls/stress.dll16/Makefile.in b/dlls/stress.dll16/Makefile.in new file mode 100644 index 0000000..1d45fc0 --- /dev/null +++ b/dlls/stress.dll16/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = stress.dll16 +IMPORTS = kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16 + +SPEC_SRCS = stress.dll16.spec + +C_SRCS = stress.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/kernel32/stress.c b/dlls/stress.dll16/stress.c similarity index 100% rename from dlls/kernel32/stress.c rename to dlls/stress.dll16/stress.c diff --git a/dlls/kernel32/stress.spec b/dlls/stress.dll16/stress.dll16.spec similarity index 100% rename from dlls/kernel32/stress.spec rename to dlls/stress.dll16/stress.dll16.spec

1 0

Tony Wasserka : d3dx9: Implement ID3DXSprite_OnLostDevice/OnResetDevice.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: bdd55d0875bcb16180df8cf2349b32fe2aee8fd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdd55d0875bcb16180df8cf23… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Wed Mar 4 12:49:23 2009 +0100 d3dx9: Implement ID3DXSprite_OnLostDevice/OnResetDevice. --- dlls/d3dx9_36/sprite.c | 39 ++++++++++++++++++++++++++++++--------- 1 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index 3699508..41767d8 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -410,15 +410,39 @@ static HRESULT WINAPI ID3DXSpriteImpl_End(LPD3DXSPRITE iface) static HRESULT WINAPI ID3DXSpriteImpl_OnLostDevice(LPD3DXSPRITE iface) { ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + TRACE("(%p)\n", This); + + if(This->stateblock) IDirect3DStateBlock9_Release(This->stateblock); + if(This->vdecl) IDirect3DVertexDeclaration9_Release(This->vdecl); + This->vdecl=NULL; + This->stateblock=NULL; + + /* Reset some variables */ + ID3DXSprite_OnResetDevice(iface); + + return D3D_OK; } static HRESULT WINAPI ID3DXSpriteImpl_OnResetDevice(LPD3DXSPRITE iface) { ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + int i; + + TRACE("(%p)\n", This); + + for(i=0;i<This->sprite_count;i++) + if(This->sprites[i].texture) + IDirect3DTexture9_Release(This->sprites[i].texture); + + This->sprite_count=0; + + This->flags=0; + This->ready=FALSE; + + /* keep matrices */ + /* device objects get restored on Begin */ + + return D3D_OK; } static const ID3DXSpriteVtbl D3DXSprite_Vtbl = @@ -465,18 +489,15 @@ HRESULT WINAPI D3DXCreateSprite(LPDIRECT3DDEVICE9 device, LPD3DXSPRITE *sprite) D3DXMatrixIdentity(&object->transform); D3DXMatrixIdentity(&object->view); - object->flags=0; - object->ready=FALSE; - IDirect3DDevice9_GetDeviceCaps(device, &caps); object->texfilter_caps=caps.TextureFilterCaps; object->maxanisotropy=caps.MaxAnisotropy; object->alphacmp_caps=caps.AlphaCmpCaps; + ID3DXSprite_OnResetDevice((ID3DXSprite*)object); + object->sprites=NULL; - object->sprite_count=0; object->allocated_sprites=0; - *sprite=(ID3DXSprite*)object; return D3D_OK;

1 0

Alexandre Julliard : winebuild: Don' t output the relay table if no entry point needs it.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: fda642d075d0888b199983bfd48e4e150a38fb14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda642d075d0888b199983bfd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 14:07:49 2009 +0100 winebuild: Don't output the relay table if no entry point needs it. --- tools/winebuild/spec32.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 24580d4..2e8cf12 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -308,8 +308,7 @@ void output_exports( DLLSPEC *spec ) /* output relays */ - /* we only support relay debugging on i386 and x86_64 */ - if (target_cpu != CPU_x86 && target_cpu != CPU_x86_64) + if (!has_relays( spec )) { output( "\t%s 0\n", get_asm_ptr_keyword() ); return;

1 0

Alexandre Julliard : winebuild: Support the --main-module option for stand-alone 16-bit modules.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: a82ce66048cb0168f8ccf82c03dcbd5bf1053d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a82ce66048cb0168f8ccf82c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 14:08:23 2009 +0100 winebuild: Support the --main-module option for stand-alone 16-bit modules. --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 21 ++++++++++----------- tools/winebuild/parser.c | 10 ++++++++++ tools/winebuild/spec16.c | 6 ++++++ 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 572f465..3818264 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -89,6 +89,7 @@ typedef struct char *file_name; /* file name of the dll */ char *dll_name; /* internal name of the dll */ char *init_func; /* initialization routine */ + char *main_module; /* main Win32 module for Win16 specs */ SPEC_TYPE type; /* type of dll (Win16/Win32) */ int base; /* ordinal base */ int limit; /* ordinal limit */ diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index cab5243..69a1d5f 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -82,7 +82,6 @@ char *spec_file_name = NULL; FILE *output_file = NULL; const char *output_file_name = NULL; static const char *output_file_source_name; -static char *main_module; /* FIXME: to be removed */ char *as_command = NULL; char *ld_command = NULL; @@ -360,8 +359,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) else force_pointer_size = 8; break; case 'M': - spec->type = SPEC_WIN16; - main_module = xstrdup( optarg ); + spec->main_module = xstrdup( optarg ); break; case 'N': spec->dll_name = xstrdup( optarg ); @@ -586,24 +584,25 @@ int main(int argc, char **argv) if (spec->subsystem != IMAGE_SUBSYSTEM_NATIVE) spec->characteristics |= IMAGE_FILE_DLL; if (!spec_file_name) fatal_error( "missing .spec file\n" ); + if (spec->type == SPEC_WIN32 && spec->main_module) /* embedded 16-bit module */ + { + spec->type = SPEC_WIN16; + load_resources( argv, spec ); + if (parse_input_file( spec )) BuildSpec16File( spec ); + break; + } /* fall through */ case MODE_EXE: load_resources( argv, spec ); load_import_libs( argv ); if (spec_file_name && !parse_input_file( spec )) break; + read_undef_symbols( spec, argv ); switch (spec->type) { case SPEC_WIN16: - if (!main_module) - { - read_undef_symbols( spec, argv ); - output_spec16_file( spec ); - } - else - BuildSpec16File( spec ); + output_spec16_file( spec ); break; case SPEC_WIN32: - read_undef_symbols( spec, argv ); BuildSpec32File( spec ); break; default: assert(0); diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index dd79a1c..fc14ad3 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -743,6 +743,16 @@ void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 ) odp->ordinal = 1; odp->link_name = xstrdup( ".L__wine_spec_dos_header" ); + if (spec16->main_module) + { + odp = add_entry_point( spec32 ); + odp->type = TYPE_EXTERN; + odp->name = xstrdup( "__wine_spec_main_module" ); + odp->lineno = 0; + odp->ordinal = 2; + odp->link_name = xstrdup( ".L__wine_spec_main_module" ); + } + assign_names( spec32 ); assign_ordinals( spec32 ); } diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index 1465d2c..7c6fc45 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -875,6 +875,12 @@ void output_spec16_file( DLLSPEC *spec16 ) output_exports( spec32 ); output_imports( spec16 ); output_resources( spec16 ); + if (spec16->main_module) + { + output( "\n\t%s\n", get_asm_string_section() ); + output( ".L__wine_spec_main_module:\n" ); + output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec16->main_module ); + } output_gnu_stack_note(); free_dll_spec( spec32 ); }

1 0

Alexandre Julliard : winebuild: Ignore 16-bit absolute exports when checking for undefined symbols.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: 49d2c208d83fed9a282e6ff4f4f278aef50dbce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49d2c208d83fed9a282e6ff4f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 14:08:35 2009 +0100 winebuild: Ignore 16-bit absolute exports when checking for undefined symbols. --- tools/winebuild/import.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index fcd958d..1cc3689 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -468,7 +468,7 @@ static void check_undefined_exports( DLLSPEC *spec ) for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; - if (odp->type == TYPE_STUB) continue; + if (odp->type == TYPE_STUB || odp->type == TYPE_ABS) continue; if (odp->flags & FLAG_FORWARD) continue; if (find_name( odp->link_name, &undef_symbols )) {

1 0

Huw Davies : gdi32/tests: Fix tests on NT4.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: 17a866df2967c2c263b9670b5d2ede9927beb4a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17a866df2967c2c263b9670b5… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 4 11:47:10 2009 +0000 gdi32/tests: Fix tests on NT4. --- dlls/gdi32/tests/clipping.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 0ae3eb6..eff87c3 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -162,12 +162,16 @@ static void verify_region(HRGN hrgn, const RECT *rc) if (IsRectEmpty(rc)) { ok(rgn.data.rdh.nCount == 0, "expected 0, got %u\n", rgn.data.rdh.nCount); - ok(rgn.data.rdh.nRgnSize == 0, "expected 0, got %u\n", rgn.data.rdh.nRgnSize); + ok(rgn.data.rdh.nRgnSize == 0 || + broken(rgn.data.rdh.nRgnSize == 168), /* NT4 */ + "expected 0, got %u\n", rgn.data.rdh.nRgnSize); } else { ok(rgn.data.rdh.nCount == 1, "expected 1, got %u\n", rgn.data.rdh.nCount); - ok(rgn.data.rdh.nRgnSize == sizeof(RECT), "expected sizeof(RECT), got %u\n", rgn.data.rdh.nRgnSize); + ok(rgn.data.rdh.nRgnSize == sizeof(RECT) || + broken(rgn.data.rdh.nRgnSize == 168), /* NT4 */ + "expected sizeof(RECT), got %u\n", rgn.data.rdh.nRgnSize); } ok(EqualRect(&rgn.data.rdh.rcBound, rc), "rects don't match\n"); } @@ -236,9 +240,14 @@ if (0) /* crashes under Win9x */ SetLastError(0xdeadbeef); hrgn = ExtCreateRegion(NULL, 1, &rgn.data); - ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); - verify_region(hrgn, &rc); - DeleteObject(hrgn); + ok(hrgn != 0 || + broken(GetLastError() == 0xdeadbeef), /* NT4 */ + "ExtCreateRegion error %u\n", GetLastError()); + if(hrgn) + { + verify_region(hrgn, &rc); + DeleteObject(hrgn); + } xform.eM11 = 0.5; /* 50% width */ xform.eM12 = 0.0;

1 0

Huw Davies : gdi32/tests: Win9x doesn't initialize the bitmap bits, so skip this test.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: 246a9a6f7a0673967e62164ecc69125d26b7f344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=246a9a6f7a0673967e62164ec… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 4 11:28:15 2009 +0000 gdi32/tests: Win9x doesn't initialize the bitmap bits, so skip this test. --- dlls/gdi32/tests/bitmap.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index c46c745..5fd11a9 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -72,7 +72,7 @@ static void test_bitmap_info(HBITMAP hbm, INT expected_depth, const BITMAPINFOHE BITMAP bm; BITMAP bma[2]; INT ret, width_bytes; - char buf[512], buf_cmp[512]; + BYTE buf[512], buf_cmp[512]; DWORD gle; ret = GetObject(hbm, sizeof(bm), &bm); @@ -101,17 +101,10 @@ static void test_bitmap_info(HBITMAP hbm, INT expected_depth, const BITMAPINFOHE memset(buf, 0xAA, sizeof(buf)); ret = GetBitmapBits(hbm, sizeof(buf), buf); ok(ret == bm.bmWidthBytes * bm.bmHeight, "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); - ok(!memcmp(buf, buf_cmp, sizeof(buf)), "buffers do not match, depth %d\n", bmih->biBitCount); - if(memcmp(buf, buf_cmp, sizeof(buf))) - { - int i; - for(i = 0; i < sizeof(buf); i++) - if(buf[i] != buf_cmp[i]) - { - trace("first mismatched byte %d: got %02x expected %02x\n", i, buf[i], buf_cmp[i]); - break; - } - } + if(bm.bmType == 21072) + win_skip("win9x does not initialize the bitmap\n"); + else + ok(!memcmp(buf, buf_cmp, sizeof(buf)), "buffers do not match, depth %d\n", bmih->biBitCount); /* test various buffer sizes for GetObject */ ret = GetObject(hbm, sizeof(*bma) * 2, bma);

1 0