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

Alexandre Julliard : makefiles: Bypass the normal substitution mechanism for the makefile dependencies.
by Alexandre Julliard March 26, 2010

March 26, 2010

Module: wine Branch: master Commit: 39b4ba214b23a516168f241f835d73e53b175bf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39b4ba214b23a516168f241f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 22:13:03 2010 +0100 makefiles: Bypass the normal substitution mechanism for the makefile dependencies. This avoids performance problems with large substitutions. --- Makefile.in | 17 +---------------- aclocal.m4 | 9 +++++++-- configure | 34 ++++++++++++++++++++++++++++------ configure.ac | 16 +++++++++++++++- 4 files changed, 51 insertions(+), 25 deletions(-) diff --git a/Makefile.in b/Makefile.in index 75e74be..2697d2b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,14 +18,10 @@ # sgmlpages: compile sgml source for the Wine API Guide # xmlpages: compile xml source for the Wine API Guide -# Directories - TOPSRCDIR = @top_srcdir@ TOPOBJDIR = . SRCDIR = @srcdir@ VPATH = @srcdir@ -LIBEXT = @LIBEXT@ -MODULE = none # Sub-directories that don't have a makefile EXTRASUBDIRS = dlls libs @@ -61,7 +57,7 @@ clean:: __clean__ $(RM) tools/makedep$(EXEEXT) distclean:: clean - $(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h Makefile + $(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h Makefile Make.tmp $(RM) -r autom4te.cache # Dependencies between directories @@ -91,14 +87,3 @@ TAGS etags: tags ctags: $(RM) tags (test -d .git && git ls-files '*.[chly]' '*.idl' || find -L $(TOPSRCDIR) -name '*.[ch]' -print) | xargs ctags -a - -# Makefile rules - -.INIT: Makefile -.BEGIN: Makefile -.MAKEFILEDEPS: - -(a)ALL_MAKEFILE_DEPENDS@ - -uninstall:: - -rmdir $(DESTDIR)$(datadir)/wine $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir) diff --git a/aclocal.m4 b/aclocal.m4 index 11fe076..08f0bcd 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -140,9 +140,14 @@ dnl dnl Usage: AC_REQUIRE([WINE_CONFIG_HELPERS]) dnl AC_DEFUN([WINE_CONFIG_HELPERS], -[AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies +[ALL_MAKEFILE_DEPENDS=" +# Rules automatically generated by configure + +.INIT: Makefile +.BEGIN: Makefile +.MAKEFILEDEPS: Makefile: Makefile.in Make.rules config.status - @./config.status Makefile"]) + @./config.status Make.tmp Makefile" AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"]) AC_SUBST(ALL_TEST_BINARIES,"") diff --git a/configure b/configure index 89341e5..7461096 100755 --- a/configure +++ b/configure @@ -599,7 +599,6 @@ LIBOBJS ALL_PROGRAM_BIN_INSTALL_DIRS ALL_TEST_BINARIES ALL_WINETEST_DEPENDS -ALL_MAKEFILE_DEPENDS LDAPLIBS LIBPOLL LIBDL @@ -13842,10 +13841,14 @@ esac ac_config_commands="$ac_config_commands include/stamp-h" -ALL_MAKEFILE_DEPENDS="# Makefile dependencies -Makefile: Makefile.in Make.rules config.status - @./config.status Makefile" +ALL_MAKEFILE_DEPENDS=" +# Rules automatically generated by configure +.INIT: Makefile +.BEGIN: Makefile +.MAKEFILEDEPS: +Makefile: Makefile.in Make.rules config.status + @./config.status Make.tmp Makefile" ALL_WINETEST_DEPENDS="# Test binaries" @@ -14695,11 +14698,17 @@ wine_fn_config_tool tools/winegcc wine_fn_config_tool tools/wmc wine_fn_config_tool tools/wrc -ac_config_files="$ac_config_files Makefile" +ac_config_commands="$ac_config_commands Makefile" + + +ac_config_files="$ac_config_files Make.tmp:Makefile.in" test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS="" +wine_fn_append_rule ALL_MAKEFILE_DEPENDS "uninstall:: + -rmdir \$(DESTDIR)\$(datadir)/wine \$(DESTDIR)\$(fakedlldir) \$(DESTDIR)\$(dlldir)" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -15384,6 +15393,17 @@ _ASBOX _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# +# INIT-COMMANDS +# +wine_fn_output_makefile () +{ + cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$1 && rm -f Make.tmp && return +$ALL_MAKEFILE_DEPENDS +_WINE_EOF + as_fn_error "could not create Makefile" "$LINENO" 5 +} + _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -15411,7 +15431,8 @@ do "dlls/Makedll.rules") CONFIG_FILES="$CONFIG_FILES dlls/Makedll.rules" ;; "dlls/Makeimplib.rules") CONFIG_FILES="$CONFIG_FILES dlls/Makeimplib.rules" ;; "programs/Makeprog.rules") CONFIG_FILES="$CONFIG_FILES programs/Makeprog.rules" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;; + "Make.tmp") CONFIG_FILES="$CONFIG_FILES Make.tmp:Makefile.in" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac @@ -16040,6 +16061,7 @@ $as_echo "$as_me: creating dlls/user32/resources" >&6;}; as_dir="dlls/user32/res $as_echo "$as_me: creating dlls/wineps.drv/data" >&6;}; as_dir="dlls/wineps.drv/data"; as_fn_mkdir_p; } ;; "include/wine":C) test -d "include/wine" || { { $as_echo "$as_me:${as_lineno-$LINENO}: creating include/wine" >&5 $as_echo "$as_me: creating include/wine" >&6;}; as_dir="include/wine"; as_fn_mkdir_p; } ;; + "Makefile":C) wine_fn_output_makefile Makefile ;; esac done # for ac_tag diff --git a/configure.ac b/configure.ac index fe11a04..142d32a 100644 --- a/configure.ac +++ b/configure.ac @@ -2702,11 +2702,25 @@ WINE_CONFIG_TOOL(tools/wmc) WINE_CONFIG_TOOL(tools/wrc) dnl End of auto-generated output commands -AC_CONFIG_FILES([Makefile]) +AC_CONFIG_COMMANDS([Makefile], [wine_fn_output_makefile Makefile], +[wine_fn_output_makefile () +{ + cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$[]1 && rm -f Make.tmp && return +$ALL_MAKEFILE_DEPENDS +_WINE_EOF + AS_ERROR([could not create Makefile]) +}]) + +AC_CONFIG_FILES([Make.tmp:Makefile.in]) dnl Don't install in bin dir for Windows build test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS="" +dnl Some final makefile rules +WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS], +[uninstall:: + -rmdir \$(DESTDIR)\$(datadir)/wine \$(DESTDIR)\$(fakedlldir) \$(DESTDIR)\$(dlldir)]) + AC_OUTPUT if test "$no_create" = "yes"

1 0

Alexandre Julliard : makefiles: Output the top-level depend rules explicitly for each module.
by Alexandre Julliard March 26, 2010

March 26, 2010

Module: wine Branch: master Commit: 18e5313cd9ac382c02a0c736763f46ff584a2773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18e5313cd9ac382c02a0c7367… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 22:00:00 2010 +0100 makefiles: Output the top-level depend rules explicitly for each module. --- Makefile.in | 6 ------ aclocal.m4 | 5 ++++- configure | 5 ++++- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile.in b/Makefile.in index 97f90ac..31896bb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -61,11 +61,6 @@ include/stamp-h: include/config.h.in config.status $(ALL_CONFIGS): @./config.status $@ -# Rules for dependencies - -depend: $(ALL_DIRS:%=%/__depend__) dummy -.PHONY: $(ALL_DIRS:%=%/__depend__) - # Rules for cleaning $(ALL_DIRS:%=%/__clean__): dummy @@ -94,7 +89,6 @@ libs/wine: libs/port tools/wmc tools/wrc: tools tools tools/wmc tools/wrc: libs/wine tools/widl tools/wmc tools/wrc: libs/wpp -tools/__depend__: $(MAKEDEP) $(MAKEDEP): include/config.h tools/Makefile @cd $(TOOLSDIR)/tools && $(MAKE) makedep$(TOOLSEXT) diff --git a/aclocal.m4 b/aclocal.m4 index bce0377..dcc0359 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -165,7 +165,10 @@ wine_fn_all_dir_rules () wine_fn_append_file ALL_DIRS $[1] wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "$[1]/__clean__: $[1]/Makefile -$[1]/Makefile $[1]/__depend__: $[1]/Makefile.in config.status $[2] +$[1]/Makefile: $[1]/Makefile.in config.status $[2] + @./config.status --file $[1]/Makefile && cd $[1] && \$(MAKE) depend +depend .PHONY: $[1]/__depend__ +$[1]/__depend__: \$(MAKEDEP) dummy @./config.status --file $[1]/Makefile && cd $[1] && \$(MAKE) depend" } diff --git a/configure b/configure index 72c3f72..e2524a0 100755 --- a/configure +++ b/configure @@ -13877,7 +13877,10 @@ wine_fn_all_dir_rules () wine_fn_append_file ALL_DIRS $1 wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "$1/__clean__: $1/Makefile -$1/Makefile $1/__depend__: $1/Makefile.in config.status $2 +$1/Makefile: $1/Makefile.in config.status $2 + @./config.status --file $1/Makefile && cd $1 && \$(MAKE) depend +depend .PHONY: $1/__depend__ +$1/__depend__: \$(MAKEDEP) dummy @./config.status --file $1/Makefile && cd $1 && \$(MAKE) depend" }

1 0

Alexandre Julliard : makefiles: Add shell functions to generate dependencies for symlinks and rule files.
by Alexandre Julliard March 26, 2010

March 26, 2010

Module: wine Branch: master Commit: abfb11e1ccc7b0c860e3146cad71b302c3f0bf70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abfb11e1ccc7b0c860e3146ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 22:12:49 2010 +0100 makefiles: Add shell functions to generate dependencies for symlinks and rule files. --- Makefile.in | 7 +------ aclocal.m4 | 33 ++++++++++++++++++++++++++------- configure | 59 +++++++++++++++++++++++++++++++++++------------------------ 3 files changed, 62 insertions(+), 37 deletions(-) diff --git a/Makefile.in b/Makefile.in index 50d239d..75e74be 100644 --- a/Makefile.in +++ b/Makefile.in @@ -39,8 +39,6 @@ WINAPI_CHECK_EXTRA_FLAGS = --global # Rules for re-running configure -ALL_CONFIGS = Makefile @ALL_MAKERULES@ @ALL_SYMLINKS@ - $(SRCDIR)/configure: @MAINTAINER_MODE@ configure.ac aclocal.m4 cd $(SRCDIR) && autoconf --warnings=all @@ -56,9 +54,6 @@ include/config.h: include/stamp-h include/stamp-h: include/config.h.in config.status @./config.status include/config.h include/stamp-h -$(ALL_CONFIGS): - @./config.status $@ - # Rules for cleaning .PHONY: __clean__ @@ -66,7 +61,7 @@ clean:: __clean__ $(RM) tools/makedep$(EXEEXT) distclean:: clean - $(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h $(ALL_CONFIGS) + $(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h Makefile $(RM) -r autom4te.cache # Dependencies between directories diff --git a/aclocal.m4 b/aclocal.m4 index 914e6f6..11fe076 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -141,11 +141,10 @@ dnl Usage: AC_REQUIRE([WINE_CONFIG_HELPERS]) dnl AC_DEFUN([WINE_CONFIG_HELPERS], [AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies -Makefile: Makefile.in Make.rules config.status"]) -AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"]) +Makefile: Makefile.in Make.rules config.status + @./config.status Makefile"]) -AC_SUBST(ALL_MAKERULES,"") -AC_SUBST(ALL_SYMLINKS,"") +AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"]) AC_SUBST(ALL_TEST_BINARIES,"") AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"") @@ -355,6 +354,27 @@ install-dev:: $ac_dir all __tooldeps__ .PHONY: $ac_dir $ac_dir: $ac_dir/Makefile libs/port dummy @cd $ac_dir && \$(MAKE)"]) +} + +wine_fn_config_makerules () +{ + ac_rules=$[1] + ac_deps=$[2] + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_rules: $ac_rules.in $ac_deps config.status + @./config.status $ac_rules +distclean:: + \$(RM) $ac_rules" +} + +wine_fn_config_symlink () +{ + ac_link=$[1] + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_link: + @./config.status $ac_link +distclean:: + \$(RM) $ac_link" }]) dnl **** Define helper function to append a file to a makefile file list **** @@ -382,15 +402,14 @@ dnl Usage: WINE_CONFIG_SYMLINK(name,target) dnl AC_DEFUN([WINE_CONFIG_SYMLINK],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl AC_CONFIG_LINKS([$1:]m4_default([$2],[$1]))dnl -m4_if([$2],,[test "$srcdir" = "." || ])WINE_APPEND_FILE(ALL_SYMLINKS,[$1])]) +m4_if([$2],,[test "$srcdir" = "." || ])wine_fn_config_symlink $1]) dnl **** Create a make rules file from config.status **** dnl dnl Usage: WINE_CONFIG_MAKERULES(file,var,deps) dnl AC_DEFUN([WINE_CONFIG_MAKERULES],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl -WINE_APPEND_FILE(ALL_MAKERULES,[$1]) -WINE_APPEND_RULE(ALL_MAKEFILE_DEPENDS,[$1: m4_ifval([$3],[$1.in $3],[$1.in]) config.status]) +wine_fn_config_makerules $1 $3 $2=$1 AC_SUBST_FILE([$2])dnl AC_CONFIG_FILES([$1])]) diff --git a/configure b/configure index a8f1cb9..89341e5 100755 --- a/configure +++ b/configure @@ -598,8 +598,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS ALL_PROGRAM_BIN_INSTALL_DIRS ALL_TEST_BINARIES -ALL_SYMLINKS -ALL_MAKERULES ALL_WINETEST_DEPENDS ALL_MAKEFILE_DEPENDS LDAPLIBS @@ -13845,14 +13843,11 @@ ac_config_commands="$ac_config_commands include/stamp-h" ALL_MAKEFILE_DEPENDS="# Makefile dependencies -Makefile: Makefile.in Make.rules config.status" +Makefile: Makefile.in Make.rules config.status + @./config.status Makefile" -ALL_WINETEST_DEPENDS="# Test binaries" - - -ALL_MAKERULES="" -ALL_SYMLINKS="" +ALL_WINETEST_DEPENDS="# Test binaries" ALL_TEST_BINARIES="" @@ -14084,18 +14079,39 @@ $ac_dir: $ac_dir/Makefile libs/port dummy @cd $ac_dir && \$(MAKE)" fi } + +wine_fn_config_makerules () +{ + ac_rules=$1 + ac_deps=$2 + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_rules: $ac_rules.in $ac_deps config.status + @./config.status $ac_rules +distclean:: + \$(RM) $ac_rules" +} + +wine_fn_config_symlink () +{ + ac_link=$1 + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_link: + @./config.status $ac_link +distclean:: + \$(RM) $ac_link" +} ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" -test "$srcdir" = "." || wine_fn_append_file ALL_SYMLINKS "dlls/wineps.drv/generic.ppd" +test "$srcdir" = "." || wine_fn_config_symlink dlls/wineps.drv/generic.ppd ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" -test "$srcdir" = "." || wine_fn_append_file ALL_SYMLINKS "fonts/marlett.ttf" +test "$srcdir" = "." || wine_fn_config_symlink fonts/marlett.ttf ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" -test "$srcdir" = "." || wine_fn_append_file ALL_SYMLINKS "fonts/symbol.ttf" +test "$srcdir" = "." || wine_fn_config_symlink fonts/symbol.ttf ac_config_links="$ac_config_links fonts/tahoma.ttf:fonts/tahoma.ttf" -test "$srcdir" = "." || wine_fn_append_file ALL_SYMLINKS "fonts/tahoma.ttf" +test "$srcdir" = "." || wine_fn_config_symlink fonts/tahoma.ttf ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf" -test "$srcdir" = "." || wine_fn_append_file ALL_SYMLINKS "fonts/tahomabd.ttf" +test "$srcdir" = "." || wine_fn_config_symlink fonts/tahomabd.ttf ac_config_links="$ac_config_links wine:tools/winewrapper" -wine_fn_append_file ALL_SYMLINKS "wine" +wine_fn_config_symlink wine ac_config_commands="$ac_config_commands dlls/gdi32/enhmfdrv" @@ -14110,28 +14126,23 @@ ac_config_commands="$ac_config_commands dlls/wineps.drv/data" ac_config_commands="$ac_config_commands include/wine" -wine_fn_append_file ALL_MAKERULES "Make.rules" -wine_fn_append_rule ALL_MAKEFILE_DEPENDS "Make.rules: Make.rules.in config.status" +wine_fn_config_makerules Make.rules MAKE_RULES=Make.rules ac_config_files="$ac_config_files Make.rules" -wine_fn_append_file ALL_MAKERULES "Maketest.rules" -wine_fn_append_rule ALL_MAKEFILE_DEPENDS "Maketest.rules: Maketest.rules.in Make.rules config.status" +wine_fn_config_makerules Maketest.rules Make.rules MAKE_TEST_RULES=Maketest.rules ac_config_files="$ac_config_files Maketest.rules" -wine_fn_append_file ALL_MAKERULES "dlls/Makedll.rules" -wine_fn_append_rule ALL_MAKEFILE_DEPENDS "dlls/Makedll.rules: dlls/Makedll.rules.in Make.rules config.status" +wine_fn_config_makerules dlls/Makedll.rules Make.rules MAKE_DLL_RULES=dlls/Makedll.rules ac_config_files="$ac_config_files dlls/Makedll.rules" -wine_fn_append_file ALL_MAKERULES "dlls/Makeimplib.rules" -wine_fn_append_rule ALL_MAKEFILE_DEPENDS "dlls/Makeimplib.rules: dlls/Makeimplib.rules.in Make.rules config.status" +wine_fn_config_makerules dlls/Makeimplib.rules Make.rules MAKE_IMPLIB_RULES=dlls/Makeimplib.rules ac_config_files="$ac_config_files dlls/Makeimplib.rules" -wine_fn_append_file ALL_MAKERULES "programs/Makeprog.rules" -wine_fn_append_rule ALL_MAKEFILE_DEPENDS "programs/Makeprog.rules: programs/Makeprog.rules.in Make.rules config.status" +wine_fn_config_makerules programs/Makeprog.rules Make.rules MAKE_PROG_RULES=programs/Makeprog.rules ac_config_files="$ac_config_files programs/Makeprog.rules"

1 0

Alexandre Julliard : makefiles: Output the top-level clean rules explicitly for each module.
by Alexandre Julliard March 26, 2010

March 26, 2010

Module: wine Branch: master Commit: 3cc14dc3fbadd9b7b65ee6980da08947e12b8816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cc14dc3fbadd9b7b65ee6980… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 22:12:12 2010 +0100 makefiles: Output the top-level clean rules explicitly for each module. --- Makefile.in | 12 +++--------- aclocal.m4 | 6 ++++-- configure | 8 ++++---- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/Makefile.in b/Makefile.in index 31896bb..50d239d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,8 +27,6 @@ VPATH = @srcdir@ LIBEXT = @LIBEXT@ MODULE = none -ALL_DIRS = @ALL_DIRS@ - # Sub-directories that don't have a makefile EXTRASUBDIRS = dlls libs @@ -63,18 +61,14 @@ $(ALL_CONFIGS): # Rules for cleaning -$(ALL_DIRS:%=%/__clean__): dummy - @cd `dirname $@` && $(MAKE) clean - -clean:: $(ALL_DIRS:%=%/__clean__) - $(RM) $(ALL_DIRS:%=%/Makefile) tools/makedep$(EXEEXT) +.PHONY: __clean__ +clean:: __clean__ + $(RM) tools/makedep$(EXEEXT) distclean:: clean $(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h $(ALL_CONFIGS) $(RM) -r autom4te.cache -.PHONY: distclean $(ALL_DIRS:%=%/__clean__) - # Dependencies between directories # dependencies needed to build any dll or program diff --git a/aclocal.m4 b/aclocal.m4 index dcc0359..914e6f6 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -146,7 +146,6 @@ AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"]) AC_SUBST(ALL_MAKERULES,"") AC_SUBST(ALL_SYMLINKS,"") -AC_SUBST(ALL_DIRS,"") AC_SUBST(ALL_TEST_BINARIES,"") AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"") @@ -164,7 +163,10 @@ wine_fn_all_dir_rules () { wine_fn_append_file ALL_DIRS $[1] wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$[1]/__clean__: $[1]/Makefile +"__clean__ .PHONY: $[1]/__clean__ +$[1]/__clean__: $[1]/Makefile + @cd $[1] && \$(MAKE) clean + \$(RM) $[1]/Makefile $[1]/Makefile: $[1]/Makefile.in config.status $[2] @./config.status --file $[1]/Makefile && cd $[1] && \$(MAKE) depend depend .PHONY: $[1]/__depend__ diff --git a/configure b/configure index e2524a0..a8f1cb9 100755 --- a/configure +++ b/configure @@ -598,7 +598,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS ALL_PROGRAM_BIN_INSTALL_DIRS ALL_TEST_BINARIES -ALL_DIRS ALL_SYMLINKS ALL_MAKERULES ALL_WINETEST_DEPENDS @@ -13855,8 +13854,6 @@ ALL_MAKERULES="" ALL_SYMLINKS="" -ALL_DIRS="" - ALL_TEST_BINARIES="" ALL_PROGRAM_BIN_INSTALL_DIRS="" @@ -13876,7 +13873,10 @@ wine_fn_all_dir_rules () { wine_fn_append_file ALL_DIRS $1 wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$1/__clean__: $1/Makefile +"__clean__ .PHONY: $1/__clean__ +$1/__clean__: $1/Makefile + @cd $1 && \$(MAKE) clean + \$(RM) $1/Makefile $1/Makefile: $1/Makefile.in config.status $2 @./config.status --file $1/Makefile && cd $1 && \$(MAKE) depend depend .PHONY: $1/__depend__

1 0

Alexandre Julliard : makefiles: Add a helper function for rules that are common to all directories.
by Alexandre Julliard March 26, 2010

March 26, 2010

Module: wine Branch: master Commit: 943cd739b2898375a40e4eb8cde3df320a676448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=943cd739b2898375a40e4eb8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 21:52:56 2010 +0100 makefiles: Add a helper function for rules that are common to all directories. --- aclocal.m4 | 44 +++++++++++++++----------------------------- configure | 44 +++++++++++++++----------------------------- 2 files changed, 30 insertions(+), 58 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index a4766d4..bce0377 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -160,15 +160,20 @@ wine_fn_append_rule () AS_VAR_APPEND($[1],"$as_nl$[2]") } +wine_fn_all_dir_rules () +{ + wine_fn_append_file ALL_DIRS $[1] + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$[1]/__clean__: $[1]/Makefile +$[1]/Makefile $[1]/__depend__: $[1]/Makefile.in config.status $[2] + @./config.status --file $[1]/Makefile && cd $[1] && \$(MAKE) depend" +} + wine_fn_config_makefile () { ac_dir=$[1] ac_enable=$[2] - wine_fn_append_file ALL_DIRS $ac_dir - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/__clean__: $ac_dir/Makefile -$ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Make.rules \$(MAKEDEP) - @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" + wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)" AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all .PHONY: $ac_dir @@ -188,7 +193,7 @@ wine_fn_config_lib () { ac_name=$[1] ac_dir=dlls/$ac_name - wine_fn_append_file ALL_DIRS $ac_dir + wine_fn_all_dir_rules $ac_dir "dlls/Makeimplib.rules \$(MAKEDEP)" wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all __builddeps__: $ac_dir __buildcrossdeps__: $ac_dir/lib$ac_name.cross.a @@ -197,9 +202,6 @@ $ac_dir: dummy @cd $ac_dir && \$(MAKE) $ac_dir/lib$ac_name.cross.a: dummy @cd $ac_dir && \$(MAKE) lib$ac_name.cross.a -$ac_dir/__clean__: $ac_dir/Makefile -$ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status dlls/Makeimplib.rules \$(MAKEDEP) - @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend install install-dev:: $ac_dir @cd $ac_dir && \$(MAKE) install uninstall:: $ac_dir/Makefile @@ -215,11 +217,7 @@ wine_fn_config_dll () ac_file="dlls/$ac_dir/lib$ac_implib" ac_deps="tools/widl tools/winebuild tools/winegcc include" - wine_fn_append_file ALL_DIRS dlls/$ac_dir - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"dlls/$ac_dir/__clean__: dlls/$ac_dir/Makefile -dlls/$ac_dir/Makefile dlls/$ac_dir/__depend__: dlls/$ac_dir/Makefile.in config.status dlls/Makedll.rules \$(MAKEDEP) - @./config.status --file dlls/$ac_dir/Makefile && cd dlls/$ac_dir && \$(MAKE) depend" + wine_fn_all_dir_rules dlls/$ac_dir "dlls/Makedll.rules \$(MAKEDEP)" AS_VAR_IF([$ac_enable],[no], dnl enable_win16 is special in that it disables import libs too @@ -277,11 +275,7 @@ wine_fn_config_program () ac_dir=$[1] ac_enable=$[2] ac_install=$[3] - wine_fn_append_file ALL_DIRS programs/$ac_dir - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"programs/$ac_dir/__clean__: programs/$ac_dir/Makefile -programs/$ac_dir/Makefile programs/$ac_dir/__depend__: programs/$ac_dir/Makefile.in config.status programs/Makeprog.rules \$(MAKEDEP) - @./config.status --file programs/$ac_dir/Makefile && cd programs/$ac_dir && \$(MAKE) depend" + wine_fn_all_dir_rules programs/$ac_dir "programs/Makeprog.rules \$(MAKEDEP)" AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all .PHONY: programs/$ac_dir @@ -310,11 +304,7 @@ wine_fn_config_test () $ac_name.rc: echo \"$ac_name.exe TESTRES \\\"$ac_name.exe\\\"\" >\$[@] || (\$(RM) \$[@] && false) $ac_name.res: $ac_name.rc $ac_name.exe" - wine_fn_append_file ALL_DIRS $ac_dir - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/__clean__: $ac_dir/Makefile -$ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Maketest.rules \$(MAKEDEP) - @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" + wine_fn_all_dir_rules $ac_dir "Maketest.rules \$(MAKEDEP)" AS_VAR_IF([enable_tests],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all programs/winetest .PHONY: $ac_dir @@ -339,11 +329,7 @@ wine_fn_config_tool () dnl makedep is in tools so tools makefile cannot depend on it ac_deps="$ac_deps \$(MAKEDEP)" fi - wine_fn_append_file ALL_DIRS $ac_dir - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/__clean__: $ac_dir/Makefile -$ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status $ac_deps - @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" + wine_fn_all_dir_rules $ac_dir "$ac_deps" AS_VAR_IF([enable_tools],[no],,[case $ac_dir in dnl tools directory has both install-lib and install-dev diff --git a/configure b/configure index 2be8132..72c3f72 100755 --- a/configure +++ b/configure @@ -13872,15 +13872,20 @@ wine_fn_append_rule () as_fn_append $1 "$as_nl$2" } +wine_fn_all_dir_rules () +{ + wine_fn_append_file ALL_DIRS $1 + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$1/__clean__: $1/Makefile +$1/Makefile $1/__depend__: $1/Makefile.in config.status $2 + @./config.status --file $1/Makefile && cd $1 && \$(MAKE) depend" +} + wine_fn_config_makefile () { ac_dir=$1 ac_enable=$2 - wine_fn_append_file ALL_DIRS $ac_dir - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/__clean__: $ac_dir/Makefile -$ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Make.rules \$(MAKEDEP) - @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" + wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)" eval as_val=\$$ac_enable if test "x$as_val" = x""no; then : @@ -13905,7 +13910,7 @@ wine_fn_config_lib () { ac_name=$1 ac_dir=dlls/$ac_name - wine_fn_append_file ALL_DIRS $ac_dir + wine_fn_all_dir_rules $ac_dir "dlls/Makeimplib.rules \$(MAKEDEP)" wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all __builddeps__: $ac_dir __buildcrossdeps__: $ac_dir/lib$ac_name.cross.a @@ -13914,9 +13919,6 @@ $ac_dir: dummy @cd $ac_dir && \$(MAKE) $ac_dir/lib$ac_name.cross.a: dummy @cd $ac_dir && \$(MAKE) lib$ac_name.cross.a -$ac_dir/__clean__: $ac_dir/Makefile -$ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status dlls/Makeimplib.rules \$(MAKEDEP) - @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend install install-dev:: $ac_dir @cd $ac_dir && \$(MAKE) install uninstall:: $ac_dir/Makefile @@ -13932,11 +13934,7 @@ wine_fn_config_dll () ac_file="dlls/$ac_dir/lib$ac_implib" ac_deps="tools/widl tools/winebuild tools/winegcc include" - wine_fn_append_file ALL_DIRS dlls/$ac_dir - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"dlls/$ac_dir/__clean__: dlls/$ac_dir/Makefile -dlls/$ac_dir/Makefile dlls/$ac_dir/__depend__: dlls/$ac_dir/Makefile.in config.status dlls/Makedll.rules \$(MAKEDEP) - @./config.status --file dlls/$ac_dir/Makefile && cd dlls/$ac_dir && \$(MAKE) depend" + wine_fn_all_dir_rules dlls/$ac_dir "dlls/Makedll.rules \$(MAKEDEP)" eval as_val=\$$ac_enable if test "x$as_val" = x""no; then : @@ -13996,11 +13994,7 @@ wine_fn_config_program () ac_dir=$1 ac_enable=$2 ac_install=$3 - wine_fn_append_file ALL_DIRS programs/$ac_dir - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"programs/$ac_dir/__clean__: programs/$ac_dir/Makefile -programs/$ac_dir/Makefile programs/$ac_dir/__depend__: programs/$ac_dir/Makefile.in config.status programs/Makeprog.rules \$(MAKEDEP) - @./config.status --file programs/$ac_dir/Makefile && cd programs/$ac_dir && \$(MAKE) depend" + wine_fn_all_dir_rules programs/$ac_dir "programs/Makeprog.rules \$(MAKEDEP)" eval as_val=\$$ac_enable if test "x$as_val" = x""no; then : @@ -14034,11 +14028,7 @@ wine_fn_config_test () $ac_name.rc: echo \"$ac_name.exe TESTRES \\\"$ac_name.exe\\\"\" >\$@ || (\$(RM) \$@ && false) $ac_name.res: $ac_name.rc $ac_name.exe" - wine_fn_append_file ALL_DIRS $ac_dir - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/__clean__: $ac_dir/Makefile -$ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Maketest.rules \$(MAKEDEP) - @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" + wine_fn_all_dir_rules $ac_dir "Maketest.rules \$(MAKEDEP)" if test "x$enable_tests" = x""no; then : @@ -14066,11 +14056,7 @@ wine_fn_config_tool () then ac_deps="$ac_deps \$(MAKEDEP)" fi - wine_fn_append_file ALL_DIRS $ac_dir - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/__clean__: $ac_dir/Makefile -$ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status $ac_deps - @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" + wine_fn_all_dir_rules $ac_dir "$ac_deps" if test "x$enable_tools" = x""no; then :

1 0

Alexandre Julliard : makefiles: Output the top-level build rules explicitly for each module.
by Alexandre Julliard March 26, 2010

March 26, 2010

Module: wine Branch: master Commit: 6c90aeaef543106953a4426930a33c3012f49021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c90aeaef543106953a442693… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 21:47:29 2010 +0100 makefiles: Output the top-level build rules explicitly for each module. --- Makefile.in | 7 ------- aclocal.m4 | 28 ++++++++++++++++++---------- configure | 28 ++++++++++++++++++---------- 3 files changed, 36 insertions(+), 27 deletions(-) diff --git a/Makefile.in b/Makefile.in index 70ab5db..97f90ac 100644 --- a/Makefile.in +++ b/Makefile.in @@ -61,13 +61,6 @@ include/stamp-h: include/config.h.in config.status $(ALL_CONFIGS): @./config.status $@ -# Rules for building - -$(ALL_DIRS): dummy - @cd $@ && $(MAKE) - -.PHONY: $(ALL_DIRS) - # Rules for dependencies depend: $(ALL_DIRS:%=%/__depend__) dummy diff --git a/aclocal.m4 b/aclocal.m4 index 4ebb11b..a4766d4 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -171,8 +171,9 @@ $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Make.rule @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all: $ac_dir -$ac_dir: $ac_dir/Makefile +"all .PHONY: $ac_dir +$ac_dir: $ac_dir/Makefile dummy + @cd $ac_dir && \$(MAKE) install:: $ac_dir @cd $ac_dir && \$(MAKE) install install-lib:: $ac_dir @@ -192,6 +193,8 @@ wine_fn_config_lib () "all __builddeps__: $ac_dir __buildcrossdeps__: $ac_dir/lib$ac_name.cross.a $ac_dir $ac_dir/lib$ac_name.cross.a: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include +$ac_dir: dummy + @cd $ac_dir && \$(MAKE) $ac_dir/lib$ac_name.cross.a: dummy @cd $ac_dir && \$(MAKE) lib$ac_name.cross.a $ac_dir/__clean__: $ac_dir/Makefile @@ -222,8 +225,9 @@ dlls/$ac_dir/Makefile dlls/$ac_dir/__depend__: dlls/$ac_dir/Makefile.in config.s dnl enable_win16 is special in that it disables import libs too [test "$ac_enable" != enable_win16 || return 0], [wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all: dlls/$ac_dir -dlls/$ac_dir: dlls/$ac_dir/Makefile __builddeps__ +"all .PHONY: dlls/$ac_dir +dlls/$ac_dir: dlls/$ac_dir/Makefile __builddeps__ dummy + @cd dlls/$ac_dir && \$(MAKE) install:: dlls/$ac_dir/Makefile __builddeps__ @cd dlls/$ac_dir && \$(MAKE) install install-lib:: dlls/$ac_dir/Makefile __builddeps__ @@ -280,8 +284,10 @@ programs/$ac_dir/Makefile programs/$ac_dir/__depend__: programs/$ac_dir/Makefile @./config.status --file programs/$ac_dir/Makefile && cd programs/$ac_dir && \$(MAKE) depend" AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all: programs/$ac_dir -programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__" +"all .PHONY: programs/$ac_dir +programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy + @cd programs/$ac_dir && \$(MAKE)" + if test -n "$ac_install" then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ @@ -311,8 +317,9 @@ $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Maketest. @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" AS_VAR_IF([enable_tests],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all programs/winetest: $ac_dir -$ac_dir: $ac_dir/Makefile __builddeps__ +"all programs/winetest .PHONY: $ac_dir +$ac_dir: $ac_dir/Makefile __builddeps__ dummy + @cd $ac_dir && \$(MAKE) crosstest .PHONY: $ac_dir/__crosstest__ $ac_dir/__crosstest__: $ac_dir/Makefile __buildcrossdeps__ dummy @cd $ac_dir && \$(MAKE) crosstest @@ -354,8 +361,9 @@ install-dev:: $ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "uninstall:: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) uninstall -all __tooldeps__: $ac_dir -$ac_dir: $ac_dir/Makefile libs/port"]) +all __tooldeps__ .PHONY: $ac_dir +$ac_dir: $ac_dir/Makefile libs/port dummy + @cd $ac_dir && \$(MAKE)"]) }]) dnl **** Define helper function to append a file to a makefile file list **** diff --git a/configure b/configure index 6308ae9..2be8132 100755 --- a/configure +++ b/configure @@ -13887,8 +13887,9 @@ $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Make.rule else wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all: $ac_dir -$ac_dir: $ac_dir/Makefile +"all .PHONY: $ac_dir +$ac_dir: $ac_dir/Makefile dummy + @cd $ac_dir && \$(MAKE) install:: $ac_dir @cd $ac_dir && \$(MAKE) install install-lib:: $ac_dir @@ -13909,6 +13910,8 @@ wine_fn_config_lib () "all __builddeps__: $ac_dir __buildcrossdeps__: $ac_dir/lib$ac_name.cross.a $ac_dir $ac_dir/lib$ac_name.cross.a: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include +$ac_dir: dummy + @cd $ac_dir && \$(MAKE) $ac_dir/lib$ac_name.cross.a: dummy @cd $ac_dir && \$(MAKE) lib$ac_name.cross.a $ac_dir/__clean__: $ac_dir/Makefile @@ -13940,8 +13943,9 @@ dlls/$ac_dir/Makefile dlls/$ac_dir/__depend__: dlls/$ac_dir/Makefile.in config.s test "$ac_enable" != enable_win16 || return 0 else wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all: dlls/$ac_dir -dlls/$ac_dir: dlls/$ac_dir/Makefile __builddeps__ +"all .PHONY: dlls/$ac_dir +dlls/$ac_dir: dlls/$ac_dir/Makefile __builddeps__ dummy + @cd dlls/$ac_dir && \$(MAKE) install:: dlls/$ac_dir/Makefile __builddeps__ @cd dlls/$ac_dir && \$(MAKE) install install-lib:: dlls/$ac_dir/Makefile __builddeps__ @@ -14003,8 +14007,10 @@ programs/$ac_dir/Makefile programs/$ac_dir/__depend__: programs/$ac_dir/Makefile else wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all: programs/$ac_dir -programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__" +"all .PHONY: programs/$ac_dir +programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy + @cd programs/$ac_dir && \$(MAKE)" + if test -n "$ac_install" then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ @@ -14038,8 +14044,9 @@ $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Maketest. else wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all programs/winetest: $ac_dir -$ac_dir: $ac_dir/Makefile __builddeps__ +"all programs/winetest .PHONY: $ac_dir +$ac_dir: $ac_dir/Makefile __builddeps__ dummy + @cd $ac_dir && \$(MAKE) crosstest .PHONY: $ac_dir/__crosstest__ $ac_dir/__crosstest__: $ac_dir/Makefile __buildcrossdeps__ dummy @cd $ac_dir && \$(MAKE) crosstest @@ -14083,8 +14090,9 @@ install-dev:: $ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "uninstall:: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) uninstall -all __tooldeps__: $ac_dir -$ac_dir: $ac_dir/Makefile libs/port" +all __tooldeps__ .PHONY: $ac_dir +$ac_dir: $ac_dir/Makefile libs/port dummy + @cd $ac_dir && \$(MAKE)" fi } ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd"

1 0

Alexandre Julliard : makefiles: Fix test rules to allow parallel makes again.
by Alexandre Julliard March 26, 2010

March 26, 2010

Module: wine Branch: master Commit: eab7efd1792d16618608c75cf34b6095a34806d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eab7efd1792d16618608c75cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 21:42:54 2010 +0100 makefiles: Fix test rules to allow parallel makes again. --- Makefile.in | 2 +- Maketest.rules.in | 4 ++-- aclocal.m4 | 6 ++++-- configure | 6 ++++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7a3bd80..1df64c2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -127,7 +127,7 @@ uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__) dummy # dependencies needed to build any dll or program __tooldeps__: libs/port libs/wine libs/wpp __builddeps__ __buildcrossdeps__: __tooldeps__ include -.PHONY: __tooldeps__ __builddeps__ __buildcrossdeps__ +.PHONY: test crosstest __tooldeps__ __builddeps__ __buildcrossdeps__ loader server: libs/port libs/wine tools fonts: tools diff --git a/Maketest.rules.in b/Maketest.rules.in index c9ae6ea..f04dc24 100644 --- a/Maketest.rules.in +++ b/Maketest.rules.in @@ -41,13 +41,13 @@ testlist.o: testlist.c $(TOPSRCDIR)/include/wine/test.h # Rules for testing -check test:: $(TESTRESULTS) +check test: $(TESTRESULTS) $(TESTRESULTS): $(MODULE)$(DLLEXT) ../$(TESTDLL)$(DLLEXT) # Rules for cross-compiling tests -crosstest:: @CROSSTEST@ +crosstest: @CROSSTEST@ $(CROSSTEST): $(CROSSOBJS) Makefile.in $(CROSSWINEGCC) $(CROSSOBJS) -o $@ $(ALL_LIBS) diff --git a/aclocal.m4 b/aclocal.m4 index 253f1a4..a3e2f49 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -306,9 +306,11 @@ $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Maketest. AS_VAR_IF([enable_tests],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all programs/winetest: $ac_dir $ac_dir: $ac_dir/Makefile __builddeps__ -crosstest:: $ac_dir/Makefile __buildcrossdeps__ +crosstest .PHONY: $ac_dir/__crosstest__ +$ac_dir/__crosstest__: $ac_dir/Makefile __buildcrossdeps__ dummy @cd $ac_dir && \$(MAKE) crosstest -test:: +test .PHONY: $ac_dir/__test__ +$ac_dir/__test__: dummy @cd $ac_dir && \$(MAKE) test testclean:: \$(RM) $ac_dir/*.ok"]) diff --git a/configure b/configure index 60dc4ab..c4f0ca9 100755 --- a/configure +++ b/configure @@ -14035,9 +14035,11 @@ else wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all programs/winetest: $ac_dir $ac_dir: $ac_dir/Makefile __builddeps__ -crosstest:: $ac_dir/Makefile __buildcrossdeps__ +crosstest .PHONY: $ac_dir/__crosstest__ +$ac_dir/__crosstest__: $ac_dir/Makefile __buildcrossdeps__ dummy @cd $ac_dir && \$(MAKE) crosstest -test:: +test .PHONY: $ac_dir/__test__ +$ac_dir/__test__: dummy @cd $ac_dir && \$(MAKE) test testclean:: \$(RM) $ac_dir/*.ok"

1 0

Alexandre Julliard : makefiles: Output the top-level installation rules explicitly for each module.
by Alexandre Julliard March 26, 2010

March 26, 2010

Module: wine Branch: master Commit: e84063bff370d911ecda1162fc2c09fd7b04a120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e84063bff370d911ecda1162f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 21:46:41 2010 +0100 makefiles: Output the top-level installation rules explicitly for each module. --- Makefile.in | 41 ----------------------------------------- aclocal.m4 | 19 +++++++++++++------ configure | 21 +++++++++++++-------- 3 files changed, 26 insertions(+), 55 deletions(-) diff --git a/Makefile.in b/Makefile.in index 1df64c2..70ab5db 100644 --- a/Makefile.in +++ b/Makefile.in @@ -28,17 +28,6 @@ LIBEXT = @LIBEXT@ MODULE = none ALL_DIRS = @ALL_DIRS@ -ALL_TOP_DIRS = @ALL_TOP_DIRS@ - -# Sub-directories to run make all into -BUILDSUBDIRS = \ - libs/wine \ - $(ALL_TOP_DIRS) - -# Sub-directories to run make install/uninstall into -INSTALLSUBDIRS = \ - libs/wine \ - $(ALL_TOP_DIRS) # Sub-directories that don't have a makefile EXTRASUBDIRS = dlls libs @@ -74,8 +63,6 @@ $(ALL_CONFIGS): # Rules for building -all: $(BUILDSUBDIRS) - $(ALL_DIRS): dummy @cd $@ && $(MAKE) @@ -100,28 +87,6 @@ distclean:: clean .PHONY: distclean $(ALL_DIRS:%=%/__clean__) -# Rules for installing - -$(INSTALLSUBDIRS:%=%/__install__): dummy - @cd `dirname $@` && $(MAKE) install - -$(INSTALLSUBDIRS:%=%/__install-lib__): dummy - @cd `dirname $@` && $(MAKE) install-lib - -$(INSTALLSUBDIRS:%=%/__install-dev__): dummy - @cd `dirname $@` && $(MAKE) install-dev - -$(INSTALLSUBDIRS:%=%/__uninstall__): dummy - @cd `dirname $@` && $(MAKE) uninstall - -install:: $(INSTALLSUBDIRS:%=%/__install__) dummy -install-lib:: $(INSTALLSUBDIRS:%=%/__install-lib__) dummy -install-dev:: $(INSTALLSUBDIRS:%=%/__install-dev__) dummy -uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__) dummy - -.PHONY: $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__uninstall__) \ - $(INSTALLSUBDIRS:%=%/__install-lib__) $(INSTALLSUBDIRS:%=%/__install-dev__) - # Dependencies between directories # dependencies needed to build any dll or program @@ -136,12 +101,6 @@ libs/wine: libs/port tools/wmc tools/wrc: tools tools tools/wmc tools/wrc: libs/wine tools/widl tools/wmc tools/wrc: libs/wpp - -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 -loader/__install__ loader/__install-lib__: libs/port libs/wine tools -server/__install__ server/__install-lib__: libs/port libs/wine tools tools/__depend__: $(MAKEDEP) $(MAKEDEP): include/config.h tools/Makefile diff --git a/aclocal.m4 b/aclocal.m4 index a3e2f49..4ebb11b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -147,7 +147,6 @@ AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"]) AC_SUBST(ALL_MAKERULES,"") AC_SUBST(ALL_SYMLINKS,"") AC_SUBST(ALL_DIRS,"") -AC_SUBST(ALL_TOP_DIRS,"") AC_SUBST(ALL_TEST_BINARIES,"") AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"") @@ -167,13 +166,21 @@ wine_fn_config_makefile () ac_enable=$[2] wine_fn_append_file ALL_DIRS $ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/__clean__ $ac_dir/__install__ $ac_dir/__install-dev__ $ac_dir/__install-lib__ $ac_dir/__uninstall__ $ac_dir: $ac_dir/Makefile +"$ac_dir/__clean__: $ac_dir/Makefile $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Make.rules \$(MAKEDEP) @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" - AS_VAR_IF([$ac_enable],[no],,[case $ac_dir in - */*) ;; - *) wine_fn_append_file ALL_TOP_DIRS $ac_dir ;; - esac]) + + AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"all: $ac_dir +$ac_dir: $ac_dir/Makefile +install:: $ac_dir + @cd $ac_dir && \$(MAKE) install +install-lib:: $ac_dir + @cd $ac_dir && \$(MAKE) install-lib +install-dev:: $ac_dir + @cd $ac_dir && \$(MAKE) install-dev +uninstall:: $ac_dir/Makefile + @cd $ac_dir && \$(MAKE) uninstall"]) } wine_fn_config_lib () diff --git a/configure b/configure index c4f0ca9..6308ae9 100755 --- a/configure +++ b/configure @@ -598,7 +598,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS ALL_PROGRAM_BIN_INSTALL_DIRS ALL_TEST_BINARIES -ALL_TOP_DIRS ALL_DIRS ALL_SYMLINKS ALL_MAKERULES @@ -13858,8 +13857,6 @@ ALL_SYMLINKS="" ALL_DIRS="" -ALL_TOP_DIRS="" - ALL_TEST_BINARIES="" ALL_PROGRAM_BIN_INSTALL_DIRS="" @@ -13881,17 +13878,25 @@ wine_fn_config_makefile () ac_enable=$2 wine_fn_append_file ALL_DIRS $ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/__clean__ $ac_dir/__install__ $ac_dir/__install-dev__ $ac_dir/__install-lib__ $ac_dir/__uninstall__ $ac_dir: $ac_dir/Makefile +"$ac_dir/__clean__: $ac_dir/Makefile $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Make.rules \$(MAKEDEP) @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" + eval as_val=\$$ac_enable if test "x$as_val" = x""no; then : else - case $ac_dir in - */*) ;; - *) wine_fn_append_file ALL_TOP_DIRS $ac_dir ;; - esac + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"all: $ac_dir +$ac_dir: $ac_dir/Makefile +install:: $ac_dir + @cd $ac_dir && \$(MAKE) install +install-lib:: $ac_dir + @cd $ac_dir && \$(MAKE) install-lib +install-dev:: $ac_dir + @cd $ac_dir && \$(MAKE) install-dev +uninstall:: $ac_dir/Makefile + @cd $ac_dir && \$(MAKE) uninstall" fi }

1 0

Piotr Caban : msvcr90: Added implementation of __sys_nerr and __sys_errlist .
by Alexandre Julliard March 25, 2010

March 25, 2010

Module: wine Branch: master Commit: f7cc8f695b954bf98bd34bb7adccc09378349a1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7cc8f695b954bf98bd34bb7a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 24 22:40:40 2010 +0100 msvcr90: Added implementation of __sys_nerr and __sys_errlist. --- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.c | 16 ++++++++++++++++ dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcr90/tests/msvcr90.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 66b56b0..7512d91 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -239,8 +239,8 @@ @ cdecl __setusermatherr(ptr) msvcrt.__setusermatherr @ stub __strncnt @ stub __swprintf_l -@ stub __sys_errlist -@ stub __sys_nerr +@ cdecl __sys_errlist() msvcr90.__sys_errlist +@ cdecl __sys_nerr() msvcr90.__sys_nerr @ cdecl __threadhandle() msvcrt.__threadhandle @ cdecl __threadid() msvcrt.__threadid @ stub __timezone diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 4fa65b5..a1994d8 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -123,3 +123,19 @@ int CDECL _initterm_e(_INITTERM_E_FN *table, _INITTERM_E_FN *end) } return res; } + +/********************************************************************* + * __sys_nerr (MSVCR90.@) + */ +int* CDECL __sys_nerr(void) +{ + return (int*)GetProcAddress(GetModuleHandleA("msvcrt.dll"), "_sys_nerr"); +} + +/********************************************************************* + * __sys_errlist (MSVCR90.@) + */ +char** CDECL __sys_errlist(void) +{ + return (char**)GetProcAddress(GetModuleHandleA("msvcrt.dll"), "_sys_errlist"); +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 0255b96..74b1614 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -231,8 +231,8 @@ @ cdecl __setusermatherr(ptr) msvcrt.__setusermatherr @ stub __strncnt @ stub __swprintf_l -@ stub __sys_errlist -@ stub __sys_nerr +@ cdecl __sys_errlist() +@ cdecl __sys_nerr() @ cdecl __threadhandle() msvcrt.__threadhandle @ cdecl __threadid() msvcrt.__threadid @ stub __timezone diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 03d75ee..5fe00b2 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -31,6 +31,10 @@ static int (__cdecl *p_initterm_e)(_INITTERM_E_FN *table, _INITTERM_E_FN *end); static void* (__cdecl *p_encode_pointer)(void *); static void* (__cdecl *p_decode_pointer)(void *); static void* (__cdecl *p_encoded_null)(void); +static int *p_sys_nerr; +static int* (__cdecl *p__sys_nerr)(void); +static char **p_sys_errlist; +static char** (__cdecl *p__sys_errlist)(void); int cb_called[4]; @@ -168,6 +172,27 @@ static void test__encode_pointer(void) ok(p_encoded_null() == p_encode_pointer(NULL), "Error encoding null\n"); } +static void test_error_messages(void) +{ + int *size, size_copy; + + if(!p_sys_nerr || !p__sys_nerr || !p_sys_errlist || !p__sys_errlist) { + win_skip("Skipping test_error_messages tests\n"); + return; + } + + size = p__sys_nerr(); + size_copy = *size; + ok(*p_sys_nerr == *size, "_sys_nerr = %u, size = %u\n", *p_sys_nerr, *size); + + *size = 20; + ok(*p_sys_nerr == *size, "_sys_nerr = %u, size = %u\n", *p_sys_nerr, *size); + + *size = size_copy; + + ok(*p_sys_errlist == *(p__sys_errlist()), "p_sys_errlist != p__sys_errlist()\n"); +} + /* ########## */ START_TEST(msvcr90) @@ -190,7 +215,12 @@ START_TEST(msvcr90) p_encode_pointer = (void *) GetProcAddress(hcrt, "_encode_pointer"); p_decode_pointer = (void *) GetProcAddress(hcrt, "_decode_pointer"); p_encoded_null = (void *) GetProcAddress(hcrt, "_encoded_null"); + p_sys_nerr = (void *) GetProcAddress(hcrt, "_sys_nerr"); + p__sys_nerr = (void *) GetProcAddress(hcrt, "__sys_nerr"); + p_sys_errlist = (void *) GetProcAddress(hcrt, "_sys_errlist"); + p__sys_errlist = (void *) GetProcAddress(hcrt, "__sys_errlist"); test__initterm_e(); test__encode_pointer(); + test_error_messages(); }

1 0

Piotr Caban : msvcr90: Added _get/ set_invalid_parameter_handler implementation.
by Alexandre Julliard March 25, 2010

March 25, 2010

Module: wine Branch: master Commit: 254eab38274b1d3ebf6f400cb049baf737337f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=254eab38274b1d3ebf6f400cb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 24 22:39:44 2010 +0100 msvcr90: Added _get/set_invalid_parameter_handler implementation. --- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.c | 25 +++++++++++++++++++++++++ dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcr90/tests/msvcr90.c | 17 +++++++++++++++++ dlls/msvcrt/errno.c | 1 + dlls/msvcrt/msvcrt.h | 2 ++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 15 +++++++++++++++ include/msvcrt/stdlib.h | 4 ++++ 9 files changed, 71 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7294d89..66b56b0 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -470,7 +470,7 @@ @ stub _get_errno @ stub _get_fmode @ stub _get_heap_handle -@ stub _get_invalid_parameter_handler +@ cdecl _get_invalid_parameter_handler() msvcr90._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @ stub _get_osplatform @ stub _get_osver @@ -533,7 +533,7 @@ @ stub _inp @ stub _inpd @ stub _inpw -@ stub _invalid_parameter +@ extern _invalid_parameter msvcrt._invalid_parameter @ stub _invalid_parameter_noinfo @ stub _invoke_watson @ extern _iob msvcrt._iob @@ -873,7 +873,7 @@ @ stub _set_errno @ cdecl _set_error_mode(long) msvcrt._set_error_mode @ stub _set_fmode -@ stub _set_invalid_parameter_handler +@ cdecl _set_invalid_parameter_handler(ptr) msvcr90._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait @ stub _set_output_format @ stub _set_printf_count_output diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 1bada8b..4fa65b5 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -27,6 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcr90); typedef int (CDECL *_INITTERM_E_FN)(void); +typedef void (__cdecl *_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, unsigned*); /********************************************************************* * DllMain (MSVCR90.@) @@ -77,6 +78,30 @@ void * CDECL _encoded_null(void) } /********************************************************************* + * _get_invalid_parameter_handler (MSVCR90.@) + */ +_invalid_parameter_handler CDECL _get_invalid_parameter_handler(void) +{ + TRACE("\n"); + return *((_invalid_parameter_handler*)GetProcAddress(GetModuleHandleA("msvcrt.dll"), "_invalid_parameter")); +} + +/********************************************************************* + * _set_invalid_parameter_handler (MSVCR90.@) + */ +_invalid_parameter_handler CDECL _set_invalid_parameter_handler(_invalid_parameter_handler handler) +{ + _invalid_parameter_handler *ptr = (_invalid_parameter_handler*)GetProcAddress( + GetModuleHandleA("msvcrt.dll"), "_invalid_parameter"); + _invalid_parameter_handler old = *ptr; + + TRACE("(%p)\n", handler); + + *ptr = handler; + return old; +} + +/********************************************************************* * _initterm_e (MSVCR90.@) * * call an array of application initialization functions and report the return value diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9feaa47..0255b96 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -462,7 +462,7 @@ @ stub _get_errno @ stub _get_fmode @ stub _get_heap_handle -@ stub _get_invalid_parameter_handler +@ cdecl _get_invalid_parameter_handler() @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @ stub _get_output_format @ stub _get_pgmptr @@ -521,7 +521,7 @@ @ stub _inp @ stub _inpd @ stub _inpw -@ stub _invalid_parameter +@ extern _invalid_parameter msvcrt._invalid_parameter @ stub _invalid_parameter_noinfo @ stub _invoke_watson @ extern _iob msvcrt._iob @@ -859,7 +859,7 @@ @ stub _set_errno @ cdecl _set_error_mode(long) msvcrt._set_error_mode @ stub _set_fmode -@ stub _set_invalid_parameter_handler +@ cdecl _set_invalid_parameter_handler(ptr) @ stub _set_malloc_crt_max_wait @ stub _set_output_format @ stub _set_printf_count_output diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index f332622..03d75ee 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -25,6 +25,7 @@ #include <errno.h> #include "wine/test.h" +static _invalid_parameter_handler (__cdecl *p_set_invalid_parameter_handler)(_invalid_parameter_handler); typedef int (__cdecl *_INITTERM_E_FN)(void); static int (__cdecl *p_initterm_e)(_INITTERM_E_FN *table, _INITTERM_E_FN *end); static void* (__cdecl *p_encode_pointer)(void *); @@ -35,6 +36,17 @@ int cb_called[4]; /* ########## */ +void __cdecl test_invalid_parameter_handler(const wchar_t *expression, + const wchar_t *function, const wchar_t *file, + unsigned line, unsigned *res) +{ + ok(expression == NULL, "expression is not NULL\n"); + ok(function == NULL, "function is not NULL\n"); + ok(file == NULL, "file is not NULL\n"); + ok(line == 0, "line = %u\n", line); + ok(res == NULL, "res = %p\n", res); +} + static int initterm_cb0(void) { cb_called[0]++; @@ -169,6 +181,11 @@ START_TEST(msvcr90) return; } + p_set_invalid_parameter_handler = (void *) GetProcAddress(hcrt, "_set_invalid_parameter_handler"); + if(p_set_invalid_parameter_handler) + ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, + "Invalid parameter handler was already set\n"); + p_initterm_e = (void *) GetProcAddress(hcrt, "_initterm_e"); p_encode_pointer = (void *) GetProcAddress(hcrt, "_encode_pointer"); p_decode_pointer = (void *) GetProcAddress(hcrt, "_decode_pointer"); diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 413ab39..c4c8618 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -117,6 +117,7 @@ char *MSVCRT__sys_errlist[] = }; unsigned int MSVCRT__sys_nerr = sizeof(MSVCRT__sys_errlist)/sizeof(MSVCRT__sys_errlist[0]) - 1; +MSVCRT_invalid_parameter_handler MSVCRT_invalid_parameter = NULL; /* INTERNAL: Set the crt and dos errno's from the OS error given. */ void msvcrt_set_errno(int err) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 1de0c7b..1000f3d 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -75,6 +75,7 @@ typedef void (*__cdecl MSVCRT__se_translator_function)(unsigned int code, struct typedef void (*__cdecl MSVCRT__beginthread_start_routine_t)(void *); typedef unsigned int (__stdcall *MSVCRT__beginthreadex_start_routine_t)(void *); typedef int (*__cdecl MSVCRT__onexit_t)(void); +typedef void (__cdecl *MSVCRT_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, unsigned*); typedef struct {long double x;} MSVCRT__LDOUBLE; @@ -124,6 +125,7 @@ extern LCID MSVCRT_current_lc_all_lcid; extern WORD MSVCRT__ctype [257]; extern WORD MSVCRT_current_ctype[257]; extern WORD* MSVCRT__pctype; +extern MSVCRT_invalid_parameter_handler MSVCRT_invalid_parameter; void msvcrt_set_errno(int); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 988d48e..bee7ba1 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -479,7 +479,7 @@ @ stub _inp #(long) -i386 @ stub _inpd #(long) -i386 @ stub _inpw #(long) -i386 -# stub _invalid_parameter +@ extern _invalid_parameter MSVCRT_invalid_parameter @ extern _iob MSVCRT__iob # stub _isalnum_l # stub _isalpha_l diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 6fd64d9..e19c543 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -53,6 +53,7 @@ static int (__cdecl *p_mbsnbcpy_s)(unsigned char * dst, size_t size, const unsig static int (__cdecl *p_wcscpy_s)(wchar_t *wcDest, size_t size, const wchar_t *wcSrc); static int (__cdecl *p_wcsupr_s)(wchar_t *str, size_t size); static size_t (__cdecl *p_strnlen)(const char *, size_t); +static _invalid_parameter_handler *p_invalid_parameter; static int *p__mb_cur_max; static unsigned char *p_mbctype; @@ -61,6 +62,17 @@ static unsigned char *p_mbctype; HMODULE hMsvcrt; +void __cdecl test_invalid_parameter_handler(const wchar_t *expression, + const wchar_t *function, const wchar_t *file, + unsigned line, unsigned *res) +{ + ok(expression == NULL, "expression is not NULL\n"); + ok(function == NULL, "function is not NULL\n"); + ok(file == NULL, "file is not NULL\n"); + ok(line == 0, "line = %u\n", line); + ok(res == NULL, "res = %p\n", res); +} + static void test_swab( void ) { char original[] = "BADCFEHGJILKNMPORQTSVUXWZY@#"; char expected1[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ@#"; @@ -946,6 +958,9 @@ START_TEST(string) SET(pmemcmp,"memcmp"); SET(p_mbctype,"_mbctype"); SET(p__mb_cur_max,"__mb_cur_max"); + p_invalid_parameter = (void *)GetProcAddress( hMsvcrt,"_invalid_parameter"); + if(p_invalid_parameter) + *p_invalid_parameter = test_invalid_parameter_handler; pstrcpy_s = (void *)GetProcAddress( hMsvcrt,"strcpy_s" ); pstrcat_s = (void *)GetProcAddress( hMsvcrt,"strcat_s" ); p_mbsnbcpy_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcpy_s" ); diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 2531f73..617bd1c 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -261,4 +261,8 @@ static inline ldiv_t __wine_msvcrt_ldiv(__msvcrt_long num, __msvcrt_long denom) #include <poppack.h> +typedef void (__cdecl *_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, unsigned*); +_invalid_parameter_handler __cdecl _set_invalid_parameter_handler(_invalid_parameter_handler); +_invalid_parameter_handler __cdecl _get_invalid_parameter_handler(void); + #endif /* __WINE_STDLIB_H */

1 0