February 2010 - Wine-commits

Alexandre Julliard : makefiles: Build the tools subdirectories directly from the top-level makefile.
by Alexandre Julliard 09 Feb '10

09 Feb '10

Module: wine Branch: master Commit: 4d3b0205f578446fda891d6425cf749fc767f7a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d3b0205f578446fda891d642… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 20:47:07 2010 +0100 makefiles: Build the tools subdirectories directly from the top-level makefile. --- Makefile.in | 33 ++++++++++++++++++++++++--------- configure | 23 ++++++++++++++++------- configure.ac | 15 ++++++++------- tools/Makefile.in | 14 +------------- tools/make_makefiles | 4 ++++ 5 files changed, 53 insertions(+), 36 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7282cd1..e1279a6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,6 +27,8 @@ VPATH = @srcdir@ LIBEXT = @LIBEXT@ MODULE = none +ALL_TOOL_DIRS = @ALL_TOOL_DIRS@ + # Sub-directories to run make depend/clean into SUBDIRS = \ dlls \ @@ -39,10 +41,10 @@ SUBDIRS = \ loader \ programs \ server \ - tools + $(ALL_TOOL_DIRS) # Sub-directories to run make install/uninstall into -INSTALLSUBDIRS = libs/wine @ALL_TOP_DIRS@ +INSTALLSUBDIRS = libs/wine $(ALL_TOOL_DIRS) @ALL_TOP_DIRS@ # Sub-directories to run make test into TESTSUBDIRS = dlls @@ -81,15 +83,22 @@ uninstall:: all: $(INSTALLSUBDIRS) -dlls programs: libs/port libs/wine libs/wpp tools include +# dependencies needed to build any dll or program +__builddeps__: libs/port libs/wine libs/wpp $(ALL_TOOL_DIRS) include +.PHONY: __builddeps__ + +dlls programs: __builddeps__ loader server: libs/port libs/wine tools -fonts include: tools +fonts: tools +include: tools/widl programs: dlls -tools: libs/port libs/wine libs/wpp -libs/wine: libs/port +libs/wine $(ALL_TOOL_DIRS): libs/port +tools/wmc tools/wrc: tools +tools tools/wmc tools/wrc: libs/wine +tools/widl tools/wmc tools/wrc: libs/wpp -dlls/__install__ dlls/__install-lib__ dlls/__install-dev__: libs/port libs/wine libs/wpp tools include -programs/__install__ programs/__install-lib__: libs/port libs/wine libs/wpp tools include +dlls/__install__ dlls/__install-lib__ dlls/__install-dev__: __builddeps__ +programs/__install__ programs/__install-lib__: __builddeps__ fonts/__install__ fonts/__install-lib__: tools include/__install__ include/__install-dev__: include libs/wine/__install__ libs/wine/__install-lib__ libs/wine/__install-dev__: libs/wine @@ -98,6 +107,12 @@ server/__install__ server/__install-lib__: libs/port libs/wine tools programs/__install__: dlls/__install__ programs/__install-lib__: dlls/__install-lib__ tools/__install__ tools/__install-lib__ tools/__install-dev__: tools +tools/widl/__install__ tools/widl/__install-dev__: tools/widl +tools/winebuild/__install__ tools/winebuild/__install-dev__: tools/winebuild +tools/winedump/__install__ tools/winedump/__install-dev__: tools/winedump +tools/winegcc/__install__ tools/winegcc/__install-dev__: tools/winegcc +tools/wmc/__install__ tools/wmc/__install-dev__: tools/wmc +tools/wrc/__install__ tools/wrc/__install-dev__: tools/wrc RECURSE_TARGETS = \ $(SUBDIRS) \ @@ -119,7 +134,7 @@ $(MAKEDEP): include/config.h # Test rules $(TESTSUBDIRS:%=%/__test__): wine -$(TESTSUBDIRS:%=%/__crosstest__): tools include +$(TESTSUBDIRS:%=%/__crosstest__): __builddeps__ # Misc rules diff --git a/configure b/configure index 4bb5081..0adb500 100755 --- a/configure +++ b/configure @@ -605,6 +605,7 @@ ALL_IMPORTLIB_RULES ALL_IMPORT_LIBS ALL_STATIC_LIBS ALL_IMPLIB_DIRS +ALL_TOOL_DIRS ALL_DLL_DIRS ALL_TOP_DIRS ALL_MAKEFILE_DEPENDS @@ -13663,6 +13664,8 @@ ALL_TOP_DIRS="" ALL_DLL_DIRS="" +ALL_TOOL_DIRS="" + ALL_IMPLIB_DIRS="" ALL_STATIC_LIBS="" @@ -18859,7 +18862,7 @@ ac_config_files="$ac_config_files server/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/Makefile" -test "x$enable_tools" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ +test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ tools" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/Makefile: tools/Makefile.in Make.rules config.status" @@ -18867,42 +18870,48 @@ ac_config_files="$ac_config_files tools/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/widl/Makefile" - +test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ + tools/widl" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/widl/Makefile: tools/widl/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/widl/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/winebuild/Makefile" - +test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ + tools/winebuild" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/winebuild/Makefile: tools/winebuild/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/winebuild/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/winedump/Makefile" - +test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ + tools/winedump" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/winedump/Makefile: tools/winedump/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/winedump/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/winegcc/Makefile" - +test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ + tools/winegcc" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/winegcc/Makefile: tools/winegcc/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/winegcc/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/wmc/Makefile" - +test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ + tools/wmc" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/wmc/Makefile: tools/wmc/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/wmc/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/wrc/Makefile" - +test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ + tools/wrc" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/wrc/Makefile: tools/wrc/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/wrc/Makefile" diff --git a/configure.ac b/configure.ac index 63b3cfe..0549119 100644 --- a/configure.ac +++ b/configure.ac @@ -2101,6 +2101,7 @@ AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"]) AC_SUBST(ALL_TOP_DIRS,"") AC_SUBST(ALL_DLL_DIRS,"") +AC_SUBST(ALL_TOOL_DIRS,"") AC_SUBST(ALL_IMPLIB_DIRS,"") AC_SUBST(ALL_STATIC_LIBS,"") AC_SUBST(ALL_IMPORT_LIBS,"") @@ -2666,13 +2667,13 @@ WINE_CONFIG_PROGRAM(wordpad,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(write,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(xcopy,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([server/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) -WINE_CONFIG_MAKEFILE([tools/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) -WINE_CONFIG_MAKEFILE([tools/widl/Makefile],[Make.rules]) -WINE_CONFIG_MAKEFILE([tools/winebuild/Makefile],[Make.rules]) -WINE_CONFIG_MAKEFILE([tools/winedump/Makefile],[Make.rules]) -WINE_CONFIG_MAKEFILE([tools/winegcc/Makefile],[Make.rules]) -WINE_CONFIG_MAKEFILE([tools/wmc/Makefile],[Make.rules]) -WINE_CONFIG_MAKEFILE([tools/wrc/Makefile],[Make.rules]) +WINE_CONFIG_MAKEFILE([tools/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) +WINE_CONFIG_MAKEFILE([tools/widl/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) +WINE_CONFIG_MAKEFILE([tools/winebuild/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) +WINE_CONFIG_MAKEFILE([tools/winedump/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) +WINE_CONFIG_MAKEFILE([tools/winegcc/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) +WINE_CONFIG_MAKEFILE([tools/wmc/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) +WINE_CONFIG_MAKEFILE([tools/wrc/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) dnl Build dependencies for test files compiled into winetest diff --git a/tools/Makefile.in b/tools/Makefile.in index 496d7bf..2d5190b 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -30,16 +30,6 @@ C_SRCS = \ relpath.c \ sfnt2fnt.c -INSTALLSUBDIRS = \ - widl \ - winebuild \ - winedump \ - winegcc \ - wmc \ - wrc - -SUBDIRS = $(INSTALLSUBDIRS) - EXTRASUBDIRS = winapi INSTALLDIRS = \ @@ -50,7 +40,7 @@ INSTALLDIRS = \ UPDATE_DESKTOP_DATABASE = update-desktop-database -all: $(PROGRAMS) $(MANPAGES) $(SUBDIRS) +all: $(PROGRAMS) $(MANPAGES) @MAKE_RULES@ @@ -94,8 +84,6 @@ uninstall:: $(RM) $(DESTDIR)$(bindir)/winemaker $(DESTDIR)$(bindir)/wineprefixcreate $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(mandir)/man$(prog_manext)/wineprefixcreate.$(prog_manext) $(DESTDIR)$(datadir)/wine/wine.inf $(DESTDIR)$(datadir)/applications/wine.desktop -$(UPDATE_DESKTOP_DATABASE) -wmc wrc: relpath$(EXEEXT) - @DEPENDENCIES@ # everything below this line is overwritten by make depend Makefile: makedep$(EXEEXT) diff --git a/tools/make_makefiles b/tools/make_makefiles index 2a05442..793b226 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -389,6 +389,10 @@ sub update_makefiles(@) (my $name = $file) =~ s/^dlls\/(.*)\/Makefile/$1/; push @lines, "WINE_CONFIG_LIB($name)\n"; } + elsif ($file =~ /^tools.*\/Makefile$/) + { + push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules],[],[ALL_TOOL_DIRS],[enable_tools])\n"; + } elsif ($file =~ /^[^\/]*\/Makefile$/) { push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules],[],[ALL_TOP_DIRS])\n";

1 0

Alexandre Julliard : makefiles: Generate dependencies to match each makefile to its subdirectory.
by Alexandre Julliard 09 Feb '10

09 Feb '10

Module: wine Branch: master Commit: 54966368502086b3e8f8eab64d3c42ab8713a138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54966368502086b3e8f8eab64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 20:47:41 2010 +0100 makefiles: Generate dependencies to match each makefile to its subdirectory. --- Makefile.in | 30 +++++++++++++++--------------- aclocal.m4 | 3 ++- configure | 17 +++++++++++++++++ 3 files changed, 34 insertions(+), 16 deletions(-) diff --git a/Makefile.in b/Makefile.in index e1279a6..2f2c85b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -115,20 +115,19 @@ tools/wmc/__install__ tools/wmc/__install-dev__: tools/wmc tools/wrc/__install__ tools/wrc/__install-dev__: tools/wrc RECURSE_TARGETS = \ - $(SUBDIRS) \ - $(SUBDIRS:%=%/__clean__) \ - $(SUBDIRS:%=%/__depend__) \ - $(SUBDIRS:%=%/__install-dev__) \ - $(SUBDIRS:%=%/__install-lib__) \ - $(SUBDIRS:%=%/__install__) \ - $(SUBDIRS:%=%/__uninstall__) \ - $(TESTSUBDIRS:%=%/__crosstest__) \ - $(TESTSUBDIRS:%=%/__test__) \ - $(TESTSUBDIRS:%=%/__testclean__) - -depend $(RECURSE_TARGETS): $(MAKEDEP) - -$(MAKEDEP): include/config.h + __clean__ \ + __depend__ \ + __install__ \ + __instal-dev__ \ + __install-lib__ \ + __uninstall__ \ + __crosstest__ + +dlls $(RECURSE_TARGETS:%=dlls/%): $(MAKEDEP) +programs $(RECURSE_TARGETS:%=programs/%): $(MAKEDEP) +depend: $(MAKEDEP) + +$(MAKEDEP): include/config.h tools/Makefile @cd $(TOOLSDIR)/tools && $(MAKE) makedep$(TOOLSEXT) # Test rules @@ -166,7 +165,8 @@ $(ALL_CONFIGS): .BEGIN: Makefile .MAKEFILEDEPS: -$(RECURSE_TARGETS) $(MAKEDEP): $(ALL_MAKEFILES) +dlls $(RECURSE_TARGETS:%=dlls/%): $(ALL_MAKEFILES) +programs $(RECURSE_TARGETS:%=programs/%): $(ALL_MAKEFILES) distclean:: $(RM) $(ALL_CONFIGS) diff --git a/aclocal.m4 b/aclocal.m4 index 357edf8..b9f485d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -176,7 +176,8 @@ m4_ifval([$4],[test "x$ac_enable" != xno]m4_foreach([ac_var],[$4],[ && ac_var="$ ac_dir"])) AS_VAR_POPDEF([ac_enable])dnl ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS -[$1: ]m4_ifval([$2],[$1.in $2],[$1.in]) config.status" +m4_ifval(ac_dir,m4_ifval([$3],,[\$(RECURSE_TARGETS:%=ac_dir/%) ac_dir: $1 \$(MAKEDEP) +]))[$1: ]m4_ifval([$2],[$1.in $2],[$1.in]) config.status" AC_CONFIG_FILES([$1])dnl m4_popdef([ac_dir])]) diff --git a/configure b/configure index 0adb500..9edb711 100755 --- a/configure +++ b/configure @@ -13767,6 +13767,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_dlls" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ dlls" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=dlls/%) dlls: dlls/Makefile \$(MAKEDEP) dlls/Makefile: dlls/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files dlls/Makefile" @@ -18302,6 +18303,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_documentation" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ documentation" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=documentation/%) documentation: documentation/Makefile \$(MAKEDEP) documentation/Makefile: documentation/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files documentation/Makefile" @@ -18310,6 +18312,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_fonts" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ fonts" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=fonts/%) fonts: fonts/Makefile \$(MAKEDEP) fonts/Makefile: fonts/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files fonts/Makefile" @@ -18318,6 +18321,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_include" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ include" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=include/%) include: include/Makefile \$(MAKEDEP) include/Makefile: include/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files include/Makefile" @@ -18325,6 +18329,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ libs/port/Makefile" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=libs/port/%) libs/port: libs/port/Makefile \$(MAKEDEP) libs/port/Makefile: libs/port/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files libs/port/Makefile" @@ -18332,6 +18337,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ libs/wine/Makefile" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=libs/wine/%) libs/wine: libs/wine/Makefile \$(MAKEDEP) libs/wine/Makefile: libs/wine/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files libs/wine/Makefile" @@ -18339,6 +18345,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ libs/wpp/Makefile" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=libs/wpp/%) libs/wpp: libs/wpp/Makefile \$(MAKEDEP) libs/wpp/Makefile: libs/wpp/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files libs/wpp/Makefile" @@ -18347,6 +18354,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_loader" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ loader" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=loader/%) loader: loader/Makefile \$(MAKEDEP) loader/Makefile: loader/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files loader/Makefile" @@ -18355,6 +18363,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_programs" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ programs" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=programs/%) programs: programs/Makefile \$(MAKEDEP) programs/Makefile: programs/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files programs/Makefile" @@ -18857,6 +18866,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_server" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ server" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=server/%) server: server/Makefile \$(MAKEDEP) server/Makefile: server/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files server/Makefile" @@ -18865,6 +18875,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ tools" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=tools/%) tools: tools/Makefile \$(MAKEDEP) tools/Makefile: tools/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/Makefile" @@ -18873,6 +18884,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ tools/widl" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=tools/widl/%) tools/widl: tools/widl/Makefile \$(MAKEDEP) tools/widl/Makefile: tools/widl/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/widl/Makefile" @@ -18881,6 +18893,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ tools/winebuild" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=tools/winebuild/%) tools/winebuild: tools/winebuild/Makefile \$(MAKEDEP) tools/winebuild/Makefile: tools/winebuild/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/winebuild/Makefile" @@ -18889,6 +18902,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ tools/winedump" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=tools/winedump/%) tools/winedump: tools/winedump/Makefile \$(MAKEDEP) tools/winedump/Makefile: tools/winedump/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/winedump/Makefile" @@ -18897,6 +18911,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ tools/winegcc" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=tools/winegcc/%) tools/winegcc: tools/winegcc/Makefile \$(MAKEDEP) tools/winegcc/Makefile: tools/winegcc/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/winegcc/Makefile" @@ -18905,6 +18920,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ tools/wmc" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=tools/wmc/%) tools/wmc: tools/wmc/Makefile \$(MAKEDEP) tools/wmc/Makefile: tools/wmc/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/wmc/Makefile" @@ -18913,6 +18929,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ tools/wrc" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=tools/wrc/%) tools/wrc: tools/wrc/Makefile \$(MAKEDEP) tools/wrc/Makefile: tools/wrc/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/wrc/Makefile"

1 0

Erich Hoover : hhctrl.ocx: Add Search capability.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: cff5f60d3ea93f7020e799406a8b95452020f360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cff5f60d3ea93f7020e799406… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Feb 7 10:39:33 2010 -0700 hhctrl.ocx: Add Search capability. --- dlls/hhctrl.ocx/Makefile.in | 1 + dlls/hhctrl.ocx/chm.c | 1 - dlls/hhctrl.ocx/help.c | 51 ++++++++- dlls/hhctrl.ocx/hhctrl.h | 12 ++ dlls/hhctrl.ocx/search.c | 247 +++++++++++++++++++++++++++++++++++++++++++ dlls/hhctrl.ocx/stream.c | 12 ++ dlls/hhctrl.ocx/stream.h | 1 + 7 files changed, 318 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cff5f60d3ea93f7020e79…

1 0

Reece Dunn : user32/tests: Make the MDI client take up the whole client area.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: e66198ae92f9266d12957aa79d4edc09cf5dd4a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e66198ae92f9266d12957aa79… Author: Reece Dunn <msclrhd(a)gmail.com> Date: Mon Feb 8 08:53:43 2010 +0000 user32/tests: Make the MDI client take up the whole client area. --- dlls/user32/tests/msg.c | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e66198ae92f9266d12957…

1 0

Dan Kegel : iphlpapi: _res is per-thread in glibc.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 22434f490a83d2a1f4c3721d95f9a7c78fd44ef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22434f490a83d2a1f4c3721d9… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Feb 8 06:25:36 2010 -0800 iphlpapi: _res is per-thread in glibc. --- dlls/iphlpapi/iphlpapi_main.c | 9 +++------ dlls/iphlpapi/tests/iphlpapi.c | 12 ++++++++++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 011e21a..7edff9e 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -66,16 +66,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); #define INADDR_NONE ~0UL #endif -static int resolver_initialised; - /* call res_init() just once because of a bug in Mac OS X 10.4 */ +/* Call once per thread on systems that have per-thread _res. */ +/* FIXME: should do same fix in dnsapi (or use dnsapi here?) */ static void initialise_resolver(void) { - if (!resolver_initialised) - { + if ((_res.options & RES_INIT) == 0) res_init(); - resolver_initialised = 1; - } } BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 7a35f7c..2410aca 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -765,11 +765,12 @@ GetBestRoute IpReleaseAddress IpRenewAddress */ -static void testWin98Functions(void) +static DWORD CALLBACK testWin98Functions(void *p) { testGetInterfaceInfo(); testGetAdaptersInfo(); testGetNetworkParams(); + return 0; } static void testGetPerAdapterInfo(void) @@ -885,9 +886,16 @@ START_TEST(iphlpapi) loadIPHlpApi(); if (hLibrary) { + HANDLE thread; + testWin98OnlyFunctions(); testWinNT4Functions(); - testWin98Functions(); + + /* run testGetXXXX in two threads at once to make sure we don't crash in that case */ + thread = CreateThread(NULL, 0, testWin98Functions, NULL, 0, NULL); + testWin98Functions(NULL); + WaitForSingleObject(thread, INFINITE); + testWin2KFunctions(); test_GetAdaptersAddresses(); freeIPHlpApi();

1 0

Nikolay Sivov : comctl32/listview: Revert item width calculation to fix performance issues.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 057267d85e14b1954f5a6735a53a5287962a8a3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=057267d85e14b1954f5a6735a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Feb 8 17:52:45 2010 +0300 comctl32/listview: Revert item width calculation to fix performance issues. --- dlls/comctl32/listview.c | 13 +++---------- dlls/comctl32/tests/listview.c | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 80a32f7..cf06e09 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -401,7 +401,7 @@ typedef struct tagLISTVIEW_INFO #define MAX_EMPTYTEXT_SELECT_WIDTH 80 /* default column width for items in list display mode */ -#define DEFAULT_COLUMN_WIDTH 96 +#define DEFAULT_COLUMN_WIDTH 128 /* Size of "line" scroll for V & H scrolls */ #define LISTVIEW_SCROLL_ICON_LINE_SIZE 37 @@ -2808,7 +2808,6 @@ static INT LISTVIEW_CalculateItemWidth(const LISTVIEW_INFO *infoPtr) { WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' }; LVITEMW lvItem; - BOOL empty; INT i; lvItem.mask = LVIF_TEXT; @@ -2823,19 +2822,13 @@ static INT LISTVIEW_CalculateItemWidth(const LISTVIEW_INFO *infoPtr) nItemWidth = max(LISTVIEW_GetStringWidthT(infoPtr, lvItem.pszText, TRUE), nItemWidth); } - empty = nItemWidth == 0; if (infoPtr->himlSmall) nItemWidth += infoPtr->iconSize.cx; if (infoPtr->himlState) nItemWidth += infoPtr->iconStateSize.cx; - if (empty) - nItemWidth = max(nItemWidth, DEFAULT_COLUMN_WIDTH); - else - nItemWidth += WIDTH_PADDING; + nItemWidth = max(DEFAULT_COLUMN_WIDTH, nItemWidth + WIDTH_PADDING); } - TRACE("nItemWidth=%d\n", nItemWidth); - return nItemWidth; } @@ -7480,7 +7473,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, TRACE(" inserting at %d, sorted=%d, count=%d, iItem=%d\n", nItem, is_sorted, infoPtr->nItemCount, lpLVItem->iItem); nItem = DPA_InsertPtr( infoPtr->hdpaItems, nItem, hdpaSubItems ); if (nItem == -1) goto fail; - if (++infoPtr->nItemCount > 0) LISTVIEW_UpdateItemSize(infoPtr); + infoPtr->nItemCount++; /* shift indices first so they don't get tangled */ LISTVIEW_ShiftIndices(infoPtr, nItem, 1); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0bac4ec..9014f72 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3967,7 +3967,7 @@ static void test_getcolumnwidth(void) memset(&itema, 0, sizeof(itema)); SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema); ret = SendMessage(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); - expect(96, ret); + todo_wine expect(96, ret); DestroyWindow(hwnd); }

1 0

Alexandre Julliard : winex11: Shape offset must be relative to the window position.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 08b8325460027b4eeb1889f102a9dd0bbed7e6b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08b8325460027b4eeb1889f10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 17:14:01 2010 +0100 winex11: Shape offset must be relative to the window position. --- dlls/winex11.drv/window.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f466cd1..93cb7c7 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1277,8 +1277,8 @@ void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect ) * Synchronize the X window position with the Windows one */ static void sync_window_position( Display *display, struct x11drv_win_data *data, - UINT swp_flags, const RECT *old_client_rect, - const RECT *old_whole_rect ) + UINT swp_flags, const RECT *old_window_rect, + const RECT *old_whole_rect, const RECT *old_client_rect ) { DWORD style = GetWindowLongW( data->hwnd, GWL_STYLE ); XWindowChanges changes; @@ -1329,10 +1329,13 @@ static void sync_window_position( Display *display, struct x11drv_win_data *data #ifdef HAVE_LIBXSHAPE if (data->shaped) { - int x_offset = old_whole_rect->left - data->whole_rect.left; - int y_offset = old_whole_rect->top - data->whole_rect.top; - if (x_offset || y_offset) - XShapeOffsetShape( display, data->whole_window, ShapeBounding, x_offset, y_offset ); + int old_x_offset = old_window_rect->left - old_whole_rect->left; + int old_y_offset = old_window_rect->top - old_whole_rect->top; + int new_x_offset = data->window_rect.left - data->whole_rect.left; + int new_y_offset = data->window_rect.top - data->whole_rect.top; + if (old_x_offset != new_x_offset || old_y_offset != new_y_offset) + XShapeOffsetShape( display, data->whole_window, ShapeBounding, + new_x_offset - old_x_offset, new_y_offset - old_y_offset ); } #endif wine_tsx11_unlock(); @@ -2097,7 +2100,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags Display *display; struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); DWORD new_style = GetWindowLongW( hwnd, GWL_STYLE ); - RECT old_whole_rect, old_client_rect; + RECT old_window_rect, old_whole_rect, old_client_rect; int event_type; if (!data) return; @@ -2105,6 +2108,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags thread_data = x11drv_thread_data(); display = thread_data->display; + old_window_rect = data->window_rect; old_whole_rect = data->whole_rect; old_client_rect = data->client_rect; data->window_rect = *rectWindow; @@ -2163,7 +2167,8 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags /* don't change position if we are about to minimize or maximize a managed window */ if (!event_type && !(data->managed && (swp_flags & SWP_STATECHANGED) && (new_style & (WS_MINIMIZE|WS_MAXIMIZE)))) - sync_window_position( display, data, swp_flags, &old_client_rect, &old_whole_rect ); + sync_window_position( display, data, swp_flags, + &old_window_rect, &old_whole_rect, &old_client_rect ); if ((new_style & WS_VISIBLE) && ((new_style & WS_MINIMIZE) || is_window_rect_mapped( rectWindow )))

1 0

Alexandre Julliard : user32: Store 32-bit and 16-bit cursors/ icons in independent structures.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: f89aaa65ad4d89a0488d573a913de7f1dd2fff9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f89aaa65ad4d89a0488d573a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 17:38:05 2010 +0100 user32: Store 32-bit and 16-bit cursors/icons in independent structures. --- dlls/user.exe16/message.c | 29 +-------- dlls/user.exe16/user.c | 115 ++++++++++++++++++++++++++++++++++- dlls/user.exe16/user_private.h | 7 +- dlls/user32/controls.h | 10 ++- dlls/user32/cursoricon.c | 132 ++++++++++++++++++++++++++++++++-------- dlls/user32/winproc.c | 38 +----------- 6 files changed, 234 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f89aaa65ad4d89a0488d5…

1 0

Alexandre Julliard : user32: Do not load 16-bit user.exe by default.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 0e0b704f5b48d1c0bba1f1e0b1e37fd77839c725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e0b704f5b48d1c0bba1f1e0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 17:44:23 2010 +0100 user32: Do not load 16-bit user.exe by default. --- dlls/user.exe16/user.c | 10 ---------- dlls/user32/user_main.c | 2 -- 2 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index f4c7741..ba90db4 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -509,16 +509,6 @@ static void free_clipboard_formats(void) /********************************************************************** - * DllMain - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - if (reason == DLL_PROCESS_ATTACH) LoadLibrary16( "user.exe" ); - return TRUE; -} - - -/********************************************************************** * InitApp (USER.5) */ INT16 WINAPI InitApp16( HINSTANCE16 hInstance ) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index d076e67..19482e4 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -278,8 +278,6 @@ static BOOL process_attach(void) /* Setup palette function pointers */ palette_init(); - LoadLibraryA( "user.exe16" ); - /* Initialize built-in window classes */ CLASS_RegisterBuiltinClasses();

1 0

Alexandre Julliard : gdi32: Do not load 16-bit gdi.exe by default.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: ad8389dc3988e7a5e5f8717786ed416ca7471b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad8389dc3988e7a5e5f871778… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 17:44:31 2010 +0100 gdi32: Do not load 16-bit gdi.exe by default. --- dlls/gdi.exe16/gdi.c | 10 ---------- dlls/gdi32/gdiobj.c | 2 -- 2 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index 59cec0f..85dfef8 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -429,16 +429,6 @@ static void free_segptr_bits( HBITMAP16 bmp ) } -/********************************************************************** - * DllMain - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - if (reason == DLL_PROCESS_ATTACH) LoadLibrary16( "gdi.exe" ); - return TRUE; -} - - /*********************************************************************** * SetBkColor (GDI.1) */ diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index bf4813f..c45ff4b 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -578,8 +578,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) if (reason != DLL_PROCESS_ATTACH) return TRUE; DisableThreadLibraryCalls( inst ); - LoadLibraryA( "gdi.exe16" ); - WineEngInit(); /* create stock objects */

1 0